Merge pull request #47 from dhis2/DHIS2-15035

feat: Add support for comments in expression

.github/workflows/main.yml

@@ -22,7 +22,7 @@ jobs:
 
   artifact:
     name: Publish - Nexus
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     needs: unit-test
 
     steps:

.github/workflows/master.yml

@@ -25,7 +25,7 @@ jobs:
 
   artifact:
     name: Publish - Nexus
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     needs: unit-test
 
     steps:

pom.xml

@@ -7,7 +7,7 @@
   <packaging>jar</packaging>
   <name>DHIS Antlr Expression Parser</name>
   <groupId>org.hisp.dhis.parser</groupId>
-  <version>1.0.33</version>
+  <version>1.0.34-SNAPSHOT</version>
 
   <description>Antlr Expression Parser</description>
 

src/main/antlr4/org/hisp/dhis/parser/expression/antlr/Expression.g4

@@ -170,6 +170,7 @@ expr
     |   numericLiteral
     |   stringLiteral
     |   booleanLiteral
+    |   comments
     ;
 
 programVariable   // (alphabtical)
@@ -241,6 +242,10 @@ programRuleVariablePart
     |   '.'
     ;
 
+comments
+    :   COMMENT
+    ;
+
 // -----------------------------------------------------------------------------
 // Assign token names to parser symbols
 // -----------------------------------------------------------------------------
@@ -498,6 +503,12 @@ EMPTY
 WS  :   [ \t\n\r]+
     ;
 
+// Comments
+
+COMMENT
+    :   ('/*' .*? '*/') -> skip
+    ;
+
 // Lexer fragments
 
 fragment Exponent

src/test/java/org/hisp/dhis/antlr/ValidExpressionTest.java

@@ -65,6 +65,12 @@ public void testExpressionWithValidSyntaxAndNotSupportedVariable()
         evaluate( "2 > V{not_supported}" );
     }
 
+    @Test
+    public void testMultiLineComments()
+    {
+        assertEquals( true, evaluate( "true and true || 1 /* this is multi \n  line comment \r */" ) );
+    }
+
     @Test(expected = ParserExceptionWithoutContext.class)
     public void testExpressionWithValidSyntaxAndNotSupportedAttribute()
     {