nodes/mcDandy-more_math
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

correct name

Browse Source
This commit is contained in:
mcDandy
2026-05-11 22:42:27 +02:00
parent 0334e24c0c
commit 1f3a85dbdc
10 changed files with 604 additions and 604 deletions
Download Patch File Download Diff File Expand all files Collapse all files
more_math/Parser/MathExpr.g4
+4 -4
View File
@@ -238,12 +238,12 @@ func3:
| LINSPACE LPAREN expr COMMA expr COMMA expr RPAREN # LinspaceFunc
| ROLL LPAREN expr COMMA expr (COMMA expr)? RPAREN # RollFunc
| RGB_TO_OKLAB LPAREN expr (COMMA expr COMMA expr)? RPAREN # RgbToOklabFunc
| RGB_TO_CILAB LPAREN expr (COMMA expr COMMA expr)? RPAREN # RgbToCilabFunc
| RGB_TO_CIELAB LPAREN expr (COMMA expr COMMA expr)? RPAREN # RgbToCielabFunc
| RGB_TO_HSV LPAREN expr (COMMA expr COMMA expr)? (COMMA expr)? RPAREN # RgbToHsvFunc
| HSV_TO_RGB LPAREN expr (COMMA expr COMMA expr)? (COMMA expr)? RPAREN # HsvToRgbFunc
| WHERE LPAREN expr COMMA expr COMMA expr RPAREN # WhereFunc
| OKLAB_TO_RGB LPAREN expr (COMMA expr COMMA expr)? RPAREN # OklabToRgbFunc
| CILAB_TO_RGB LPAREN expr (COMMA expr COMMA expr)? RPAREN # CilabToRgbFunc;
| CIELAB_TO_RGB LPAREN expr (COMMA expr COMMA expr)? RPAREN # CielabToRgbFunc;
func4:
SWAP LPAREN expr COMMA expr COMMA expr COMMA expr RPAREN # SwapFunc
@@ -419,9 +419,9 @@ ERODE: 'erode';
MORPH_OPEN: 'morph_open';
MORPH_CLOSE: 'morph_close';
RGB_TO_OKLAB: 'rgb_to_oklab';
RGB_TO_CILAB: 'rgb_to_cilab';
RGB_TO_CIELAB: 'rgb_to_cielab';
OKLAB_TO_RGB: 'oklab_to_rgb';
CILAB_TO_RGB: 'cielab_to_rgb';
CIELAB_TO_RGB: 'cielab_to_rgb';
RGB_TO_HSV: 'rgb_to_hsv';
HSV_TO_RGB: 'hsv_to_rgb';
INT_TO_RGB: 'int_to_rgb';
more_math/Parser/MathExpr.interp
+3 -3
View File
@@ -131,7 +131,7 @@ null
'morph_open'
'morph_close'
'rgb_to_oklab'
'rgb_to_cilab'
'rgb_to_cielab'
'oklab_to_rgb'
'cielab_to_rgb'
'rgb_to_hsv'
@@ -354,9 +354,9 @@ ERODE
MORPH_OPEN
MORPH_CLOSE
RGB_TO_OKLAB
RGB_TO_CILAB
RGB_TO_CIELAB
OKLAB_TO_RGB
CILAB_TO_RGB
CIELAB_TO_RGB
RGB_TO_HSV
HSV_TO_RGB
INT_TO_RGB
more_math/Parser/MathExpr.tokens
+3 -3
View File
@@ -129,9 +129,9 @@ ERODE=128
MORPH_OPEN=129
MORPH_CLOSE=130
RGB_TO_OKLAB=131
RGB_TO_CILAB=132
RGB_TO_CIELAB=132
OKLAB_TO_RGB=133
CILAB_TO_RGB=134
CIELAB_TO_RGB=134
RGB_TO_HSV=135
HSV_TO_RGB=136
INT_TO_RGB=137
@@ -322,7 +322,7 @@ WS=220
'morph_open'=129
'morph_close'=130
'rgb_to_oklab'=131
'rgb_to_cilab'=132
'rgb_to_cielab'=132
'oklab_to_rgb'=133
'cielab_to_rgb'=134
'rgb_to_hsv'=135
more_math/Parser/MathExprLexer.interp
+6 -6
View File
File diff suppressed because one or more lines are too long
more_math/Parser/MathExprLexer.py
+475 -475
View File
File diff suppressed because it is too large Load Diff
more_math/Parser/MathExprLexer.tokens
+3 -3
View File
@@ -129,9 +129,9 @@ ERODE=128
MORPH_OPEN=129
MORPH_CLOSE=130
RGB_TO_OKLAB=131
RGB_TO_CILAB=132
RGB_TO_CIELAB=132
OKLAB_TO_RGB=133
CILAB_TO_RGB=134
CIELAB_TO_RGB=134
RGB_TO_HSV=135
HSV_TO_RGB=136
INT_TO_RGB=137
@@ -322,7 +322,7 @@ WS=220
'morph_open'=129
'morph_close'=130
'rgb_to_oklab'=131
'rgb_to_cilab'=132
'rgb_to_cielab'=132
'oklab_to_rgb'=133
'cielab_to_rgb'=134
'rgb_to_hsv'=135
more_math/Parser/MathExprListener.py
+8 -8
View File
@@ -1817,12 +1817,12 @@ class MathExprListener(ParseTreeListener):
pass
# Enter a parse tree produced by MathExprParser#RgbToCilabFunc.
def enterRgbToCilabFunc(self, ctx:MathExprParser.RgbToCilabFuncContext):
# Enter a parse tree produced by MathExprParser#RgbToCielabFunc.
def enterRgbToCielabFunc(self, ctx:MathExprParser.RgbToCielabFuncContext):
pass
# Exit a parse tree produced by MathExprParser#RgbToCilabFunc.
def exitRgbToCilabFunc(self, ctx:MathExprParser.RgbToCilabFuncContext):
# Exit a parse tree produced by MathExprParser#RgbToCielabFunc.
def exitRgbToCielabFunc(self, ctx:MathExprParser.RgbToCielabFuncContext):
pass
@@ -1862,12 +1862,12 @@ class MathExprListener(ParseTreeListener):
pass
# Enter a parse tree produced by MathExprParser#CilabToRgbFunc.
def enterCilabToRgbFunc(self, ctx:MathExprParser.CilabToRgbFuncContext):
# Enter a parse tree produced by MathExprParser#CielabToRgbFunc.
def enterCielabToRgbFunc(self, ctx:MathExprParser.CielabToRgbFuncContext):
pass
# Exit a parse tree produced by MathExprParser#CilabToRgbFunc.
def exitCilabToRgbFunc(self, ctx:MathExprParser.CilabToRgbFuncContext):
# Exit a parse tree produced by MathExprParser#CielabToRgbFunc.
def exitCielabToRgbFunc(self, ctx:MathExprParser.CielabToRgbFuncContext):
pass
more_math/Parser/MathExprParser.py
+94 -94
View File
@@ -732,7 +732,7 @@ class MathExprParser ( Parser ):
"'float'", "'upper'", "'lower'", "'trim'", "'split'",
"'join'", "'substring'", "'substr'", "'find'", "'replace'",
"'dilate'", "'erode'", "'morph_open'", "'morph_close'",
"'rgb_to_oklab'", "'rgb_to_cilab'", "'oklab_to_rgb'",
"'rgb_to_oklab'", "'rgb_to_cielab'", "'oklab_to_rgb'",
"'cielab_to_rgb'", "'rgb_to_hsv'", "'hsv_to_rgb'",
"'int_to_rgb'", "'rgb_to_int'", "'interpolate_linear'",
"'interpolate_area'", "<INVALID>", "'if'", "'else'",
@@ -773,15 +773,15 @@ class MathExprParser ( Parser ):
"CONCAT", "INT", "FLOAT", "UPPER", "LOWER", "TRIM",
"SPLIT", "JOIN", "SUBSTRING", "SUBSTR", "FIND", "REPLACE",
"DILATE", "ERODE", "MORPH_OPEN", "MORPH_CLOSE", "RGB_TO_OKLAB",
"RGB_TO_CILAB", "OKLAB_TO_RGB", "CILAB_TO_RGB", "RGB_TO_HSV",
"HSV_TO_RGB", "INT_TO_RGB", "RGB_TO_INT", "INTERPOLATE_LINEAR",
"INTERPOLATE_AREA", "INTERPOLATE_NEAREST", "IF", "ELSE",
"WHILE", "FOR", "IN", "BREAK", "CONTINUE", "RETURN",
"TIMESTAMP", "SORT", "ARGSORT", "ARGMIN", "ARGMAX",
"SOFTMAX", "SOFTMIN", "UNIQUE", "FLIP", "ROLL", "COV",
"CORR", "ENTROPY", "CROP", "NONE", "NOISE", "RAND",
"CAUCHY", "EXPONENTIAL", "LOGNORMAL", "BERNOULLI",
"POISSON", "GAMMADIST", "BETADIST", "LAPLACEDIST",
"RGB_TO_CIELAB", "OKLAB_TO_RGB", "CIELAB_TO_RGB",
"RGB_TO_HSV", "HSV_TO_RGB", "INT_TO_RGB", "RGB_TO_INT",
"INTERPOLATE_LINEAR", "INTERPOLATE_AREA", "INTERPOLATE_NEAREST",
"IF", "ELSE", "WHILE", "FOR", "IN", "BREAK", "CONTINUE",
"RETURN", "TIMESTAMP", "SORT", "ARGSORT", "ARGMIN",
"ARGMAX", "SOFTMAX", "SOFTMIN", "UNIQUE", "FLIP",
"ROLL", "COV", "CORR", "ENTROPY", "CROP", "NONE",
"NOISE", "RAND", "CAUCHY", "EXPONENTIAL", "LOGNORMAL",
"BERNOULLI", "POISSON", "GAMMADIST", "BETADIST", "LAPLACEDIST",
"GUMBELDIST", "WEIBULLDIST", "CHI2DIST", "STUDENTTDIST",
"PERLIN", "CELLULAR", "PLASMA", "PLUS", "MINUS", "MULT",
"DIV", "MOD", "POW", "LSHIFT", "RSHIFT", "GE", "GT",
@@ -963,9 +963,9 @@ class MathExprParser ( Parser ):
MORPH_OPEN=129
MORPH_CLOSE=130
RGB_TO_OKLAB=131
RGB_TO_CILAB=132
RGB_TO_CIELAB=132
OKLAB_TO_RGB=133
CILAB_TO_RGB=134
CIELAB_TO_RGB=134
RGB_TO_HSV=135
HSV_TO_RGB=136
INT_TO_RGB=137
@@ -10519,6 +10519,45 @@ class MathExprParser ( Parser ):
return visitor.visitChildren(self)
class CielabToRgbFuncContext(Func3Context):
def __init__(self, parser, ctx:ParserRuleContext): # actually a MathExprParser.Func3Context
super().__init__(parser)
self.copyFrom(ctx)
def CIELAB_TO_RGB(self):
return self.getToken(MathExprParser.CIELAB_TO_RGB, 0)
def LPAREN(self):
return self.getToken(MathExprParser.LPAREN, 0)
def expr(self, i:int=None):
if i is None:
return self.getTypedRuleContexts(MathExprParser.ExprContext)
else:
return self.getTypedRuleContext(MathExprParser.ExprContext,i)
def RPAREN(self):
return self.getToken(MathExprParser.RPAREN, 0)
def COMMA(self, i:int=None):
if i is None:
return self.getTokens(MathExprParser.COMMA)
else:
return self.getToken(MathExprParser.COMMA, i)
def enterRule(self, listener:ParseTreeListener):
if hasattr( listener, "enterCielabToRgbFunc" ):
listener.enterCielabToRgbFunc(self)
def exitRule(self, listener:ParseTreeListener):
if hasattr( listener, "exitCielabToRgbFunc" ):
listener.exitCielabToRgbFunc(self)
def accept(self, visitor:ParseTreeVisitor):
if hasattr( visitor, "visitCielabToRgbFunc" ):
return visitor.visitCielabToRgbFunc(self)
else:
return visitor.visitChildren(self)
class CubicEaseFuncContext(Func3Context):
def __init__(self, parser, ctx:ParserRuleContext): # actually a MathExprParser.Func3Context
@@ -10831,45 +10870,6 @@ class MathExprParser ( Parser ):
return visitor.visitChildren(self)
class CilabToRgbFuncContext(Func3Context):
def __init__(self, parser, ctx:ParserRuleContext): # actually a MathExprParser.Func3Context
super().__init__(parser)
self.copyFrom(ctx)
def CILAB_TO_RGB(self):
return self.getToken(MathExprParser.CILAB_TO_RGB, 0)
def LPAREN(self):
return self.getToken(MathExprParser.LPAREN, 0)
def expr(self, i:int=None):
if i is None:
return self.getTypedRuleContexts(MathExprParser.ExprContext)
else:
return self.getTypedRuleContext(MathExprParser.ExprContext,i)
def RPAREN(self):
return self.getToken(MathExprParser.RPAREN, 0)
def COMMA(self, i:int=None):
if i is None:
return self.getTokens(MathExprParser.COMMA)
else:
return self.getToken(MathExprParser.COMMA, i)
def enterRule(self, listener:ParseTreeListener):
if hasattr( listener, "enterCilabToRgbFunc" ):
listener.enterCilabToRgbFunc(self)
def exitRule(self, listener:ParseTreeListener):
if hasattr( listener, "exitCilabToRgbFunc" ):
listener.exitCilabToRgbFunc(self)
def accept(self, visitor:ParseTreeVisitor):
if hasattr( visitor, "visitCilabToRgbFunc" ):
return visitor.visitCilabToRgbFunc(self)
else:
return visitor.visitChildren(self)
class RollFuncContext(Func3Context):
def __init__(self, parser, ctx:ParserRuleContext): # actually a MathExprParser.Func3Context
@@ -10909,6 +10909,45 @@ class MathExprParser ( Parser ):
return visitor.visitChildren(self)
class RgbToCielabFuncContext(Func3Context):
def __init__(self, parser, ctx:ParserRuleContext): # actually a MathExprParser.Func3Context
super().__init__(parser)
self.copyFrom(ctx)
def RGB_TO_CIELAB(self):
return self.getToken(MathExprParser.RGB_TO_CIELAB, 0)
def LPAREN(self):
return self.getToken(MathExprParser.LPAREN, 0)
def expr(self, i:int=None):
if i is None:
return self.getTypedRuleContexts(MathExprParser.ExprContext)
else:
return self.getTypedRuleContext(MathExprParser.ExprContext,i)
def RPAREN(self):
return self.getToken(MathExprParser.RPAREN, 0)
def COMMA(self, i:int=None):
if i is None:
return self.getTokens(MathExprParser.COMMA)
else:
return self.getToken(MathExprParser.COMMA, i)
def enterRule(self, listener:ParseTreeListener):
if hasattr( listener, "enterRgbToCielabFunc" ):
listener.enterRgbToCielabFunc(self)
def exitRule(self, listener:ParseTreeListener):
if hasattr( listener, "exitRgbToCielabFunc" ):
listener.exitRgbToCielabFunc(self)
def accept(self, visitor:ParseTreeVisitor):
if hasattr( visitor, "visitRgbToCielabFunc" ):
return visitor.visitRgbToCielabFunc(self)
else:
return visitor.visitChildren(self)
class MomentFuncContext(Func3Context):
def __init__(self, parser, ctx:ParserRuleContext): # actually a MathExprParser.Func3Context
@@ -11062,45 +11101,6 @@ class MathExprParser ( Parser ):
return visitor.visitChildren(self)
class RgbToCilabFuncContext(Func3Context):
def __init__(self, parser, ctx:ParserRuleContext): # actually a MathExprParser.Func3Context
super().__init__(parser)
self.copyFrom(ctx)
def RGB_TO_CILAB(self):
return self.getToken(MathExprParser.RGB_TO_CILAB, 0)
def LPAREN(self):
return self.getToken(MathExprParser.LPAREN, 0)
def expr(self, i:int=None):
if i is None:
return self.getTypedRuleContexts(MathExprParser.ExprContext)
else:
return self.getTypedRuleContext(MathExprParser.ExprContext,i)
def RPAREN(self):
return self.getToken(MathExprParser.RPAREN, 0)
def COMMA(self, i:int=None):
if i is None:
return self.getTokens(MathExprParser.COMMA)
else:
return self.getToken(MathExprParser.COMMA, i)
def enterRule(self, listener:ParseTreeListener):
if hasattr( listener, "enterRgbToCilabFunc" ):
listener.enterRgbToCilabFunc(self)
def exitRule(self, listener:ParseTreeListener):
if hasattr( listener, "exitRgbToCilabFunc" ):
listener.exitRgbToCilabFunc(self)
def accept(self, visitor:ParseTreeVisitor):
if hasattr( visitor, "visitRgbToCilabFunc" ):
return visitor.visitRgbToCilabFunc(self)
else:
return visitor.visitChildren(self)
class ElasticEaseFuncContext(Func3Context):
def __init__(self, parser, ctx:ParserRuleContext): # actually a MathExprParser.Func3Context
@@ -11553,10 +11553,10 @@ class MathExprParser ( Parser ):
self.match(MathExprParser.RPAREN)
pass
elif token in [132]:
localctx = MathExprParser.RgbToCilabFuncContext(self, localctx)
localctx = MathExprParser.RgbToCielabFuncContext(self, localctx)
self.enterOuterAlt(localctx, 16)
self.state = 1250
self.match(MathExprParser.RGB_TO_CILAB)
self.match(MathExprParser.RGB_TO_CIELAB)
self.state = 1251
self.match(MathExprParser.LPAREN)
self.state = 1252
@@ -11697,10 +11697,10 @@ class MathExprParser ( Parser ):
self.match(MathExprParser.RPAREN)
pass
elif token in [134]:
localctx = MathExprParser.CilabToRgbFuncContext(self, localctx)
localctx = MathExprParser.CielabToRgbFuncContext(self, localctx)
self.enterOuterAlt(localctx, 21)
self.state = 1315
self.match(MathExprParser.CILAB_TO_RGB)
self.match(MathExprParser.CIELAB_TO_RGB)
self.state = 1316
self.match(MathExprParser.LPAREN)
self.state = 1317
more_math/Parser/MathExprVisitor.py
+4 -4
View File
@@ -1014,8 +1014,8 @@ class MathExprVisitor(ParseTreeVisitor):
return self.visitChildren(ctx)
# Visit a parse tree produced by MathExprParser#RgbToCilabFunc.
def visitRgbToCilabFunc(self, ctx:MathExprParser.RgbToCilabFuncContext):
# Visit a parse tree produced by MathExprParser#RgbToCielabFunc.
def visitRgbToCielabFunc(self, ctx:MathExprParser.RgbToCielabFuncContext):
return self.visitChildren(ctx)
@@ -1039,8 +1039,8 @@ class MathExprVisitor(ParseTreeVisitor):
return self.visitChildren(ctx)
# Visit a parse tree produced by MathExprParser#CilabToRgbFunc.
def visitCilabToRgbFunc(self, ctx:MathExprParser.CilabToRgbFuncContext):
# Visit a parse tree produced by MathExprParser#CielabToRgbFunc.
def visitCielabToRgbFunc(self, ctx:MathExprParser.CielabToRgbFuncContext):
return self.visitChildren(ctx)
more_math/Parser/UnifiedMathVisitor.py
+4 -4
View File
@@ -3817,12 +3817,12 @@ class UnifiedMathVisitor(MathExprVisitor):
return self._linear_to_oklab(r, g, b)
def visitRgbToCilabFunc(self, ctx):
def visitRgbToCielabFunc(self, ctx):
num_args = len(ctx.expr())
if num_args == 1:
rgb_val = yield ctx.expr(0)
r, g, b = self._rgb_triplet_from_arg(ctx, rgb_val, "rgb_to_cilab")
r, g, b = self._rgb_triplet_from_arg(ctx, rgb_val, "rgb_to_cielab")
else:
r = self._promote_to_tensor((yield ctx.expr(0))).float()
g = self._promote_to_tensor((yield ctx.expr(1))).float()
@@ -3883,11 +3883,11 @@ class UnifiedMathVisitor(MathExprVisitor):
return self._oklab_to_rgb(L, a, b)
def visitCilabToRgbFunc(self, ctx):
def visitCielabToRgbFunc(self, ctx):
num_args = len(ctx.expr())
if num_args == 1:
lab_val = yield ctx.expr(0)
L, a, b = self._rgb_triplet_from_arg(ctx, lab_val, "cilab_to_rgb")
L, a, b = self._rgb_triplet_from_arg(ctx, lab_val, "cielab_to_rgb")
else:
L = self._promote_to_tensor((yield ctx.expr(0))).float()
a = self._promote_to_tensor((yield ctx.expr(1))).float()