WIP

0cc1048e · Johannes Mey · 0f8bf9c8 · 0cc1048e · 0cc1048e
Commit 0cc1048e authored Apr 16, 2020 by Johannes Mey
Showing with 5 additions and 4 deletions

ros2rag.base/src/main/jastadd/RelAst.flex ros2rag.base/src/main/jastadd/RelAst.flex +3 -2

ros2rag.base/src/test/resources/MinimalExample.relast ros2rag.base/src/test/resources/MinimalExample.relast +2 -2

No files found.
--- a/ros2rag.base/src/main/jastadd/RelAst.flex
+++ b/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$_]*


--- a/ros2rag.base/src/test/resources/MinimalExample.relast
+++ b/ros2rag.base/src/test/resources/MinimalExample.relast
-Model ::= RobotArm ZoneModel ;
-
+Model ::= RobotArm ZoneModel ; // comment 1
+// comment 2
 ZoneModel ::= Size:Position SafetyZone:Zone*;

 Zone ::= Position*;