move interface static implementations out of the header

Author: Aidan63

src/generators/cpp/gen/cppGenClassHeader.ml

@@ -87,19 +87,18 @@ let gen_class_header ctx tcpp_class h_file scriptable parents =
       else h_file#add_include klass.cl_path
   | _ -> ());
 
-  (* And any interfaces ... *)
+  (* And any native interfaces ... *)
   List.iter
-    (fun imp ->
-      let interface = fst imp in
+    (fun interface ->
       let include_files =
-        get_all_meta_string_path interface.cl_meta Meta.Include
+        get_all_meta_string_path interface.if_class.cl_meta Meta.Include
       in
       if List.length include_files > 0 then
         List.iter
           (fun inc -> h_file#add_include (path_of_string inc))
           include_files
-      else h_file#add_include interface.cl_path)
-    (real_interfaces tcpp_class.tcl_class.cl_implements);
+      else h_file#add_include interface.if_class.cl_path)
+    tcpp_class.tcl_native_interfaces;
 
   (* Only need to forward-declare classes that are mentioned in the header file
      (ie, not the implementation) *)
@@ -325,7 +324,7 @@ let generate_managed_header base_ctx tcpp_class =
     let alreadyGlued = Hashtbl.create 0 in
     List.iter
       (fun src ->
-        let rec check_interface (interface:tcpp_interface) =
+        let rec check_interface interface =
           let check_field func =
             let cast = cpp_tfun_signature false func.iff_args func.iff_return in
             let class_implementation = find_class_implementation func tcpp_class

src/generators/cpp/gen/cppGenInterfaceHeader.ml

@@ -32,21 +32,10 @@ let gen_function ctx interface func =
   let output       = ctx.ctx_output in
   let argList      = print_tfun_arg_list true func.iff_args in
   let returnType   = type_to_string func.iff_return in
-  let returnStr    = if returnType = "void" then "" else "return " in
   let commaArgList = if argList = "" then argList else "," ^ argList in
-  let cast = Printf.sprintf "::hx::interface_cast< ::%s_obj *>" (join_class_path_remap interface.if_class.cl_path "::") in
 
   Printf.sprintf "\t\t%s (::hx::Object :: *_hx_%s)(%s);\n" returnType func.iff_name argList |> output;
-  Printf.sprintf "\t\tstatic inline %s %s( ::Dynamic _hx_%s ){\n" returnType func.iff_name commaArgList |> output;
-  output "\t\t\t#ifdef HXCPP_CHECK_POINTER\n";
-  output "\t\t\tif (::hx::IsNull(_hx_)) ::hx::NullReference(\"Object\", false);\n";
-  output "\t\t\t#ifdef HXCPP_GC_CHECK_POINTER\n";
-  output "\t\t\t\tGCCheckPointer(_hx_.mPtr);\n";
-  output "\t\t\t#endif\n";
-  output "\t\t\t#endif\n";
-  Printf.sprintf
-    "\t\t\t%s( _hx_.mPtr->*( %s(_hx_.mPtr->_hx_getInterface(%s)))->_hx_%s )(%s);\n\t\t}\n"
-    returnStr cast interface.if_hash func.iff_name (print_arg_names func.iff_args) |> output
+  Printf.sprintf "\t\tstatic %s %s( ::Dynamic _hx_%s );\n" returnType func.iff_name commaArgList |> output
 
 let gen_includes h_file interface_def =
   let add_class_includes cls =

src/generators/cpp/gen/cppGenInterfaceImplementation.ml

@@ -104,6 +104,29 @@ let generate_managed_interface base_ctx tcpp_interface =
   begin_namespace output_cpp class_path;
   output_cpp "\n";
 
+  let gen_function func =
+    let argList      = print_tfun_arg_list true func.iff_args in
+    let returnType   = type_to_string func.iff_return in
+    let returnStr    = if returnType = "void" then "" else "return " in
+    let commaArgList = if argList = "" then argList else "," ^ argList in
+    let cast         = Printf.sprintf "::hx::interface_cast< %s *>" tcpp_interface.if_name in
+    
+    Printf.sprintf "%s %s::%s( ::Dynamic _hx_%s ) {\n" returnType tcpp_interface.if_name func.iff_name commaArgList |> output_cpp;
+    output_cpp "#ifdef HXCPP_CHECK_POINTER\n";
+    output_cpp "\tif (::hx::IsNull(_hx_)) ::hx::NullReference(\"Object\", false);\n";
+    output_cpp "#ifdef HXCPP_GC_CHECK_POINTER\n";
+    output_cpp "\tGCCheckPointer(_hx_.mPtr);\n";
+    output_cpp "#endif\n";
+    output_cpp "#endif\n";
+    Printf.sprintf
+      "\t%s( _hx_.mPtr->*( %s(_hx_.mPtr->_hx_getInterface(%s)))->_hx_%s )(%s);\n}\n"
+      returnStr cast tcpp_interface.if_hash func.iff_name (print_arg_names func.iff_args) |> output_cpp
+  in
+
+  all_interface_functions tcpp_interface |> List.iter gen_function;
+
+  output_cpp "\n";
+
   output_cpp (get_class_code tcpp_interface.if_class Meta.CppNamespaceCode);
 
   output_cpp "\n";