# HG changeset patch # User Jaroslav Tulach # Date 1357226421 -3600 # Node ID 21da8e2f591180cbf0ff40288e5ef122d96b3055 # Parent dd2f85a6bbba8e793dbaa41ee3931011afe27749# Parent b2f68438b0e22189a18ff161a917213bad120ed2 Merging Lubo's fix in as all tests continue to pass diff -r dd2f85a6bbba -r 21da8e2f5911 vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java --- a/vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java Thu Jan 03 11:13:40 2013 +0100 +++ b/vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java Thu Jan 03 16:20:21 2013 +0100 @@ -1249,6 +1249,7 @@ returnType[0] = 'L'; } i = next + 1; + array = false; continue; case '[': array = true; diff -r dd2f85a6bbba -r 21da8e2f5911 vm/src/main/java/org/apidesign/vm4brwsr/VM.java --- a/vm/src/main/java/org/apidesign/vm4brwsr/VM.java Thu Jan 03 11:13:40 2013 +0100 +++ b/vm/src/main/java/org/apidesign/vm4brwsr/VM.java Thu Jan 03 16:20:21 2013 +0100 @@ -122,7 +122,7 @@ + " if (fn) return fn(false);\n" + " if (!args[0]) throw 'bck2brwsr initialized without loader function, cannot load ' + name;\n" + " return vm.org_apidesign_vm4brwsr_VMLazy(false).\n" - + " load___3Ljava_lang_Object_2Ljava_lang_Object_2Ljava_lang_String_2_3Ljava_lang_Object_2(loader, name, args);\n" + + " load__Ljava_lang_Object_2Ljava_lang_Object_2Ljava_lang_String_2_3Ljava_lang_Object_2(loader, name, args);\n" + " }\n" + " if (args[0]) vm.loadClass = loader.loadClass;\n" + " return loader;\n"