feat: Merged spans

lykia-rs · Dec 7, 2023 · 66d1889 · 66d1889
1 parent 364206f
commit 66d1889
Show file tree

Hide file tree

Showing 7 changed files with 122 additions and 74 deletions.
diff --git a/src/lang/ast/sql.rs b/src/lang/ast/sql.rs
@@ -2,12 +2,44 @@ use crate::lang::token::Token;
 
 use super::expr::ExprId;
 
+// Enums
+
 #[derive(Debug, Eq, PartialEq)]
 pub enum SqlDistinct {
     All,
     Distinct,
 }
 
+#[derive(Debug, Eq, PartialEq)]
+pub enum SqlJoinType {
+    Left,
+    LeftOuter,
+    Right,
+    Inner,
+}
+
+#[derive(Debug, Eq, PartialEq)]
+pub enum SqlCompoundOperator {
+    Union,
+    UnionAll,
+    Intersect,
+    Except,
+}
+
+#[derive(Debug, Eq, PartialEq)]
+pub enum SqlOrdering {
+    Asc,
+    Desc,
+}
+
+//
+
+#[derive(Debug, Eq, PartialEq)]
+pub enum SqlFrom {
+    TableSubquery(Vec<SqlTableSubquery>),
+    JoinClause(Box<SqlJoinClause>),
+}
+
 #[derive(Debug, Eq, PartialEq)]
 pub enum SqlProjection {
     All,
@@ -33,40 +65,12 @@ pub enum SqlTableSubquery {
     },
 }
 
-#[derive(Debug, Eq, PartialEq)]
-pub enum SqlJoinType {
-    Left,
-    LeftOuter,
-    Right,
-    Inner,
-}
-
 #[derive(Debug, Eq, PartialEq)]
 pub enum SqlJoinClause {
     None(SqlTableSubquery),
     Join(Vec<(SqlJoinType, SqlTableSubquery, SqlExpr)>),
 }
 
-#[derive(Debug, Eq, PartialEq)]
-pub enum SqlCompoundOperator {
-    Union,
-    UnionAll,
-    Intersect,
-    Except,
-}
-
-#[derive(Debug, Eq, PartialEq)]
-pub enum SqlOrdering {
-    Asc,
-    Desc,
-}
-
-#[derive(Debug, Eq, PartialEq)]
-pub enum SqlFrom {
-    TableSubquery(Vec<SqlTableSubquery>),
-    JoinClause(Box<SqlJoinClause>),
-}
-
 #[derive(Debug, Eq, PartialEq)]
 pub struct SelectCore {
     pub distinct: SqlDistinct,

diff --git a/src/lang/ast/stmt.rs b/src/lang/ast/stmt.rs
@@ -1,4 +1,4 @@
-use crate::lang::token::{Span, Token};
+use crate::lang::token::{Span, Spanned, Token};
 
 use super::expr::ExprId;
 
@@ -45,6 +45,22 @@ pub enum Stmt {
     },
 }
 
+impl Spanned for Stmt {
+    fn get_span(&self) -> Span {
+        match self {
+            Stmt::Program { span, .. } => *span,
+            Stmt::Expression { span, .. } => *span,
+            Stmt::Break { span, .. } => *span,
+            Stmt::Continue { span, .. } => *span,
+            Stmt::Block { span, .. } => *span,
+            Stmt::Declaration { span, .. } => *span,
+            Stmt::If { span, .. } => *span,
+            Stmt::Loop { span, .. } => *span,
+            Stmt::Return { span, .. } => *span,
+        }
+    }
+}
+
 #[repr(transparent)]
 #[derive(Debug, Clone, Copy, Eq, PartialEq)]
 pub struct StmtId(pub usize);