rt/vm/src/main/java/org/apidesign/vm4brwsr/VM.java
branchclosure
changeset 1558 0c5a8b83182a
parent 1550 cb9e273dfd51
child 1575 08c8821c962d
     1.1 --- a/rt/vm/src/main/java/org/apidesign/vm4brwsr/VM.java	Wed May 07 17:24:29 2014 +0200
     1.2 +++ b/rt/vm/src/main/java/org/apidesign/vm4brwsr/VM.java	Sun May 11 23:06:45 2014 +0200
     1.3 @@ -98,7 +98,7 @@
     1.4          }
     1.5          
     1.6          for (String r : asBinary.toArray()) {
     1.7 -            append("\n  ").append(getExportsObject()).append(".registerResource('");
     1.8 +            append("\n  ").append(getExportsObject()).append("['registerResource']('");
     1.9              append(r).append("', '");
    1.10              InputStream is = this.resources.get(r);
    1.11              byte[] arr = new byte[is.available()];
    1.12 @@ -522,7 +522,7 @@
    1.13                  + "    for (var i = 0; i < extensions.length; ++i) {\n"
    1.14                  + "      extensions[i](vm);\n"
    1.15                  + "    }\n"
    1.16 -                + "    vm.registerResource = null;\n"
    1.17 +                + "    vm['registerResource'] = null;\n"
    1.18                  + "    var knownExtensions = extensions.length;\n"
    1.19                  + "    var loader = {};\n"
    1.20                  + "    loader.vm = vm;\n"
    1.21 @@ -535,9 +535,9 @@
    1.22                  + "          load__Ljava_lang_Object_2Ljava_lang_Object_2Ljava_lang_String_2_3Ljava_lang_Object_2(loader, name, args);\n"
    1.23                  + "      } catch (err) {\n"
    1.24                  + "        while (knownExtensions < extensions.length) {\n"
    1.25 -                + "          vm.registerResource = registerResource;\n"
    1.26 +                + "          vm['registerResource'] = registerResource;\n"
    1.27                  + "          extensions[knownExtensions++](vm);\n"
    1.28 -                + "          vm.registerResource = null;\n"
    1.29 +                + "          vm['registerResource'] = null;\n"
    1.30                  + "        }\n"
    1.31                  + "        fn = vm[attr];\n"
    1.32                  + "        if (fn) return fn(false);\n"
    1.33 @@ -568,9 +568,9 @@
    1.34                  + "        loadBytes___3BLjava_lang_Object_2Ljava_lang_String_2_3Ljava_lang_Object_2I(loader, name, args, skip);\n"
    1.35                  + "      if (ret !== null) return ret;\n"
    1.36                  + "      while (knownExtensions < extensions.length) {\n"
    1.37 -                + "        vm.registerResource = registerResource;\n"
    1.38 +                + "        vm['registerResource'] = registerResource;\n"
    1.39                  + "        extensions[knownExtensions++](vm);\n"
    1.40 -                + "        vm.registerResource = null;\n"
    1.41 +                + "        vm['registerResource'] = null;\n"
    1.42                  + "      }\n"
    1.43                  + "      var arr = resources[name];\n"
    1.44                  + "      return (arr && arr.length > arrSize) ? arr[arrSize] : null;\n"