New parser

Cargo.toml

@@ -1,9 +1,8 @@
 [workspace]
 members = [
-    "prism_compiler", "prism_diag", "prism_diag_derive", "prism_input", "prism_parser", "prism_lsp", "prism_parser_bootstrap"
-]
+    "prism_compiler", "prism_diag", "prism_diag_derive", "prism_input", "prism_lsp", "prism_data_structures"]
 default-members = [
-    "prism_compiler", "prism_diag", "prism_diag_derive", "prism_input", "prism_parser", "prism_lsp", "prism_parser_bootstrap"
+    "prism_compiler", "prism_diag", "prism_diag_derive", "prism_input", "prism_lsp", "prism_data_structures"
 ]
 resolver = "3"
 
@@ -15,17 +14,16 @@ license = "MPL-2.0"
 
 [workspace.dependencies]
 # Internal
-prism_parser = { path = "prism_parser" }
 prism_input = { path = "prism_input" }
 prism_compiler = { path = "prism_compiler" }
 prism_diag = { path = "prism_diag" }
 prism_diag_derive = { path = "prism_diag_derive" }
+prism_data_structures = { path = "prism_data_structures" }
 
 # External
 clap = { version = "4.5", default-features = false, features = ["help", "usage", "error-context", "std", "derive"] }
 serde = { version = "1.0", features = ["derive", "std", "rc"] }
 serde_json = "1.0"
-test_each_file = "0.3"
 rmp-serde = "1.3"
 tower-lsp-server = "0.23"
 tokio = { version = "1.49", default-features = false, features = ["macros", "rt-multi-thread", "io-std"] }
@@ -34,4 +32,5 @@ synstructure = "0.13.2"
 syn = "2.0.112"
 quote = "1.0.42"
 proc-macro2 = "1.0.104"
-libtest-mimic = "0.8.1"
+libtest-mimic = "0.8.1"
+unicode-ident = "1.0.23"

prism_compiler/Cargo.toml

@@ -7,13 +7,13 @@ license.workspace = true
 
 [dependencies]
 clap.workspace = true
-prism_parser.workspace = true
 prism_input.workspace = true
 prism_diag.workspace = true
 prism_diag_derive.workspace = true
+prism_data_structures.workspace = true
+unicode-ident.workspace = true
 
 [dev-dependencies]
-test_each_file.workspace = true
 libtest-mimic.workspace = true
 
 [[test]]

prism_compiler/resources/thing.pr

@@ -1 +1,5 @@
-Type
+/// help
+// so cool
+
+let
+// attjaa

prism_compiler/src/interp/beta_reduce.rs

@@ -1,4 +1,4 @@
-use crate::lang::CorePrismExpr;
+use crate::lang::Expr;
 use crate::lang::env::{DbEnv, EnvEntry};
 use crate::lang::{CoreIndex, PrismDb};
 use crate::type_check::{TypecheckPrismEnv, UniqueVariableId};
@@ -20,45 +20,68 @@ impl<'a> TypecheckPrismEnv<'a> {
     ) -> CoreIndex {
         let (i, s) = self.db.beta_reduce_head(i, s);
 
-        let e_new = match self.db.checked_values[*i] {
+        let e_new = match self.db.exprs[*i] {
             // Values
-            CorePrismExpr::Type | CorePrismExpr::GrammarValue(..) | CorePrismExpr::GrammarType => {
+            Expr::Type => {
                 return i;
             }
 
-            CorePrismExpr::Let(_, _) => unreachable!(),
-            CorePrismExpr::DeBruijnIndex(v) => {
+            Expr::Let {
+                name: _,
+                value: _,
+                body: _,
+            } => unreachable!(),
+            Expr::DeBruijnIndex { idx: v } => {
                 let EnvEntry::RType(id) = s[v] else {
                     unreachable!()
                 };
-                CorePrismExpr::DeBruijnIndex(var_map.len() - var_map[&id] - 1)
+                Expr::DeBruijnIndex {
+                    idx: var_map.len() - var_map[&id] - 1,
+                }
             }
-            CorePrismExpr::FnType(a, b) => {
+            Expr::FnType {
+                arg_name,
+                arg_type: a,
+                body: b,
+            } => {
                 let a = self.beta_reduce_inner(a, &s, var_map);
                 let id = self.new_tc_id();
                 var_map.insert(id, var_map.len());
                 let sub_env = s.cons(EnvEntry::RType(id));
                 let b = self.beta_reduce_inner(b, &sub_env, var_map);
                 var_map.remove(&id);
-                CorePrismExpr::FnType(a, b)
+                Expr::FnType {
+                    arg_name,
+                    arg_type: a,
+                    body: b,
+                }
             }
-            CorePrismExpr::FnConstruct(b) => {
+            Expr::FnConstruct { arg_name, body: b } => {
                 let id = self.new_tc_id();
                 var_map.insert(id, var_map.len());
                 let sub_env = s.cons(EnvEntry::RType(id));
                 let b = self.beta_reduce_inner(b, &sub_env, var_map);
                 var_map.remove(&id);
-                CorePrismExpr::FnConstruct(b)
+                Expr::FnConstruct { arg_name, body: b }
             }
-            CorePrismExpr::FnDestruct(a, b) => {
+            Expr::FnDestruct {
+                function: a,
+                arg: b,
+            } => {
                 let a = self.beta_reduce_inner(a, &s, var_map);
                 let b = self.beta_reduce_inner(b, &s, var_map);
-                CorePrismExpr::FnDestruct(a, b)
+                Expr::FnDestruct {
+                    function: a,
+                    arg: b,
+                }
             }
-            CorePrismExpr::Free => CorePrismExpr::Free,
-            CorePrismExpr::Shift(_, _) => unreachable!(),
-            CorePrismExpr::TypeAssert(_, _) => unreachable!(),
+            Expr::Free => Expr::Free,
+            Expr::Shift(_, _) => unreachable!(),
+            Expr::TypeAssert {
+                value: _,
+                type_hint: _,
+            } => unreachable!(),
         };
-        self.db.store_checked(e_new, self.db.checked_origins[*i])
+        self.db.store(e_new, self.db.expr_origins[*i])
     }
 }