Rename Or to BitOr despite it also being type Or for clarity

Cypher1 · Sep 29, 2024 · 4c4cca5 · 4c4cca5
1 parent 61da82e
commit 4c4cca5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/takolib/build.rs b/takolib/build.rs
@@ -7,6 +7,9 @@ fn main() {
             ctp.yacckind(YaccKind::Grmtools)
                 .grammar_in_src_dir("tako.y")
                 .expect("tako.y failed to build")
+                .show_warnings(true)
+                .warnings_are_errors(true)
+                .error_on_conflicts(true)
         })
         .lexer_in_src_dir("tako.l")
         .expect("tako.l failed to build")

diff --git a/takolib/src/tako.l b/takolib/src/tako.l
@@ -83,7 +83,7 @@ write "write"
 /= "DivAssign"
 \*= "MulAssign"
 &= "AndAssign"
-|= "OrAssign"
+|= "BitOrAssign"
 ^= "BitXorAssign"
 &&= "LogicalAndAssign"
 ||= "LogicalOrAssign"
@@ -114,7 +114,7 @@ write "write"
 \? "Try"
 @ "GetAddress"
 ^ "BitXor"
-\| "Or"
+\| "BitOr"
 \|> "RightPipe"
 \|\| "LogicalOr"
 ~ "BitNot"

diff --git a/takolib/src/tako.y b/takolib/src/tako.y
@@ -42,8 +42,8 @@ RightShiftArg -> R: SimpleExpr { $1 };
 
 AddArg -> R: Mul { $1 };
 MulArg -> R: Exp { $1 };
-ExpArg -> R: Or { $1 } | LogicalOr { $1 } | BitXor { $1 } | Modulo { $1 };
-OrArg -> R: And { $1 };
+ExpArg -> R: BitOr { $1 } | LogicalOr { $1 } | BitXor { $1 } | Modulo { $1 };
+BitOrArg -> R: And { $1 };
 AndArg -> R: SimpleExpr { $1 };
 LogicalOrArg -> R: LogicalAnd { $1 };
 TryArg -> R: Range { $1 };
@@ -200,10 +200,10 @@ Assign -> R:
     // TODO: Flatten
     Ok(op)
   }
-| AssignTarget 'OrAssign' AssignArg
+| AssignTarget 'BitOrAssign' AssignArg
   {
     let op = with(ctx).add_op(Op{
-        op: Symbol::OrAssign,
+        op: Symbol::BitOrAssign,
         args: smallvec![$1?, $3?]
       },
       $span.into()
@@ -463,17 +463,17 @@ Range -> R:
 }
 | RangeArg { $1 };
 
-Or -> R:
-  Or 'Or' OrArg {
+BitOr -> R:
+  BitOr 'BitOr' BitOrArg {
     let op = with(ctx).add_op(Op{
-        op: Symbol::Or,
+        op: Symbol::BitOr,
         args: smallvec![$1?, $3?]
       },
       $span.into()
     );
     Ok(op)
 }
-| OrArg { $1 };
+| BitOrArg { $1 };
 
 LogicalOr -> R:
   LogicalOr 'LogicalOr' LogicalOrArg {