Browse Source

use proper position for duplicate type parameter name error, also fix tests

Dan Korostelev 9 years ago
parent
commit
c78e7cdb9a

+ 1 - 1
src/typing/typeload.ml

@@ -1534,7 +1534,7 @@ let rec type_type_param ?(enum_constructor=false) ctx path get_params p tp =
 and type_type_params ?(enum_constructor=false) ctx path get_params p tpl =
 and type_type_params ?(enum_constructor=false) ctx path get_params p tpl =
 	let names = ref [] in
 	let names = ref [] in
 	List.map (fun tp ->
 	List.map (fun tp ->
-		if List.exists (fun name -> name = fst tp.tp_name) !names then display_error ctx ("Duplicate type parameter name: " ^ fst tp.tp_name) p;
+		if List.exists (fun name -> name = fst tp.tp_name) !names then display_error ctx ("Duplicate type parameter name: " ^ fst tp.tp_name) (pos tp.tp_name);
 		names := (fst tp.tp_name) :: !names;
 		names := (fst tp.tp_name) :: !names;
 		type_type_param ~enum_constructor ctx path get_params p tp
 		type_type_param ~enum_constructor ctx path get_params p tp
 	) tpl
 	) tpl

+ 1 - 1
tests/misc/projects/Issue1138/compile4-fail.hxml.stderr

@@ -1 +1 @@
-$$normPath(::cwd::/src3/import.hx):1: characters 0-11 : Only import and using is allowed in import.hx files
+$$normPath(::cwd::/src3/import.hx):1: characters 0-14 : Only import and using is allowed in import.hx files

+ 1 - 1
tests/misc/projects/Issue4293/compile-abstract-fail.hxml.stderr

@@ -1 +1 @@
-OnAbstract.hx:1: lines 1-3 : Duplicate type parameter name: T
+OnAbstract.hx:1: characters 23-24 : Duplicate type parameter name: T

+ 1 - 1
tests/misc/projects/Issue4293/compile-class-fail.hxml.stderr

@@ -1 +1 @@
-OnClass.hx:1: lines 1-3 : Duplicate type parameter name: T
+OnClass.hx:1: characters 17-18 : Duplicate type parameter name: T

+ 1 - 1
tests/misc/projects/Issue4293/compile-enum-ctor-fail.hxml.stderr

@@ -1 +1 @@
-OnEnumCtor.hx:2: characters 1-11 : Duplicate type parameter name: T
+OnEnumCtor.hx:2: characters 6-7 : Duplicate type parameter name: T

+ 1 - 1
tests/misc/projects/Issue4293/compile-enum-fail.hxml.stderr

@@ -1 +1 @@
-OnEnum.hx:1: lines 1-3 : Duplicate type parameter name: T
+OnEnum.hx:1: characters 15-16 : Duplicate type parameter name: T

+ 1 - 1
tests/misc/projects/Issue4293/compile-field-fail.hxml.stderr

@@ -1 +1 @@
-OnField.hx:2: characters 8-33 : Duplicate type parameter name: T
+OnField.hx:2: characters 25-26 : Duplicate type parameter name: T

+ 1 - 1
tests/misc/projects/Issue4293/compile-typedef-fail.hxml.stderr

@@ -1 +1 @@
-OnTypedef.hx:1: characters 0-25 : Duplicate type parameter name: T
+OnTypedef.hx:1: characters 21-22 : Duplicate type parameter name: T