1
0

Fix parsing errors

This commit is contained in:
Jeff 2024-05-20 15:22:50 -04:00
parent 8fb8a456cd
commit 9c77ae2410
3 changed files with 39 additions and 37 deletions

View File

@ -158,6 +158,8 @@ pub fn parser<'src>(
}); });
let statement = recursive(|statement| { let statement = recursive(|statement| {
let allow_built_ins = allow_built_ins.clone();
let block = statement let block = statement
.clone() .clone()
.repeated() .repeated()
@ -169,6 +171,8 @@ pub fn parser<'src>(
.map_with(|statements, state| Block::new(statements).with_position(state.span())); .map_with(|statements, state| Block::new(statements).with_position(state.span()));
let expression = recursive(|expression| { let expression = recursive(|expression| {
let allow_built_ins = allow_built_ins.clone();
let identifier_expression = identifier.clone().map_with(|identifier, state| { let identifier_expression = identifier.clone().map_with(|identifier, state| {
Expression::Identifier(identifier.with_position(state.span())) Expression::Identifier(identifier.with_position(state.span()))
}); });
@ -261,40 +265,37 @@ pub fn parser<'src>(
); );
let built_in_function_call = choice(( let built_in_function_call = choice((
just(Token::Keyword(Keyword::ReadLine)).to(Keyword::ReadLine), just(Token::Keyword(Keyword::ReadLine)).map_with(|_, state| {
just(Token::Keyword(Keyword::Sleep)).to(Keyword::Sleep), Expression::BuiltInFunctionCall(
just(Token::Keyword(Keyword::WriteLine)).to(Keyword::WriteLine), Box::new(BuiltInFunctionCall::ReadLine).with_position(state.span()),
))
.then(
expression
.clone()
.delimited_by(
just(Token::Control(Control::ParenOpen)),
just(Token::Control(Control::ParenClose)),
) )
.separated_by(Token::Control(Control::Comma)), }),
) just(Token::Keyword(Keyword::Sleep))
.map_with(|(keyword, arguments), state| { .ignore_then(expression.clone())
if !allow_built_ins { .map_with(|argument, state| {
return Err(Rich::custom( Expression::BuiltInFunctionCall(
Box::new(BuiltInFunctionCall::Sleep(argument))
.with_position(state.span()),
)
}),
just(Token::Keyword(Keyword::WriteLine))
.ignore_then(expression.clone())
.map_with(|argument, state| {
Expression::BuiltInFunctionCall(
Box::new(BuiltInFunctionCall::WriteLine(argument))
.with_position(state.span()),
)
}),
))
.try_map_with(move |expression, state| {
if allow_built_ins {
Ok(expression)
} else {
Err(Rich::custom(
state.span(), state.span(),
"Built-in function calls can only be used by the standard library.", "Built-in function calls can only be used by the standard library.",
)); ))
} }
let call = match keyword {
Keyword::ReadLine => Expression::BuiltInFunctionCall(
Box::new(BuiltInFunctionCall::ReadLine).with_position(state.span()),
),
_ => {
return Err(Rich::custom(
state.span(),
"Could not parse this built-in function call.",
))
}
};
Ok(call)
}); });
let structure_field = identifier let structure_field = identifier
@ -503,6 +504,7 @@ pub fn parser<'src>(
}, },
), ),
)); ));
choice(( choice((
logic_math_indexes_and_function_calls, logic_math_indexes_and_function_calls,
built_in_function_call, built_in_function_call,
@ -623,7 +625,7 @@ mod tests {
#[test] #[test]
fn built_in_function() { fn built_in_function() {
let tokens = lex("READ_LINE()").unwrap(); let tokens = lex("READ_LINE").unwrap();
let statements = parser(true) let statements = parser(true)
.parse(tokens.spanned((tokens.len()..tokens.len()).into())) .parse(tokens.spanned((tokens.len()..tokens.len()).into()))
.into_result() .into_result()
@ -638,11 +640,11 @@ mod tests {
assert_eq!( assert_eq!(
statements[0], statements[0],
Statement::Expression(Expression::BuiltInFunctionCall( Statement::Expression(Expression::BuiltInFunctionCall(
Box::new(BuiltInFunctionCall::ReadLine).with_position((0, 11)) Box::new(BuiltInFunctionCall::ReadLine).with_position((0, 9))
)) ))
); );
let tokens = lex("WRITE_LINE('hiya')").unwrap(); let tokens = lex("WRITE_LINE 'hiya'").unwrap();
let statements = parser(true) let statements = parser(true)
.parse(tokens.spanned((tokens.len()..tokens.len()).into())) .parse(tokens.spanned((tokens.len()..tokens.len()).into()))
.into_result() .into_result()
@ -660,7 +662,7 @@ mod tests {
Box::new(BuiltInFunctionCall::WriteLine(Expression::Value( Box::new(BuiltInFunctionCall::WriteLine(Expression::Value(
ValueNode::String("hiya".to_string()).with_position((11, 17)) ValueNode::String("hiya".to_string()).with_position((11, 17))
))) )))
.with_position((0, 18)) .with_position((0, 17))
)) ))
); );
} }

View File

@ -1,9 +1,9 @@
io = { io = {
read_line = fn () str { read_line = fn () str {
READ_LINE() READ_LINE
} }
write_line = fn (output: any) none { write_line = fn (output: any) none {
WRITE_LINE(output) WRITE_LINE output
} }
} }

View File

@ -1,5 +1,5 @@
thread = { thread = {
sleep = fn (milliseconds: int) none { sleep = fn (milliseconds: int) none {
SLEEP(milliseconds) SLEEP milliseconds
} }
} }