syntax: fix type evolution on non nullable type

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

diff --git a/src/syntax/typing.nit b/src/syntax/typing.nit
index f004491..7f625e8 100644 (file)
--- a/src/syntax/typing.nit
+++ b/src/syntax/typing.nit
@@ -1461,7 +1461,7 @@ redef class AEqExpr
        private fun try_to_isa(v: TypingVisitor, n: AExpr)
        do
                var variable = n.its_variable
-               if variable != null then
+               if variable != null and n.stype isa MMNullableType then
                        _if_false_variable_ctx = v.variable_ctx.sub_with(self, variable, n.stype.as_notnull)
                        _if_true_variable_ctx = v.variable_ctx.sub_with(self, variable, v.type_none)
                end
@@ -1492,7 +1492,7 @@ redef class ANeExpr
        private fun try_to_isa(v: TypingVisitor, n: AExpr)
        do
                var variable = n.its_variable
-               if variable != null then
+               if variable != null and n.stype isa MMNullableType then
                        _if_true_variable_ctx = v.variable_ctx.sub_with(self, variable, n.stype.as_notnull)
                        _if_false_variable_ctx = v.variable_ctx.sub_with(self, variable, v.type_none)
                end

diff --git a/tests/base_var_type_evolution_null3.nit b/tests/base_var_type_evolution_null3.nit
new file mode 100644 (file)
index 0000000..a1ae9ca
--- /dev/null
+++ b/tests/base_var_type_evolution_null3.nit
@@ -0,0 +1,63 @@
+# This file is part of NIT ( http://www.nitlanguage.org ).
+#
+# Copyright 2010 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.
+
+import kernel
+
+class G[A: nullable Object]
+       var _a: A
+       init (a: A) do _a = a
+
+       fun run
+       do
+               var a = _a
+
+               if a != null then
+                       a.output
+               end
+
+               _a = a
+       end
+
+       fun na: nullable A = _a
+
+       fun run2
+       do
+               var na = na
+               if na != null then
+                       na.output
+                       _a = na
+               end
+
+               #alt1# _a = na
+       end
+end
+
+fun foo
+do
+       var a: Object = 5
+       var o = a
+       if a != null then
+               a.output
+       end
+       o = a
+end
+
+fun rand: Bool do return true
+
+var g = new G[Object](1)
+g.run
+g.run2
+foo

diff --git a/tests/sav/base_var_type_evolution_null3.sav b/tests/sav/base_var_type_evolution_null3.sav
new file mode 100644 (file)
index 0000000..a556a0a
--- /dev/null
+++ b/tests/sav/base_var_type_evolution_null3.sav
@@ -0,0 +1,3 @@
+1
+1
+5

diff --git a/tests/sav/base_var_type_evolution_null3_alt1.sav b/tests/sav/base_var_type_evolution_null3_alt1.sav
new file mode 100644 (file)
index 0000000..c5d006c
--- /dev/null
+++ b/tests/sav/base_var_type_evolution_null3_alt1.sav
@@ -0,0 +1 @@
+alt/base_var_type_evolution_null3_alt1.nit:44,9--10: Type error: expected A, got nullable A