shadowcat/lang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more import preparation

Browse Source
This commit is contained in:
shadow cat
2025-04-25 13:37:26 -04:00
parent 4e7c201690
commit 5adca32dd4
13 changed files with 203 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ir/lower/program.rs
View File

@@ -31,7 +31,7 @@ impl LProgram {
fbuilder.instrs.push(LInstruction::Ret { src: None });
}
let res = fbuilder.finish(f);
ssbuilder.write_fn(sym, res, Some(p.names.name(i).to_string()));
ssbuilder.write_fn(sym, res, Some(p.names.path(i).to_string()));
}
let sym_space = ssbuilder.finish().expect("we failed the mission");
Ok(Self { sym_space, entry })
@@ -142,7 +142,7 @@ impl<'a> LFunctionBuilder<'a> {
let sym = self.data.builder.ro_data(
src,
&data.content,
Some(self.program.names.name(dest.id).to_string()),
Some(self.program.names.path(dest.id).to_string()),
);
self.instrs.push(LInstruction::LoadData {
dest: dest.id,
@@ -163,7 +163,7 @@ impl<'a> LFunctionBuilder<'a> {
let sym = self.data.builder.ro_data(
src,
&data.content,
Some(self.program.names.name(dest.id).to_string()),
Some(self.program.names.path(dest.id).to_string()),
);
self.instrs.push(LInstruction::LoadAddr {
dest: dest.id,

9
src/ir/upper/assoc.rs
View File

@@ -32,9 +32,16 @@ impl NameMap {
inv_names: core::array::from_fn(|_| HashMap::new()),
}
}
pub fn name<K: Kind>(&self, id: ID<K>) -> &str {
pub fn path<K: Kind>(&self, id: ID<K>) -> &str {
&self.names[K::INDEX][id.0]
}
pub fn name<K: Kind>(&self, id: ID<K>) -> &str {
let mut path = self.path(id);
while let Some(i) = path.find("::") {
path = &path[i + 2..];
}
path
}
pub fn id<K: Kind>(&self, name: &str) -> Option<ID<K>> {
Some(ID::new(*self.inv_names[K::INDEX].get(name)?))
}

5
src/ir/upper/ty.rs
View File

@@ -36,6 +36,11 @@ impl UProgram {
pub fn resolve_types(&mut self) {
// I LOVE RUST
let mut vars = self.vars.clone();
// set type of vars referring to functions
for (i, f) in self.iter_fns() {
let vi = self.fn_var.var(i);
vars[vi.0].as_mut().expect("bruh").ty = f.ty(self);
}
for (i, f) in self.iter_fns() {
let mut redo_iter = Vec::new();
let mut ph_vars = Vec::new();

6
src/ir/upper/validate.rs
View File

@@ -89,7 +89,11 @@ impl UProgram {
let destty = &self.expect(dest.id).ty;
let f = self.expect(f.id);
let Type::Fn { args: argtys, ret } = &f.ty else {
todo!()
output.err(CompilerMsg {
msg: format!("Type {} is not callable", self.type_name(&f.ty)),
spans: vec![dest.span],
});
continue;
};
output.check_assign(self, ret, destty, dest.span);
if args.len() != argtys.len() {

10
src/main.rs
View File

@@ -5,6 +5,8 @@
// dawg what
#![feature(str_as_str)]
pub const FILE_EXT: &str = "lang";
use ir::{LProgram, UProgram};
use parser::{PModule, ParseResult, ParserCtx};
use std::{
@@ -52,11 +54,11 @@ fn run_file(file: &str, gdb: bool, asm: bool) {
program.resolve_types();
// println!("vars:");
// for (id, def) in program.iter_vars() {
// println!(" {id:?} = {}: {}", program.names.name(id), program.type_name(&def.ty));
// println!(" {id:?} = {}: {}", program.names.path(id), program.type_name(&def.ty));
// }
// for (id, f) in program.iter_fns() {
// println!("{}:{id:?} = {:#?}", program.names.path(id), f);
// }
for (id, f) in program.iter_fns() {
println!("{}:{id:?} = {:#?}", program.names.name(id), f);
}
output = program.validate();
if !output.errs.is_empty() {
break 'outer;

2
src/parser/v3/lower/block.rs
View File

@@ -13,6 +13,7 @@ impl FnLowerable for PBlock {
let mut statements = Vec::new();
let mut fn_nodes = Vec::new();
let mut struct_nodes = Vec::new();
let mut imports = Vec::new();
// first sort statements
for s in &self.statements {
let Some(s) = s.as_ref() else {
@@ -23,6 +24,7 @@ impl FnLowerable for PBlock {
PStatementLike::Const(pconst_statement) => match pconst_statement {
PConstStatement::Fn(f) => fn_nodes.push(f),
PConstStatement::Struct(s) => struct_nodes.push(s),
PConstStatement::Import(i) => imports.push(i),
},
}
}

4
src/parser/v3/lower/func.rs
View File

@@ -23,6 +23,8 @@ impl PFunction {
Some(id)
}
pub fn lower(&self, id: FnID, p: &mut UProgram, output: &mut CompilerOutput) {
let name = p.names.name(id).to_string();
p.push_name(&name);
let (args, ret) = if let Some(header) = self.header.as_ref() {
(
header
@@ -56,7 +58,7 @@ impl PFunction {
ret,
instructions,
};
p.expect_mut(p.fn_var.var(id)).ty = f.ty(p);
p.pop_name();
p.write(id, f)
}
}

2
src/parser/v3/lower/mod.rs
View File

@@ -26,10 +26,8 @@ impl PModule {
instructions: fctx.instructions,
ret: Type::Unit,
};
let ty = f.ty(p);
p.write(id, f);
p.pop_name();
p.expect_mut(p.fn_var.var(id)).ty = ty;
}
}

12
src/parser/v3/nodes/statement.rs
View File

@@ -1,6 +1,6 @@
use super::{
Keyword, Node, PExpr, PFunction, PStruct, PVarDef, Parsable, ParseResult, ParserCtx, Symbol,
Token,
Keyword, Node, PExpr, PFunction, PIdent, PStruct, PVarDef, Parsable, ParseResult, ParserCtx,
Symbol, Token,
};
pub enum PStatement {
@@ -12,6 +12,7 @@ pub enum PStatement {
pub enum PConstStatement {
Fn(Node<PFunction>),
Struct(Node<PStruct>),
Import(Node<PIdent>),
}
pub enum PStatementLike {
@@ -47,6 +48,10 @@ impl Parsable for PStatementLike {
ctx.next();
ParseResult::Ok(Self::Const(PConstStatement::Struct(ctx.parse()?)))
}
Token::Keyword(Keyword::Import) => {
ctx.next();
ParseResult::Ok(Self::Const(PConstStatement::Import(ctx.parse()?)))
}
_ => ctx.parse().map(|n| Self::Statement(PStatement::Expr(n))),
}
}
@@ -81,6 +86,9 @@ impl std::fmt::Debug for PConstStatement {
Self::Struct(s) => {
s.fmt(f)?;
}
Self::Import(s) => {
writeln!(f, "import {:?}", s);
}
}
Ok(())
}

2
src/parser/v3/token/keyword.rs
View File

@@ -12,6 +12,7 @@ pub enum Keyword {
Impl,
For,
Asm,
Import,
Funne,
}
@@ -30,6 +31,7 @@ impl Keyword {
"trait" => Self::Trait,
"impl" => Self::Impl,
"asm" => Self::Asm,
"import" => Self::Import,
"funne" => Self::Funne,
_ => return None,
})