Data milestone 2

Cargo.toml

@@ -11,15 +11,17 @@ members = [
   "ast",
   "project",
   "ty",
-  "ir",
   "e2e",
   "tyvm",
-  "linter", 
+  "linter",
   "codelocation",
-  "types", 
-  "cachectx", 
-  "typetable", 
-  "scopetable"
-]
+  "types",
+  "typetable",
+  "scopetable",
+  "fir",
+  "oir",
+  "scir",
+  "datatable",
+  ]
 resolver = "2"
 

bootstrap/token/lib.ty

@@ -2,7 +2,7 @@ pub type TokenError = error
   | InvalidToken
   | UnexpectedEnd
 
-pub type Token = enum(u8) {
+pub type Token = enum 
   | Error
   | Defer
   | ErrDefer

datatable/Cargo.toml

@@ -0,0 +1,7 @@
+[package]
+name = "datatable"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+cranelift-module = "0"

datatable/src/lib.rs

@@ -0,0 +1,14 @@
+use cranelift_module::DataId;
+use std::collections::BTreeMap;
+
+pub struct DataTable {
+    pub table: BTreeMap<String, DataId>,
+}
+
+impl DataTable {
+    pub fn new() -> Self {
+        DataTable {
+            table: BTreeMap::new(),
+        }
+    }
+}

e2e/Cargo.toml

@@ -12,7 +12,6 @@ typetable = { path = "../typetable" }
 lexer = { path = "../lexer" }
 token = { path = "../token" }
 parser = { path = "../parser" }
-ir = { path = "../ir" }
 object = { path = "../object" }
 objmaker = { path = "../objmaker" }
 linter = { path = "../linter" }

e2e/src/main.rs

@@ -4,18 +4,17 @@ use linter::LintSource;
 use parser::Parser;
 use std::fs::File;
 use std::io::Read;
-use typetable::TypeTable;
 
 use std::path::Path;
 use std::process::Command;
 
 fn main() {
     println!("[run] simple exe");
     objmaker::from_buffer(
-        "pub const main = fn() usize { 
-            const m = 7
+        "const m = 7
+        pub const main = fn() usize { 
             const x = 5 
-            return x + m 
+            return x + m
         }",
         Path::new("main.ty"),
     );

ebnf.txt

@@ -1,9 +1,9 @@
 // use this to test, and this must pass at all times
 // https://bnfplayground.pauliankline.com/
 <all> ::= (<top_decl>)*
-<top_decl> ::= "pub "? ("const " | "let " | "type " | "impl ") <ident> (":" <signature>)? " = " (<trait> | <fn> | <struct> | <tag> | <import> | <error> | <reassign> | <expr> | <enum>)
+<top_decl> ::= "pub "? ("const " | "let " | "type " | "impl ") <destructure> (":" <signature>)? " = " (<trait> | <fn> | <struct> | <tag> | <import> | <error> | <reassign> | <expr> | <enum>)
 <import> ::= "import " <chars>
-<trait> ::= "trait " "{ " (<top_decl)* " }"
+<trait> ::= "trait " "{ " (<top_decl>)* " }"
 <signature> ::= <val_type> | ("&" | "*")? ("[" <signature> "]" | <ident> ("." <ident>)* | <fn_type>)
 <fn_type> ::= "fn" "(" <type_args> ")" ("void" | <signature>)
 <type_args> ::= (<type_arg> ("," <type_arg>)*)?
@@ -15,14 +15,15 @@
 <for> ::= "for " "(" <expr> ")" (<fn> | <block>)
 <while> ::= "while " "(" <expr> ")" (<fn> | <block>)
 <match> ::= "match " "(" <expr> ")" "{ " <arm>+ "}" 
-<arm> ::= <expr> "=> " (<fn> | <block>)
+<arm> ::= <expr> "=> " (<fn> | <block> | <or>)
 <tag> ::= "tag " ("| " <ident> (":" <signature>)?)+
 <enum> ::= "enum" "(" <val_type> ")" ("| " <ident> ("=" <expr>)?)+
 <declarators> ::= (<declarator>)*
 <declarator> ::= "pub "? <ident> (":" <signature>)?
+<destructure> ::= ("{ " <ident> ("," <ident>)* " }") | <ident>
 <args> ::= (<arg> ("," <arg>)*)?
 <arg> ::= ("self " (": " <signature>)?) | <ident> (":" <signature>)?
-<inner_decl> ::= ( "const " | "let ") <ident> (":" <signature>)? "= " <expr> 
+<inner_decl> ::= ( "const " | "let ") <destructure> (":" <signature>)? "= " <expr> 
 <reassign> ::= <access> ("= " <expr>)?
 <block> ::= "{ " (<inner_decl> | <for> | <while> | <if> | <reassign>)* (<return> | <break>)? "}"
 <return> ::= "return " <expr>? 

ir/Cargo.toml → fir/Cargo.toml

@@ -1,18 +1,20 @@
 [package]
-name = "ir"
+name = "fir"
 version = "0.1.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 ast = { path="../ast" }
+oir = { path="../oir" }
 symtable = { path="../symtable" }
+datatable = { path="../datatable" }
 typetable = { path="../typetable" }
+scopetable = { path="../scopetable" }
 token = { path="../token" }
 perror = { path="../perror" }
 lexer = { path="../lexer" }
 linter = { path="../linter" }
 types = { path="../types" }
 cranelift-frontend = "0"
 cranelift-codegen = "0"
+cranelift-module = "0"