parser: generalise Prod::collect_text

[nit.git] / src / modelize / modelize_class.nit

diff --git a/src/modelize/modelize_class.nit b/src/modelize/modelize_class.nit
index 9fa812f..2a5e9fb 100644 (file)
--- a/src/modelize/modelize_class.nit
+++ b/src/modelize/modelize_class.nit
@@ -104,7 +104,7 @@ redef class ModelBuilder
                else if nclassdef isa AStdClassdef and nclassdef.n_kwredef == null then
                        error(nclassdef, "Redef error: {name} is an imported class. Add the redef keyword to refine it.")
                        return
-               else if mclass.arity != arity then
+               else if arity != 0 and mclass.arity != arity then
                        error(nclassdef, "Redef error: Formal parameter arity missmatch; got {arity}, expected {mclass.arity}.")
                        return
                else if nkind != null and mkind != concrete_kind and mclass.kind != mkind then
@@ -141,6 +141,12 @@ redef class ModelBuilder
                if nclassdef isa AStdClassdef and mclass.arity > 0 then
                        # Revolve bound for formal parameters
                        for i in [0..mclass.arity[ do
+                               if nclassdef.n_formaldefs.is_empty then
+                                       # Inherit the bound
+                                       var bound = mclass.intro.bound_mtype.arguments[i]
+                                       bounds.add(bound)
+                                       continue
+                               end
 
                                var nfd = nclassdef.n_formaldefs[i]
                                var pname = mclass.mparameters[i].name
@@ -430,19 +436,19 @@ redef class ModelBuilder
                end
 
                # Check parameter type
-               if mclassdef != null and mclassdef.parameter_names.has(name) then
-                       if not ntype.n_types.is_empty then
-                               error(ntype, "Type error: formal type {name} cannot have formal parameters.")
-                       end
-                       for i in [0..mclassdef.parameter_names.length[ do
-                               if mclassdef.parameter_names[i] == name then
-                                       res = mclassdef.mclass.mclass_type.arguments[i]
-                                       if ntype.n_kwnullable != null then res = res.as_nullable
-                                       ntype.mtype = res
-                                       return res
+               if mclassdef != null then
+                       for p in mclassdef.mclass.mparameters do
+                               if p.name != name then continue
+
+                               if not ntype.n_types.is_empty then
+                                       error(ntype, "Type error: formal type {name} cannot have formal parameters.")
                                end
+
+                               res = p
+                               if ntype.n_kwnullable != null then res = res.as_nullable
+                               ntype.mtype = res
+                               return res
                        end
-                       abort
                end
 
                # Check class