projects
/
sbp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add LabelNode
[sbp.git]
/
src
/
edu
/
berkeley
/
sbp
/
meta
/
meta.g
diff --git
a/src/edu/berkeley/sbp/meta/meta.g
b/src/edu/berkeley/sbp/meta/meta.g
index
f06eb2f
..
a468d32
100644
(file)
--- a/
src/edu/berkeley/sbp/meta/meta.g
+++ b/
src/edu/berkeley/sbp/meta/meta.g
@@
-34,7
+34,6
@@
e = e ^"!"
> NonTerminalReference:: Word
| Literal:: Quoted
| ^"()"
> NonTerminalReference:: Word
| Literal:: Quoted
| ^"()"
- | ^"{" PreSequence "}" /ws
| ^"[" Range* "]"
| e ^"++" /ws -> ~[/]
| e ^"+" /ws -> ~[+]
| ^"[" Range* "]"
| e ^"++" /ws -> ~[/]
| e ^"+" /ws -> ~[+]
@@
-51,8
+50,6
@@
e = e ^"!"
| "(" Word ^")"
> ^"(" RHS ")" /ws
| "~":: ("~" -> ~"~")! e
| "(" Word ^")"
> ^"(" RHS ")" /ws
| "~":: ("~" -> ~"~")! e
- | ^"\\{"
- | ^"\\}"
| ^">>"
| ^"<<"
| ^">>"
| ^"<<"
@@
-71,7
+68,8
@@
ec = ~[\-\]\\<>]
| escaped
escaped = "\n":: "\\n"
| "\r":: "\\r"
| escaped
escaped = "\n":: "\\n"
| "\r":: "\\r"
- | "\\" ~[nr]
+ | "\t":: "\\t"
+ | "\\" ~[nrt]
-ws! = [ \r\n]**
- | [ \r\n]** "//" ~[\n]* "\n" ws
+ws! = [ \r\t\n]**
+ | [ \r\t\n]** "//" ~[\n]* "\n" ws