dranke/curlywas
1
0
Fork 0
mirror of https://github.com/exoticorn/curlywas.git synced 2026-01-20 11:46:43 +01:00
Code Issues Projects Releases Wiki Activity

fix "i?SCREEN = 0" being parsed as "i?(SCREEN = 0)"

Browse Source
This commit is contained in:
Dennis Ranke
2022-02-26 21:00:01 +01:00
parent 5f316cf17d
commit cda3eb868b
3 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/parser.rs
View File

@@ -487,16 +487,6 @@ fn script_parser() -> impl Parser<Token, ast::Script, Error = ScriptError> + Clo
})
.boxed();
let assign = identifier
.then_ignore(just(Token::Op("=".to_string())))
.then(expression.clone())
.map(|(name, value)| ast::Expr::Assign {
name,
value: Box::new(value),
local_id: None,
})
.boxed();
let select = just(Token::Select)
.ignore_then(
expression
@@ -532,7 +522,6 @@ fn script_parser() -> impl Parser<Token, ast::Script, Error = ScriptError> + Clo
let atom = val
.or(function_call)
.or(assign)
.or(local_tee)
.or(variable)
.or(block_expr)
@@ -791,11 +780,24 @@ fn script_parser() -> impl Parser<Token, ast::Script, Error = ScriptError> + Clo
let block_expression = block_expression.unwrap();
let assign = identifier
.then_ignore(just(Token::Op("=".to_string())))
.then(expression.clone())
.map(|(name, value)| ast::Expr::Assign {
name,
value: Box::new(value),
local_id: None,
})
.map_with_span(|expr, span| expr.with_span(span))
.boxed();
block_expression
.clone()
.then(just(Token::Ctrl(';')).or_not())
.map_with_span(|(expr, semi), span| (expr.with_span(span), semi.is_none()))
.or(expression.clone().then(just(Token::Ctrl(';')).to(false)))
.or(assign
.or(expression.clone())
.then(just(Token::Ctrl(';')).to(false)))
.repeated()
.then(expression.clone().or_not())
.map_with_span(|(mut statements, mut final_expression), span| {