WIP

ros2rag.base/src/main/jastadd/RelAst.flex

@@ -35,10 +35,11 @@ import org.jastadd.ros2rag.parser.RelAstParser.Terminals;
   }
 %}
 
-WhiteSpace = [ ] | \t | \f | \n | \r | \r\n
+WhiteSpace = [ ] | \t | \f
+Newline = \n | \r | \r\n
 TraditionalComment   = [/][*][^*]*[*]+([^*/][^*]*[*]+)*[/]
 EndOfLineComment = "//" [^\n\r]*
-Comment = {TraditionalComment} | {EndOfLineComment}
+Comment = {TraditionalComment} | {EndOfLineComment} | {Newline}
 
 ID = [a-zA-Z$_][a-zA-Z0-9$_]*
 

ros2rag.base/src/test/resources/MinimalExample.relast

-Model ::= RobotArm ZoneModel ;
-
+Model ::= RobotArm ZoneModel ; // comment 1
+// comment 2
 ZoneModel ::= Size:Position SafetyZone:Zone*;
 
 Zone ::= Position*;