nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge: Attribute and autoinit annotations
[nit.git]
/
src
/
semantize
/
typing.nit
diff --git
a/src/semantize/typing.nit
b/src/semantize/typing.nit
index
9676168
..
b37e4a4
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`
@@
-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
@@
-2061,7
+2063,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
@@
-2072,9
+2074,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