Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch tkt-4a4e443ce9-pt-oo-fail Excluding Merge-Ins
This is equivalent to a diff from d29f257cb9 to 2a77eead81
2015-06-10
| ||
17:47 | pt::rde(::oo) - Merging work on engine debugging (narrative) back, making it visible/official. check-in: 310ee6d508 user: aku tags: trunk | |
17:45 | Updated to trunk. Closed-Leaf check-in: 2a77eead81 user: aku tags: tkt-4a4e443ce9-pt-oo-fail | |
17:44 | pt::rde(::oo) - Fixed copyright years. Fixed version mismatch in the C code. Removed irrelevant requirement. Work on the narrative and internals complete. check-in: fd7bcc6781 user: aku tags: tkt-4a4e443ce9-pt-oo-fail | |
2015-06-09
| ||
01:21 | Normalizing the API for zipfile::mkzip to the version checked into ODIE (Which also follows the design pattern laid down by zipfile::decode and zipfile::encode) check-in: d29f257cb9 user: hypnotoad tags: trunk | |
2015-06-08
| ||
20:30 | multiplexer - Ticket [ced089d5fe]. Merged testsuite fix. Thanks Aspect. check-in: debee3c876 user: aku tags: trunk | |
Changes to modules/pt/pkgIndex.tcl.
︙ | ︙ | |||
47 48 49 50 51 52 53 | package ifneeded pt::peg::to::tclparam 1.0.3 [list source [file join $dir pt_peg_to_tclparam.tcl]] # Import core functionality: Conversion from a specific format to PEG. package ifneeded pt::peg::from::json 1 [list source [file join $dir pt_peg_from_json.tcl]] package ifneeded pt::peg::from::peg 1.0.3 [list source [file join $dir pt_peg_from_peg.tcl]] # PARAM runtime. | | | | 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 | package ifneeded pt::peg::to::tclparam 1.0.3 [list source [file join $dir pt_peg_to_tclparam.tcl]] # Import core functionality: Conversion from a specific format to PEG. package ifneeded pt::peg::from::json 1 [list source [file join $dir pt_peg_from_json.tcl]] package ifneeded pt::peg::from::peg 1.0.3 [list source [file join $dir pt_peg_from_peg.tcl]] # PARAM runtime. package ifneeded pt::rde 1.1 [list source [file join $dir pt_rdengine.tcl]] package ifneeded pt::rde::oo 1.1 [list source [file join $dir pt_rdengine_oo.tcl]] # PEG grammar specification, as CONTAINER package ifneeded pt::peg::container::peg 1 [list source [file join $dir pt_peg_container_peg.tcl]] # */PARAM support (canned configurations). package ifneeded pt::cparam::configuration::critcl 1.0.2 [list source [file join $dir pt_cparam_config_critcl.tcl]] package ifneeded pt::cparam::configuration::tea 0.1 [list source [file join $dir pt_cparam_config_tea.tcl]] |
︙ | ︙ |
Changes to modules/pt/pt_rdengine.man.
|
| | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 | [vset VERSION 1.1] [comment {-*- text -*- doctools manpage}] [manpage_begin pt::rde n [vset VERSION]] [include include/module.inc] [titledesc {Parsing Runtime Support, PARAM based}] [require pt::rde [opt [vset VERSION]]] [require snit] [require struct::stack 1.5] [require pt::ast 1.1] [description] [include include/ref_intro.inc] This package provides a class whose instances provide the runtime support for recursive descent parsers with backtracking, as is needed for the execution of, for example, parsing expression grammars. It |
︙ | ︙ |
Changes to modules/pt/pt_rdengine.tcl.
1 2 | # -*- tcl -*- # | | | 1 2 3 4 5 6 7 8 9 10 | # -*- tcl -*- # # Copyright (c) 2009-2015 by Andreas Kupries <[email protected]> # # ## ### ##### ######## ############# ##################### ## Package description ## Implementation of the PackRat Machine (PARAM), a virtual machine on ## top of which parsers for Parsing Expression Grammars (PEGs) can be ## realized. This implementation is tied to Tcl for control flow. We |
︙ | ︙ | |||
19 20 21 22 23 24 25 | # @mdgen EXCLUDE: pt_rdengine_c.tcl package require Tcl 8.5 namespace eval ::pt::rde {} # # ## ### ##### ######## ############# ##################### | > > > > > > > | > > > > > > > > > > > > | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 | # @mdgen EXCLUDE: pt_rdengine_c.tcl package require Tcl 8.5 namespace eval ::pt::rde {} # # ## ### ##### ######## ############# ##################### ## Support narrative tracing. package require debug debug level pt/rdengine debug prefix pt/rdengine {} # # ## ### ##### ######## ############# ##################### ## Management of RDengine implementations. # ::pt::rde::LoadAccelerator -- # # Loads a named implementation, if possible. # # Arguments: # key Name of the implementation to load. # # Results: # A boolean flag. True if the implementation # was successfully loaded; and False otherwise. proc ::pt::rde::LoadAccelerator {key} { debug.pt/rdengine {[info level 0]} variable accel set r 0 switch -exact -- $key { critcl { if {![package vsatisfies [package provide Tcl] 8.5]} {return 0} if {[catch {package require tcllibc}]} {return 0} set r [llength [info commands ::pt::rde_critcl]] } tcl { variable selfdir source [file join $selfdir pt_rdengine_tcl.tcl] set r 1 } default { return -code error "invalid accelerator/impl. package $key:\ must be one of [join [KnownImplementations] {, }]" } } set accel($key) $r debug.pt/rdengine {[info level 0] ==> ($r)} return $r } # ::pt::rde::SwitchTo -- # # Activates a loaded named implementation. # # Arguments: # key Name of the implementation to activate. # # Results: # None. proc ::pt::rde::SwitchTo {key} { debug.pt/rdengine {[info level 0]} variable accel variable loaded if {$key eq $loaded} { # No change, nothing to do. debug.pt/rdengine {[info level 0] == $loaded /no change} return } elseif {$key ne {}} { # Validate the target implementation of the switch. debug.pt/rdengine {[info level 0] validate} if {![info exists accel($key)]} { return -code error "Unable to activate unknown implementation \"$key\"" } elseif {![info exists accel($key)] || !$accel($key)} { return -code error "Unable to activate missing implementation \"$key\"" } } # Deactivate the previous implementation, if there was any. if {$loaded ne {}} { debug.pt/rdengine {[info level 0] disable $loaded} rename ::pt::rde ::pt::rde_$loaded } # Activate the new implementation, if there is any. if {$key ne {}} { debug.pt/rdengine {[info level 0] enable $key} rename ::pt::rde_$key ::pt::rde } # Remember the active implementation, for deactivation by future # switches. set loaded $key debug.pt/rdengine {[info level 0] /done} return } # ::pt::rde::Implementations -- # # Determines which implementations are # present, i.e. loaded. # # Arguments: # None. # # Results: # A list of implementation keys. proc ::pt::rde::Implementations {} { debug.pt/rdengine {[info level 0]} variable accel set res {} foreach n [array names accel] { if {!$accel($n)} continue lappend res $n } debug.pt/rdengine {[info level 0] ==> ($res)} return $res } # ::pt::rde::KnownImplementations -- # # Determines which implementations are known # as possible implementations. # # Arguments: # None. # # Results: # A list of implementation keys. In the order # of preference, most prefered first. proc ::pt::rde::KnownImplementations {} { debug.pt/rdengine {[info level 0]} return {critcl tcl} } proc ::pt::rde::Names {} { debug.pt/rdengine {[info level 0]} return { critcl {tcllibc based} tcl {pure Tcl} } } # # ## ### ##### ######## ############# ##################### |
︙ | ︙ | |||
180 181 182 183 184 185 186 | ## Ready namespace eval ::pt { # Export the constructor command. namespace export rde } | | | 199 200 201 202 203 204 205 206 | ## Ready namespace eval ::pt { # Export the constructor command. namespace export rde } package provide pt::rde 1.1 |
Changes to modules/pt/pt_rdengine_c.tcl.
1 2 | # -*- tcl -*- # | | | 1 2 3 4 5 6 7 8 9 10 | # -*- tcl -*- # # Copyright (c) 2009-2015 by Andreas Kupries <[email protected]> # # ## ### ##### ######## ############# ##################### ## Package description ## Implementation of the PackRat Machine (PARAM), a virtual machine on ## top of which parsers for Parsing Expression Grammars (PEGs) can be ## realized. This implementation is written in C, for parsers written in |
︙ | ︙ | |||
160 161 162 163 164 165 166 | return TCL_OK; } } # # ## ### ##### ######## ############# ##################### ## Ready | | | 160 161 162 163 164 165 166 167 168 | return TCL_OK; } } # # ## ### ##### ######## ############# ##################### ## Ready package provide pt::rde::critcl 1.3.3 return |
Changes to modules/pt/pt_rdengine_oo.tcl.
1 2 | # -*- tcl -*- # | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | | | > > > < | | < < > > > > | | > > > > > > | > > | > > | | | | | | | | > > > | > > | > > | > > > > > | > > > | > > > | > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 | # -*- tcl -*- # # Copyright (c) 2009-2015 by Andreas Kupries <[email protected]> # # ## ### ##### ######## ############# ##################### ## Package description ## Implementation of the PackRat Machine (PARAM), a virtual machine on ## top of which parsers for Parsing Expression Grammars (PEGs) can be ## realized. This implementation is tied to Tcl for control flow. We ## (will) have alternate implementations written in TclOO, and critcl, ## all exporting the same API. # ## RD stands for Recursive Descent. # # ## ### ##### ######## ############# ##################### ## Requisites package require Tcl 8.5 package require TclOO package require struct::stack 1.5 ; # Requiring peekr, getr, get, trim* methods package require pt::ast package require pt::pe # # ## ### ##### ######## ############# ##################### ## Support narrative tracing. package require debug debug level pt/rdengine debug prefix pt/rdengine {} # # ## ### ##### ######## ############# ##################### ## Implementation oo::class create ::pt::rde::oo { # # ## ### ##### ######## ############# ##################### ## Instruction counter for tracing. Unused else. Plus other helpers. method TraceInitialization {} { # Creation of the tracing support procedures. # Conditional on debug tag "pt/rdengine". # The instance namespace is the current context. # This is where the procedures go. proc Instruction {label {a {}} {b {}}} { upvar 1 mytracecounter mytracecounter myok myok myloc myloc mycurrent mycurrent mysvalue mysvalue myerror myerror __inst theinst set theinst [list $label $a $b] return "[uplevel 1 self] <<[format %08d [incr mytracecounter]]>> START I:[format %-30s $label] [format %-10s $a] [format %-10s $b] :: [State]" } proc InstReturn {} { upvar 1 mytracecounter mytracecounter myok myok myloc myloc mycurrent mycurrent mysvalue mysvalue myerror myerror __inst theinst lassign $theinst label a b return "[uplevel 1 self] <<[format %08d $mytracecounter]>> END__ I:[format %-30s $label] [format %-10s $a] [format %-10s $b] :: [State]" } proc State {} { upvar 1 myok myok myloc myloc mycurrent mycurrent mysvalue mysvalue myerror myerror set sv [expr {[info exists mysvalue] ? $mysvalue : ""}] return "ST $myok CL $myloc CC ($mycurrent) SV ($sv) ER ($myerror)" } proc TraceSetupStacks {} { set selfns [namespace current] # Move stack instances aside. rename ${selfns}::LOC ${selfns}::LOC__ rename ${selfns}::ERR ${selfns}::ERR__ rename ${selfns}::AST ${selfns}::AST__ rename ${selfns}::MARK ${selfns}::MRK__ # Create procedures doing tracing, and forwarding to # the renamed actual instances. interp alias {} ${selfns}::LOC {} ${selfns}::WRAP LS LOC__ interp alias {} ${selfns}::ERR {} ${selfns}::WRAP ES ERR__ interp alias {} ${selfns}::AST {} ${selfns}::WRAP ARS AST__ interp alias {} ${selfns}::MARK {} ${selfns}::WRAP ASM MRK__ proc WRAP {label stack args} { debug.pt/rdengine { $label ___ $args} set res [$stack {*}$args] # Show state state after the op set n [$stack size] if {!$n} { set c {()} } elseif {$n == 1} { set c <<[$stack peek $n]>> } else { set c <<[join [$stack peek $n] {>> <<}]>> } debug.pt/rdengine { $label == ($n):$c} # And op return debug.pt/rdengine { $label ==> ($res)} return $res } return } return } # # ## ### ##### ######## ############# ##################### ## API - Lifecycle constructor {} { debug.pt/rdengine {[my TraceInitialization][self] constructor} #set selfns [self namespace] set mystackloc [struct::stack LOC] ; # LS set mystackerr [struct::stack ERR] ; # ES set mystackast [struct::stack AST] ; # ARS/AS set mystackmark [struct::stack MARK] ; # s.a. debug.pt/rdengine {[TraceSetupStacks][self] constructor /done} my reset {} return } method reset {chan} { debug.pt/rdengine {[self] reset ($chan)} set mychan $chan ; # IN set mycurrent {} ; # CC set myloc -1 ; # CL set myok 0 ; # ST set msvalue {} ; # SV set myerror {} ; # ER set mytoken {} ; # TC (string) array unset mysymbol * ; # NC $mystackloc clear $mystackerr clear $mystackast clear $mystackmark clear debug.pt/rdengine {[self] reset /done} return } method complete {} { debug.pt/rdengine {[self] complete [State]} if {$myok} { set n [$mystackast size] debug.pt/rdengine {[self] complete ast $n} if {$n > 1} { # Multiple ASTs left, reduce into single containing them. set pos [$mystackloc peek] incr pos set children [$mystackast peekr [$mystackast size]] ; # SaveToMark set ast [pt::ast new {} $pos $myloc {*}$children] ; # Reduce ALL debug.pt/rdengine {[self] complete n ==> ($ast)} return $ast } elseif {$n == 0} { # Match, but no AST. This is possible if the grammar # consists of only the start expression. debug.pt/rdengine {[self] complete 0 ==> ()} return {} } else { # Match, with AST. set ast [$mystackast peek] debug.pt/rdengine {[self] complete 1 ==> ($ast)} return $ast } } else { lassign $myerror loc messages return -code error \ -errorcode {PT RDE SYNTAX} \ [list pt::rde $loc $messages] } } # # ## ### ##### ######## ############# ##################### ## API - State accessors method chan {} { debug.pt/rdengine {[self] chan} ; return $mychan } # - - -- --- ----- -------- method current {} { debug.pt/rdengine {[self] current} ; return $mycurrent } method location {} { debug.pt/rdengine {[self] location} ; return $myloc } method lmarked {} { debug.pt/rdengine {[self] lmarked} ; return [$mystackloc getr] } # - - -- --- ----- -------- method ok {} { debug.pt/rdengine {[self] ok} ; return $myok } method value {} { debug.pt/rdengine {[self] value} ; return $mysvalue } method error {} { debug.pt/rdengine {[self] error} ; return $myerror } method emarked {} { debug.pt/rdengine {[self] emarked} ; return [$mystackerr getr] } # - - -- --- ----- -------- method tokens {{from {}} {to {}}} { debug.pt/rdengine {[self] tokens ($from) ($to)} switch -exact [llength [info level 0]] { 4 { return $mytoken } 5 { return [string range $mytoken $from $from] } 6 { return [string range $mytoken $from $to] } } } method symbols {} { debug.pt/rdengine {[self] symbols} return [array get mysymbol] } method scached {} { debug.pt/rdengine {[self] scached} return [array names mysymbol] } # - - -- --- ----- -------- method asts {} { debug.pt/rdengine {[self] asts} ; return [$mystackast getr] } method amarked {} { debug.pt/rdengine {[self] amarked} ; return [$mystackmark getr] } method ast {} { debug.pt/rdengine {[self] ast} ; return [$mystackast peek] } # # ## ### ##### ######## ############# ##################### ## API - Preloading the token cache. method data {string} { debug.pt/rdengine {[self] data +[string length $string]} append mytoken $string return } # # ## ### ##### ######## ############# ##################### ## Common instruction sequences method si:void_state_push {} { debug.pt/rdengine {[Instruction si:void_state_push]} # i_loc_push # i_error_clear_push $mystackloc push $myloc set myerror {} $mystackerr push {} debug.pt/rdengine {[InstReturn]} return } method si:void2_state_push {} { debug.pt/rdengine {[Instruction si:void2_state_push]} # i_loc_push # i_error_push $mystackloc push $myloc $mystackerr push {} debug.pt/rdengine {[InstReturn]} return } method si:value_state_push {} { debug.pt/rdengine {[Instruction si:value_state_push]} # i_ast_push # i_loc_push # i_error_clear_push $mystackmark push [$mystackast size] $mystackloc push $myloc set myerror {} $mystackerr push {} debug.pt/rdengine {[InstReturn]} return } # - -- --- ----- -------- ------------- --------------------- method si:void_state_merge {} { debug.pt/rdengine {[Instruction si:void_state_merge]} # i_error_pop_merge # i_loc_pop_rewind/discard set olderror [$mystackerr pop] # We have either old or new error data, keep it. if {![llength $myerror]} { set myerror $olderror |
︙ | ︙ | |||
180 181 182 183 184 185 186 | } elseif {$loe == $lon} { # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } set last [$mystackloc pop] | | | > > > | 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 | } elseif {$loe == $lon} { # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } set last [$mystackloc pop] if {!$myok} { set myloc $last } debug.pt/rdengine {[InstReturn]} return } method si:void_state_merge_ok {} { debug.pt/rdengine {[Instruction si:void_state_merge_ok]} # i_error_pop_merge # i_loc_pop_rewind/discard # i_status_ok set olderror [$mystackerr pop] # We have either old or new error data, keep it. if {![llength $myerror]} { |
︙ | ︙ | |||
210 211 212 213 214 215 216 | } elseif {$loe == $lon} { # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } set last [$mystackloc pop] | | | | > > > > | 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 | } elseif {$loe == $lon} { # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } set last [$mystackloc pop] if {!$myok} { set myloc $last set myok 1 } debug.pt/rdengine {[InstReturn]} return } method si:value_state_merge {} { debug.pt/rdengine {[Instruction si:value_state_merge]} # i_error_pop_merge # i_ast_pop_rewind/discard # i_loc_pop_rewind/discard set olderror [$mystackerr pop] # We have either old or new error data, keep it. if {![llength $myerror]} { |
︙ | ︙ | |||
242 243 244 245 246 247 248 | # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } set mark [$mystackmark pop] set last [$mystackloc pop] | | | | > > > > > > > > > > > > > | > > > > > | 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 | # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } set mark [$mystackmark pop] set last [$mystackloc pop] if {!$myok} { $mystackast trim* $mark set myloc $last } debug.pt/rdengine {[InstReturn]} return } # - -- --- ----- -------- ------------- --------------------- method si:value_notahead_start {} { debug.pt/rdengine {[Instruction si:value_notahead_start]} # i_loc_push # i_ast_push $mystackloc push $myloc $mystackmark push [$mystackast size] debug.pt/rdengine {[InstReturn]} return } method si:void_notahead_exit {} { debug.pt/rdengine {[Instruction si:void_notahead_exit]} # i_loc_pop_rewind # i_status_negate set myloc [$mystackloc pop] set myok [expr {!$myok}] debug.pt/rdengine {[InstReturn]} return } method si:value_notahead_exit {} { debug.pt/rdengine {[Instruction si:value_notahead_exit]} # i_ast_pop_discard/rewind # i_loc_pop_rewind # i_status_negate set mark [$mystackmark pop] if {$myok} { $mystackast trim* $mark } set myloc [$mystackloc pop] set myok [expr {!$myok}] debug.pt/rdengine {[InstReturn]} return } # - -- --- ----- -------- ------------- --------------------- method si:kleene_abort {} { debug.pt/rdengine {[Instruction si:kleene_abort]} # i_loc_pop_rewind/discard # i:fail_return set last [$mystackloc pop] if {$myok} { debug.pt/rdengine {[InstReturn]} return } set myloc $last debug.pt/rdengine {[InstReturn]} return -code return } method si:kleene_close {} { debug.pt/rdengine {[Instruction si:kleene_close]} # i_error_pop_merge # i_loc_pop_rewind/discard # i:fail_status_ok # i:fail_return set olderror [$mystackerr pop] # We have either old or new error data, keep it. |
︙ | ︙ | |||
320 321 322 323 324 325 326 | } elseif {$loe == $lon} { # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } set last [$mystackloc pop] | | > > > > > > | 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 | } elseif {$loe == $lon} { # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } set last [$mystackloc pop] if {$myok} { debug.pt/rdengine {[InstReturn]} return } set myok 1 set myloc $last debug.pt/rdengine {[InstReturn]} return -code return } # - -- --- ----- -------- ------------- --------------------- method si:voidvoid_branch {} { debug.pt/rdengine {[Instruction si:voidvoid_branch]} # i_error_pop_merge # i:ok_loc_pop_discard # i:ok_return # i_loc_rewind # i_error_push set olderror [$mystackerr pop] |
︙ | ︙ | |||
356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 | # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } if {$myok} { $mystackloc pop return -code return } set myloc [$mystackloc peek] $mystackerr push $myerror return } method si:voidvalue_branch {} { # i_error_pop_merge # i:ok_loc_pop_discard # i:ok_return # i_ast_push # i_loc_rewind # i_error_push | > > > > | 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 | # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } if {$myok} { $mystackloc pop debug.pt/rdengine {[InstReturn]} return -code return } set myloc [$mystackloc peek] $mystackerr push $myerror debug.pt/rdengine {[InstReturn]} return } method si:voidvalue_branch {} { debug.pt/rdengine {[Instruction si:voidvalue_branch]} # i_error_pop_merge # i:ok_loc_pop_discard # i:ok_return # i_ast_push # i_loc_rewind # i_error_push |
︙ | ︙ | |||
392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 | # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } if {$myok} { $mystackloc pop return -code return } $mystackmark push [$mystackast size] set myloc [$mystackloc peek] $mystackerr push {} return } method si:valuevoid_branch {} { # i_error_pop_merge # i_ast_pop_rewind/discard # i:ok_loc_pop_discard # i:ok_return # i_loc_rewind # i_error_push | > > > > | 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 | # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } if {$myok} { $mystackloc pop debug.pt/rdengine {[InstReturn]} return -code return } $mystackmark push [$mystackast size] set myloc [$mystackloc peek] $mystackerr push {} debug.pt/rdengine {[InstReturn]} return } method si:valuevoid_branch {} { debug.pt/rdengine {[Instruction si:valuevoid_branch]} # i_error_pop_merge # i_ast_pop_rewind/discard # i:ok_loc_pop_discard # i:ok_return # i_loc_rewind # i_error_push |
︙ | ︙ | |||
429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 | # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } set mark [$mystackmark pop] if {$myok} { $mystackloc pop return -code return } $mystackast trim* $mark set myloc [$mystackloc peek] $mystackerr push {} return } method si:valuevalue_branch {} { # i_error_pop_merge # i_ast_pop_discard # i:ok_loc_pop_discard # i:ok_return # i_ast_rewind # i_loc_rewind # i_error_push | > > > > | 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 | # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } set mark [$mystackmark pop] if {$myok} { $mystackloc pop debug.pt/rdengine {[InstReturn]} return -code return } $mystackast trim* $mark set myloc [$mystackloc peek] $mystackerr push {} debug.pt/rdengine {[InstReturn]} return } method si:valuevalue_branch {} { debug.pt/rdengine {[Instruction si:valuevalue_branch]} # i_error_pop_merge # i_ast_pop_discard # i:ok_loc_pop_discard # i:ok_return # i_ast_rewind # i_loc_rewind # i_error_push |
︙ | ︙ | |||
467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 | # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } if {$myok} { $mystackmark pop $mystackloc pop return -code return } $mystackast trim* [$mystackmark peek] set myloc [$mystackloc peek] $mystackerr push {} return } # - -- --- ----- -------- ------------- --------------------- method si:voidvoid_part {} { # i_error_pop_merge # i:fail_loc_pop_rewind # i:fail_return # i_error_push set olderror [$mystackerr pop] # We have either old or new error data, keep it. | > > > > > | 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 | # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } if {$myok} { $mystackmark pop $mystackloc pop debug.pt/rdengine {[InstReturn]} return -code return } $mystackast trim* [$mystackmark peek] set myloc [$mystackloc peek] $mystackerr push {} debug.pt/rdengine {[InstReturn]} return } # - -- --- ----- -------- ------------- --------------------- method si:voidvoid_part {} { debug.pt/rdengine {[Instruction si:voidvoid_part]} # i_error_pop_merge # i:fail_loc_pop_rewind # i:fail_return # i_error_push set olderror [$mystackerr pop] # We have either old or new error data, keep it. |
︙ | ︙ | |||
503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 | } elseif {$loe == $lon} { # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } if {!$myok} { set myloc [$mystackloc pop] return -code return } $mystackerr push $myerror return } method si:voidvalue_part {} { # i_error_pop_merge # i:fail_loc_pop_rewind # i:fail_return # i_ast_push # i_error_push set olderror [$mystackerr pop] | > > > > | 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 | } elseif {$loe == $lon} { # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } if {!$myok} { set myloc [$mystackloc pop] debug.pt/rdengine {[InstReturn]} return -code return } $mystackerr push $myerror debug.pt/rdengine {[InstReturn]} return } method si:voidvalue_part {} { debug.pt/rdengine {[Instruction si:voidvalue_part]} # i_error_pop_merge # i:fail_loc_pop_rewind # i:fail_return # i_ast_push # i_error_push set olderror [$mystackerr pop] |
︙ | ︙ | |||
536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 | } elseif {$loe == $lon} { # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } if {!$myok} { set myloc [$mystackloc pop] return -code return } $mystackmark push [$mystackast size] $mystackerr push $myerror return } method si:valuevalue_part {} { # i_error_pop_merge # i:fail_ast_pop_rewind # i:fail_loc_pop_rewind # i:fail_return # i_error_push set olderror [$mystackerr pop] | > > > > | 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 | } elseif {$loe == $lon} { # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } if {!$myok} { set myloc [$mystackloc pop] debug.pt/rdengine {[InstReturn]} return -code return } $mystackmark push [$mystackast size] $mystackerr push $myerror debug.pt/rdengine {[InstReturn]} return } method si:valuevalue_part {} { debug.pt/rdengine {[Instruction si:valuevalue_part]} # i_error_pop_merge # i:fail_ast_pop_rewind # i:fail_loc_pop_rewind # i:fail_return # i_error_push set olderror [$mystackerr pop] |
︙ | ︙ | |||
571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 | # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } if {!$myok} { $mystackast trim* [$mystackmark pop] set myloc [$mystackloc pop] return -code return } $mystackerr push $myerror return } # - -- --- ----- -------- ------------- --------------------- method si:next_str {tok} { | > > > > > | | > > > > > > > > > > > > > > > > > > > | > > > | > > > | > > > | > > > | > > > | > > > | > > > | > > > | > > > | > > > | > > > | > > > | > > > | > > > > > > > > > > > > > > > > > > > > | 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 | # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } if {!$myok} { $mystackast trim* [$mystackmark pop] set myloc [$mystackloc pop] debug.pt/rdengine {[InstReturn]} return -code return } $mystackerr push $myerror debug.pt/rdengine {[InstReturn]} return } # - -- --- ----- -------- ------------- --------------------- method si:next_str {tok} { debug.pt/rdengine {[Instruction si:next_str $tok]} # String = sequence of characters. # No need for all the intermediate stack churn. set n [string length $tok] set last [expr {$myloc + $n}] set max [string length $mytoken] incr myloc if {($last >= $max) && ![my ExtendTCN [expr {$last - $max + 1}]]} { set myok 0 set myerror [list $myloc [list [list str $tok]]] # i:fail_return debug.pt/rdengine {[InstReturn]} return } set lex [string range $mytoken $myloc $last] set mycurrent [string index $mytoken $last] # ATTENTION: The error output of this instruction is different # from a regular sequence of si:next_char instructions. The # error location will be the start of the string token we # wanted to match, and the message will contain the entire # string token. In the regular sequence we would see the exact # point of the mismatch instead, with the message containing # the expected character. set myok [expr {$tok eq $lex}] if {$myok} { set myloc $last set myerror {} } else { set myerror [list $myloc [list [list str $tok]]] incr myloc -1 } debug.pt/rdengine {[InstReturn]} return } method si:next_class {tok} { debug.pt/rdengine {[Instruction si:next_class $tok]} # Class = Choice of characters. No need for stack churn. # i_input_next "\{t $c\}" # i:fail_return # i_test_<user class> incr myloc if {($myloc >= [string length $mytoken]) && ![my ExtendTC]} { set myok 0 set myerror [list $myloc [list [list cl $tok]]] # i:fail_return debug.pt/rdengine {[InstReturn]} return } set mycurrent [string index $mytoken $myloc] # Note what is needle versus hay. The token, i.e. the string # of allowed characters is the hay in which the current # character is looked, making it the needle. set myok [expr {[string first $mycurrent $tok] >= 0}] if {$myok} { set myerror {} } else { set myerror [list $myloc [list [list cl $tok]]] incr myloc -1 } debug.pt/rdengine {[InstReturn]} return } method si:next_char {tok} { debug.pt/rdengine {[Instruction si:next_char $tok]} # i_input_next "\{t $c\}" # i:fail_return # i_test_char $c incr myloc if {($myloc >= [string length $mytoken]) && ![my ExtendTC]} { set myok 0 set myerror [list $myloc [list [list t $tok]]] # i:fail_return debug.pt/rdengine {[InstReturn]} return } set mycurrent [string index $mytoken $myloc] set myok [expr {$tok eq $mycurrent}] if {$myok} { set myerror {} } else { set myerror [list $myloc [list [list t $tok]]] incr myloc -1 } debug.pt/rdengine {[InstReturn]} return } method si:next_range {toks toke} { debug.pt/rdengine {[Instruction si:next_range $toks $toke]} #Asm::Ins i_input_next "\{.. $s $e\}" #Asm::Ins i:fail_return #Asm::Ins i_test_range $s $e incr myloc if {($myloc >= [string length $mytoken]) && ![my ExtendTC]} { set myok 0 set myerror [list $myloc [list [list .. $toks $toke]]] # i:fail_return debug.pt/rdengine {[InstReturn]} return } set mycurrent [string index $mytoken $myloc] set myok [expr { ([string compare $toks $mycurrent] <= 0) && ([string compare $mycurrent $toke] <= 0) }] ; # {} if {$myok} { set myerror {} } else { set myerror [list $myloc [list [pt::pe range $toks $toke]]] incr myloc -1 } debug.pt/rdengine {[InstReturn]} return } # - -- --- ----- -------- ------------- --------------------- method si:next_alnum {} { debug.pt/rdengine {[Instruction si:next_alnum]} #Asm::Ins i_input_next alnum #Asm::Ins i:fail_return #Asm::Ins i_test_alnum incr myloc if {($myloc >= [string length $mytoken]) && ![my ExtendTC]} { set myok 0 set myerror [list $myloc [list alnum]] # i:fail_return debug.pt/rdengine {[InstReturn]} return } set mycurrent [string index $mytoken $myloc] set myok [string is alnum -strict $mycurrent] if {!$myok} { set myerror [list $myloc [list alnum]] incr myloc -1 } else { set myerror {} } debug.pt/rdengine {[InstReturn]} return } method si:next_alpha {} { debug.pt/rdengine {[Instruction si:next_alpha]} #Asm::Ins i_input_next alpha #Asm::Ins i:fail_return #Asm::Ins i_test_alpha incr myloc if {($myloc >= [string length $mytoken]) && ![my ExtendTC]} { set myok 0 set myerror [list $myloc [list alpha]] # i:fail_return debug.pt/rdengine {[InstReturn]} return } set mycurrent [string index $mytoken $myloc] set myok [string is alpha -strict $mycurrent] if {!$myok} { set myerror [list $myloc [list alpha]] incr myloc -1 } else { set myerror {} } debug.pt/rdengine {[InstReturn]} return } method si:next_ascii {} { debug.pt/rdengine {[Instruction si:next_ascii]} #Asm::Ins i_input_next ascii #Asm::Ins i:fail_return #Asm::Ins i_test_ascii incr myloc if {($myloc >= [string length $mytoken]) && ![my ExtendTC]} { set myok 0 set myerror [list $myloc [list ascii]] # i:fail_return debug.pt/rdengine {[InstReturn]} return } set mycurrent [string index $mytoken $myloc] set myok [string is ascii -strict $mycurrent] if {!$myok} { set myerror [list $myloc [list ascii]] incr myloc -1 } else { set myerror {} } debug.pt/rdengine {[InstReturn]} return } method si:next_control {} { debug.pt/rdengine {[Instruction si:next_control]} #Asm::Ins i_input_next control #Asm::Ins i:fail_return #Asm::Ins i_test_control incr myloc if {($myloc >= [string length $mytoken]) && ![my ExtendTC]} { set myok 0 set myerror [list $myloc [list control]] # i:fail_return debug.pt/rdengine {[InstReturn]} return } set mycurrent [string index $mytoken $myloc] set myok [string is control -strict $mycurrent] if {!$myok} { set myerror [list $myloc [list control]] incr myloc -1 } else { set myerror {} } debug.pt/rdengine {[InstReturn]} return } method si:next_ddigit {} { debug.pt/rdengine {[Instruction si:next_ddigit]} #Asm::Ins i_input_next ddigit #Asm::Ins i:fail_return #Asm::Ins i_test_ddigit incr myloc if {($myloc >= [string length $mytoken]) && ![my ExtendTC]} { set myok 0 set myerror [list $myloc [list ddigit]] # i:fail_return debug.pt/rdengine {[InstReturn]} return } set mycurrent [string index $mytoken $myloc] set myok [string match {[0-9]} $mycurrent] if {!$myok} { set myerror [list $myloc [list ddigit]] incr myloc -1 } else { set myerror {} } debug.pt/rdengine {[InstReturn]} return } method si:next_digit {} { debug.pt/rdengine {[Instruction si:next_digit]} #Asm::Ins i_input_next digit #Asm::Ins i:fail_return #Asm::Ins i_test_digit incr myloc if {($myloc >= [string length $mytoken]) && ![my ExtendTC]} { set myok 0 set myerror [list $myloc [list digit]] # i:fail_return debug.pt/rdengine {[InstReturn]} return } set mycurrent [string index $mytoken $myloc] set myok [string is digit -strict $mycurrent] if {!$myok} { set myerror [list $myloc [list digit]] incr myloc -1 } else { set myerror {} } debug.pt/rdengine {[InstReturn]} return } method si:next_graph {} { debug.pt/rdengine {[Instruction si:next_graph]} #Asm::Ins i_input_next graph #Asm::Ins i:fail_return #Asm::Ins i_test_graph incr myloc if {($myloc >= [string length $mytoken]) && ![my ExtendTC]} { set myok 0 set myerror [list $myloc [list graph]] # i:fail_return debug.pt/rdengine {[InstReturn]} return } set mycurrent [string index $mytoken $myloc] set myok [string is graph -strict $mycurrent] if {!$myok} { set myerror [list $myloc [list graph]] incr myloc -1 } else { set myerror {} } debug.pt/rdengine {[InstReturn]} return } method si:next_lower {} { debug.pt/rdengine {[Instruction si:next_lower]} #Asm::Ins i_input_next lower #Asm::Ins i:fail_return #Asm::Ins i_test_lower incr myloc if {($myloc >= [string length $mytoken]) && ![my ExtendTC]} { set myok 0 set myerror [list $myloc [list lower]] # i:fail_return debug.pt/rdengine {[InstReturn]} return } set mycurrent [string index $mytoken $myloc] set myok [string is lower -strict $mycurrent] if {!$myok} { set myerror [list $myloc [list lower]] incr myloc -1 } else { set myerror {} } debug.pt/rdengine {[InstReturn]} return } method si:next_print {} { debug.pt/rdengine {[Instruction si:next_print]} #Asm::Ins i_input_next print #Asm::Ins i:fail_return #Asm::Ins i_test_print incr myloc if {($myloc >= [string length $mytoken]) && ![my ExtendTC]} { set myok 0 set myerror [list $myloc [list print]] # i:fail_return debug.pt/rdengine {[InstReturn]} return } set mycurrent [string index $mytoken $myloc] set myok [string is print -strict $mycurrent] if {!$myok} { set myerror [list $myloc [list print]] incr myloc -1 } else { set myerror {} } debug.pt/rdengine {[InstReturn]} return } method si:next_punct {} { debug.pt/rdengine {[Instruction si:next_punct]} #Asm::Ins i_input_next punct #Asm::Ins i:fail_return #Asm::Ins i_test_punct incr myloc if {($myloc >= [string length $mytoken]) && ![my ExtendTC]} { set myok 0 set myerror [list $myloc [list punct]] # i:fail_return debug.pt/rdengine {[InstReturn]} return } set mycurrent [string index $mytoken $myloc] set myok [string is punct -strict $mycurrent] if {!$myok} { set myerror [list $myloc [list punct]] incr myloc -1 } else { set myerror {} } debug.pt/rdengine {[InstReturn]} return } method si:next_space {} { debug.pt/rdengine {[Instruction si:next_space]} #Asm::Ins i_input_next space #Asm::Ins i:fail_return #Asm::Ins i_test_space incr myloc if {($myloc >= [string length $mytoken]) && ![my ExtendTC]} { set myok 0 set myerror [list $myloc [list space]] # i:fail_return debug.pt/rdengine {[InstReturn]} return } set mycurrent [string index $mytoken $myloc] set myok [string is space -strict $mycurrent] if {!$myok} { set myerror [list $myloc [list space]] incr myloc -1 } else { set myerror {} } debug.pt/rdengine {[InstReturn]} return } method si:next_upper {} { debug.pt/rdengine {[Instruction si:next_upper]} #Asm::Ins i_input_next upper #Asm::Ins i:fail_return #Asm::Ins i_test_upper incr myloc if {($myloc >= [string length $mytoken]) && ![my ExtendTC]} { set myok 0 set myerror [list $myloc [list upper]] # i:fail_return debug.pt/rdengine {[InstReturn]} return } set mycurrent [string index $mytoken $myloc] set myok [string is upper -strict $mycurrent] if {!$myok} { set myerror [list $myloc [list upper]] incr myloc -1 } else { set myerror {} } debug.pt/rdengine {[InstReturn]} return } method si:next_wordchar {} { debug.pt/rdengine {[Instruction si:next_wordchar]} #Asm::Ins i_input_next wordchar #Asm::Ins i:fail_return #Asm::Ins i_test_wordchar incr myloc if {($myloc >= [string length $mytoken]) && ![my ExtendTC]} { set myok 0 set myerror [list $myloc [list wordchar]] # i:fail_return debug.pt/rdengine {[InstReturn]} return } set mycurrent [string index $mytoken $myloc] set myok [string is wordchar -strict $mycurrent] if {!$myok} { set myerror [list $myloc [list wordchar]] incr myloc -1 } else { set myerror {} } debug.pt/rdengine {[InstReturn]} return } method si:next_xdigit {} { debug.pt/rdengine {[Instruction si:next_xdigit]} #Asm::Ins i_input_next xdigit #Asm::Ins i:fail_return #Asm::Ins i_test_xdigit incr myloc if {($myloc >= [string length $mytoken]) && ![my ExtendTC]} { set myok 0 set myerror [list $myloc [list xdigit]] # i:fail_return debug.pt/rdengine {[InstReturn]} return } set mycurrent [string index $mytoken $myloc] set myok [string is xdigit -strict $mycurrent] if {!$myok} { set myerror [list $myloc [list xdigit]] incr myloc -1 } else { set myerror {} } debug.pt/rdengine {[InstReturn]} return } # - -- --- ----- -------- ------------- --------------------- method si:value_symbol_start {symbol} { debug.pt/rdengine {[Instruction si:value_symbol_start $symbol]} # if @runtime@ i_symbol_restore $symbol # i:found:ok_ast_value_push # i:found_return # i_loc_push # i_ast_push set k [list $myloc $symbol] if {[info exists mysymbol($k)]} { lassign $mysymbol($k) myloc myok myerror mysvalue if {$myok} { $mystackast push $mysvalue } debug.pt/rdengine {[InstReturn]} return -code return } $mystackloc push $myloc $mystackmark push [$mystackast size] debug.pt/rdengine {[InstReturn]} return } method si:value_void_symbol_start {symbol} { debug.pt/rdengine {[Instruction si:value_void_symbol_start $symbol]} # if @runtime@ i_symbol_restore $symbol # i:found_return # i_loc_push # i_ast_push set k [list $myloc $symbol] if {[info exists mysymbol($k)]} { lassign $mysymbol($k) myloc myok myerror mysvalue debug.pt/rdengine {[InstReturn]} return -code return } $mystackloc push $myloc $mystackmark push [$mystackast size] debug.pt/rdengine {[InstReturn]} return } method si:void_symbol_start {symbol} { debug.pt/rdengine {[Instruction si:void_symbol_start $symbol]} # if @runtime@ i_symbol_restore $symbol # i:found:ok_ast_value_push # i:found_return # i_loc_push set k [list $myloc $symbol] if {[info exists mysymbol($k)]} { lassign $mysymbol($k) myloc myok myerror mysvalue if {$myok} { $mystackast push $mysvalue } debug.pt/rdengine {[InstReturn]} return -code return } $mystackloc push $myloc debug.pt/rdengine {[InstReturn]} return } method si:void_void_symbol_start {symbol} { debug.pt/rdengine {[Instruction si:void_void_symbol_start $symbol]} # if @runtime@ i_symbol_restore $symbol # i:found_return # i_loc_push set k [list $myloc $symbol] if {[info exists mysymbol($k)]} { lassign $mysymbol($k) myloc myok myerror mysvalue debug.pt/rdengine {[InstReturn]} return -code return } $mystackloc push $myloc debug.pt/rdengine {[InstReturn]} return } method si:reduce_symbol_end {symbol} { debug.pt/rdengine {[Instruction si:reduce_symbol_end $symbol]} # i_value_clear/reduce $symbol # i_symbol_save $symbol # i_error_nonterminal $symbol # i_ast_pop_rewind # i_loc_pop_discard # i:ok_ast_value_push |
︙ | ︙ | |||
1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 | } }} $mystackast trim* [$mystackmark pop] if {$myok} { $mystackast push $mysvalue } return } method si:void_leaf_symbol_end {symbol} { # i_value_clear/leaf $symbol # i_symbol_save $symbol # i_error_nonterminal $symbol # i_loc_pop_discard # i:ok_ast_value_push set mysvalue {} | > > | 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 | } }} $mystackast trim* [$mystackmark pop] if {$myok} { $mystackast push $mysvalue } debug.pt/rdengine {[InstReturn]} return } method si:void_leaf_symbol_end {symbol} { debug.pt/rdengine {[Instruction si:void_leaf_symbol_end $symbol]} # i_value_clear/leaf $symbol # i_symbol_save $symbol # i_error_nonterminal $symbol # i_loc_pop_discard # i:ok_ast_value_push set mysvalue {} |
︙ | ︙ | |||
1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 | set myerror [list $loc [list [list n $symbol]]] } }} if {$myok} { $mystackast push $mysvalue } return } method si:value_leaf_symbol_end {symbol} { # i_value_clear/leaf $symbol # i_symbol_save $symbol # i_error_nonterminal $symbol # i_loc_pop_discard # i_ast_pop_rewind # i:ok_ast_value_push | > > > | 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 | set myerror [list $loc [list [list n $symbol]]] } }} if {$myok} { $mystackast push $mysvalue } debug.pt/rdengine {[InstReturn]} return } method si:value_leaf_symbol_end {symbol} { debug.pt/rdengine {[Instruction si:value_leaf_symbol_end $symbol]} # i_value_clear/leaf $symbol # i_symbol_save $symbol # i_error_nonterminal $symbol # i_loc_pop_discard # i_ast_pop_rewind # i:ok_ast_value_push |
︙ | ︙ | |||
1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 | } }} $mystackast trim* [$mystackmark pop] if {$myok} { $mystackast push $mysvalue } return } method si:value_clear_symbol_end {symbol} { # i_value_clear # i_symbol_save $symbol # i_error_nonterminal $symbol # i_loc_pop_discard # i_ast_pop_rewind set mysvalue {} | > > > | 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 | } }} $mystackast trim* [$mystackmark pop] if {$myok} { $mystackast push $mysvalue } debug.pt/rdengine {[InstReturn]} return } method si:value_clear_symbol_end {symbol} { debug.pt/rdengine {[Instruction si:value_clear_symbol_end $symbol]} # i_value_clear # i_symbol_save $symbol # i_error_nonterminal $symbol # i_loc_pop_discard # i_ast_pop_rewind set mysvalue {} |
︙ | ︙ | |||
1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 | lassign $myerror loc messages if {$loc == $pos} { set myerror [list $loc [list [list n $symbol]]] } }} $mystackast trim* [$mystackmark pop] return } method si:void_clear_symbol_end {symbol} { # i_value_clear # i_symbol_save $symbol # i_error_nonterminal $symbol # i_loc_pop_discard set mysvalue {} set at [$mystackloc pop] set k [list $at $symbol] set mysymbol($k) [list $myloc $myok $myerror $mysvalue] # si:void_clear_symbol_end / i_error_nonterminal -- inlined -- disabled if {0} {if {[llength $myerror]} { set pos $at incr pos lassign $myerror loc messages if {$loc == $pos} { set myerror [list $loc [list [list n $symbol]]] } }} return } # # ## ### ##### ######## ############# ##################### ## API - Instructions - Control flow method i:ok_continue {} { if {!$myok} return return -code continue } method i:fail_continue {} { if {$myok} return return -code continue } method i:fail_return {} { if {$myok} return return -code return } method i:ok_return {} { if {!$myok} return return -code return } # # ## ### ##### ######## ############# ##################### ## API - Instructions - Unconditional matching. method i_status_ok {} { set myok 1 return } method i_status_fail {} { set myok 0 return } method i_status_negate {} { set myok [expr {!$myok}] return } # # ## ### ##### ######## ############# ##################### ## API - Instructions - Error handling. method i_error_clear {} { set myerror {} return } method i_error_push {} { $mystackerr push $myerror return } method i_error_clear_push {} { set myerror {} $mystackerr push {} return } method i_error_pop_merge {} { set olderror [$mystackerr pop] # We have either old or new error data, keep it. | > > > > > > > > > > > > > > > > > > > > | | | | < > > | > > > | > > > | > > > > > > > > > > > | | > > > > > > > > > > > > > > | | > > > > | | > > > > > > > > > | > > > | | > > > > > > > | | > > > > > > | > > > > > > > > > > > > | | | > > > > > > > > | > > > > > | < | | | | | | | | | | | | | > > > > > > > | > > > > > > > < | | < < < < < < < < < < < < < < < < < < < < < > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > | > > > | > > > | > > > | > > > | < | | < < < < < < > | > > > | > > > | > > > | > > < < < < | < | | > < | | 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 | lassign $myerror loc messages if {$loc == $pos} { set myerror [list $loc [list [list n $symbol]]] } }} $mystackast trim* [$mystackmark pop] debug.pt/rdengine {[InstReturn]} return } method si:void_clear_symbol_end {symbol} { debug.pt/rdengine {[Instruction si:void_clear_symbol_end $symbol]} # i_value_clear # i_symbol_save $symbol # i_error_nonterminal $symbol # i_loc_pop_discard set mysvalue {} set at [$mystackloc pop] set k [list $at $symbol] set mysymbol($k) [list $myloc $myok $myerror $mysvalue] # si:void_clear_symbol_end / i_error_nonterminal -- inlined -- disabled if {0} {if {[llength $myerror]} { set pos $at incr pos lassign $myerror loc messages if {$loc == $pos} { set myerror [list $loc [list [list n $symbol]]] } }} debug.pt/rdengine {[InstReturn]} return } # # ## ### ##### ######## ############# ##################### ## API - Instructions - Control flow method i:ok_continue {} { debug.pt/rdengine {[Instruction i:ok_continue]} if {!$myok} return return -code continue } method i:fail_continue {} { debug.pt/rdengine {[Instruction i:fail_continue]} if {$myok} return return -code continue } method i:fail_return {} { debug.pt/rdengine {[Instruction i:fail_return]} if {$myok} return return -code return } method i:ok_return {} { debug.pt/rdengine {[Instruction i:ok_return]} if {!$myok} return return -code return } # # ## ### ##### ######## ############# ##################### ## API - Instructions - Unconditional matching. method i_status_ok {} { debug.pt/rdengine {[Instruction i_status_ok]} set myok 1 debug.pt/rdengine {[InstReturn]} return } method i_status_fail {} { debug.pt/rdengine {[Instruction i_status_fail]} set myok 0 debug.pt/rdengine {[InstReturn]} return } method i_status_negate {} { debug.pt/rdengine {[Instruction i_status_negate]} set myok [expr {!$myok}] debug.pt/rdengine {[InstReturn]} return } # # ## ### ##### ######## ############# ##################### ## API - Instructions - Error handling. method i_error_clear {} { debug.pt/rdengine {[Instruction i_error_clear]} set myerror {} debug.pt/rdengine {[InstReturn]} return } method i_error_push {} { debug.pt/rdengine {[Instruction i_error_push]} $mystackerr push $myerror debug.pt/rdengine {[InstReturn]} return } method i_error_clear_push {} { debug.pt/rdengine {[Instruction i_error_clear_push]} set myerror {} $mystackerr push {} debug.pt/rdengine {[InstReturn]} return } method i_error_pop_merge {} { debug.pt/rdengine {[Instruction i_error_pop_merge]} set olderror [$mystackerr pop] # We have either old or new error data, keep it. if {![llength $myerror]} { set myerror $olderror ; debug.pt/rdengine {[InstReturn]} ; return } if {![llength $olderror]} { debug.pt/rdengine {[InstReturn]} ; return } # If one of the errors is further on in the input choose that as # the information to propagate. lassign $myerror loe msgse lassign $olderror lon msgsn if {$lon > $loe} { set myerror $olderror ; debug.pt/rdengine {[InstReturn]} ; return } if {$loe > $lon} { debug.pt/rdengine {[InstReturn]} ; return } # Equal locations, merge the message lists. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] debug.pt/rdengine {[InstReturn]} return } method i_error_nonterminal {symbol} { debug.pt/rdengine {[Instruction i_error_nonterminal $symbol]} # i_error_nonterminal -- Disabled. Generate only low-level # i_error_nonterminal -- errors until we have worked out how # i_error_nonterminal -- to integrate symbol information with # i_error_nonterminal -- them. Do not forget where this # i_error_nonterminal -- instruction is inlined. return # Inlined: Errors, Expected. if {![llength $myerror]} { debug.pt/rdengine {no error} return } set pos [$mystackloc peek] incr pos lassign $myerror loc messages if {$loc != $pos} { debug.pt/rdengine {my $myerror != pos $pos} return } set myerror [list $loc [list [list n $symbol]]] debug.pt/rdengine {::= ($myerror)} return } # # ## ### ##### ######## ############# ##################### ## API - Instructions - Basic input handling and tracking method i_loc_pop_rewind/discard {} { debug.pt/rdengine {[Instruction i_loc_pop_rewind/discard]} #$myparser i:fail_loc_pop_rewind #$myparser i:ok_loc_pop_discard #return set last [$mystackloc pop] if {!$myok} { set myloc $last } debug.pt/rdengine {[InstReturn]} return } method i_loc_pop_discard {} { debug.pt/rdengine {[Instruction i_loc_pop_discard]} $mystackloc pop debug.pt/rdengine {[InstReturn]} return } # i:ok_loc_pop_discard - all uses inlined method i_loc_pop_rewind {} { debug.pt/rdengine {[Instruction i_loc_pop_rewind]} set myloc [$mystackloc pop] debug.pt/rdengine {[InstReturn]} return } method i:fail_loc_pop_rewind {} { debug.pt/rdengine {[Instruction i:fail_loc_pop_rewind]} if {!$myok} { set myloc [$mystackloc pop] } debug.pt/rdengine {[InstReturn]} return } method i_loc_push {} { debug.pt/rdengine {[Instruction i_loc_push]} $mystackloc push $myloc debug.pt/rdengine {[InstReturn]} return } method i_loc_rewind {} { debug.pt/rdengine {[Instruction i_loc_rewind]} # i_loc_pop_rewind - set myloc [$mystackloc pop] # i_loc_push - $mystackloc push $myloc set myloc [$mystackloc peek] debug.pt/rdengine {[InstReturn]} return } # # ## ### ##### ######## ############# ##################### ## API - Instructions - AST stack handling method i_ast_pop_rewind/discard {} { debug.pt/rdengine {[Instruction i_ast_pop_rewind/discard]} #$myparser i:fail_ast_pop_rewind #$myparser i:ok_ast_pop_discard #return set mark [$mystackmark pop] if {!$myok} { $mystackast trim* $mark } debug.pt/rdengine {[InstReturn]} return } method i_ast_pop_discard/rewind {} { debug.pt/rdengine {[Instruction i_ast_pop_discard/rewind]} #$myparser i:ok_ast_pop_rewind #$myparser i:fail_ast_pop_discard #return set mark [$mystackmark pop] if {$myok} { $mystackast trim* $mark } debug.pt/rdengine {[InstReturn]} return } method i_ast_pop_discard {} { debug.pt/rdengine {[Instruction i_ast_pop_discard]} $mystackmark pop debug.pt/rdengine {[InstReturn]} return } # i:ok_ast_pop_discard - all uses inlined method i_ast_pop_rewind {} { debug.pt/rdengine {[Instruction i_ast_pop_rewind]} $mystackast trim* [$mystackmark pop] debug.pt/rdengine {[InstReturn]} return } method i:fail_ast_pop_rewind {} { debug.pt/rdengine {[Instruction i:fail_ast_pop_rewind]} if {!$myok} { $mystackast trim* [$mystackmark pop] } debug.pt/rdengine {[InstReturn]} return } method i_ast_push {} { debug.pt/rdengine {[Instruction i_ast_push]} $mystackmark push [$mystackast size] debug.pt/rdengine {[InstReturn]} return } method i:ok_ast_value_push {} { debug.pt/rdengine {[Instruction i:ok_ast_value_push]} if {$myok} { $mystackast push $mysvalue } debug.pt/rdengine {[InstReturn]} return } # i_ast_rewind - all uses inlined # # ## ### ##### ######## ############# ##################### ## API - Instructions - Nonterminal cache method i_symbol_restore {symbol} { debug.pt/rdengine {[Instruction i_symbol_restore $symbol]} # Satisfy from cache if possible. set k [list $myloc $symbol] if {![info exists mysymbol($k)]} { debug.pt/rdengine {[InstReturn]} return 0 } lassign $mysymbol($k) myloc myok myerror mysvalue # We go forward, as the nonterminal matches (or not). debug.pt/rdengine {[InstReturn]} return 1 } method i_symbol_save {symbol} { debug.pt/rdengine {[Instruction i_symbol_save $symbol]} # Store not only the value, but also how far # the match went (if it was a match). set at [$mystackloc peek] set k [list $at $symbol] set mysymbol($k) [list $myloc $myok $myerror $mysvalue] debug.pt/rdengine {[InstReturn]} return } # # ## ### ##### ######## ############# ##################### ## API - Instructions - Semantic values. method i_value_clear {} { debug.pt/rdengine {[Instruction i_value_clear]} set mysvalue {} debug.pt/rdengine {[InstReturn]} return } method i_value_clear/leaf {symbol} { debug.pt/rdengine {[Instruction i_value_clear/leaf $symbol] :: ([expr {[$mystackloc peek]+1}])-@$myloc)} # not quite value_lead (guarded, and clear on fail) # Inlined clear, reduce, and optimized. # Clear ; if {$ok} {Reduce $symbol} set mysvalue {} if {$myok} { set pos [$mystackloc peek] incr pos if {($pos - 1) == $myloc} { # The symbol did not process any input. As this is # signaled to be ok (*) we create a node covering an # empty range. (Ad *): Can happen for a RHS using # toplevel operators * or ?. set mysvalue [pt::ast new0 $symbol $pos] } else { set mysvalue [pt::ast new $symbol $pos $myloc] } } debug.pt/rdengine {[InstReturn]} return } method i_value_clear/reduce {symbol} { debug.pt/rdengine {[Instruction i_value_clear/reduce $symbol]} set mysvalue {} if {$myok} { set mark [$mystackmark peek];# Old size of stack before current nt pushed more. set newa [expr {[$mystackast size] - $mark}] set pos [$mystackloc peek] incr pos if {!$newa} { set mysvalue {} } elseif {$newa == 1} { # peek 1 => single element comes back set mysvalue [list [$mystackast peek]] ; # SaveToMark } else { # peek n > 1 => list of elements comes back set mysvalue [$mystackast peekr $newa] ; # SaveToMark } if {($pos - 1) == $myloc} { # The symbol did not process any input. As this is # signaled to be ok (*) we create a node covering an # empty range. (Ad *): Can happen for a RHS using # toplevel operators * or ?. set mysvalue [pt::ast new0 $symbol $pos {*}$mysvalue] } else { set mysvalue [pt::ast new $symbol $pos $myloc {*}$mysvalue] ; # Reduce $symbol } } debug.pt/rdengine {[InstReturn]} return } # # ## ### ##### ######## ############# ##################### ## API - Instructions - Terminal matching method i_input_next {msg} { debug.pt/rdengine {[Instruction i_input_next $msg]} # Inlined: Getch, Expected, ClearErrors # Satisfy from input cache if possible. incr myloc # May read from the input (ExtendTC), and remember the # information. Note: We are implicitly incrementing the # location! if {($myloc >= [string length $mytoken]) && ![my ExtendTC]} { set myok 0 set myerror [list $myloc [list $msg]] debug.pt/rdengine {[InstReturn]} return } set mycurrent [string index $mytoken $myloc] set myok 1 set myerror {} debug.pt/rdengine {[InstReturn]} return } method i_test_char {tok} { debug.pt/rdengine {[Instruction i_test_char $tok] :: ok [expr {$tok eq $mycurrent}], [expr {$tok eq $mycurrent ? "@$myloc" : "back@[expr {$myloc-1}]"}]} set myok [expr {$tok eq $mycurrent}] my OkFailD {pt::pe terminal $tok} debug.pt/rdengine {[InstReturn]} return } method i_test_range {toks toke} { debug.pt/rdengine {[Instruction i_test_range $toks $toke]} set myok [expr { ([string compare $toks $mycurrent] <= 0) && ([string compare $mycurrent $toke] <= 0) }] ; # {} my OkFailD {pt::pe range $toks $toke} debug.pt/rdengine {[InstReturn]} return } method i_test_alnum {} { debug.pt/rdengine {[Instruction i_test_alnum]} set myok [string is alnum -strict $mycurrent] my OkFailD {pt::pe alnum} debug.pt/rdengine {[InstReturn]} return } method i_test_alpha {} { debug.pt/rdengine {[Instruction i_test_alpha]} set myok [string is alpha -strict $mycurrent] my OkFailD {pt::pe alpha} debug.pt/rdengine {[InstReturn]} return } method i_test_ascii {} { debug.pt/rdengine {[Instruction i_test_ascii]} set myok [string is ascii -strict $mycurrent] my OkFailD {pt::pe ascii} debug.pt/rdengine {[InstReturn]} return } method i_test_control {} { debug.pt/rdengine {[Instruction i_test_control]} set myok [string is control -strict $mycurrent] my OkFailD {pt::pe control} debug.pt/rdengine {[InstReturn]} return } method i_test_ddigit {} { debug.pt/rdengine {[Instruction i_test_ddigit]} set myok [string match {[0-9]} $mycurrent] my OkFailD {pt::pe ddigit} debug.pt/rdengine {[InstReturn]} return } method i_test_digit {} { debug.pt/rdengine {[Instruction i_test_digit]} set myok [string is digit -strict $mycurrent] my OkFailD {pt::pe digit} debug.pt/rdengine {[InstReturn]} return } method i_test_graph {} { debug.pt/rdengine {[Instruction i_test_graph]} set myok [string is graph -strict $mycurrent] my OkFailD {pt::pe graph} debug.pt/rdengine {[InstReturn]} return } method i_test_lower {} { debug.pt/rdengine {[Instruction i_test_lower]} set myok [string is lower -strict $mycurrent] my OkFailD {pt::pe lower} debug.pt/rdengine {[InstReturn]} return } method i_test_print {} { debug.pt/rdengine {[Instruction i_test_print]} set myok [string is print -strict $mycurrent] my OkFailD {pt::pe printable} debug.pt/rdengine {[InstReturn]} return } method i_test_punct {} { debug.pt/rdengine {[Instruction i_test_punct]} set myok [string is punct -strict $mycurrent] my OkFailD {pt::pe punct} debug.pt/rdengine {[InstReturn]} return } method i_test_space {} { debug.pt/rdengine {[Instruction i_test_space]} set myok [string is space -strict $mycurrent] my OkFailD {pt::pe space} debug.pt/rdengine {[InstReturn]} return } method i_test_upper {} { debug.pt/rdengine {[Instruction i_test_upper]} set myok [string is upper -strict $mycurrent] my OkFailD {pt::pe upper} debug.pt/rdengine {[InstReturn]} return } method i_test_wordchar {} { debug.pt/rdengine {[Instruction i_test_wordchar]} set myok [string is wordchar -strict $mycurrent] my OkFailD {pt::pe wordchar} debug.pt/rdengine {[InstReturn]} return } method i_test_xdigit {} { debug.pt/rdengine {[Instruction i_test_xdigit]} set myok [string is xdigit -strict $mycurrent] my OkFailD {pt::pe xdigit} debug.pt/rdengine {[InstReturn]} return } # # ## ### ##### ######## ############# ##################### ## Internals method ExtendTC {} { if {($mychan eq {}) || [eof $mychan]} {return 0} set ch [read $mychan 1] if {$ch eq {}} { return 0 } append mytoken $ch return 1 } method ExtendTCN {n} { if {($mychan eq {}) || [eof $mychan]} {return 0} set str [read $mychan $n] set k [string length $str] append mytoken $str if {$k < $n} { return 0 } return 1 } method OkFailD {msgcmd} { # Inlined: Expected, Unget, ClearErrors if {!$myok} { set myerror [list $myloc [list [uplevel 1 $msgcmd]]] incr myloc -1 } else { set myerror {} } return } # # ## ### ##### ######## ############# ##################### ## Data structures. ## Mainly the architectural state of the instance's PARAM. variable \ mychan mycurrent myloc mystackloc \ myok mysvalue myerror mystackerr \ mytoken mysymbol mystackast mystackmark \ mytracecounter # Parser Input (channel, location (line, column)) ........... # Token, current parsing location, stack of locations ....... # Match state . ........ ............. ..................... # Caches for tokens and nonterminals .. ..................... # Abstract syntax tree (AST) .......... ..................... # # ## ### ##### ######## ############# ##################### } # # ## ### ##### ######## ############# ##################### ## Ready package provide pt::rde::oo 1.1 return |
Changes to modules/pt/pt_rdengine_tcl.tcl.
1 2 | # -*- tcl -*- # | | | > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > < < < | > | | > > | > > > > | > > > > > > | > > | | | | | | | | | > | > | > | | | | > | > > > | > > > | > > > | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 | # -*- tcl -*- # # Copyright (c) 2009-2015 by Andreas Kupries <[email protected]> # # ## ### ##### ######## ############# ##################### ## Package description ## Implementation of the PackRat Machine (PARAM), a virtual machine on ## top of which parsers for Parsing Expression Grammars (PEGs) can be ## realized. This implementation is tied to Tcl for control flow. We ## (will) have alternate implementations written in TclOO, and critcl, ## all exporting the same API. # ## RD stands for Recursive Descent. # # ## ### ##### ######## ############# ##################### ## Requisites package require Tcl 8.5 package require snit package require struct::stack 1.5 ; # Requiring peekr, getr, get, trim* methods package require pt::ast package require pt::pe # # ## ### ##### ######## ############# ##################### ## Support narrative tracing. package require debug debug level pt/rdengine debug prefix pt/rdengine {} # # ## ### ##### ######## ############# ##################### ## Implementation snit::type ::pt::rde_tcl { # # ## ### ##### ######## ############# ##################### ## Instruction counter for tracing. Unused else. Plus other helpers. variable trace 0 proc Instruction {label {a {}} {b {}}} { upvar 1 self self trace trace myok myok myloc myloc mycurrent mycurrent mysvalue mysvalue myerror myerror __inst theinst set theinst [list $label $a $b] return "$self <<[format %08d [incr trace]]>> START I:[format %-30s $label] [format %-10s $a] [format %-10s $b] :: [State]" } proc InstReturn {} { upvar 1 self self trace trace myok myok myloc myloc mycurrent mycurrent mysvalue mysvalue myerror myerror __inst theinst lassign $theinst label a b return "$self <<[format %08d $trace]>> END__ I:[format %-30s $label] [format %-10s $a] [format %-10s $b] :: [State]" } proc State {} { upvar 1 myok myok myloc myloc mycurrent mycurrent mysvalue mysvalue myerror myerror return "ST $myok CL $myloc CC ($mycurrent) SV ($mysvalue) ER ($myerror)" } proc TraceSetupStacks {} { upvar selfns selfns # Move stack instances aside. rename ${selfns}::LOC ${selfns}::LOC__ rename ${selfns}::ERR ${selfns}::ERR__ rename ${selfns}::AST ${selfns}::AST__ rename ${selfns}::MARK ${selfns}::MRK__ # Create procedures doing tracing, and forwarding to the # renamed actual instances. interp alias {} ${selfns}::LOC {} ${selfns}::WRAP LS LOC__ interp alias {} ${selfns}::ERR {} ${selfns}::WRAP ES ERR__ interp alias {} ${selfns}::AST {} ${selfns}::WRAP ARS AST__ interp alias {} ${selfns}::MARK {} ${selfns}::WRAP ASM MRK__ proc ${selfns}::WRAP {label stack args} { debug.pt/rdengine { $label ___ $args} set res [$stack {*}$args] # Show state state after the op set n [$stack size] if {!$n} { set c {()} } elseif {$n == 1} { set c <<[$stack peek $n]>> } else { set c <<[join [$stack peek $n] {>> <<}]>> } debug.pt/rdengine { $label == ($n):$c} # And op return debug.pt/rdengine { $label ==> ($res)} return $res } return } # # ## ### ##### ######## ############# ##################### ## API - Lifecycle constructor {} { debug.pt/rdengine {$self constructor} set mystackloc [struct::stack ${selfns}::LOC] ; # LS set mystackerr [struct::stack ${selfns}::ERR] ; # ES set mystackast [struct::stack ${selfns}::AST] ; # ARS/AS set mystackmark [struct::stack ${selfns}::MARK] ; # s.a. debug.pt/rdengine {[TraceSetupStacks]$self constructor /done} return } method reset {{chan {}}} { debug.pt/rdengine {$self reset ($chan)} set mychan $chan ; # IN set mycurrent {} ; # CC set myloc -1 ; # CL set myok 0 ; # ST set msvalue {} ; # SV set myerror {} ; # ER set mytoken {} ; # TC (string) array unset mysymbol * ; # NC $mystackloc clear $mystackerr clear $mystackast clear $mystackmark clear debug.pt/rdengine {$self reset /done} return } method complete {} { debug.pt/rdengine {$self complete [State]} if {$myok} { set n [$mystackast size] debug.pt/rdengine {$self complete ast $n} if {$n > 1} { # Multiple ASTs left, reduce into single containing them. set pos [$mystackloc peek] incr pos set children [$mystackast peekr [$mystackast size]] ; # SaveToMark set ast [pt::ast new {} $pos $myloc {*}$children] ; # Reduce ALL debug.pt/rdengine {$self complete n ==> ($ast)} return $ast } elseif {$n == 0} { # Match, but no AST. This is possible if the grammar # consists of only the start expression. debug.pt/rdengine {$self complete 0 ==> ()} return {} } else { # Match, with AST. set ast [$mystackast peek] debug.pt/rdengine {$self complete 1 ==> ($ast)} return $ast } } else { lassign $myerror loc messages return -code error \ -errorcode {PT RDE SYNTAX} \ [list pt::rde $loc $messages] } } # # ## ### ##### ######## ############# ##################### ## API - State accessors method chan {} { debug.pt/rdengine {$self chan} ; return $mychan } # - - -- --- ----- -------- method current {} { debug.pt/rdengine {$self current} ; return $mycurrent } method location {} { debug.pt/rdengine {$self location} ; return $myloc } method lmarked {} { debug.pt/rdengine {$self lmarked} ; return [$mystackloc getr] } # - - -- --- ----- -------- method ok {} { debug.pt/rdengine {$self ok} ; return $myok } method value {} { debug.pt/rdengine {$self value} ; return $mysvalue } method error {} { debug.pt/rdengine {$self error} ; return $myerror } method emarked {} { debug.pt/rdengine {$self emarked} ; return [$mystackerr getr] } # - - -- --- ----- -------- method tokens {{from {}} {to {}}} { debug.pt/rdengine {$self tokens ($from) ($to)} switch -exact [llength [info level 0]] { 5 { return $mytoken } 6 { return [string range $mytoken $from $from] } 7 { return [string range $mytoken $from $to] } } } method symbols {} { debug.pt/rdengine {$self symbols} return [array get mysymbol] } method scached {} { debug.pt/rdengine {$self scached} return [array names mysymbol] } # - - -- --- ----- -------- method asts {} { debug.pt/rdengine {$self asts} ; return [$mystackast getr] } method amarked {} { debug.pt/rdengine {$self amarked} ; return [$mystackmark getr] } method ast {} { debug.pt/rdengine {$self ast} ; return [$mystackast peek] } # # ## ### ##### ######## ############# ##################### ## API - Preloading the token cache. method data {data} { debug.pt/rdengine {$self data +[string length $data]} append mytoken $data return } # # ## ### ##### ######## ############# ##################### ## Common instruction sequences method si:void_state_push {} { debug.pt/rdengine {[Instruction si:void_state_push]} # i_loc_push # i_error_clear_push $mystackloc push $myloc set myerror {} $mystackerr push {} debug.pt/rdengine {[InstReturn]} return } method si:void2_state_push {} { debug.pt/rdengine {[Instruction si:void2_state_push]} # i_loc_push # i_error_push $mystackloc push $myloc $mystackerr push {} debug.pt/rdengine {[InstReturn]} return } method si:value_state_push {} { debug.pt/rdengine {[Instruction si:value_state_push]} # i_ast_push # i_loc_push # i_error_clear_push $mystackmark push [$mystackast size] $mystackloc push $myloc set myerror {} $mystackerr push {} debug.pt/rdengine {[InstReturn]} return } # - -- --- ----- -------- ------------- --------------------- method si:void_state_merge {} { debug.pt/rdengine {[Instruction si:void_state_merge]} # i_error_pop_merge # i_loc_pop_rewind/discard set olderror [$mystackerr pop] # We have either old or new error data, keep it. if {![llength $myerror]} { set myerror $olderror |
︙ | ︙ | |||
186 187 188 189 190 191 192 | } elseif {$loe == $lon} { # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } set last [$mystackloc pop] | | | > > | > | 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 | } elseif {$loe == $lon} { # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } set last [$mystackloc pop] if {!$myok} { set myloc $last } debug.pt/rdengine {[InstReturn]} return } method si:void_state_merge_ok {} { debug.pt/rdengine {[Instruction si:void_state_merge_ok]} # i_error_pop_merge # i_loc_pop_rewind/discard # i_status_ok set olderror [$mystackerr pop] # We have either old or new error data, keep it. if {![llength $myerror]} { |
︙ | ︙ | |||
216 217 218 219 220 221 222 | } elseif {$loe == $lon} { # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } set last [$mystackloc pop] | | | | > > > | > | 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 | } elseif {$loe == $lon} { # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } set last [$mystackloc pop] if {!$myok} { set myloc $last set myok 1 } debug.pt/rdengine {[InstReturn]} return } method si:value_state_merge {} { debug.pt/rdengine {[Instruction si:value_state_merge]} # i_error_pop_merge # i_ast_pop_rewind/discard # i_loc_pop_rewind/discard set olderror [$mystackerr pop] # We have either old or new error data, keep it. if {![llength $myerror]} { |
︙ | ︙ | |||
248 249 250 251 252 253 254 | # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } set mark [$mystackmark pop] set last [$mystackloc pop] | | | | > > > | > > > | > > > | > > > | > | > > > > | > | 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 | # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } set mark [$mystackmark pop] set last [$mystackloc pop] if {!$myok} { $mystackast trim* $mark set myloc $last } debug.pt/rdengine {[InstReturn]} return } # - -- --- ----- -------- ------------- --------------------- method si:value_notahead_start {} { debug.pt/rdengine {[Instruction si:value_notahead_start]} # i_loc_push # i_ast_push $mystackloc push $myloc $mystackmark push [$mystackast size] debug.pt/rdengine {[InstReturn]} return } method si:void_notahead_exit {} { debug.pt/rdengine {[Instruction si:void_notahead_exit]} # i_loc_pop_rewind # i_status_negate set myloc [$mystackloc pop] set myok [expr {!$myok}] debug.pt/rdengine {[InstReturn]} return } method si:value_notahead_exit {} { debug.pt/rdengine {[Instruction si:value_notahead_exit]} # i_ast_pop_discard/rewind # i_loc_pop_rewind # i_status_negate set mark [$mystackmark pop] if {$myok} { $mystackast trim* $mark } set myloc [$mystackloc pop] set myok [expr {!$myok}] debug.pt/rdengine {[InstReturn]} return } # - -- --- ----- -------- ------------- --------------------- method si:kleene_abort {} { debug.pt/rdengine {[Instruction si:kleene_abort]} # i_loc_pop_rewind/discard # i:fail_return set last [$mystackloc pop] if {$myok} { debug.pt/rdengine {[InstReturn]} return } set myloc $last debug.pt/rdengine {[InstReturn]} return -code return } method si:kleene_close {} { debug.pt/rdengine {[Instruction si:kleene_close]} # i_error_pop_merge # i_loc_pop_rewind/discard # i:fail_status_ok # i:fail_return set olderror [$mystackerr pop] # We have either old or new error data, keep it. |
︙ | ︙ | |||
326 327 328 329 330 331 332 | } elseif {$loe == $lon} { # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } set last [$mystackloc pop] | | > > > > > | > | 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 | } elseif {$loe == $lon} { # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } set last [$mystackloc pop] if {$myok} { debug.pt/rdengine {[InstReturn]} return } set myok 1 set myloc $last debug.pt/rdengine {[InstReturn]} return -code return } # - -- --- ----- -------- ------------- --------------------- method si:voidvoid_branch {} { debug.pt/rdengine {[Instruction si:voidvoid_branch]} # i_error_pop_merge # i:ok_loc_pop_discard # i:ok_return # i_loc_rewind # i_error_push set olderror [$mystackerr pop] |
︙ | ︙ | |||
362 363 364 365 366 367 368 369 370 371 372 373 374 375 | # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } if {$myok} { $mystackloc pop return -code return } set myloc [$mystackloc peek] $mystackerr push $myerror return } | > > > | > | 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 | # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } if {$myok} { $mystackloc pop debug.pt/rdengine {[InstReturn]} return -code return } set myloc [$mystackloc peek] $mystackerr push $myerror debug.pt/rdengine {[InstReturn]} return } method si:voidvalue_branch {} { debug.pt/rdengine {[Instruction si:voidvalue_branch]} # i_error_pop_merge # i:ok_loc_pop_discard # i:ok_return # i_ast_push # i_loc_rewind # i_error_push |
︙ | ︙ | |||
398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 | # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } if {$myok} { $mystackloc pop return -code return } $mystackmark push [$mystackast size] set myloc [$mystackloc peek] $mystackerr push {} return } | > > > | > | 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 | # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } if {$myok} { $mystackloc pop debug.pt/rdengine {[InstReturn]} return -code return } $mystackmark push [$mystackast size] set myloc [$mystackloc peek] $mystackerr push {} debug.pt/rdengine {[InstReturn]} return } method si:valuevoid_branch {} { debug.pt/rdengine {[Instruction si:valuevoid_branch]} # i_error_pop_merge # i_ast_pop_rewind/discard # i:ok_loc_pop_discard # i:ok_return # i_loc_rewind # i_error_push |
︙ | ︙ | |||
435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 | # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } set mark [$mystackmark pop] if {$myok} { $mystackloc pop return -code return } $mystackast trim* $mark set myloc [$mystackloc peek] $mystackerr push {} return } | > > > | > | 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 | # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } set mark [$mystackmark pop] if {$myok} { $mystackloc pop debug.pt/rdengine {[InstReturn]} return -code return } $mystackast trim* $mark set myloc [$mystackloc peek] $mystackerr push {} debug.pt/rdengine {[InstReturn]} return } method si:valuevalue_branch {} { debug.pt/rdengine {[Instruction si:valuevalue_branch]} # i_error_pop_merge # i_ast_pop_discard # i:ok_loc_pop_discard # i:ok_return # i_ast_rewind # i_loc_rewind # i_error_push |
︙ | ︙ | |||
473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 | # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } if {$myok} { $mystackmark pop $mystackloc pop return -code return } $mystackast trim* [$mystackmark peek] set myloc [$mystackloc peek] $mystackerr push {} return } # - -- --- ----- -------- ------------- --------------------- | > > > > | > | 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 | # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } if {$myok} { $mystackmark pop $mystackloc pop debug.pt/rdengine {[InstReturn]} return -code return } $mystackast trim* [$mystackmark peek] set myloc [$mystackloc peek] $mystackerr push {} debug.pt/rdengine {[InstReturn]} return } # - -- --- ----- -------- ------------- --------------------- method si:voidvoid_part {} { debug.pt/rdengine {[Instruction si:voidvoid_part]} # i_error_pop_merge # i:fail_loc_pop_rewind # i:fail_return # i_error_push set olderror [$mystackerr pop] # We have either old or new error data, keep it. |
︙ | ︙ | |||
509 510 511 512 513 514 515 516 517 518 519 520 521 | } elseif {$loe == $lon} { # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } if {!$myok} { set myloc [$mystackloc pop] return -code return } $mystackerr push $myerror return } | > > > | > | 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 | } elseif {$loe == $lon} { # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } if {!$myok} { set myloc [$mystackloc pop] debug.pt/rdengine {[InstReturn]} return -code return } $mystackerr push $myerror debug.pt/rdengine {[InstReturn]} return } method si:voidvalue_part {} { debug.pt/rdengine {[Instruction si:voidvalue_part]} # i_error_pop_merge # i:fail_loc_pop_rewind # i:fail_return # i_ast_push # i_error_push set olderror [$mystackerr pop] |
︙ | ︙ | |||
542 543 544 545 546 547 548 549 550 551 552 553 554 555 | } elseif {$loe == $lon} { # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } if {!$myok} { set myloc [$mystackloc pop] return -code return } $mystackmark push [$mystackast size] $mystackerr push $myerror return } | > > > | > | 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 | } elseif {$loe == $lon} { # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } if {!$myok} { set myloc [$mystackloc pop] debug.pt/rdengine {[InstReturn]} return -code return } $mystackmark push [$mystackast size] $mystackerr push $myerror debug.pt/rdengine {[InstReturn]} return } method si:valuevalue_part {} { debug.pt/rdengine {[Instruction si:valuevalue_part]} # i_error_pop_merge # i:fail_ast_pop_rewind # i:fail_loc_pop_rewind # i:fail_return # i_error_push set olderror [$mystackerr pop] |
︙ | ︙ | |||
577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 | # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } if {!$myok} { $mystackast trim* [$mystackmark pop] set myloc [$mystackloc pop] return -code return } $mystackerr push $myerror return } # - -- --- ----- -------- ------------- --------------------- | > > > > | > > | 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 | # Equal locations, merge the message lists, set-like. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] } } if {!$myok} { $mystackast trim* [$mystackmark pop] set myloc [$mystackloc pop] debug.pt/rdengine {[InstReturn]} return -code return } $mystackerr push $myerror debug.pt/rdengine {[InstReturn]} return } # - -- --- ----- -------- ------------- --------------------- method si:next_str {tok} { debug.pt/rdengine {[Instruction si:next_str $tok]} # String = sequence of characters. # No need for all the intermediate stack churn. set n [string length $tok] set last [expr {$myloc + $n}] set max [string length $mytoken] incr myloc if {($last >= $max) && ![ExtendTCN [expr {$last - $max + 1}]]} { set myok 0 set myerror [list $myloc [list [pt::pe str $tok]]] # i:fail_return debug.pt/rdengine {[InstReturn]} return } set lex [string range $mytoken $myloc $last] set mycurrent [string index $mytoken $last] # ATTENTION: The error output of this instruction is different # from a regular sequence of si:next_char instructions. The |
︙ | ︙ | |||
620 621 622 623 624 625 626 627 628 629 | if {$myok} { set myloc $last set myerror {} } else { set myerror [list $myloc [list [pt::pe str $tok]]] incr myloc -1 } return } | > | > > > | > > > | > > > | > > > | > > > | > > > | > > > | > > > | > > > | > > > | > > > | > > > | > > > | > > > | > > > | > > > | > > > | > > > > | > > > > | > > > > | > > > > | > | 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 | if {$myok} { set myloc $last set myerror {} } else { set myerror [list $myloc [list [pt::pe str $tok]]] incr myloc -1 } debug.pt/rdengine {[InstReturn]} return } method si:next_class {tok} { debug.pt/rdengine {[Instruction si:next_class $tok]} # Class = Choice of characters. No need for stack churn. # i_input_next "\{t $c\}" # i:fail_return # i_test_<user class> incr myloc if {($myloc >= [string length $mytoken]) && ![ExtendTC]} { set myok 0 set myerror [list $myloc [list [pt::pe class $tok]]] # i:fail_return debug.pt/rdengine {[InstReturn]} return } set mycurrent [string index $mytoken $myloc] # Note what is needle versus hay. The token, i.e. the string # of allowed characters is the hay in which the current # character is looked, making it the needle. set myok [expr {[string first $mycurrent $tok] >= 0}] if {$myok} { set myerror {} } else { set myerror [list $myloc [list [pt::pe class $tok]]] incr myloc -1 } debug.pt/rdengine {[InstReturn]} return } method si:next_char {tok} { debug.pt/rdengine {[Instruction si:next_char $tok]} # i_input_next "\{t $c\}" # i:fail_return # i_test_char $c incr myloc if {($myloc >= [string length $mytoken]) && ![ExtendTC]} { set myok 0 set myerror [list $myloc [list [pt::pe terminal $tok]]] # i:fail_return debug.pt/rdengine {[InstReturn]} return } set mycurrent [string index $mytoken $myloc] set myok [expr {$tok eq $mycurrent}] if {$myok} { set myerror {} } else { set myerror [list $myloc [list [pt::pe terminal $tok]]] incr myloc -1 } debug.pt/rdengine {[InstReturn]} return } method si:next_range {toks toke} { debug.pt/rdengine {[Instruction si:next_range $toks $toke]} #Asm::Ins i_input_next "\{.. $s $e\}" #Asm::Ins i:fail_return #Asm::Ins i_test_range $s $e incr myloc if {($myloc >= [string length $mytoken]) && ![ExtendTC]} { set myok 0 set myerror [list $myloc [list [pt::pe range $toks $toke]]] # i:fail_return debug.pt/rdengine {[InstReturn]} return } set mycurrent [string index $mytoken $myloc] set myok [expr { ([string compare $toks $mycurrent] <= 0) && ([string compare $mycurrent $toke] <= 0) }] ; # {} if {$myok} { set myerror {} } else { set myerror [list $myloc [list [pt::pe range $toks $toke]]] incr myloc -1 } debug.pt/rdengine {[InstReturn]} return } # - -- --- ----- -------- ------------- --------------------- method si:next_alnum {} { debug.pt/rdengine {[Instruction si:next_alnum]} #Asm::Ins i_input_next alnum #Asm::Ins i:fail_return #Asm::Ins i_test_alnum incr myloc if {($myloc >= [string length $mytoken]) && ![ExtendTC]} { set myok 0 set myerror [list $myloc [list alnum]] # i:fail_return debug.pt/rdengine {[InstReturn]} return } set mycurrent [string index $mytoken $myloc] set myok [string is alnum -strict $mycurrent] if {!$myok} { set myerror [list $myloc [list alnum]] incr myloc -1 } else { set myerror {} } debug.pt/rdengine {[InstReturn]} return } method si:next_alpha {} { debug.pt/rdengine {[Instruction si:next_alpha]} #Asm::Ins i_input_next alpha #Asm::Ins i:fail_return #Asm::Ins i_test_alpha incr myloc if {($myloc >= [string length $mytoken]) && ![ExtendTC]} { set myok 0 set myerror [list $myloc [list alpha]] # i:fail_return debug.pt/rdengine {[InstReturn]} return } set mycurrent [string index $mytoken $myloc] set myok [string is alpha -strict $mycurrent] if {!$myok} { set myerror [list $myloc [list alpha]] incr myloc -1 } else { set myerror {} } debug.pt/rdengine {[InstReturn]} return } method si:next_ascii {} { debug.pt/rdengine {[Instruction si:next_ascii]} #Asm::Ins i_input_next ascii #Asm::Ins i:fail_return #Asm::Ins i_test_ascii incr myloc if {($myloc >= [string length $mytoken]) && ![ExtendTC]} { set myok 0 set myerror [list $myloc [list ascii]] # i:fail_return debug.pt/rdengine {[InstReturn]} return } set mycurrent [string index $mytoken $myloc] set myok [string is ascii -strict $mycurrent] if {!$myok} { set myerror [list $myloc [list ascii]] incr myloc -1 } else { set myerror {} } debug.pt/rdengine {[InstReturn]} return } method si:next_control {} { debug.pt/rdengine {[Instruction si:next_control]} #Asm::Ins i_input_next control #Asm::Ins i:fail_return #Asm::Ins i_test_control incr myloc if {($myloc >= [string length $mytoken]) && ![ExtendTC]} { set myok 0 set myerror [list $myloc [list control]] # i:fail_return debug.pt/rdengine {[InstReturn]} return } set mycurrent [string index $mytoken $myloc] set myok [string is control -strict $mycurrent] if {!$myok} { set myerror [list $myloc [list control]] incr myloc -1 } else { set myerror {} } debug.pt/rdengine {[InstReturn]} return } method si:next_ddigit {} { debug.pt/rdengine {[Instruction si:next_ddigit]} #Asm::Ins i_input_next ddigit #Asm::Ins i:fail_return #Asm::Ins i_test_ddigit incr myloc if {($myloc >= [string length $mytoken]) && ![ExtendTC]} { set myok 0 set myerror [list $myloc [list ddigit]] # i:fail_return debug.pt/rdengine {[InstReturn]} return } set mycurrent [string index $mytoken $myloc] set myok [string match {[0-9]} $mycurrent] if {!$myok} { set myerror [list $myloc [list ddigit]] incr myloc -1 } else { set myerror {} } debug.pt/rdengine {[InstReturn]} return } method si:next_digit {} { debug.pt/rdengine {[Instruction si:next_digit]} #Asm::Ins i_input_next digit #Asm::Ins i:fail_return #Asm::Ins i_test_digit incr myloc if {($myloc >= [string length $mytoken]) && ![ExtendTC]} { set myok 0 set myerror [list $myloc [list digit]] # i:fail_return debug.pt/rdengine {[InstReturn]} return } set mycurrent [string index $mytoken $myloc] set myok [string is digit -strict $mycurrent] if {!$myok} { set myerror [list $myloc [list digit]] incr myloc -1 } else { set myerror {} } debug.pt/rdengine {[InstReturn]} return } method si:next_graph {} { debug.pt/rdengine {[Instruction si:next_graph]} #Asm::Ins i_input_next graph #Asm::Ins i:fail_return #Asm::Ins i_test_graph incr myloc if {($myloc >= [string length $mytoken]) && ![ExtendTC]} { set myok 0 set myerror [list $myloc [list graph]] # i:fail_return debug.pt/rdengine {[InstReturn]} return } set mycurrent [string index $mytoken $myloc] set myok [string is graph -strict $mycurrent] if {!$myok} { set myerror [list $myloc [list graph]] incr myloc -1 } else { set myerror {} } debug.pt/rdengine {[InstReturn]} return } method si:next_lower {} { debug.pt/rdengine {[Instruction si:next_lower]} #Asm::Ins i_input_next lower #Asm::Ins i:fail_return #Asm::Ins i_test_lower incr myloc if {($myloc >= [string length $mytoken]) && ![ExtendTC]} { set myok 0 set myerror [list $myloc [list lower]] # i:fail_return debug.pt/rdengine {[InstReturn]} return } set mycurrent [string index $mytoken $myloc] set myok [string is lower -strict $mycurrent] if {!$myok} { set myerror [list $myloc [list lower]] incr myloc -1 } else { set myerror {} } debug.pt/rdengine {[InstReturn]} return } method si:next_print {} { debug.pt/rdengine {[Instruction si:next_print]} #Asm::Ins i_input_next print #Asm::Ins i:fail_return #Asm::Ins i_test_print incr myloc if {($myloc >= [string length $mytoken]) && ![ExtendTC]} { set myok 0 set myerror [list $myloc [list print]] # i:fail_return debug.pt/rdengine {[InstReturn]} return } set mycurrent [string index $mytoken $myloc] set myok [string is print -strict $mycurrent] if {!$myok} { set myerror [list $myloc [list print]] incr myloc -1 } else { set myerror {} } debug.pt/rdengine {[InstReturn]} return } method si:next_punct {} { debug.pt/rdengine {[Instruction si:next_punct]} #Asm::Ins i_input_next punct #Asm::Ins i:fail_return #Asm::Ins i_test_punct incr myloc if {($myloc >= [string length $mytoken]) && ![ExtendTC]} { set myok 0 set myerror [list $myloc [list punct]] # i:fail_return debug.pt/rdengine {[InstReturn]} return } set mycurrent [string index $mytoken $myloc] set myok [string is punct -strict $mycurrent] if {!$myok} { set myerror [list $myloc [list punct]] incr myloc -1 } else { set myerror {} } debug.pt/rdengine {[InstReturn]} return } method si:next_space {} { debug.pt/rdengine {[Instruction si:next_space]} #Asm::Ins i_input_next space #Asm::Ins i:fail_return #Asm::Ins i_test_space incr myloc if {($myloc >= [string length $mytoken]) && ![ExtendTC]} { set myok 0 set myerror [list $myloc [list space]] # i:fail_return debug.pt/rdengine {[InstReturn]} return } set mycurrent [string index $mytoken $myloc] set myok [string is space -strict $mycurrent] if {!$myok} { set myerror [list $myloc [list space]] incr myloc -1 } else { set myerror {} } debug.pt/rdengine {[InstReturn]} return } method si:next_upper {} { debug.pt/rdengine {[Instruction si:next_upper]} #Asm::Ins i_input_next upper #Asm::Ins i:fail_return #Asm::Ins i_test_upper incr myloc if {($myloc >= [string length $mytoken]) && ![ExtendTC]} { set myok 0 set myerror [list $myloc [list upper]] # i:fail_return debug.pt/rdengine {[InstReturn]} return } set mycurrent [string index $mytoken $myloc] set myok [string is upper -strict $mycurrent] if {!$myok} { set myerror [list $myloc [list upper]] incr myloc -1 } else { set myerror {} } debug.pt/rdengine {[InstReturn]} return } method si:next_wordchar {} { debug.pt/rdengine {[Instruction si:next_wordchar]} #Asm::Ins i_input_next wordchar #Asm::Ins i:fail_return #Asm::Ins i_test_wordchar incr myloc if {($myloc >= [string length $mytoken]) && ![ExtendTC]} { set myok 0 set myerror [list $myloc [list wordchar]] # i:fail_return debug.pt/rdengine {[InstReturn]} return } set mycurrent [string index $mytoken $myloc] set myok [string is wordchar -strict $mycurrent] if {!$myok} { set myerror [list $myloc [list wordchar]] incr myloc -1 } else { set myerror {} } debug.pt/rdengine {[InstReturn]} return } method si:next_xdigit {} { debug.pt/rdengine {[Instruction si:next_xdigit]} #Asm::Ins i_input_next xdigit #Asm::Ins i:fail_return #Asm::Ins i_test_xdigit incr myloc if {($myloc >= [string length $mytoken]) && ![ExtendTC]} { set myok 0 set myerror [list $myloc [list xdigit]] # i:fail_return debug.pt/rdengine {[InstReturn]} return } set mycurrent [string index $mytoken $myloc] set myok [string is xdigit -strict $mycurrent] if {!$myok} { set myerror [list $myloc [list xdigit]] incr myloc -1 } else { set myerror {} } debug.pt/rdengine {[InstReturn]} return } # - -- --- ----- -------- ------------- --------------------- method si:value_symbol_start {symbol} { debug.pt/rdengine {[Instruction si:value_symbol_start $symbol]} # if @runtime@ i_symbol_restore $symbol # i:found:ok_ast_value_push # i:found_return # i_loc_push # i_ast_push set k [list $myloc $symbol] if {[info exists mysymbol($k)]} { lassign $mysymbol($k) myloc myok myerror mysvalue if {$myok} { $mystackast push $mysvalue } debug.pt/rdengine {[InstReturn]} return -code return } $mystackloc push $myloc $mystackmark push [$mystackast size] debug.pt/rdengine {[InstReturn]} return } method si:value_void_symbol_start {symbol} { debug.pt/rdengine {[Instruction si:value_void_symbol_start $symbol]} # if @runtime@ i_symbol_restore $symbol # i:found_return # i_loc_push # i_ast_push set k [list $myloc $symbol] if {[info exists mysymbol($k)]} { lassign $mysymbol($k) myloc myok myerror mysvalue debug.pt/rdengine {[InstReturn]} return -code return } $mystackloc push $myloc $mystackmark push [$mystackast size] debug.pt/rdengine {[InstReturn]} return } method si:void_symbol_start {symbol} { debug.pt/rdengine {[Instruction si:void_symbol_start $symbol]} # if @runtime@ i_symbol_restore $symbol # i:found:ok_ast_value_push # i:found_return # i_loc_push set k [list $myloc $symbol] if {[info exists mysymbol($k)]} { lassign $mysymbol($k) myloc myok myerror mysvalue if {$myok} { $mystackast push $mysvalue } debug.pt/rdengine {[InstReturn]} return -code return } $mystackloc push $myloc debug.pt/rdengine {[InstReturn]} return } method si:void_void_symbol_start {symbol} { debug.pt/rdengine {[Instruction si:void_void_symbol_start $symbol]} # if @runtime@ i_symbol_restore $symbol # i:found_return # i_loc_push set k [list $myloc $symbol] if {[info exists mysymbol($k)]} { lassign $mysymbol($k) myloc myok myerror mysvalue debug.pt/rdengine {[InstReturn]} return -code return } $mystackloc push $myloc debug.pt/rdengine {[InstReturn]} return } method si:reduce_symbol_end {symbol} { debug.pt/rdengine {[Instruction si:reduce_symbol_end $symbol]} # i_value_clear/reduce $symbol # i_symbol_save $symbol # i_error_nonterminal $symbol # i_ast_pop_rewind # i_loc_pop_discard # i:ok_ast_value_push |
︙ | ︙ | |||
1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 | } }} $mystackast trim* [$mystackmark pop] if {$myok} { $mystackast push $mysvalue } return } | > | > | 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 | } }} $mystackast trim* [$mystackmark pop] if {$myok} { $mystackast push $mysvalue } debug.pt/rdengine {[InstReturn]} return } method si:void_leaf_symbol_end {symbol} { debug.pt/rdengine {[Instruction si:void_leaf_symbol_end $symbol]} # i_value_clear/leaf $symbol # i_symbol_save $symbol # i_error_nonterminal $symbol # i_loc_pop_discard # i:ok_ast_value_push set mysvalue {} |
︙ | ︙ | |||
1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 | set myerror [list $loc [list [list n $symbol]]] } }} if {$myok} { $mystackast push $mysvalue } return } | > > | > | 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 | set myerror [list $loc [list [list n $symbol]]] } }} if {$myok} { $mystackast push $mysvalue } debug.pt/rdengine {[InstReturn]} return } method si:value_leaf_symbol_end {symbol} { debug.pt/rdengine {[Instruction si:value_leaf_symbol_end $symbol]} # i_value_clear/leaf $symbol # i_symbol_save $symbol # i_error_nonterminal $symbol # i_loc_pop_discard # i_ast_pop_rewind # i:ok_ast_value_push |
︙ | ︙ | |||
1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 | } }} $mystackast trim* [$mystackmark pop] if {$myok} { $mystackast push $mysvalue } return } | > > | > | 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 | } }} $mystackast trim* [$mystackmark pop] if {$myok} { $mystackast push $mysvalue } debug.pt/rdengine {[InstReturn]} return } method si:value_clear_symbol_end {symbol} { debug.pt/rdengine {[Instruction si:value_clear_symbol_end $symbol]} # i_value_clear # i_symbol_save $symbol # i_error_nonterminal $symbol # i_loc_pop_discard # i_ast_pop_rewind set mysvalue {} |
︙ | ︙ | |||
1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 | lassign $myerror loc messages if {$loc == $pos} { set myerror [list $loc [list [list n $symbol]]] } }} $mystackast trim* [$mystackmark pop] return } | > | > > | > | > | > | > | > > | > > | > > | > > | > > | > > | > | | | | | > | > | | | > | > | | > > | > > | > | | > > > > | < > | > | | > > | > > | > < > | > | | > > > | > | | > > > | > > > | > | | > > > | > > > | > | | > > > | > > > | > | | > > > | > > > | > | > > > > | > > > | > > > | > > | | | | | | | | | | | | > > > | > | < | | | | | | | | | | | | | | | | | | | | | | > > > | > > > > > > | < < < | < | > | > < < < | < | > | > > > | > > > | > > > > | < | > > > | > > > | > > > | > < | > > | > | > > > | > > > | > > > | > > > | > > > | > > > | > < | | < < < < < < | 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 | lassign $myerror loc messages if {$loc == $pos} { set myerror [list $loc [list [list n $symbol]]] } }} $mystackast trim* [$mystackmark pop] debug.pt/rdengine {[InstReturn]} return } method si:void_clear_symbol_end {symbol} { debug.pt/rdengine {[Instruction si:void_clear_symbol_end $symbol]} # i_value_clear # i_symbol_save $symbol # i_error_nonterminal $symbol # i_loc_pop_discard set mysvalue {} set at [$mystackloc pop] set k [list $at $symbol] set mysymbol($k) [list $myloc $myok $myerror $mysvalue] # si:void_clear_symbol_end / i_error_nonterminal -- inlined -- disabled if {0} {if {[llength $myerror]} { set pos $at incr pos lassign $myerror loc messages if {$loc == $pos} { set myerror [list $loc [list [list n $symbol]]] } }} debug.pt/rdengine {[InstReturn]} return } # # ## ### ##### ######## ############# ##################### ## API - Instructions - Control flow method i:ok_continue {} { debug.pt/rdengine {[Instruction i:ok_continue]} if {!$myok} return return -code continue } method i:fail_continue {} { debug.pt/rdengine {[Instruction i:fail_continue]} if {$myok} return return -code continue } method i:fail_return {} { debug.pt/rdengine {[Instruction i:fail_return]} if {$myok} return return -code return } method i:ok_return {} { debug.pt/rdengine {[Instruction i:ok_return]} if {!$myok} return return -code return } # # ## ### ##### ######## ############# ##################### ## API - Instructions - Unconditional matching. method i_status_ok {} { debug.pt/rdengine {[Instruction i_status_ok]} set myok 1 debug.pt/rdengine {[InstReturn]} return } method i_status_fail {} { debug.pt/rdengine {[Instruction i_status_fail]} set myok 0 debug.pt/rdengine {[InstReturn]} return } method i_status_negate {} { debug.pt/rdengine {[Instruction i_status_negate]} set myok [expr {!$myok}] debug.pt/rdengine {[InstReturn]} return } # # ## ### ##### ######## ############# ##################### ## API - Instructions - Error handling. method i_error_clear {} { debug.pt/rdengine {[Instruction i_error_clear]} set myerror {} debug.pt/rdengine {[InstReturn]} return } method i_error_push {} { debug.pt/rdengine {[Instruction i_error_push]} $mystackerr push $myerror debug.pt/rdengine {[InstReturn]} return } method i_error_clear_push {} { debug.pt/rdengine {[Instruction i_error_clear_push]} set myerror {} $mystackerr push {} debug.pt/rdengine {[InstReturn]} return } method i_error_pop_merge {} { debug.pt/rdengine {[Instruction i_error_pop_merge]} set olderror [$mystackerr pop] # We have either old or new error data, keep it. if {![llength $myerror]} { set myerror $olderror ; debug.pt/rdengine {[InstReturn]} ; return } if {![llength $olderror]} { debug.pt/rdengine {[InstReturn]} ; return } # If one of the errors is further on in the input choose that as # the information to propagate. lassign $myerror loe msgse lassign $olderror lon msgsn if {$lon > $loe} { set myerror $olderror ; debug.pt/rdengine {[InstReturn]} ; return } if {$loe > $lon} { debug.pt/rdengine {[InstReturn]} ; return } # Equal locations, merge the message lists. set myerror [list $loe [lsort -uniq [list {*}$msgse {*}$msgsn]]] debug.pt/rdengine {[InstReturn]} return } method i_error_nonterminal {symbol} { debug.pt/rdengine {[Instruction i_error_nonterminal $symbol]} # i_error_nonterminal -- Disabled. Generate only low-level # i_error_nonterminal -- errors until we have worked out how # i_error_nonterminal -- to integrate symbol information with # i_error_nonterminal -- them. Do not forget where this # i_error_nonterminal -- instruction is inlined. return # Inlined: Errors, Expected. if {![llength $myerror]} { debug.pt/rdengine {no error} return } set pos [$mystackloc peek] incr pos lassign $myerror loc messages if {$loc != $pos} { debug.pt/rdengine {my $myerror != pos $pos} return } set myerror [list $loc [list [list n $symbol]]] debug.pt/rdengine {::= ($myerror)} return } # # ## ### ##### ######## ############# ##################### ## API - Instructions - Basic input handling and tracking method i_loc_pop_rewind/discard {} { debug.pt/rdengine {[Instruction i_loc_pop_rewind/discard]} #$myparser i:fail_loc_pop_rewind #$myparser i:ok_loc_pop_discard #return set last [$mystackloc pop] if {!$myok} { set myloc $last } debug.pt/rdengine {[InstReturn]} return } method i_loc_pop_discard {} { debug.pt/rdengine {[Instruction i_loc_pop_discard]} $mystackloc pop debug.pt/rdengine {[InstReturn]} return } method i:ok_loc_pop_discard {} { debug.pt/rdengine {[Instruction i:ok_loc_pop_discard]} if {$myok} { $mystackloc pop } debug.pt/rdengine {[InstReturn]} return } method i_loc_pop_rewind {} { debug.pt/rdengine {[Instruction i_loc_pop_rewind]} set myloc [$mystackloc pop] debug.pt/rdengine {[InstReturn]} return } method i:fail_loc_pop_rewind {} { debug.pt/rdengine {[Instruction i:fail_loc_pop_rewind]} if {!$myok} { set myloc [$mystackloc pop] } debug.pt/rdengine {[InstReturn]} return } method i_loc_push {} { debug.pt/rdengine {[Instruction i_loc_push]} $mystackloc push $myloc debug.pt/rdengine {[InstReturn]} return } method i_loc_rewind {} { debug.pt/rdengine {[Instruction i_loc_rewind]} # i_loc_pop_rewind - set myloc [$mystackloc pop] # i_loc_push - $mystackloc push $myloc set myloc [$mystackloc peek] debug.pt/rdengine {[InstReturn]} return } # # ## ### ##### ######## ############# ##################### ## API - Instructions - AST stack handling method i_ast_pop_rewind/discard {} { debug.pt/rdengine {[Instruction i_ast_pop_rewind/discard]} #$myparser i:fail_ast_pop_rewind #$myparser i:ok_ast_pop_discard #return set mark [$mystackmark pop] if {!$myok} { $mystackast trim* $mark } debug.pt/rdengine {[InstReturn]} return } method i_ast_pop_discard/rewind {} { debug.pt/rdengine {[Instruction i_ast_pop_discard/rewind]} #$myparser i:ok_ast_pop_rewind #$myparser i:fail_ast_pop_discard #return set mark [$mystackmark pop] if {$myok} { $mystackast trim* $mark } debug.pt/rdengine {[InstReturn]} return } method i_ast_pop_discard {} { debug.pt/rdengine {[Instruction i_ast_pop_discard]} $mystackmark pop debug.pt/rdengine {[InstReturn]} return } method i:ok_ast_pop_discard {} { debug.pt/rdengine {[Instruction i:ok_ast_pop_discard]} if {$myok} { $mystackmark pop } debug.pt/rdengine {[InstReturn]} return } method i_ast_pop_rewind {} { debug.pt/rdengine {[Instruction i_ast_pop_rewind]} $mystackast trim* [$mystackmark pop] debug.pt/rdengine {[InstReturn]} return } method i:fail_ast_pop_rewind {} { debug.pt/rdengine {[Instruction i:fail_ast_pop_rewind]} if {!$myok} { $mystackast trim* [$mystackmark pop] } debug.pt/rdengine {[InstReturn]} return } method i_ast_push {} { debug.pt/rdengine {[Instruction i_ast_push]} $mystackmark push [$mystackast size] debug.pt/rdengine {[InstReturn]} return } method i:ok_ast_value_push {} { debug.pt/rdengine {[Instruction i:ok_ast_value_push]} if {$myok} { $mystackast push $mysvalue } debug.pt/rdengine {[InstReturn]} return } method i_ast_rewind {} { debug.pt/rdengine {[Instruction i_ast_rewind]} # i_ast_pop_rewind - $mystackast trim* [$mystackmark pop] # i_ast_push - $mystackmark push [$mystackast size] $mystackast trim* [$mystackmark peek] debug.pt/rdengine {[InstReturn]} return } # # ## ### ##### ######## ############# ##################### ## API - Instructions - Nonterminal cache method i_symbol_restore {symbol} { debug.pt/rdengine {[Instruction i_symbol_restore $symbol]} # Satisfy from cache if possible. set k [list $myloc $symbol] if {![info exists mysymbol($k)]} { debug.pt/rdengine {[InstReturn]} return 0 } lassign $mysymbol($k) myloc myok myerror mysvalue # We go forward, as the nonterminal matches (or not). debug.pt/rdengine {[InstReturn]} return 1 } method i_symbol_save {symbol} { debug.pt/rdengine {[Instruction i_symbol_save $symbol]} # Store not only the value, but also how far # the match went (if it was a match). set at [$mystackloc peek] set k [list $at $symbol] set mysymbol($k) [list $myloc $myok $myerror $mysvalue] debug.pt/rdengine {[InstReturn]} return } # # ## ### ##### ######## ############# ##################### ## API - Instructions - Semantic values. method i_value_clear {} { debug.pt/rdengine {[Instruction i_value_clear]} set mysvalue {} debug.pt/rdengine {[InstReturn]} return } method i_value_clear/leaf {symbol} { debug.pt/rdengine {[Instruction i_value_clear/leaf $symbol] :: ([expr {[$mystackloc peek]+1}])-@$myloc)} # not quite value_lead (guarded, and clear on fail) # Inlined clear, reduce, and optimized. # Clear ; if {$ok} {Reduce $symbol} set mysvalue {} if {$myok} { set pos [$mystackloc peek] incr pos if {($pos - 1) == $myloc} { # The symbol did not process any input. As this is # signaled to be ok (*) we create a node covering an empty # range. (Ad *): Can happen for a RHS using toplevel # operators * or ?. set mysvalue [pt::ast new0 $symbol $pos] } else { set mysvalue [pt::ast new $symbol $pos $myloc] } } debug.pt/rdengine {[InstReturn]} return } method i_value_clear/reduce {symbol} { debug.pt/rdengine {[Instruction i_value_clear/reduce $symbol]} set mysvalue {} if {$myok} { set mark [$mystackmark peek];# Old size of stack before current nt pushed more. set newa [expr {[$mystackast size] - $mark}] set pos [$mystackloc peek] incr pos if {!$newa} { set mysvalue {} } elseif {$newa == 1} { # peek 1 => single element comes back set mysvalue [list [$mystackast peek]] ; # SaveToMark } else { # peek n > 1 => list of elements comes back set mysvalue [$mystackast peekr $newa] ; # SaveToMark } if {($pos - 1) == $myloc} { # The symbol did not process any input. As this is # signaled to be ok (*) we create a node covering an empty # range. (Ad *): Can happen for a RHS using toplevel # operators * or ?. set mysvalue [pt::ast new0 $symbol $pos {*}$mysvalue] } else { set mysvalue [pt::ast new $symbol $pos $myloc {*}$mysvalue] ; # Reduce $symbol } } debug.pt/rdengine {[InstReturn]} return } # # ## ### ##### ######## ############# ##################### ## API - Instructions - Terminal matching method i_input_next {msg} { debug.pt/rdengine {[Instruction i_input_next $msg]} # Inlined: Getch, Expected, ClearErrors # Satisfy from input cache if possible. incr myloc # May read from the input (ExtendTC), and remember the # information. Note: We are implicitly incrementing the # location! if {($myloc >= [string length $mytoken]) && ![ExtendTC]} { set myok 0 set myerror [list $myloc [list $msg]] debug.pt/rdengine {[InstReturn]} return } set mycurrent [string index $mytoken $myloc] set myok 1 set myerror {} debug.pt/rdengine {[InstReturn]} return } method i_test_char {tok} { debug.pt/rdengine {[Instruction i_test_char $tok] :: ok [expr {$tok eq $mycurrent}], [expr {$tok eq $mycurrent ? "@$myloc" : "back@[expr {$myloc-1}]"}]} set myok [expr {$tok eq $mycurrent}] OkFailD {pt::pe terminal $tok} debug.pt/rdengine {[InstReturn]} return } method i_test_range {toks toke} { debug.pt/rdengine {[Instruction i_test_range $toks $toke]} set myok [expr { ([string compare $toks $mycurrent] <= 0) && ([string compare $mycurrent $toke] <= 0) }] ; # {} OkFailD {pt::pe range $toks $toke} debug.pt/rdengine {[InstReturn]} return } method i_test_alnum {} { debug.pt/rdengine {[Instruction i_test_alnum]} set myok [string is alnum -strict $mycurrent] OkFail alnum debug.pt/rdengine {[InstReturn]} return } method i_test_alpha {} { debug.pt/rdengine {[Instruction i_test_alpha]} set myok [string is alpha -strict $mycurrent] OkFail alpha debug.pt/rdengine {[InstReturn]} return } method i_test_ascii {} { debug.pt/rdengine {[Instruction i_test_ascii]} set myok [string is ascii -strict $mycurrent] OkFail ascii debug.pt/rdengine {[InstReturn]} return } method i_test_control {} { debug.pt/rdengine {[Instruction i_test_control]} set myok [string is control -strict $mycurrent] OkFail control debug.pt/rdengine {[InstReturn]} return } method i_test_ddigit {} { debug.pt/rdengine {[Instruction i_test_ddigit]} set myok [string match {[0-9]} $mycurrent] OkFail ddigit debug.pt/rdengine {[InstReturn]} return } method i_test_digit {} { debug.pt/rdengine {[Instruction i_test_digit]} set myok [string is digit -strict $mycurrent] OkFail digit debug.pt/rdengine {[InstReturn]} return } method i_test_graph {} { debug.pt/rdengine {[Instruction i_test_graph]} set myok [string is graph -strict $mycurrent] OkFail graph debug.pt/rdengine {[InstReturn]} return } method i_test_lower {} { debug.pt/rdengine {[Instruction i_test_lower]} set myok [string is lower -strict $mycurrent] OkFail lower debug.pt/rdengine {[InstReturn]} return } method i_test_print {} { debug.pt/rdengine {[Instruction i_test_print]} set myok [string is print -strict $mycurrent] OkFail print debug.pt/rdengine {[InstReturn]} return } method i_test_punct {} { debug.pt/rdengine {[Instruction i_test_punct]} set myok [string is punct -strict $mycurrent] OkFail punct debug.pt/rdengine {[InstReturn]} return } method i_test_space {} { debug.pt/rdengine {[Instruction i_test_space]} set myok [string is space -strict $mycurrent] OkFail space debug.pt/rdengine {[InstReturn]} return } method i_test_upper {} { debug.pt/rdengine {[Instruction i_test_upper]} set myok [string is upper -strict $mycurrent] OkFail upper debug.pt/rdengine {[InstReturn]} return } method i_test_wordchar {} { debug.pt/rdengine {[Instruction i_test_wordchar]} set myok [string is wordchar -strict $mycurrent] OkFail wordchar debug.pt/rdengine {[InstReturn]} return } method i_test_xdigit {} { debug.pt/rdengine {[Instruction i_test_xdigit]} set myok [string is xdigit -strict $mycurrent] OkFail xdigit debug.pt/rdengine {[InstReturn]} return } # # ## ### ##### ######## ############# ##################### ## Internals proc ExtendTC {} { |
︙ | ︙ | |||
1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 | # # the guarded control flow # # instructions, i.e. # # i:{ok,fail}_{continue,return}. typevariable ourmsg -array {} typeconstructor { set ourmsg(alnum) [pt::pe alnum] set ourmsg(alpha) [pt::pe alpha] set ourmsg(ascii) [pt::pe ascii] set ourmsg(control) [pt::pe control] set ourmsg(ddigit) [pt::pe ddigit] set ourmsg(digit) [pt::pe digit] set ourmsg(graph) [pt::pe graph] set ourmsg(lower) [pt::pe lower] set ourmsg(print) [pt::pe printable] set ourmsg(punct) [pt::pe punct] set ourmsg(space) [pt::pe space] set ourmsg(upper) [pt::pe upper] set ourmsg(wordchar) [pt::pe wordchar] set ourmsg(xdigit) [pt::pe xdigit] return } # Parser Input (channel, location (line, column)) ........... variable mychan {} ; # IN. Channel we read the characters # from. Its current location is | > > > > | 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 | # # the guarded control flow # # instructions, i.e. # # i:{ok,fail}_{continue,return}. typevariable ourmsg -array {} typeconstructor { debug.pt/rdengine {} set ourmsg(alnum) [pt::pe alnum] set ourmsg(alpha) [pt::pe alpha] set ourmsg(ascii) [pt::pe ascii] set ourmsg(control) [pt::pe control] set ourmsg(ddigit) [pt::pe ddigit] set ourmsg(digit) [pt::pe digit] set ourmsg(graph) [pt::pe graph] set ourmsg(lower) [pt::pe lower] set ourmsg(print) [pt::pe printable] set ourmsg(punct) [pt::pe punct] set ourmsg(space) [pt::pe space] set ourmsg(upper) [pt::pe upper] set ourmsg(wordchar) [pt::pe wordchar] set ourmsg(xdigit) [pt::pe xdigit] debug.pt/rdengine {/done} return } # Parser Input (channel, location (line, column)) ........... variable mychan {} ; # IN. Channel we read the characters # from. Its current location is |
︙ | ︙ |