From 0cc1048e145185a5001a2f1b642caafa052a2df9 Mon Sep 17 00:00:00 2001 From: Johannes Mey <johannes.mey@tu-dresden.de> Date: Thu, 16 Apr 2020 15:19:10 +0200 Subject: [PATCH] WIP --- ros2rag.base/src/main/jastadd/RelAst.flex | 5 +++-- ros2rag.base/src/test/resources/MinimalExample.relast | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ros2rag.base/src/main/jastadd/RelAst.flex b/ros2rag.base/src/main/jastadd/RelAst.flex index b0a3fd2..f432c06 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 7152bd1..20ed428 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*; -- GitLab