diff --git a/ros2rag.base/src/main/jastadd/RelAst.flex b/ros2rag.base/src/main/jastadd/RelAst.flex index b0a3fd2e5ad19d90580960340bd7b99b35a1897a..f432c065bc5d241e5277d9fb22b0b5ba430b0687 100644 --- 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$_]* diff --git a/ros2rag.base/src/test/resources/MinimalExample.relast b/ros2rag.base/src/test/resources/MinimalExample.relast index 7152bd150d0a8daba192dff6993d8760ff390a41..20ed428a6024113b11aa02303b010fb345c87284 100644 --- a/ros2rag.base/src/test/resources/MinimalExample.relast +++ b/ros2rag.base/src/test/resources/MinimalExample.relast @@ -1,5 +1,5 @@ -Model ::= RobotArm ZoneModel ; - +Model ::= RobotArm ZoneModel ; // comment 1 +// comment 2 ZoneModel ::= Size:Position SafetyZone:Zone*; Zone ::= Position*;