Add AST source NodeId to lower's expression stack (#567)

Author: jpschorr

partiql-ast/src/ast/mod.rs

@@ -11,7 +11,7 @@
 use rust_decimal::Decimal as RustDecimal;
 
 use partiql_ast_macros::Visit;
-use partiql_common::node::NodeId;
+use partiql_common::node::{IdAnnotated, NodeId};
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 use std::fmt;
@@ -36,6 +36,12 @@ impl<T> Deref for AstNode<T> {
     }
 }
 
+impl<T> IdAnnotated<NodeId> for AstNode<T> {
+    fn id(&self) -> NodeId {
+        self.id
+    }
+}
+
 #[derive(Visit, Clone, Debug, PartialEq)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub enum Item {
@@ -421,6 +427,30 @@ pub enum Expr {
     Error,
 }
 
+impl IdAnnotated<NodeId> for Expr {
+    fn id(&self) -> NodeId {
+        match self {
+            Expr::Lit(l) => l.id(),
+            Expr::VarRef(v) => v.id(),
+            Expr::BinOp(b) => b.id(),
+            Expr::UniOp(u) => u.id(),
+            Expr::Like(l) => l.id(),
+            Expr::Between(l) => l.id(),
+            Expr::In(l) => l.id(),
+            Expr::Case(c) => c.id(),
+            Expr::Struct(s) => s.id(),
+            Expr::Bag(b) => b.id(),
+            Expr::List(l) => l.id(),
+            Expr::Path(p) => p.id(),
+            Expr::Call(c) => c.id(),
+            Expr::CallAgg(c) => c.id(),
+            Expr::GraphMatch(g) => g.id(),
+            Expr::Query(q) => q.id(),
+            Expr::Error => unreachable!(),
+        }
+    }
+}
+
 /// `Lit` is mostly inspired by SQL-92 Literals standard and `PartiQL` specification.
 /// See section 5.3 in the following:
 /// <https://www.contrib.andrew.cmu.edu/~shadow/sql/sql1992.txt>

partiql-common/src/node.rs

@@ -6,10 +6,20 @@ use serde::{Deserialize, Serialize};
 
 pub type NodeMap<T> = IndexMap<NodeId, T>;
 
+pub trait IdAnnotated<T: Copy> {
+    fn id(&self) -> T;
+}
+
 #[derive(Copy, Clone, Debug, Eq, PartialEq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub struct NodeId(pub u32);
 
+impl IdAnnotated<NodeId> for NodeId {
+    fn id(&self) -> NodeId {
+        *self
+    }
+}
+
 #[derive(Debug)]
 /// Auto-incrementing [`NodeIdGenerator`]
 pub struct AutoNodeIdGenerator {

partiql-conformance-tests/tests/mod.rs

@@ -213,8 +213,8 @@ pub(crate) fn pass_eval(
         Ok(v) => {
             assert_eq!(&TestValue::from(v), expected)
         },
-        Err(TestError::Parse(_)) => {
-            panic!("When evaluating (mode = {mode:#?}) `{statement}`, unexpected parse error")
+        Err(TestError::Parse(err)) => {
+            panic!("When evaluating (mode = {mode:#?}) `{statement}`, unexpected parse error: {err:#?}")
         }
         Err(TestError::Lower(err)) => panic!("When evaluating (mode = {mode:#?}) `{statement}`, unexpected lowering error `{err:?}`"),
         Err(TestError::Plan(err)) => panic!("When evaluating (mode = {mode:#?}) `{statement}`, unexpected planning error `{err:?}`"),