diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2018-06-22 18:45:37 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2018-06-22 18:45:37 (GMT) |
| commit | e55a2b1a194b20d08d25f977f03226895ff631d0 (patch) | |
| tree | 5c25ad78f7cf2f71062b99a5a7147492999001b1 /taccle | |
| parent | cd82cfdab4da60d5cc43d18f8be29c46a1bf77cd (diff) | |
| parent | 43e44a1837713a28351c339cfec986cbf1c2c242 (diff) | |
| download | blt-e55a2b1a194b20d08d25f977f03226895ff631d0.zip blt-e55a2b1a194b20d08d25f977f03226895ff631d0.tar.gz blt-e55a2b1a194b20d08d25f977f03226895ff631d0.tar.bz2 | |
Merge commit '43e44a1837713a28351c339cfec986cbf1c2c242'
Diffstat (limited to 'taccle')
| -rw-r--r-- | taccle/README.md | 3 | ||||
| -rw-r--r-- | taccle/taccle.tcl | 35 |
2 files changed, 27 insertions, 11 deletions
diff --git a/taccle/README.md b/taccle/README.md index fd10f40..94348fc 100644 --- a/taccle/README.md +++ b/taccle/README.md @@ -19,8 +19,9 @@ file that implements an LALR(1) parser. The program brings to the Tcl language what yacc and bison do for C and C++. This release of taccle implements nearly all features of yacc: - - %token and %start declarations + - #include <filename> - %define parse.error verbose declaration + - %token and %start declarations - epsilon transitions (i.e., "empty" rules) - embedded (mid-rule) actions - literal tokens diff --git a/taccle/taccle.tcl b/taccle/taccle.tcl index db41038..d4ae6d2 100644 --- a/taccle/taccle.tcl +++ b/taccle/taccle.tcl @@ -42,12 +42,27 @@ proc handle_defs {line} { } switch -- $keyword { "%token" { - foreach token_name [split $args] { - if {$token_name != ""} { - # add the terminal token to the table - add_token $token_name $::TERMINAL 0 0 nonassoc - } - } + if {!$::parse_error} { + foreach {token_name} [split $args] { + if {$token_name != ""} { + # add the terminal token to the table + add_token $token_name $::TERMINAL 0 0 nonassoc + } + } + } else { + foreach {token_name token_title} [split $args] { + if {$token_name != {}} { + # add the terminal token to the table + set tt {} + if {$token_title != {}} { + set tt $token_title + } else { + set tt [string trimright $token_name {_}] + } + add_token $token_name $::TERMINAL 0 0 nonassoc $tt + } + } + } } "%left" - "%right" - @@ -945,9 +960,8 @@ puts $::dest " if {\[info exists lr1_table(\$save_state,trans)\] && \[llength \$lr1_table(\$save_state,trans)\] >= 1} { foreach trans \$lr1_table(\$save_state,trans) { foreach {tok_id nextstate} \$trans { - set ss \$token_id_table(\$tok_id) - set ss \[string trimright \$ss {_}\] - if {\[string is upper \$ss\]} { + set ss \$token_id_table(\$tok_id,title) + if {\$ss != {}} { append rr \"\$ss, \" } } @@ -1076,7 +1090,7 @@ proc write_header_file {} { # @param prec_dir direction of precedence, either <var>left</var>, # <var>right</var>, or <var>nonassoc</var> # @return id value for this token -proc add_token {token_name type implicit prec_level prec_dir} { +proc add_token {token_name type implicit prec_level prec_dir {token_title {}}} { if {$token_name == "\$"} { taccle_error "The token '$' is reserved and may not be used in productions." $::SYNTAX_ERROR } @@ -1108,6 +1122,7 @@ proc add_token {token_name type implicit prec_level prec_dir} { } set ::token_table($token_name,t) $type set ::token_id_table($id) $token_name + set ::token_id_table($id,title) $token_title set ::token_id_table($id,t) $type set ::token_id_table($id,line) $::line_count lappend ::token_list $id |