projects
/
sbp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove stale logging code from Cartesian
[sbp.git]
/
tests
/
meta.g
diff --git
a/tests/meta.g
b/tests/meta.g
index
4416d55
..
abe03f3
100644
(file)
--- a/
tests/meta.g
+++ b/
tests/meta.g
@@
-7,9
+7,8
@@
s = ws! Grammar ws!
Grammar = Declaration +/ ws
Declaration = NonTerminal
Grammar = Declaration +/ ws
Declaration = NonTerminal
- | ^"#import" ws! FileName (ws! "as" ws! Prefix)?
+ | ^"#import" ws! FileName (ws! "as" ws! Word)?
-Prefix = ([a-zA-Z] ".")+ "*"
FileName = FileNameChar+ -> [\r\n ]
FileNameChar = Space:: "\\ "
| ~[\r\n ]
FileName = FileNameChar+ -> [\r\n ]
FileNameChar = Space:: "\\ "
| ~[\r\n ]
@@
-35,7
+34,7
@@
ec = ~[\-\]\\]
| escaped
Range = ec
| escaped
Range = ec
- | ec ^"-" ec
+ | ec "-" ec
e = (Quoted|Word) ^":" e
> NonTerminalReference
e = (Quoted|Word) ^":" e
> NonTerminalReference
@@
-56,6
+55,8
@@
e = (Quoted|Word) ^":" e
| ^"^" Quoted
> ^"(" RHS ")" /ws
| ^"~" e
| ^"^" Quoted
> ^"(" RHS ")" /ws
| ^"~" e
+ | ^"\\{"
+ | ^"\\}"
NonTerminalReference = Word
Literal = Quoted
NonTerminalReference = Word
Literal = Quoted
@@
-69,6
+70,6
@@
escaped = "\n":: "\\n"
| "\\" ~[nr]
w = " " | "\n" | "\r"
| "\\" ~[nr]
w = " " | "\n" | "\r"
-ws = "()":: w**
- | "()":: w** "//" (~[\n])* "\n" ws
+ws = w**
+ | w** "//" (~[\n])*! "\n" ws!
wp = w++
wp = w++