Browse Source

[cpp] Add a bit more control over cppia script running order

Hugh 9 years ago
parent
commit
c4825bed47
2 changed files with 39 additions and 2 deletions
  1. 6 2
      std/cpp/cppia/Host.hx
  2. 33 0
      std/cpp/cppia/Module.hx

+ 6 - 2
std/cpp/cppia/Host.hx

@@ -27,7 +27,9 @@ class Host
 {
    public static function run(source:String)
    {
-      untyped __global__.__scriptable_load_cppia(source);
+      var module = Module.fromString(source);
+      module.boot();
+      module.run();
    }
 
    public static function runFile(filename:String)
@@ -49,7 +51,9 @@ class Host
       else
       {
          var source = sys.io.File.getContent(script);
-         run(source);
+         var module = Module.fromString(source);
+         module.boot();
+         module.run();
       }
    }
 }

+ 33 - 0
std/cpp/cppia/Module.hx

@@ -0,0 +1,33 @@
+/*
+ * Copyright (C)2005-2016 Haxe Foundation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+package cpp.cppia;
+
+
+@:native("hx::CppiaLoadedModule")
+extern class Module
+{
+   @:native("__scriptable_cppia_from_string")
+   public static function fromString(sourceCode:String) : Module;
+   public function boot():Void;
+   public function run():Void;
+}
+