# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1381349006 -7200
# Node ID 49fb4574259bf9e9dc6db913586e52f2fbe76e5b
# Parent  5d93ca1561c323d82be5aad067a27f8d5df48d88
Prefix well-known static enum fields with fld_

diff -r 5d93ca1561c3 -r 49fb4574259b rt/emul/compact/src/main/java/java/util/EnumMap.java
--- a/rt/emul/compact/src/main/java/java/util/EnumMap.java	Wed Oct 09 22:02:34 2013 +0200
+++ b/rt/emul/compact/src/main/java/java/util/EnumMap.java	Wed Oct 09 22:03:26 2013 +0200
@@ -737,7 +737,7 @@
      * Returns all of the values comprising K.
      * The result is uncloned, cached, and shared by all callers.
      */
-    @JavaScriptBody(args = { "enumType" }, body = "return enumType.cnstr.$VALUES;")
+    @JavaScriptBody(args = { "enumType" }, body = "return enumType.cnstr.fld_$VALUES;")
     private static native <K extends Enum<K>> K[] getKeyUniverse(Class<K> keyType);
 
     private static final long serialVersionUID = 458661240069192865L;
diff -r 5d93ca1561c3 -r 49fb4574259b rt/emul/compact/src/main/java/java/util/EnumSet.java
--- a/rt/emul/compact/src/main/java/java/util/EnumSet.java	Wed Oct 09 22:02:34 2013 +0200
+++ b/rt/emul/compact/src/main/java/java/util/EnumSet.java	Wed Oct 09 22:03:26 2013 +0200
@@ -384,7 +384,7 @@
      * Returns all of the values comprising E.
      * The result is uncloned, cached, and shared by all callers.
      */
-    @JavaScriptBody(args = { "enumType" }, body = "return enumType.cnstr.$VALUES;")
+    @JavaScriptBody(args = { "enumType" }, body = "return enumType.cnstr.fld_$VALUES;")
     private static native <E extends Enum<E>> E[] getUniverse(Class<E> elementType);
 
     /**
diff -r 5d93ca1561c3 -r 49fb4574259b rt/emul/mini/src/main/java/java/lang/Enum.java
--- a/rt/emul/mini/src/main/java/java/lang/Enum.java	Wed Oct 09 22:02:34 2013 +0200
+++ b/rt/emul/mini/src/main/java/java/lang/Enum.java	Wed Oct 09 22:03:26 2013 +0200
@@ -235,7 +235,7 @@
         throw new IllegalArgumentException();
     }
     
-    @JavaScriptBody(args = { "enumType" }, body = "return enumType.cnstr.$VALUES;")
+    @JavaScriptBody(args = { "enumType" }, body = "return enumType.cnstr.fld_$VALUES;")
     private static native Object[] values(Class<?> enumType);
 
     /**
diff -r 5d93ca1561c3 -r 49fb4574259b rt/vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java
--- a/rt/vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java	Wed Oct 09 22:02:34 2013 +0200
+++ b/rt/vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java	Wed Oct 09 22:03:26 2013 +0200
@@ -1880,7 +1880,7 @@
                 requireReference(slashType);
                 
                 out.append(accessClass(slashType.replace('/', '_')))
-                   .append("(false).constructor.").append(value);
+                   .append("(false).constructor.fld_").append(value);
             }
         };
         ap.parse(data, cd);