diff options
author | Adrian Thurston <thurston@complang.org> | 2012-05-22 21:53:40 -0400 |
---|---|---|
committer | Adrian Thurston <thurston@complang.org> | 2012-05-22 21:53:40 -0400 |
commit | a120f823372cdde77e08e8a770ab5076a134ede0 (patch) | |
tree | 2ddfeb293f9036db17ba115007aaecd9e600a057 /test | |
parent | 9cccdce724cf806feeb1c7831606ed3fd2c73910 (diff) | |
download | colm-a120f823372cdde77e08e8a770ab5076a134ede0.tar.gz |
updated tests for latest parser changes
Diffstat (limited to 'test')
-rw-r--r-- | test/btscan1.exp | 2 | ||||
-rw-r--r-- | test/btscan1.lm | 1 | ||||
-rw-r--r-- | test/btscan2.exp | 2 | ||||
-rw-r--r-- | test/commitbt.exp | 2 | ||||
-rw-r--r-- | test/commitbt.lm | 1 | ||||
-rw-r--r-- | test/context2.exp | 2 | ||||
-rw-r--r-- | test/ignore3.exp | 17 | ||||
-rw-r--r-- | test/ignore3.lm | 1 | ||||
-rw-r--r-- | test/island.exp | 4 | ||||
-rw-r--r-- | test/nestedcomm.exp | 3 | ||||
-rw-r--r-- | test/nestedcomm.lm | 4 | ||||
-rw-r--r-- | test/order2.lm | 7 | ||||
-rw-r--r-- | test/ragelambig1.exp | 2 | ||||
-rw-r--r-- | test/ragelambig1.lm | 2 | ||||
-rw-r--r-- | test/ragelambig2.exp | 2 | ||||
-rw-r--r-- | test/ragelambig2.lm | 1 | ||||
-rw-r--r-- | test/ragelambig3.exp | 2 | ||||
-rw-r--r-- | test/ragelambig3.lm | 1 | ||||
-rw-r--r-- | test/ragelambig4.exp | 2 | ||||
-rw-r--r-- | test/ragelambig4.lm | 1 | ||||
-rw-r--r-- | test/rediv.exp | 2 | ||||
-rw-r--r-- | test/rediv.lm | 1 | ||||
-rw-r--r-- | test/rubyhere.exp | 2 | ||||
-rw-r--r-- | test/string.exp | 2 | ||||
-rw-r--r-- | test/string.lm | 1 | ||||
-rw-r--r-- | test/superid.exp | 4 | ||||
-rw-r--r-- | test/superid.lm | 1 | ||||
-rw-r--r-- | test/tags1.exp | 4 | ||||
-rw-r--r-- | test/tags3.exp | 2 |
29 files changed, 44 insertions, 34 deletions
diff --git a/test/btscan1.exp b/test/btscan1.exp index e8fef50c..09c7af65 100644 --- a/test/btscan1.exp +++ b/test/btscan1.exp @@ -1 +1 @@ -<btscan><_repeat_item><item><r2::line><r2::_literal_0006>!</r2::_literal_0006><r2::id>abb</r2::id></r2::line></item><item><r1::line><r1::_literal_0001>!</r1::_literal_0001><r1::_literal_0002>a</r1::_literal_0002><r1::_literal_0003>b</r1::_literal_0003><r1::_literal_0003>b</r1::_literal_0003><r1::_literal_0002>a</r1::_literal_0002></r1::line></item><item><r2::line><r2::_literal_0006>!</r2::_literal_0006><r2::id>aab</r2::id></r2::line></item></_repeat_item></btscan>
\ No newline at end of file +<btscan><_repeat_item><item><r2::line><r2::_literal_0009>!</r2::_literal_0009><r2::id>abb</r2::id></r2::line></item><item><r1::line><r1::_literal_0001>!</r1::_literal_0001><r1::_literal_0003>a</r1::_literal_0003><r1::_literal_0005>b</r1::_literal_0005><r1::_literal_0005>b</r1::_literal_0005><r1::_literal_0003>a</r1::_literal_0003></r1::line></item><item><r2::line><r2::_literal_0009>!</r2::_literal_0009><r2::id>aab</r2::id></r2::line></item></_repeat_item></btscan> diff --git a/test/btscan1.lm b/test/btscan1.lm index 0aae89e3..8abf28e6 100644 --- a/test/btscan1.lm +++ b/test/btscan1.lm @@ -32,3 +32,4 @@ P: btscan P = parse btscan( stdin ) match P ~!abb !abba !aab print_xml(P) +print( '\n' ) diff --git a/test/btscan2.exp b/test/btscan2.exp index e8fef50c..d16fbbde 100644 --- a/test/btscan2.exp +++ b/test/btscan2.exp @@ -1 +1 @@ -<btscan><_repeat_item><item><r2::line><r2::_literal_0006>!</r2::_literal_0006><r2::id>abb</r2::id></r2::line></item><item><r1::line><r1::_literal_0001>!</r1::_literal_0001><r1::_literal_0002>a</r1::_literal_0002><r1::_literal_0003>b</r1::_literal_0003><r1::_literal_0003>b</r1::_literal_0003><r1::_literal_0002>a</r1::_literal_0002></r1::line></item><item><r2::line><r2::_literal_0006>!</r2::_literal_0006><r2::id>aab</r2::id></r2::line></item></_repeat_item></btscan>
\ No newline at end of file +<btscan><_repeat_item><item><r2::line><r2::_literal_0009>!</r2::_literal_0009><r2::id>abb</r2::id></r2::line></item><item><r1::line><r1::_literal_0001>!</r1::_literal_0001><r1::_literal_0003>a</r1::_literal_0003><r1::_literal_0005>b</r1::_literal_0005><r1::_literal_0005>b</r1::_literal_0005><r1::_literal_0003>a</r1::_literal_0003></r1::line></item><item><r2::line><r2::_literal_0009>!</r2::_literal_0009><r2::id>aab</r2::id></r2::line></item></_repeat_item></btscan>
\ No newline at end of file diff --git a/test/commitbt.exp b/test/commitbt.exp index 6fc214b5..373661d3 100644 --- a/test/commitbt.exp +++ b/test/commitbt.exp @@ -1 +1 @@ -<stuff><_repeat_item><item>1</item></_repeat_item><_literal_0008>!</_literal_0008></stuff>
\ No newline at end of file +<stuff><_repeat_item><item>1</item></_repeat_item><_literal_000d>!</_literal_000d></stuff> diff --git a/test/commitbt.lm b/test/commitbt.lm index a187e5ef..7f6786b3 100644 --- a/test/commitbt.lm +++ b/test/commitbt.lm @@ -109,3 +109,4 @@ def stuff S: stuff = parse stuff( stdin ) print_xml( S ) +print( '\n' ) diff --git a/test/context2.exp b/test/context2.exp index 8ae9cfb0..20f1a117 100644 --- a/test/context2.exp +++ b/test/context2.exp @@ -1,4 +1,4 @@ -<ruby_here::start><ruby_here::_repeat_item><ruby_here::item><ruby_here::statement><ruby_here::call><ruby_here::id>print</ruby_here::id><ruby_here::_literal_0008>(</ruby_here::_literal_0008><ruby_here::_opt_arglist><ruby_here::arglist><ruby_here::primary><ruby_here::heredoc><ruby_here::_literal_0005><<</ruby_here::_literal_0005><ruby_here::here_id>DATA1</ruby_here::here_id></ruby_here::heredoc></ruby_here::primary><ruby_here::_repeat_arglist_more><ruby_here::arglist_more><ruby_here::_literal_0007>,</ruby_here::_literal_0007><ruby_here::primary><ruby_here::id>more</ruby_here::id></ruby_here::primary></ruby_here::arglist_more><ruby_here::arglist_more><ruby_here::_literal_0007>,</ruby_here::_literal_0007><ruby_here::primary><ruby_here::heredoc><ruby_here::_literal_0005><<</ruby_here::_literal_0005><ruby_here::here_id>DATA2</ruby_here::here_id></ruby_here::heredoc></ruby_here::primary></ruby_here::arglist_more><ruby_here::arglist_more><ruby_here::_literal_0007>,</ruby_here::_literal_0007><ruby_here::primary><ruby_here::number>99</ruby_here::number></ruby_here::primary></ruby_here::arglist_more></ruby_here::_repeat_arglist_more></ruby_here::arglist></ruby_here::_opt_arglist><ruby_here::_literal_0009>)</ruby_here::_literal_0009></ruby_here::call></ruby_here::statement><ruby_here::_literal_000a>!</ruby_here::_literal_000a></ruby_here::item><ruby_here::item><ruby_here::foobar>print( <<DATA1, more, <<DATA2, 99 ) +<ruby_here::start><ruby_here::_repeat_item><ruby_here::item><ruby_here::statement><ruby_here::call><ruby_here::id>print</ruby_here::id><ruby_here::_literal_000d>(</ruby_here::_literal_000d><ruby_here::_opt_arglist><ruby_here::arglist><ruby_here::primary><ruby_here::heredoc><ruby_here::_literal_0007><<</ruby_here::_literal_0007><ruby_here::here_id>DATA1</ruby_here::here_id></ruby_here::heredoc></ruby_here::primary><ruby_here::_repeat_arglist_more><ruby_here::arglist_more><ruby_here::_literal_000b>,</ruby_here::_literal_000b><ruby_here::primary><ruby_here::id>more</ruby_here::id></ruby_here::primary></ruby_here::arglist_more><ruby_here::arglist_more><ruby_here::_literal_000b>,</ruby_here::_literal_000b><ruby_here::primary><ruby_here::heredoc><ruby_here::_literal_0007><<</ruby_here::_literal_0007><ruby_here::here_id>DATA2</ruby_here::here_id></ruby_here::heredoc></ruby_here::primary></ruby_here::arglist_more><ruby_here::arglist_more><ruby_here::_literal_000b>,</ruby_here::_literal_000b><ruby_here::primary><ruby_here::number>99</ruby_here::number></ruby_here::primary></ruby_here::arglist_more></ruby_here::_repeat_arglist_more></ruby_here::arglist></ruby_here::_opt_arglist><ruby_here::_literal_000f>)</ruby_here::_literal_000f></ruby_here::call></ruby_here::statement><ruby_here::_literal_0011>!</ruby_here::_literal_0011></ruby_here::item><ruby_here::item><ruby_here::foobar>print( <<DATA1, more, <<DATA2, 99 ) "&^#(@ almost !arbitrary text! DATA1 diff --git a/test/ignore3.exp b/test/ignore3.exp index 4ffc4944..3bba001a 100644 --- a/test/ignore3.exp +++ b/test/ignore3.exp @@ -1,9 +1,8 @@ -item: .a . -item: .b . -item: .c . -item: .( d ) . -innr: .( .d .) . -item: .e . -item: .f . -item: .g. - +item: .a . +item: .b . +item: .c . +item: .( d ) . +innr: .( .d .) . +item: .e . +item: .f . +item: .g. diff --git a/test/ignore3.lm b/test/ignore3.lm index 9e072eb7..3286e9e3 100644 --- a/test/ignore3.lm +++ b/test/ignore3.lm @@ -25,5 +25,4 @@ for I: item in Start { if match I [ O: '(' Inner: inner* C: ')' ] print( 'innr: .' %O '.' %Inner '.' %C '.\n' ) } -print( '\n' ) diff --git a/test/island.exp b/test/island.exp index b9ca1f66..c29e0cc1 100644 --- a/test/island.exp +++ b/test/island.exp @@ -1,7 +1,7 @@ -<start><_repeat_top_item><top_item><class><ident>class</ident><_literal_000c>{</_literal_000c><class_body><_repeat_class_item><class_item><number>1</number><_literal_0009>;</_literal_0009></class_item><class_item><string>"string"</string><_literal_0009>;</_literal_0009></class_item><class_item><ident>foo</ident><_literal_0009>;</_literal_0009></class_item><class_item><func><ident>func</ident><_literal_000a>(</_literal_000a><_literal_000b>)</_literal_000b><_literal_000c>{</_literal_000c><func_body><_repeat_func_item><func_item><func_chr>func() +<start><_repeat_top_item><top_item><class><ident>class</ident><_literal_0017>{</_literal_0017><class_body><_repeat_class_item><class_item><number>1</number><_literal_0011>;</_literal_0011></class_item><class_item><string>"string"</string><_literal_0011>;</_literal_0011></class_item><class_item><ident>foo</ident><_literal_0011>;</_literal_0011></class_item><class_item><func><ident>func</ident><_literal_0013>(</_literal_0013><_literal_0015>)</_literal_0015><_literal_0017>{</_literal_0017><func_body><_repeat_func_item><func_item><func_chr>func() </func_chr></func_item><func_item><func_open>{</func_open><func_body><_repeat_func_item><func_item><func_chr> 1+</func_chr></func_item><func_item><func_open>{</func_open><func_body><_repeat_func_item><func_item><func_chr>2</func_chr></func_item></_repeat_func_item></func_body><func_close>}</func_close></func_item><func_item><func_chr> </func_chr></func_item></_repeat_func_item></func_body><func_close>}</func_close></func_item><func_item><func_chr> - </func_chr></func_item></_repeat_func_item></func_body><func_close>}</func_close></func></class_item></_repeat_class_item></class_body><_literal_000d>}</_literal_000d></class></top_item><top_item><func><ident>func</ident><_literal_000a>(</_literal_000a><_literal_000b>)</_literal_000b><_literal_000c>{</_literal_000c><func_body><_repeat_func_item><func_item><func_chr>"data" + </func_chr></func_item></_repeat_func_item></func_body><func_close>}</func_close></func></class_item></_repeat_class_item></class_body><_literal_0019>}</_literal_0019></class></top_item><top_item><func><ident>func</ident><_literal_0013>(</_literal_0013><_literal_0015>)</_literal_0015><_literal_0017>{</_literal_0017><func_body><_repeat_func_item><func_item><func_chr>"data" </func_chr></func_item><func_item><func_open>{</func_open><func_body><_repeat_func_item><func_item><func_chr>a</func_chr></func_item></_repeat_func_item></func_body><func_close>}</func_close></func_item><func_item><func_chr> </func_chr></func_item></_repeat_func_item></func_body><func_close>}</func_close></func></top_item></_repeat_top_item></start> diff --git a/test/nestedcomm.exp b/test/nestedcomm.exp index 9ba98c34..f460488f 100644 --- a/test/nestedcomm.exp +++ b/test/nestedcomm.exp @@ -1,4 +1,5 @@ +( (this is a nested comment /*sdf;asd_++_stuff) ) hello there ( (this is a nested comment /*sdf;asd_++_stuff) ) and this is not <nested><_repeat_id><id>hello</id><id>there</id><id>and</id><id>this</id><id>is</id><id>not</id></_repeat_id></nested> -<nested><_repeat_id><id>hello</id><_ignore_0001_ign> </_ignore_0001_ign><id>there</id><_ignore_0001_ign> </_ignore_0001_ign><nested_comment><_literal_0005>(</_literal_0005><_repeat_nc_item><nc_item><nc_data> </nc_data></nc_item><nc_item><nested_comment><_literal_0005>(</_literal_0005><_repeat_nc_item><nc_item><nc_data>this is a nested comment /*sdf;asd_++_stuff</nc_data></nc_item></_repeat_nc_item><_literal_0006>)</_literal_0006></nested_comment></nc_item><nc_item><nc_data> </nc_data></nc_item></_repeat_nc_item><_literal_0006>)</_literal_0006></nested_comment><_ignore_0001_ign> </_ignore_0001_ign><id>and</id><_ignore_0001_ign> </_ignore_0001_ign><id>this</id><_ignore_0001_ign> </_ignore_0001_ign><id>is</id><_ignore_0001_ign> </_ignore_0001_ign><id>not</id></_repeat_id></nested> +<nested><_repeat_id><id>hello</id><_ignore_0001> </_ignore_0001><id>there</id><_ignore_0001> </_ignore_0001><nested_comment><_literal_0007>(</_literal_0007><_repeat_nc_item><nc_item><nc_data> </nc_data></nc_item><nc_item><nested_comment><_literal_0007>(</_literal_0007><_repeat_nc_item><nc_item><nc_data>this is a nested comment /*sdf;asd_++_stuff</nc_data></nc_item></_repeat_nc_item><_literal_0009>)</_literal_0009></nested_comment></nc_item><nc_item><nc_data> </nc_data></nc_item></_repeat_nc_item><_literal_0009>)</_literal_0009></nested_comment><_ignore_0001> </_ignore_0001><id>and</id><_ignore_0001> </_ignore_0001><id>this</id><_ignore_0001> </_ignore_0001><id>is</id><_ignore_0001> </_ignore_0001><id>not</id></_repeat_id></nested> hello there ( (this is a nested comment /*sdf;asd_++_stuff) ) and this is not diff --git a/test/nestedcomm.lm b/test/nestedcomm.lm index f5ed3609..e01be456 100644 --- a/test/nestedcomm.lm +++ b/test/nestedcomm.lm @@ -13,7 +13,9 @@ lex start token open_paren /'('/ { - input.push_ignore( parse_stop nested_comment( stdin ) ) + parse_stop NC: nested_comment( stdin ) + print( %NC '\n' ) + input.push_ignore( NC ) } } diff --git a/test/order2.lm b/test/order2.lm index 917524e9..13064ae9 100644 --- a/test/order2.lm +++ b/test/order2.lm @@ -91,9 +91,8 @@ Output: output Output = construct output [] # Take off the leading C from the input file and send it out. match P [C: c '%%' protocol*] -Output << [%C] +Output << [$C] Output << "#include <assert.h> -Output << '\n\n' - -print( Output.finish() '\n\n' ) + " +print( Output.finish() ) diff --git a/test/ragelambig1.exp b/test/ragelambig1.exp index af337d33..f6b7171f 100644 --- a/test/ragelambig1.exp +++ b/test/ragelambig1.exp @@ -1 +1 @@ -<start><expression><expression><term><factor_with_rep><factor_with_neg><factor><alphabet_num><uint>1</uint></alphabet_num></factor></factor_with_neg></factor_with_rep></term></expression><_literal_0005>-</_literal_0005><term><factor_with_rep><factor_with_neg><factor><alphabet_num><uint>1</uint></alphabet_num></factor></factor_with_neg></factor_with_rep></term></expression></start>
\ No newline at end of file +<start><expression><expression><term><factor_with_rep><factor_with_neg><factor><alphabet_num><uint>1</uint></alphabet_num></factor></factor_with_neg></factor_with_rep></term></expression><_literal_0007>-</_literal_0007><term><factor_with_rep><factor_with_neg><factor><alphabet_num><uint>1</uint></alphabet_num></factor></factor_with_neg></factor_with_rep></term></expression></start> diff --git a/test/ragelambig1.lm b/test/ragelambig1.lm index 2dae635c..3c94a569 100644 --- a/test/ragelambig1.lm +++ b/test/ragelambig1.lm @@ -64,3 +64,5 @@ def alphabet_num | ['-' uint] parse start( stdin ) + +print( '\n' ) diff --git a/test/ragelambig2.exp b/test/ragelambig2.exp index 556c9c80..126719e4 100644 --- a/test/ragelambig2.exp +++ b/test/ragelambig2.exp @@ -1 +1 @@ -<start><expression><expression><term><factor_with_rep><factor_with_neg><factor><alphabet_num><uint>1</uint></alphabet_num></factor></factor_with_neg></factor_with_rep><more_term></more_term></term></expression><_literal_0005>-</_literal_0005><term><factor_with_rep><factor_with_neg><factor><alphabet_num><uint>1</uint></alphabet_num></factor></factor_with_neg></factor_with_rep><more_term></more_term></term></expression></start>
\ No newline at end of file +<start><expression><expression><term><factor_with_rep><factor_with_neg><factor><alphabet_num><uint>1</uint></alphabet_num></factor></factor_with_neg></factor_with_rep><more_term></more_term></term></expression><_literal_0007>-</_literal_0007><term><factor_with_rep><factor_with_neg><factor><alphabet_num><uint>1</uint></alphabet_num></factor></factor_with_neg></factor_with_rep><more_term></more_term></term></expression></start> diff --git a/test/ragelambig2.lm b/test/ragelambig2.lm index 84053b70..aa5945e6 100644 --- a/test/ragelambig2.lm +++ b/test/ragelambig2.lm @@ -65,3 +65,4 @@ def alphabet_num | ['-' uint] parse start( stdin ) +print( '\n' ) diff --git a/test/ragelambig3.exp b/test/ragelambig3.exp index b32841a1..176173ba 100644 --- a/test/ragelambig3.exp +++ b/test/ragelambig3.exp @@ -1 +1 @@ -<start><expression><expression><term_short><term><factor_with_rep><factor_with_neg><factor><alphabet_num><uint>1</uint></alphabet_num></factor></factor_with_neg></factor_with_rep></term></term_short></expression><_literal_0005>-</_literal_0005><term_short><term><factor_with_rep><factor_with_neg><factor><alphabet_num><uint>1</uint></alphabet_num></factor></factor_with_neg></factor_with_rep></term></term_short></expression></start>
\ No newline at end of file +<start><expression><expression><term_short><term><factor_with_rep><factor_with_neg><factor><alphabet_num><uint>1</uint></alphabet_num></factor></factor_with_neg></factor_with_rep></term></term_short></expression><_literal_0007>-</_literal_0007><term_short><term><factor_with_rep><factor_with_neg><factor><alphabet_num><uint>1</uint></alphabet_num></factor></factor_with_neg></factor_with_rep></term></term_short></expression></start> diff --git a/test/ragelambig3.lm b/test/ragelambig3.lm index c9c3fd24..db5c4561 100644 --- a/test/ragelambig3.lm +++ b/test/ragelambig3.lm @@ -65,3 +65,4 @@ def alphabet_num | ['-' uint] parse start( stdin ) +print( '\n' ) diff --git a/test/ragelambig4.exp b/test/ragelambig4.exp index 1989f17b..7c20735c 100644 --- a/test/ragelambig4.exp +++ b/test/ragelambig4.exp @@ -1 +1 @@ -<start><expression><term><factor_rep><factor_neg><factor><alphabet_num><uint>1</uint></alphabet_num></factor></factor_neg><_repeat_factor_rep_op></_repeat_factor_rep_op></factor_rep><term_op_list_short></term_op_list_short></term><_repeat_expression_op><expression_op><_literal_0005>-</_literal_0005><term><factor_rep><factor_neg><factor><alphabet_num><uint>1</uint></alphabet_num></factor></factor_neg><_repeat_factor_rep_op></_repeat_factor_rep_op></factor_rep><term_op_list_short></term_op_list_short></term></expression_op></_repeat_expression_op></expression></start>
\ No newline at end of file +<start><expression><term><factor_rep><factor_neg><factor><alphabet_num><uint>1</uint></alphabet_num></factor></factor_neg><_repeat_factor_rep_op></_repeat_factor_rep_op></factor_rep><term_op_list_short></term_op_list_short></term><_repeat_expression_op><expression_op><_literal_0007>-</_literal_0007><term><factor_rep><factor_neg><factor><alphabet_num><uint>1</uint></alphabet_num></factor></factor_neg><_repeat_factor_rep_op></_repeat_factor_rep_op></factor_rep><term_op_list_short></term_op_list_short></term></expression_op></_repeat_expression_op></expression></start> diff --git a/test/ragelambig4.lm b/test/ragelambig4.lm index b58825d7..f98200ed 100644 --- a/test/ragelambig4.lm +++ b/test/ragelambig4.lm @@ -69,3 +69,4 @@ def alphabet_num | ['-' uint] parse start( stdin ) +print( '\n' ) diff --git a/test/rediv.exp b/test/rediv.exp index 5c5e9f14..e684c38b 100644 --- a/test/rediv.exp +++ b/test/rediv.exp @@ -1,4 +1,4 @@ g y a -<start><_repeat_statement><statement><expr><term><term><factor><number>2</number></factor></term><_literal_0011>/</_literal_0011><factor><_literal_0011>/</_literal_0011><regex_body><_repeat_regex_item><regex_item><regex_base><orlit_neg_open>[^</orlit_neg_open><orlit><_repeat_orlit_item><orlit_item><orlit_chr>g</orlit_chr></orlit_item><orlit_item><orlit_chr>u</orlit_chr><orlit_dash>-</orlit_dash><orlit_chr>z</orlit_chr></orlit_item><orlit_item><orlit_chr>y</orlit_chr></orlit_item></_repeat_orlit_item></orlit><orlit_close>]</orlit_close></regex_base><regex_rep></regex_rep></regex_item><regex_item><regex_base><regex_dot>.</regex_dot></regex_base><regex_rep><regex_star>*</regex_star></regex_rep></regex_item><regex_item><regex_base><regex_chr>o</regex_chr></regex_base><regex_rep></regex_rep></regex_item><regex_item><regex_base><orlit_open>[</orlit_open><orlit><_repeat_orlit_item><orlit_item><orlit_chr>\d</orlit_chr><orlit_dash>-</orlit_dash><orlit_chr>x</orlit_chr></orlit_item><orlit_item><orlit_chr>a</orlit_chr></orlit_item></_repeat_orlit_item></orlit><orlit_close>]</orlit_close></regex_base><regex_rep><regex_star>*</regex_star></regex_rep></regex_item></_repeat_regex_item></regex_body><regex_close>/</regex_close></factor></term></expr><_literal_0010>;</_literal_0010></statement></_repeat_statement></start>
\ No newline at end of file +<start><_repeat_statement><statement><expr><term><term><factor><number>2</number></factor></term><_literal_0021>/</_literal_0021><factor><_literal_0021>/</_literal_0021><regex_body><_repeat_regex_item><regex_item><regex_base><orlit_neg_open>[^</orlit_neg_open><orlit><_repeat_orlit_item><orlit_item><orlit_chr>g</orlit_chr></orlit_item><orlit_item><orlit_chr>u</orlit_chr><orlit_dash>-</orlit_dash><orlit_chr>z</orlit_chr></orlit_item><orlit_item><orlit_chr>y</orlit_chr></orlit_item></_repeat_orlit_item></orlit><orlit_close>]</orlit_close></regex_base><regex_rep></regex_rep></regex_item><regex_item><regex_base><regex_dot>.</regex_dot></regex_base><regex_rep><regex_star>*</regex_star></regex_rep></regex_item><regex_item><regex_base><regex_chr>o</regex_chr></regex_base><regex_rep></regex_rep></regex_item><regex_item><regex_base><orlit_open>[</orlit_open><orlit><_repeat_orlit_item><orlit_item><orlit_chr>\d</orlit_chr><orlit_dash>-</orlit_dash><orlit_chr>x</orlit_chr></orlit_item><orlit_item><orlit_chr>a</orlit_chr></orlit_item></_repeat_orlit_item></orlit><orlit_close>]</orlit_close></regex_base><regex_rep><regex_star>*</regex_star></regex_rep></regex_item></_repeat_regex_item></regex_body><regex_close>/</regex_close></factor></term></expr><_literal_001f>;</_literal_001f></statement></_repeat_statement></start> diff --git a/test/rediv.lm b/test/rediv.lm index 1d8b4f58..423d8e01 100644 --- a/test/rediv.lm +++ b/test/rediv.lm @@ -92,3 +92,4 @@ for I:orlit_item in S { } } print_xml( S ) +print( '\n' ) diff --git a/test/rubyhere.exp b/test/rubyhere.exp index 9c8f2726..beeb78da 100644 --- a/test/rubyhere.exp +++ b/test/rubyhere.exp @@ -1,4 +1,4 @@ -<start><_repeat_item><item><statement><call><id>print</id><_literal_0008>(</_literal_0008><_opt_arglist><arglist><primary><heredoc><_literal_0005><<</_literal_0005><here_id>DATA1</here_id></heredoc></primary><_repeat_arglist_more><arglist_more><_literal_0007>,</_literal_0007><primary><id>more</id></primary></arglist_more><arglist_more><_literal_0007>,</_literal_0007><primary><heredoc><_literal_0005><<</_literal_0005><here_id>DATA2</here_id></heredoc></primary></arglist_more><arglist_more><_literal_0007>,</_literal_0007><primary><number>99</number></primary></arglist_more></_repeat_arglist_more></arglist></_opt_arglist><_literal_0009>)</_literal_0009></call></statement><_literal_000a>!</_literal_000a></item><item><foobar>print( <<DATA1, more, <<DATA2, 99 ) +<start><_repeat_item><item><statement><call><id>print</id><_literal_000d>(</_literal_000d><_opt_arglist><arglist><primary><heredoc><_literal_0007><<</_literal_0007><here_id>DATA1</here_id></heredoc></primary><_repeat_arglist_more><arglist_more><_literal_000b>,</_literal_000b><primary><id>more</id></primary></arglist_more><arglist_more><_literal_000b>,</_literal_000b><primary><heredoc><_literal_0007><<</_literal_0007><here_id>DATA2</here_id></heredoc></primary></arglist_more><arglist_more><_literal_000b>,</_literal_000b><primary><number>99</number></primary></arglist_more></_repeat_arglist_more></arglist></_opt_arglist><_literal_000f>)</_literal_000f></call></statement><_literal_0011>!</_literal_0011></item><item><foobar>print( <<DATA1, more, <<DATA2, 99 ) "&^#(@ almost !arbitrary text! DATA1 diff --git a/test/string.exp b/test/string.exp index ed4063a6..0962bae8 100644 --- a/test/string.exp +++ b/test/string.exp @@ -1,2 +1,2 @@ yes -<start><expr_list><expr_list><expr_list></expr_list><expr><expr><term><primary><ident>a</ident></primary></term></expr><_literal_0005>+</_literal_0005><term><primary><string><_literal_0008>"</_literal_0008><_repeat_str_item><str_item><str_chr>%{{</str_chr></str_item></_repeat_str_item><_literal_0008>"</_literal_0008></string></primary></term></expr><_literal_0007>;</_literal_0007></expr_list><expr><term><term><primary><number>1</number></primary></term><_literal_0006>*</_literal_0006><primary><number>2</number></primary></term></expr><_literal_0007>;</_literal_0007></expr_list></start>
\ No newline at end of file +<start><expr_list><expr_list><expr_list></expr_list><expr><expr><term><primary><ident>a</ident></primary></term></expr><_literal_0009>+</_literal_0009><term><primary><string><_literal_000f>"</_literal_000f><_repeat_str_item><str_item><str_chr>%{{</str_chr></str_item></_repeat_str_item><_literal_000f>"</_literal_000f></string></primary></term></expr><_literal_000d>;</_literal_000d></expr_list><expr><term><term><primary><number>1</number></primary></term><_literal_000b>*</_literal_000b><primary><number>2</number></primary></term></expr><_literal_000d>;</_literal_000d></expr_list></start> diff --git a/test/string.lm b/test/string.lm index 1d437588..015de456 100644 --- a/test/string.lm +++ b/test/string.lm @@ -52,3 +52,4 @@ def start S: start = parse start(stdin) print_xml( S ) +print( '\n' ) diff --git a/test/superid.exp b/test/superid.exp index 461f8bf5..b21666b7 100644 --- a/test/superid.exp +++ b/test/superid.exp @@ -3,5 +3,5 @@ new_id = 13 old_id = NIL new_id = 12 this is item2 -<start><item2><e2></e2><_literal_0001>!</_literal_0001><_literal_0002>a</_literal_0002><super_id>b</super_id><super_id>b</super_id><_literal_0002>a</_literal_0002></item2><_literal_0003>; -</_literal_0003></start>
\ No newline at end of file +<start><item2><e2></e2><_literal_0001>!</_literal_0001><_literal_0003>a</_literal_0003><super_id>b</super_id><super_id>b</super_id><_literal_0003>a</_literal_0003></item2><_literal_0005>; +</_literal_0005></start> diff --git a/test/superid.lm b/test/superid.lm index a74bb6db..d05726d7 100644 --- a/test/superid.lm +++ b/test/superid.lm @@ -58,3 +58,4 @@ def start } print_xml( parse start(stdin) ) +print( '\n' ) diff --git a/test/tags1.exp b/test/tags1.exp index 5524dec8..302db967 100644 --- a/test/tags1.exp +++ b/test/tags1.exp @@ -1,2 +1,2 @@ -<tag_stack><id>sentinal</id><tag_stack></tag_stack></tag_stack><start><_repeat_tag><tag><open_tag><id>y</id></open_tag><_repeat_tag></_repeat_tag><close_tag><id>y</id></close_tag></tag><tag><open_tag><id>a</id></open_tag><_repeat_tag><tag><open_tag><id>i</id></open_tag><_repeat_tag></_repeat_tag><close_tag><id>i</id></close_tag></tag><tag><open_tag><id>b</id></open_tag><_repeat_tag><tag><open_tag><id>c</id></open_tag><_repeat_tag></_repeat_tag><close_tag><id>c</id></close_tag></tag><tag><open_tag><id>m</id></open_tag><_repeat_tag></_repeat_tag><close_tag><id>m</id></close_tag></tag><tag><open_tag><id>n</id></open_tag><_repeat_tag></_repeat_tag><close_tag><id>n</id></close_tag></tag></_repeat_tag><close_tag><id>b</id></close_tag></tag></_repeat_tag><close_tag><id>a</id></close_tag></tag></_repeat_tag><_literal_0002>; -</_literal_0002></start>got structure +<tag_stack><id>sentinal</id><tag_stack></tag_stack></tag_stack><start><_repeat_tag><tag><open_tag><id>y</id></open_tag><_repeat_tag></_repeat_tag><close_tag><id>y</id></close_tag></tag><tag><open_tag><id>a</id></open_tag><_repeat_tag><tag><open_tag><id>i</id></open_tag><_repeat_tag></_repeat_tag><close_tag><id>i</id></close_tag></tag><tag><open_tag><id>b</id></open_tag><_repeat_tag><tag><open_tag><id>c</id></open_tag><_repeat_tag></_repeat_tag><close_tag><id>c</id></close_tag></tag><tag><open_tag><id>m</id></open_tag><_repeat_tag></_repeat_tag><close_tag><id>m</id></close_tag></tag><tag><open_tag><id>n</id></open_tag><_repeat_tag></_repeat_tag><close_tag><id>n</id></close_tag></tag></_repeat_tag><close_tag><id>b</id></close_tag></tag></_repeat_tag><close_tag><id>a</id></close_tag></tag></_repeat_tag><_literal_0003>; +</_literal_0003></start>got structure diff --git a/test/tags3.exp b/test/tags3.exp index 1ade1db1..c5fa004a 100644 --- a/test/tags3.exp +++ b/test/tags3.exp @@ -1,4 +1,4 @@ -<start><_repeat_item><item><tag><open_tag><_literal_0011><</_literal_0011><tag_id>t1</tag_id><_repeat_attr></_repeat_attr><_literal_000d>></_literal_000d></open_tag><_repeat_item><item><tag><open_tag><_literal_0011><</_literal_0011><tag_id>t2</tag_id><_repeat_attr></_repeat_attr><_literal_000d>></_literal_000d></open_tag><_repeat_item></_repeat_item><opt_close_tag></opt_close_tag></tag></item><item><tag><open_tag><_literal_0011><</_literal_0011><tag_id>a</tag_id><_repeat_attr><attr><attr_name>href</attr_name><_opt_eql_attr_val><eql_attr_val><_literal_0007>=</_literal_0007><attr_val><dquote_val>"foo"</dquote_val></attr_val></eql_attr_val></_opt_eql_attr_val></attr></_repeat_attr><_literal_000d>></_literal_000d></open_tag><_repeat_item><item><doc_data>FOO</doc_data></item></_repeat_item><opt_close_tag><_literal_0012></</_literal_0012><close_id>a</close_id><_literal_000d>></_literal_000d></opt_close_tag></tag></item><item><tag><open_tag><_literal_0011><</_literal_0011><tag_id>t3</tag_id><_repeat_attr></_repeat_attr><_literal_000d>></_literal_000d></open_tag><_repeat_item></_repeat_item><opt_close_tag><_literal_0012></</_literal_0012><close_id>t3</close_id><_literal_000d>></_literal_000d></opt_close_tag></tag></item></_repeat_item><opt_close_tag><_literal_0012></</_literal_0012><close_id>t1</close_id><_literal_000d>></_literal_000d></opt_close_tag></tag></item></_repeat_item><trailing> +<start><_repeat_item><item><tag><open_tag><_literal_0019><</_literal_0019><tag_id>t1</tag_id><_repeat_attr></_repeat_attr><_literal_0013>></_literal_0013></open_tag><_repeat_item><item><tag><open_tag><_literal_0019><</_literal_0019><tag_id>t2</tag_id><_repeat_attr></_repeat_attr><_literal_0013>></_literal_0013></open_tag><_repeat_item></_repeat_item><opt_close_tag></opt_close_tag></tag></item><item><tag><open_tag><_literal_0019><</_literal_0019><tag_id>a</tag_id><_repeat_attr><attr><attr_name>href</attr_name><_opt_eql_attr_val><eql_attr_val><_literal_0009>=</_literal_0009><attr_val><dquote_val>"foo"</dquote_val></attr_val></eql_attr_val></_opt_eql_attr_val></attr></_repeat_attr><_literal_0013>></_literal_0013></open_tag><_repeat_item><item><doc_data>FOO</doc_data></item></_repeat_item><opt_close_tag><_literal_001b></</_literal_001b><close_id>a</close_id><_literal_0013>></_literal_0013></opt_close_tag></tag></item><item><tag><open_tag><_literal_0019><</_literal_0019><tag_id>t3</tag_id><_repeat_attr></_repeat_attr><_literal_0013>></_literal_0013></open_tag><_repeat_item></_repeat_item><opt_close_tag><_literal_001b></</_literal_001b><close_id>t3</close_id><_literal_0013>></_literal_0013></opt_close_tag></tag></item></_repeat_item><opt_close_tag><_literal_001b></</_literal_001b><close_id>t1</close_id><_literal_0013>></_literal_0013></opt_close_tag></tag></item></_repeat_item><trailing> </trailing></start>link: FOO target: "foo" |