Multiparameter static methods with JavaScriptBody work now emul
authorJaroslav Tulach <jaroslav.tulach@apidesign.org>
Thu, 11 Oct 2012 04:11:42 -0700
branchemul
changeset 9967e892757752
parent 98 9fb17a3cbbb6
child 100 029e6eed60e9
Multiparameter static methods with JavaScriptBody work now
vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java
vm/src/test/java/org/apidesign/vm4brwsr/StaticMethod.java
vm/src/test/java/org/apidesign/vm4brwsr/StaticMethodTest.java
     1.1 --- a/vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java	Wed Oct 10 16:49:45 2012 -0700
     1.2 +++ b/vm/src/main/java/org/apidesign/vm4brwsr/ByteCodeToJavaScript.java	Thu Oct 11 04:11:42 2012 -0700
     1.3 @@ -950,6 +950,7 @@
     1.4                  out.append(names[index]);
     1.5                  final String desc = findDescriptor(args.get(i).getDescriptor());
     1.6                  index++;
     1.7 +                space = ",";
     1.8              }
     1.9              out.append(") {").append("\n");
    1.10              out.append(body);
     2.1 --- a/vm/src/test/java/org/apidesign/vm4brwsr/StaticMethod.java	Wed Oct 10 16:49:45 2012 -0700
     2.2 +++ b/vm/src/test/java/org/apidesign/vm4brwsr/StaticMethod.java	Thu Oct 11 04:11:42 2012 -0700
     2.3 @@ -95,9 +95,9 @@
     2.4      }
     2.5      
     2.6      @JavaScriptBody(
     2.7 -        args="i", body="return i.toString();"
     2.8 +        args={"i","j"}, body="return (i + j).toString();"
     2.9      )
    2.10 -    public static String i2s(int i) {
    2.11 +    public static String i2s(int i, int j) {
    2.12          throw new IllegalStateException();
    2.13      }
    2.14      
     3.1 --- a/vm/src/test/java/org/apidesign/vm4brwsr/StaticMethodTest.java	Wed Oct 10 16:49:45 2012 -0700
     3.2 +++ b/vm/src/test/java/org/apidesign/vm4brwsr/StaticMethodTest.java	Thu Oct 11 04:11:42 2012 -0700
     3.3 @@ -187,9 +187,9 @@
     3.4      @Test public void javaScriptBody() throws Exception {
     3.5          assertExec(
     3.6              "JavaScript string",
     3.7 -            "org_apidesign_vm4brwsr_StaticMethod_i2sLjava_lang_StringI",
     3.8 +            "org_apidesign_vm4brwsr_StaticMethod_i2sLjava_lang_StringII",
     3.9              "333",
    3.10 -            333
    3.11 +            330, 3
    3.12          );
    3.13      }
    3.14