nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
typing: factorize AEqExpr and ANeExpr into AEqFormExpr
[nit.git]
/
src
/
semantize
/
typing.nit
diff --git
a/src/semantize/typing.nit
b/src/semantize/typing.nit
index
b37e4a4
..
4868fc9
100644
(file)
--- a/
src/semantize/typing.nit
+++ b/
src/semantize/typing.nit
@@
-1304,7
+1304,8
@@
redef class AOrElseExpr
end
if t1 isa MNullType then
end
if t1 isa MNullType then
- v.error(n_expr, "Type Error: `or else` on `null`.")
+ self.mtype = t2
+ return
else if v.check_can_be_null(n_expr, t1) then
t1 = t1.as_notnull
end
else if v.check_can_be_null(n_expr, t1) then
t1 = t1.as_notnull
end
@@
-1688,14
+1689,8
@@
redef class ABinopExpr
redef fun property_name do return operator
redef fun property_node do return n_op
end
redef fun property_name do return operator
redef fun property_node do return n_op
end
-redef class AEqExpr
- redef fun accept_typing(v)
- do
- super
- v.null_test(self)
- end
-end
-redef class ANeExpr
+
+redef class AEqFormExpr
redef fun accept_typing(v)
do
super
redef fun accept_typing(v)
do
super