fix: pow incorrect precedence/associativity

src/main/interpreter/antlr/MineScript.g4

@@ -36,10 +36,10 @@ statement
 
 expression
     : ID '(' actual_parameters? ')'                                                                                                           #FuncCall
-    | '-' expression                                                                                                                          #Neg
-    | 'not' expression                                                                                                                        #NotExpr
     | '(' expression ')'                                                                                                                      #ParenExpr
+    | 'not' expression                                                                                                                        #NotExpr
     | <assoc=right> expression '^' expression                                                                                                 #Pow
+    | '-' expression                                                                                                                          #Neg
     | expression op=('*' | '/' | '%') expression                                                                                              #MultDivMod
     | expression op=('+' | '-') expression                                                                                                    #AddSub
     | expression op=('<' | '>' | '<=' | '>=') expression                                                                                      #Comp

src/main/interpreter/antlr/MineScript.interp

@@ -14,9 +14,9 @@ null
 'define'
 'enddefine'
 'return'
-'-'
 'not'
 '^'
+'-'
 '*'
 '/'
 '%'
@@ -92,4 +92,4 @@ actual_parameters
 
 
 atn:
-[4, 1, 39, 160, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 1, 0, 5, 0, 14, 8, 0, 10, 0, 12, 0, 17, 9, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 5, 1, 24, 8, 1, 10, 1, 12, 1, 27, 9, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 5, 2, 49, 8, 2, 10, 2, 12, 2, 52, 9, 2, 1, 2, 1, 2, 3, 2, 56, 8, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 3, 2, 81, 8, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 3, 2, 93, 8, 2, 1, 3, 1, 3, 1, 3, 1, 3, 3, 3, 99, 8, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 3, 3, 116, 8, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 5, 3, 139, 8, 3, 10, 3, 12, 3, 142, 9, 3, 1, 4, 1, 4, 1, 4, 5, 4, 147, 8, 4, 10, 4, 12, 4, 150, 9, 4, 1, 5, 1, 5, 1, 5, 5, 5, 155, 8, 5, 10, 5, 12, 5, 158, 9, 5, 1, 5, 0, 1, 6, 6, 0, 2, 4, 6, 8, 10, 0, 4, 1, 0, 18, 20, 2, 0, 15, 15, 21, 21, 1, 0, 22, 25, 1, 0, 26, 27, 184, 0, 15, 1, 0, 0, 0, 2, 20, 1, 0, 0, 0, 4, 92, 1, 0, 0, 0, 6, 115, 1, 0, 0, 0, 8, 143, 1, 0, 0, 0, 10, 151, 1, 0, 0, 0, 12, 14, 3, 4, 2, 0, 13, 12, 1, 0, 0, 0, 14, 17, 1, 0, 0, 0, 15, 13, 1, 0, 0, 0, 15, 16, 1, 0, 0, 0, 16, 18, 1, 0, 0, 0, 17, 15, 1, 0, 0, 0, 18, 19, 5, 0, 0, 1, 19, 1, 1, 0, 0, 0, 20, 21, 5, 1, 0, 0, 21, 25, 5, 38, 0, 0, 22, 24, 3, 4, 2, 0, 23, 22, 1, 0, 0, 0, 24, 27, 1, 0, 0, 0, 25, 23, 1, 0, 0, 0, 25, 26, 1, 0, 0, 0, 26, 3, 1, 0, 0, 0, 27, 25, 1, 0, 0, 0, 28, 29, 3, 6, 3, 0, 29, 30, 5, 38, 0, 0, 30, 93, 1, 0, 0, 0, 31, 32, 5, 37, 0, 0, 32, 33, 5, 2, 0, 0, 33, 34, 3, 6, 3, 0, 34, 35, 5, 38, 0, 0, 35, 93, 1, 0, 0, 0, 36, 37, 5, 3, 0, 0, 37, 38, 5, 4, 0, 0, 38, 39, 3, 6, 3, 0, 39, 40, 5, 5, 0, 0, 40, 50, 3, 2, 1, 0, 41, 42, 5, 6, 0, 0, 42, 43, 5, 3, 0, 0, 43, 44, 5, 4, 0, 0, 44, 45, 3, 6, 3, 0, 45, 46, 5, 5, 0, 0, 46, 47, 3, 2, 1, 0, 47, 49, 1, 0, 0, 0, 48, 41, 1, 0, 0, 0, 49, 52, 1, 0, 0, 0, 50, 48, 1, 0, 0, 0, 50, 51, 1, 0, 0, 0, 51, 55, 1, 0, 0, 0, 52, 50, 1, 0, 0, 0, 53, 54, 5, 6, 0, 0, 54, 56, 3, 2, 1, 0, 55, 53, 1, 0, 0, 0, 55, 56, 1, 0, 0, 0, 56, 57, 1, 0, 0, 0, 57, 58, 5, 7, 0, 0, 58, 59, 5, 38, 0, 0, 59, 93, 1, 0, 0, 0, 60, 61, 5, 8, 0, 0, 61, 62, 5, 4, 0, 0, 62, 63, 3, 6, 3, 0, 63, 64, 5, 5, 0, 0, 64, 65, 3, 2, 1, 0, 65, 66, 5, 9, 0, 0, 66, 67, 5, 38, 0, 0, 67, 93, 1, 0, 0, 0, 68, 69, 5, 10, 0, 0, 69, 70, 5, 4, 0, 0, 70, 71, 3, 6, 3, 0, 71, 72, 5, 5, 0, 0, 72, 73, 3, 2, 1, 0, 73, 74, 5, 11, 0, 0, 74, 75, 5, 38, 0, 0, 75, 93, 1, 0, 0, 0, 76, 77, 5, 12, 0, 0, 77, 78, 5, 37, 0, 0, 78, 80, 5, 4, 0, 0, 79, 81, 3, 8, 4, 0, 80, 79, 1, 0, 0, 0, 80, 81, 1, 0, 0, 0, 81, 82, 1, 0, 0, 0, 82, 83, 5, 5, 0, 0, 83, 84, 3, 2, 1, 0, 84, 85, 5, 13, 0, 0, 85, 86, 5, 38, 0, 0, 86, 93, 1, 0, 0, 0, 87, 88, 5, 14, 0, 0, 88, 89, 3, 6, 3, 0, 89, 90, 5, 38, 0, 0, 90, 93, 1, 0, 0, 0, 91, 93, 5, 38, 0, 0, 92, 28, 1, 0, 0, 0, 92, 31, 1, 0, 0, 0, 92, 36, 1, 0, 0, 0, 92, 60, 1, 0, 0, 0, 92, 68, 1, 0, 0, 0, 92, 76, 1, 0, 0, 0, 92, 87, 1, 0, 0, 0, 92, 91, 1, 0, 0, 0, 93, 5, 1, 0, 0, 0, 94, 95, 6, 3, -1, 0, 95, 96, 5, 37, 0, 0, 96, 98, 5, 4, 0, 0, 97, 99, 3, 10, 5, 0, 98, 97, 1, 0, 0, 0, 98, 99, 1, 0, 0, 0, 99, 100, 1, 0, 0, 0, 100, 116, 5, 5, 0, 0, 101, 102, 5, 15, 0, 0, 102, 116, 3, 6, 3, 16, 103, 104, 5, 16, 0, 0, 104, 116, 3, 6, 3, 15, 105, 106, 5, 4, 0, 0, 106, 107, 3, 6, 3, 0, 107, 108, 5, 5, 0, 0, 108, 116, 1, 0, 0, 0, 109, 116, 5, 37, 0, 0, 110, 116, 5, 35, 0, 0, 111, 116, 5, 32, 0, 0, 112, 116, 5, 33, 0, 0, 113, 116, 5, 36, 0, 0, 114, 116, 5, 34, 0, 0, 115, 94, 1, 0, 0, 0, 115, 101, 1, 0, 0, 0, 115, 103, 1, 0, 0, 0, 115, 105, 1, 0, 0, 0, 115, 109, 1, 0, 0, 0, 115, 110, 1, 0, 0, 0, 115, 111, 1, 0, 0, 0, 115, 112, 1, 0, 0, 0, 115, 113, 1, 0, 0, 0, 115, 114, 1, 0, 0, 0, 116, 140, 1, 0, 0, 0, 117, 118, 10, 13, 0, 0, 118, 119, 5, 17, 0, 0, 119, 139, 3, 6, 3, 13, 120, 121, 10, 12, 0, 0, 121, 122, 7, 0, 0, 0, 122, 139, 3, 6, 3, 13, 123, 124, 10, 11, 0, 0, 124, 125, 7, 1, 0, 0, 125, 139, 3, 6, 3, 12, 126, 127, 10, 10, 0, 0, 127, 128, 7, 2, 0, 0, 128, 139, 3, 6, 3, 11, 129, 130, 10, 9, 0, 0, 130, 131, 7, 3, 0, 0, 131, 139, 3, 6, 3, 10, 132, 133, 10, 8, 0, 0, 133, 134, 5, 28, 0, 0, 134, 139, 3, 6, 3, 9, 135, 136, 10, 7, 0, 0, 136, 137, 5, 29, 0, 0, 137, 139, 3, 6, 3, 8, 138, 117, 1, 0, 0, 0, 138, 120, 1, 0, 0, 0, 138, 123, 1, 0, 0, 0, 138, 126, 1, 0, 0, 0, 138, 129, 1, 0, 0, 0, 138, 132, 1, 0, 0, 0, 138, 135, 1, 0, 0, 0, 139, 142, 1, 0, 0, 0, 140, 138, 1, 0, 0, 0, 140, 141, 1, 0, 0, 0, 141, 7, 1, 0, 0, 0, 142, 140, 1, 0, 0, 0, 143, 148, 5, 37, 0, 0, 144, 145, 5, 30, 0, 0, 145, 147, 5, 37, 0, 0, 146, 144, 1, 0, 0, 0, 147, 150, 1, 0, 0, 0, 148, 146, 1, 0, 0, 0, 148, 149, 1, 0, 0, 0, 149, 9, 1, 0, 0, 0, 150, 148, 1, 0, 0, 0, 151, 156, 3, 6, 3, 0, 152, 153, 5, 30, 0, 0, 153, 155, 3, 6, 3, 0, 154, 152, 1, 0, 0, 0, 155, 158, 1, 0, 0, 0, 156, 154, 1, 0, 0, 0, 156, 157, 1, 0, 0, 0, 157, 11, 1, 0, 0, 0, 158, 156, 1, 0, 0, 0, 12, 15, 25, 50, 55, 80, 92, 98, 115, 138, 140, 148, 156]
+[4, 1, 39, 160, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 1, 0, 5, 0, 14, 8, 0, 10, 0, 12, 0, 17, 9, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 5, 1, 24, 8, 1, 10, 1, 12, 1, 27, 9, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 5, 2, 49, 8, 2, 10, 2, 12, 2, 52, 9, 2, 1, 2, 1, 2, 3, 2, 56, 8, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 3, 2, 81, 8, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 3, 2, 93, 8, 2, 1, 3, 1, 3, 1, 3, 1, 3, 3, 3, 99, 8, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 3, 3, 116, 8, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 5, 3, 139, 8, 3, 10, 3, 12, 3, 142, 9, 3, 1, 4, 1, 4, 1, 4, 5, 4, 147, 8, 4, 10, 4, 12, 4, 150, 9, 4, 1, 5, 1, 5, 1, 5, 5, 5, 155, 8, 5, 10, 5, 12, 5, 158, 9, 5, 1, 5, 0, 1, 6, 6, 0, 2, 4, 6, 8, 10, 0, 4, 1, 0, 18, 20, 2, 0, 17, 17, 21, 21, 1, 0, 22, 25, 1, 0, 26, 27, 184, 0, 15, 1, 0, 0, 0, 2, 20, 1, 0, 0, 0, 4, 92, 1, 0, 0, 0, 6, 115, 1, 0, 0, 0, 8, 143, 1, 0, 0, 0, 10, 151, 1, 0, 0, 0, 12, 14, 3, 4, 2, 0, 13, 12, 1, 0, 0, 0, 14, 17, 1, 0, 0, 0, 15, 13, 1, 0, 0, 0, 15, 16, 1, 0, 0, 0, 16, 18, 1, 0, 0, 0, 17, 15, 1, 0, 0, 0, 18, 19, 5, 0, 0, 1, 19, 1, 1, 0, 0, 0, 20, 21, 5, 1, 0, 0, 21, 25, 5, 38, 0, 0, 22, 24, 3, 4, 2, 0, 23, 22, 1, 0, 0, 0, 24, 27, 1, 0, 0, 0, 25, 23, 1, 0, 0, 0, 25, 26, 1, 0, 0, 0, 26, 3, 1, 0, 0, 0, 27, 25, 1, 0, 0, 0, 28, 29, 3, 6, 3, 0, 29, 30, 5, 38, 0, 0, 30, 93, 1, 0, 0, 0, 31, 32, 5, 37, 0, 0, 32, 33, 5, 2, 0, 0, 33, 34, 3, 6, 3, 0, 34, 35, 5, 38, 0, 0, 35, 93, 1, 0, 0, 0, 36, 37, 5, 3, 0, 0, 37, 38, 5, 4, 0, 0, 38, 39, 3, 6, 3, 0, 39, 40, 5, 5, 0, 0, 40, 50, 3, 2, 1, 0, 41, 42, 5, 6, 0, 0, 42, 43, 5, 3, 0, 0, 43, 44, 5, 4, 0, 0, 44, 45, 3, 6, 3, 0, 45, 46, 5, 5, 0, 0, 46, 47, 3, 2, 1, 0, 47, 49, 1, 0, 0, 0, 48, 41, 1, 0, 0, 0, 49, 52, 1, 0, 0, 0, 50, 48, 1, 0, 0, 0, 50, 51, 1, 0, 0, 0, 51, 55, 1, 0, 0, 0, 52, 50, 1, 0, 0, 0, 53, 54, 5, 6, 0, 0, 54, 56, 3, 2, 1, 0, 55, 53, 1, 0, 0, 0, 55, 56, 1, 0, 0, 0, 56, 57, 1, 0, 0, 0, 57, 58, 5, 7, 0, 0, 58, 59, 5, 38, 0, 0, 59, 93, 1, 0, 0, 0, 60, 61, 5, 8, 0, 0, 61, 62, 5, 4, 0, 0, 62, 63, 3, 6, 3, 0, 63, 64, 5, 5, 0, 0, 64, 65, 3, 2, 1, 0, 65, 66, 5, 9, 0, 0, 66, 67, 5, 38, 0, 0, 67, 93, 1, 0, 0, 0, 68, 69, 5, 10, 0, 0, 69, 70, 5, 4, 0, 0, 70, 71, 3, 6, 3, 0, 71, 72, 5, 5, 0, 0, 72, 73, 3, 2, 1, 0, 73, 74, 5, 11, 0, 0, 74, 75, 5, 38, 0, 0, 75, 93, 1, 0, 0, 0, 76, 77, 5, 12, 0, 0, 77, 78, 5, 37, 0, 0, 78, 80, 5, 4, 0, 0, 79, 81, 3, 8, 4, 0, 80, 79, 1, 0, 0, 0, 80, 81, 1, 0, 0, 0, 81, 82, 1, 0, 0, 0, 82, 83, 5, 5, 0, 0, 83, 84, 3, 2, 1, 0, 84, 85, 5, 13, 0, 0, 85, 86, 5, 38, 0, 0, 86, 93, 1, 0, 0, 0, 87, 88, 5, 14, 0, 0, 88, 89, 3, 6, 3, 0, 89, 90, 5, 38, 0, 0, 90, 93, 1, 0, 0, 0, 91, 93, 5, 38, 0, 0, 92, 28, 1, 0, 0, 0, 92, 31, 1, 0, 0, 0, 92, 36, 1, 0, 0, 0, 92, 60, 1, 0, 0, 0, 92, 68, 1, 0, 0, 0, 92, 76, 1, 0, 0, 0, 92, 87, 1, 0, 0, 0, 92, 91, 1, 0, 0, 0, 93, 5, 1, 0, 0, 0, 94, 95, 6, 3, -1, 0, 95, 96, 5, 37, 0, 0, 96, 98, 5, 4, 0, 0, 97, 99, 3, 10, 5, 0, 98, 97, 1, 0, 0, 0, 98, 99, 1, 0, 0, 0, 99, 100, 1, 0, 0, 0, 100, 116, 5, 5, 0, 0, 101, 102, 5, 4, 0, 0, 102, 103, 3, 6, 3, 0, 103, 104, 5, 5, 0, 0, 104, 116, 1, 0, 0, 0, 105, 106, 5, 15, 0, 0, 106, 116, 3, 6, 3, 15, 107, 108, 5, 17, 0, 0, 108, 116, 3, 6, 3, 13, 109, 116, 5, 37, 0, 0, 110, 116, 5, 35, 0, 0, 111, 116, 5, 32, 0, 0, 112, 116, 5, 33, 0, 0, 113, 116, 5, 36, 0, 0, 114, 116, 5, 34, 0, 0, 115, 94, 1, 0, 0, 0, 115, 101, 1, 0, 0, 0, 115, 105, 1, 0, 0, 0, 115, 107, 1, 0, 0, 0, 115, 109, 1, 0, 0, 0, 115, 110, 1, 0, 0, 0, 115, 111, 1, 0, 0, 0, 115, 112, 1, 0, 0, 0, 115, 113, 1, 0, 0, 0, 115, 114, 1, 0, 0, 0, 116, 140, 1, 0, 0, 0, 117, 118, 10, 14, 0, 0, 118, 119, 5, 16, 0, 0, 119, 139, 3, 6, 3, 14, 120, 121, 10, 12, 0, 0, 121, 122, 7, 0, 0, 0, 122, 139, 3, 6, 3, 13, 123, 124, 10, 11, 0, 0, 124, 125, 7, 1, 0, 0, 125, 139, 3, 6, 3, 12, 126, 127, 10, 10, 0, 0, 127, 128, 7, 2, 0, 0, 128, 139, 3, 6, 3, 11, 129, 130, 10, 9, 0, 0, 130, 131, 7, 3, 0, 0, 131, 139, 3, 6, 3, 10, 132, 133, 10, 8, 0, 0, 133, 134, 5, 28, 0, 0, 134, 139, 3, 6, 3, 9, 135, 136, 10, 7, 0, 0, 136, 137, 5, 29, 0, 0, 137, 139, 3, 6, 3, 8, 138, 117, 1, 0, 0, 0, 138, 120, 1, 0, 0, 0, 138, 123, 1, 0, 0, 0, 138, 126, 1, 0, 0, 0, 138, 129, 1, 0, 0, 0, 138, 132, 1, 0, 0, 0, 138, 135, 1, 0, 0, 0, 139, 142, 1, 0, 0, 0, 140, 138, 1, 0, 0, 0, 140, 141, 1, 0, 0, 0, 141, 7, 1, 0, 0, 0, 142, 140, 1, 0, 0, 0, 143, 148, 5, 37, 0, 0, 144, 145, 5, 30, 0, 0, 145, 147, 5, 37, 0, 0, 146, 144, 1, 0, 0, 0, 147, 150, 1, 0, 0, 0, 148, 146, 1, 0, 0, 0, 148, 149, 1, 0, 0, 0, 149, 9, 1, 0, 0, 0, 150, 148, 1, 0, 0, 0, 151, 156, 3, 6, 3, 0, 152, 153, 5, 30, 0, 0, 153, 155, 3, 6, 3, 0, 154, 152, 1, 0, 0, 0, 155, 158, 1, 0, 0, 0, 156, 154, 1, 0, 0, 0, 156, 157, 1, 0, 0, 0, 157, 11, 1, 0, 0, 0, 158, 156, 1, 0, 0, 0, 12, 15, 25, 50, 55, 80, 92, 98, 115, 138, 140, 148, 156]

src/main/interpreter/antlr/MineScript.tokens

@@ -51,9 +51,9 @@ WS=39
 'define'=12
 'enddefine'=13
 'return'=14
-'-'=15
-'not'=16
-'^'=17
+'not'=15
+'^'=16
+'-'=17
 '*'=18
 '/'=19
 '%'=20

src/main/interpreter/antlr/MineScriptBaseVisitor.java

@@ -1,6 +1,6 @@
 package interpreter.antlr;
 
-// Generated from MineScript.g4 by ANTLR 4.12.0
+// Generated from MineScript.g4 by ANTLR 4.13.0
 import org.antlr.v4.runtime.tree.AbstractParseTreeVisitor;
 
 /**