diff --git a/src/more_math/Parser/MathExpr.g4 b/src/more_math/Parser/MathExpr.g4 index 997a0c0..b0009d3 100644 --- a/src/more_math/Parser/MathExpr.g4 +++ b/src/more_math/Parser/MathExpr.g4 @@ -119,7 +119,7 @@ CEIL : 'ceil'; ROUND : 'round'; GAMMA : 'gamma'; POWE : 'pow'; -SIGM : 'sigmoid'; +SIGM : 'sigm'; CLAMP : 'clamp'; PLUS : '+'; diff --git a/src/more_math/Parser/MathExpr.interp b/src/more_math/Parser/MathExpr.interp index 01b40e0..2d3247e 100644 --- a/src/more_math/Parser/MathExpr.interp +++ b/src/more_math/Parser/MathExpr.interp @@ -32,7 +32,7 @@ null 'round' 'gamma' 'pow' -'sigmoid' +'sigm' 'clamp' '+' '-' diff --git a/src/more_math/Parser/MathExpr.tokens b/src/more_math/Parser/MathExpr.tokens index cc8ad59..f85cec2 100644 --- a/src/more_math/Parser/MathExpr.tokens +++ b/src/more_math/Parser/MathExpr.tokens @@ -74,7 +74,7 @@ WS=44 'round'=30 'gamma'=31 'pow'=32 -'sigmoid'=33 +'sigm'=33 'clamp'=34 '+'=35 '-'=36 diff --git a/src/more_math/Parser/MathExprLexer.interp b/src/more_math/Parser/MathExprLexer.interp index a528e64..1705bf2 100644 --- a/src/more_math/Parser/MathExprLexer.interp +++ b/src/more_math/Parser/MathExprLexer.interp @@ -32,7 +32,7 @@ null 'round' 'gamma' 'pow' -'sigmoid' +'sigm' 'clamp' '+' '-' @@ -146,4 +146,4 @@ mode names: DEFAULT_MODE atn: -[4, 0, 44, 300, 6, -1, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 2, 29, 7, 29, 2, 30, 7, 30, 2, 31, 7, 31, 2, 32, 7, 32, 2, 33, 7, 33, 2, 34, 7, 34, 2, 35, 7, 35, 2, 36, 7, 36, 2, 37, 7, 37, 2, 38, 7, 38, 2, 39, 7, 39, 2, 40, 7, 40, 2, 41, 7, 41, 2, 42, 7, 42, 2, 43, 7, 43, 1, 0, 1, 0, 1, 1, 1, 1, 1, 2, 1, 2, 1, 3, 1, 3, 1, 3, 1, 3, 1, 4, 1, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 1, 5, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 16, 1, 16, 1, 16, 1, 16, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 18, 1, 18, 1, 18, 1, 19, 1, 19, 1, 19, 1, 19, 1, 20, 1, 20, 1, 20, 1, 20, 1, 21, 1, 21, 1, 21, 1, 21, 1, 21, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 25, 1, 25, 1, 25, 1, 25, 1, 25, 1, 25, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 27, 1, 27, 1, 27, 1, 27, 1, 27, 1, 27, 1, 28, 1, 28, 1, 28, 1, 28, 1, 28, 1, 29, 1, 29, 1, 29, 1, 29, 1, 29, 1, 29, 1, 30, 1, 30, 1, 30, 1, 30, 1, 30, 1, 30, 1, 31, 1, 31, 1, 31, 1, 31, 1, 32, 1, 32, 1, 32, 1, 32, 1, 32, 1, 32, 1, 32, 1, 32, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 34, 1, 34, 1, 35, 1, 35, 1, 36, 1, 36, 1, 37, 1, 37, 1, 38, 1, 38, 1, 39, 1, 39, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 3, 40, 272, 8, 40, 1, 41, 4, 41, 275, 8, 41, 11, 41, 12, 41, 276, 1, 41, 1, 41, 4, 41, 281, 8, 41, 11, 41, 12, 41, 282, 3, 41, 285, 8, 41, 1, 42, 1, 42, 5, 42, 289, 8, 42, 10, 42, 12, 42, 292, 9, 42, 1, 43, 4, 43, 295, 8, 43, 11, 43, 12, 43, 296, 1, 43, 1, 43, 0, 0, 44, 1, 1, 3, 2, 5, 3, 7, 4, 9, 5, 11, 6, 13, 7, 15, 8, 17, 9, 19, 10, 21, 11, 23, 12, 25, 13, 27, 14, 29, 15, 31, 16, 33, 17, 35, 18, 37, 19, 39, 20, 41, 21, 43, 22, 45, 23, 47, 24, 49, 25, 51, 26, 53, 27, 55, 28, 57, 29, 59, 30, 61, 31, 63, 32, 65, 33, 67, 34, 69, 35, 71, 36, 73, 37, 75, 38, 77, 39, 79, 40, 81, 41, 83, 42, 85, 43, 87, 44, 1, 0, 5, 2, 0, 69, 69, 101, 101, 1, 0, 48, 57, 3, 0, 65, 90, 95, 95, 97, 122, 4, 0, 48, 57, 65, 90, 95, 95, 97, 122, 3, 0, 9, 10, 13, 13, 32, 32, 306, 0, 1, 1, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 5, 1, 0, 0, 0, 0, 7, 1, 0, 0, 0, 0, 9, 1, 0, 0, 0, 0, 11, 1, 0, 0, 0, 0, 13, 1, 0, 0, 0, 0, 15, 1, 0, 0, 0, 0, 17, 1, 0, 0, 0, 0, 19, 1, 0, 0, 0, 0, 21, 1, 0, 0, 0, 0, 23, 1, 0, 0, 0, 0, 25, 1, 0, 0, 0, 0, 27, 1, 0, 0, 0, 0, 29, 1, 0, 0, 0, 0, 31, 1, 0, 0, 0, 0, 33, 1, 0, 0, 0, 0, 35, 1, 0, 0, 0, 0, 37, 1, 0, 0, 0, 0, 39, 1, 0, 0, 0, 0, 41, 1, 0, 0, 0, 0, 43, 1, 0, 0, 0, 0, 45, 1, 0, 0, 0, 0, 47, 1, 0, 0, 0, 0, 49, 1, 0, 0, 0, 0, 51, 1, 0, 0, 0, 0, 53, 1, 0, 0, 0, 0, 55, 1, 0, 0, 0, 0, 57, 1, 0, 0, 0, 0, 59, 1, 0, 0, 0, 0, 61, 1, 0, 0, 0, 0, 63, 1, 0, 0, 0, 0, 65, 1, 0, 0, 0, 0, 67, 1, 0, 0, 0, 0, 69, 1, 0, 0, 0, 0, 71, 1, 0, 0, 0, 0, 73, 1, 0, 0, 0, 0, 75, 1, 0, 0, 0, 0, 77, 1, 0, 0, 0, 0, 79, 1, 0, 0, 0, 0, 81, 1, 0, 0, 0, 0, 83, 1, 0, 0, 0, 0, 85, 1, 0, 0, 0, 0, 87, 1, 0, 0, 0, 1, 89, 1, 0, 0, 0, 3, 91, 1, 0, 0, 0, 5, 93, 1, 0, 0, 0, 7, 95, 1, 0, 0, 0, 9, 99, 1, 0, 0, 0, 11, 103, 1, 0, 0, 0, 13, 107, 1, 0, 0, 0, 15, 112, 1, 0, 0, 0, 17, 117, 1, 0, 0, 0, 19, 122, 1, 0, 0, 0, 21, 128, 1, 0, 0, 0, 23, 133, 1, 0, 0, 0, 25, 138, 1, 0, 0, 0, 27, 143, 1, 0, 0, 0, 29, 149, 1, 0, 0, 0, 31, 155, 1, 0, 0, 0, 33, 161, 1, 0, 0, 0, 35, 165, 1, 0, 0, 0, 37, 170, 1, 0, 0, 0, 39, 173, 1, 0, 0, 0, 41, 177, 1, 0, 0, 0, 43, 181, 1, 0, 0, 0, 45, 186, 1, 0, 0, 0, 47, 191, 1, 0, 0, 0, 49, 196, 1, 0, 0, 0, 51, 201, 1, 0, 0, 0, 53, 207, 1, 0, 0, 0, 55, 213, 1, 0, 0, 0, 57, 219, 1, 0, 0, 0, 59, 224, 1, 0, 0, 0, 61, 230, 1, 0, 0, 0, 63, 236, 1, 0, 0, 0, 65, 240, 1, 0, 0, 0, 67, 248, 1, 0, 0, 0, 69, 254, 1, 0, 0, 0, 71, 256, 1, 0, 0, 0, 73, 258, 1, 0, 0, 0, 75, 260, 1, 0, 0, 0, 77, 262, 1, 0, 0, 0, 79, 264, 1, 0, 0, 0, 81, 271, 1, 0, 0, 0, 83, 274, 1, 0, 0, 0, 85, 286, 1, 0, 0, 0, 87, 294, 1, 0, 0, 0, 89, 90, 5, 40, 0, 0, 90, 2, 1, 0, 0, 0, 91, 92, 5, 41, 0, 0, 92, 4, 1, 0, 0, 0, 93, 94, 5, 44, 0, 0, 94, 6, 1, 0, 0, 0, 95, 96, 5, 115, 0, 0, 96, 97, 5, 105, 0, 0, 97, 98, 5, 110, 0, 0, 98, 8, 1, 0, 0, 0, 99, 100, 5, 99, 0, 0, 100, 101, 5, 111, 0, 0, 101, 102, 5, 115, 0, 0, 102, 10, 1, 0, 0, 0, 103, 104, 5, 116, 0, 0, 104, 105, 5, 97, 0, 0, 105, 106, 5, 110, 0, 0, 106, 12, 1, 0, 0, 0, 107, 108, 5, 97, 0, 0, 108, 109, 5, 115, 0, 0, 109, 110, 5, 105, 0, 0, 110, 111, 5, 110, 0, 0, 111, 14, 1, 0, 0, 0, 112, 113, 5, 97, 0, 0, 113, 114, 5, 99, 0, 0, 114, 115, 5, 111, 0, 0, 115, 116, 5, 115, 0, 0, 116, 16, 1, 0, 0, 0, 117, 118, 5, 97, 0, 0, 118, 119, 5, 116, 0, 0, 119, 120, 5, 97, 0, 0, 120, 121, 5, 110, 0, 0, 121, 18, 1, 0, 0, 0, 122, 123, 5, 97, 0, 0, 123, 124, 5, 116, 0, 0, 124, 125, 5, 97, 0, 0, 125, 126, 5, 110, 0, 0, 126, 127, 5, 50, 0, 0, 127, 20, 1, 0, 0, 0, 128, 129, 5, 115, 0, 0, 129, 130, 5, 105, 0, 0, 130, 131, 5, 110, 0, 0, 131, 132, 5, 104, 0, 0, 132, 22, 1, 0, 0, 0, 133, 134, 5, 99, 0, 0, 134, 135, 5, 111, 0, 0, 135, 136, 5, 115, 0, 0, 136, 137, 5, 104, 0, 0, 137, 24, 1, 0, 0, 0, 138, 139, 5, 116, 0, 0, 139, 140, 5, 97, 0, 0, 140, 141, 5, 110, 0, 0, 141, 142, 5, 104, 0, 0, 142, 26, 1, 0, 0, 0, 143, 144, 5, 97, 0, 0, 144, 145, 5, 115, 0, 0, 145, 146, 5, 105, 0, 0, 146, 147, 5, 110, 0, 0, 147, 148, 5, 104, 0, 0, 148, 28, 1, 0, 0, 0, 149, 150, 5, 97, 0, 0, 150, 151, 5, 99, 0, 0, 151, 152, 5, 111, 0, 0, 152, 153, 5, 115, 0, 0, 153, 154, 5, 104, 0, 0, 154, 30, 1, 0, 0, 0, 155, 156, 5, 97, 0, 0, 156, 157, 5, 116, 0, 0, 157, 158, 5, 97, 0, 0, 158, 159, 5, 110, 0, 0, 159, 160, 5, 104, 0, 0, 160, 32, 1, 0, 0, 0, 161, 162, 5, 97, 0, 0, 162, 163, 5, 98, 0, 0, 163, 164, 5, 115, 0, 0, 164, 34, 1, 0, 0, 0, 165, 166, 5, 115, 0, 0, 166, 167, 5, 113, 0, 0, 167, 168, 5, 114, 0, 0, 168, 169, 5, 116, 0, 0, 169, 36, 1, 0, 0, 0, 170, 171, 5, 108, 0, 0, 171, 172, 5, 110, 0, 0, 172, 38, 1, 0, 0, 0, 173, 174, 5, 108, 0, 0, 174, 175, 5, 111, 0, 0, 175, 176, 5, 103, 0, 0, 176, 40, 1, 0, 0, 0, 177, 178, 5, 101, 0, 0, 178, 179, 5, 120, 0, 0, 179, 180, 5, 112, 0, 0, 180, 42, 1, 0, 0, 0, 181, 182, 5, 115, 0, 0, 182, 183, 5, 109, 0, 0, 183, 184, 5, 105, 0, 0, 184, 185, 5, 110, 0, 0, 185, 44, 1, 0, 0, 0, 186, 187, 5, 115, 0, 0, 187, 188, 5, 109, 0, 0, 188, 189, 5, 97, 0, 0, 189, 190, 5, 120, 0, 0, 190, 46, 1, 0, 0, 0, 191, 192, 5, 116, 0, 0, 192, 193, 5, 109, 0, 0, 193, 194, 5, 105, 0, 0, 194, 195, 5, 110, 0, 0, 195, 48, 1, 0, 0, 0, 196, 197, 5, 116, 0, 0, 197, 198, 5, 109, 0, 0, 198, 199, 5, 97, 0, 0, 199, 200, 5, 120, 0, 0, 200, 50, 1, 0, 0, 0, 201, 202, 5, 116, 0, 0, 202, 203, 5, 110, 0, 0, 203, 204, 5, 111, 0, 0, 204, 205, 5, 114, 0, 0, 205, 206, 5, 109, 0, 0, 206, 52, 1, 0, 0, 0, 207, 208, 5, 115, 0, 0, 208, 209, 5, 110, 0, 0, 209, 210, 5, 111, 0, 0, 210, 211, 5, 114, 0, 0, 211, 212, 5, 109, 0, 0, 212, 54, 1, 0, 0, 0, 213, 214, 5, 102, 0, 0, 214, 215, 5, 108, 0, 0, 215, 216, 5, 111, 0, 0, 216, 217, 5, 111, 0, 0, 217, 218, 5, 114, 0, 0, 218, 56, 1, 0, 0, 0, 219, 220, 5, 99, 0, 0, 220, 221, 5, 101, 0, 0, 221, 222, 5, 105, 0, 0, 222, 223, 5, 108, 0, 0, 223, 58, 1, 0, 0, 0, 224, 225, 5, 114, 0, 0, 225, 226, 5, 111, 0, 0, 226, 227, 5, 117, 0, 0, 227, 228, 5, 110, 0, 0, 228, 229, 5, 100, 0, 0, 229, 60, 1, 0, 0, 0, 230, 231, 5, 103, 0, 0, 231, 232, 5, 97, 0, 0, 232, 233, 5, 109, 0, 0, 233, 234, 5, 109, 0, 0, 234, 235, 5, 97, 0, 0, 235, 62, 1, 0, 0, 0, 236, 237, 5, 112, 0, 0, 237, 238, 5, 111, 0, 0, 238, 239, 5, 119, 0, 0, 239, 64, 1, 0, 0, 0, 240, 241, 5, 115, 0, 0, 241, 242, 5, 105, 0, 0, 242, 243, 5, 103, 0, 0, 243, 244, 5, 109, 0, 0, 244, 245, 5, 111, 0, 0, 245, 246, 5, 105, 0, 0, 246, 247, 5, 100, 0, 0, 247, 66, 1, 0, 0, 0, 248, 249, 5, 99, 0, 0, 249, 250, 5, 108, 0, 0, 250, 251, 5, 97, 0, 0, 251, 252, 5, 109, 0, 0, 252, 253, 5, 112, 0, 0, 253, 68, 1, 0, 0, 0, 254, 255, 5, 43, 0, 0, 255, 70, 1, 0, 0, 0, 256, 257, 5, 45, 0, 0, 257, 72, 1, 0, 0, 0, 258, 259, 5, 42, 0, 0, 259, 74, 1, 0, 0, 0, 260, 261, 5, 47, 0, 0, 261, 76, 1, 0, 0, 0, 262, 263, 5, 37, 0, 0, 263, 78, 1, 0, 0, 0, 264, 265, 5, 94, 0, 0, 265, 80, 1, 0, 0, 0, 266, 267, 5, 112, 0, 0, 267, 272, 5, 105, 0, 0, 268, 269, 5, 80, 0, 0, 269, 272, 5, 73, 0, 0, 270, 272, 7, 0, 0, 0, 271, 266, 1, 0, 0, 0, 271, 268, 1, 0, 0, 0, 271, 270, 1, 0, 0, 0, 272, 82, 1, 0, 0, 0, 273, 275, 7, 1, 0, 0, 274, 273, 1, 0, 0, 0, 275, 276, 1, 0, 0, 0, 276, 274, 1, 0, 0, 0, 276, 277, 1, 0, 0, 0, 277, 284, 1, 0, 0, 0, 278, 280, 5, 46, 0, 0, 279, 281, 7, 1, 0, 0, 280, 279, 1, 0, 0, 0, 281, 282, 1, 0, 0, 0, 282, 280, 1, 0, 0, 0, 282, 283, 1, 0, 0, 0, 283, 285, 1, 0, 0, 0, 284, 278, 1, 0, 0, 0, 284, 285, 1, 0, 0, 0, 285, 84, 1, 0, 0, 0, 286, 290, 7, 2, 0, 0, 287, 289, 7, 3, 0, 0, 288, 287, 1, 0, 0, 0, 289, 292, 1, 0, 0, 0, 290, 288, 1, 0, 0, 0, 290, 291, 1, 0, 0, 0, 291, 86, 1, 0, 0, 0, 292, 290, 1, 0, 0, 0, 293, 295, 7, 4, 0, 0, 294, 293, 1, 0, 0, 0, 295, 296, 1, 0, 0, 0, 296, 294, 1, 0, 0, 0, 296, 297, 1, 0, 0, 0, 297, 298, 1, 0, 0, 0, 298, 299, 6, 43, 0, 0, 299, 88, 1, 0, 0, 0, 7, 0, 271, 276, 282, 284, 290, 296, 1, 6, 0, 0] \ No newline at end of file +[4, 0, 44, 297, 6, -1, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 2, 29, 7, 29, 2, 30, 7, 30, 2, 31, 7, 31, 2, 32, 7, 32, 2, 33, 7, 33, 2, 34, 7, 34, 2, 35, 7, 35, 2, 36, 7, 36, 2, 37, 7, 37, 2, 38, 7, 38, 2, 39, 7, 39, 2, 40, 7, 40, 2, 41, 7, 41, 2, 42, 7, 42, 2, 43, 7, 43, 1, 0, 1, 0, 1, 1, 1, 1, 1, 2, 1, 2, 1, 3, 1, 3, 1, 3, 1, 3, 1, 4, 1, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 1, 5, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 16, 1, 16, 1, 16, 1, 16, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 18, 1, 18, 1, 18, 1, 19, 1, 19, 1, 19, 1, 19, 1, 20, 1, 20, 1, 20, 1, 20, 1, 21, 1, 21, 1, 21, 1, 21, 1, 21, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 24, 1, 24, 1, 24, 1, 24, 1, 24, 1, 25, 1, 25, 1, 25, 1, 25, 1, 25, 1, 25, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 27, 1, 27, 1, 27, 1, 27, 1, 27, 1, 27, 1, 28, 1, 28, 1, 28, 1, 28, 1, 28, 1, 29, 1, 29, 1, 29, 1, 29, 1, 29, 1, 29, 1, 30, 1, 30, 1, 30, 1, 30, 1, 30, 1, 30, 1, 31, 1, 31, 1, 31, 1, 31, 1, 32, 1, 32, 1, 32, 1, 32, 1, 32, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 33, 1, 34, 1, 34, 1, 35, 1, 35, 1, 36, 1, 36, 1, 37, 1, 37, 1, 38, 1, 38, 1, 39, 1, 39, 1, 40, 1, 40, 1, 40, 1, 40, 1, 40, 3, 40, 269, 8, 40, 1, 41, 4, 41, 272, 8, 41, 11, 41, 12, 41, 273, 1, 41, 1, 41, 4, 41, 278, 8, 41, 11, 41, 12, 41, 279, 3, 41, 282, 8, 41, 1, 42, 1, 42, 5, 42, 286, 8, 42, 10, 42, 12, 42, 289, 9, 42, 1, 43, 4, 43, 292, 8, 43, 11, 43, 12, 43, 293, 1, 43, 1, 43, 0, 0, 44, 1, 1, 3, 2, 5, 3, 7, 4, 9, 5, 11, 6, 13, 7, 15, 8, 17, 9, 19, 10, 21, 11, 23, 12, 25, 13, 27, 14, 29, 15, 31, 16, 33, 17, 35, 18, 37, 19, 39, 20, 41, 21, 43, 22, 45, 23, 47, 24, 49, 25, 51, 26, 53, 27, 55, 28, 57, 29, 59, 30, 61, 31, 63, 32, 65, 33, 67, 34, 69, 35, 71, 36, 73, 37, 75, 38, 77, 39, 79, 40, 81, 41, 83, 42, 85, 43, 87, 44, 1, 0, 5, 2, 0, 69, 69, 101, 101, 1, 0, 48, 57, 3, 0, 65, 90, 95, 95, 97, 122, 4, 0, 48, 57, 65, 90, 95, 95, 97, 122, 3, 0, 9, 10, 13, 13, 32, 32, 303, 0, 1, 1, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 5, 1, 0, 0, 0, 0, 7, 1, 0, 0, 0, 0, 9, 1, 0, 0, 0, 0, 11, 1, 0, 0, 0, 0, 13, 1, 0, 0, 0, 0, 15, 1, 0, 0, 0, 0, 17, 1, 0, 0, 0, 0, 19, 1, 0, 0, 0, 0, 21, 1, 0, 0, 0, 0, 23, 1, 0, 0, 0, 0, 25, 1, 0, 0, 0, 0, 27, 1, 0, 0, 0, 0, 29, 1, 0, 0, 0, 0, 31, 1, 0, 0, 0, 0, 33, 1, 0, 0, 0, 0, 35, 1, 0, 0, 0, 0, 37, 1, 0, 0, 0, 0, 39, 1, 0, 0, 0, 0, 41, 1, 0, 0, 0, 0, 43, 1, 0, 0, 0, 0, 45, 1, 0, 0, 0, 0, 47, 1, 0, 0, 0, 0, 49, 1, 0, 0, 0, 0, 51, 1, 0, 0, 0, 0, 53, 1, 0, 0, 0, 0, 55, 1, 0, 0, 0, 0, 57, 1, 0, 0, 0, 0, 59, 1, 0, 0, 0, 0, 61, 1, 0, 0, 0, 0, 63, 1, 0, 0, 0, 0, 65, 1, 0, 0, 0, 0, 67, 1, 0, 0, 0, 0, 69, 1, 0, 0, 0, 0, 71, 1, 0, 0, 0, 0, 73, 1, 0, 0, 0, 0, 75, 1, 0, 0, 0, 0, 77, 1, 0, 0, 0, 0, 79, 1, 0, 0, 0, 0, 81, 1, 0, 0, 0, 0, 83, 1, 0, 0, 0, 0, 85, 1, 0, 0, 0, 0, 87, 1, 0, 0, 0, 1, 89, 1, 0, 0, 0, 3, 91, 1, 0, 0, 0, 5, 93, 1, 0, 0, 0, 7, 95, 1, 0, 0, 0, 9, 99, 1, 0, 0, 0, 11, 103, 1, 0, 0, 0, 13, 107, 1, 0, 0, 0, 15, 112, 1, 0, 0, 0, 17, 117, 1, 0, 0, 0, 19, 122, 1, 0, 0, 0, 21, 128, 1, 0, 0, 0, 23, 133, 1, 0, 0, 0, 25, 138, 1, 0, 0, 0, 27, 143, 1, 0, 0, 0, 29, 149, 1, 0, 0, 0, 31, 155, 1, 0, 0, 0, 33, 161, 1, 0, 0, 0, 35, 165, 1, 0, 0, 0, 37, 170, 1, 0, 0, 0, 39, 173, 1, 0, 0, 0, 41, 177, 1, 0, 0, 0, 43, 181, 1, 0, 0, 0, 45, 186, 1, 0, 0, 0, 47, 191, 1, 0, 0, 0, 49, 196, 1, 0, 0, 0, 51, 201, 1, 0, 0, 0, 53, 207, 1, 0, 0, 0, 55, 213, 1, 0, 0, 0, 57, 219, 1, 0, 0, 0, 59, 224, 1, 0, 0, 0, 61, 230, 1, 0, 0, 0, 63, 236, 1, 0, 0, 0, 65, 240, 1, 0, 0, 0, 67, 245, 1, 0, 0, 0, 69, 251, 1, 0, 0, 0, 71, 253, 1, 0, 0, 0, 73, 255, 1, 0, 0, 0, 75, 257, 1, 0, 0, 0, 77, 259, 1, 0, 0, 0, 79, 261, 1, 0, 0, 0, 81, 268, 1, 0, 0, 0, 83, 271, 1, 0, 0, 0, 85, 283, 1, 0, 0, 0, 87, 291, 1, 0, 0, 0, 89, 90, 5, 40, 0, 0, 90, 2, 1, 0, 0, 0, 91, 92, 5, 41, 0, 0, 92, 4, 1, 0, 0, 0, 93, 94, 5, 44, 0, 0, 94, 6, 1, 0, 0, 0, 95, 96, 5, 115, 0, 0, 96, 97, 5, 105, 0, 0, 97, 98, 5, 110, 0, 0, 98, 8, 1, 0, 0, 0, 99, 100, 5, 99, 0, 0, 100, 101, 5, 111, 0, 0, 101, 102, 5, 115, 0, 0, 102, 10, 1, 0, 0, 0, 103, 104, 5, 116, 0, 0, 104, 105, 5, 97, 0, 0, 105, 106, 5, 110, 0, 0, 106, 12, 1, 0, 0, 0, 107, 108, 5, 97, 0, 0, 108, 109, 5, 115, 0, 0, 109, 110, 5, 105, 0, 0, 110, 111, 5, 110, 0, 0, 111, 14, 1, 0, 0, 0, 112, 113, 5, 97, 0, 0, 113, 114, 5, 99, 0, 0, 114, 115, 5, 111, 0, 0, 115, 116, 5, 115, 0, 0, 116, 16, 1, 0, 0, 0, 117, 118, 5, 97, 0, 0, 118, 119, 5, 116, 0, 0, 119, 120, 5, 97, 0, 0, 120, 121, 5, 110, 0, 0, 121, 18, 1, 0, 0, 0, 122, 123, 5, 97, 0, 0, 123, 124, 5, 116, 0, 0, 124, 125, 5, 97, 0, 0, 125, 126, 5, 110, 0, 0, 126, 127, 5, 50, 0, 0, 127, 20, 1, 0, 0, 0, 128, 129, 5, 115, 0, 0, 129, 130, 5, 105, 0, 0, 130, 131, 5, 110, 0, 0, 131, 132, 5, 104, 0, 0, 132, 22, 1, 0, 0, 0, 133, 134, 5, 99, 0, 0, 134, 135, 5, 111, 0, 0, 135, 136, 5, 115, 0, 0, 136, 137, 5, 104, 0, 0, 137, 24, 1, 0, 0, 0, 138, 139, 5, 116, 0, 0, 139, 140, 5, 97, 0, 0, 140, 141, 5, 110, 0, 0, 141, 142, 5, 104, 0, 0, 142, 26, 1, 0, 0, 0, 143, 144, 5, 97, 0, 0, 144, 145, 5, 115, 0, 0, 145, 146, 5, 105, 0, 0, 146, 147, 5, 110, 0, 0, 147, 148, 5, 104, 0, 0, 148, 28, 1, 0, 0, 0, 149, 150, 5, 97, 0, 0, 150, 151, 5, 99, 0, 0, 151, 152, 5, 111, 0, 0, 152, 153, 5, 115, 0, 0, 153, 154, 5, 104, 0, 0, 154, 30, 1, 0, 0, 0, 155, 156, 5, 97, 0, 0, 156, 157, 5, 116, 0, 0, 157, 158, 5, 97, 0, 0, 158, 159, 5, 110, 0, 0, 159, 160, 5, 104, 0, 0, 160, 32, 1, 0, 0, 0, 161, 162, 5, 97, 0, 0, 162, 163, 5, 98, 0, 0, 163, 164, 5, 115, 0, 0, 164, 34, 1, 0, 0, 0, 165, 166, 5, 115, 0, 0, 166, 167, 5, 113, 0, 0, 167, 168, 5, 114, 0, 0, 168, 169, 5, 116, 0, 0, 169, 36, 1, 0, 0, 0, 170, 171, 5, 108, 0, 0, 171, 172, 5, 110, 0, 0, 172, 38, 1, 0, 0, 0, 173, 174, 5, 108, 0, 0, 174, 175, 5, 111, 0, 0, 175, 176, 5, 103, 0, 0, 176, 40, 1, 0, 0, 0, 177, 178, 5, 101, 0, 0, 178, 179, 5, 120, 0, 0, 179, 180, 5, 112, 0, 0, 180, 42, 1, 0, 0, 0, 181, 182, 5, 115, 0, 0, 182, 183, 5, 109, 0, 0, 183, 184, 5, 105, 0, 0, 184, 185, 5, 110, 0, 0, 185, 44, 1, 0, 0, 0, 186, 187, 5, 115, 0, 0, 187, 188, 5, 109, 0, 0, 188, 189, 5, 97, 0, 0, 189, 190, 5, 120, 0, 0, 190, 46, 1, 0, 0, 0, 191, 192, 5, 116, 0, 0, 192, 193, 5, 109, 0, 0, 193, 194, 5, 105, 0, 0, 194, 195, 5, 110, 0, 0, 195, 48, 1, 0, 0, 0, 196, 197, 5, 116, 0, 0, 197, 198, 5, 109, 0, 0, 198, 199, 5, 97, 0, 0, 199, 200, 5, 120, 0, 0, 200, 50, 1, 0, 0, 0, 201, 202, 5, 116, 0, 0, 202, 203, 5, 110, 0, 0, 203, 204, 5, 111, 0, 0, 204, 205, 5, 114, 0, 0, 205, 206, 5, 109, 0, 0, 206, 52, 1, 0, 0, 0, 207, 208, 5, 115, 0, 0, 208, 209, 5, 110, 0, 0, 209, 210, 5, 111, 0, 0, 210, 211, 5, 114, 0, 0, 211, 212, 5, 109, 0, 0, 212, 54, 1, 0, 0, 0, 213, 214, 5, 102, 0, 0, 214, 215, 5, 108, 0, 0, 215, 216, 5, 111, 0, 0, 216, 217, 5, 111, 0, 0, 217, 218, 5, 114, 0, 0, 218, 56, 1, 0, 0, 0, 219, 220, 5, 99, 0, 0, 220, 221, 5, 101, 0, 0, 221, 222, 5, 105, 0, 0, 222, 223, 5, 108, 0, 0, 223, 58, 1, 0, 0, 0, 224, 225, 5, 114, 0, 0, 225, 226, 5, 111, 0, 0, 226, 227, 5, 117, 0, 0, 227, 228, 5, 110, 0, 0, 228, 229, 5, 100, 0, 0, 229, 60, 1, 0, 0, 0, 230, 231, 5, 103, 0, 0, 231, 232, 5, 97, 0, 0, 232, 233, 5, 109, 0, 0, 233, 234, 5, 109, 0, 0, 234, 235, 5, 97, 0, 0, 235, 62, 1, 0, 0, 0, 236, 237, 5, 112, 0, 0, 237, 238, 5, 111, 0, 0, 238, 239, 5, 119, 0, 0, 239, 64, 1, 0, 0, 0, 240, 241, 5, 115, 0, 0, 241, 242, 5, 105, 0, 0, 242, 243, 5, 103, 0, 0, 243, 244, 5, 109, 0, 0, 244, 66, 1, 0, 0, 0, 245, 246, 5, 99, 0, 0, 246, 247, 5, 108, 0, 0, 247, 248, 5, 97, 0, 0, 248, 249, 5, 109, 0, 0, 249, 250, 5, 112, 0, 0, 250, 68, 1, 0, 0, 0, 251, 252, 5, 43, 0, 0, 252, 70, 1, 0, 0, 0, 253, 254, 5, 45, 0, 0, 254, 72, 1, 0, 0, 0, 255, 256, 5, 42, 0, 0, 256, 74, 1, 0, 0, 0, 257, 258, 5, 47, 0, 0, 258, 76, 1, 0, 0, 0, 259, 260, 5, 37, 0, 0, 260, 78, 1, 0, 0, 0, 261, 262, 5, 94, 0, 0, 262, 80, 1, 0, 0, 0, 263, 264, 5, 112, 0, 0, 264, 269, 5, 105, 0, 0, 265, 266, 5, 80, 0, 0, 266, 269, 5, 73, 0, 0, 267, 269, 7, 0, 0, 0, 268, 263, 1, 0, 0, 0, 268, 265, 1, 0, 0, 0, 268, 267, 1, 0, 0, 0, 269, 82, 1, 0, 0, 0, 270, 272, 7, 1, 0, 0, 271, 270, 1, 0, 0, 0, 272, 273, 1, 0, 0, 0, 273, 271, 1, 0, 0, 0, 273, 274, 1, 0, 0, 0, 274, 281, 1, 0, 0, 0, 275, 277, 5, 46, 0, 0, 276, 278, 7, 1, 0, 0, 277, 276, 1, 0, 0, 0, 278, 279, 1, 0, 0, 0, 279, 277, 1, 0, 0, 0, 279, 280, 1, 0, 0, 0, 280, 282, 1, 0, 0, 0, 281, 275, 1, 0, 0, 0, 281, 282, 1, 0, 0, 0, 282, 84, 1, 0, 0, 0, 283, 287, 7, 2, 0, 0, 284, 286, 7, 3, 0, 0, 285, 284, 1, 0, 0, 0, 286, 289, 1, 0, 0, 0, 287, 285, 1, 0, 0, 0, 287, 288, 1, 0, 0, 0, 288, 86, 1, 0, 0, 0, 289, 287, 1, 0, 0, 0, 290, 292, 7, 4, 0, 0, 291, 290, 1, 0, 0, 0, 292, 293, 1, 0, 0, 0, 293, 291, 1, 0, 0, 0, 293, 294, 1, 0, 0, 0, 294, 295, 1, 0, 0, 0, 295, 296, 6, 43, 0, 0, 296, 88, 1, 0, 0, 0, 7, 0, 268, 273, 279, 281, 287, 293, 1, 6, 0, 0] \ No newline at end of file diff --git a/src/more_math/Parser/MathExprLexer.py b/src/more_math/Parser/MathExprLexer.py index 0b671f8..b5e30f1 100644 --- a/src/more_math/Parser/MathExprLexer.py +++ b/src/more_math/Parser/MathExprLexer.py @@ -10,7 +10,7 @@ else: def serializedATN(): return [ - 4,0,44,300,6,-1,2,0,7,0,2,1,7,1,2,2,7,2,2,3,7,3,2,4,7,4,2,5,7,5, + 4,0,44,297,6,-1,2,0,7,0,2,1,7,1,2,2,7,2,2,3,7,3,2,4,7,4,2,5,7,5, 2,6,7,6,2,7,7,7,2,8,7,8,2,9,7,9,2,10,7,10,2,11,7,11,2,12,7,12,2, 13,7,13,2,14,7,14,2,15,7,15,2,16,7,16,2,17,7,17,2,18,7,18,2,19,7, 19,2,20,7,20,2,21,7,21,2,22,7,22,2,23,7,23,2,24,7,24,2,25,7,25,2, @@ -28,93 +28,92 @@ def serializedATN(): 25,1,25,1,25,1,25,1,26,1,26,1,26,1,26,1,26,1,26,1,27,1,27,1,27,1, 27,1,27,1,27,1,28,1,28,1,28,1,28,1,28,1,29,1,29,1,29,1,29,1,29,1, 29,1,30,1,30,1,30,1,30,1,30,1,30,1,31,1,31,1,31,1,31,1,32,1,32,1, - 32,1,32,1,32,1,32,1,32,1,32,1,33,1,33,1,33,1,33,1,33,1,33,1,34,1, - 34,1,35,1,35,1,36,1,36,1,37,1,37,1,38,1,38,1,39,1,39,1,40,1,40,1, - 40,1,40,1,40,3,40,272,8,40,1,41,4,41,275,8,41,11,41,12,41,276,1, - 41,1,41,4,41,281,8,41,11,41,12,41,282,3,41,285,8,41,1,42,1,42,5, - 42,289,8,42,10,42,12,42,292,9,42,1,43,4,43,295,8,43,11,43,12,43, - 296,1,43,1,43,0,0,44,1,1,3,2,5,3,7,4,9,5,11,6,13,7,15,8,17,9,19, - 10,21,11,23,12,25,13,27,14,29,15,31,16,33,17,35,18,37,19,39,20,41, - 21,43,22,45,23,47,24,49,25,51,26,53,27,55,28,57,29,59,30,61,31,63, - 32,65,33,67,34,69,35,71,36,73,37,75,38,77,39,79,40,81,41,83,42,85, - 43,87,44,1,0,5,2,0,69,69,101,101,1,0,48,57,3,0,65,90,95,95,97,122, - 4,0,48,57,65,90,95,95,97,122,3,0,9,10,13,13,32,32,306,0,1,1,0,0, - 0,0,3,1,0,0,0,0,5,1,0,0,0,0,7,1,0,0,0,0,9,1,0,0,0,0,11,1,0,0,0,0, - 13,1,0,0,0,0,15,1,0,0,0,0,17,1,0,0,0,0,19,1,0,0,0,0,21,1,0,0,0,0, - 23,1,0,0,0,0,25,1,0,0,0,0,27,1,0,0,0,0,29,1,0,0,0,0,31,1,0,0,0,0, - 33,1,0,0,0,0,35,1,0,0,0,0,37,1,0,0,0,0,39,1,0,0,0,0,41,1,0,0,0,0, - 43,1,0,0,0,0,45,1,0,0,0,0,47,1,0,0,0,0,49,1,0,0,0,0,51,1,0,0,0,0, - 53,1,0,0,0,0,55,1,0,0,0,0,57,1,0,0,0,0,59,1,0,0,0,0,61,1,0,0,0,0, - 63,1,0,0,0,0,65,1,0,0,0,0,67,1,0,0,0,0,69,1,0,0,0,0,71,1,0,0,0,0, - 73,1,0,0,0,0,75,1,0,0,0,0,77,1,0,0,0,0,79,1,0,0,0,0,81,1,0,0,0,0, - 83,1,0,0,0,0,85,1,0,0,0,0,87,1,0,0,0,1,89,1,0,0,0,3,91,1,0,0,0,5, - 93,1,0,0,0,7,95,1,0,0,0,9,99,1,0,0,0,11,103,1,0,0,0,13,107,1,0,0, - 0,15,112,1,0,0,0,17,117,1,0,0,0,19,122,1,0,0,0,21,128,1,0,0,0,23, - 133,1,0,0,0,25,138,1,0,0,0,27,143,1,0,0,0,29,149,1,0,0,0,31,155, - 1,0,0,0,33,161,1,0,0,0,35,165,1,0,0,0,37,170,1,0,0,0,39,173,1,0, - 0,0,41,177,1,0,0,0,43,181,1,0,0,0,45,186,1,0,0,0,47,191,1,0,0,0, - 49,196,1,0,0,0,51,201,1,0,0,0,53,207,1,0,0,0,55,213,1,0,0,0,57,219, - 1,0,0,0,59,224,1,0,0,0,61,230,1,0,0,0,63,236,1,0,0,0,65,240,1,0, - 0,0,67,248,1,0,0,0,69,254,1,0,0,0,71,256,1,0,0,0,73,258,1,0,0,0, - 75,260,1,0,0,0,77,262,1,0,0,0,79,264,1,0,0,0,81,271,1,0,0,0,83,274, - 1,0,0,0,85,286,1,0,0,0,87,294,1,0,0,0,89,90,5,40,0,0,90,2,1,0,0, - 0,91,92,5,41,0,0,92,4,1,0,0,0,93,94,5,44,0,0,94,6,1,0,0,0,95,96, - 5,115,0,0,96,97,5,105,0,0,97,98,5,110,0,0,98,8,1,0,0,0,99,100,5, - 99,0,0,100,101,5,111,0,0,101,102,5,115,0,0,102,10,1,0,0,0,103,104, - 5,116,0,0,104,105,5,97,0,0,105,106,5,110,0,0,106,12,1,0,0,0,107, - 108,5,97,0,0,108,109,5,115,0,0,109,110,5,105,0,0,110,111,5,110,0, - 0,111,14,1,0,0,0,112,113,5,97,0,0,113,114,5,99,0,0,114,115,5,111, - 0,0,115,116,5,115,0,0,116,16,1,0,0,0,117,118,5,97,0,0,118,119,5, - 116,0,0,119,120,5,97,0,0,120,121,5,110,0,0,121,18,1,0,0,0,122,123, - 5,97,0,0,123,124,5,116,0,0,124,125,5,97,0,0,125,126,5,110,0,0,126, - 127,5,50,0,0,127,20,1,0,0,0,128,129,5,115,0,0,129,130,5,105,0,0, - 130,131,5,110,0,0,131,132,5,104,0,0,132,22,1,0,0,0,133,134,5,99, - 0,0,134,135,5,111,0,0,135,136,5,115,0,0,136,137,5,104,0,0,137,24, - 1,0,0,0,138,139,5,116,0,0,139,140,5,97,0,0,140,141,5,110,0,0,141, - 142,5,104,0,0,142,26,1,0,0,0,143,144,5,97,0,0,144,145,5,115,0,0, - 145,146,5,105,0,0,146,147,5,110,0,0,147,148,5,104,0,0,148,28,1,0, - 0,0,149,150,5,97,0,0,150,151,5,99,0,0,151,152,5,111,0,0,152,153, - 5,115,0,0,153,154,5,104,0,0,154,30,1,0,0,0,155,156,5,97,0,0,156, - 157,5,116,0,0,157,158,5,97,0,0,158,159,5,110,0,0,159,160,5,104,0, - 0,160,32,1,0,0,0,161,162,5,97,0,0,162,163,5,98,0,0,163,164,5,115, - 0,0,164,34,1,0,0,0,165,166,5,115,0,0,166,167,5,113,0,0,167,168,5, - 114,0,0,168,169,5,116,0,0,169,36,1,0,0,0,170,171,5,108,0,0,171,172, - 5,110,0,0,172,38,1,0,0,0,173,174,5,108,0,0,174,175,5,111,0,0,175, - 176,5,103,0,0,176,40,1,0,0,0,177,178,5,101,0,0,178,179,5,120,0,0, - 179,180,5,112,0,0,180,42,1,0,0,0,181,182,5,115,0,0,182,183,5,109, - 0,0,183,184,5,105,0,0,184,185,5,110,0,0,185,44,1,0,0,0,186,187,5, - 115,0,0,187,188,5,109,0,0,188,189,5,97,0,0,189,190,5,120,0,0,190, - 46,1,0,0,0,191,192,5,116,0,0,192,193,5,109,0,0,193,194,5,105,0,0, - 194,195,5,110,0,0,195,48,1,0,0,0,196,197,5,116,0,0,197,198,5,109, - 0,0,198,199,5,97,0,0,199,200,5,120,0,0,200,50,1,0,0,0,201,202,5, - 116,0,0,202,203,5,110,0,0,203,204,5,111,0,0,204,205,5,114,0,0,205, - 206,5,109,0,0,206,52,1,0,0,0,207,208,5,115,0,0,208,209,5,110,0,0, - 209,210,5,111,0,0,210,211,5,114,0,0,211,212,5,109,0,0,212,54,1,0, - 0,0,213,214,5,102,0,0,214,215,5,108,0,0,215,216,5,111,0,0,216,217, - 5,111,0,0,217,218,5,114,0,0,218,56,1,0,0,0,219,220,5,99,0,0,220, - 221,5,101,0,0,221,222,5,105,0,0,222,223,5,108,0,0,223,58,1,0,0,0, - 224,225,5,114,0,0,225,226,5,111,0,0,226,227,5,117,0,0,227,228,5, - 110,0,0,228,229,5,100,0,0,229,60,1,0,0,0,230,231,5,103,0,0,231,232, - 5,97,0,0,232,233,5,109,0,0,233,234,5,109,0,0,234,235,5,97,0,0,235, - 62,1,0,0,0,236,237,5,112,0,0,237,238,5,111,0,0,238,239,5,119,0,0, - 239,64,1,0,0,0,240,241,5,115,0,0,241,242,5,105,0,0,242,243,5,103, - 0,0,243,244,5,109,0,0,244,245,5,111,0,0,245,246,5,105,0,0,246,247, - 5,100,0,0,247,66,1,0,0,0,248,249,5,99,0,0,249,250,5,108,0,0,250, - 251,5,97,0,0,251,252,5,109,0,0,252,253,5,112,0,0,253,68,1,0,0,0, - 254,255,5,43,0,0,255,70,1,0,0,0,256,257,5,45,0,0,257,72,1,0,0,0, - 258,259,5,42,0,0,259,74,1,0,0,0,260,261,5,47,0,0,261,76,1,0,0,0, - 262,263,5,37,0,0,263,78,1,0,0,0,264,265,5,94,0,0,265,80,1,0,0,0, - 266,267,5,112,0,0,267,272,5,105,0,0,268,269,5,80,0,0,269,272,5,73, - 0,0,270,272,7,0,0,0,271,266,1,0,0,0,271,268,1,0,0,0,271,270,1,0, - 0,0,272,82,1,0,0,0,273,275,7,1,0,0,274,273,1,0,0,0,275,276,1,0,0, - 0,276,274,1,0,0,0,276,277,1,0,0,0,277,284,1,0,0,0,278,280,5,46,0, - 0,279,281,7,1,0,0,280,279,1,0,0,0,281,282,1,0,0,0,282,280,1,0,0, - 0,282,283,1,0,0,0,283,285,1,0,0,0,284,278,1,0,0,0,284,285,1,0,0, - 0,285,84,1,0,0,0,286,290,7,2,0,0,287,289,7,3,0,0,288,287,1,0,0,0, - 289,292,1,0,0,0,290,288,1,0,0,0,290,291,1,0,0,0,291,86,1,0,0,0,292, - 290,1,0,0,0,293,295,7,4,0,0,294,293,1,0,0,0,295,296,1,0,0,0,296, - 294,1,0,0,0,296,297,1,0,0,0,297,298,1,0,0,0,298,299,6,43,0,0,299, - 88,1,0,0,0,7,0,271,276,282,284,290,296,1,6,0,0 + 32,1,32,1,32,1,33,1,33,1,33,1,33,1,33,1,33,1,34,1,34,1,35,1,35,1, + 36,1,36,1,37,1,37,1,38,1,38,1,39,1,39,1,40,1,40,1,40,1,40,1,40,3, + 40,269,8,40,1,41,4,41,272,8,41,11,41,12,41,273,1,41,1,41,4,41,278, + 8,41,11,41,12,41,279,3,41,282,8,41,1,42,1,42,5,42,286,8,42,10,42, + 12,42,289,9,42,1,43,4,43,292,8,43,11,43,12,43,293,1,43,1,43,0,0, + 44,1,1,3,2,5,3,7,4,9,5,11,6,13,7,15,8,17,9,19,10,21,11,23,12,25, + 13,27,14,29,15,31,16,33,17,35,18,37,19,39,20,41,21,43,22,45,23,47, + 24,49,25,51,26,53,27,55,28,57,29,59,30,61,31,63,32,65,33,67,34,69, + 35,71,36,73,37,75,38,77,39,79,40,81,41,83,42,85,43,87,44,1,0,5,2, + 0,69,69,101,101,1,0,48,57,3,0,65,90,95,95,97,122,4,0,48,57,65,90, + 95,95,97,122,3,0,9,10,13,13,32,32,303,0,1,1,0,0,0,0,3,1,0,0,0,0, + 5,1,0,0,0,0,7,1,0,0,0,0,9,1,0,0,0,0,11,1,0,0,0,0,13,1,0,0,0,0,15, + 1,0,0,0,0,17,1,0,0,0,0,19,1,0,0,0,0,21,1,0,0,0,0,23,1,0,0,0,0,25, + 1,0,0,0,0,27,1,0,0,0,0,29,1,0,0,0,0,31,1,0,0,0,0,33,1,0,0,0,0,35, + 1,0,0,0,0,37,1,0,0,0,0,39,1,0,0,0,0,41,1,0,0,0,0,43,1,0,0,0,0,45, + 1,0,0,0,0,47,1,0,0,0,0,49,1,0,0,0,0,51,1,0,0,0,0,53,1,0,0,0,0,55, + 1,0,0,0,0,57,1,0,0,0,0,59,1,0,0,0,0,61,1,0,0,0,0,63,1,0,0,0,0,65, + 1,0,0,0,0,67,1,0,0,0,0,69,1,0,0,0,0,71,1,0,0,0,0,73,1,0,0,0,0,75, + 1,0,0,0,0,77,1,0,0,0,0,79,1,0,0,0,0,81,1,0,0,0,0,83,1,0,0,0,0,85, + 1,0,0,0,0,87,1,0,0,0,1,89,1,0,0,0,3,91,1,0,0,0,5,93,1,0,0,0,7,95, + 1,0,0,0,9,99,1,0,0,0,11,103,1,0,0,0,13,107,1,0,0,0,15,112,1,0,0, + 0,17,117,1,0,0,0,19,122,1,0,0,0,21,128,1,0,0,0,23,133,1,0,0,0,25, + 138,1,0,0,0,27,143,1,0,0,0,29,149,1,0,0,0,31,155,1,0,0,0,33,161, + 1,0,0,0,35,165,1,0,0,0,37,170,1,0,0,0,39,173,1,0,0,0,41,177,1,0, + 0,0,43,181,1,0,0,0,45,186,1,0,0,0,47,191,1,0,0,0,49,196,1,0,0,0, + 51,201,1,0,0,0,53,207,1,0,0,0,55,213,1,0,0,0,57,219,1,0,0,0,59,224, + 1,0,0,0,61,230,1,0,0,0,63,236,1,0,0,0,65,240,1,0,0,0,67,245,1,0, + 0,0,69,251,1,0,0,0,71,253,1,0,0,0,73,255,1,0,0,0,75,257,1,0,0,0, + 77,259,1,0,0,0,79,261,1,0,0,0,81,268,1,0,0,0,83,271,1,0,0,0,85,283, + 1,0,0,0,87,291,1,0,0,0,89,90,5,40,0,0,90,2,1,0,0,0,91,92,5,41,0, + 0,92,4,1,0,0,0,93,94,5,44,0,0,94,6,1,0,0,0,95,96,5,115,0,0,96,97, + 5,105,0,0,97,98,5,110,0,0,98,8,1,0,0,0,99,100,5,99,0,0,100,101,5, + 111,0,0,101,102,5,115,0,0,102,10,1,0,0,0,103,104,5,116,0,0,104,105, + 5,97,0,0,105,106,5,110,0,0,106,12,1,0,0,0,107,108,5,97,0,0,108,109, + 5,115,0,0,109,110,5,105,0,0,110,111,5,110,0,0,111,14,1,0,0,0,112, + 113,5,97,0,0,113,114,5,99,0,0,114,115,5,111,0,0,115,116,5,115,0, + 0,116,16,1,0,0,0,117,118,5,97,0,0,118,119,5,116,0,0,119,120,5,97, + 0,0,120,121,5,110,0,0,121,18,1,0,0,0,122,123,5,97,0,0,123,124,5, + 116,0,0,124,125,5,97,0,0,125,126,5,110,0,0,126,127,5,50,0,0,127, + 20,1,0,0,0,128,129,5,115,0,0,129,130,5,105,0,0,130,131,5,110,0,0, + 131,132,5,104,0,0,132,22,1,0,0,0,133,134,5,99,0,0,134,135,5,111, + 0,0,135,136,5,115,0,0,136,137,5,104,0,0,137,24,1,0,0,0,138,139,5, + 116,0,0,139,140,5,97,0,0,140,141,5,110,0,0,141,142,5,104,0,0,142, + 26,1,0,0,0,143,144,5,97,0,0,144,145,5,115,0,0,145,146,5,105,0,0, + 146,147,5,110,0,0,147,148,5,104,0,0,148,28,1,0,0,0,149,150,5,97, + 0,0,150,151,5,99,0,0,151,152,5,111,0,0,152,153,5,115,0,0,153,154, + 5,104,0,0,154,30,1,0,0,0,155,156,5,97,0,0,156,157,5,116,0,0,157, + 158,5,97,0,0,158,159,5,110,0,0,159,160,5,104,0,0,160,32,1,0,0,0, + 161,162,5,97,0,0,162,163,5,98,0,0,163,164,5,115,0,0,164,34,1,0,0, + 0,165,166,5,115,0,0,166,167,5,113,0,0,167,168,5,114,0,0,168,169, + 5,116,0,0,169,36,1,0,0,0,170,171,5,108,0,0,171,172,5,110,0,0,172, + 38,1,0,0,0,173,174,5,108,0,0,174,175,5,111,0,0,175,176,5,103,0,0, + 176,40,1,0,0,0,177,178,5,101,0,0,178,179,5,120,0,0,179,180,5,112, + 0,0,180,42,1,0,0,0,181,182,5,115,0,0,182,183,5,109,0,0,183,184,5, + 105,0,0,184,185,5,110,0,0,185,44,1,0,0,0,186,187,5,115,0,0,187,188, + 5,109,0,0,188,189,5,97,0,0,189,190,5,120,0,0,190,46,1,0,0,0,191, + 192,5,116,0,0,192,193,5,109,0,0,193,194,5,105,0,0,194,195,5,110, + 0,0,195,48,1,0,0,0,196,197,5,116,0,0,197,198,5,109,0,0,198,199,5, + 97,0,0,199,200,5,120,0,0,200,50,1,0,0,0,201,202,5,116,0,0,202,203, + 5,110,0,0,203,204,5,111,0,0,204,205,5,114,0,0,205,206,5,109,0,0, + 206,52,1,0,0,0,207,208,5,115,0,0,208,209,5,110,0,0,209,210,5,111, + 0,0,210,211,5,114,0,0,211,212,5,109,0,0,212,54,1,0,0,0,213,214,5, + 102,0,0,214,215,5,108,0,0,215,216,5,111,0,0,216,217,5,111,0,0,217, + 218,5,114,0,0,218,56,1,0,0,0,219,220,5,99,0,0,220,221,5,101,0,0, + 221,222,5,105,0,0,222,223,5,108,0,0,223,58,1,0,0,0,224,225,5,114, + 0,0,225,226,5,111,0,0,226,227,5,117,0,0,227,228,5,110,0,0,228,229, + 5,100,0,0,229,60,1,0,0,0,230,231,5,103,0,0,231,232,5,97,0,0,232, + 233,5,109,0,0,233,234,5,109,0,0,234,235,5,97,0,0,235,62,1,0,0,0, + 236,237,5,112,0,0,237,238,5,111,0,0,238,239,5,119,0,0,239,64,1,0, + 0,0,240,241,5,115,0,0,241,242,5,105,0,0,242,243,5,103,0,0,243,244, + 5,109,0,0,244,66,1,0,0,0,245,246,5,99,0,0,246,247,5,108,0,0,247, + 248,5,97,0,0,248,249,5,109,0,0,249,250,5,112,0,0,250,68,1,0,0,0, + 251,252,5,43,0,0,252,70,1,0,0,0,253,254,5,45,0,0,254,72,1,0,0,0, + 255,256,5,42,0,0,256,74,1,0,0,0,257,258,5,47,0,0,258,76,1,0,0,0, + 259,260,5,37,0,0,260,78,1,0,0,0,261,262,5,94,0,0,262,80,1,0,0,0, + 263,264,5,112,0,0,264,269,5,105,0,0,265,266,5,80,0,0,266,269,5,73, + 0,0,267,269,7,0,0,0,268,263,1,0,0,0,268,265,1,0,0,0,268,267,1,0, + 0,0,269,82,1,0,0,0,270,272,7,1,0,0,271,270,1,0,0,0,272,273,1,0,0, + 0,273,271,1,0,0,0,273,274,1,0,0,0,274,281,1,0,0,0,275,277,5,46,0, + 0,276,278,7,1,0,0,277,276,1,0,0,0,278,279,1,0,0,0,279,277,1,0,0, + 0,279,280,1,0,0,0,280,282,1,0,0,0,281,275,1,0,0,0,281,282,1,0,0, + 0,282,84,1,0,0,0,283,287,7,2,0,0,284,286,7,3,0,0,285,284,1,0,0,0, + 286,289,1,0,0,0,287,285,1,0,0,0,287,288,1,0,0,0,288,86,1,0,0,0,289, + 287,1,0,0,0,290,292,7,4,0,0,291,290,1,0,0,0,292,293,1,0,0,0,293, + 291,1,0,0,0,293,294,1,0,0,0,294,295,1,0,0,0,295,296,6,43,0,0,296, + 88,1,0,0,0,7,0,268,273,279,281,287,293,1,6,0,0 ] class MathExprLexer(Lexer): @@ -177,7 +176,7 @@ class MathExprLexer(Lexer): "'atan'", "'atan2'", "'sinh'", "'cosh'", "'tanh'", "'asinh'", "'acosh'", "'atanh'", "'abs'", "'sqrt'", "'ln'", "'log'", "'exp'", "'smin'", "'smax'", "'tmin'", "'tmax'", "'tnorm'", "'snorm'", - "'floor'", "'ceil'", "'round'", "'gamma'", "'pow'", "'sigmoid'", + "'floor'", "'ceil'", "'round'", "'gamma'", "'pow'", "'sigm'", "'clamp'", "'+'", "'-'", "'*'", "'/'", "'%'", "'^'" ] symbolicNames = [ "", diff --git a/src/more_math/Parser/MathExprLexer.tokens b/src/more_math/Parser/MathExprLexer.tokens index cc8ad59..f85cec2 100644 --- a/src/more_math/Parser/MathExprLexer.tokens +++ b/src/more_math/Parser/MathExprLexer.tokens @@ -74,7 +74,7 @@ WS=44 'round'=30 'gamma'=31 'pow'=32 -'sigmoid'=33 +'sigm'=33 'clamp'=34 '+'=35 '-'=36 diff --git a/src/more_math/Parser/MathExprParser.py b/src/more_math/Parser/MathExprParser.py index ea462f3..b0a5fa3 100644 --- a/src/more_math/Parser/MathExprParser.py +++ b/src/more_math/Parser/MathExprParser.py @@ -120,8 +120,8 @@ class MathExprParser ( Parser ): "'abs'", "'sqrt'", "'ln'", "'log'", "'exp'", "'smin'", "'smax'", "'tmin'", "'tmax'", "'tnorm'", "'snorm'", "'floor'", "'ceil'", "'round'", "'gamma'", "'pow'", - "'sigmoid'", "'clamp'", "'+'", "'-'", "'*'", "'/'", - "'%'", "'^'" ] + "'sigm'", "'clamp'", "'+'", "'-'", "'*'", "'/'", "'%'", + "'^'" ] symbolicNames = [ "", "", "", "", "SIN", "COS", "TAN", "ASIN", "ACOS", "ATAN", "ATAN2",