nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
src: use `as_notnullable` in code
[nit.git]
/
src
/
typing.nit
diff --git
a/src/typing.nit
b/src/typing.nit
index
2223131
..
d2cc5fa
100644
(file)
--- a/
src/typing.nit
+++ b/
src/typing.nit
@@
-284,7
+284,7
@@
private class TypeVisitor
var erasure_cast = false
var rettype = mpropdef.msignature.return_mtype
if not recv_is_self and rettype != null then
var erasure_cast = false
var rettype = mpropdef.msignature.return_mtype
if not recv_is_self and rettype != null then
- if rettype isa MNullableType then rettype = rettype.mtype
+ rettype = rettype.as_notnullable
if rettype isa MParameterType then
var erased_rettype = msignature.return_mtype
assert erased_rettype != null
if rettype isa MParameterType then
var erased_rettype = msignature.return_mtype
assert erased_rettype != null
@@
-905,7
+905,7
@@
redef class AForExpr
# anchor formal and virtual types
if mtype.need_anchor then mtype = v.anchor_to(mtype)
# anchor formal and virtual types
if mtype.need_anchor then mtype = v.anchor_to(mtype)
- if mtype isa MNullableType then mtype = mtype.mtype
+ mtype = mtype.as_notnullable
self.coltype = mtype.as(MClassType)
# get methods is_ok, next, item
self.coltype = mtype.as(MClassType)
# get methods is_ok, next, item
@@
-1008,9
+1008,7
@@
redef class AOrElseExpr
return # Skip error
end
return # Skip error
end
- if t1 isa MNullableType then
- t1 = t1.mtype
- end
+ t1 = t1.as_notnullable
var t = v.merge_types(self, [t1, t2])
if t == null then
var t = v.merge_types(self, [t1, t2])
if t == null then