fix: operator precedence & not equal code generation

sigmasoldi3r · Oct 30, 2023 · 5ffd57a · 5ffd57a
1 parent 40d6ba7
commit 5ffd57a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/examples/loops.saturn b/examples/loops.saturn
@@ -6,11 +6,12 @@ let tbl = {
   c: "x"
 };
 
+// For-each
 for (k, v) in entries(tbl) {
   print(k, v);
 }
 
-
+// Range based for
 for i in 1..4 {
   print(i);
 }
diff --git a/src/lua.rs b/src/lua.rs
@@ -623,7 +623,6 @@ impl code::Visitor<code::Builder> for LuaEmitter {
             | "<"
             | "<="
             | "=="
-            | "~="
             // Logic
             | "not"
             | "and"
@@ -640,13 +639,19 @@ impl code::Visitor<code::Builder> for LuaEmitter {
                 let ctx = ctx.put(op.to_owned());
                 self.visit_expression(ctx.put(" "), &expr.right)
             }
-            "++"=> {
+            "++" => {
                 // Native-to-native operator translation
                 let ctx = self.visit_expression(ctx, &expr.left)?.put(" ");
                 let ctx = ctx.put("..".to_owned());
                 self.visit_expression(ctx.put(" "), &expr.right)
             }
-            _=> {
+            "<>" => {
+                // Native-to-native operator translation
+                let ctx = self.visit_expression(ctx, &expr.left)?.put(" ");
+                let ctx = ctx.put("~=".to_owned());
+                self.visit_expression(ctx.put(" "), &expr.right)
+            }
+            _ => {
                 // Direct function translation
                 let ctx = translate_operator(ctx, op.to_owned()).put("(");
                 let ctx = self.visit_expression(ctx, &expr.left)?.put(", ");

diff --git a/src/parser/mod.rs b/src/parser/mod.rs
@@ -264,11 +264,11 @@ peg::parser! {
             { ClassField::Operator(OperatorOverload { operator, arguments, body }) }
 
         rule assign_extra() -> Operator
-            = value:$("+") { Operator(value.into()) }
+            = value:$("++") { Operator(value.into()) }
+            / value:$("+") { Operator(value.into()) }
             / value:$("-") { Operator(value.into()) }
             / value:$("*") { Operator(value.into()) }
             / value:$("/") { Operator(value.into()) }
-            / value:$("++") { Operator(value.into()) }
 
         rule argument_list() -> Vec<Argument>
             = "(" _ args:argument() ** (_ "," _) _ ")" { args }