Improve function call return value handling

Fixes sass#1269
mgreter · Jun 12, 2015 · 65cf074 · 65cf074
1 parent 5a2ab75
commit 65cf074
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/eval.cpp b/eval.cpp
@@ -685,10 +685,8 @@ namespace Sass {
     if (result->pstate().file == string::npos)
       result->pstate(c->pstate());
 
-    do {
-      result->is_delayed(result->concrete_type() == Expression::STRING);
-      result = result->perform(this);
-    } while (result->concrete_type() == Expression::NONE);
+    result->is_delayed(result->concrete_type() == Expression::STRING);
+    if (!result->is_delayed()) result = result->perform(this);
     exp.env_stack.pop_back();
     return result;
   }