Chalice: limited functions are still problematic (see Calculator.chalice)

1 files changed, 5 insertions, 6 deletions

diff --git a/Chalice/src/Resolver.scala b/Chalice/src/Resolver.scala
index d4adbec3..2729a0d5 100644
--- a/Chalice/src/Resolver.scala
+++ b/Chalice/src/Resolver.scala
@@ -216,12 +216,11 @@ object Resolver {
                  // resolve function calls

                  calls addNode f;

                  e visit {

-                 case app : FunctionApplication =>

-                   assert(app.f != null);

-                   calls addNode app.f;

-                   calls.addEdge(f, app.f);

-                   if (app.f == f) f.isRecursive = true; // self-recursion

-                 case _ =>

+                   case app : FunctionApplication if app.f != null /* may not be resolved */ =>

+                     calls addNode app.f;

+                     calls.addEdge(f, app.f);

+                     if (app.f == f) f.isRecursive = true; // self-recursion

+                   case _ =>

                  }

                case None =>

              }