1 files changed, 30 insertions, 47 deletions

diff --git a/lib/handlebars/compiler/javascript-compiler.js b/lib/handlebars/compiler/javascript-compiler.js
index d41cacd..4e414e5 100644
--- a/lib/handlebars/compiler/javascript-compiler.js
+++ b/lib/handlebars/compiler/javascript-compiler.js
@@ -289,13 +289,18 @@ JavaScriptCompiler.prototype = {
   // If `value` is truthy, or 0, it is coerced into a string and appended
   // Otherwise, the empty string is appended
   append: function() {
-    // Force anything that is inlined onto the stack so we don't have duplication
-    // when we examine local
-    this.flushInline();
-    var local = this.popStack();
-    this.pushSource('if (' + local + ' != null) { ' + this.appendToBuffer(local) + ' }');
-    if (this.environment.isSimple) {
-      this.pushSource("else { " + this.appendToBuffer("''") + " }");
+    if (this.isInline()) {
+      this.replaceStack(function(current) {
+        return ' != null ? ' + current + ' : ""';
+      });
+
+      this.pushSource(this.appendToBuffer(this.popStack()));
+    } else {
+      var local = this.popStack();
+      this.pushSource('if (' + local + ' != null) { ' + this.appendToBuffer(local) + ' }');
+      if (this.environment.isSimple) {
+        this.pushSource("else { " + this.appendToBuffer("''") + " }");
+      }
     }
   },
 
@@ -692,7 +697,7 @@ JavaScriptCompiler.prototype = {
   },
 
   pushStackLiteral: function(item) {
-    return this.push(new Literal(item));
+    this.push(new Literal(item));
   },
 
   pushSource: function(source) {
@@ -706,15 +711,6 @@ JavaScriptCompiler.prototype = {
     }
   },
 
-  pushStack: function(item) {
-    this.flushInline();
-
-    var stack = this.incrStack();
-    this.pushSource(stack + " = " + item + ";");
-    this.compileStack.push(stack);
-    return stack;
-  },
-
   replaceStack: function(callback) {
     var prefix = '',
         inline = this.isInline(),
@@ -736,8 +732,8 @@ JavaScriptCompiler.prototype = {
       usedLiteral = true;
     } else {
       // Get or create the current stack name for use by the inline
-      createdStack = !this.stackSlot;
-      var name = !createdStack ? this.topStackName() : this.incrStack();
+      createdStack = true;
+      var name = this.incrStack();
 
       prefix = '(' + this.push(name) + ' = ' + top + ')';
       stack = this.topStack();
@@ -764,15 +760,16 @@ JavaScriptCompiler.prototype = {
   },
   flushInline: function() {
     var inlineStack = this.inlineStack;
-    if (inlineStack.length) {
-      this.inlineStack = [];
-      for (var i = 0, len = inlineStack.length; i < len; i++) {
-        var entry = inlineStack[i];
-        if (entry instanceof Literal) {
-          this.compileStack.push(entry);
-        } else {
-          this.pushStack(entry);
-        }
+    this.inlineStack = [];
+    for (var i = 0, len = inlineStack.length; i < len; i++) {
+      var entry = inlineStack[i];
+      /* istanbul ignore if */
+      if (entry instanceof Literal) {
+        this.compileStack.push(entry);
+      } else {
+        var stack = this.incrStack();
+        this.pushSource(stack + " = " + entry + ";");
+        this.compileStack.push(stack);
       }
     }
   },
@@ -802,6 +799,7 @@ JavaScriptCompiler.prototype = {
     var stack = (this.isInline() ? this.inlineStack : this.compileStack),
         item = stack[stack.length - 1];
 
+    /* istanbul ignore if */
     if (item instanceof Literal) {
       return item.value;
     } else {
@@ -852,7 +850,7 @@ JavaScriptCompiler.prototype = {
     };
   },
 
-  setupOptions: function(helper, paramSize, params) {
+  setupParams: function(helper, paramSize, params, useRegister) {
     var options = {}, contexts = [], types = [], ids = [], param, inverse, program;
 
     options.name = this.quotedString(helper);
@@ -872,16 +870,8 @@ JavaScriptCompiler.prototype = {
     // Avoid setting fn and inverse if neither are set. This allows
     // helpers to do a check for `if (options.fn)`
     if (program || inverse) {
-      if (!program) {
-        program = 'this.noop';
-      }
-
-      if (!inverse) {
-        inverse = 'this.noop';
-      }
-
-      options.fn = program;
-      options.inverse = inverse;
+      options.fn = program || 'this.noop';
+      options.inverse = inverse || 'this.noop';
     }
 
     // The parameters go on to the stack in order (making sure that they are evaluated in order)
@@ -912,14 +902,7 @@ JavaScriptCompiler.prototype = {
       options.data = "data";
     }
 
-    return options;
-  },
-
-  // the params and contexts arguments are passed in arrays
-  // to fill in
-  setupParams: function(helperName, paramSize, params, useRegister) {
-    var options = this.objectLiteral(this.setupOptions(helperName, paramSize, params));
-
+    options = this.objectLiteral(options);
     if (useRegister) {
       this.useRegister('options');
       params.push('options');