diff --git a/Cargo.lock b/Cargo.lock index 5a346e53..cb8d890d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -15,7 +15,7 @@ dependencies = [ [[package]] name = "erg" -version = "0.2.8" +version = "0.3.0" dependencies = [ "erg_common", "erg_compiler", @@ -25,14 +25,14 @@ dependencies = [ [[package]] name = "erg_common" -version = "0.2.8" +version = "0.3.0" dependencies = [ "atty", ] [[package]] name = "erg_compiler" -version = "0.2.8" +version = "0.3.0" dependencies = [ "erg_common", "erg_parser", @@ -41,14 +41,14 @@ dependencies = [ [[package]] name = "erg_parser" -version = "0.2.8" +version = "0.3.0" dependencies = [ "erg_common", ] [[package]] name = "erg_type" -version = "0.2.8" +version = "0.3.0" dependencies = [ "erg_common", ] diff --git a/compiler/erg_compiler/context/inquire.rs b/compiler/erg_compiler/context/inquire.rs index 4996180e..9dff6252 100644 --- a/compiler/erg_compiler/context/inquire.rs +++ b/compiler/erg_compiler/context/inquire.rs @@ -901,7 +901,7 @@ impl Context { return Some((t, ctx)); } } - _ => todo!(), + other => todo!("{other}"), } if let Some(outer) = &self.outer { outer.rec_get_nominal_type_ctx(typ) diff --git a/compiler/erg_compiler/context/register.rs b/compiler/erg_compiler/context/register.rs index 43338bc9..cb1a38c4 100644 --- a/compiler/erg_compiler/context/register.rs +++ b/compiler/erg_compiler/context/register.rs @@ -170,7 +170,7 @@ impl Context { } let vis = ident.vis(); let vi = VarInfo::new(generalized, muty, vis, VarKind::Defined(id)); - self.params.push((Some(ident.name.clone()), vi)); + self.locals.insert(ident.name.clone(), vi); Ok(()) } } diff --git a/compiler/erg_compiler/hir.rs b/compiler/erg_compiler/hir.rs index 6421c3ae..0f7e0999 100644 --- a/compiler/erg_compiler/hir.rs +++ b/compiler/erg_compiler/hir.rs @@ -1136,8 +1136,7 @@ pub struct Def { impl NestedDisplay for Def { fn fmt_nest(&self, f: &mut fmt::Formatter<'_>, level: usize) -> fmt::Result { - self.sig.fmt_nest(f, level)?; - writeln!(f, " {}", self.body.op.content)?; + writeln!(f, "{} {}", self.sig, self.body.op.content)?; self.body.block.fmt_nest(f, level + 1) } } diff --git a/compiler/erg_parser/ast.rs b/compiler/erg_parser/ast.rs index b1453b41..1dcb14ff 100644 --- a/compiler/erg_parser/ast.rs +++ b/compiler/erg_parser/ast.rs @@ -2389,8 +2389,7 @@ pub struct Def { impl NestedDisplay for Def { fn fmt_nest(&self, f: &mut fmt::Formatter<'_>, level: usize) -> fmt::Result { - self.sig.fmt_nest(f, level)?; - writeln!(f, " {}", self.body.op.content)?; + writeln!(f, "{} {}", self.sig, self.body.op.content)?; self.body.block.fmt_nest(f, level + 1) } } diff --git a/compiler/erg_parser/parse.rs b/compiler/erg_parser/parse.rs index 5813d873..90b49d61 100644 --- a/compiler/erg_parser/parse.rs +++ b/compiler/erg_parser/parse.rs @@ -1645,10 +1645,6 @@ impl Parser { self.errs.push(err); return Err(()); } - // REVIEW: need this? - while self.cur_is(Newline) { - self.skip(); - } let body = self.try_reduce_block().map_err(|_| self.stack_dec())?; self.counter.inc(); self.level -= 1;