Skip to content

Commit

Permalink
feat: textContains expr. function [DHIS2-16211] (#48)
Browse files Browse the repository at this point in the history
* feat: textContains expr. function [DHIS2-16211]

* bump version

* Bump to 1.0.35
  • Loading branch information
jimgrace authored Jan 24, 2024
1 parent 1291a8f commit 6d8927d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<packaging>jar</packaging>
<name>DHIS Antlr Expression Parser</name>
<groupId>org.hisp.dhis.parser</groupId>
<version>1.0.34-SNAPSHOT</version>
<version>1.0.35</version>

<description>Antlr Expression Parser</description>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ grammar Expression;
// Parser rules
// -----------------------------------------------------------------------------

// Note: ANTLR symbols for optional or repeating:
// ? -> 0 or 1
// * -> 0 or more
// + -> 1 or more

expression // The expression must last until the end of the string
: expr EOF
;
Expand Down Expand Up @@ -59,6 +64,7 @@ expr
| it='orgUnit.program(' WS* UID WS* (',' WS* UID WS* )* ')'
| it='removeZeros(' expr ')'
| it='subExpression(' expr ')'
| it='textContains(' expr (',' expr )+ ')'

// Aggergation functions (alphabetical)

Expand Down Expand Up @@ -303,6 +309,7 @@ ORGUNIT_GROUP : 'orgUnit.group(';
ORGUNIT_PROGRAM : 'orgUnit.program(';
REMOVE_ZEROS : 'removeZeros(';
SUB_EXPRESSION : 'subExpression(';
TEXT_CONTAINS : 'textContains(';

// Aggegation functions (alphabetical)

Expand Down

0 comments on commit 6d8927d

Please sign in to comment.