From c6447bc5b0456ec54e4b81703e1587aaaf49b7b9 Mon Sep 17 00:00:00 2001
From: Taddeus Kroes <taddeuskroes@gmail.com>
Date: Mon, 21 Jul 2014 15:11:31 +0200
Subject: [PATCH] 'and' and 'or' keywords may now be directly adjacent a
 comment

---
 lexer.mll | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lexer.mll b/lexer.mll
index 3b2a870..a04b19f 100644
--- 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 }
-- 
GitLab