WIP: Arith/Bitwise precedence

CircuitCoder · CircuitCoder · commit 88a76acc3832 · 2019-10-24T03:32:58.000+08:00
diff --git a/src/main/scala/plus/meow/MeowRust/parser/statement.scala b/src/main/scala/plus/meow/MeowRust/parser/statement.scala
@@ -84,16 +84,19 @@ trait Statement extends RegexParsers with Literal with Pattern with Identifier w
 
   // TODO: precedence
   lazy val ARITHMETIC_OR_LOGICAL_EXPRESSION: Parser[BinaryOpExpr] = (
-      (EXPRESSION <~? "+") ~? EXPRESSION ^^ { (l, r) => BinaryOpExpr(Add(), l, r) }
-    | (EXPRESSION <~? "-") ~? EXPRESSION ^^ { (l, r) => BinaryOpExpr(Sub(), l, r) }
-    | (EXPRESSION <~? "*") ~? EXPRESSION ^^ { (l, r) => BinaryOpExpr(Mul(), l, r) }
-    | (EXPRESSION <~? "/") ~? EXPRESSION ^^ { (l, r) => BinaryOpExpr(Div(), l, r) }
-    | (EXPRESSION <~? "%") ~? EXPRESSION ^^ { (l, r) => BinaryOpExpr(Mod(), l, r) }
+      EXPRESSION ~? """\*|/|%""".r ~? EXPRESSION ^^ { (l, op, r) => {
+        val opt = op match {
+          case "*" => Mul()
+          case "/" => Div()
+          case _ => Mod()
+        }
+        BinaryOpExpr(opt, l, r)
+      }}
+    | EXPRESSION ~? """\+|-""".r ~? EXPRESSION ^^ { (l, op, r) => BinaryOpExpr(if(op == "+") Add() else Sub(), l, r) }
+    | EXPRESSION ~? """<<|>>""".r ~? EXPRESSION ^^ { (l, op, r) => BinaryOpExpr(if(op == "<<") BitwiseLShift() else BitwiseRShift(), l, r) }
     | (EXPRESSION <~? "&") ~? EXPRESSION ^^ { (l, r) => BinaryOpExpr(BitwiseAnd(), l, r) }
-    | (EXPRESSION <~? "|") ~? EXPRESSION ^^ { (l, r) => BinaryOpExpr(BitwiseOr(), l, r) }
     | (EXPRESSION <~? "^") ~? EXPRESSION ^^ { (l, r) => BinaryOpExpr(BitwiseXor(), l, r) }
-    | (EXPRESSION <~? "<<") ~? EXPRESSION ^^ { (l, r) => BinaryOpExpr(BitwiseLShift(), l, r) }
-    | (EXPRESSION <~? ">>") ~? EXPRESSION ^^ { (l, r) => BinaryOpExpr(BitwiseRShift(), l, r) }
+    | (EXPRESSION <~? "|") ~? EXPRESSION ^^ { (l, r) => BinaryOpExpr(BitwiseOr(), l, r) }
   )
 
   lazy val COMPARISION_EXPRESSION: Parser[BinaryOpExpr] = (
diff --git a/testcases/arith_expr.txt b/testcases/arith_expr.txt
@@ -1 +1 @@
-"space test" +4 * true
+1 - "space test" +4 * true - 10

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-"space test" +4 * true`
	`1`	`+1 - "space test" +4 * true - 10`