Browse Source

minor fixes

Nicolas Cannasse 17 years ago
parent
commit
2bf69e0a2e
2 changed files with 3 additions and 3 deletions
  1. 1 1
      genswf9.ml
  2. 2 2
      typeload.ml

+ 1 - 1
genswf9.ml

@@ -620,7 +620,7 @@ let begin_fun ctx args tret el stat p =
 					hltc_name = None;
 				}
 			) (List.rev ctx.trys));
-			hlf_locals = Array.of_list (List.map (fun (id,name,t) -> ident name, type_opt ctx t, id) ctx.block_vars);
+			hlf_locals = Array.of_list (List.map (fun (id,name,t) -> ident name, type_opt ctx t, id, false) ctx.block_vars);
 		} in
 		let mt = { (end_fun ctx args tret) with
 			hlmt_var_args = varargs;

+ 2 - 2
typeload.ml

@@ -344,8 +344,8 @@ let rec check_interface ctx c p intf params =
 	PMap.iter (fun i f ->
 		try
 			let t2, f2 = class_field_no_interf c i in
-			ignore(follow f.cf_type); (* force evaluation *)
-			let p = (match f.cf_expr with None -> p | Some e -> e.epos) in
+			ignore(follow f2.cf_type); (* force evaluation *)
+			let p = (match f2.cf_expr with None -> p | Some e -> e.epos) in
 			if f.cf_public && not f2.cf_public then
 				display_error ctx ("Field " ^ i ^ " should be public as requested by " ^ s_type_path intf.cl_path) p
 			else if not(unify_access f2.cf_get f.cf_get) then