Browse Source

minor fixes

Nicolas Cannasse 17 years ago
parent
commit
18889c154f
2 changed files with 5 additions and 2 deletions
  1. 1 0
      genswf.ml
  2. 4 2
      genswf9.ml

+ 1 - 0
genswf.ml

@@ -68,6 +68,7 @@ let build_movieclip ctx (pack,name) =
 	let name = HMPath (pack,name) in
 	let name = HMPath (pack,name) in
 	let mc = HMPath (["flash";"display"],"MovieClip") in
 	let mc = HMPath (["flash";"display"],"MovieClip") in
 	let c = {
 	let c = {
+		hlc_index = 0;
 		hlc_name = name;
 		hlc_name = name;
 		hlc_super = Some mc;
 		hlc_super = Some mc;
 		hlc_sealed = false;
 		hlc_sealed = false;

+ 4 - 2
genswf9.ml

@@ -495,7 +495,7 @@ let end_fun ctx args tret =
 		| Some l -> dparams := Some (HVNone :: l)
 		| Some l -> dparams := Some (HVNone :: l)
 	) args;
 	) args;
 	{
 	{
-		hlmt_mark = As3hlparse.alloc_mark();
+		hlmt_index = 0;
 		hlmt_ret = type_void ctx tret;
 		hlmt_ret = type_void ctx tret;
 		hlmt_args = List.map (fun (_,_,t) -> type_opt ctx t) args;
 		hlmt_args = List.map (fun (_,_,t) -> type_opt ctx t) args;
 		hlmt_native = false;
 		hlmt_native = false;
@@ -1556,6 +1556,7 @@ let generate_class ctx c =
 		| Some (c,_) -> is_dynamic c
 		| Some (c,_) -> is_dynamic c
 	in
 	in
 	{
 	{
+		hlc_index = 0;
 		hlc_name = name;
 		hlc_name = name;
 		hlc_super = (if c.cl_interface then None else Some (type_path ctx (match c.cl_super with None -> [],"Object" | Some (c,_) -> c.cl_path)));
 		hlc_super = (if c.cl_interface then None else Some (type_path ctx (match c.cl_super with None -> [],"Object" | Some (c,_) -> c.cl_path)));
 		hlc_sealed = not (is_dynamic c);
 		hlc_sealed = not (is_dynamic c);
@@ -1636,6 +1637,7 @@ let generate_enum ctx e =
 		} :: acc
 		} :: acc
 	) e.e_constrs [] in
 	) e.e_constrs [] in
 	{
 	{
+		hlc_index = 0;
 		hlc_name = name_id;
 		hlc_name = name_id;
 		hlc_super = Some (type_path ctx ([],"Object"));
 		hlc_super = Some (type_path ctx ([],"Object"));
 		hlc_sealed = true;
 		hlc_sealed = true;
@@ -1665,7 +1667,7 @@ let generate_enum ctx e =
 		hlc_static_fields = Array.of_list ({
 		hlc_static_fields = Array.of_list ({
 			hlf_name = ident "__isenum";
 			hlf_name = ident "__isenum";
 			hlf_slot = !st_count + 2;
 			hlf_slot = !st_count + 2;
-			hlf_kind = HFVar { hlv_type = None; hlv_value = HVBool true; hlv_const = true; };
+			hlf_kind = HFVar { hlv_type = Some (HMPath ([],"Boolean")); hlv_value = HVBool true; hlv_const = true; };
 			hlf_metas = None;
 			hlf_metas = None;
 		} :: {
 		} :: {
 			hlf_name = ident "__constructs__";
 			hlf_name = ident "__constructs__";