From a871d59fa2467c4bac97a1106a8c7a8ec5b568ac Mon Sep 17 00:00:00 2001 From: Jean Privat Date: Thu, 25 Dec 2008 05:56:42 -0500 Subject: [PATCH] Do not abort when comparing signatures, just return false --- src/metamodel/static_type.nit | 3 +-- src/syntax/mmbuilder.nit | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/metamodel/static_type.nit b/src/metamodel/static_type.nit index e7a2c6e..2720fa4 100644 --- a/src/metamodel/static_type.nit +++ b/src/metamodel/static_type.nit @@ -97,8 +97,7 @@ class MMSignature return true end assert _recv.module == s.recv.module - assert arity == s.arity - assert (_return_type == null) == (s.return_type == null) + if arity != s.arity or (_return_type == null) != (s.return_type == null) then return false if _return_type != null and not _return_type < s.return_type then return false end diff --git a/src/syntax/mmbuilder.nit b/src/syntax/mmbuilder.nit index 56e2ace..5b4c47a 100644 --- a/src/syntax/mmbuilder.nit +++ b/src/syntax/mmbuilder.nit @@ -674,7 +674,7 @@ redef class PPropdef if s == null then if v.params.length != isig.arity then - prop.node.printl("v.params.length {v.params.length} != isig.arity {isig.arity} ; {prop.full_name} vs {ip.full_name}") + #prop.node.printl("v.params.length {v.params.length} != isig.arity {isig.arity} ; {prop.full_name} vs {ip.full_name}") return end for p in v.params do -- 1.7.9.5