diff options
| author | Adrian Thurston <thurston@complang.org> | 2012-05-20 07:56:56 -0400 |
|---|---|---|
| committer | Adrian Thurston <thurston@complang.org> | 2012-05-20 07:56:56 -0400 |
| commit | 05375e66ff24d929c15903dccf04a88e383f6bdd (patch) | |
| tree | aac064abaf8883abab035b420adfaf87fa71a025 | |
| parent | 34d585363eef199b024016f1dcfa916db206cb32 (diff) | |
| download | colm-05375e66ff24d929c15903dccf04a88e383f6bdd.tar.gz | |
updated accumbt1 and backtrack3 for follow-ignore
Don't need to explicitly collect EOF tokens, they get included in the previous
token.
| -rw-r--r-- | test/accumbt1.exp | 3 | ||||
| -rw-r--r-- | test/accumbt1.lm | 4 | ||||
| -rw-r--r-- | test/backtrack3.exp | 3 | ||||
| -rw-r--r-- | test/backtrack3.lm | 4 |
4 files changed, 4 insertions, 10 deletions
diff --git a/test/accumbt1.exp b/test/accumbt1.exp index 70c9cd74..c315ba6d 100644 --- a/test/accumbt1.exp +++ b/test/accumbt1.exp @@ -1,2 +1 @@ -<start><prefix><id>id</id></prefix><choice1><number>77</number></choice1><choice2><number>88</number></choice2><string>"hello"</string><id>dude</id><id>dude</id><EOF> -</EOF></start>
\ No newline at end of file +<start><prefix><id>id</id></prefix><choice1><number>77</number></choice1><choice2><number>88</number></choice2><string>"hello"</string><id>dude</id><id>dude</id></start>
\ No newline at end of file diff --git a/test/accumbt1.lm b/test/accumbt1.lm index 4576e1de..21ca594d 100644 --- a/test/accumbt1.lm +++ b/test/accumbt1.lm @@ -20,10 +20,8 @@ def choice2 | [id number] | [number] -token EOF /ws+/ - def start - [prefix choice1 choice2 string id id EOF] + [prefix choice1 choice2 string id id] cons I: parser<start> [] diff --git a/test/backtrack3.exp b/test/backtrack3.exp index f1a6ae39..c315ba6d 100644 --- a/test/backtrack3.exp +++ b/test/backtrack3.exp @@ -1,2 +1 @@ -<start><prefix><id>id</id></prefix><choice1><number>77</number></choice1><choice2><number>88</number></choice2><string>"hello"</string><id>dude</id><id>dude</id><EOL> -</EOL></start>
\ No newline at end of file +<start><prefix><id>id</id></prefix><choice1><number>77</number></choice1><choice2><number>88</number></choice2><string>"hello"</string><id>dude</id><id>dude</id></start>
\ No newline at end of file diff --git a/test/backtrack3.lm b/test/backtrack3.lm index e8670064..a0f201ea 100644 --- a/test/backtrack3.lm +++ b/test/backtrack3.lm @@ -20,10 +20,8 @@ def choice2 | [id number] | [number] -token EOL /'\n'/ - def start - [prefix choice1 choice2 string id id EOL] + [prefix choice1 choice2 string id id] { print_xml( match lhs "id 77 88 \"hello\" dude dude\n" ) } |