disallow ?.new and ?.match

HaxeFoundation · Oct 22, 2024 · b4695ee · b4695ee
1 parent cf4d729
commit b4695ee
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 2 deletions.
diff --git a/src/typing/typer.ml b/src/typing/typer.ml
@@ -629,7 +629,8 @@ and type_access ctx e p mode with_type =
 	match e with
 	| EConst (Ident s) ->
 		type_ident ctx s p mode with_type
-	| EField (e1,"new",efk_todo) ->
+	| EField (e1,"new",efk) ->
+		if efk = EFSafe then raise_typing_error "?.new is not supported" p;
 		let e1 = type_expr ctx e1 WithType.value in
 		begin match e1.eexpr with
 			| TTypeExpr (TClassDecl c) ->
@@ -1752,7 +1753,8 @@ and type_call_builtin ctx e el mode with_type p =
 		in
 		warning ctx WInfo s e1.epos;
 		e1
-	| (EField(e,"match",efk_todo),p), [epat] ->
+	| (EField(e,"match",efk),p), [epat] ->
+		if efk = EFSafe then raise_typing_error "?.match is not supported" p;
 		let et = type_expr ctx e WithType.value in
 		let rec has_enum_match t = match follow t with
 			| TEnum _ -> true

diff --git a/tests/misc/projects/Issue11571/MainMatch.hx b/tests/misc/projects/Issue11571/MainMatch.hx
@@ -0,0 +1,3 @@
+function main() {
+	(macro 1).expr?.match(1);
+}
diff --git a/tests/misc/projects/Issue11571/MainNew.hx b/tests/misc/projects/Issue11571/MainNew.hx
@@ -0,0 +1,3 @@
+function main() {
+	String?.new;
+}
diff --git a/tests/misc/projects/Issue11571/compile-match-fail.hxml b/tests/misc/projects/Issue11571/compile-match-fail.hxml
@@ -0,0 +1,2 @@
+--main MainMatch
+--interp
diff --git a/tests/misc/projects/Issue11571/compile-match-fail.hxml.stderr b/tests/misc/projects/Issue11571/compile-match-fail.hxml.stderr
@@ -0,0 +1 @@
+MainMatch.hx:2: characters 2-23 : ?.match is not supported
diff --git a/tests/misc/projects/Issue11571/compile-new-fail.hxml b/tests/misc/projects/Issue11571/compile-new-fail.hxml
@@ -0,0 +1,2 @@
+--main MainNew
+--interp
diff --git a/tests/misc/projects/Issue11571/compile-new-fail.hxml.stderr b/tests/misc/projects/Issue11571/compile-new-fail.hxml.stderr
@@ -0,0 +1 @@
+MainNew.hx:2: characters 2-13 : ?.new is not supported