Merge branch 'master' of http://github.com/wycats/handlebars.js

lib/handlebars/vm.js

@@ -8,7 +8,7 @@ Handlebars.JavaScriptCompiler = function() {};
   Compiler.OPCODE_MAP = {
     appendContent: 1,
     getContext: 2,
-    lookupWithFallback: 3,
+    lookupWithHelpers: 3,
     lookup: 4,
     append: 5,
     invokeMustache: 6,
@@ -25,7 +25,7 @@ Handlebars.JavaScriptCompiler = function() {};
   Compiler.MULTI_PARAM_OPCODES = {
     appendContent: 1,
     getContext: 1,
-    lookupWithFallback: 1,
+    lookupWithHelpers: 1,
     lookup: 1,
     invokeMustache: 2,
     pushString: 1,
@@ -201,7 +201,7 @@ Handlebars.JavaScriptCompiler = function() {};
 
       this.opcode('getContext', id.depth);
 
-      this.opcode('lookupWithFallback', id.parts[0] || null);
+      this.opcode('lookupWithHelpers', id.parts[0] || null);
 
       for(var i=1, l=id.parts.length; i<l; i++) {
         this.opcode('lookup', id.parts[i]);
@@ -432,11 +432,17 @@ Handlebars.JavaScriptCompiler = function() {};
       }
     },
 
-    lookupWithFallback: function(name) {
+    lookupWithHelpers: function(name) {
       if(name) {
-        this.pushStack(this.nameLookup('currentContext', name, 'context'));
-        var topStack = this.topStack();
-        this.source.push("if(" + topStack + " === undefined) { " + topStack + " = " + this.nameLookup('helpers', name, 'helper') + "; }");
+        var topStack = this.nextStack();
+
+        var toPush =  "if('" + name + "' in helpers) { " + topStack +
+                      " = " + this.nameLookup('helpers', name, 'helper') +
+                      "; } else { " + topStack + " = " +
+                      this.nameLookup('currentContext', name, 'context') +
+                      "; }";
+
+        this.source.push(toPush);
       } else {
         this.pushStack("currentContext");
       }
@@ -627,13 +633,16 @@ Handlebars.JavaScriptCompiler = function() {};
 Handlebars.VM = {
   programWithDepth: function(fn) {
     var args = Array.prototype.slice.call(arguments, 1);
-    return function(context) {
+    return function(context, helpers, partials, data) {
+      args[0] = helpers || args[0];
+      args[1] = partials || args[1];
+      args[2] = data || args[2];
       return fn.apply(this, [context].concat(args));
     };
   },
   program: function(fn, helpers, partials, data) {
-    return function(context) {
-      return fn(context, helpers, partials, data);
+    return function(context, h2, p2, d2) {
+      return fn(context, h2 || helpers, p2 || partials, d2 || data);
     };
   },
   noop: function() { return ""; },