work

2026-04-18 00:16:03 -04:00
parent b3f77076d4
commit d864adfd05
12 changed files with 167 additions and 38 deletions
@@ -31,7 +31,7 @@ def_tokens! {
    }
    keyword {
        Let: "let",
-        Do: "do",
+        Import: "import",
        Fn: "fn",
        If: "if",
        Loop: "loop",
@@ -5,3 +5,25 @@ mod nodes;
 use cursor::*;
 pub use node::*;
 pub use nodes::*;
+
+use crate::io::CompilerOutput;
+
+pub fn parse_file(path: &str, output: &mut CompilerOutput) -> Option<Body> {
+    let code = match std::fs::read_to_string(path) {
+        Ok(code) => code,
+        Err(err) => {
+            output.error(format!("Failed to read input file: {err}"));
+            return None;
+        }
+    };
+    output.files.push(path.to_string());
+    let mut ctx = ParseCtx::new(Cursor::new(&code, 0));
+    let root = match ctx.parse() {
+        Ok(v) => v,
+        Err(msg) => {
+            output.error(msg);
+            return None;
+        }
+    };
+    Some(root)
+}
@@ -1,13 +1,10 @@
-use crate::{
-    io::{CompilerMsg, CompilerOutput},
-    parser::{Cursor, nodes::*},
-};
-
 mod ctx;
 mod dsp;
 pub use ctx::*;
 pub use dsp::*;

+use crate::io::CompilerMsg;
+
 pub trait Node: Sized {
    fn parse(ctx: &mut ParseCtx) -> Result<Self, CompilerMsg>;
    fn fmt(&self, f: &mut std::fmt::Formatter, ctx: DisplayCtx) -> std::fmt::Result;
@@ -18,23 +15,3 @@ pub trait Node: Sized {
        self.dsp(DisplayCtx { indent: 0 })
    }
 }
-
-pub fn parse_root(path: &str, output: &mut CompilerOutput) -> Option<Body> {
-    let root_code = match std::fs::read_to_string(path) {
-        Ok(code) => code,
-        Err(err) => {
-            output.error(format!("Failed to read input file: {err}"));
-            return None;
-        }
-    };
-    output.files.push(path.to_string());
-    let mut ctx = ParseCtx::new(Cursor::new(&root_code, 0));
-    let root = match ctx.parse() {
-        Ok(v) => v,
-        Err(msg) => {
-            output.error(msg);
-            return None;
-        }
-    };
-    Some(root)
-}
@@ -11,12 +11,18 @@ pub enum ItemTy {
        ty: Option<Type>,
        val: Expr,
    },
+    Fn(Func),
    Expr(Expr),
+    Import(Ident),
 }

 impl Node for Item {
    fn parse(ctx: &mut ParseCtx) -> Result<Self, CompilerMsg> {
        let ty = match ctx.expect_peek()? {
+            Token::Fn => {
+                ctx.next();
+                ItemTy::Fn(ctx.parse()?)
+            }
            Token::Let => {
                ctx.next();
                let name = ctx.parse()?;
@@ -28,6 +34,10 @@ impl Node for Item {
                let val = ctx.parse()?;
                ItemTy::Let { name, ty, val }
            }
+            Token::Import => {
+                ctx.next();
+                ItemTy::Import(ctx.parse()?)
+            }
            _ => ItemTy::Expr(ctx.parse()?),
        };
        Ok(Self {
@@ -38,6 +48,7 @@ impl Node for Item {

    fn fmt(&self, f: &mut std::fmt::Formatter, ctx: DisplayCtx) -> std::fmt::Result {
        match &self.ty {
+            ItemTy::Fn(func) => func.fmt(f, ctx)?,
            ItemTy::Let { name, ty, val } => {
                write!(f, "let {}", name.dsp(ctx))?;
                if let Some(ty) = ty {
@@ -45,7 +56,8 @@ impl Node for Item {
                }
                write!(f, " = {}", val.dsp(ctx))?;
            }
-            ItemTy::Expr(id) => id.fmt(f, ctx)?,
+            ItemTy::Expr(expr) => expr.fmt(f, ctx)?,
+            ItemTy::Import(ident) => write!(f, "import {}", ident.dsp(ctx))?,
        }
        Ok(())
    }
@@ -56,6 +68,8 @@ impl Item {
        match &self.ty {
            ItemTy::Let { val, .. } => val.ends_with_block(),
            ItemTy::Expr(id) => id.ends_with_block(),
+            ItemTy::Fn(f) => f.ends_with_block(),
+            ItemTy::Import(ident) => false,
        }
    }
    pub fn needs_semicolon(&self) -> bool {