language-servers/erg
1
0
Fork 0
mirror of https://github.com/erg-lang/erg.git synced 2025-10-03 05:54:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

WIP: Enable to declare in class methods definitions

Browse source
This commit is contained in:
Shunsuke Shibayama 2022-11-07 17:37:46 +09:00
parent 60956a590e
commit 14b143778f
5 changed files with 143 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

27
compiler/erg_parser/parse.rs
View file

@ -813,14 +813,18 @@ impl Parser {
let first = self
.try_reduce_chunk(false, false)
.map_err(|_| self.stack_dec())?;
let Some(first) = option_enum_unwrap!(first, Expr::Def) else {
// self.restore();
self.level -= 1;
let err = self.skip_and_throw_syntax_err(caused_by!());
self.errs.push(err);
return Err(());
let first = match first {
Expr::Def(def) => ClassAttr::Def(def),
Expr::TypeAsc(tasc) => ClassAttr::Decl(tasc),
_ => {
// self.restore();
self.level -= 1;
let err = self.skip_and_throw_syntax_err(caused_by!());
self.errs.push(err);
return Err(());
}
};
let mut defs = vec![first];
let mut attrs = vec![first];
loop {
match self.peek() {
Some(t) if t.is(Newline) && self.nth_is(1, Dedent) => {
@ -838,7 +842,10 @@ impl Parser {
.map_err(|_| self.stack_dec())?;
match def {
Expr::Def(def) => {
defs.push(def);
attrs.push(ClassAttr::Def(def));
}
Expr::TypeAsc(tasc) => {
attrs.push(ClassAttr::Decl(tasc));
}
other => {
self.errs
@ -854,10 +861,10 @@ impl Parser {
}
}
}
let defs = RecordAttrs::from(defs);
let attrs = ClassAttrs::from(attrs);
let class = Self::expr_to_type_spec(class).map_err(|e| self.errs.push(e))?;
self.level -= 1;
Ok(Methods::new(class, vis, defs))
Ok(Methods::new(class, vis, attrs))
}
fn try_reduce_do_block(&mut self) -> ParseResult<Lambda> {