From 2ee4dfd507653d01be45b2412e3e6714d2cd0af1 Mon Sep 17 00:00:00 2001 From: mcDandy Date: Sun, 1 Feb 2026 15:19:24 +0100 Subject: [PATCH] crop, get_value + formating --- more_math/Parser/MathExpr.g4 | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/more_math/Parser/MathExpr.g4 b/more_math/Parser/MathExpr.g4 index 32a1896..14576c5 100644 --- a/more_math/Parser/MathExpr.g4 +++ b/more_math/Parser/MathExpr.g4 @@ -66,7 +66,7 @@ indexExpr: // Atoms: function calls, variable, number, constant, or parenthesized expression atom: - func0 # Func0Exp + func0 # Func0Exp | func1 # Func1Exp | func2 # Func2Exp | func3 # Func3Exp @@ -83,8 +83,7 @@ atom: exprList: expr (COMMA expr)*; -func0: - TIMESTAMP LPAREN RPAREN #TimestampFunc; +func0: TIMESTAMP LPAREN RPAREN # TimestampFunc; // Single-argument functions func1: SIN LPAREN expr RPAREN # SinFunc @@ -179,7 +178,9 @@ func3: | CUBIC_EASE LPAREN expr COMMA expr COMMA expr RPAREN # CubicEaseFunc | ELASTIC_EASE LPAREN expr COMMA expr COMMA expr RPAREN # ElasticEaseFunc | SINE_EASE LPAREN expr COMMA expr COMMA expr RPAREN # SineEaseFunc - | SMOOTHERSTEP LPAREN expr COMMA expr COMMA expr RPAREN # SmootherstepFunc; + | SINE_EASE LPAREN expr COMMA expr COMMA expr RPAREN # SineEaseFunc + | SMOOTHERSTEP LPAREN expr COMMA expr COMMA expr RPAREN # SmootherstepFunc + | CROP LPAREN expr COMMA expr COMMA expr RPAREN # CropFunc; func4: SWAP LPAREN expr COMMA expr COMMA expr COMMA expr RPAREN # SwapFunc @@ -305,6 +306,8 @@ FLIP: 'flip'; COV: 'cov'; SORT: 'sort'; APPEND: 'append'; +GET_VALUE: 'get_value'; +CROP: 'crop'; FOR: 'for'; IN: 'in'; @@ -343,6 +346,6 @@ NUMBER: ([0-9]+ ('.' [0-9]*)? | '.' [0-9]+) ([eE][+-]? [0-9]+)?; CONSTANT: ('pi' | 'PI' | 'e' | 'E'); VARIABLE: [a-zA-Z_] [a-zA-Z_0-9]*; -SL_COMMENT : '#' ~[\r\n]* -> skip; -ML_COMMENT : '/*' .*? '*/' -> skip; +SL_COMMENT: '#' ~[\r\n]* -> skip; +ML_COMMENT: '/*' .*? '*/' -> skip; WS: [ \t\r\n]+ -> skip; \ No newline at end of file