Browse Source

minor issues fixes

Nicolas Cannasse 13 years ago
parent
commit
d2c707be5a
1 changed files with 2 additions and 2 deletions
  1. 2 2
      genas3.ml

+ 2 - 2
genas3.ml

@@ -85,7 +85,7 @@ let reserved =
 	(* AS3 keywords which are not haXe ones *)
 	"each";"label";"finally";"with";"final";"internal";"native";"const";"namespace";"include";"delete";
 	(* some globals give some errors with Flex SDK as well *)
-	"print";
+	"print";"trace";
 	(* we don't include get+set since they are not 'real' keywords, but they can't be used as method names *)
 	];
 	h
@@ -859,7 +859,7 @@ let generate_field ctx static f =
 			print ctx "]";
 		| _ -> ()
 	) f.cf_meta;
-	let public = f.cf_public || Hashtbl.mem ctx.get_sets (f.cf_name,static) || (f.cf_name = "main" && static) || f.cf_name = "resolve" in
+	let public = f.cf_public || Hashtbl.mem ctx.get_sets (f.cf_name,static) || (f.cf_name = "main" && static) || f.cf_name = "resolve" || has_meta ":public" f.cf_meta in
 	let rights = (if static then "static " else "") ^ (if public then "public" else "protected") in
 	let p = ctx.curclass.cl_pos in
 	match f.cf_expr, f.cf_kind with