# HG changeset patch
# User Lubomir Nerad <lubomir.nerad@oracle.com>
# Date 1367597747 -7200
# Node ID 977cc6141083023eff95b053d4e287645602cd9d
# Parent  b1fe994d4267ef837c700f68b09c9896047c7c90
Generate $instOf in exported form

diff -r b1fe994d4267 -r 977cc6141083 rt/emul/mini/src/main/java/java/lang/Object.java
--- a/rt/emul/mini/src/main/java/java/lang/Object.java	Fri Apr 26 18:48:34 2013 +0200
+++ b/rt/emul/mini/src/main/java/java/lang/Object.java	Fri May 03 18:15:47 2013 +0200
@@ -246,7 +246,7 @@
     }
 
     @JavaScriptBody(args = "self", body = 
-          "\nif (!self.$instOf_java_lang_Cloneable) {"
+          "\nif (!self['$instOf_java_lang_Cloneable']) {"
         + "\n  return null;"
         + "\n} else {"
         + "\n  var clone = self.constructor(true);"
diff -r b1fe994d4267 -r 977cc6141083 rt/emul/mini/src/main/java/java/lang/String.java
--- a/rt/emul/mini/src/main/java/java/lang/String.java	Fri Apr 26 18:48:34 2013 +0200
+++ b/rt/emul/mini/src/main/java/java/lang/String.java	Fri May 03 18:15:47 2013 +0200
@@ -1013,7 +1013,7 @@
      * @see  #equalsIgnoreCase(String)
      */
     @JavaScriptBody(args = { "obj" }, body = 
-        "return obj != null && obj.$instOf_java_lang_String && "
+        "return obj != null && obj['$instOf_java_lang_String'] && "
         + "this.toString() === obj.toString();"
     )
     public boolean equals(Object anObject) {
diff -r b1fe994d4267 -r 977cc6141083 rt/vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java
--- a/rt/vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java	Fri Apr 26 18:48:34 2013 +0200
+++ b/rt/vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java	Fri May 03 18:15:47 2013 +0200
@@ -185,13 +185,9 @@
             out.append("\n    ").append(destObject).append(".").append(mn).append(".cls = CLS;");
         }
         out.append("\n    c.constructor = CLS;");
-        String instOfName = "$instOf_" + className;
-        out.append("\n    c.").append(instOfName).append(" = true;");
-//        obfuscationDelegate.exportJSProperty(out, "c", instOfName);
+        out.append("\n    c['$instOf_").append(className).append("'] = true;");
         for (String superInterface : jc.getSuperInterfaces()) {
-            instOfName = "$instOf_" + superInterface.replace('/', '_');
-            out.append("\n    c.").append(instOfName).append(" = true;");
-//            obfuscationDelegate.exportJSProperty(out, "c", instOfName);
+            out.append("\n    c['$instOf_").append(superInterface.replace('/', '_')).append("'] = true;");
         }
         out.append("\n    CLS.$class = 'temp';");
         out.append("\n    CLS.$class = ");
@@ -1783,7 +1779,7 @@
                 final String classInternalName = jc.getClassName(e.catch_cpx);
                 addReference(classInternalName);
                 if ("java/lang/Throwable".equals(classInternalName)) {
-                    out.append("if (e.$instOf_java_lang_Throwable) {");
+                    out.append("if (e['$instOf_java_lang_Throwable']) {");
                     out.append("  var stA0 = e;");
                     out.append("} else {");
                     out.append("  var stA0 = vm.java_lang_Throwable(true);");
@@ -1791,7 +1787,7 @@
                     out.append("}");
                     goTo(out, current, e.handler_pc, topMostLabel);
                 } else {
-                    out.append("if (e.$instOf_" + classInternalName.replace('/', '_') + ") {");
+                    out.append("if (e['$instOf_" + classInternalName.replace('/', '_') + "']) {");
                     out.append("var stA0 = e;");
                     goTo(out, current, e.handler_pc, topMostLabel);
                     out.append("}\n");
@@ -1920,7 +1916,7 @@
     private void generateInstanceOf(int indx, final StackMapper smapper) throws IOException {
         final String type = jc.getClassName(indx);
         if (!type.startsWith("[")) {
-            emit(out, "var @2 = @1 != null && @1.$instOf_@3 ? 1 : 0;",
+            emit(out, "var @2 = @1 != null && @1['$instOf_@3'] ? 1 : 0;",
                  smapper.popA(), smapper.pushI(),
                  type.replace('/', '_'));
         } else {
@@ -1935,7 +1931,7 @@
         final String type = jc.getClassName(indx);
         if (!type.startsWith("[")) {
             emit(out,
-                 "if (@1 !== null && !@1.$instOf_@2) throw vm.java_lang_ClassCastException(true);",
+                 "if (@1 !== null && !@1['$instOf_@2']) throw vm.java_lang_ClassCastException(true);",
                  smapper.getA(0), type.replace('/', '_'));
         } else {
             emit(out, "vm.java_lang_Class(false).forName__Ljava_lang_Class_2Ljava_lang_String_2('@2').cast__Ljava_lang_Object_2Ljava_lang_Object_2(@1);",