end
end
- # A mixin class can be build the same way that one of its superclasses
- readable attr _is_mixin: Bool = false
-
# Introduce or inherit default constructors
private meth process_default_constructors(v: PropertyBuilderVisitor)
do
if not gp.is_init then continue
super_constructors.add(gp)
end
- var gp = sc.get_property_by_name(once ("init".to_symbol))
- if gp != null then
+ var initname = once ("init".to_symbol)
+ if sc.has_global_property_by_name(initname) then
+ var gp = sc.get_property_by_name(initname)
super_inits.add(self[gp])
end
end
for gp in super_constructors do
var sc = gp.local_class
if supers.has(sc) then continue
- assert sc isa MMSrcLocalClass
- if not sc.is_mixin then
+ if not sc.global.is_mixin then
supers.add(sc)
end
end
make_visible_an_inherited_global_property(gp)
end
end
- _is_mixin = true
+ global.mixin_of = superclass.global
else
# v.error(nodes.first, "Error, constructor required in {self} since no anonimous init found in {sc}.")
# Position of the current star parameter
readable writable attr _vararg_rank: Int = -1
+ # Current closure declarations
+ readable writable attr _closure_decls: Array[AClosureDecl] = new Array[AClosureDecl]
+
# Current signature
readable writable attr _signature: MMSignature = null
end
end
local_class.nodes.add(self)
else
- local_class = new MMSrcLocalClass(name, self, arity)
- mod.add_local_class(local_class)
+ local_class = new MMSrcLocalClass(mod, name, self, arity)
local_classes[name] = local_class
- var g = mod.global_class_named(name)
- if g == null then
- # Intro
+ if not mod.has_global_class_named(name) then
local_class.new_global
- g = local_class.global
else
- local_class.set_global(g)
+ local_class.set_global(mod.global_class_named(name))
end
end
v.error(v.signature_builder.untyped_params.first, "Error: Untyped parameter.")
else
prop.signature = new MMSignature(new Array[MMType], null, v.local_class.get_type)
+ if v.signature_builder.closure_decls != null then
+ for clos in v.signature_builder.closure_decls do
+ prop.signature.closures.add(clos.variable.closure)
+ end
+ end
end
end
end
v.error(self, "Redef error: {prop.local_class}::{prop} redefines {ip.local_class}::{ip} with {isig.arity} parameter(s).")
return
end
+ if v.signature_builder.closure_decls.length != isig.closures.length then
+ v.error(self, "Redef error: {prop.local_class}::{prop} redefines {ip.local_class}::{ip} with {isig.arity} closure(s).")
+ return
+ end
for p in v.signature_builder.params do
var t = isig[p.position]
p.stype = t
end
s = isig
prop.signature = s
+ #print "s is null"
end
+ var nberr = v.tc.error_count
+ #print "Check {prop.local_class}::{prop}{s} vs {ip.local_class}::{ip}{isig}"
+ #print "s={s.object_id} isig={isig.object_id} isigorig={i.signature.object_id}"
+
#print "orig signature: {i.signature.recv} . {i.signature}"
#print "inh signature: {isig.recv} . {isig}"
#print "redef signature: {s.recv} . {s}"
- if glob.is_init and i.local_class.global != prop.local_class.global then
- # Do not check signature
- else if s.arity != isig.arity then
+ if s.arity != isig.arity then
v.error(self, "Redef error: {prop.local_class}::{prop} redefines {ip.local_class}::{ip} with {isig.arity} parameter(s).")
else
for i in [0..s.arity[ do
v.error(self, "Redef error: The function {prop.local_class}::{prop} redefines the procedure {ip.local_class}::{ip}.")
else if srt != null and isrt != null and not srt < isrt then
v.error(self, "Redef error: Expected {isrt} (as in {ip.local_class}::{ip}), got {srt} in {prop.local_class}::{prop}.")
+ else if not s < isig and nberr == v.tc.error_count then
+ # Systematic fallback for conformance check
+ v.error(self, "Redef error: Incompatible redefinition of {ip.local_class}::{ip} with {prop.local_class}::{prop}")
else if srt != null and isrt != null and srt != isrt and prop isa MMAttribute then
# FIXME: To remove
v.warning(self, "Redef warning: Expected {isrt} (as in {ip.local_class}::{ip}), got {srt} in {prop.local_class}::{prop}.")
# Visitor used to build a full method name from multiple tokens
private class MethidAccumulator
special Visitor
- readable attr _name: String
+ readable attr _name: Buffer = new Buffer
redef meth visit(n)
do
if n isa Token then
n.visit_all(self)
end
end
-
- init
- do
- _name = new String
- end
end
redef class PMethid
do
var accumulator = new MethidAccumulator
accumulator.visit(self)
- _name = accumulator.name.to_symbol
+ _name = accumulator.name.to_s.to_symbol
super
end
end
if v.signature_builder.vararg_rank >= 0 then
v.signature_builder.signature.vararg_rank = v.signature_builder.vararg_rank
end
+ for clos in v.signature_builder.closure_decls do
+ v.signature_builder.signature.closures.add(clos.variable.closure)
+ end
end
end
redef meth is_vararg do return n_dotdotdot != null
end
+redef class AClosureDecl
+ redef readable attr _variable: ClosureVariable
+
+ redef meth accept_property_verifier(v)
+ do
+ var old_signature_builder = v.signature_builder
+ v.signature_builder = new SignatureBuilder
+ super
+ var sig = v.signature_builder.signature
+ if sig == null then
+ sig = new MMSignature(new Array[MMType], null, v.local_class.get_type)
+ end
+ if sig.return_type != null and n_kwbreak != null then
+ v.error(self, "Syntax Error: A break block cannot have a return value.")
+ end
+
+ # Add the finalizer to the closure signature
+ var finalize_sig = new MMSignature(new Array[MMType], null, null)
+ var finalizer_clos = new MMClosure(finalize_sig, false, true)
+ sig.closures.add(finalizer_clos)
+
+ var clos = new MMClosure(sig, n_kwbreak != null, n_expr != null)
+ v.signature_builder = old_signature_builder
+ old_signature_builder.closure_decls.add(self)
+ _variable = new ClosureVariable(n_id.to_symbol, self, clos)
+ end
+end
+
redef class PType
# Check that visibilities of types in the signature are compatible with the visibility of the property.
private meth check_visibility(v: AbsSyntaxVisitor, p: MMLocalProperty) is abstract
nitlanguage / nit.git / blobdiff