Tests for strict mode parsing or getter and setters.

Nick Santos · hns · commit 1a6eee434c15 · 2012-05-14T09:22:37.000+02:00
Fixes issue 598 Committed by John Lenz ------------- Created by MOE: http://code.google.com/p/moe-java MOE_MIGRATED_REVID=26392288 Conflicts: src/org/mozilla/javascript/Parser.java
diff --git a/src/org/mozilla/javascript/Parser.java b/src/org/mozilla/javascript/Parser.java
@@ -3078,7 +3078,7 @@ private ArrayComprehensionLoop arrayComprehensionLoop()
         }
     }
 
-    private AstNode generatorExpression(AstNode result, int pos) 
+    private AstNode generatorExpression(AstNode result, int pos)
         throws IOException
     {
         return generatorExpression(result, pos, false);
@@ -3168,18 +3168,28 @@ private GeneratorExpressionLoop generatorExpressionLoop()
         }
     }
 
+    private static final int PROP_ENTRY = 1;
+    private static final int GET_ENTRY  = 2;
+    private static final int SET_ENTRY  = 4;
+
     private ObjectLiteral objectLiteral()
         throws IOException
     {
         int pos = ts.tokenBeg, lineno = ts.lineno;
         int afterComma = -1;
         List<ObjectProperty> elems = new ArrayList<ObjectProperty>();
-        Set<String> propertyNames = new HashSet<String>();
+        Set<String> getterNames = null;
+        Set<String> setterNames = null;
+        if (this.inUseStrictDirective) {
+            getterNames = new HashSet<String>();
+            setterNames = new HashSet<String>();
+        }
         Comment objJsdocNode = getAndResetJsDoc();
 
       commaLoop:
         for (;;) {
             String propertyName = null;
+            int entryKind = PROP_ENTRY;
             int tt = peekToken();
             Comment jsdocNode = getAndResetJsDoc();
             switch(tt) {
@@ -3230,11 +3240,29 @@ private ObjectLiteral objectLiteral()
                   break;
             }
 
-            if (this.inUseStrictDirective) {
-                if (propertyNames.contains(propertyName)) {
-                    addError("msg.dup.obj.lit.prop.strict", propertyName);
+            if (this.inUseStrictDirective && propertyName != null) {
+                switch (entryKind) {
+                case PROP_ENTRY:
+                    if (getterNames.contains(propertyName)
+                        || setterNames.contains(propertyName)) {
+                        addError("msg.dup.obj.lit.prop.strict", propertyName);
+                    }
+                    getterNames.add(propertyName);
+                    setterNames.add(propertyName);
+                    break;
+                case GET_ENTRY:
+                    if (getterNames.contains(propertyName)) {
+                      addError("msg.dup.obj.lit.prop.strict", propertyName);
+                    }
+                    getterNames.add(propertyName);
+                    break;
+                case SET_ENTRY:
+                    if (setterNames.contains(propertyName)) {
+                      addError("msg.dup.obj.lit.prop.strict", propertyName);
+                    }
+                    setterNames.add(propertyName);
+                    break;
                 }
-                propertyNames.add(propertyName);
             }
 
             // Eat any dangling jsdoc in the property.
