Refactor parser (#181)

* Refactor parser and bump lalrpop to 0.20 * Split cst into cst::exp and cst::decls * Factor out the constituents of cst::Exp All the constituent parts of cst::Exp are now individual structs. * Split lowering of cst::Exp into multiple impls * Remove ParamInst and Telescope from CST * Apply suggestions from code review Co-authored-by: Tim Süberkrüb <[email protected]> --------- Co-authored-by: Tim Süberkrüb <[email protected]>
polarity-lang · Apr 17, 2024 · f3d9b77 · f3d9b77
1 parent b6ebd47
commit f3d9b77
Show file tree

Hide file tree

Showing 13 changed files with 653 additions and 331 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lang/lowering/src/ctx.rs b/lang/lowering/src/ctx.rs
@@ -1,7 +1,7 @@
 use codespan::Span;
 use miette_util::ToMiette;
 use parser::cst;
-use parser::cst::{BindingSite, Ident};
+use parser::cst::exp::{BindingSite, Ident};
 use syntax::common::*;
 use syntax::ctx::{Context, ContextElem};
 use syntax::generic::lookup_table::DeclMeta;
@@ -171,20 +171,20 @@ impl ContextElem<Ctx> for Ident {
     }
 }
 
-impl ContextElem<Ctx> for &cst::Param {
+impl ContextElem<Ctx> for &cst::decls::Param {
     fn as_element(&self) -> <Ctx as Context>::ElemIn {
         match &self.name {
-            BindingSite::Var { name } => name.to_owned(),
-            BindingSite::Wildcard => "_".to_owned(),
+            BindingSite::Var { name, .. } => name.to_owned(),
+            BindingSite::Wildcard { .. } => "_".to_owned(),
         }
     }
 }
 
-impl ContextElem<Ctx> for &cst::ParamInst {
+impl ContextElem<Ctx> for &cst::exp::BindingSite {
     fn as_element(&self) -> <Ctx as Context>::ElemIn {
-        match &self.name {
-            BindingSite::Var { name } => name.to_owned(),
-            BindingSite::Wildcard => "_".to_owned(),
+        match self {
+            BindingSite::Var { name, .. } => name.to_owned(),
+            BindingSite::Wildcard { .. } => "_".to_owned(),
         }
     }
 }