From: Jean Privat <jean@pryen.org>
Date: Sat, 4 Jul 2009 02:51:08 +0000 (-0400)
Subject: syntax: do not process erroneous formal types
X-Git-Tag: v0.3~193
X-Git-Url: http://nitlanguage.org

syntax: do not process erroneous formal types

Signed-off-by: Jean Privat <jean@pryen.org>
---

diff --git a/src/syntax/mmbuilder.nit b/src/syntax/mmbuilder.nit
index 228d9c9..dba9f20 100644
--- a/src/syntax/mmbuilder.nit
+++ b/src/syntax/mmbuilder.nit
@@ -690,14 +690,18 @@ redef class AFormaldef
 			if n_type == null then
 				_formal.bound = v.module.type_any.as_nullable
 			else
-				_formal.bound = n_type.get_stype(v).as(not null)
+				var stype = n_type.get_stype(v)
+				if stype == null then return
+				_formal.bound = stype
 			end
 		else
 			var ob = o.get_formal(_formal.position).bound.for_module(v.module)
 			if n_type == null then
 				_formal.bound = ob
 			else
-				_formal.bound = n_type.get_stype(v).as(not null)
+				var stype = n_type.get_stype(v)
+				if stype == null then return
+				_formal.bound = stype
 				if _formal.bound != ob then
 					v.error(self, "Redef error: Cannot change formal parameter type of class {c}; got {_formal.bound}, expected {ob}.")
 				end
diff --git a/tests/error_type_not_ok3.nit b/tests/error_type_not_ok3.nit
new file mode 100644
index 0000000..7828cf6
--- /dev/null
+++ b/tests/error_type_not_ok3.nit
@@ -0,0 +1,24 @@
+# This file is part of NIT ( http://www.nitlanguage.org ).
+#
+# Copyright 2009 Jean Privat <jean@pryen.org>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#alt1#class Fail[E]
+#alt1#end
+
+class C[T: Fail]
+end
+
+class D[T: Array[Fail]]
+end
diff --git a/tests/sav/error_type_not_ok3.sav b/tests/sav/error_type_not_ok3.sav
new file mode 100644
index 0000000..701307a
--- /dev/null
+++ b/tests/sav/error_type_not_ok3.sav
@@ -0,0 +1,2 @@
+./error_type_not_ok3.nit:23,18: Type error: class Fail not found in module error_type_not_ok3.
+./error_type_not_ok3.nit:20,12: Type error: class Fail not found in module error_type_not_ok3.
diff --git a/tests/sav/error_type_not_ok3_alt1.sav b/tests/sav/error_type_not_ok3_alt1.sav
new file mode 100644
index 0000000..0b71202
--- /dev/null
+++ b/tests/sav/error_type_not_ok3_alt1.sav
@@ -0,0 +1,2 @@
+alt/error_type_not_ok3_alt1.nit:20,12--15: Type error: 'Fail' is a generic class.
+alt/error_type_not_ok3_alt1.nit:23,18--21: Type error: 'Fail' is a generic class.