Fix function parsing

This commit is contained in:
Jeff 2023-12-16 20:42:19 -05:00
parent 6cb2df55f7
commit 3096cf5959
2 changed files with 13 additions and 5 deletions

View File

@ -33,7 +33,7 @@ impl AbstractTree for ValueNode {
let mut parameters = Vec::new(); let mut parameters = Vec::new();
let mut parameter_types = Vec::new(); let mut parameter_types = Vec::new();
for index in 2..child_count - 1 { for index in 2..child_count - 2 {
let child = child.child(index).unwrap(); let child = child.child(index).unwrap();
if child.kind() == "identifier" { if child.kind() == "identifier" {
@ -258,12 +258,12 @@ mod tests {
#[test] #[test]
fn evaluate_function() { fn evaluate_function() {
let result = evaluate("(fn) <bool> {true}"); let result = evaluate("(fn) <int> { 1 }");
let value = result.unwrap(); let value = result.unwrap();
let function = value.as_function().unwrap(); let function = value.as_function().unwrap();
assert_eq!(&Vec::<Identifier>::with_capacity(0), function.parameters()); assert_eq!(&Vec::<Identifier>::with_capacity(0), function.parameters());
assert_eq!(Ok(&Type::Boolean), function.return_type()); assert_eq!(Ok(&Type::Integer), function.return_type());
let result = evaluate("(fn x <bool>) <bool> {true}"); let result = evaluate("(fn x <bool>) <bool> {true}");
let value = result.unwrap(); let value = result.unwrap();

View File

@ -216,8 +216,16 @@ impl Error {
pub fn is_type_check_error(&self, other: &Error) -> bool { pub fn is_type_check_error(&self, other: &Error) -> bool {
match self { match self {
Error::WithContext { error, .. } => error.as_ref() == other, Error::WithContext { error, .. } => {
_ => self == other, debug_assert_eq!(error.as_ref(), other);
error.as_ref() == other
}
_ => {
debug_assert_eq!(self, other);
self == other
}
} }
} }
} }