Fix AST parser for call expressions inside bracket expressions

src/expression.js

@@ -468,6 +468,9 @@ assign(Stack.prototype,{
 	},
 	popTo: function(types){
 		this.popUntil(types);
+		this.pop();
+	},
+	pop: function() {
 		if(!this.isRootTop()) {
 			this.stack.pop();
 		}
@@ -782,7 +785,7 @@ var expression = {
 					});
 				}
 				else if(firstParent.type === 'Bracket' && !(firstParent.children && firstParent.children.length > 0)) {
-					stack.addTo(["Bracket"], {type: "Lookup", key: token});
+					stack.addToAndPush(["Bracket"], {type: "Lookup", key: token});
 				}
 				// This is to make sure in a helper like `helper foo[bar] car` that
 				// car would not be added to the Bracket expression.
@@ -803,6 +806,7 @@ var expression = {
 				stack.addToAndPush(["Helper", "Call", "Hash"], {type: "Arg", key: token});
 			}
 			// Call
+			// foo[bar()]
 			else if(token === "(") {
 				top = stack.top();
 				if(top.type === "Lookup") {
@@ -841,6 +845,10 @@ var expression = {
 					stack.replaceTopAndPush({type: "Bracket"});
 				}
 			}
+			// End Bracket
+			else if(token === "]") {
+				stack.pop();
+			}
 			else if(token === " ") {
 				stack.push(token);
 			}

test/expression-test.js

@@ -353,6 +353,12 @@ test("expression.ast - [] operator", function(){
 	    children: [{type: "Lookup", key: "bar"}]
 	});
 
+	deepEqual(expression.ast("foo[bar()]"), {
+    type: "Bracket",
+		root: {type: "Lookup", key: "foo"},
+    children: [{type: "Call", method: {key: "@bar", type: "Lookup" }}]
+	});
+
 	deepEqual(expression.ast("foo()[bar]"), {
 		type: "Bracket",
 		root: {type: "Call", method: {key: "@foo", type: "Lookup" } },
@@ -386,7 +392,9 @@ test("expression.ast - [] operator", function(){
 			type: "Literal",
 			value: "foo"
 		}]
-	});
+	},
+	"eq foo['bar'] 'foo' valid"
+	);
 
 	deepEqual(expression.ast("eq foo[bar] foo"), {
 		type: "Helper",
@@ -413,7 +421,9 @@ test("expression.ast - [] operator", function(){
 				children: [{type: "Lookup", key: "bar"}]
 		},
 		children: [{type: "Lookup", key: "baz"}]
-	});
+	},
+	"foo[bar][baz] valid"
+	);
 });
 
 test("expression.parse - [] operator", function(){