Nicolas Cannasse пре 13 година
родитељ
комит
09d223dbbb
6 измењених фајлова са 10 додато и 10 уклоњено
  1. 1 1
      genas3.ml
  2. 1 1
      genphp.ml
  3. 1 1
      genswf.ml
  4. 2 2
      genswf9.ml
  5. 4 4
      interp.ml
  6. 1 1
      main.ml

+ 1 - 1
genas3.ml

@@ -82,7 +82,7 @@ let reserved =
 	List.iter (fun l -> Hashtbl.add h l ())
 	(* these ones are defined in order to prevent recursion in some Std functions *)
 	["is";"as";"int";"uint";"const";"getTimer";"typeof";"parseInt";"parseFloat";
-	(* AS3 keywords which are not haXe ones *)
+	(* 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";"trace";

+ 1 - 1
genphp.ml

@@ -2064,7 +2064,7 @@ let createmain com e =
 	} in
 
 	spr ctx "if(version_compare(PHP_VERSION, '5.1.0', '<')) {
-    exit('Your current PHP version is: ' . PHP_VERSION . '. haXe/PHP generates code for version 5.1.0 or later');
+    exit('Your current PHP version is: ' . PHP_VERSION . '. Haxe/PHP generates code for version 5.1.0 or later');
 }";
 	newline ctx;
 	newline ctx;

+ 1 - 1
genswf.ml

@@ -714,7 +714,7 @@ let build_swc_catalog com types =
 	"<?xml version=\"1.0\" encoding =\"utf-8\"?>\n" ^ Xml.to_string_fmt x
 
 let make_as3_public data =
-	(* set all protected+private fields to public - this will enable overriding/reflection in haXe classes *)
+	(* set all protected+private fields to public - this will enable overriding/reflection in Haxe classes *)
 	let ns = Array.mapi (fun i ns ->
 		match ns with
 		| A3NPrivate _

+ 2 - 2
genswf9.ml

@@ -292,8 +292,8 @@ let property ctx p t =
 		| _ -> as3 p, None, false);
 	| TInst ({ cl_path = [],"String" },_) ->
 		(match p with
-		| "length" (* Int in AS3/haXe *) -> ident p, None, false
-		| "charCodeAt" (* use haXe version *) -> ident p, None, true
+		| "length" (* Int in AS3/Haxe *) -> ident p, None, false
+		| "charCodeAt" (* use Haxe version *) -> ident p, None, true
 		| "cca" -> as3 "charCodeAt", None, false
 		| _ -> as3 p, None, false);
 	| TAnon a ->

+ 4 - 4
interp.ml

@@ -899,7 +899,7 @@ let std_lib =
 				let t = Unix.localtime (date d) in
 				VString (Printf.sprintf "%.4d-%.2d-%.2d %.2d:%.2d:%.2d" (t.tm_year + 1900) (t.tm_mon + 1) t.tm_mday t.tm_hour t.tm_min t.tm_sec)
 			| VString _ ->
-				exc (VString "Custom date format is not supported") (* use native haXe implementation *)
+				exc (VString "Custom date format is not supported") (* use native Haxe implementation *)
 			| _ ->
 				error()
 		);
@@ -1619,9 +1619,9 @@ let reg_lib =
 				| Some (pos,pend) -> VObject (obj (hash_field (get_ctx())) ["pos",VInt pos;"len",VInt (pend - pos)]))
 			| _ -> error()
 		);
-		(* regexp_replace : not used by haXe *)
-		(* regexp_replace_all : not used by haXe *)
-		(* regexp_replace_fun : not used by haXe *)
+		(* regexp_replace : not used by Haxe *)
+		(* regexp_replace_all : not used by Haxe *)
+		(* regexp_replace_fun : not used by Haxe *)
 	]
 
 (* ---------------------------------------------------------------------- *)

+ 1 - 1
main.ml

@@ -623,7 +623,7 @@ and do_connect host port args =
 
 and init ctx =
 	let usage = Printf.sprintf
-		"haXe Compiler %d.%.2d - (c)2005-2012 Motion-Twin\n Usage : haxe%s -main <class> [-swf|-js|-neko|-php|-cpp|-cs|-java|-as3] <output> [options]\n Options :"
+		"Haxe Compiler %d.%.2d - (c)2005-2012 Motion-Twin\n Usage : haxe%s -main <class> [-swf|-js|-neko|-php|-cpp|-cs|-java|-as3] <output> [options]\n Options :"
 		(version / 100) (version mod 100) (if Sys.os_type = "Win32" then ".exe" else "")
 	in
 	let com = ctx.com in