X-Git-Url: http://nitlanguage.org diff --git a/src/model/model.nit b/src/model/model.nit index cd1e570..4395cee 100644 --- a/src/model/model.nit +++ b/src/model/model.nit @@ -1762,9 +1762,25 @@ class MSignature # Example: for "(a: Int, b: Bool..., c: Char)" #-> vararg_rank=1 var vararg_rank: Int is noinit - # The number or parameters + # The number of parameters fun arity: Int do return mparameters.length + # The number of non-default parameters + # + # The number of default parameters is then `arity-min_arity`. + # + # Note that there cannot be both varargs and default prameters, thus + # if `vararg_rank != -1` then `min_arity` == `arity` + fun min_arity: Int + do + if vararg_rank != -1 then return arity + var res = 0 + for p in mparameters do + if not p.is_default then res += 1 + end + return res + end + redef fun to_s do var b = new FlatBuffer @@ -1818,6 +1834,9 @@ class MParameter # Is the parameter a vararg? var is_vararg: Bool + # Is the parameter a default one? + var is_default: Bool + redef fun to_s do if is_vararg then @@ -1833,7 +1852,7 @@ class MParameter do if not self.mtype.need_anchor then return self var newtype = self.mtype.resolve_for(mtype, anchor, mmodule, cleanup_virtual) - var res = new MParameter(self.name, newtype, self.is_vararg) + var res = new MParameter(self.name, newtype, self.is_vararg, self.is_default) return res end