surprise surprise!

Nick Santos · hns · commit 4cee4199f59a · 2012-05-14T09:22:56.000+02:00
the one cl i didn't bother writing good tests for is the one where i did a bad merge :) Committed by Nick Santos ------------- Created by MOE: http://code.google.com/p/moe-java MOE_MIGRATED_REVID=26403848
diff --git a/src/org/mozilla/javascript/Parser.java b/src/org/mozilla/javascript/Parser.java
@@ -3205,6 +3205,7 @@ private ObjectLiteral objectLiteral()
                           || "set".equals(propertyName))))
                   {
                       boolean isGet = "get".equals(propertyName);
+                      entryKind = isGet ? GET_ENTRY : SET_ENTRY;
                       AstNode pname = objliteralProperty();
                       if (pname == null) {
                         propertyName = null;
diff --git a/testsrc/org/mozilla/javascript/tests/ParserTest.java b/testsrc/org/mozilla/javascript/tests/ParserTest.java
@@ -605,6 +605,17 @@ public void testNestedOr() {
 
     }
 
+    public void testObjectLitGetterAndSetter() {
+        AstNode root = parse(
+            "'use strict';\n" +
+            "function App() {}\n" +
+            "App.prototype = {\n" +
+            "  get appData() { return this.appData_; },\n" +
+            "  set appData(data) { this.appData_ = data; }\n" +
+            "};");
+        assertNotNull(root);
+    }
+
     public void testObjectLitLocation() {
       AstNode root = parse(
           "\nvar foo =\n" +

Original file line number	Diff line number	Diff line change
`@@ -3205,6 +3205,7 @@ private ObjectLiteral objectLiteral()`
`3205`	`3205`	`\|\| "set".equals(propertyName))))`
`3206`	`3206`	`{`
`3207`	`3207`	`boolean isGet = "get".equals(propertyName);`
	`3208`	`+ entryKind = isGet ? GET_ENTRY : SET_ENTRY;`
`3208`	`3209`	`AstNode pname = objliteralProperty();`
`3209`	`3210`	`if (pname == null) {`
`3210`	`3211`	`propertyName = null;`