nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge: More keep going
[nit.git]
/
src
/
semantize
/
typing.nit
diff --git
a/src/semantize/typing.nit
b/src/semantize/typing.nit
index
10edaf1
..
4aad2d2
100644
(file)
--- a/
src/semantize/typing.nit
+++ b/
src/semantize/typing.nit
@@
-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
@@
-1344,6
+1346,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
+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
@@
-2063,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