1.1 --- a/vm/src/main/java/org/apidesign/vm4brwsr/GenJS.java Thu Dec 06 21:54:40 2012 +0100
1.2 +++ b/vm/src/main/java/org/apidesign/vm4brwsr/GenJS.java Thu Dec 06 22:02:10 2012 +0100
1.3 @@ -114,7 +114,7 @@
1.4 }
1.5 out.append(
1.6 " global.bck2brwsr = function() { return {\n"
1.7 - + " loadClass : function(name) { return vm[name](true); }\n"
1.8 + + " loadClass : function(name) { return vm[name.replace__Ljava_lang_String_2CC(name, '.','_')](true); }\n"
1.9 + " };\n};\n");
1.10 out.append("}(this));");
1.11 }
2.1 --- a/vm/src/test/java/org/apidesign/vm4brwsr/CompareVMs.java Thu Dec 06 21:54:40 2012 +0100
2.2 +++ b/vm/src/test/java/org/apidesign/vm4brwsr/CompareVMs.java Thu Dec 06 22:02:10 2012 +0100
2.3 @@ -127,7 +127,7 @@
2.4 try {
2.5 compileTheCode(m.getDeclaringClass());
2.6 Object vm = code.invokeFunction("bck2brwsr");
2.7 - Object inst = code.invokeMethod(vm, "loadClass", m.getDeclaringClass().getName().replace('.', '_'));
2.8 + Object inst = code.invokeMethod(vm, "loadClass", m.getDeclaringClass().getName());
2.9 value = code.invokeMethod(inst, m.getName() + "__I");
2.10 } catch (Exception ex) {
2.11 throw new AssertionError(StaticMethodTest.dumpJS(codeSeq)).initCause(ex);
3.1 --- a/vm/src/test/java/org/apidesign/vm4brwsr/NumberTest.java Thu Dec 06 21:54:40 2012 +0100
3.2 +++ b/vm/src/test/java/org/apidesign/vm4brwsr/NumberTest.java Thu Dec 06 22:02:10 2012 +0100
3.3 @@ -162,7 +162,7 @@
3.4 Object ret = null;
3.5 try {
3.6 ret = code.invokeFunction("bck2brwsr");
3.7 - ret = code.invokeMethod(ret, "loadClass", clazz.getName().replace('.', '_'));
3.8 + ret = code.invokeMethod(ret, "loadClass", clazz.getName());
3.9 ret = code.invokeMethod(ret, method, args);
3.10 } catch (ScriptException ex) {
3.11 fail("Execution failed in\n" + StaticMethodTest.dumpJS(codeSeq), ex);
4.1 --- a/vm/src/test/java/org/apidesign/vm4brwsr/StaticMethodTest.java Thu Dec 06 21:54:40 2012 +0100
4.2 +++ b/vm/src/test/java/org/apidesign/vm4brwsr/StaticMethodTest.java Thu Dec 06 22:02:10 2012 +0100
4.3 @@ -263,7 +263,7 @@
4.4 Object ret = null;
4.5 try {
4.6 ret = toRun.invokeFunction("bck2brwsr");
4.7 - ret = toRun.invokeMethod(ret, "loadClass", clazz.getName().replace('.', '_'));
4.8 + ret = toRun.invokeMethod(ret, "loadClass", clazz.getName());
4.9 ret = toRun.invokeMethod(ret, method, args);
4.10 } catch (ScriptException ex) {
4.11 fail("Execution failed in\n" + dumpJS(theCode), ex);