Added || shorthand for abs and snorm

Author: mcDandy

README.md

@@ -18,14 +18,14 @@ You can also get the node from comfy manager under the name of More math.
 - Nodes for CONDITIONING, LATENT, IMAGE, NOISE, FLOAT, VIDEO and AUDIO
 
 ## Operators
-- Math: `+`, `-`, `*`, `/`, `%`, `^`
+- Math: `+`, `-`, `*`, `/`, `%`, `^`, `||`
 - Boolean: `<`, `<=`, `>`, `>=`, `==`, `!=`
   (`false = 0.0`, `true = 1.0`)
 
 ## Functions
 
 ### Basic Math
-- `abs(x)`: Absolute value.
+- `abs(x)` or `|x|`: Absolute value. For **float** `abs(x)` and `|x|` are the same. For **tensor** `abs(x)` calculates element-wise absolute value and for `|x|` it calculates L2 norm (euclidean norm).
 - `sqrt(x)`: Square root.
 - `ln(x)`: Natural logarithm (base e).
 - `log(x)`: Logarithm base 10.

more_math/Parser/FloatEvalVisitor.py

@@ -105,6 +105,7 @@ def visitAsinhFunc(self, ctx): return math.asinh(self.visit(ctx.expr()))
     def visitAcoshFunc(self, ctx): return math.acosh(self.visit(ctx.expr()))
     def visitAtanhFunc(self, ctx): return math.atanh(self.visit(ctx.expr()))
     def visitAbsFunc(self, ctx):   return math.abs(self.visit(ctx.expr()))
+    def visitAbsExp(self, ctx):    return math.abs(self.visit(ctx.expr()))
     def visitSqrtFunc(self, ctx):  return math.sqrt(self.visit(ctx.expr()))
     def visitLnFunc(self, ctx):    return math.log(self.visit(ctx.expr()))
     def visitLogFunc(self, ctx):   return math.log10(self.visit(ctx.expr()))

more_math/Parser/MathExpr.g4

@@ -50,6 +50,7 @@ atom
     | NUMBER                 # NumberExp
     | CONSTANT               # ConstantExp
     | '(' expr ')'           # ParenExp
+    | PIPE expr PIPE         # AbsExp
     ;
 
 // Single-argument functions
@@ -174,6 +175,7 @@ LE          : '<=';
 LT          : '<';
 EQ          : '==';
 NE          : '!=';
+PIPE        : '|';
 
 CONSTANT : ('pi'|'PI'|'e'|'E');
 NUMBER   : [0-9]+ ('.' [0-9]+)?;

more_math/Parser/MathExpr.interp

@@ -57,10 +57,11 @@ LE=56
 LT=57
 EQ=58
 NE=59
-CONSTANT=60
-NUMBER=61
-VARIABLE=62
-WS=63
+PIPE=60
+CONSTANT=61
+NUMBER=62
+VARIABLE=63
+WS=64
 '('=1
 ')'=2
 ','=3
@@ -120,3 +121,4 @@ WS=63
 '<'=57
 '=='=58
 '!='=59
+'|'=60

more_math/Parser/MathExpr.tokens

@@ -57,10 +57,11 @@ LE=56
 LT=57
 EQ=58
 NE=59
-CONSTANT=60
-NUMBER=61
-VARIABLE=62
-WS=63
+PIPE=60
+CONSTANT=61
+NUMBER=62
+VARIABLE=63
+WS=64
 '('=1
 ')'=2
 ','=3
@@ -120,3 +121,4 @@ WS=63
 '<'=57
 '=='=58
 '!='=59
+'|'=60

more_math/Parser/MathExprLexer.interp

@@ -1,5 +1,5 @@
-# Generated from src/more_math/Parser/MathExpr.g4 by ANTLR 4.13.2
-from antlr4 import ParseTreeVisitor
+# Generated from ./MathExpr.g4 by ANTLR 4.13.2
+from antlr4 import *
 if "." in __name__:
     from .MathExprParser import MathExprParser
 else:
@@ -154,6 +154,11 @@ def visitParenExp(self, ctx:MathExprParser.ParenExpContext):
         return self.visitChildren(ctx)
 
 
+    # Visit a parse tree produced by MathExprParser#AbsExp.
+    def visitAbsExp(self, ctx:MathExprParser.AbsExpContext):
+        return self.visitChildren(ctx)
+
+
     # Visit a parse tree produced by MathExprParser#SinFunc.
     def visitSinFunc(self, ctx:MathExprParser.SinFuncContext):
         return self.visitChildren(ctx)