mm: adds param name to signatures

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

diff --git a/src/syntax/mmbuilder.nit b/src/syntax/mmbuilder.nit
index 8312018..edbd44f 100644 (file)
--- a/src/syntax/mmbuilder.nit
+++ b/src/syntax/mmbuilder.nit
@@ -292,17 +292,17 @@ redef class MMImplicitInit
                end
                _super_init = base
 
-               var params = new Array[MMType]
+               var params = new Array[MMParam]
                if base != null then
                        var sig = base.signature
                        for i in [0..sig.arity[ do
-                               params.add(sig[i])
+                               params.add(sig.params[i])
                        end
                end
                for a in unassigned_attributes do
                        var sig = a.signature
                        if sig == null then return # Broken attribute definition
-                       params.add(sig.return_type.as(not null))
+                       params.add( new MMParam( sig.return_type.as(not null), once "recv".to_symbol))
                end
                signature = new MMSignature(params, null, local_class.get_type)
        end
@@ -792,7 +792,7 @@ redef class APropdef
                        else if not v.signature_builder.untyped_params.is_empty then
                                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)
+                               prop.signature = new MMSignature(new Array[MMParam], null, v.local_class.get_type)
                                for clos in v.signature_builder.closure_decls do
                                        prop.signature.closures.add(clos.variable.closure)
                                end
@@ -967,7 +967,7 @@ redef class AAttrPropdef
                end
 
                var prop = prop
-               var signature = new MMSignature(new Array[MMType], t, v.local_class.get_type)
+               var signature = new MMSignature(new Array[MMParam], t, v.local_class.get_type)
                prop.signature = signature
                var visibility_level = n_visibility.level
                process_and_check(v, prop, n_id != null and n_kwredef != null, visibility_level)
@@ -979,7 +979,7 @@ redef class AAttrPropdef
                end
                if n_writable != null or n_id == null then
                        var m = _writemethod.as(not null)
-                       m.signature = new MMSignature(new Array[MMType].with_items(t), null, v.local_class.get_type)
+                       m.signature = new MMSignature(new Array[MMParam].with_items(new MMParam(t, once "value".to_symbol)), null, v.local_class.get_type)
                        var vl = visibility_level
                        if n_id == null then
                                if n_writable == null then vl = 3 else vl = n_writable.n_visibility.level # write accessor has a specific visibility
@@ -1062,7 +1062,7 @@ redef class AMainMethPropdef
        redef fun process_and_check(v, prop, has_redef, visibility_level)
        do
                prop.global.visibility_level = visibility_level
-               prop.signature = new MMSignature(new Array[MMType], null, v.local_class.get_type)
+               prop.signature = new MMSignature(new Array[MMParam], null, v.local_class.get_type)
                # Disable all checks for main
        end
 end
@@ -1098,7 +1098,7 @@ redef class ATypePropdef
        redef fun accept_property_verifier(v)
        do
                super
-               var signature = new MMSignature(new Array[MMType], n_type.get_stype(v), v.local_class.get_type)
+               var signature = new MMSignature(new Array[MMParam], n_type.get_stype(v), v.local_class.get_type)
                prop.signature = signature
                var visibility_level = n_visibility.level
                process_and_check(v, prop, n_kwredef != null, visibility_level)
@@ -1151,9 +1151,9 @@ redef class ASignature
                                return
                        end
                else if not v.signature_builder.params.is_empty or n_type != null then
-                       var pars = new Array[MMType]
+                       var pars = new Array[MMParam]
                        for p in v.signature_builder.params do
-                               pars.add(p.stype.as(not null))
+                               pars.add( new MMParam( p.stype.as(not null),  p.n_id.to_symbol ) )
                        end
                        var ret: nullable MMType = null
                        if n_type != null then
@@ -1241,14 +1241,14 @@ redef class AClosureDecl
                end
                var sig = v.signature_builder.signature
                if sig == null then
-                       sig = new MMSignature(new Array[MMType], null, v.local_class.get_type)
+                       sig = new MMSignature(new Array[MMParam], 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, v.mmmodule.type_any) # FIXME should be no receiver
+               var finalize_sig = new MMSignature(new Array[MMParam], null, v.mmmodule.type_any) # FIXME should be no receiver
                var finalizer_clos = new MMClosure(once ("break".to_symbol), finalize_sig, false, true)
                sig.closures.add(finalizer_clos)