From 5a32ae0f92f6062e173213224e9897b8bfae200e Mon Sep 17 00:00:00 2001 From: mailravi3390 Date: Thu, 2 Apr 2020 15:54:45 -0700 Subject: [PATCH 1/3] absolute quick and dirty --- core/src/main/antlr4/MetricExpression.g4 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/src/main/antlr4/MetricExpression.g4 b/core/src/main/antlr4/MetricExpression.g4 index 2c42a93416..5b112c4f56 100644 --- a/core/src/main/antlr4/MetricExpression.g4 +++ b/core/src/main/antlr4/MetricExpression.g4 @@ -34,6 +34,7 @@ logicalOperands : relationalExpression | TRUE | FALSE ; arthmeticExpression : '(' arthmeticExpression ')' #paren_arith_rule + | ABSOLUTE '(' arthmeticExpression ')' #abs_rule | arthmeticExpression '%' arthmeticExpression #mod_arith_rule | arthmeticExpression ('/'|'*') arthmeticExpression #divmul_arith_rule | arthmeticExpression ('-'|'+') arthmeticExpression #addsub_arith_rule @@ -77,6 +78,8 @@ not : N O T | '!' TRUE : T R U E; FALSE: F A L S E; +ABSOLUTE: A B S O L U T E + modulo : '%' ; metric: REX; From 9413ef96178d59a0d270507cd411d7a2a4e426c9 Mon Sep 17 00:00:00 2001 From: mailravi3390 Date: Thu, 2 Apr 2020 15:58:13 -0700 Subject: [PATCH 2/3] change to ABS --- core/src/main/antlr4/MetricExpression.g4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/antlr4/MetricExpression.g4 b/core/src/main/antlr4/MetricExpression.g4 index 5b112c4f56..58eda106f1 100644 --- a/core/src/main/antlr4/MetricExpression.g4 +++ b/core/src/main/antlr4/MetricExpression.g4 @@ -78,7 +78,7 @@ not : N O T | '!' TRUE : T R U E; FALSE: F A L S E; -ABSOLUTE: A B S O L U T E +ABSOLUTE: A B S modulo : '%' ; From ec8cdf8c60f18a26d8ffeabb34fc883913cd4bc4 Mon Sep 17 00:00:00 2001 From: mailravi3390 Date: Thu, 21 May 2020 16:01:06 -0700 Subject: [PATCH 3/3] Add semi colon --- core/src/main/antlr4/MetricExpression.g4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/antlr4/MetricExpression.g4 b/core/src/main/antlr4/MetricExpression.g4 index 58eda106f1..1df365f180 100644 --- a/core/src/main/antlr4/MetricExpression.g4 +++ b/core/src/main/antlr4/MetricExpression.g4 @@ -78,7 +78,7 @@ not : N O T | '!' TRUE : T R U E; FALSE: F A L S E; -ABSOLUTE: A B S +ABSOLUTE: A B S; modulo : '%' ;