diff -r a6c71e376889 -r 3d1612be40bc rt/vm/src/main/java/org/apidesign/vm4brwsr/VM.java --- a/rt/vm/src/main/java/org/apidesign/vm4brwsr/VM.java Sun Oct 20 20:36:03 2013 +0200 +++ b/rt/vm/src/main/java/org/apidesign/vm4brwsr/VM.java Thu Nov 07 09:41:45 2013 +0100 @@ -137,13 +137,17 @@ out.append( " return vm;\n" + " };\n" + + " function mangleClass(name) {\n" + + " return name.replace__Ljava_lang_String_2Ljava_lang_CharSequence_2Ljava_lang_CharSequence_2(\n" + + " '_', '_1').replace__Ljava_lang_String_2CC('.','_');\n" + + " };\n" + " global.bck2brwsr = function() {\n" + " var args = Array.prototype.slice.apply(arguments);\n" + " var vm = fillInVMSkeleton({});\n" + " var loader = {};\n" + " loader.vm = vm;\n" + " loader.loadClass = function(name) {\n" - + " var attr = name.replace__Ljava_lang_String_2CC('.','_');\n" + + " var attr = mangleClass(name);\n" + " var fn = vm[attr];\n" + " if (fn) return fn(false);\n" + " return vm.org_apidesign_vm4brwsr_VMLazy(false).\n" @@ -154,7 +158,7 @@ + " }\n" + " vm.loadClass = loader.loadClass;\n" + " vm._reload = function(name, byteCode) {;\n" - + " var attr = name.replace__Ljava_lang_String_2CC('.','_');\n" + + " var attr = mangleClass(name);\n" + " delete vm[attr];\n" + " return vm.org_apidesign_vm4brwsr_VMLazy(false).\n" + " reload__Ljava_lang_Object_2Ljava_lang_Object_2Ljava_lang_String_2_3Ljava_lang_Object_2_3B(loader, name, args, byteCode);\n"