From 2250cd0546f097ece49cb19a4f1ee6d769c7ae8b Mon Sep 17 00:00:00 2001
From: "igor%mir2.org" <igor%mir2.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 15 May 2004 17:23:06 +0000
Subject: [PATCH] Quote property names in object literals produced by
 toSource() if they coincide with reserved keywords.

git-svn-id: svn://10.0.0.236/trunk@156428 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../js/rhino/src/org/mozilla/javascript/ScriptRuntime.java | 2 +-
 .../js/rhino/src/org/mozilla/javascript/TokenStream.java   | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/ScriptRuntime.java b/mozilla/js/rhino/src/org/mozilla/javascript/ScriptRuntime.java
index 0787e783bb4..60d539db249 100644
--- a/mozilla/js/rhino/src/org/mozilla/javascript/ScriptRuntime.java
+++ b/mozilla/js/rhino/src/org/mozilla/javascript/ScriptRuntime.java
@@ -516,7 +516,7 @@ public class ScriptRuntime {
             if (!Character.isJavaIdentifierPart(s.charAt(i)))
                 return false;
         }
-        return true;
+        return !TokenStream.isKeyword(s);
     }
 
     /**
diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/TokenStream.java b/mozilla/js/rhino/src/org/mozilla/javascript/TokenStream.java
index 11da1efc260..a56d3efd3d5 100644
--- a/mozilla/js/rhino/src/org/mozilla/javascript/TokenStream.java
+++ b/mozilla/js/rhino/src/org/mozilla/javascript/TokenStream.java
@@ -123,7 +123,12 @@ public class TokenStream
         return "";
     }
 
-    private int stringToKeyword(String name) {
+    static boolean isKeyword(String s)
+    {
+        return Token.EOF != stringToKeyword(s);
+    }
+
+    private static int stringToKeyword(String name) {
 // #string_id_map#
 // The following assumes that Token.EOF == 0
         final int