Merge pull request #20 from JCBurnside/feature/extern-items

Feature/extern items
JCBurnside · Mar 17, 2024 · ba30eff · ba30eff
2 parents 3806190 + cebf2a0
commit ba30eff
Show file tree

Hide file tree

Showing 16 changed files with 764 additions and 322 deletions.
diff --git a/cli/src/main.rs b/cli/src/main.rs
@@ -30,7 +30,7 @@ fn main() {
         },
     );
 
-    let (program, warnings) = compiler::from_file(&args.file, fwd_decl.clone(), "jit".to_string());
+    let (program, _warnings) = compiler::from_file(&args.file, fwd_decl.clone(), "jit".to_string());
 
     match program {
         Err(errors) => {

diff --git a/cli/test.fb b/cli/test.fb
@@ -7,11 +7,9 @@ let test_ifs a b : bool -> bool -> int32 =
         print_str "neither\n";
     return 0;
 
-for<T> let eq_check a b : T -> T -> bool = a < b || a > b
-
 let test_ifexpr a b : bool -> bool -> int32 = if a then 
         0 
-    else if b then 
+    else if b then
         1 
     else if true then 
         let x : int32 = 2;
@@ -21,6 +19,8 @@ let test_ifexpr a b : bool -> bool -> int32 = if a then
     else
         4
 
+extern "C" let externed : int32 -> int32;
+
 let show_short_curicuit _ : () -> () =
     if (show_something ()) && (show_something_else ()) then
         print_str "this is a seperator\n";
@@ -46,4 +46,5 @@ let main _ : () -> () =
     | 2 -> print_str "two",
     print_str "main";
     show_short_curicuit ();
+    let y = externed 0;
     return ();
diff --git a/compiler/src/ast.rs b/compiler/src/ast.rs
@@ -49,7 +49,9 @@ impl ModuleDeclaration {
                     continue;
                 }
                 Declaration::Value(v) => {
-                    // todo check if externed.  if so no work needed.
+                    if v.value == ValueType::External {
+                        continue;
+                    }
                     let old = v.ident.clone();
                     v.ident = path.iter().cloned().join("::") + "::" + &v.ident;
                     (old, v.ident.clone())
@@ -187,6 +189,12 @@ pub struct ArgDeclaration {
     pub ty: Option<ResolvedType>, 
 }
 
+#[derive(PartialEq,Debug, Clone)]
+pub struct Abi {
+    pub loc : crate::Location,
+    pub identifier : String,
+}
+
 #[derive(PartialEq, Debug)]
 pub struct ValueDeclaration {
     pub loc: crate::Location, //should be location of the ident.
@@ -196,6 +204,7 @@ pub struct ValueDeclaration {
     pub ty: Option<ResolvedType>,
     pub value: ValueType,
     pub generictypes: Option<GenericsDecl>,
+    pub abi : Option<Abi>,
 }
 impl ValueDeclaration {
     fn replace(&mut self, nice_name: &str, actual: &str) {
@@ -212,7 +221,7 @@ impl ValueDeclaration {
         }
         for arg in &self.args {
             if let Some(ty) = &arg.ty {
-                let mut tys = ty.get_all_types();
+                let tys = ty.get_all_types();
                 output.extend(tys);
             }
         }
@@ -226,21 +235,23 @@ impl ValueDeclaration {
 pub enum ValueType {
     Expr(Expr),
     Function(Vec<Statement>),
+    External,
 }
 impl ValueType {
     fn replace(&mut self, nice_name: &str, actual: &str) {
         match self {
-            ValueType::Expr(expr) => expr.replace(nice_name, actual),
-            ValueType::Function(stmnts) => stmnts
+            Self::Expr(expr) => expr.replace(nice_name, actual),
+            Self::Function(stmnts) => stmnts
                 .iter_mut()
                 .for_each(|it| it.replace(nice_name, actual)),
+            Self::External => (),
         }
     }
 
     fn get_dependencies(&self, known_values: Vec<String>) -> HashSet<String> {
         match self {
-            ValueType::Expr(expr) => expr.get_dependencies(known_values),
-            ValueType::Function(stmnts) => {
+            Self::Expr(expr) => expr.get_dependencies(known_values),
+            Self::Function(stmnts) => {
                 stmnts
                     .iter()
                     .fold(
@@ -255,6 +266,7 @@ impl ValueType {
                     )
                     .1
             }
+            Self::External => HashSet::new(),
         }
     }
 }