nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
compiler: Merge `maybenull` and `maybe_null`
[nit.git]
/
src
/
modelize
/
modelize_property.nit
diff --git
a/src/modelize/modelize_property.nit
b/src/modelize/modelize_property.nit
index
5ba3196
..
44d551d
100644
(file)
--- a/
src/modelize/modelize_property.nit
+++ b/
src/modelize/modelize_property.nit
@@
-80,7
+80,6
@@
redef class ModelBuilder
end
# Build the properties of `nclassdef`.
end
# Build the properties of `nclassdef`.
- # REQUIRE: all superclasses are built.
private fun build_properties(nclassdef: AClassdef)
do
# Force building recursively
private fun build_properties(nclassdef: AClassdef)
do
# Force building recursively
@@
-1159,8
+1158,8
@@
redef class AAttrPropdef
# Is the node tagged optional?
var is_optional = false
# Is the node tagged optional?
var is_optional = false
- # Has the node a default value?
- # Could be through `n_expr` or `n_block`
+ # Does the node have a default value?
+ # Could be through `n_expr`, `n_block` or `is_lazy`
var has_value = false
# The guard associated to a lazy attribute.
var has_value = false
# The guard associated to a lazy attribute.
@@
-1686,8
+1685,7
@@
redef class ATypePropdef
break
end
if p.mclassdef.mclass == mclassdef.mclass then
break
end
if p.mclassdef.mclass == mclassdef.mclass then
- # Still a warning to pass existing bad code
- modelbuilder.warning(n_type, "refine-type", "Redef Error: a virtual type cannot be refined.")
+ modelbuilder.error(n_type, "Redef Error: a virtual type cannot be refined.")
break
end
if not modelbuilder.check_subtype(n_type, mmodule, anchor, bound, supbound) then
break
end
if not modelbuilder.check_subtype(n_type, mmodule, anchor, bound, supbound) then