fixed an issue when (probably) multiplying list and tensor

Author: mcDandy

more_math/Parser/MathExpr.g4

@@ -23,9 +23,9 @@ stmt:
 ifStmt: IF LPAREN expr RPAREN stmt (ELSE stmt)?;
 whileStmt: WHILE LPAREN expr RPAREN stmt;
 block: LBRACE stmt* RBRACE;
-breakStmt: BRK SEMICOLON;
-continueStmt: CONT SEMICOLON;
-returnStmt: RET expr? SEMICOLON;
+breakStmt: BREAK SEMICOLON;
+continueStmt: CONTINUE SEMICOLON;
+returnStmt: RETURN expr? SEMICOLON;
 
 expr: ternaryExpr | atom | compExpr;
 
@@ -281,7 +281,7 @@ REMAP: 'remap';
 IF: 'if';
 ELSE: 'else';
 WHILE: 'while';
-RET: 'return';
+RETURN: 'return';
 PUSH: 'push';
 POP: 'pop';
 CLEAR: 'clear';
@@ -303,8 +303,8 @@ SORT: 'sort';
 APPEND: 'append';
 
 TIMESTAMP: 'timestamp' | 'now';
-BRK: 'break';
-CONT: 'continue';
+BREAK: 'break';
+CONTINUE: 'continue';
 
 PLUS: '+';
 MINUS: '-';
@@ -339,4 +339,4 @@ VARIABLE: [a-zA-Z_] [a-zA-Z_0-9]*;
 
 SL_COMMENT : '#' ~[\r\n]* -> skip;
 ML_COMMENT : '/*' .*? '*/' -> skip;
-WS: [ \t\r\n]+ -> skip;
+WS: [ \t\r\n]+ -> skip;

more_math/Parser/MathExpr.interp

@@ -221,7 +221,7 @@ REMAP
 IF
 ELSE
 WHILE
-RET
+RETURN
 PUSH
 POP
 CLEAR
@@ -240,8 +240,8 @@ COV
 SORT
 APPEND
 TIMESTAMP
-BRK
-CONT
+BREAK
+CONTINUE
 PLUS
 MINUS
 MULT

more_math/Parser/MathExpr.tokens

@@ -81,7 +81,7 @@ REMAP=80
 IF=81
 ELSE=82
 WHILE=83
-RET=84
+RETURN=84
 PUSH=85
 POP=86
 CLEAR=87
@@ -100,8 +100,8 @@ COV=99
 SORT=100
 APPEND=101
 TIMESTAMP=102
-BRK=103
-CONT=104
+BREAK=103
+CONTINUE=104
 PLUS=105
 MINUS=106
 MULT=107

more_math/Parser/MathExprLexer.interp

@@ -221,7 +221,7 @@ REMAP
 IF
 ELSE
 WHILE
-RET
+RETURN
 PUSH
 POP
 CLEAR
@@ -240,8 +240,8 @@ COV
 SORT
 APPEND
 TIMESTAMP
-BRK
-CONT
+BREAK
+CONTINUE
 PLUS
 MINUS
 MULT
@@ -358,7 +358,7 @@ REMAP
 IF
 ELSE
 WHILE
-RET
+RETURN
 PUSH
 POP
 CLEAR
@@ -377,8 +377,8 @@ COV
 SORT
 APPEND
 TIMESTAMP
-BRK
-CONT
+BREAK
+CONTINUE
 PLUS
 MINUS
 MULT

more_math/Parser/MathExprLexer.py

@@ -562,7 +562,7 @@ class MathExprLexer(Lexer):
     IF = 81
     ELSE = 82
     WHILE = 83
-    RET = 84
+    RETURN = 84
     PUSH = 85
     POP = 86
     CLEAR = 87
@@ -581,8 +581,8 @@ class MathExprLexer(Lexer):
     SORT = 100
     APPEND = 101
     TIMESTAMP = 102
-    BRK = 103
-    CONT = 104
+    BREAK = 103
+    CONTINUE = 104
     PLUS = 105
     MINUS = 106
     MULT = 107
@@ -650,15 +650,15 @@ class MathExprLexer(Lexer):
             "PERCENTILE", "QUANTILE", "DOT", "MOMENT", "ANY", "ALL", "EDGE", 
             "GAUSSIAN", "MEDIAN", "MODE", "CUMSUM", "CUMPROD", "TOPK_IND", 
             "BOTK_IND", "CUBIC_EASE", "ELASTIC_EASE", "SINE_EASE", "SMOOTHERSTEP", 
-            "DIST", "REMAP", "IF", "ELSE", "WHILE", "RET", "PUSH", "POP", 
+            "DIST", "REMAP", "IF", "ELSE", "WHILE", "RETURN", "PUSH", "POP", 
             "CLEAR", "HAS", "GET", "NOISE", "RAND", "CAUCHY", "EXPONENTIAL", 
             "LOGNORMAL", "BERNOULLI", "POISSON", "COSSIM", "FLIP", "COV", 
-            "SORT", "APPEND", "TIMESTAMP", "BRK", "CONT", "PLUS", "MINUS", 
-            "MULT", "DIV", "MOD", "POW", "GE", "GT", "LE", "LT", "EQ", "EQUEALS", 
-            "NE", "PIPE", "LPAREN", "RPAREN", "COMMA", "SEMICOLON", "ARROW", 
-            "LBRACKET", "RBRACKET", "QUESTION", "COLON", "LBRACE", "RBRACE", 
-            "CONSTANT", "NUMBER", "VARIABLE", "SL_COMMENT", "ML_COMMENT", 
-            "WS" ]
+            "SORT", "APPEND", "TIMESTAMP", "BREAK", "CONTINUE", "PLUS", 
+            "MINUS", "MULT", "DIV", "MOD", "POW", "GE", "GT", "LE", "LT", 
+            "EQ", "EQUEALS", "NE", "PIPE", "LPAREN", "RPAREN", "COMMA", 
+            "SEMICOLON", "ARROW", "LBRACKET", "RBRACKET", "QUESTION", "COLON", 
+            "LBRACE", "RBRACE", "CONSTANT", "NUMBER", "VARIABLE", "SL_COMMENT", 
+            "ML_COMMENT", "WS" ]
 
     ruleNames = [ "SIN", "COS", "TAN", "ASIN", "ACOS", "ATAN", "ATAN2", 
                   "SINH", "COSH", "TANH", "ASINH", "ACOSH", "ATANH", "ABS", 
@@ -672,12 +672,12 @@ class MathExprLexer(Lexer):
                   "DOT", "MOMENT", "ANY", "ALL", "EDGE", "GAUSSIAN", "MEDIAN", 
                   "MODE", "CUMSUM", "CUMPROD", "TOPK_IND", "BOTK_IND", "CUBIC_EASE", 
                   "ELASTIC_EASE", "SINE_EASE", "SMOOTHERSTEP", "DIST", "REMAP", 
-                  "IF", "ELSE", "WHILE", "RET", "PUSH", "POP", "CLEAR", 
+                  "IF", "ELSE", "WHILE", "RETURN", "PUSH", "POP", "CLEAR", 
                   "HAS", "GET", "NOISE", "RAND", "CAUCHY", "EXPONENTIAL", 
                   "LOGNORMAL", "BERNOULLI", "POISSON", "COSSIM", "FLIP", 
-                  "COV", "SORT", "APPEND", "TIMESTAMP", "BRK", "CONT", "PLUS", 
-                  "MINUS", "MULT", "DIV", "MOD", "POW", "GE", "GT", "LE", 
-                  "LT", "EQ", "EQUEALS", "NE", "PIPE", "LPAREN", "RPAREN", 
+                  "COV", "SORT", "APPEND", "TIMESTAMP", "BREAK", "CONTINUE", 
+                  "PLUS", "MINUS", "MULT", "DIV", "MOD", "POW", "GE", "GT", 
+                  "LE", "LT", "EQ", "EQUEALS", "NE", "PIPE", "LPAREN", "RPAREN", 
                   "COMMA", "SEMICOLON", "ARROW", "LBRACKET", "RBRACKET", 
                   "QUESTION", "COLON", "LBRACE", "RBRACE", "CONSTANT", "NUMBER", 
                   "VARIABLE", "SL_COMMENT", "ML_COMMENT", "WS" ]

more_math/Parser/MathExprLexer.tokens

@@ -81,7 +81,7 @@ REMAP=80
 IF=81
 ELSE=82
 WHILE=83
-RET=84
+RETURN=84
 PUSH=85
 POP=86
 CLEAR=87
@@ -100,8 +100,8 @@ COV=99
 SORT=100
 APPEND=101
 TIMESTAMP=102
-BRK=103
-CONT=104
+BREAK=103
+CONTINUE=104
 PLUS=105
 MINUS=106
 MULT=107