Ver código fonte

Merge remote-tracking branch 'origin/development' into travis

Andy Li 11 anos atrás
pai
commit
37d73c63d3
2 arquivos alterados com 8 adições e 2 exclusões
  1. 7 1
      genjs.ml
  2. 1 1
      std/flash8/Boot.hx

+ 7 - 1
genjs.ml

@@ -1105,7 +1105,13 @@ let alloc_ctx com =
 		separator = false;
 		found_expose = false;
 	} in
-	ctx.type_accessor <- (fun t -> s_path ctx (t_path t));
+	ctx.type_accessor <- (fun t -> 
+		let p = t_path t in
+		match t with
+		| TClassDecl { cl_extern = true } 
+		| TEnumDecl { e_extern = true }
+			-> dot_path p
+		| _ -> s_path ctx p);
 	ctx
 
 let gen_single_expr ctx e expr =

+ 1 - 1
std/flash8/Boot.hx

@@ -27,7 +27,7 @@ class Boot {
 	private static var def_color = 0;
 	private static var exception = null;
 
-	private static function __string_rec(o : Dynamic,s : String) {
+	public static function __string_rec(o : Dynamic,s : String) {
 		untyped {
 			if( s.length >= 20 )
 				return "<...>"; // too much deep recursion