summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Thurston <thurston@complang.org>2012-05-20 09:01:19 -0400
committerAdrian Thurston <thurston@complang.org>2012-05-20 09:02:01 -0400
commit956ad7c92094e09679e977d10f82e4565902de45 (patch)
tree55182189bfb7488bc7113ca345c208fa5a6a34f8
parent3945c72480140c235dc48c63c9eef19d8bdaaaec (diff)
downloadcolm-956ad7c92094e09679e977d10f82e4565902de45.tar.gz
updated context2 test for follow-ignore
Removed the token matching the empty string. Adjusted the output for shifting placement of ignore tokens.
-rw-r--r--test/context2.exp5
-rw-r--r--test/context2.lm3
2 files changed, 4 insertions, 4 deletions
diff --git a/test/context2.exp b/test/context2.exp
index f0f31173..8ae9cfb0 100644
--- a/test/context2.exp
+++ b/test/context2.exp
@@ -1,5 +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>&lt;&lt;</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>&lt;&lt;</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( &lt;&lt;DATA1, more, &lt;&lt;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_0008>(</ruby_here::_literal_0008><ruby_here::_opt_arglist><ruby_here::arglist><ruby_here::primary><ruby_here::heredoc><ruby_here::_literal_0005>&lt;&lt;</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>&lt;&lt;</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( &lt;&lt;DATA1, more, &lt;&lt;DATA2, 99 )
"&amp;^#(@ almost
!arbitrary text!
DATA1
@@ -7,4 +6,4 @@ hello
world
DATA2
# error here
-</ruby_here::foobar></ruby_here::item></ruby_here::_repeat_item></ruby_here::start> \ No newline at end of file
+</ruby_here::foobar></ruby_here::item></ruby_here::_repeat_item></ruby_here::start>
diff --git a/test/context2.lm b/test/context2.lm
index bb2872cd..8dd8bb25 100644
--- a/test/context2.lm
+++ b/test/context2.lm
@@ -81,7 +81,7 @@ context ruby_here
[primary]
| [call]
- token foobar /any*/
+ token foobar /any+/
def item
[statement '!']
@@ -95,3 +95,4 @@ CTX: ruby_here = cons ruby_here []
S: ruby_here::start = parse ruby_here::start( CTX stdin )
print_xml(S)
+print('\n')