metamodel: MMLocalClass::init takes the MMModule

[nit.git] / src / syntax / mmbuilder.nit

diff --git a/src/syntax/mmbuilder.nit b/src/syntax/mmbuilder.nit
index 6a03fde..cdcf45e 100644 (file)
--- a/src/syntax/mmbuilder.nit
+++ b/src/syntax/mmbuilder.nit
@@ -173,8 +173,9 @@ redef class MMSrcLocalClass
                                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
@@ -522,16 +523,12 @@ redef class PClassdef
                        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
@@ -851,6 +848,10 @@ redef class PPropdef
                                        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
@@ -861,8 +862,13 @@ redef class PPropdef
                                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}"
@@ -885,6 +891,9 @@ redef class PPropdef
                                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}.")
@@ -1055,7 +1064,7 @@ end
 # 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
@@ -1064,11 +1073,6 @@ special Visitor
                        n.visit_all(self)
                end
        end
-
-       init
-       do
-               _name = new String
-       end
 end
 
 redef class PMethid
@@ -1079,7 +1083,7 @@ 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
@@ -1180,9 +1184,15 @@ redef class AClosureDecl
                        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 bloc cannot have a return value.")
+                       v.error(self, "Syntax Error: A break block cannot have a return value.")
                end
-               var clos = new MMClosure(sig, n_kwbreak != null)
+
+               # 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)