redef fun process_nmodule(nmodule)
do
for nclassdef in nmodule.n_classdefs do
+ if nclassdef.all_defs == null then continue # skip non principal classdef
toolcontext.modelbuilder.build_properties(nclassdef)
end
end
var mclassdef = nclassdef.mclassdef.as(not null)
if mclassdef.in_hierarchy == null then return # Skip error
for superclassdef in mclassdef.in_hierarchy.direct_greaters do
+ if not mclassdef2nclassdef.has_key(superclassdef) then continue
build_properties(mclassdef2nclassdef[superclassdef])
end
- for npropdef in nclassdef.n_propdefs do
- npropdef.build_property(self, nclassdef)
- end
- for npropdef in nclassdef.n_propdefs do
- npropdef.build_signature(self, nclassdef)
- end
- for npropdef in nclassdef.n_propdefs do
- npropdef.check_signature(self, nclassdef)
+ for nclassdef2 in nclassdef.all_defs do
+ for npropdef in nclassdef2.n_propdefs do
+ npropdef.build_property(self, mclassdef)
+ end
+ for npropdef in nclassdef2.n_propdefs do
+ npropdef.build_signature(self)
+ end
+ for npropdef in nclassdef2.n_propdefs do
+ npropdef.check_signature(self)
+ end
end
process_default_constructors(nclassdef)
end
if not nclassdef isa AStdClassdef then return
- var mmodule = nclassdef.mclassdef.mmodule
+ var mmodule = mclassdef.mmodule
# Do we inherit for a constructor?
var combine = new Array[MMethod]
var inhc: nullable MClass = null
for st in mclassdef.supertypes do
var c = st.mclass
if not c.kind.need_init then continue
- st = st.anchor_to(mmodule, nclassdef.mclassdef.bound_mtype)
+ st = st.anchor_to(mmodule, mclassdef.bound_mtype)
var candidate = self.try_get_mproperty_by_name2(nclassdef, mmodule, st, "init").as(nullable MMethod)
if candidate != null and candidate.intro.msignature.arity == 0 then
combine.add(candidate)
var inherit_init_from: nullable MClass = null
end
-redef class MClassDef
- private var propdef_names = new HashSet[String]
-end
-
redef class MPropDef
# Does the MPropDef contains a call to super or a call of a super-constructor?
# Subsequent phases of the frontend (esp. typing) set it if required
# The free init (implicitely constructed by the class if required)
var mfree_init: nullable MMethodDef = null
+end
+redef class MClassDef
# What is the `APropdef` associated to a `MProperty`?
# Used to check multiple definition of a property.
var mprop2npropdef: Map[MProperty, APropdef] = new HashMap[MProperty, APropdef]
# The associated propdef once build by a `ModelBuilder`
var mpropdef: nullable MPROPDEF writable
- private fun build_property(modelbuilder: ModelBuilder, nclassdef: AClassdef) is abstract
- private fun build_signature(modelbuilder: ModelBuilder, nclassdef: AClassdef) is abstract
- private fun check_signature(modelbuilder: ModelBuilder, nclassdef: AClassdef) is abstract
- private fun new_property_visibility(modelbuilder: ModelBuilder, nclassdef: AClassdef, nvisibility: nullable AVisibility): MVisibility
+ private fun build_property(modelbuilder: ModelBuilder, mclassdef: MClassDef) is abstract
+ private fun build_signature(modelbuilder: ModelBuilder) is abstract
+ private fun check_signature(modelbuilder: ModelBuilder) is abstract
+ private fun new_property_visibility(modelbuilder: ModelBuilder, mclassdef: MClassDef, nvisibility: nullable AVisibility): MVisibility
do
var mvisibility = public_visibility
if nvisibility != null then
mvisibility = public_visibility
end
end
- if nclassdef.mclassdef.mclass.visibility == private_visibility then
+ if mclassdef.mclass.visibility == private_visibility then
if mvisibility == protected_visibility then
assert nvisibility != null
modelbuilder.error(nvisibility, "Error: The only legal visibility for properties in a private class is private.")
private fun set_doc(mpropdef: MPropDef)
do
var ndoc = self.n_doc
- if ndoc != null then mpropdef.mdoc = ndoc.to_mdoc
+ if ndoc != null then
+ var mdoc = ndoc.to_mdoc
+ mpropdef.mdoc = mdoc
+ mdoc.original_mentity = mpropdef
+ end
end
- private fun check_redef_property_visibility(modelbuilder: ModelBuilder, nclassdef: AClassdef, nvisibility: nullable AVisibility, mprop: MProperty)
+ private fun check_redef_property_visibility(modelbuilder: ModelBuilder, nvisibility: nullable AVisibility, mprop: MProperty)
do
if nvisibility == null then return
var mvisibility = nvisibility.mvisibility
end
end
- private fun check_redef_keyword(modelbuilder: ModelBuilder, nclassdef: AClassdef, kwredef: nullable Token, need_redef: Bool, mprop: MProperty): Bool
+ private fun check_redef_keyword(modelbuilder: ModelBuilder, mclassdef: MClassDef, kwredef: nullable Token, need_redef: Bool, mprop: MProperty): Bool
do
- if nclassdef.mprop2npropdef.has_key(mprop) then
- modelbuilder.error(self, "Error: A property {mprop} is already defined in class {nclassdef.mclassdef.mclass}.")
+ if mclassdef.mprop2npropdef.has_key(mprop) then
+ modelbuilder.error(self, "Error: A property {mprop} is already defined in class {mclassdef.mclass} at line {mclassdef.mprop2npropdef[mprop].location.line_start}.")
return false
end
+ if mprop isa MMethod and mprop.is_toplevel != (parent isa ATopClassdef) then
+ if mprop.is_toplevel then
+ modelbuilder.error(self, "Error: {mprop} is a top level method.")
+ else
+ modelbuilder.error(self, "Error: {mprop} is not a top level method.")
+ end
+ return false
+
+ end
if kwredef == null then
if need_redef then
- modelbuilder.error(self, "Redef error: {nclassdef.mclassdef.mclass}::{mprop.name} is an inherited property. To redefine it, add the redef keyword.")
+ modelbuilder.error(self, "Redef error: {mclassdef.mclass}::{mprop.name} is an inherited property. To redefine it, add the redef keyword.")
return false
end
else
if not need_redef then
- modelbuilder.error(self, "Error: No property {nclassdef.mclassdef.mclass}::{mprop.name} is inherited. Remove the redef keyword to define a new property.")
+ modelbuilder.error(self, "Error: No property {mclassdef.mclass}::{mprop.name} is inherited. Remove the redef keyword to define a new property.")
return false
end
end
end
# Build a visited signature
- fun build_signature(modelbuilder: ModelBuilder, nclassdef: AClassdef): nullable MSignature
+ fun build_signature(modelbuilder: ModelBuilder): nullable MSignature
do
if param_names.length != param_types.length then
# Some parameters are typed, other parameters are not typed.
redef class AMethPropdef
redef type MPROPDEF: MMethodDef
- redef fun build_property(modelbuilder, nclassdef)
+ redef fun build_property(modelbuilder, mclassdef)
do
var n_kwinit = n_kwinit
var n_kwnew = n_kwnew
var is_init = n_kwinit != null or n_kwnew != null
- var mclassdef = nclassdef.mclassdef.as(not null)
var name: String
var amethodid = self.n_methid
var name_node: ANode
var mprop: nullable MMethod = null
if not is_init or n_kwredef != null then mprop = modelbuilder.try_get_mproperty_by_name(name_node, mclassdef, name).as(nullable MMethod)
if mprop == null then
- var mvisibility = new_property_visibility(modelbuilder, nclassdef, self.n_visibility)
+ var mvisibility = new_property_visibility(modelbuilder, mclassdef, self.n_visibility)
mprop = new MMethod(mclassdef, name, mvisibility)
mprop.is_init = is_init
mprop.is_new = n_kwnew != null
- if not self.check_redef_keyword(modelbuilder, nclassdef, n_kwredef, false, mprop) then return
+ if parent isa ATopClassdef then mprop.is_toplevel = true
+ if not self.check_redef_keyword(modelbuilder, mclassdef, n_kwredef, false, mprop) then return
else
- if n_kwredef == null then
- if self isa AMainMethPropdef then
- # no warning
- else
- if not self.check_redef_keyword(modelbuilder, nclassdef, n_kwredef, true, mprop) then return
- end
- end
- check_redef_property_visibility(modelbuilder, nclassdef, self.n_visibility, mprop)
+ if not self.check_redef_keyword(modelbuilder, mclassdef, n_kwredef, not self isa AMainMethPropdef, mprop) then return
+ check_redef_property_visibility(modelbuilder, self.n_visibility, mprop)
end
- nclassdef.mprop2npropdef[mprop] = self
+ mclassdef.mprop2npropdef[mprop] = self
var mpropdef = new MMethodDef(mclassdef, mprop, self.location)
- if mclassdef.propdef_names.has(mprop.name) then
- var loc: nullable Location = null
- for i in mclassdef.mpropdefs do
- if i.mproperty.name == mprop.name then
- loc = i.location
- break
- end
- end
- if loc == null then abort
- modelbuilder.error(self, "Error: a property {mprop} is already defined in class {mclassdef.mclass} at {loc}")
- end
-
- mclassdef.propdef_names.add(mpropdef.mproperty.name)
-
set_doc(mpropdef)
self.mpropdef = mpropdef
end
end
- redef fun build_signature(modelbuilder, nclassdef)
+ redef fun build_signature(modelbuilder)
do
var mpropdef = self.mpropdef
if mpropdef == null then return # Error thus skiped
end
else if mpropdef.mproperty.is_init then
# FIXME UGLY: inherit signature from a super-constructor
- for msupertype in nclassdef.mclassdef.supertypes do
- msupertype = msupertype.anchor_to(mmodule, nclassdef.mclassdef.bound_mtype)
+ for msupertype in mclassdef.supertypes do
+ msupertype = msupertype.anchor_to(mmodule, mclassdef.bound_mtype)
var candidate = modelbuilder.try_get_mproperty_by_name2(self, mmodule, msupertype, mpropdef.mproperty.name)
if candidate != null then
if msignature == null then
mpropdef.is_extern = self isa AExternPropdef
end
- redef fun check_signature(modelbuilder, nclassdef)
+ redef fun check_signature(modelbuilder)
do
var mpropdef = self.mpropdef
if mpropdef == null then return # Error thus skiped
- var mmodule = mpropdef.mclassdef.mmodule
+ var mclassdef = mpropdef.mclassdef
+ var mmodule = mclassdef.mmodule
var nsig = self.n_signature
var mysignature = self.mpropdef.msignature
if mysignature == null then return # Error thus skiped
for i in [0..mysignature.arity[ do
var myt = mysignature.mparameters[i].mtype
var prt = msignature.mparameters[i].mtype
- if not myt.is_subtype(mmodule, nclassdef.mclassdef.bound_mtype, prt) or
- not prt.is_subtype(mmodule, nclassdef.mclassdef.bound_mtype, myt) then
+ if not myt.is_subtype(mmodule, mclassdef.bound_mtype, prt) or
+ not prt.is_subtype(mmodule, mclassdef.bound_mtype, myt) then
modelbuilder.error(nsig.n_params[i], "Redef Error: Wrong type for parameter `{mysignature.mparameters[i].name}'. found {myt}, expected {prt} as in {mpropdef.mproperty.intro}.")
end
end
if ret_type == null then
# Inherit the return type
ret_type = precursor_ret_type
- else if not ret_type.is_subtype(mmodule, nclassdef.mclassdef.bound_mtype, precursor_ret_type) then
+ else if not ret_type.is_subtype(mmodule, mclassdef.bound_mtype, precursor_ret_type) then
modelbuilder.error(nsig.n_type.as(not null), "Redef Error: Wrong return type. found {ret_type}, expected {precursor_ret_type} as in {mpropdef.mproperty.intro}.")
end
end
var mreadpropdef: nullable MMethodDef writable
# The associated setter (write accessor) if any
var mwritepropdef: nullable MMethodDef writable
- redef fun build_property(modelbuilder, nclassdef)
+ redef fun build_property(modelbuilder, mclassdef)
do
- var mclassdef = nclassdef.mclassdef.as(not null)
var mclass = mclassdef.mclass
var name: String
# Old attribute style
var mprop = modelbuilder.try_get_mproperty_by_name(nid, mclassdef, name)
if mprop == null then
- var mvisibility = new_property_visibility(modelbuilder, nclassdef, self.n_visibility)
+ var mvisibility = new_property_visibility(modelbuilder, mclassdef, self.n_visibility)
mprop = new MAttribute(mclassdef, name, mvisibility)
- if not self.check_redef_keyword(modelbuilder, nclassdef, self.n_kwredef, false, mprop) then return
+ if not self.check_redef_keyword(modelbuilder, mclassdef, self.n_kwredef, false, mprop) then return
else
assert mprop isa MAttribute
- check_redef_property_visibility(modelbuilder, nclassdef, self.n_visibility, mprop)
- if not self.check_redef_keyword(modelbuilder, nclassdef, self.n_kwredef, true, mprop) then return
+ check_redef_property_visibility(modelbuilder, self.n_visibility, mprop)
+ if not self.check_redef_keyword(modelbuilder, mclassdef, self.n_kwredef, true, mprop) then return
end
- nclassdef.mprop2npropdef[mprop] = self
+ mclassdef.mprop2npropdef[mprop] = self
var mpropdef = new MAttributeDef(mclassdef, mprop, self.location)
self.mpropdef = mpropdef
set_doc(mpropdef)
var nreadable = self.n_readable
- if nreadable != null then
- var readname = name.substring_from(1)
- var mreadprop = modelbuilder.try_get_mproperty_by_name(nid, mclassdef, readname).as(nullable MMethod)
- if mreadprop == null then
- var mvisibility = new_property_visibility(modelbuilder, nclassdef, nreadable.n_visibility)
- mreadprop = new MMethod(mclassdef, readname, mvisibility)
- if not self.check_redef_keyword(modelbuilder, nclassdef, nreadable.n_kwredef, false, mreadprop) then return
- else
- if not self.check_redef_keyword(modelbuilder, nclassdef, nreadable.n_kwredef, true, mreadprop) then return
- check_redef_property_visibility(modelbuilder, nclassdef, nreadable.n_visibility, mreadprop)
- end
- nclassdef.mprop2npropdef[mreadprop] = self
-
- var mreadpropdef = new MMethodDef(mclassdef, mreadprop, self.location)
- self.mreadpropdef = mreadpropdef
- modelbuilder.mpropdef2npropdef[mreadpropdef] = self
- mreadpropdef.mdoc = mpropdef.mdoc
- end
-
+ if nreadable != null then modelbuilder.error(nreadable, "Error: old-style getter no more supported")
var nwritable = self.n_writable
- if nwritable != null then
- var writename = name.substring_from(1) + "="
- var mwriteprop = modelbuilder.try_get_mproperty_by_name(nid, mclassdef, writename).as(nullable MMethod)
- if mwriteprop == null then
- var mvisibility = new_property_visibility(modelbuilder, nclassdef, nwritable.n_visibility)
- mwriteprop = new MMethod(mclassdef, writename, mvisibility)
- if not self.check_redef_keyword(modelbuilder, nclassdef, nwritable.n_kwredef, false, mwriteprop) then return
- else
- if not self.check_redef_keyword(modelbuilder, nclassdef, nwritable.n_kwredef, true, mwriteprop) then return
- check_redef_property_visibility(modelbuilder, nclassdef, nwritable.n_visibility, mwriteprop)
- end
- nclassdef.mprop2npropdef[mwriteprop] = self
-
- var mwritepropdef = new MMethodDef(mclassdef, mwriteprop, self.location)
- self.mwritepropdef = mwritepropdef
- modelbuilder.mpropdef2npropdef[mwritepropdef] = self
- mwritepropdef.mdoc = mpropdef.mdoc
- end
+ if nwritable != null then modelbuilder.error(nwritable, "Error: old-style setter no more supported")
else
# New attribute style
var nid2 = self.n_id2.as(not null)
var readname = name
var mreadprop = modelbuilder.try_get_mproperty_by_name(nid2, mclassdef, readname).as(nullable MMethod)
if mreadprop == null then
- var mvisibility = new_property_visibility(modelbuilder, nclassdef, self.n_visibility)
+ var mvisibility = new_property_visibility(modelbuilder, mclassdef, self.n_visibility)
mreadprop = new MMethod(mclassdef, readname, mvisibility)
- if not self.check_redef_keyword(modelbuilder, nclassdef, n_kwredef, false, mreadprop) then return
+ if not self.check_redef_keyword(modelbuilder, mclassdef, n_kwredef, false, mreadprop) then return
else
- if not self.check_redef_keyword(modelbuilder, nclassdef, n_kwredef, true, mreadprop) then return
- check_redef_property_visibility(modelbuilder, nclassdef, self.n_visibility, mreadprop)
+ if not self.check_redef_keyword(modelbuilder, mclassdef, n_kwredef, true, mreadprop) then return
+ check_redef_property_visibility(modelbuilder, self.n_visibility, mreadprop)
end
- nclassdef.mprop2npropdef[mreadprop] = self
+ mclassdef.mprop2npropdef[mreadprop] = self
var mreadpropdef = new MMethodDef(mclassdef, mreadprop, self.location)
self.mreadpropdef = mreadpropdef
if mwriteprop == null then
var mvisibility
if nwritable != null then
- mvisibility = new_property_visibility(modelbuilder, nclassdef, nwritable.n_visibility)
+ mvisibility = new_property_visibility(modelbuilder, mclassdef, nwritable.n_visibility)
else
mvisibility = private_visibility
end
mwriteprop = new MMethod(mclassdef, writename, mvisibility)
- if not self.check_redef_keyword(modelbuilder, nclassdef, nwkwredef, false, mwriteprop) then return
+ if not self.check_redef_keyword(modelbuilder, mclassdef, nwkwredef, false, mwriteprop) then return
else
- if not self.check_redef_keyword(modelbuilder, nclassdef, nwkwredef, true, mwriteprop) then return
+ if not self.check_redef_keyword(modelbuilder, mclassdef, nwkwredef, true, mwriteprop) then return
if nwritable != null then
- check_redef_property_visibility(modelbuilder, nclassdef, nwritable.n_visibility, mwriteprop)
+ check_redef_property_visibility(modelbuilder, nwritable.n_visibility, mwriteprop)
end
end
- nclassdef.mprop2npropdef[mwriteprop] = self
+ mclassdef.mprop2npropdef[mwriteprop] = self
var mwritepropdef = new MMethodDef(mclassdef, mwriteprop, self.location)
self.mwritepropdef = mwritepropdef
end
end
- redef fun build_signature(modelbuilder, nclassdef)
+ redef fun build_signature(modelbuilder)
do
var mpropdef = self.mpropdef
if mpropdef == null then return # Error thus skiped
end
end
- redef fun check_signature(modelbuilder, nclassdef)
+ redef fun check_signature(modelbuilder)
do
var mpropdef = self.mpropdef
if mpropdef == null then return # Error thus skiped
- var mmodule = mpropdef.mclassdef.mmodule
+ var mclassdef = mpropdef.mclassdef
+ var mmodule = mclassdef.mmodule
var ntype = self.n_type
var mtype = self.mpropdef.static_mtype
if mtype == null then return # Error thus skiped
# Check getter and setter
var meth = self.mreadpropdef
if meth != null then
- self.check_method_signature(modelbuilder, nclassdef, meth)
+ self.check_method_signature(modelbuilder, meth)
var node: nullable ANode = ntype
if node == null then node = self
modelbuilder.check_visibility(node, mtype, meth)
end
meth = self.mwritepropdef
if meth != null then
- self.check_method_signature(modelbuilder, nclassdef, meth)
+ self.check_method_signature(modelbuilder, meth)
var node: nullable ANode = ntype
if node == null then node = self
modelbuilder.check_visibility(node, mtype, meth)
end
end
- private fun check_method_signature(modelbuilder: ModelBuilder, nclassdef: AClassdef, mpropdef: MMethodDef)
+ private fun check_method_signature(modelbuilder: ModelBuilder, mpropdef: MMethodDef)
do
- var mmodule = mpropdef.mclassdef.mmodule
+ var mclassdef = mpropdef.mclassdef
+ var mmodule = mclassdef.mmodule
var nsig = self.n_type
var mysignature = mpropdef.msignature
if mysignature == null then return # Error thus skiped
for i in [0..mysignature.arity[ do
var myt = mysignature.mparameters[i].mtype
var prt = msignature.mparameters[i].mtype
- if not myt.is_subtype(mmodule, nclassdef.mclassdef.bound_mtype, prt) and
- not prt.is_subtype(mmodule, nclassdef.mclassdef.bound_mtype, myt) then
+ if not myt.is_subtype(mmodule, mclassdef.bound_mtype, prt) and
+ not prt.is_subtype(mmodule, mclassdef.bound_mtype, myt) then
var node: ANode
if nsig != null then node = nsig else node = self
modelbuilder.error(node, "Redef Error: Wrong type for parameter `{mysignature.mparameters[i].name}'. found {myt}, expected {prt}.")
if ret_type == null then
# Inherit the return type
ret_type = precursor_ret_type
- else if not ret_type.is_subtype(mmodule, nclassdef.mclassdef.bound_mtype, precursor_ret_type) then
+ else if not ret_type.is_subtype(mmodule, mclassdef.bound_mtype, precursor_ret_type) then
var node: ANode
if nsig != null then node = nsig else node = self
modelbuilder.error(node, "Redef Error: Wrong return type. found {ret_type}, expected {precursor_ret_type}.")
redef class ATypePropdef
redef type MPROPDEF: MVirtualTypeDef
- redef fun build_property(modelbuilder, nclassdef)
+ redef fun build_property(modelbuilder, mclassdef)
do
- var mclassdef = nclassdef.mclassdef.as(not null)
var name = self.n_id.text
var mprop = modelbuilder.try_get_mproperty_by_name(self.n_id, mclassdef, name)
if mprop == null then
- var mvisibility = new_property_visibility(modelbuilder, nclassdef, self.n_visibility)
+ var mvisibility = new_property_visibility(modelbuilder, mclassdef, self.n_visibility)
mprop = new MVirtualTypeProp(mclassdef, name, mvisibility)
for c in name.chars do if c >= 'a' and c<= 'z' then
modelbuilder.warning(n_id, "Warning: lowercase in the virtual type {name}")
break
end
- if not self.check_redef_keyword(modelbuilder, nclassdef, self.n_kwredef, false, mprop) then return
+ if not self.check_redef_keyword(modelbuilder, mclassdef, self.n_kwredef, false, mprop) then return
else
- if not self.check_redef_keyword(modelbuilder, nclassdef, self.n_kwredef, true, mprop) then return
+ if not self.check_redef_keyword(modelbuilder, mclassdef, self.n_kwredef, true, mprop) then return
assert mprop isa MVirtualTypeProp
- check_redef_property_visibility(modelbuilder, nclassdef, self.n_visibility, mprop)
+ check_redef_property_visibility(modelbuilder, self.n_visibility, mprop)
end
- nclassdef.mprop2npropdef[mprop] = self
+ mclassdef.mprop2npropdef[mprop] = self
var mpropdef = new MVirtualTypeDef(mclassdef, mprop, self.location)
self.mpropdef = mpropdef
set_doc(mpropdef)
end
- redef fun build_signature(modelbuilder, nclassdef)
+ redef fun build_signature(modelbuilder)
do
var mpropdef = self.mpropdef
if mpropdef == null then return # Error thus skiped
# print "{mpropdef}: {mtype}"
end
- redef fun check_signature(modelbuilder, nclassdef)
+ redef fun check_signature(modelbuilder)
do
var mpropdef = self.mpropdef
if mpropdef == null then return # Error thus skiped
# Fast case: the bound is not a formal type
if not bound isa MVirtualType then return
- var mmodule = nclassdef.mclassdef.mmodule
- var anchor = nclassdef.mclassdef.bound_mtype
+ var mclassdef = mpropdef.mclassdef
+ var mmodule = mclassdef.mmodule
+ var anchor = mclassdef.bound_mtype
# Slow case: progress on each resolution until: (i) we loop, or (ii) we found a non formal type
var seen = [self.mpropdef.mproperty.mvirtualtype]
nitlanguage / nit.git / blobdiff