@@ -16,7 +16,6 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*)
-open Extlib_leftovers
open Ast
open Type
open Globals
@@ -1,6 +1,5 @@
open Extlib_leftovers
-open Gctx
(**
Characters used for base64 VLQ encoding
@@ -1,7 +1,4 @@
-open Ast
-open Error
type tcpp =
@@ -154,4 +151,4 @@ and tcpp_expr_expr =
| CppCastObjC of tcppexpr * tclass
| CppCastObjCBlock of tcppexpr * tcpp list * tcpp
| CppCastProtocol of tcppexpr * tclass
- | CppCastNative of tcppexpr
+ | CppCastNative of tcppexpr
@@ -1,7 +1,5 @@
open CppAst
open CppTypeUtils
@@ -726,4 +724,4 @@ let enum_getter_type t =
| TCppScalar "int" -> "Int"
| TCppScalar "bool" -> "Bool"
| TCppScalar x -> x
- | _ -> "Object"
+ | _ -> "Object"
@@ -1,9 +1,4 @@
open Gctx
-open Type
-open Globals
open CppAstTools
(* CPP code generation context *)
@@ -98,4 +93,4 @@ let is_gc_element ctx member_type =
let strip_file ctx file = match Gctx.defined ctx Define.AbsolutePath with
| true -> Path.get_full_path file
- | false -> ctx.class_paths#relative_path file
+ | false -> ctx.class_paths#relative_path file
@@ -1,8 +1,4 @@
let rec remove_parens expression =
match expression.eexpr with
@@ -20,4 +16,4 @@ let rec remove_parens_cast expression =
let is_static_access obj =
match (remove_parens obj).eexpr with
| TTypeExpr _ -> true
- | _ -> false
+ | _ -> false
@@ -1,9 +1,7 @@
open Error
-open CppExprUtils
open CppStrings
@@ -185,4 +180,4 @@ let new_placed_cpp_file common_ctx class_path =
( base_dir ^ "/src/" ^ ( String.concat "-" (fst class_path) ) ^ "-" ^
(snd class_path) ^ (source_file_extension common_ctx) )
end else
- new_cpp_file common_ctx common_ctx.file class_path
+ new_cpp_file common_ctx common_ctx.file class_path
@@ -1,11 +1,7 @@
(* Various helper functions to run checks on haxe classes and various other ast types *)
(* functions in here operate on standard haxe ast types, not gencpp ast types *)
let follow = Abstract.follow_with_abstracts
@@ -354,4 +350,4 @@ let class_name class_def =
let nativeGen = Meta.has Meta.NativeGen class_def.cl_meta in
class_path ^ if nativeGen then "" else "_obj"
-let class_pointer class_def = "::hx::ObjectPtr< " ^ class_name class_def ^ " >"
+let class_pointer class_def = "::hx::ObjectPtr< " ^ class_name class_def ^ " >"
@@ -1,4 +1,3 @@
@@ -7,7 +6,6 @@ open CppExprUtils
-open CppSourceWriter
open CppContext
let cpp_type_of = CppRetyper.cpp_type_of
@@ -4,7 +4,6 @@ open Type
@@ -2045,4 +2044,4 @@ let dynamic_functions class_def =
when is_dynamic_haxe_method field ->
keyword_remap field.cf_name :: result
| _ -> result)
- [] class_def.cl_ordered_fields
+ [] class_def.cl_ordered_fields
@@ -3,7 +3,6 @@ open Type
@@ -549,4 +548,4 @@ let generate baseCtx class_def =
end_header_file output_h def_string;
- h_file#close
+ h_file#close
@@ -1389,4 +1388,4 @@ let generate baseCtx class_def =
^ "_delegate alloc] initWithImplementation:inImplementation.mPtr];\n");
output_cpp "}\n\n");
- cpp_file#close
+ cpp_file#close
@@ -1,11 +1,5 @@
-open CppTypeUtils
-open CppAst
open CppSourceWriter
@@ -1,13 +1,7 @@
(*
@@ -22,9 +22,7 @@ open Type
@@ -399,4 +397,4 @@ let generate common_ctx =
end else begin
let ctx = new_context common_ctx debug_level (ref PMap.empty) (create_member_types common_ctx) in
generate_source ctx
- end
+ end
@@ -24,7 +24,6 @@ open Error
-open NativeLibraries
let tag ?(ext=false) d = {
tid = 0;
@@ -22,7 +22,6 @@ open DisplayTypes.DisplayMode
open Common
open Typecore
-open Resolution