Use a better label name for the isnull functional operator

statisticsnorway · Mar 13, 2017 · 41adadd · 41adadd
1 parent 5b789db
commit 41adadd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/java-vtl-parser/src/main/antlr4/no/ssb/vtl/parser/VTL.g4 b/java-vtl-parser/src/main/antlr4/no/ssb/vtl/parser/VTL.g4
@@ -99,7 +99,7 @@ aggregate   : 'aggregate' ;
 
 booleanExpression                                                                                       //Evaluation order of the operators
     : '(' booleanExpression ')'                                                 # BooleanPrecedence     // I
-    | func=ISNULL_FUNC '(' booleanParam ')'                                     # BooleanFunction       // II  All functional operators
+    | ISNULL_FUNC '(' booleanParam ')'                                          # BooleanIsNullFunction // II  All functional operators
     | booleanParam op=(ISNULL|ISNOTNULL)                                        # BooleanPostfix        // ??
     | left=booleanParam op=( LE | LT | GE | GT ) right=booleanParam             # BooleanEquality       // VII
     | op=NOT booleanExpression                                                  # BooleanNot            // IV

diff --git a/java-vtl-script/src/main/java/no/ssb/vtl/script/visitors/BooleanExpressionVisitor.java b/java-vtl-script/src/main/java/no/ssb/vtl/script/visitors/BooleanExpressionVisitor.java
@@ -80,7 +80,7 @@ public VTLPredicate visitBooleanPostfix(VTLParser.BooleanPostfixContext ctx) {
     }
 
     @Override
-    public VTLPredicate visitBooleanFunction(VTLParser.BooleanFunctionContext ctx) {
+    public VTLPredicate visitBooleanIsNullFunction(VTLParser.BooleanIsNullFunctionContext ctx) {
         ParamVisitor paramVisitor = new ParamVisitor(referenceVisitor);
         Object ref = paramVisitor.visit(ctx.booleanParam());
         return getIsNullPredicate(ref);