cleanup preprocess

Signed-off-by: Heinz N. Gies <heinz@licenser.net>
tremor-rs · May 12, 2021 · 98d4c92 · 98d4c92
1 parent aee045b
commit 98d4c92
Show file tree

Hide file tree

Showing 4 changed files with 141 additions and 307 deletions.
diff --git a/tests/script_errors/lexer_triple_colon/error.txt b/tests/script_errors/lexer_triple_colon/error.txt
@@ -1,5 +1,5 @@
 Error: 
     1 | #  we can't have triple colons
     2 | a:::b()
-      |  ^^^ Found the token `:::` but expected one of `!=`, `%`, `&`, `(`, `)`, `*`, `+`, `,`, `-`, `.`, `.`, `/`, `:`, `::`, `;`, `<`, `<<`, `<=`, `<end-of-stream>`, `==`, `=>`, `>`, `>=`, `>>`, `>>>`, `[`, `]`, `^`, `and`, `case`, `default`, `end`, `of`, `or`, `when`, `xor`, `|`, `}`
+      |  ^^^ Found the token `:::` but expected one of `!=`, `%`, `&`, `(`, `)`, `*`, `+`, `,`, `-`, `.`, `.`, `/`, `:`, `::`, `;`, `<`, `<<`, `<=`, `<end-of-stream>`, `==`, `=>`, `>`, `>=`, `>>`, `>>>`, `[`, `]`, `^`, `and`, `case`, `default`, `end`, `of`, `or`, `when`, `xor`, `}`
       |      NOTE: Did you mean to use `::`?
diff --git a/tremor-script/src/grammar.lalrpop b/tremor-script/src/grammar.lalrpop
@@ -380,7 +380,7 @@ AndExprImut: ImutExprRaw<'input> = {
 
 /// Bitwise or
 BitOrExprImut: ImutExprRaw<'input> = {
-    <o:BinOp<BinBitOr, BitOrExprImut, BitXorExprImut>> => <>,
+//    <o:BinOp<BinBitOr, BitOrExprImut, BitXorExprImut>> => <>,
     BitXorExprImut => <>,
 }
 
@@ -1243,9 +1243,9 @@ BinXor: BinOpKind = {
 BinAnd: BinOpKind = {
     "and" => BinOpKind::And,
 }
-BinBitOr: BinOpKind = {
-    "|" => BinOpKind::BitOr,
-}
+// BinBitOr: BinOpKind = {
+//    "|" => BinOpKind::BitOr,
+// }
 BinBitXor: BinOpKind = {
     "^" => BinOpKind::BitXor,
 }
@@ -1343,7 +1343,7 @@ extern {
         ">>>" => Token::RBitShiftUnsigned,
         "<<" => Token::LBitShift,
         "!" => Token::BitNot,
-        "|" => Token::BitOr,
+//        "|" => Token::BitOr,
         "^" => Token::BitXor,
         "&" => Token::BitAnd,
         "+" => Token::Add,