extern/kalker
1
0
Fork 0
mirror of https://github.com/PaddiM8/kalker.git synced 2025-01-31 08:59:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Prevent self-referencing variables

Browse Source
This commit is contained in:
PaddiM8 2020-12-28 23:54:12 +01:00
parent 865947dccd
commit e8c362c72e
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kalk/src/parser.rs
View File

@ -84,6 +84,7 @@ pub enum CalcError {
InvalidOperator, InvalidOperator,
InvalidUnit, InvalidUnit,
TimedOut, TimedOut,
VariableReferencesItself,
UnexpectedToken(TokenKind, TokenKind), UnexpectedToken(TokenKind, TokenKind),
UndefinedFn(String), UndefinedFn(String),
UndefinedVar(String), UndefinedVar(String),
@ -195,6 +196,9 @@ fn parse_var_decl_stmt(context: &mut Context) -> Result<Stmt, CalcError> {
let identifier = advance(context).clone(); let identifier = advance(context).clone();
advance(context); // Equal sign advance(context); // Equal sign
let expr = parse_expr(context)?; let expr = parse_expr(context)?;
if inverter::contains_var(&context.symbol_table, &expr, &identifier.value) {
return Err(CalcError::VariableReferencesItself);
}
Ok(Stmt::VarDecl(identifier.value, Box::new(expr))) Ok(Stmt::VarDecl(identifier.value, Box::new(expr)))
} }

1
kalk_cli/src/output.rs
View File

@ -36,6 +36,7 @@ fn print_calc_err(err: CalcError) {
InvalidOperator => format!("Invalid operator."), InvalidOperator => format!("Invalid operator."),
InvalidUnit => format!("Invalid unit."), InvalidUnit => format!("Invalid unit."),
TimedOut => format!("Operation took too long."), TimedOut => format!("Operation took too long."),
VariableReferencesItself => format!("Variable references itself."),
UnexpectedToken(got, expected) => { UnexpectedToken(got, expected) => {
format!("Unexpected token: '{:?}', expected '{:?}'.", got, expected) format!("Unexpected token: '{:?}', expected '{:?}'.", got, expected)
} }