Support AssignOr and AssignAnd

jac3km4 · Jul 11, 2021 · 1b0ccf0 · 1b0ccf0 · flibdev · Jul 12, 2021
1 parent 85c084f
commit 1b0ccf0
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/compiler/src/lib.rs b/compiler/src/lib.rs
@@ -673,7 +673,7 @@ impl ModulePath {
     }
 }
 
-impl <'a> IntoIterator for &'a ModulePath {
+impl<'a> IntoIterator for &'a ModulePath {
     type Item = &'a Ident;
 
     type IntoIter = std::slice::Iter<'a, Ident>;

diff --git a/compiler/src/parser.rs b/compiler/src/parser.rs
@@ -346,6 +346,8 @@ peg::parser! {
             x:@ _ pos:pos() "-=" _ y:(@) { Expr::BinOp(Box::new(x), Box::new(y), BinOp::AssignSubtract, pos) }
             x:@ _ pos:pos() "*=" _ y:(@) { Expr::BinOp(Box::new(x), Box::new(y), BinOp::AssignMultiply, pos) }
             x:@ _ pos:pos() "/=" _ y:(@) { Expr::BinOp(Box::new(x), Box::new(y), BinOp::AssignDivide, pos) }
+            x:@ _ pos:pos() "|=" _ y:(@) { Expr::BinOp(Box::new(x), Box::new(y), BinOp::AssignOr, pos) }
+            x:@ _ pos:pos() "&=" _ y:(@) { Expr::BinOp(Box::new(x), Box::new(y), BinOp::AssignAnd, pos) }
             --
             x:(@) _ pos:pos() "||" _ y:@ { Expr::BinOp(Box::new(x), Box::new(y), BinOp::LogicOr, pos) }
             x:(@) _ pos:pos() "&&" _ y:@ { Expr::BinOp(Box::new(x), Box::new(y), BinOp::LogicAnd, pos) }

diff --git a/core/src/ast.rs b/core/src/ast.rs
@@ -156,6 +156,10 @@ pub enum BinOp {
     AssignMultiply,
     #[strum(serialize = "OperatorAssignDivide")]
     AssignDivide,
+    #[strum(serialize = "OperatorAssignOr")]
+    AssignOr,
+    #[strum(serialize = "OperatorAssignAnd")]
+    AssignAnd,
     #[strum(serialize = "OperatorLogicOr")]
     LogicOr,
     #[strum(serialize = "OperatorLogicAnd")]
@@ -197,6 +201,8 @@ impl BinOp {
             BinOp::AssignSubtract => 10,
             BinOp::AssignMultiply => 10,
             BinOp::AssignDivide => 10,
+            BinOp::AssignOr => 10,
+            BinOp::AssignAnd => 10,
             BinOp::LogicOr => 9,
             BinOp::LogicAnd => 8,
             BinOp::Or => 7,
@@ -222,6 +228,8 @@ impl BinOp {
             BinOp::AssignSubtract => false,
             BinOp::AssignMultiply => false,
             BinOp::AssignDivide => false,
+            BinOp::AssignOr => false,
+            BinOp::AssignAnd => false,
             BinOp::LogicOr => true,
             BinOp::LogicAnd => true,
             BinOp::Or => true,

diff --git a/decompiler/src/print.rs b/decompiler/src/print.rs
@@ -467,6 +467,8 @@ fn format_binop(op: BinOp) -> &'static str {
         BinOp::AssignSubtract => "-=",
         BinOp::AssignMultiply => "*=",
         BinOp::AssignDivide => "/=",
+        BinOp::AssignOr => "|=",
+        BinOp::AssignAnd => "&=",
         BinOp::LogicOr => "||",
         BinOp::LogicAnd => "&&",
         BinOp::Or => "|",