Bläddra i källkod

renamed @:arguments to @:haxe.arguments

Aleksandr Kuzmenko 5 år sedan
förälder
incheckning
9dd62f10ab
3 ändrade filer med 8 tillägg och 6 borttagningar
  1. 6 4
      src-json/meta.json
  2. 1 1
      src/typing/nullSafety.ml
  3. 1 1
      src/typing/typeload.ml

+ 6 - 4
src-json/meta.json

@@ -1210,13 +1210,15 @@
 		"name": "Value",
 		"metadata": ":value",
 		"doc": "Used to store default values for fields and function arguments.",
-		"targets": ["TClassField"]
+		"targets": ["TClassField"],
+		"internal": true
 	},
 	{
-		"name": "Arguments",
-		"metadata": ":arguments",
+		"name": "HaxeArguments",
+		"metadata": ":haxe.arguments",
 		"doc": "Used to store function arguments.",
-		"targets": ["TClassField"]
+		"targets": ["TClassField"],
+		"internal": true
 	},
 	{
 		"name": "Void",

+ 1 - 1
src/typing/nullSafety.ml

@@ -188,7 +188,7 @@ let get_arguments_meta callee expected_args_count =
 		| TField (_, FStatic (_, field))
 		| TField (_, FInstance (_, _, field)) ->
 			(try
-				match get_meta Meta.Arguments field.cf_meta with
+				match get_meta Meta.HaxeArguments field.cf_meta with
 				| _,[EFunction(_,{ f_args = args }),_],_ when expected_args_count = List.length args ->
 					List.map (fun (_,_,m,_,_) -> m) args
 				| _ ->

+ 1 - 1
src/typing/typeload.ml

@@ -210,7 +210,7 @@ let generate_args_meta com cls_opt add_meta args =
 	);
 	if List.exists (fun (_,_,m,_,_) -> m <> []) args then
 		let fn = { f_params = []; f_args = args; f_type = None; f_expr = None } in
-		add_meta (Meta.Arguments,[EFunction(FKAnonymous,fn),null_pos],null_pos)
+		add_meta (Meta.HaxeArguments,[EFunction(FKAnonymous,fn),null_pos],null_pos)
 
 let is_redefined ctx cf1 fields p =
 	try