From 054025c6ed73320c1cd37ac5e6fcb3722f971342 Mon Sep 17 00:00:00 2001
From: jellevandenhooff <jelle@vandenhooff.name>
Date: Sat, 26 Oct 2013 15:41:12 -0400
Subject: [PATCH] Allow filters in 'in' and 'as'-expressions.

---
 third_party/esprima/esprima.js | 36 +++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/third_party/esprima/esprima.js b/third_party/esprima/esprima.js
index 13f16af..7444189 100644
--- a/third_party/esprima/esprima.js
+++ b/third_party/esprima/esprima.js
@@ -949,8 +949,7 @@
     //   "|" Filter
     //   Filters "|" Filter
 
-    function parseFilters(expr) {
-        delegate.createTopLevel(expr);
+    function parseFilters() {
         while (match('|')) {
             lex();
             parseFilter();
@@ -961,15 +960,18 @@
     //   LabelledExpressions
     //   AsExpression
     //   InExpression
-    //   Expression
-    //   Expression Filters
+    //   FilterExpression
 
     // AsExpression ::
-    //   Expression as Identifier
+    //   FilterExpression as Identifier
 
     // InExpression ::
-    //   Identifier, Identifier in Expression
-    //   Identifier in Expression
+    //   Identifier, Identifier in FilterExpression
+    //   Identifier in FilterExpression
+
+    // FilterExpression ::
+    //   Expression
+    //   Expression Filters
 
     function parseTopLevel() {
         skipWhitespace();
@@ -977,17 +979,18 @@
 
         var expr = parseExpression();
         if (expr) {
-            if (lookahead.value === 'as') {
-                parseAsExpression(expr);
-            } else if (lookahead.value === ',' || lookahead.value == 'in' &&
+            if (lookahead.value === ',' || lookahead.value == 'in' &&
                        expr.type === Syntax.Identifier) {
                 parseInExpression(expr);
-            } else if (match('|')) {
-                parseFilters(expr);
-            } else if (expr.type === Syntax.Identifier && match(':')) {
+            } else if (expr.type === Syntax.Identifier && match(':')) { 
                 parseLabelledExpressions(expr);
             } else {
-                delegate.createTopLevel(expr);
+                parseFilters();
+                if (lookahead.value === 'as') {
+                    parseAsExpression(expr);
+                } else {
+                    delegate.createTopLevel(expr);
+                }
             }
         }
 
@@ -1007,7 +1010,7 @@
     function parseLabelledExpressions(expr) {
         // TODO(arv): Link to documentation.
         console.warn('Labelled expressions are deprecated. ' +
-                     'Use tokenList filter instead');
+                    'Use tokenList filter instead');
         var label = expr.name;
         expect(':');
 
@@ -1026,7 +1029,7 @@
         }
 
         return null;
-    }
+    } 
 
     function parseAsExpression(expr) {
         lex();  // as
@@ -1045,6 +1048,7 @@
 
         lex();  // in
         var expr = parseExpression();
+        parseFilters();
         delegate.createInExpression(identifier.name, indexName, expr);
     }