syntax: better message for signature errors
[nit.git] / src / syntax / mmbuilder.nit
index ce875a8..0c41698 100644 (file)
@@ -529,6 +529,7 @@ redef class AClassdef
                var local_classes = mod.src_local_classes
                if (local_classes.has_key(name)) then
                        local_class = local_classes[name]
+                       _local_class = local_class
                        if self isa AStdClassdef then
                                # If we are not a special implicit class then rant
                                v.error(self, "Error: A class {name} is already defined at line {local_class.node.location.line_start}.")
@@ -540,15 +541,16 @@ redef class AClassdef
                        n.next_node = self
                else
                        local_class = new MMSrcLocalClass(mod, name, self, arity)
+                       _local_class = local_class
                        local_classes[name] = local_class
                        if not mod.has_global_class_named(name) then
-                               local_class.new_global
+                               build_class_introduction(v)
                        else
-                               local_class.set_global(mod.global_class_named(name))
+                               var glob = mod.global_class_named(name)
+                               build_class_refinement(v, glob)
                        end
 
                end
-               _local_class = local_class
                v.local_class_arity = 0
                v.formals = local_class.formal_dict
 
@@ -559,6 +561,70 @@ redef class AClassdef
                v.formals = null
        end
 
+       fun build_class_introduction(v: AbsSyntaxVisitor)
+       do
+               local_class.new_global
+               var glob = local_class.global
+
+               glob.visibility_level = visibility_level
+               if self isa AStdClassdef then
+                       if n_kwredef != null then
+                               v.error(self, "Redef error: No class {name} is imported. Remove the redef keyword to define a new class.")
+                               return
+                       end
+                       glob.is_interface = n_classkind.is_interface
+                       glob.is_abstract = n_classkind.is_abstract
+                       glob.is_enum = n_classkind.is_enum
+               end
+       end
+
+       fun build_class_refinement(v: AbsSyntaxVisitor, glob: MMGlobalClass)
+       do
+               local_class.set_global(glob)
+
+               glob.check_visibility(v, self, v.mmmodule)
+               if self isa AStdClassdef and n_kwredef == null then
+                       v.error(self, "Redef error: {name} is an imported class. Add the redef keyword to refine it.")
+                       return
+               end
+
+               if glob.intro.arity != _local_class.arity then
+                       v.error(self, "Redef error: Formal parameter arity missmatch; got {_local_class.arity}, expected {glob.intro.arity}.")
+               end
+
+               if self isa AStdClassdef and (not glob.is_interface and n_classkind.is_interface or
+                       not glob.is_abstract and n_classkind.is_abstract or
+                       not glob.is_enum and n_classkind.is_enum)
+               then
+                       v.error(self, "Redef error: cannot change kind of class {name}.")
+               end
+       end
+
+       redef fun accept_class_verifier(v)
+       do
+               super
+               var glob = _local_class.global
+               for c in _local_class.cshe.direct_greaters do
+                       var cg = c.global
+                       if glob.is_interface then
+                               if cg.is_enum then
+                                       v.error(self, "Special error: Interface {name} try to specialise enum class {c.name}.")
+                               else if not cg.is_interface then
+                                       v.error(self, "Special error: Interface {name} try to specialise class {c.name}.")
+                               end
+                       else if glob.is_enum then
+                               if not cg.is_interface and not cg.is_enum then
+                                       v.error(self, "Special error: Enum class {name} try to specialise class {c.name}.")
+                               end
+                       else
+                               if cg.is_enum then
+                                       v.error(self, "Special error: Class {name} try to specialise enum class {c.name}.")
+                               end
+                       end
+
+               end
+       end
+
        redef fun accept_abs_syntax_visitor(v)
        do
                v.local_class = _local_class
@@ -592,62 +658,6 @@ redef class AStdClassdef
        do
                return n_formaldefs.length
        end
-       redef fun accept_class_verifier(v)
-       do
-               super
-               var glob = _local_class.global
-               if glob.intro == _local_class then
-                       # Intro
-                       glob.visibility_level = visibility_level
-                       glob.is_interface = n_classkind.is_interface
-                       glob.is_abstract = n_classkind.is_abstract
-                       glob.is_enum = n_classkind.is_enum
-                       if n_kwredef != null then
-                               v.error(self, "Redef error: No class {name} is imported. Remove the redef keyword to define a new class.")
-                       end
-
-                       for c in _local_class.cshe.direct_greaters do
-                               var cg = c.global
-                               if glob.is_interface then
-                                       if cg.is_enum then
-                                               v.error(self, "Special error: Interface {name} try to specialise enum class {c.name}.")
-                                       else if not cg.is_interface then
-                                               v.error(self, "Special error: Interface {name} try to specialise class {c.name}.")
-                                       end
-                               else if glob.is_enum then
-                                       if not cg.is_interface and not cg.is_enum then
-                                               v.error(self, "Special error: Enum class {name} try to specialise class {c.name}.")
-                                       end
-                               else
-                                       if cg.is_enum then
-                                               v.error(self, "Special error: Class {name} try to specialise enum class {c.name}.")
-                                       end
-                               end
-
-                       end
-                       return
-               end
-
-               # Redef
-
-               glob.check_visibility(v, self, v.mmmodule)
-               if n_kwredef == null then
-                       v.error(self, "Redef error: {name} is an imported class. Add the redef keyword to refine it.")
-                       return
-               end
-
-               if glob.intro.arity != _local_class.arity then
-                       v.error(self, "Redef error: Formal parameter arity missmatch; got {_local_class.arity}, expected {glob.intro.arity}.")
-               end
-
-               if 
-                       not glob.is_interface and n_classkind.is_interface or
-                       not glob.is_abstract and n_classkind.is_abstract or
-                       not glob.is_enum and n_classkind.is_enum
-               then
-                       v.error(self, "Redef error: cannot change kind of class {name}.")
-               end
-       end
 
        redef fun visibility_level
        do
@@ -882,11 +892,22 @@ redef class APropdef
 
                        if s.arity != isig.arity then
                                v.error(self, "Redef error: {prop.local_class}::{prop} redefines {ip.local_class}::{ip} with {isig.arity} parameter(s).")
-                       else
-                               for j in [0..s.arity[ do
-                                       if s[j] != isig[j] then
-                                               v.error(self, "Redef error: Expected {isig[j]} (as in {ip.local_class}::{ip}), got {s[j]} in {prop.local_class}::{prop}.")
+                       else if s.arity > 0 then
+                               if self isa AMethPropdef then
+                                       # A standard method
+                                       for j in [0..s.arity[ do
+                                               if s[j] != isig[j] then
+                                                       v.error(n_signature.n_params[j], "Redef error: Expected {isig[j]}, as in {ip.local_class}::{ip}.")
+                                               end
+                                       end
+                               else if self isa AAttrPropdef then
+                                       # A write accessor
+                                       if s[0] != isig[0] then
+                                               v.error(n_type, "Redef error: Expected {isig[0]}, as in the parameter of {ip.local_class}::{ip}.")
                                        end
+
+                               else
+                                       abort #
                                end
                        end
 
@@ -897,13 +918,21 @@ redef class APropdef
                        else if srt != null and isrt == null then
                                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}.")
+                               var n: nullable ANode = null
+                               if self isa AMethPropdef then
+                                       n = self.n_signature.n_type
+                               else if self isa AAttrPropdef then
+                                       n = self.n_type
+                               else if self isa ATypePropdef then
+                                       n = self.n_type
+                               end
+                               v.error(n, "Redef error: Expected {isrt}, as in {ip.local_class}::{ip}.")
                        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}.")
+                               v.warning(self, "Redef warning: Expected {isrt}, as in {ip.local_class}::{ip}.")
                        end
                end