X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmeta%2Fmeta.g;h=a468d3226bc86190e16a7985c3bfcdf6819f9404;hb=f95343b3b6e918434ff68924e79df22b9cb074e8;hp=f06eb2f42010e4165a6b498eb7203b98d8645e84;hpb=bea819e3a90c7cc18159e43250b3af87602295f8;p=sbp.git

diff --git a/src/edu/berkeley/sbp/meta/meta.g b/src/edu/berkeley/sbp/meta/meta.g
index f06eb2f..a468d32 100644
--- 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
               |                  ^"()"
-              |                  ^"{" PreSequence "}"    /ws
               |                  ^"["  Range* "]"
               |                e ^"++"                   /ws -> ~[/]
               |                e ^"+"                    /ws -> ~[+]
@@ -51,8 +50,6 @@ e             =                                   e ^"!"
               |                   "(" Word  ^")"
               >                  ^"(" RHS  ")"           /ws
               |                 "~":: ("~" -> ~"~")!  e
-              |                  ^"\\{"
-              |                  ^"\\}"
               |                  ^">>"
               |                  ^"<<"
 
@@ -71,7 +68,8 @@ ec            = ~[\-\]\\<>]
               | 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