add a_constructor

Author: Simn

src/core/abstract.ml

@@ -155,7 +155,7 @@ let rec follow_with_forward_ctor ?(build=false) t = match follow t with
 	| TAbstract(a,tl) as t ->
 		if build then build_abstract a;
 		if Meta.has Meta.ForwardNew a.a_meta && not (match a.a_impl with
-			| Some c -> PMap.mem "_hx_new" c.cl_statics
+			| Some c -> a.a_constructor <> None
 			| None -> false
 		) then
 			follow_with_forward_ctor (get_underlying_type ~return_first:true a tl)

src/core/display/completionItem.ml

@@ -182,14 +182,11 @@ module CompletionModuleType = struct
 			raise Exit
 
 	let of_module_type mt =
-		let actor a = match a.a_impl with
-			| None -> No
-			| Some c ->
-				try
-					let cf = PMap.find "_hx_new" c.cl_statics in
-					if (has_class_flag c CExtern) || (has_class_field_flag cf CfPublic) then Yes else YesButPrivate
-				with Not_found ->
-					No
+		let actor a = match a.a_impl,a.a_constructor with
+			| Some c,Some cf ->
+				if (has_class_flag c CExtern) || (has_class_field_flag cf CfPublic) then Yes else YesButPrivate
+			| _ ->
+				No
 		in
 		let ctor c =
 			try

src/core/tFunctions.ml

@@ -299,6 +299,7 @@ let null_abstract = {
 	a_read = None;
 	a_write = None;
 	a_call = None;
+	a_constructor = None;
 	a_extern = false;
 	a_enum = false;
 }

src/core/tOther.ml

@@ -300,6 +300,7 @@ let mk_abstract m path pos name_pos =
 		a_this = mk_mono();
 		a_read = None;
 		a_write = None;
+		a_constructor = None;
 		a_extern = false;
 		a_enum = false;
 		a_call = None;

src/core/tType.ml

@@ -382,6 +382,7 @@ and tabstract = {
 	mutable a_read : tclass_field option;
 	mutable a_write : tclass_field option;
 	mutable a_call : tclass_field option;
+	mutable a_constructor : tclass_field option;
 	mutable a_extern : bool;
 	mutable a_enum : bool;
 }

src/typing/fieldAccess.ml

@@ -163,8 +163,15 @@ let get_constructor_access c tl p =
 			| _ -> c, tl
 		in
 		let cf, fh = match c.cl_kind with
-			| KAbstractImpl a -> PMap.find "_hx_new" c.cl_statics, FHAbstract(a,tl,c)
-			| _ -> Type.get_constructor c, FHInstance(c,tl)
+			| KAbstractImpl a ->
+				begin match a.a_constructor with
+					| None ->
+						raise Not_found
+					| Some cf ->
+					cf,FHAbstract(a,tl,c)
+				end
+			| _ ->
+				Type.get_constructor c, FHInstance(c,tl)
 		in
 		create e_static cf fh false p
 	with Not_found ->

src/typing/typeloadFields.ml

@@ -929,6 +929,7 @@ let create_variable (ctx,cctx,fctx) c f cf t eo p =
 	cf
 
 let check_abstract (ctx,cctx,fctx) a c cf fd t ret p =
+	if fctx.is_abstract_constructor then a.a_constructor <- Some cf;
 	let m = mk_mono() in
 	let ta = TAbstract(a,List.map (fun _ -> mk_mono()) a.a_params) in
 	let tthis = if fctx.is_abstract_member || Meta.has Meta.To cf.cf_meta then monomorphs a.a_params a.a_this else a.a_this in

src/typing/typeloadModule.ml

@@ -197,6 +197,7 @@ module ModuleLevel = struct
 						a_read = None;
 						a_write = None;
 						a_call = None;
+						a_constructor = None;
 						a_extern = List.mem AbExtern d.d_flags;
 						a_enum = List.mem AbEnum d.d_flags || p_enum_meta <> None;
 					} in

src/typing/typerDisplay.ml

@@ -619,7 +619,7 @@ let handle_display ctx e_ast dk mode with_type =
 						| TClassDecl c -> has_constructor c
 						| TAbstractDecl a -> (match Abstract.follow_with_forward_ctor ~build:true (TAbstract(a,extract_param_types a.a_params)) with
 							| TInst(c,_) -> has_constructor c
-							| TAbstract({a_impl = Some c},_) -> PMap.mem "_hx_new" c.cl_statics
+							| TAbstract(a,_) -> a.a_constructor <> None
 							| _ -> false)
 						| _ -> false
 						end