diff options
| -rw-r--r-- | test/accumbt3.lm | 4 | ||||
| -rw-r--r-- | test/backtrack2.lm | 4 | ||||
| -rw-r--r-- | test/backtrack3.lm | 2 | ||||
| -rw-r--r-- | test/binary1.lm | 4 | ||||
| -rw-r--r-- | test/btscan1.lm | 6 | ||||
| -rw-r--r-- | test/commitbt.lm | 8 | ||||
| -rw-r--r-- | test/concat1.lm | 3 | ||||
| -rw-r--r-- | test/concat2.lm | 3 | ||||
| -rw-r--r-- | test/lookup1.lm | 3 |
9 files changed, 20 insertions, 17 deletions
diff --git a/test/accumbt3.lm b/test/accumbt3.lm index 7a709f2f..57669a8f 100644 --- a/test/accumbt3.lm +++ b/test/accumbt3.lm @@ -13,8 +13,8 @@ lex start token open_paren /'('/ { - parse_stop NC: nested_comment( input ) - print( 'discarding: ' NC '\n' ) + parse_stop NC: nested_comment[ input ] + print( 'discarding: ' NC.tree '\n' ) } } diff --git a/test/backtrack2.lm b/test/backtrack2.lm index 9b166fbe..cd23fff0 100644 --- a/test/backtrack2.lm +++ b/test/backtrack2.lm @@ -20,5 +20,5 @@ def prods def start [prods] -parse S: start( stdin ) -print_xml( match S "!aa bb cc dd" ) +parse S: start[ stdin ] +print_xml( match S.tree "!aa bb cc dd" ) diff --git a/test/backtrack3.lm b/test/backtrack3.lm index a0f201ea..ebf55df2 100644 --- a/test/backtrack3.lm +++ b/test/backtrack3.lm @@ -26,4 +26,4 @@ def start print_xml( match lhs "id 77 88 \"hello\" dude dude\n" ) } -parse start(stdin) +parse start[stdin] diff --git a/test/binary1.lm b/test/binary1.lm index 87cfaab1..ff3ca066 100644 --- a/test/binary1.lm +++ b/test/binary1.lm @@ -479,6 +479,6 @@ int print_all_names( s: start ) } } -S: start = parse start( stdin ) -print_all_names( S ) +S: start = parse start[ stdin ] +print_all_names( S.tree ) print( '*** SUCCESS ***\n' ) diff --git a/test/btscan1.lm b/test/btscan1.lm index 8abf28e6..8c825fd7 100644 --- a/test/btscan1.lm +++ b/test/btscan1.lm @@ -28,8 +28,8 @@ def item def btscan [item*] -P: btscan P = parse btscan( stdin ) +parse P: btscan[ stdin ] -match P ~!abb !abba !aab -print_xml(P) +match P.tree ~!abb !abba !aab +print_xml(P.tree) print( '\n' ) diff --git a/test/commitbt.lm b/test/commitbt.lm index 7f6786b3..c2949728 100644 --- a/test/commitbt.lm +++ b/test/commitbt.lm @@ -99,14 +99,14 @@ token item /[0-9]+/ { M: str = input.pull(match_length) - S: sub = parse_stop sub(input) - input.push( make_token( typeid<item> M S ) ) + parse_stop S: sub[input] + input.push( make_token( typeid<item> M S.tree ) ) } def stuff [item* '!'] | [sub] -S: stuff = parse stuff( stdin ) -print_xml( S ) +parse S: stuff[ stdin ] +print_xml( S.tree ) print( '\n' ) diff --git a/test/concat1.lm b/test/concat1.lm index dcc5b2fa..7d04f7d6 100644 --- a/test/concat1.lm +++ b/test/concat1.lm @@ -45,7 +45,8 @@ def start start parseStart( InputFile: stream ) { - return parse start( InputFile ) + parse P: start[ InputFile ] + return P.tree } start parseTxt( T: str ) diff --git a/test/concat2.lm b/test/concat2.lm index dcc5b2fa..7d04f7d6 100644 --- a/test/concat2.lm +++ b/test/concat2.lm @@ -45,7 +45,8 @@ def start start parseStart( InputFile: stream ) { - return parse start( InputFile ) + parse P: start[ InputFile ] + return P.tree } start parseTxt( T: str ) diff --git a/test/lookup1.lm b/test/lookup1.lm index a22100e7..cb5db9c4 100644 --- a/test/lookup1.lm +++ b/test/lookup1.lm @@ -2156,7 +2156,8 @@ int printNamespace() printObject( '' rootNamespace ) } -S: start = parse start( stdin ) +parse SP: start[ stdin ] +S: start = SP.tree if ! S { print( error() ) exit( 1 ) |