Merge ea948ff010 into 2d8fc61677

lib/parse.js

@@ -1376,12 +1376,13 @@ function parse($TEXT, options) {
             next();
             var yes = expression(false);
             expect(":");
+            var alternative = expression(false, no_in);
             return new AST_Conditional({
                 start       : start,
                 condition   : expr,
                 consequent  : yes,
-                alternative : expression(false, no_in),
-                end         : peek()
+                alternative : alternative,
+                end         : prev()
             });
         }
         return expr;