Support reserved words in XML attribute names.

Author: aardvark179

rhino/src/main/java/org/mozilla/javascript/Parser.java

@@ -3269,7 +3269,10 @@ private AstNode attributeAccess() throws IOException {
             // handles: @name, @ns::name, @ns::*, @ns::[expr]
             case Token.NAME:
                 return propertyName(atPos, 0);
-
+            case Token.RESERVED:
+                String name = ts.getString();
+                saveNameTokenData(ts.tokenBeg, name, lineNumber(), columnNumber());
+                return propertyName(atPos, 0);
             // handles: @*, @*::name, @*::*, @*::[expr]
             case Token.MUL:
                 saveNameTokenData(ts.tokenBeg, "*", lineNumber(), columnNumber());
@@ -3280,6 +3283,16 @@ private AstNode attributeAccess() throws IOException {
                 return xmlElemRef(atPos, null, -1);
 
             default:
+                {
+                    if (compilerEnv.isReservedKeywordAsIdentifier()) {
+                        // allow keywords as property names, e.g. ({if: 1})
+                        name = Token.keywordToName(tt);
+                        if (name != null) {
+                            saveNameTokenData(ts.tokenBeg, name, lineNumber(), columnNumber());
+                            return propertyName(atPos, 0);
+                        }
+                    }
+                }
                 reportError("msg.no.name.after.xmlAttr");
                 return makeErrorNode();
         }
@@ -3304,13 +3317,19 @@ private AstNode propertyName(int atPos, int memberTypeFlags) throws IOException
             ns = name;
             colonPos = ts.tokenBeg;
 
-            switch (nextToken()) {
+            int nt = nextToken();
+            switch (nt) {
                 // handles name::name
                 case Token.NAME:
                     name = createNameNode();
                     break;
-
-                // handles name::*
+                case Token.RESERVED:
+                    {
+                        String realName = ts.getString();
+                        saveNameTokenData(ts.tokenBeg, realName, lineNumber(), columnNumber());
+                        name = createNameNode(false, -1);
+                        break;
+                    }
                 case Token.MUL:
                     saveNameTokenData(ts.tokenBeg, "*", lineNumber(), columnNumber());
                     name = createNameNode(false, -1);
@@ -3321,6 +3340,18 @@ private AstNode propertyName(int atPos, int memberTypeFlags) throws IOException
                     return xmlElemRef(atPos, ns, colonPos);
 
                 default:
+                    {
+                        if (compilerEnv.isReservedKeywordAsIdentifier()) {
+                            // allow keywords as property names, e.g. ({if: 1})
+                            String realName = Token.keywordToName(nt);
+                            if (name != null) {
+                                saveNameTokenData(
+                                        ts.tokenBeg, realName, lineNumber(), columnNumber());
+                                name = createNameNode(false, -1);
+                                break;
+                            }
+                        }
+                    }
                     reportError("msg.no.name.after.coloncolon");
                     return makeErrorNode();
             }

tests/src/test/java/org/mozilla/javascript/tests/XMLReservedWordsAttributesTest.java

@@ -0,0 +1,10 @@
+package org.mozilla.javascript.tests;
+
+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.drivers.LanguageVersion;
+import org.mozilla.javascript.drivers.RhinoTest;
+import org.mozilla.javascript.drivers.ScriptTestsBase;
+
+@RhinoTest("testsrc/jstests/xml-reserved-words-as-attributes.js")
+@LanguageVersion(Context.VERSION_ES6)
+public class XMLReservedWordsAttributesTest extends ScriptTestsBase {}

tests/testsrc/jstests/xml-reserved-words-as-attributes.js

@@ -0,0 +1,23 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+// Test that reserved words can be used as both XML attribute names
+// and as part of a name space qualified name.
+
+load('testsrc/assert.js');
+
+x =
+<alpha>
+    <bravo for="value1" ns:for="value3" xmlns:ns="http://someuri">
+        <charlie class="value2" ns:class="value4"/>
+    </bravo>
+</alpha>
+
+assertEquals("value1", x.bravo.@for.toXMLString());
+assertEquals("value2", x.bravo.charlie.@class.toXMLString());
+n = new Namespace("http://someuri");
+assertEquals("value3", x.bravo.@n::for.toXMLString());
+assertEquals("value4", x.bravo.charlie.@n::class.toXMLString());
+
+"success"