nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
typing: `or else` on null is no more an error
[nit.git]
/
src
/
semantize
/
typing.nit
diff --git
a/src/semantize/typing.nit
b/src/semantize/typing.nit
index
10edaf1
..
9724537
100644
(file)
--- a/
src/semantize/typing.nit
+++ b/
src/semantize/typing.nit
@@
-648,7
+648,7
@@
end
redef class Variable
# The declared type of the variable
redef class Variable
# The declared type of the variable
- var declared_type: nullable MType
+ var declared_type: nullable MType is writable
# Was the variable type-adapted?
# This is used to speedup type retrieval while it remains `false`
# Was the variable type-adapted?
# This is used to speedup type retrieval while it remains `false`
@@
-760,15
+760,15
@@
redef class AAttrPropdef
do
if not has_value then return
do
if not has_value then return
- var mpropdef = self.mpropdef
- if mpropdef == null then return # skip error
+ var mpropdef = self.mreadpropdef
+ if mpropdef == null or mpropdef.msignature == null then return # skip error
var v = new TypeVisitor(modelbuilder, mpropdef.mclassdef.mmodule, mpropdef)
self.selfvariable = v.selfvariable
var nexpr = self.n_expr
if nexpr != null then
var v = new TypeVisitor(modelbuilder, mpropdef.mclassdef.mmodule, mpropdef)
self.selfvariable = v.selfvariable
var nexpr = self.n_expr
if nexpr != null then
- var mtype = self.mpropdef.static_mtype
+ var mtype = self.mtype
v.visit_expr_subtype(nexpr, mtype)
end
var nblock = self.n_block
v.visit_expr_subtype(nexpr, mtype)
end
var nblock = self.n_block
@@
-960,7
+960,7
@@
redef class AVarReassignExpr
v.set_variable(self, variable, rettype)
v.set_variable(self, variable, rettype)
- self.is_typed = true
+ self.is_typed = rettype != null
end
end
end
end
@@
-1006,9
+1006,11
@@
redef class AReturnExpr
else
v.visit_expr(nexpr)
v.error(nexpr, "Error: `return` with value in a procedure.")
else
v.visit_expr(nexpr)
v.error(nexpr, "Error: `return` with value in a procedure.")
+ return
end
else if ret_type != null then
v.error(self, "Error: `return` without value in a function.")
end
else if ret_type != null then
v.error(self, "Error: `return` without value in a function.")
+ return
end
self.is_typed = true
end
end
self.is_typed = true
end
@@
-1302,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
@@
-1344,6
+1347,15
@@
redef class AIntExpr
end
end
end
end
+redef class AByteExpr
+ redef fun accept_typing(v)
+ do
+ var mclass = v.get_mclass(self, "Byte")
+ if mclass == null then return # Forward error
+ self.mtype = mclass.mclass_type
+ end
+end
+
redef class AFloatExpr
redef fun accept_typing(v)
do
redef class AFloatExpr
redef fun accept_typing(v)
do
@@
-2052,7
+2064,7
@@
redef class AAttrAssignExpr
var mtype = self.attr_type
v.visit_expr_subtype(self.n_value, mtype)
var mtype = self.attr_type
v.visit_expr_subtype(self.n_value, mtype)
- self.is_typed = true
+ self.is_typed = mtype != null
end
end
end
end
@@
-2063,9
+2075,9
@@
redef class AAttrReassignExpr
var mtype = self.attr_type
if mtype == null then return # Skip error
var mtype = self.attr_type
if mtype == null then return # Skip error
- self.resolve_reassignment(v, mtype, mtype)
+ var rettype = self.resolve_reassignment(v, mtype, mtype)
- self.is_typed = true
+ self.is_typed = rettype != null
end
end
end
end