fixes to grammar file

diff --git a/src/edu/berkeley/fleet/assembler/fleet.g b/src/edu/berkeley/fleet/assembler/fleet.g
index cf1f9ef..dc36134 100644 (file)
--- a/src/edu/berkeley/fleet/assembler/fleet.g
+++ b/src/edu/berkeley/fleet/assembler/fleet.g
@@ -5,8 +5,8 @@
 // the grammar.  An equivalent lex+yacc grammar and support code would
 // be several times as long.
 
-Comment        = "//" ~[\n]* "\n"
-               | "/*" ~[\n]* "*/"
+Comment        = "//" ~[\n\r]* [\r\n]!
+               | "/*" ~[\n\r]* "*/"
 ws             = ([\r\n ] | Comment)* -> ~[\r\n ]
 
 s               = ws! Program ws!
@@ -17,7 +17,9 @@ Statement       = Fiber::        Source ":" (Instruction +/ ws)     /ws
                 | Literal::      int    ":" "sendto" Port       ";" /ws
                 | NamedCodeBag:: name   ":" "{" CodeBagBody "}"     /ws
 
-Instruction     = Instruction:: (Brack:: "[" (int|(Star::"*"))? ("r")? "]" ws!)? (Command +/ (ws! "," ws!) ws! ";"!)
+Instruction     = Instruction::
+                        (Brack:: "[" (int|(Star::"*"))? ("r")? "]" ws!)?
+                        (Command +/ (ws! "," ws!) ws! ";"!)
 Command         = Nop::     "nop"
                 | Kill::    "kill"
                 | Wait::    "wait"