Add head lowering for ExpressionOperatorChain

purefunctor · Feb 1, 2025 · 404a062 · 404a062
1 parent aa1fe11
commit 404a062
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 30 deletions.
diff --git a/crates/lowering/src/algorithm.rs b/crates/lowering/src/algorithm.rs
@@ -157,28 +157,25 @@ fn lower_expression(state: &mut State, cst: &cst::Expression) -> ExpressionId {
             ExpressionKind::Typed { expression, signature }
         }
         cst::Expression::ExpressionOperatorChain(o) => {
-            let pairs: Vec<_> = o
-                .children()
-                .map(|p| {
-                    let qualified = p.qualified();
-
-                    let qualifier = qualified.as_ref().and_then(|q| {
-                        let q = q.qualifier()?;
-                        let t = q.text()?;
-                        Some(SmolStr::from(t.text()))
-                    });
-
-                    let operator = qualified.as_ref().and_then(|q| {
-                        let o = q.operator()?;
-                        Some(SmolStr::from(o.text()))
-                    });
-
-                    let element = p.expression().map(|e| lower_expression(state, &e));
-
-                    OperatorPair { qualifier, operator, element }
-                })
-                .collect();
-            ExpressionKind::OperatorChain { pairs }
+            let lower_pair = |state: &mut State, p: &cst::ExpressionOperatorPair| {
+                let qualified = p.qualified();
+                let qualifier = qualified.as_ref().and_then(|q| {
+                    let q = q.qualifier()?;
+                    let t = q.text()?;
+                    Some(SmolStr::from(t.text()))
+                });
+                let operator = qualified.as_ref().and_then(|q| {
+                    let o = q.operator()?;
+                    Some(SmolStr::from(o.text()))
+                });
+                let element = p.expression().map(|e| lower_expression(state, &e));
+                OperatorPair { qualifier, operator, element }
+            };
+
+            let head = o.expression().map(|e| lower_expression(state, &e));
+            let tail: Vec<_> = o.children().map(|p| lower_pair(state, &p)).collect();
+
+            ExpressionKind::OperatorChain { head, tail }
         }
         cst::Expression::ExpressionInfixChain(i) => {
             let lower_pair = |state: &mut State, p: &cst::ExpressionInfixPair| {

diff --git a/crates/lowering/src/concrete.rs b/crates/lowering/src/concrete.rs
@@ -21,7 +21,7 @@ pub struct TickPair<T> {
 #[derive(Debug, PartialEq, Eq, Hash)]
 pub enum ExpressionKind {
     Typed { expression: Option<ExpressionId>, signature: Option<TypeId> },
-    OperatorChain { pairs: Vec<OperatorPair<ExpressionId>> },
+    OperatorChain { head: Option<ExpressionId>, tail: Vec<OperatorPair<ExpressionId>> },
     InfixChain { head: Option<ExpressionId>, tail: Vec<TickPair<ExpressionId>> },
     Negate,
     ApplicationChain,

diff --git a/crates/lowering/tests/concrete.rs b/crates/lowering/tests/concrete.rs
@@ -12,8 +12,6 @@ fn lower_declaration<'s>(source: impl AsRef<[&'s str]>) -> (IndexingResult, Lowe
     let (node, _) = parsing::parse(&lexed, &tokens);
     let module = cst::Module::cast(node).unwrap();
 
-    dbg!(&module);
-
     let (index, _) = indexing::index(&module);
     let lower = lowering::lower(&module, &index);
 

diff --git a/crates/lowering/tests/snapshots/concrete__lower_expression_operator_chain.snap b/crates/lowering/tests/snapshots/concrete__lower_expression_operator_chain.snap
@@ -7,6 +7,12 @@ SourceMap {
     types: {},
     binders: {},
     expressions: {
+        AstPtr {
+            raw: SyntaxNodePtr {
+                kind: ExpressionInteger,
+                range: 25..27,
+            },
+        }: Integer,
         AstPtr {
             raw: SyntaxNodePtr {
                 kind: ExpressionInteger,
@@ -37,14 +43,17 @@ SourceMap {
                 range: 25..43,
             },
         }: OperatorChain {
-            pairs: [
+            head: Some(
+                Id<syntax::cst::Expression>(0),
+            ),
+            tail: [
                 OperatorPair {
                     qualifier: None,
                     operator: Some(
                         "+",
                     ),
                     element: Some(
-                        Id<syntax::cst::Expression>(0),
+                        Id<syntax::cst::Expression>(1),
                     ),
                 },
                 OperatorPair {
@@ -53,7 +62,7 @@ SourceMap {
                         "+",
                     ),
                     element: Some(
-                        Id<syntax::cst::Expression>(1),
+                        Id<syntax::cst::Expression>(2),
                     ),
                 },
                 OperatorPair {
@@ -62,7 +71,7 @@ SourceMap {
                         "+",
                     ),
                     element: Some(
-                        Id<syntax::cst::Expression>(2),
+                        Id<syntax::cst::Expression>(3),
                     ),
                 },
                 OperatorPair {
@@ -71,7 +80,7 @@ SourceMap {
                         "+",
                     ),
                     element: Some(
-                        Id<syntax::cst::Expression>(3),
+                        Id<syntax::cst::Expression>(4),
                     ),
                 },
             ],

diff --git a/crates/syntax/src/cst.rs b/crates/syntax/src/cst.rs
@@ -450,6 +450,11 @@ has_child!(
     | signature() -> Type
 );
 
+has_child!(
+    ExpressionOperatorChain
+    | expression() -> Expression
+);
+
 has_children!(
     ExpressionOperatorChain
     | children() -> ExpressionOperatorPair