Make >> and >>> parseable for A<B<T>>

APLanguage · Oct 5, 2023 · 345d6c3 · 345d6c3
1 parent ed2e628
commit 345d6c3
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -4,6 +4,7 @@
 #![feature(trait_alias)]
 #![feature(return_position_impl_trait_in_trait)]
 #![feature(iter_collect_into)]
+// #![feature(iter_map_windows)]
 
 use std::{ops::Range, path::Path};
 

diff --git a/src/parsing/parsers/expressions.rs b/src/parsing/parsers/expressions.rs
@@ -3,8 +3,9 @@ use chumsky::{
     recursive::recursive,
     select,
     span::SimpleSpan,
-    Parser,
+    IterParser, Parser, prelude::Rich,
 };
+use itertools::Itertools;
 
 use crate::parsing::{
     ast::expressions::{CallKind, Expression},
@@ -241,7 +242,18 @@ macro_rules! binary_parser {
 #[rustfmt::skip] binary_parser!(operation_chain, comparison, term, ops_parser!(GreaterEqual, LessEqual, Greater, Less));
 #[rustfmt::skip] binary_parser!(binary, term, factor, ops_parser!(Plus, Minus)); // TODO: Newline split
 #[rustfmt::skip] binary_parser!(binary, factor, bitops, ops_parser!(Asterisk, SlashSlash, Slash, Percent));
-#[rustfmt::skip] binary_parser!(binary, bitops, unary, ops_parser!(Bar, Ampersand, GreaterGreater, LessLess, GreaterGreaterGreater));
+#[rustfmt::skip] binary_parser!(binary, bitops, unary, ops_parser!(Bar, Ampersand, LessLess)
+    .or(
+        just(Token::Greater).span().repeated().at_least(2).at_most(3).collect_boxed_slice()
+        .try_map(|slice, _span|
+            if slice.iter().tuple_windows().all(|(a, b)| a.end == b.start) {
+                Ok(if slice.len() == 2 { Operation::ShiftRight } else { Operation::ShiftRightUnsigned })
+            } else {
+                Err(Rich::custom(_span, "there is a whitespace between the two/three >"))
+            }
+        )
+    )
+);
 
 pub fn operation_chain_parser<'a, NP, OP, I: TokenInput<'a>>(
     next_parser: NP,

diff --git a/src/parsing/tokenizer.rs b/src/parsing/tokenizer.rs
@@ -85,12 +85,12 @@ pub enum Token {
     #[token("^")]
     Circumflex,
 
-    #[token(">>")]
-    GreaterGreater,
+    // #[token(">>")]
+    // GreaterGreater,
     #[token("<<")]
     LessLess,
-    #[token(">>>")]
-    GreaterGreaterGreater,
+    // #[token(">>>")]
+    // GreaterGreaterGreater,
 
     #[token("&&")]
     AmpersandAmpersand,
@@ -251,9 +251,9 @@ impl From<Token> for Operation {
             Ampersand => AndBitwise,
             Bar => OrBitwise,
             Circumflex => XOR,
-            GreaterGreater => ShiftRight,
+            // GreaterGreater => ShiftRight,
             LessLess => ShiftLeft,
-            GreaterGreaterGreater => ShiftRightUnsigned,
+            // GreaterGreaterGreater => ShiftRightUnsigned,
             AmpersandAmpersand => And,
             BarBar => Or,
             Token::Greater => Operation::Greater,