projects
/
sbp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ba93ca5
)
checkpoint
author
adam
<adam@megacz.com>
Tue, 13 Dec 2005 07:53:55 +0000
(
02:53
-0500)
committer
adam
<adam@megacz.com>
Tue, 13 Dec 2005 07:53:55 +0000
(
02:53
-0500)
darcs-hash:
20051213075355
-5007d-
374a1834cda482a04acc40d7237abbc264243276
.gz
tests/meta.g
patch
|
blob
|
history
tests/testcase.g
patch
|
blob
|
history
diff --git
a/tests/meta.g
b/tests/meta.g
index
3c191d4
..
c89fae1
100644
(file)
--- a/
tests/meta.g
+++ b/
tests/meta.g
@@
-1,18
+1,18
@@
s ::= ws grammar ws => "gram"
ws !::= w**
s ::= ws grammar ws => "gram"
ws !::= w**
-grammar ::= r+/ws => "grammar"
+grammar ::= r$$ws => "grammar"
r ::= word ^"::=" alternatives /ws
| word ^"!::=" alternatives /ws
ec ::= [~\]\\\-\~] | escaped
r ::= word ^"::=" alternatives /ws
| word ^"!::=" alternatives /ws
ec ::= [~\]\\\-\~] | escaped
-alternatives ::= equiAlt +/ (ws ">" ws)
-equiAlt ::= conjuncts +/ (ws "|" ws) => "alternatives"
+alternatives ::= equiAlt $$ (ws ">" ws)
+equiAlt ::= conjuncts $$ (ws "|" ws) => "alternatives"
sequence ::= Es
> Es ^"/" e /ws
Es ::= e+
sequence ::= Es
> Es ^"/" e /ws
Es ::= e+
-es ::= e+/ws
+es ::= e$$ws
conjuncts ::= rewrite
conjuncts ::= rewrite
@@
-31,7
+31,6
@@
e ::= word => "nonTerminalY"
| [(][)] => "epsilon"
| ^"{" alternatives "}" /ws
| "[" [\~]? range* "]" => "range"
| [(][)] => "epsilon"
| ^"{" alternatives "}" /ws
| "[" [\~]? range* "]" => "range"
- | e ^"+/" e /ws
| e ^"%%" e /ws
| e ^"$$" e /ws
| e ^"?" /ws
| e ^"%%" e /ws
| e ^"$$" e /ws
| e ^"?" /ws
diff --git
a/tests/testcase.g
b/tests/testcase.g
index
920717e
..
9e15176
100644
(file)
--- a/
tests/testcase.g
+++ b/
tests/testcase.g
@@
-1,7
+1,7
@@
ts ::= ws tests ws => ts
tests ::= test %% ws
ws !::= w*
ts ::= ws tests ws => ts
tests ::= test %% ws
ws !::= w*
-test ::= ^"testcase" "{" input output+/ws grammar "}" /ws
+test ::= ^"testcase" "{" input output $$ ws grammar "}" /ws
| ^"testcase" "{" input grammar "}" /ws
output ::= "output" quoted ";" /ws
input ::= "input" quoted ";" /ws
| ^"testcase" "{" input grammar "}" /ws
output ::= "output" quoted ";" /ws
input ::= "input" quoted ";" /ws