nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
typing: warnings related to adaptive typing are moved to the post_typing
[nit.git]
/
src
/
semantize
/
typing.nit
diff --git
a/src/semantize/typing.nit
b/src/semantize/typing.nit
index
10edaf1
..
f231d4b
100644
(file)
--- a/
src/semantize/typing.nit
+++ b/
src/semantize/typing.nit
@@
-184,12
+184,12
@@
private class TypeVisitor
end
end
- fun visit_expr_cast(node: ANode, nexpr: AExpr, ntype: AType): nullable MType
+ fun check_expr_cast(node: ANode, nexpr: AExpr, ntype: AType): nullable MType
do
do
- var sub = visit_expr(nexpr)
+ var sub = nexpr.mtype
if sub == null then return null # Forward error
if sub == null then return null # Forward error
- var sup = self.resolve_mtype(ntype)
+ var sup = ntype.mtype
if sup == null then return null # Forward error
if sup == sub then
if sup == null then return null # Forward error
if sup == sub then
@@
-240,7
+240,7
@@
private class TypeVisitor
if not mtype2 isa MNullType then return
# Check of useless null
if not mtype2 isa MNullType then return
# Check of useless null
- if not check_can_be_null(anode.n_expr, mtype) then return
+ if not can_be_null(mtype) then return
if mtype isa MNullType then
# Because of type adaptation, we cannot just stop here
if mtype isa MNullType then
# Because of type adaptation, we cannot just stop here
@@
-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`
@@
-748,6
+748,9
@@
redef class AMethPropdef
if not v.has_loop or not v.dirty then break
end
if not v.has_loop or not v.dirty then break
end
+ var post_visitor = new PostTypingVisitor(v)
+ post_visitor.enter_visit(self)
+
if not nblock.after_flow_context.is_unreachable and msignature.return_mtype != null then
# We reach the end of the function without having a return, it is bad
v.error(self, "Error: reached end of function; expected `return` with a value.")
if not nblock.after_flow_context.is_unreachable and msignature.return_mtype != null then
# We reach the end of the function without having a return, it is bad
v.error(self, "Error: reached end of function; expected `return` with a value.")
@@
-755,20
+758,33
@@
redef class AMethPropdef
end
end
end
end
+private class PostTypingVisitor
+ super Visitor
+ var type_visitor: TypeVisitor
+ redef fun visit(n) do
+ n.visit_all(self)
+ n.accept_post_typing(type_visitor)
+ end
+end
+
+redef class ANode
+ private fun accept_post_typing(v: TypeVisitor) do end
+end
+
redef class AAttrPropdef
redef fun do_typing(modelbuilder: ModelBuilder)
do
if not has_value then return
redef class AAttrPropdef
redef fun do_typing(modelbuilder: ModelBuilder)
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
+976,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
+1022,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,8
+1320,9
@@
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`.")
- else if v.check_can_be_null(n_expr, t1) then
+ self.mtype = t2
+ return
+ else if v.can_be_null(t1) then
t1 = t1.as_notnull
end
t1 = t1.as_notnull
end
@@
-1319,6
+1338,16
@@
redef class AOrElseExpr
end
self.mtype = t
end
end
self.mtype = t
end
+
+ redef fun accept_post_typing(v)
+ do
+ var t1 = n_expr.mtype
+ if t1 == null then
+ return
+ else
+ v.check_can_be_null(n_expr, t1)
+ end
+ end
end
redef class ATrueExpr
end
redef class ATrueExpr
@@
-1344,6
+1373,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
@@
-1513,7
+1551,10
@@
redef class AIsaExpr
var cast_type: nullable MType
redef fun accept_typing(v)
do
var cast_type: nullable MType
redef fun accept_typing(v)
do
- var mtype = v.visit_expr_cast(self, self.n_expr, self.n_type)
+ v.visit_expr(n_expr)
+
+ var mtype = v.resolve_mtype(n_type)
+
self.cast_type = mtype
var variable = self.n_expr.its_variable
self.cast_type = mtype
var variable = self.n_expr.its_variable
@@
-1527,12
+1568,24
@@
redef class AIsaExpr
self.mtype = v.type_bool(self)
end
self.mtype = v.type_bool(self)
end
+
+ redef fun accept_post_typing(v)
+ do
+ v.check_expr_cast(self, self.n_expr, self.n_type)
+ end
end
redef class AAsCastExpr
redef fun accept_typing(v)
do
end
redef class AAsCastExpr
redef fun accept_typing(v)
do
- self.mtype = v.visit_expr_cast(self, self.n_expr, self.n_type)
+ v.visit_expr(n_expr)
+
+ self.mtype = v.resolve_mtype(n_type)
+ end
+
+ redef fun accept_post_typing(v)
+ do
+ v.check_expr_cast(self, self.n_expr, self.n_type)
end
end
end
end
@@
-1547,12
+1600,19
@@
redef class AAsNotnullExpr
return
end
return
end
- if v.check_can_be_null(n_expr, mtype) then
+ if v.can_be_null(mtype) then
mtype = mtype.as_notnull
end
self.mtype = mtype
end
mtype = mtype.as_notnull
end
self.mtype = mtype
end
+
+ redef fun accept_post_typing(v)
+ do
+ var mtype = n_expr.mtype
+ if mtype == null then return
+ v.check_can_be_null(n_expr, mtype)
+ end
end
redef class AParExpr
end
redef class AParExpr
@@
-1677,18
+1737,24
@@
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 class AEqFormExpr
redef fun accept_typing(v)
do
super
v.null_test(self)
end
redef fun accept_typing(v)
do
super
v.null_test(self)
end
-end
-redef class ANeExpr
- redef fun accept_typing(v)
+
+ redef fun accept_post_typing(v)
do
do
- super
- v.null_test(self)
+ var mtype = n_expr.mtype
+ var mtype2 = n_expr2.mtype
+
+ if mtype == null or mtype2 == null then return
+
+ if not mtype2 isa MNullType then return
+
+ v.check_can_be_null(n_expr, mtype)
end
end
end
end
@@
-2052,7
+2118,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
+2129,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