'and' and 'or' keywords may now be directly adjacent a comment

c6447bc5 · Taddeüs Kroes · 70f032a3 · c6447bc5
Commit c6447bc5 authored Jul 21, 2014 by Taddeüs Kroes
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

lexer.mll lexer.mll +4 -2

No files found.
--- a/lexer.mll
+++ b/lexer.mll
@@ -108,8 +108,10 @@ rule token = parse
  | '@' uagent K E Y F R A M E S  { KEYFRAMES_SYM }
  | '@' S U P P O R T S           { SUPPORTS_SYM }

-  | (s | comment)* s A N D s (s | comment)*  { advance_pos lexbuf; WS_AND }
-  | (s | comment)* s O R   s (s | comment)*  { advance_pos lexbuf; WS_OR }
+  | (s | comment)* s comment* A N D comment* s (s | comment)*
+  { advance_pos lexbuf; WS_AND }
+  | (s | comment)* s comment* O R   comment* s (s | comment)*
+  { advance_pos lexbuf; WS_OR }

  | O N L Y             { ONLY }
  | N O T               { NOT }