AbleOS/holey-bytes
3
3
Fork 5
Code Issues 2 Pull requests Packages Projects Releases Wiki Activity

some cleanup

Browse source
This commit is contained in:
Jakub Doka 2024-11-13 15:45:45 +01:00
parent f493c2776f
commit 2e2b7612d9
No known key found for this signature in database
GPG key ID: C6E9A89936B8C143
1 changed files with 16 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
lang/src/son.rs
View file

@ -3819,41 +3819,24 @@ impl<'a> Codegen<'a> {
); );
} }
let (mut tys, mut args, mut cargs) = (sig.args.args(), args.iter(), cargs.iter());
if is_inline || inline { if is_inline || inline {
let mut tys = sig.args.args();
let mut args = args.iter();
let mut cargs = cargs.iter();
let var_base = self.ci.scope.vars.len(); let var_base = self.ci.scope.vars.len();
let aclass_base = self.ci.scope.aclasses.len(); let aclass_base = self.ci.scope.aclasses.len();
while let Some(aty) = tys.next(self.tys) { while let (Some(aty), Some(arg)) = (tys.next(self.tys), args.next()) {
let carg = cargs.next().unwrap(); let carg = cargs.next().unwrap();
let Some(arg) = args.next() else { break }; let var = match aty {
match aty { Arg::Type(id) => Variable::new(carg.id, id, false, NEVER, &mut self.ci.nodes),
Arg::Type(id) => {
self.ci.scope.vars.push(Variable::new(
carg.id,
id,
false,
NEVER,
&mut self.ci.nodes,
));
}
Arg::Value(ty) => { Arg::Value(ty) => {
let mut value = self.raw_expr_ctx(arg, Ctx::default().with_ty(ty))?; let mut value = self.raw_expr_ctx(arg, Ctx::default().with_ty(ty))?;
self.strip_var(&mut value); self.strip_var(&mut value);
debug_assert_ne!(self.ci.nodes[value.id].kind, Kind::Stre); debug_assert_ne!(self.ci.nodes[value.id].kind, Kind::Stre);
debug_assert_ne!(value.id, 0); debug_assert_ne!(value.id, 0);
self.assert_ty(arg.pos(), &mut value, ty, fa!("argument {}", carg.name)); self.assert_ty(arg.pos(), &mut value, ty, fa!("argument {}", carg.name));
Variable::new(carg.id, ty, value.ptr, value.id, &mut self.ci.nodes)
self.ci.scope.vars.push(Variable::new(
carg.id,
ty,
value.ptr,
value.id,
&mut self.ci.nodes,
));
} }
} };
self.ci.scope.vars.push(var);
} }
let prev_var_base = mem::replace(&mut self.ci.inline_var_base, var_base); let prev_var_base = mem::replace(&mut self.ci.inline_var_base, var_base);
@ -3871,7 +3854,7 @@ impl<'a> Codegen<'a> {
self.report( self.report(
body.pos(), body.pos(),
"expected all paths in the fucntion to return \ "expected all paths in the fucntion to return \
or the return type to be 'void'", or the return type to be 'void'",
); );
} }
} }
@ -3908,15 +3891,10 @@ impl<'a> Codegen<'a> {
Some(v) Some(v)
} else { } else {
self.make_func_reachable(fu); self.make_func_reachable(fu);
let mut inps = Vc::from([NEVER]); let mut inps = Vc::from([NEVER]);
let mut tys = sig.args.args();
let mut cargs = cargs.iter();
let mut args = args.iter();
let mut clobbered_aliases = BitSet::default(); let mut clobbered_aliases = BitSet::default();
while let Some(ty) = tys.next(self.tys) { while let (Some(ty), Some(arg)) = (tys.next(self.tys), args.next()) {
let carg = cargs.next().unwrap(); let carg = cargs.next().unwrap();
let Some(arg) = args.next() else { break };
let Arg::Value(ty) = ty else { continue }; let Arg::Value(ty) = ty else { continue };
let mut value = self.raw_expr_ctx(arg, Ctx::default().with_ty(ty))?; let mut value = self.raw_expr_ctx(arg, Ctx::default().with_ty(ty))?;
@ -4064,9 +4042,7 @@ impl<'a> Codegen<'a> {
let base = self.ci.scope.vars.len(); let base = self.ci.scope.vars.len();
for (arg, carg) in args.iter().zip(cargs) { for (arg, carg) in args.iter().zip(cargs) {
let prev_file = mem::replace(&mut self.ci.file, file); let ty = self.ty_in(file, &carg.ty);
let ty = self.ty(&carg.ty);
self.ci.file = prev_file;
self.tys.tmp.args.push(ty); self.tys.tmp.args.push(ty);
let sym = parser::find_symbol(&fast.symbols, carg.id); let sym = parser::find_symbol(&fast.symbols, carg.id);
@ -4104,9 +4080,7 @@ impl<'a> Codegen<'a> {
self.report(pos, "function instance has too many arguments"); self.report(pos, "function instance has too many arguments");
return None; return None;
}; };
let prev_file = mem::replace(&mut self.ci.file, file); let ret = self.ty_in(file, ret);
let ret = self.ty(ret);
self.ci.file = prev_file;
self.ci.scope.vars.drain(base..).for_each(|v| v.remove(&mut self.ci.nodes)); self.ci.scope.vars.drain(base..).for_each(|v| v.remove(&mut self.ci.nodes));
@ -4445,7 +4419,11 @@ impl<'a> Codegen<'a> {
} }
fn ty(&mut self, expr: &Expr) -> ty::Id { fn ty(&mut self, expr: &Expr) -> ty::Id {
self.parse_ty(self.ci.file, expr, None, self.files) self.ty_in(self.ci.file, expr)
}
fn ty_in(&mut self, file: Module, expr: &Expr) -> ty::Id {
self.parse_ty(file, expr, None, self.files)
} }
fn ty_display(&self, ty: ty::Id) -> ty::Display { fn ty_display(&self, ty: ty::Id) -> ty::Display {