From 46cf4b772a5feae73a5c4523a7b9bbb04b609b2a Mon Sep 17 00:00:00 2001
From: "mrbkap%gmail.com"
 <mrbkap%gmail.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 14 Jun 2006 05:08:36 +0000
Subject: [PATCH] Fix let redeclaration grammar. Also don't allow duplicated
 iteration variables in array comprehensions.

git-svn-id: svn://10.0.0.236/branches/JS_1_7_ALPHA_BRANCH@199864 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/js/src/jsparse.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/mozilla/js/src/jsparse.c b/mozilla/js/src/jsparse.c
index d72f7c29995..db422e61240 100644
--- a/mozilla/js/src/jsparse.c
+++ b/mozilla/js/src/jsparse.c
@@ -1343,7 +1343,6 @@ typedef struct BindVarArgs {
         } var;
         struct {
             jsuint          index;
-            JSBool          allowDup;
             uintN           overflowError;
         } let;
     } u;
@@ -1369,14 +1368,12 @@ DeclareLetVar(JSContext *cx, JSAtom *atom, BindVarArgs *args)
         JS_ASSERT(sprop->flags & SPROP_HAS_SHORTID);
         JS_ASSERT((uint16)sprop->shortid < args->u.let.index);
         OBJ_DROP_PROPERTY(cx, blockObj, (JSProperty *) sprop);
-        if (args->u.let.allowDup)
-            return JS_TRUE;
 
         name = js_AtomToPrintableString(cx, atom);
         if (name) {
             js_ReportCompileErrorNumber(cx, args->ts,
                                         JSREPORT_TS | JSREPORT_ERROR,
-                                        JSMSG_REDECLARED_VAR, js_let_str,
+                                        JSMSG_REDECLARED_VAR, "variable",
                                         name);
         }
         return JS_FALSE;
@@ -3155,7 +3152,6 @@ Variables(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc)
     } else {
         args.obj = tc->topScopeStmt->blockObj;
         args.u.let.index = 0;
-        args.u.let.allowDup = JS_FALSE;
         args.u.let.overflowError = JSMSG_TOO_MANY_FUN_VARS;
     }
 
@@ -4794,7 +4790,6 @@ PrimaryExpr(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc,
                 args.let = JS_TRUE;
                 args.op = JSOP_NOP;
                 args.u.let.index = 0;
-                args.u.let.allowDup = JS_TRUE;
                 args.u.let.overflowError = JSMSG_ARRAY_INIT_TOO_BIG;
 
                 do {