language-servers/erg
1
0
Fork 0
mirror of https://github.com/erg-lang/erg.git synced 2025-08-27 05:44:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(parser): fix conflict

Browse source
This commit is contained in:
GreasySlug 2023-04-01 11:28:31 +09:00
parent 855be06c26
commit 723e75813e
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/erg_parser/parse.rs
View file

@ -2168,10 +2168,11 @@ impl Parser {
obj = obj.attr_expr(ident);
}
NatLit => {
let index = Literal::from(self.lpop());
let index = Literal::from(token);
obj = obj.tuple_attr_expr(index);
}
Newline => {
self.restore(token);
self.restore(vis);
break;
}
@ -3017,7 +3018,6 @@ impl Parser {
debug_exit_info!(self);
return Err(());
};
self.skip();
if let Some(args) = self
.opt_reduce_args(false)
.transpose()

2
crates/erg_parser/tests/parse_test.rs
View file

@ -69,7 +69,7 @@ fn exec_invalid_chunk_prs_err() -> Result<(), ()> {
#[test]
fn expect_failure_collections_err() -> Result<(), ()> {
expect_failure("tests/invalid_collections.er", 33)
expect_failure("tests/invalid_collections.er", 30)
}
#[test]