mark/mers
1
0
Fork 0
mirror of https://github.com/Dummi26/mers.git synced 2025-03-10 14:13:52 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix { x := ... } being interpreted as an object

Browse Source
This commit is contained in:
Mark 2023-11-30 17:53:41 +01:00
parent 48c1381194
commit d21715c2d3
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
mers_lib/src/parsing/statements.rs
View File

@ -321,23 +321,30 @@ pub fn parse_no_chain(
let name = src.next_word().to_owned();
src.skip_whitespace();
match src.next_char() {
Some(':') => elems.push((
name,
match parse(src, srca) {
Ok(Some(v)) => v,
Ok(None) => {
return Err(CheckError::new()
.src(vec![((pos_in_src, src.get_pos(), srca).into(), None)])
.msg(format!("EOF after `:` in object")))
}
Err(e) => {
return Err(CheckError::new()
.src(vec![((pos_in_src, src.get_pos(), srca).into(), None)])
.msg(format!("Error in statement after `:` in object"))
.err(e))
}
},
)),
Some(':') if src.next_char().is_some_and(|c| c.is_whitespace()) => elems
.push((
name,
match parse(src, srca) {
Ok(Some(v)) => v,
Ok(None) => {
return Err(CheckError::new()
.src(vec![(
(pos_in_src, src.get_pos(), srca).into(),
None,
)])
.msg(format!("EOF after `:` in object")))
}
Err(e) => {
return Err(CheckError::new()
.src(vec![(
(pos_in_src, src.get_pos(), srca).into(),
None,
)])
.msg(format!("Error in statement after `:` in object"))
.err(e))
}
},
)),
_ => {
// not an object (or invalid syntax)
src.set_pos(pos_in_src_after_bracket);