Err out on unknown function (#66)

* Err out on unknown function * Added tests * Lazily instanciate/bump the Arc
clarkmcc · Jul 11, 2024 · 2cb75cb · 2cb75cb
1 parent 18466fa
commit 2cb75cb
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/interpreter/src/context.rs b/interpreter/src/context.rs
@@ -85,11 +85,11 @@ impl<'a> Context<'a> {
                 .get(&name)
                 .cloned()
                 .or_else(|| parent.get_variable(&name).ok())
-                .ok_or(ExecutionError::UndeclaredReference(name.into())),
+                .ok_or_else(|| ExecutionError::UndeclaredReference(name.into())),
             Context::Root { variables, .. } => variables
                 .get(&name)
                 .cloned()
-                .ok_or(ExecutionError::UndeclaredReference(name.into())),
+                .ok_or_else(|| ExecutionError::UndeclaredReference(name.into())),
         }
     }
 

diff --git a/interpreter/src/lib.rs b/interpreter/src/lib.rs
@@ -262,6 +262,16 @@ mod tests {
                 "missing == 1",
                 ExecutionError::undeclared_reference("missing"),
             ),
+            (
+                "undeclared method",
+                "1.missing()",
+                ExecutionError::undeclared_reference("missing"),
+            ),
+            (
+                "undeclared function",
+                "missing(1)",
+                ExecutionError::undeclared_reference("missing"),
+            ),
             (
                 "unsupported key type",
                 "{null: true}",

diff --git a/interpreter/src/objects.rs b/interpreter/src/objects.rs
@@ -523,7 +523,9 @@ impl<'a> Value {
             Expression::Ident(name) => ctx.get_variable(&***name),
             Expression::FunctionCall(name, target, args) => {
                 if let Expression::Ident(name) = &**name {
-                    let func = ctx.get_function(&**name).unwrap();
+                    let func = ctx
+                        .get_function(&**name)
+                        .ok_or_else(|| ExecutionError::UndeclaredReference(Arc::clone(name)))?;
                     match target {
                         None => {
                             let mut ctx =