[cpp] Gencpp Rework Mk II

src/generators/cpp/cppAst.ml

@@ -1,6 +1,45 @@
 open Type
 open Globals
 
+module PathMap = Map.Make(struct type t = path let compare i1 i2 = String.compare (s_type_path i2) (s_type_path i1) end)
+
+module ObjectIds = struct
+  type t = {
+    ids : int32 PathMap.t;
+    cache : unit Int32Map.t;
+  }
+
+  let empty = { ids = PathMap.empty; cache = Int32Map.empty }
+
+  let add path id store =
+    { ids = PathMap.add path id store.ids; cache = Int32Map.add id () store.cache }
+
+  let find_opt path store =
+    PathMap.find_opt path store.ids
+
+  let collision id store =
+    Int32Map.mem id store.cache
+end
+
+module InterfaceSlots = struct
+  type t = {
+    hash : int StringMap.t;
+    next : int;
+  }
+
+  let empty = { hash = StringMap.empty; next = 2 }
+
+  let add name slots =
+    match StringMap.find_opt name slots.hash with
+    | Some slot ->
+      slots
+    | None ->
+      { hash = StringMap.add name slots.next slots.hash; next = slots.next + 1 }
+
+  let find_opt name slots =
+    StringMap.find_opt name slots.hash
+end
+
 type tcpp =
   | TCppDynamic
   | TCppUnchanged
@@ -44,7 +83,7 @@ and tcpp_closure = {
   close_args : (tvar * texpr option) list;
   close_expr : tcppexpr;
   close_id : int;
-  close_undeclared : (string, tvar) Hashtbl.t;
+  close_undeclared : tvar StringMap.t;
   close_this : tcppthis option;
 }
 
@@ -152,3 +191,109 @@ and tcpp_expr_expr =
   | CppCastObjCBlock of tcppexpr * tcpp list * tcpp
   | CppCastProtocol of tcppexpr * tclass
   | CppCastNative of tcppexpr
+
+and tcpp_class_container =
+  | Current (* If the current class holds GC variables *)
+  | Parent (* If one of the current classes parents holds GC variables *)
+
+and tcpp_class_flags =
+  | QuickAlloc
+  | Scriptable
+  | MemberGet
+  | MemberSet
+  | StaticGet
+  | StaticSet
+  | GetFields
+  | Compare
+  | Boot
+
+and tcpp_class_function = {
+  tcf_field : tclass_field;
+  tcf_name : string;
+  tcf_func : tfunc;
+
+  tcf_is_virtual : bool;
+  tcf_is_reflective : bool;
+  tcf_is_external : bool;
+  tcf_is_scriptable : bool;
+  tcf_is_overriding : bool;
+}
+
+and tcpp_class_variable = {
+  tcv_field : tclass_field;
+  tcv_name : string;
+  tcv_type : t;
+  tcv_default : texpr option;
+
+  tcv_is_stackonly : bool;
+  tcv_is_gc_element : bool;
+  tcv_is_reflective : bool;
+}
+
+and tcpp_class = {
+  tcl_class : tclass;
+  tcl_params : tparams;
+  tcl_name : string;
+  tcl_id : int32;
+  tcl_flags : int;
+  tcl_debug_level : int;
+  tcl_super : tcpp_class option;
+  tcl_container : tcpp_class_container option;
+
+  tcl_haxe_interfaces : tcpp_interface list;
+  tcl_native_interfaces : tcpp_interface list;
+
+  tcl_static_variables : tcpp_class_variable list;
+  tcl_static_properties : tcpp_class_variable list;
+  tcl_static_functions : tcpp_class_function list;
+  tcl_static_dynamic_functions : tcpp_class_function list;
+
+  tcl_variables : tcpp_class_variable list;
+  tcl_properties : tcpp_class_variable list;
+  tcl_functions : tcpp_class_function list;
+  tcl_dynamic_functions : tcpp_class_function list;
+
+  tcl_meta : texpr option;
+  tcl_rtti : texpr option;
+  tcl_init : texpr option;
+}
+
+and tcpp_interface_function = {
+  iff_field : tclass_field;
+  iff_name : string;
+  iff_args : (string * bool * t) list;
+  iff_return : t;
+  iff_script_slot : int option;
+}
+
+and tcpp_interface = {
+  if_class : tclass;
+  if_name : string;
+  if_hash : string;
+  if_debug_level : int;
+  if_functions : tcpp_interface_function list;
+  if_variables : tclass_field list;
+  if_extends : tcpp_interface option;
+  if_meta : texpr option;
+  if_rtti : texpr option;
+  if_scriptable : bool;
+}
+
+and tcpp_enum_field = {
+  tef_field : tenum_field;
+  tef_name : string;
+  tef_hash : string;
+}
+
+and tcpp_enum = {
+  te_enum : tenum;
+  te_id : int32;
+  te_constructors : tcpp_enum_field list;
+}
+
+and tcpp_decl =
+  | ManagedClass of tcpp_class
+  | NativeClass of tcpp_class
+  | ManagedInterface of tcpp_interface
+  | NativeInterface of tcpp_interface
+  | Enum of tcpp_enum

src/generators/cpp/cppAstTools.ml

@@ -6,6 +6,8 @@ open CppTypeUtils
 
 let follow = Abstract.follow_with_abstracts
 
+let string_map_of_list bs = List.fold_left (fun m (k, v) -> StringMap.add k v m) StringMap.empty bs
+
 (*
    A class_path is made from a package (array of strings) and a class name.
    Join these together, inclding a separator.  eg, "/" for includes : pack1/pack2/Name or "::"
@@ -588,6 +590,19 @@ and array_element_type haxe_type =
    | _ -> "::Dynamic"
 
 and cpp_function_signature tfun abi =
+   let gen_interface_arg_type_name name opt typ =
+      let type_str = (type_string typ) in
+      (* type_str may have already converted Null<X> to Dynamic because of NotNull tag ... *)
+      (if (opt && (cant_be_null typ) && type_str<>"Dynamic" ) then
+         "::hx::Null< " ^ type_str ^ " > "
+      else
+         type_str ) ^ " " ^ (keyword_remap name)
+   in
+
+   let gen_tfun_interface_arg_list args =
+      String.concat "," (List.map (fun (name,opt,typ) -> gen_interface_arg_type_name name opt typ) args)
+   in
+
    match follow tfun with
    | TFun(args,ret) -> (type_string ret) ^ " " ^ abi ^ "(" ^ (gen_tfun_interface_arg_list args) ^ ")"
    | _ -> "void *"
@@ -600,18 +615,7 @@ and cpp_function_signature_params params = match params with
    | _ ->
       print_endline ("Params:" ^ (String.concat "," (List.map type_string params) ));
       die "" __LOC__;
-
-and gen_interface_arg_type_name name opt typ =
-   let type_str = (type_string typ) in
-   (* type_str may have already converted Null<X> to Dynamic because of NotNull tag ... *)
-   (if (opt && (cant_be_null typ) && type_str<>"Dynamic" ) then
-      "::hx::Null< " ^ type_str ^ " > "
-   else
-      type_str ) ^ " " ^ (keyword_remap name)
-
-and gen_tfun_interface_arg_list args =
-   String.concat "," (List.map (fun (name,opt,typ) -> gen_interface_arg_type_name name opt typ) args)
-
+
 and cant_be_null haxe_type =
    is_numeric haxe_type || (type_has_meta_key Meta.NotNull haxe_type )
 
@@ -725,3 +729,37 @@ let enum_getter_type t =
   | TCppScalar "bool"  -> "Bool"
   | TCppScalar x  -> x
   | _  -> "Object"
+
+let int_of_tcpp_class_flag (flag:tcpp_class_flags) =
+   Obj.magic flag
+
+let set_tcpp_class_flag flags c =
+   set_flag flags (int_of_tcpp_class_flag c)
+
+let has_tcpp_class_flag c flag =
+   has_flag c.tcl_flags (int_of_tcpp_class_flag flag)
+
+let all_interface_functions tcpp_interface =
+   let add_interface_functions existing interface =
+      let folder acc cur =
+         if List.exists (fun f -> f.iff_name = cur.iff_name) acc then
+            acc
+         else
+            cur :: acc
+         in
+      List.fold_left folder existing interface.if_functions
+   in
+
+   let rec visit_interface existing interface =
+      let initial =
+         match interface.if_extends with
+         | None ->
+            existing
+         | Some super ->
+            visit_interface existing super
+      in
+
+      add_interface_functions initial interface
+   in
+
+   visit_interface [] tcpp_interface |> List.rev

src/generators/cpp/cppContext.ml

@@ -1,4 +1,6 @@
 open Gctx
+open Globals
+open Type
 open CppAstTools
 
 (* CPP code generation context *)
@@ -17,20 +19,19 @@ type context = {
   mutable ctx_debug_level : int;
   (* cached as required *)
   mutable ctx_file_info : (string, string) PMap.t ref;
-  ctx_type_ids : (string, Int32.t) Hashtbl.t;
   (* Per file *)
   ctx_output : string -> unit;
   ctx_writer : CppSourceWriter.source_writer;
   ctx_file_id : int ref;
   ctx_is_header : bool;
-  ctx_interface_slot : (string, int) Hashtbl.t ref;
-  ctx_interface_slot_count : int ref;
+  ctx_super_deps : path list CppAst.PathMap.t;
+  ctx_constructor_deps : tclass_field CppAst.PathMap.t;
+  ctx_class_member_types : string StringMap.t;
   (* This is for returning from the child nodes of TSwitch && TTry *)
   mutable ctx_real_this_ptr : bool;
-  mutable ctx_class_member_types : (string, string) Hashtbl.t;
 }
 
-let new_context common_ctx debug file_info member_types =
+let new_context common_ctx debug file_info member_types super_deps constructor_deps =
   let null_file =
     new CppSourceWriter.source_writer common_ctx ignore ignore (fun () -> ())
   in
@@ -40,18 +41,17 @@ let new_context common_ctx debug file_info member_types =
       ctx_common = common_ctx;
       ctx_writer = null_file;
       ctx_file_id = ref (-1);
-      ctx_type_ids = Hashtbl.create 0;
       ctx_is_header = false;
       ctx_output = null_file#write;
-      ctx_interface_slot = ref (Hashtbl.create 0);
-      ctx_interface_slot_count = ref 2;
       ctx_debug_level =
         (if has_def Define.AnnotateSource then 3
          else if has_def Define.HxcppDebugger then 2
          else debug);
       ctx_real_this_ptr = true;
       ctx_class_member_types = member_types;
       ctx_file_info = file_info;
+      ctx_super_deps = super_deps;
+      ctx_constructor_deps = constructor_deps;
     }
   in
   result