extern/kalker
1
0
Fork 0
mirror of https://github.com/PaddiM8/kalker.git synced 2025-06-23 19:21:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug where symbol_table::contains_fn didn't check in the BINARY_FUNCS map

Browse Source
This commit is contained in:
PaddiM8 2020-12-13 23:44:33 +01:00
parent 98d29bcaa6
commit fd29599e31
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kalk/src/parser.rs
View File

@ -70,7 +70,7 @@ pub enum CalcError {
InvalidNumberLiteral(String), InvalidNumberLiteral(String),
InvalidOperator, InvalidOperator,
InvalidUnit, InvalidUnit,
UnexpectedToken(TokenKind), UnexpectedToken(TokenKind, TokenKind),
UndefinedFn(String), UndefinedFn(String),
UndefinedVar(String), UndefinedVar(String),
UnableToInvert(String), UnableToInvert(String),
@ -466,7 +466,7 @@ fn consume(context: &mut Context, kind: TokenKind) -> Result<&Token, CalcError>
return Ok(advance(context)); return Ok(advance(context));
} }
Err(CalcError::UnexpectedToken(kind)) Err(CalcError::UnexpectedToken(peek(context).kind, kind))
} }
fn is_at_end(context: &Context) -> bool { fn is_at_end(context: &Context) -> bool {

2
kalk/src/symbol_table.rs
View File

@ -75,7 +75,7 @@ impl SymbolTable {
pub fn contains_fn(&self, identifier: &str) -> bool { pub fn contains_fn(&self, identifier: &str) -> bool {
prelude::UNARY_FUNCS.contains_key(identifier) prelude::UNARY_FUNCS.contains_key(identifier)
|| prelude::UNARY_FUNCS.contains_key(identifier) || prelude::BINARY_FUNCS.contains_key(identifier)
|| self.hashmap.contains_key(&format!("fn.{}", identifier)) || self.hashmap.contains_key(&format!("fn.{}", identifier))
} }
} }

4
kalk_cli/src/output.rs
View File

@ -39,7 +39,9 @@ fn print_calc_err(err: CalcError) {
InvalidNumberLiteral(x) => format!("Invalid number literal: '{}'.", x), InvalidNumberLiteral(x) => format!("Invalid number literal: '{}'.", x),
InvalidOperator => format!("Invalid operator."), InvalidOperator => format!("Invalid operator."),
InvalidUnit => format!("Invalid unit."), InvalidUnit => format!("Invalid unit."),
UnexpectedToken(kind) => format!("Unexpected token: '{:?}'.", kind), UnexpectedToken(got, expected) => {
format!("Unexpected token: '{:?}', expected '{:?}'.", got, expected)
}
UnableToInvert(msg) => format!("Unable to invert: {}", msg), UnableToInvert(msg) => format!("Unable to invert: {}", msg),
UndefinedFn(name) => format!("Undefined function: '{}'.", name), UndefinedFn(name) => format!("Undefined function: '{}'.", name),
UndefinedVar(name) => format!("Undefined variable: '{}'.", name), UndefinedVar(name) => format!("Undefined variable: '{}'.", name),