Fix lua 5.4 operator precedence, fix #59

Author: boolangery

cmd/gen.sh

@@ -0,0 +1,3 @@
+#!/bin/zsh
+
+java -jar ~/Downloads/antlr-4.13.2-complete.jar -visitor -Dlanguage=Python3 luaparser/parser/LuaParser.g4

luaparser/parser/LuaParser.g4

@@ -98,10 +98,13 @@ exp
     | exp op = ('*' | '/' | '%' | '//') exp
     | exp op = ('+' | '-') exp
     | <assoc = right> exp (op = '..') exp
+    | exp op = ('<<' | '>>') exp
+    | exp (op = '&') exp
+    | exp (op = '~') exp
+    | exp (op = '|') exp
     | exp op = ('<' | '>' | '<=' | '>=' | '~=' | '==') exp
     | exp (op = 'and') exp
     | exp (op = 'or') exp
-    | exp op = ('&' | '|' | '~' | '<<' | '>>') exp
     ;
 
 // var ::=  Name | prefixexp '[' exp ']' | prefixexp '.' Name

luaparser/parser/LuaParser.interp

@@ -1,4 +1,4 @@
-# Generated from ./luaparser/parser/LuaParser.g4 by ANTLR 4.13.2
+# Generated from luaparser/parser/LuaParser.g4 by ANTLR 4.13.2
 from antlr4 import *
 if "." in __name__:
     from .LuaParser import LuaParser

luaparser/parser/LuaParser.py

@@ -1,4 +1,4 @@
-# Generated from ./luaparser/parser/LuaParser.g4 by ANTLR 4.13.2
+# Generated from luaparser/parser/LuaParser.g4 by ANTLR 4.13.2
 from antlr4 import *
 if "." in __name__:
     from .LuaParser import LuaParser

luaparser/parser/LuaParserListener.py

@@ -372,3 +372,15 @@ def test_cont_int_13(self):
             ])
         )
         self.assertEqual(exp, tree)
+
+    # Bitwise operators mis-parsed #59
+    def test_cont_int_14(self):
+        source = "x = h1 >> 6 | h2 << 20"
+        tree = ast.parse(source)
+        exp = Chunk(
+            Block([
+                Assign([Name("x")], [BOrOp(left=BShiftROp(Name("h1"), Number(6)), right=BShiftLOp(Name("h2"), Number(20)))]),
+            ])
+        )
+        self.assertEqual(source, ast.to_lua_source(ast.parse(source)))
+        self.assertEqual(exp, tree)