Merge pull request #20 from Koihik/fix-incorrect-parse-order

fix: incorrect parse order

Author: Koihik

Lua.g4

@@ -108,8 +108,8 @@ exp:
 	| prefixexp
 	| functiondef
 	| tableconstructor
-	| exp linkOperator exp
-	| unaryOperator exp;
+	| unaryOperator exp
+	| exp linkOperator exp;
 
 prefixexp: varOrExp nameAndArgs*;
 

generated/Lua.interp

@@ -1882,7 +1882,7 @@ LuaParser::ExpContext* LuaParser::exp(int precedence) {
         setState(259);
         unaryOperator();
         setState(260);
-        exp(1);
+        exp(2);
         break;
       }
 
@@ -1902,11 +1902,11 @@ LuaParser::ExpContext* LuaParser::exp(int precedence) {
         pushNewRecursionContext(_localctx, startState, RuleExp);
         setState(264);
 
-        if (!(precpred(_ctx, 2))) throw FailedPredicateException(this, "precpred(_ctx, 2)");
+        if (!(precpred(_ctx, 1))) throw FailedPredicateException(this, "precpred(_ctx, 1)");
         setState(265);
         linkOperator();
         setState(266);
-        exp(3); 
+        exp(2); 
       }
       setState(272);
       _errHandler->sync(this);
@@ -3238,7 +3238,7 @@ bool LuaParser::sempred(RuleContext *context, size_t ruleIndex, size_t predicate
 
 bool LuaParser::expSempred(ExpContext *_localctx, size_t predicateIndex) {
   switch (predicateIndex) {
-    case 0: return precpred(_ctx, 2);
+    case 0: return precpred(_ctx, 1);
 
   default:
     break;
@@ -3490,14 +3490,14 @@ LuaParser::Initializer::Initializer() {
     0x2, 0x100, 0x109, 0x5, 0x4e, 0x28, 0x2, 0x101, 0x109, 0x7, 0x33, 0x2, 
     0x2, 0x102, 0x109, 0x5, 0x2e, 0x18, 0x2, 0x103, 0x109, 0x5, 0x3a, 0x1e, 
     0x2, 0x104, 0x109, 0x5, 0x40, 0x21, 0x2, 0x105, 0x106, 0x5, 0x4a, 0x26, 
-    0x2, 0x106, 0x107, 0x5, 0x2c, 0x17, 0x3, 0x107, 0x109, 0x3, 0x2, 0x2, 
+    0x2, 0x106, 0x107, 0x5, 0x2c, 0x17, 0x4, 0x107, 0x109, 0x3, 0x2, 0x2, 
     0x2, 0x108, 0xfb, 0x3, 0x2, 0x2, 0x2, 0x108, 0xfd, 0x3, 0x2, 0x2, 0x2, 
     0x108, 0xfe, 0x3, 0x2, 0x2, 0x2, 0x108, 0xff, 0x3, 0x2, 0x2, 0x2, 0x108, 
     0x100, 0x3, 0x2, 0x2, 0x2, 0x108, 0x101, 0x3, 0x2, 0x2, 0x2, 0x108, 
     0x102, 0x3, 0x2, 0x2, 0x2, 0x108, 0x103, 0x3, 0x2, 0x2, 0x2, 0x108, 
     0x104, 0x3, 0x2, 0x2, 0x2, 0x108, 0x105, 0x3, 0x2, 0x2, 0x2, 0x109, 
-    0x110, 0x3, 0x2, 0x2, 0x2, 0x10a, 0x10b, 0xc, 0x4, 0x2, 0x2, 0x10b, 
-    0x10c, 0x5, 0x48, 0x25, 0x2, 0x10c, 0x10d, 0x5, 0x2c, 0x17, 0x5, 0x10d, 
+    0x110, 0x3, 0x2, 0x2, 0x2, 0x10a, 0x10b, 0xc, 0x3, 0x2, 0x2, 0x10b, 
+    0x10c, 0x5, 0x48, 0x25, 0x2, 0x10c, 0x10d, 0x5, 0x2c, 0x17, 0x4, 0x10d, 
     0x10f, 0x3, 0x2, 0x2, 0x2, 0x10e, 0x10a, 0x3, 0x2, 0x2, 0x2, 0x10f, 
     0x112, 0x3, 0x2, 0x2, 0x2, 0x110, 0x10e, 0x3, 0x2, 0x2, 0x2, 0x110, 
     0x111, 0x3, 0x2, 0x2, 0x2, 0x111, 0x2d, 0x3, 0x2, 0x2, 0x2, 0x112, 0x110, 

generated/LuaParser.cpp

@@ -27,14 +27,16 @@ using namespace std;
         REQUIRE(expect == formatTwice);                                                                     \
     }
 
+TEST_FILE("../test/testdata/linebreak/args_length.lua");
 TEST_FILE("../test/testdata/linebreak/block.lua");
+TEST_FILE("../test/testdata/linebreak/chained_call_args.lua");
 TEST_FILE("../test/testdata/linebreak/functioncall.lua");
 TEST_FILE("../test/testdata/linebreak/functiondef.lua");
+TEST_FILE("../test/testdata/linebreak/indent_in_explist.lua");
+TEST_FILE("../test/testdata/linebreak/long_var.lua");
+TEST_FILE("../test/testdata/linebreak/nested_method_call.lua");
 TEST_FILE("../test/testdata/linebreak/operators.lua");
 TEST_FILE("../test/testdata/linebreak/table.lua");
-TEST_FILE("../test/testdata/linebreak/chained_call_args.lua");
-TEST_FILE("../test/testdata/linebreak/nested_method_call.lua");
-TEST_FILE("../test/testdata/linebreak/args_length.lua");
 
 TEST_FILE("../test/testdata/comment/function.lua");
 TEST_FILE("../test/testdata/comment/space.lua");
@@ -50,3 +52,4 @@ TEST_FILE("../test/testdata/statement/statements.lua");
 TEST_FILE("../test/testdata/statement/table.lua");
 
 TEST_FILE("../test/testdata/issues/issue-1.lua");
+TEST_FILE("../test/testdata/issues/issue-18.lua");

test/test_format_file.cpp

@@ -0,0 +1,3 @@
+if aaaaaaa == 1 and bbbbb == 1 and bbbbb == 1 and bbbbb == 1 and bbbbb == 1 and
+    b == -1 and bbbbb == 1 and bbbbb == 1 and bbbbb == 1 and bbbbb == 1 and
+    bbbbb == 1 and bbbbb == 1 then print(1) end

test/testdata/issues/_issue-18.lua

@@ -0,0 +1,4 @@
+if aaaaaaa == 1 and bbbbb == 1 and bbbbb == 1 and bbbbb == 1 and bbbbb == 1 and
+    b ==
+    -1 and bbbbb == 1 and bbbbb == 1 and bbbbb == 1 and bbbbb == 1 and bbbbb ==
+        1 and bbbbb == 1 then print(1) end