psimsa/handlebars.js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix incorrect stack pop when replacing literals

Browse Source
This commit is contained in:
kpdecker
2013-12-31 21:17:16 -06:00
parent cbfec5b9e9
commit f4d337d252
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/handlebars/compiler/javascript-compiler.js
+4 -2
View File
@@ -687,7 +687,8 @@ JavaScriptCompiler.prototype = {
replaceStack: function(callback) { replaceStack: function(callback) {
var prefix = '', var prefix = '',
inline = this.isInline(), inline = this.isInline(),
stack; stack,
usedLiteral;
// If we are currently inline then we want to merge the inline statement into the // If we are currently inline then we want to merge the inline statement into the
// replacement statement via ',' // replacement statement via ','
@@ -697,6 +698,7 @@ JavaScriptCompiler.prototype = {
if (top instanceof Literal) { if (top instanceof Literal) {
// Literals do not need to be inlined // Literals do not need to be inlined
stack = top.value; stack = top.value;
usedLiteral = true;
} else { } else {
// Get or create the current stack name for use by the inline // Get or create the current stack name for use by the inline
var name = this.stackSlot ? this.topStackName() : this.incrStack(); var name = this.stackSlot ? this.topStackName() : this.incrStack();
@@ -711,7 +713,7 @@ JavaScriptCompiler.prototype = {
var item = callback.call(this, stack); var item = callback.call(this, stack);
if (inline) { if (inline) {
if (this.inlineStack.length || this.compileStack.length) { if (!usedLiteral) {
this.popStack(); this.popStack();
} }
this.push('(' + prefix + item + ')'); this.push('(' + prefix + item + ')');