parser: locate errors with locations in ANode

Locate declarations of modules, classes and properties on their identifier.

Signed-off-by: Jean Privat <jean@pryen.org>

diff --git a/src/parser/parser_nodes.nit b/src/parser/parser_nodes.nit
index 6178ce6..a5f09ca 100644 (file)
--- a/src/parser/parser_nodes.nit
+++ b/src/parser/parser_nodes.nit
@@ -27,6 +27,8 @@ abstract class ANode
        # Location is set during AST building. Once built, location cannon be null
        # However, manual instanciated nodes may need mode care
        fun location: Location do return _location.as(not null)
+       # The location of the important part of the node (identifier or whatever)
+       fun hot_location: Location do return location
 end
 
 # Ancestor of all tokens
@@ -326,6 +328,7 @@ class AModuledecl
     readable var _n_doc: nullable ADoc = null
     readable var _n_kwmodule: TKwmodule
     readable var _n_id: TId
+    redef fun hot_location do return n_id.location
 end
 class AImport super Prod end
 class AStdImport
@@ -367,6 +370,7 @@ class AStdClassdef
     readable var _n_formaldefs: List[AFormaldef] = new List[AFormaldef]
     readable var _n_superclasses: List[ASuperclass] = new List[ASuperclass]
     readable var _n_propdefs: List[APropdef] = new List[APropdef]
+    redef fun hot_location do return n_id.location
 end
 class ATopClassdef
        super AClassdef
@@ -419,6 +423,10 @@ class AAttrPropdef
     readable var _n_readable: nullable AAble = null
     readable var _n_writable: nullable AAble = null
     readable var _n_expr: nullable AExpr = null
+    redef fun hot_location
+    do
+           if n_id != null then return n_id.location else return n_id2.location
+    end
 end
 class AMethPropdef
        super APropdef
@@ -426,6 +434,14 @@ class AMethPropdef
     readable var _n_visibility: nullable AVisibility
     readable var _n_methid: nullable AMethid = null
     readable var _n_signature: nullable ASignature
+    redef fun hot_location
+    do
+           if n_methid != null then
+                   return n_methid.location
+           else
+                   return location
+           end
+    end
 end
 class ADeferredMethPropdef
        super AMethPropdef
@@ -448,6 +464,7 @@ end
 class AConcreteInitPropdef
        super AConcreteMethPropdef
     readable var _n_kwinit: TKwinit
+    redef fun hot_location do return n_kwinit.location
 end
 class AMainMethPropdef
        super AConcreteMethPropdef

diff --git a/src/syntax/syntax_base.nit b/src/syntax/syntax_base.nit
index 6d9bf07..127163d 100644 (file)
--- a/src/syntax/syntax_base.nit
+++ b/src/syntax/syntax_base.nit
@@ -393,19 +393,19 @@ class AbsSyntaxVisitor
        # Display an error for a given syntax node
        fun error(n: nullable ANode, s: String)
        do
-               _tc.error(if n == null then null else n.location, s)
+               _tc.error(if n == null then null else n.hot_location, s)
        end
 
        # Add an error, show errors and quit
        fun fatal_error(n: nullable ANode, s: String)
        do
-               _tc.fatal_error(if n == null then null else n.location, s)
+               _tc.fatal_error(if n == null then null else n.hot_location, s)
        end
 
        # Display a warning for a given syntax node
        fun warning(n: nullable ANode, s: String)
        do
-               _tc.warning(if n == null then null else n.location, s)
+               _tc.warning(if n == null then null else n.hot_location, s)
        end
 
        # Check conformity and display error

diff --git a/tests/sav/base_attr5_alt1.sav b/tests/sav/base_attr5_alt1.sav
index e65b884..d8a9533 100644 (file)
--- a/tests/sav/base_attr5_alt1.sav
+++ b/tests/sav/base_attr5_alt1.sav
@@ -1 +1 @@
-alt/base_attr5_alt1.nit:34,2--18: Redef error: B::foo is an inherited property. To redefine it, add the redef keyword.
+alt/base_attr5_alt1.nit:34,6--8: Redef error: B::foo is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/base_attr5_alt11.sav b/tests/sav/base_attr5_alt11.sav
index 346d578..c09dc40 100644 (file)
--- a/tests/sav/base_attr5_alt11.sav
+++ b/tests/sav/base_attr5_alt11.sav
@@ -1 +1 @@
-alt/base_attr5_alt11.nit:41,2--18: Redef error: B::bar= is an inherited property. To redefine it, add the redef keyword.
+alt/base_attr5_alt11.nit:41,6--8: Redef error: B::bar= is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/base_attr5_alt12.sav b/tests/sav/base_attr5_alt12.sav
index 4a7fad3..94161cb 100644 (file)
--- a/tests/sav/base_attr5_alt12.sav
+++ b/tests/sav/base_attr5_alt12.sav
@@ -1,2 +1,2 @@
-alt/base_attr5_alt12.nit:41,2--42,24: Error: No property B::bar is inherited. Remove the redef keyword to define a new property.
-alt/base_attr5_alt12.nit:41,2--42,24: Redef error: B::bar= is an inherited property. To redefine it, add the redef keyword.
+alt/base_attr5_alt12.nit:42,12--14: Error: No property B::bar is inherited. Remove the redef keyword to define a new property.
+alt/base_attr5_alt12.nit:42,12--14: Redef error: B::bar= is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/base_attr5_alt13.sav b/tests/sav/base_attr5_alt13.sav
index 55c9894..f94d858 100644 (file)
--- a/tests/sav/base_attr5_alt13.sav
+++ b/tests/sav/base_attr5_alt13.sav
@@ -1 +1 @@
-alt/base_attr5_alt13.nit:41,2--43,27: Redef error: B::bar= is an inherited property. To redefine it, add the redef keyword.
+alt/base_attr5_alt13.nit:43,6--8: Redef error: B::bar= is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/base_attr5_alt14.sav b/tests/sav/base_attr5_alt14.sav
index 32b4ed4..1da576a 100644 (file)
--- a/tests/sav/base_attr5_alt14.sav
+++ b/tests/sav/base_attr5_alt14.sav
@@ -1,2 +1,2 @@
-alt/base_attr5_alt14.nit:41,2--44,33: Error: No property B::bar is inherited. Remove the redef keyword to define a new property.
-alt/base_attr5_alt14.nit:41,2--44,33: Redef error: B::bar= is an inherited property. To redefine it, add the redef keyword.
+alt/base_attr5_alt14.nit:44,12--14: Error: No property B::bar is inherited. Remove the redef keyword to define a new property.
+alt/base_attr5_alt14.nit:44,12--14: Redef error: B::bar= is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/base_attr5_alt16.sav b/tests/sav/base_attr5_alt16.sav
index 500c953..f39c3d7 100644 (file)
--- a/tests/sav/base_attr5_alt16.sav
+++ b/tests/sav/base_attr5_alt16.sav
@@ -1 +1 @@
-alt/base_attr5_alt16.nit:41,2--46,39: Error: No property B::bar is inherited. Remove the redef keyword to define a new property.
+alt/base_attr5_alt16.nit:46,12--14: Error: No property B::bar is inherited. Remove the redef keyword to define a new property.

diff --git a/tests/sav/base_attr5_alt21.sav b/tests/sav/base_attr5_alt21.sav
index 842b17e..c3a66cf 100644 (file)
--- a/tests/sav/base_attr5_alt21.sav
+++ b/tests/sav/base_attr5_alt21.sav
@@ -1,2 +1,2 @@
-alt/base_attr5_alt21.nit:48,2--18: Redef error: B::baz is an inherited property. To redefine it, add the redef keyword.
-alt/base_attr5_alt21.nit:48,2--18: Redef error: B::baz= is an inherited property. To redefine it, add the redef keyword.
+alt/base_attr5_alt21.nit:48,6--8: Redef error: B::baz is an inherited property. To redefine it, add the redef keyword.
+alt/base_attr5_alt21.nit:48,6--8: Redef error: B::baz= is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/base_attr5_alt22.sav b/tests/sav/base_attr5_alt22.sav
index cbc00dc..522382e 100644 (file)
--- a/tests/sav/base_attr5_alt22.sav
+++ b/tests/sav/base_attr5_alt22.sav
@@ -1 +1 @@
-alt/base_attr5_alt22.nit:48,2--49,24: Redef error: B::baz= is an inherited property. To redefine it, add the redef keyword.
+alt/base_attr5_alt22.nit:49,12--14: Redef error: B::baz= is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/base_attr5_alt23.sav b/tests/sav/base_attr5_alt23.sav
index 3ee67c0..a6b02f7 100644 (file)
--- a/tests/sav/base_attr5_alt23.sav
+++ b/tests/sav/base_attr5_alt23.sav
@@ -1,2 +1,2 @@
-alt/base_attr5_alt23.nit:48,2--50,27: Redef error: B::baz is an inherited property. To redefine it, add the redef keyword.
-alt/base_attr5_alt23.nit:48,2--50,27: Redef error: B::baz= is an inherited property. To redefine it, add the redef keyword.
+alt/base_attr5_alt23.nit:50,6--8: Redef error: B::baz is an inherited property. To redefine it, add the redef keyword.
+alt/base_attr5_alt23.nit:50,6--8: Redef error: B::baz= is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/base_attr5_alt24.sav b/tests/sav/base_attr5_alt24.sav
index 33d26ec..6e9c596 100644 (file)
--- a/tests/sav/base_attr5_alt24.sav
+++ b/tests/sav/base_attr5_alt24.sav
@@ -1 +1 @@
-alt/base_attr5_alt24.nit:48,2--51,33: Redef error: B::baz= is an inherited property. To redefine it, add the redef keyword.
+alt/base_attr5_alt24.nit:51,12--14: Redef error: B::baz= is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/base_attr5_alt25.sav b/tests/sav/base_attr5_alt25.sav
index 79508d8..a51e259 100644 (file)
--- a/tests/sav/base_attr5_alt25.sav
+++ b/tests/sav/base_attr5_alt25.sav
@@ -1 +1 @@
-alt/base_attr5_alt25.nit:48,2--52,33: Redef error: B::baz is an inherited property. To redefine it, add the redef keyword.
+alt/base_attr5_alt25.nit:52,6--8: Redef error: B::baz is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/base_attr5_alt3.sav b/tests/sav/base_attr5_alt3.sav
index b9792b5..2431981 100644 (file)
--- a/tests/sav/base_attr5_alt3.sav
+++ b/tests/sav/base_attr5_alt3.sav
@@ -1 +1 @@
-alt/base_attr5_alt3.nit:34,2--36,27: Redef error: B::foo is an inherited property. To redefine it, add the redef keyword.
+alt/base_attr5_alt3.nit:36,6--8: Redef error: B::foo is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/base_attr5_alt5.sav b/tests/sav/base_attr5_alt5.sav
index 93e9b7d..5803835 100644 (file)
--- a/tests/sav/base_attr5_alt5.sav
+++ b/tests/sav/base_attr5_alt5.sav
@@ -1,2 +1,2 @@
-alt/base_attr5_alt5.nit:34,2--38,33: Redef error: B::foo is an inherited property. To redefine it, add the redef keyword.
-alt/base_attr5_alt5.nit:34,2--38,33: Error: No property B::foo= is inherited. Remove the redef keyword to define a new property.
+alt/base_attr5_alt5.nit:38,6--8: Redef error: B::foo is an inherited property. To redefine it, add the redef keyword.
+alt/base_attr5_alt5.nit:38,6--8: Error: No property B::foo= is inherited. Remove the redef keyword to define a new property.

diff --git a/tests/sav/base_attr5_alt6.sav b/tests/sav/base_attr5_alt6.sav
index 7756f12..a8a0ff4 100644 (file)
--- a/tests/sav/base_attr5_alt6.sav
+++ b/tests/sav/base_attr5_alt6.sav
@@ -1 +1 @@
-alt/base_attr5_alt6.nit:34,2--39,39: Error: No property B::foo= is inherited. Remove the redef keyword to define a new property.
+alt/base_attr5_alt6.nit:39,12--14: Error: No property B::foo= is inherited. Remove the redef keyword to define a new property.

diff --git a/tests/sav/base_control_flow_alt1.sav b/tests/sav/base_control_flow_alt1.sav
index 7013490..9d515d9 100644 (file)
--- a/tests/sav/base_control_flow_alt1.sav
+++ b/tests/sav/base_control_flow_alt1.sav
@@ -1,2 +1,2 @@
-alt/base_control_flow_alt1.nit:26,1--30,2: Control error: Reached end of function (a 'return' with a value was expected).
-alt/base_control_flow_alt1.nit:33,1--41,2: Control error: Reached end of function (a 'return' with a value was expected).
+alt/base_control_flow_alt1.nit:26,5: Control error: Reached end of function (a 'return' with a value was expected).
+alt/base_control_flow_alt1.nit:33,5: Control error: Reached end of function (a 'return' with a value was expected).

diff --git a/tests/sav/base_init_inherit2_alt3.sav b/tests/sav/base_init_inherit2_alt3.sav
index 2f118ea..bf88578 100644 (file)
--- a/tests/sav/base_init_inherit2_alt3.sav
+++ b/tests/sav/base_init_inherit2_alt3.sav
@@ -1 +1 @@
-alt/base_init_inherit2_alt3.nit:75,1--81,7: Error: Explicit constructor required in N since multiple inheritance of constructor is forbiden. Conflicting classes are B, C. Costructors are base_init_inherit2_alt3::B::cb, base_init_inherit2_alt3::A::ca, base_init_inherit2_alt3::C::cc.
+alt/base_init_inherit2_alt3.nit:75,7: Error: Explicit constructor required in N since multiple inheritance of constructor is forbiden. Conflicting classes are B, C. Costructors are base_init_inherit2_alt3::B::cb, base_init_inherit2_alt3::A::ca, base_init_inherit2_alt3::C::cc.

diff --git a/tests/sav/base_init_inherit3.sav b/tests/sav/base_init_inherit3.sav
index daceadd..64617a6 100644 (file)
--- a/tests/sav/base_init_inherit3.sav
+++ b/tests/sav/base_init_inherit3.sav
@@ -1 +1 @@
-./base_init_inherit3.nit:85,2--88,7: Error: No property Q::foo is inherited. Remove the redef keyword to define a new property.
+./base_init_inherit3.nit:85,12--14: Error: No property Q::foo is inherited. Remove the redef keyword to define a new property.

diff --git a/tests/sav/base_init_linext2_alt2.sav b/tests/sav/base_init_linext2_alt2.sav
index ce93357..e022a55 100644 (file)
--- a/tests/sav/base_init_linext2_alt2.sav
+++ b/tests/sav/base_init_linext2_alt2.sav
@@ -1 +1 @@
-alt/base_init_linext2_alt2.nit:99,2--112,12: Error: there is no available compatible constrctor in B. Discarded candidates are base_init_linext2_alt2::B::initb, base_init_linext2_alt2::B::init_par, base_init_linext2_alt2::B::init_par2(Char).
+alt/base_init_linext2_alt2.nit:99,2--5: Error: there is no available compatible constrctor in B. Discarded candidates are base_init_linext2_alt2::B::initb, base_init_linext2_alt2::B::init_par, base_init_linext2_alt2::B::init_par2(Char).

diff --git a/tests/sav/base_init_linext2_alt4.sav b/tests/sav/base_init_linext2_alt4.sav
index 3be440e..5bb9c27 100644 (file)
--- a/tests/sav/base_init_linext2_alt4.sav
+++ b/tests/sav/base_init_linext2_alt4.sav
@@ -1,2 +1,2 @@
+alt/base_init_linext2_alt4.nit:99,2--5: Error: there is no available compatible constrctor in B. Discarded candidates are base_init_linext2_alt4::B::initb, base_init_linext2_alt4::B::init_par, base_init_linext2_alt4::B::init_par2(Char).
 alt/base_init_linext2_alt4.nit:105,3--7: Error: Constructor of B must be invoked before constructor of C
-alt/base_init_linext2_alt4.nit:99,2--113,12: Error: there is no available compatible constrctor in B. Discarded candidates are base_init_linext2_alt4::B::initb, base_init_linext2_alt4::B::init_par, base_init_linext2_alt4::B::init_par2(Char).

diff --git a/tests/sav/base_init_simple_alt1.sav b/tests/sav/base_init_simple_alt1.sav
index c31ffd1..8726ea6 100644 (file)
--- a/tests/sav/base_init_simple_alt1.sav
+++ b/tests/sav/base_init_simple_alt1.sav
@@ -1,3 +1,3 @@
-alt/base_init_simple_alt1.nit:11,2--25: Error: No property B::init is inherited. Remove the redef keyword to define a new property.
-alt/base_init_simple_alt1.nit:12,2--31: Error: No property B::init2 is inherited. Remove the redef keyword to define a new property.
-alt/base_init_simple_alt1.nit:13,2--31: Error: No property B::init3 is inherited. Remove the redef keyword to define a new property.
+alt/base_init_simple_alt1.nit:11,8--11: Error: No property B::init is inherited. Remove the redef keyword to define a new property.
+alt/base_init_simple_alt1.nit:12,8--11: Error: No property B::init2 is inherited. Remove the redef keyword to define a new property.
+alt/base_init_simple_alt1.nit:13,8--11: Error: No property B::init3 is inherited. Remove the redef keyword to define a new property.

diff --git a/tests/sav/error_attr_2def.sav b/tests/sav/error_attr_2def.sav
index 4259721..0415621 100644 (file)
--- a/tests/sav/error_attr_2def.sav
+++ b/tests/sav/error_attr_2def.sav
@@ -1 +1 @@
-./error_attr_2def.nit:19,2--18: Error: A property _toto is already defined in class A.
+./error_attr_2def.nit:19,6--10: Error: A property _toto is already defined in class A.

diff --git a/tests/sav/error_class_generic_alt1.sav b/tests/sav/error_class_generic_alt1.sav
index 7c16aaf..f7e9a89 100644 (file)
--- a/tests/sav/error_class_generic_alt1.sav
+++ b/tests/sav/error_class_generic_alt1.sav
@@ -1 +1 @@
-alt/error_class_generic_alt1.nit:17,1--17: Redef error: Formal parameter arity missmatch; got 0, expected 1.
+alt/error_class_generic_alt1.nit:17,13--17: Redef error: Formal parameter arity missmatch; got 0, expected 1.

diff --git a/tests/sav/error_class_generic_alt3.sav b/tests/sav/error_class_generic_alt3.sav
index 099b01d..95235a6 100644 (file)
--- a/tests/sav/error_class_generic_alt3.sav
+++ b/tests/sav/error_class_generic_alt3.sav
@@ -1 +1 @@
-alt/error_class_generic_alt3.nit:17,1--19,34: Redef error: Formal parameter arity missmatch; got 2, expected 1.
+alt/error_class_generic_alt3.nit:19,13--17: Redef error: Formal parameter arity missmatch; got 2, expected 1.

diff --git a/tests/sav/error_class_generic_alt4.sav b/tests/sav/error_class_generic_alt4.sav
index b9e726b..393c1d3 100644 (file)
--- a/tests/sav/error_class_generic_alt4.sav
+++ b/tests/sav/error_class_generic_alt4.sav
@@ -1 +1 @@
-alt/error_class_generic_alt4.nit:17,1--20,11: Redef error: Array is an imported class. Add the redef keyword to refine it.
+alt/error_class_generic_alt4.nit:20,7--11: Redef error: Array is an imported class. Add the redef keyword to refine it.

diff --git a/tests/sav/error_class_generic_alt5.sav b/tests/sav/error_class_generic_alt5.sav
index bcb709d..c5d9def 100644 (file)
--- a/tests/sav/error_class_generic_alt5.sav
+++ b/tests/sav/error_class_generic_alt5.sav
@@ -1 +1 @@
-alt/error_class_generic_alt5.nit:17,1--21,20: Redef error: Array is an imported class. Add the redef keyword to refine it.
+alt/error_class_generic_alt5.nit:21,7--11: Redef error: Array is an imported class. Add the redef keyword to refine it.

diff --git a/tests/sav/error_class_generic_alt6.sav b/tests/sav/error_class_generic_alt6.sav
index 5f03dfb..eebfb9c 100644 (file)
--- a/tests/sav/error_class_generic_alt6.sav
+++ b/tests/sav/error_class_generic_alt6.sav
@@ -1 +1 @@
-alt/error_class_generic_alt6.nit:17,1--22,28: Redef error: Array is an imported class. Add the redef keyword to refine it.
+alt/error_class_generic_alt6.nit:22,7--11: Redef error: Array is an imported class. Add the redef keyword to refine it.

diff --git a/tests/sav/error_cons_arity.sav b/tests/sav/error_cons_arity.sav
index 4bea07f..8c19fe3 100644 (file)
--- a/tests/sav/error_cons_arity.sav
+++ b/tests/sav/error_cons_arity.sav
@@ -1 +1 @@
-./error_cons_arity.nit:19,1--28: Error: A class C is already defined at line 17.
+./error_cons_arity.nit:19,7: Error: A class C is already defined at line 17.

diff --git a/tests/sav/error_cons_arity2.sav b/tests/sav/error_cons_arity2.sav
index f8c2f57..d040e00 100644 (file)
--- a/tests/sav/error_cons_arity2.sav
+++ b/tests/sav/error_cons_arity2.sav
@@ -1 +1 @@
-./error_cons_arity2.nit:20,1--17: Error: A class A is already defined at line 17.
+./error_cons_arity2.nit:20,7: Error: A class A is already defined at line 17.

diff --git a/tests/sav/error_constraint.sav b/tests/sav/error_constraint.sav
index 12d43e8..9a07352 100644 (file)
--- a/tests/sav/error_constraint.sav
+++ b/tests/sav/error_constraint.sav
@@ -1 +1 @@
-./error_constraint.nit:20,1--17: Error: A class A is already defined at line 18.
+./error_constraint.nit:20,7: Error: A class A is already defined at line 18.

diff --git a/tests/sav/error_defs_alt1.sav b/tests/sav/error_defs_alt1.sav
index 95b008c..51c7c1a 100644 (file)
--- a/tests/sav/error_defs_alt1.sav
+++ b/tests/sav/error_defs_alt1.sav
@@ -1 +1 @@
-alt/error_defs_alt1.nit:19,1--20,32: Redef error: Object is an imported class. Add the redef keyword to refine it.
+alt/error_defs_alt1.nit:19,7--12: Redef error: Object is an imported class. Add the redef keyword to refine it.

diff --git a/tests/sav/error_defs_alt2.sav b/tests/sav/error_defs_alt2.sav
index 39b7324..f5d22d8 100644 (file)
--- a/tests/sav/error_defs_alt2.sav
+++ b/tests/sav/error_defs_alt2.sav
@@ -1 +1 @@
-alt/error_defs_alt2.nit:26,2--39: Error: A property foo is already defined in class A.
+alt/error_defs_alt2.nit:26,6--8: Error: A property foo is already defined in class A.

diff --git a/tests/sav/error_defs_alt3.sav b/tests/sav/error_defs_alt3.sav
index f3e5eb4..addb686 100644 (file)
--- a/tests/sav/error_defs_alt3.sav
+++ b/tests/sav/error_defs_alt3.sav
@@ -1 +1 @@
-alt/error_defs_alt3.nit:26,1--27,32: Redef error: A::bar is an inherited property. To redefine it, add the redef keyword.
+alt/error_defs_alt3.nit:27,6--8: Redef error: A::bar is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_defs_alt4.sav b/tests/sav/error_defs_alt4.sav
index f83c589..5588be1 100644 (file)
--- a/tests/sav/error_defs_alt4.sav
+++ b/tests/sav/error_defs_alt4.sav
@@ -1 +1 @@
-alt/error_defs_alt4.nit:28,1--29,29: Redef error: A::baz is an inherited property. To redefine it, add the redef keyword.
+alt/error_defs_alt4.nit:29,6--8: Redef error: A::baz is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_defs_alt5.sav b/tests/sav/error_defs_alt5.sav
index df92802..ca07f29 100644 (file)
--- a/tests/sav/error_defs_alt5.sav
+++ b/tests/sav/error_defs_alt5.sav
@@ -1,2 +1,2 @@
-alt/error_defs_alt5.nit:28,1--30,35: Redef error: A::baz redefines Object::baz with 0 parameter(s).
-alt/error_defs_alt5.nit:28,1--30,35: Redef error: The procedure A::baz redefines the function Object::baz.
+alt/error_defs_alt5.nit:30,12--14: Redef error: A::baz redefines Object::baz with 0 parameter(s).
+alt/error_defs_alt5.nit:30,12--14: Redef error: The procedure A::baz redefines the function Object::baz.

diff --git a/tests/sav/error_defs_alt6.sav b/tests/sav/error_defs_alt6.sav
index feb1fa0..5f14bc0 100644 (file)
--- a/tests/sav/error_defs_alt6.sav
+++ b/tests/sav/error_defs_alt6.sav
@@ -1 +1 @@
-alt/error_defs_alt6.nit:35,1--36,33: Error: A class A is already defined at line 24.
+alt/error_defs_alt6.nit:35,7: Error: A class A is already defined at line 24.

diff --git a/tests/sav/error_defs_alt7.sav b/tests/sav/error_defs_alt7.sav
index 6b54313..cd3b438 100644 (file)
--- a/tests/sav/error_defs_alt7.sav
+++ b/tests/sav/error_defs_alt7.sav
@@ -1 +1 @@
-alt/error_defs_alt7.nit:35,1--39,33: Error: A class A is already defined at line 24.
+alt/error_defs_alt7.nit:38,13: Error: A class A is already defined at line 24.

diff --git a/tests/sav/error_defs_alt8.sav b/tests/sav/error_defs_alt8.sav
index af58be8..34f438c 100644 (file)
--- a/tests/sav/error_defs_alt8.sav
+++ b/tests/sav/error_defs_alt8.sav
@@ -1 +1 @@
-alt/error_defs_alt8.nit:35,1--42,39: Error: A class A is already defined at line 24.
+alt/error_defs_alt8.nit:41,13: Error: A class A is already defined at line 24.

diff --git a/tests/sav/error_fun_ret.sav b/tests/sav/error_fun_ret.sav
index fb6ebcf..4843a8d 100644 (file)
--- a/tests/sav/error_fun_ret.sav
+++ b/tests/sav/error_fun_ret.sav
@@ -1 +1 @@
-./error_fun_ret.nit:17,1--13: Control error: Reached end of function (a 'return' with a value was expected).
+./error_fun_ret.nit:17,5--8: Control error: Reached end of function (a 'return' with a value was expected).

diff --git a/tests/sav/error_fun_ret2.sav b/tests/sav/error_fun_ret2.sav
index aed0a45..bff3d83 100644 (file)
--- a/tests/sav/error_fun_ret2.sav
+++ b/tests/sav/error_fun_ret2.sav
@@ -1 +1 @@
-./error_fun_ret2.nit:17,1--20,10: Control error: Reached end of function (a 'return' with a value was expected).
+./error_fun_ret2.nit:17,5--8: Control error: Reached end of function (a 'return' with a value was expected).

diff --git a/tests/sav/error_fun_ret3.sav b/tests/sav/error_fun_ret3.sav
index c89fa83..9ae2a2f 100644 (file)
--- a/tests/sav/error_fun_ret3.sav
+++ b/tests/sav/error_fun_ret3.sav
@@ -1 +1 @@
-./error_fun_ret3.nit:17,1--21,10: Control error: Reached end of function (a 'return' with a value was expected).
+./error_fun_ret3.nit:17,5--8: Control error: Reached end of function (a 'return' with a value was expected).

diff --git a/tests/sav/error_fun_ret4.sav b/tests/sav/error_fun_ret4.sav
index 93095b5..dda7702 100644 (file)
--- a/tests/sav/error_fun_ret4.sav
+++ b/tests/sav/error_fun_ret4.sav
@@ -1 +1 @@
-./error_fun_ret4.nit:17,1--21,10: Control error: Reached end of function (a 'return' with a value was expected).
+./error_fun_ret4.nit:17,5--8: Control error: Reached end of function (a 'return' with a value was expected).

diff --git a/tests/sav/error_fun_ret5.sav b/tests/sav/error_fun_ret5.sav
index 163a47d..4b06829 100644 (file)
--- a/tests/sav/error_fun_ret5.sav
+++ b/tests/sav/error_fun_ret5.sav
@@ -1 +1 @@
-./error_fun_ret5.nit:17,1--20,10: Control error: Reached end of function (a 'return' with a value was expected).
+./error_fun_ret5.nit:17,5--8: Control error: Reached end of function (a 'return' with a value was expected).

diff --git a/tests/sav/error_kern_attr_any.sav b/tests/sav/error_kern_attr_any.sav
index e16871e..243d43d 100644 (file)
--- a/tests/sav/error_kern_attr_any.sav
+++ b/tests/sav/error_kern_attr_any.sav
@@ -1 +1 @@
-./error_kern_attr_any.nit:18,2--16: Error: Attempt to define attribute _toto in the interface Object.
+./error_kern_attr_any.nit:18,6--10: Error: Attempt to define attribute _toto in the interface Object.

diff --git a/tests/sav/error_kern_attr_int.sav b/tests/sav/error_kern_attr_int.sav
index f5e7a14..36a25b8 100644 (file)
--- a/tests/sav/error_kern_attr_int.sav
+++ b/tests/sav/error_kern_attr_int.sav
@@ -1 +1 @@
-./error_kern_attr_int.nit:18,2--18: Error: Attempt to define attribute _toto in the enum class Int.
+./error_kern_attr_int.nit:18,6--10: Error: Attempt to define attribute _toto in the enum class Int.

diff --git a/tests/sav/error_meth_2def.sav b/tests/sav/error_meth_2def.sav
index c96f27e..39ba057 100644 (file)
--- a/tests/sav/error_meth_2def.sav
+++ b/tests/sav/error_meth_2def.sav
@@ -1 +1 @@
-./error_meth_2def.nit:19,2--17: Error: A property toto is already defined in class A.
+./error_meth_2def.nit:19,6--9: Error: A property toto is already defined in class A.

diff --git a/tests/sav/error_meth_2def2.sav b/tests/sav/error_meth_2def2.sav
index 7f3188f..3f5f14f 100644 (file)
--- a/tests/sav/error_meth_2def2.sav
+++ b/tests/sav/error_meth_2def2.sav
@@ -1 +1 @@
-./error_meth_2def2.nit:19,2--34: Error: A property toto is already defined in class A.
+./error_meth_2def2.nit:19,6--9: Error: A property toto is already defined in class A.

diff --git a/tests/sav/error_redef2_1alt1_alt1.sav b/tests/sav/error_redef2_1alt1_alt1.sav
index 1b9b1e7..ea3360c 100644 (file)
--- a/tests/sav/error_redef2_1alt1_alt1.sav
+++ b/tests/sav/error_redef2_1alt1_alt1.sav
@@ -1 +1 @@
-alt/error_redef2_1alt1_alt1.nit:26,2--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.
+alt/error_redef2_1alt1_alt1.nit:26,6--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_redef2_1alt1_alt2.sav b/tests/sav/error_redef2_1alt1_alt2.sav
index 607ff65..e1277dc 100644 (file)
--- a/tests/sav/error_redef2_1alt1_alt2.sav
+++ b/tests/sav/error_redef2_1alt1_alt2.sav
@@ -1 +1 @@
-alt/error_redef2_1alt1_alt2.nit:26,2--27,14: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.
+alt/error_redef2_1alt1_alt2.nit:27,6--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_redef2_1alt1_alt3.sav b/tests/sav/error_redef2_1alt1_alt3.sav
index 302dd34..5b5936d 100644 (file)
--- a/tests/sav/error_redef2_1alt1_alt3.sav
+++ b/tests/sav/error_redef2_1alt1_alt3.sav
@@ -1 +1 @@
-alt/error_redef2_1alt1_alt3.nit:26,2--28,9: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.
+alt/error_redef2_1alt1_alt3.nit:28,6--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_redef2_1alt1_alt4.sav b/tests/sav/error_redef2_1alt1_alt4.sav
index 0dfa5ea..4da3993 100644 (file)
--- a/tests/sav/error_redef2_1alt1_alt4.sav
+++ b/tests/sav/error_redef2_1alt1_alt4.sav
@@ -1 +1 @@
-alt/error_redef2_1alt1_alt4.nit:26,2--29,19: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.
+alt/error_redef2_1alt1_alt4.nit:29,6--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_redef2_1alt1_alt5.sav b/tests/sav/error_redef2_1alt1_alt5.sav
index c289a09..9e54eb0 100644 (file)
--- a/tests/sav/error_redef2_1alt1_alt5.sav
+++ b/tests/sav/error_redef2_1alt1_alt5.sav
@@ -1 +1 @@
-alt/error_redef2_1alt1_alt5.nit:26,2--30,31: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.
+alt/error_redef2_1alt1_alt5.nit:30,6--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_redef2_1alt1_alt6.sav b/tests/sav/error_redef2_1alt1_alt6.sav
index 5bc3baa..9babde1 100644 (file)
--- a/tests/sav/error_redef2_1alt1_alt6.sav
+++ b/tests/sav/error_redef2_1alt1_alt6.sav
@@ -1 +1 @@
-alt/error_redef2_1alt1_alt6.nit:26,2--31,26: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.
+alt/error_redef2_1alt1_alt6.nit:31,6--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_redef2_1alt1_alt7.sav b/tests/sav/error_redef2_1alt1_alt7.sav
index b66c2dd..3c1d84a 100644 (file)
--- a/tests/sav/error_redef2_1alt1_alt7.sav
+++ b/tests/sav/error_redef2_1alt1_alt7.sav
@@ -1 +1 @@
-alt/error_redef2_1alt1_alt7.nit:26,2--32,24: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.
+alt/error_redef2_1alt1_alt7.nit:32,6--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_redef2_1alt1_alt8.sav b/tests/sav/error_redef2_1alt1_alt8.sav
index 31f353a..df3e30f 100644 (file)
--- a/tests/sav/error_redef2_1alt1_alt8.sav
+++ b/tests/sav/error_redef2_1alt1_alt8.sav
@@ -1 +1 @@
-alt/error_redef2_1alt1_alt8.nit:26,2--33,36: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.
+alt/error_redef2_1alt1_alt8.nit:33,6--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_redef2_1alt1_alt9.sav b/tests/sav/error_redef2_1alt1_alt9.sav
index 83cefce..79ba99b 100644 (file)
--- a/tests/sav/error_redef2_1alt1_alt9.sav
+++ b/tests/sav/error_redef2_1alt1_alt9.sav
@@ -1,2 +1,2 @@
+alt/error_redef2_1alt1_alt9.nit:34,6--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.
 alt/error_redef2_1alt1_alt9.nit:34,9: Syntax error: untyped parameter.
-alt/error_redef2_1alt1_alt9.nit:26,2--34,31: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_redef2_1alt2_alt1.sav b/tests/sav/error_redef2_1alt2_alt1.sav
index be0599c..03ee097 100644 (file)
--- a/tests/sav/error_redef2_1alt2_alt1.sav
+++ b/tests/sav/error_redef2_1alt2_alt1.sav
@@ -1 +1 @@
-alt/error_redef2_1alt2_alt1.nit:26,2--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.
+alt/error_redef2_1alt2_alt1.nit:26,6--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_redef2_1alt2_alt2.sav b/tests/sav/error_redef2_1alt2_alt2.sav
index 4559b26..e0730fd 100644 (file)
--- a/tests/sav/error_redef2_1alt2_alt2.sav
+++ b/tests/sav/error_redef2_1alt2_alt2.sav
@@ -1 +1 @@
-alt/error_redef2_1alt2_alt2.nit:26,2--27,14: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.
+alt/error_redef2_1alt2_alt2.nit:27,6--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_redef2_1alt2_alt3.sav b/tests/sav/error_redef2_1alt2_alt3.sav
index 24ce775..b74242e 100644 (file)
--- a/tests/sav/error_redef2_1alt2_alt3.sav
+++ b/tests/sav/error_redef2_1alt2_alt3.sav
@@ -1 +1 @@
-alt/error_redef2_1alt2_alt3.nit:26,2--28,9: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.
+alt/error_redef2_1alt2_alt3.nit:28,6--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_redef2_1alt2_alt4.sav b/tests/sav/error_redef2_1alt2_alt4.sav
index 71135e7..f4129a2 100644 (file)
--- a/tests/sav/error_redef2_1alt2_alt4.sav
+++ b/tests/sav/error_redef2_1alt2_alt4.sav
@@ -1 +1 @@
-alt/error_redef2_1alt2_alt4.nit:26,2--29,19: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.
+alt/error_redef2_1alt2_alt4.nit:29,6--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_redef2_1alt2_alt5.sav b/tests/sav/error_redef2_1alt2_alt5.sav
index 87d1a95..39804df 100644 (file)
--- a/tests/sav/error_redef2_1alt2_alt5.sav
+++ b/tests/sav/error_redef2_1alt2_alt5.sav
@@ -1 +1 @@
-alt/error_redef2_1alt2_alt5.nit:26,2--30,31: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.
+alt/error_redef2_1alt2_alt5.nit:30,6--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_redef2_1alt2_alt6.sav b/tests/sav/error_redef2_1alt2_alt6.sav
index 7207ee1..8e7e43b 100644 (file)
--- a/tests/sav/error_redef2_1alt2_alt6.sav
+++ b/tests/sav/error_redef2_1alt2_alt6.sav
@@ -1 +1 @@
-alt/error_redef2_1alt2_alt6.nit:26,2--31,26: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.
+alt/error_redef2_1alt2_alt6.nit:31,6--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_redef2_1alt2_alt7.sav b/tests/sav/error_redef2_1alt2_alt7.sav
index 5d3bd07..383a842 100644 (file)
--- a/tests/sav/error_redef2_1alt2_alt7.sav
+++ b/tests/sav/error_redef2_1alt2_alt7.sav
@@ -1 +1 @@
-alt/error_redef2_1alt2_alt7.nit:26,2--32,24: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.
+alt/error_redef2_1alt2_alt7.nit:32,6--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_redef2_1alt2_alt8.sav b/tests/sav/error_redef2_1alt2_alt8.sav
index ef53ddd..21f9e03 100644 (file)
--- a/tests/sav/error_redef2_1alt2_alt8.sav
+++ b/tests/sav/error_redef2_1alt2_alt8.sav
@@ -1 +1 @@
-alt/error_redef2_1alt2_alt8.nit:26,2--33,36: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.
+alt/error_redef2_1alt2_alt8.nit:33,6--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_redef2_1alt2_alt9.sav b/tests/sav/error_redef2_1alt2_alt9.sav
index 0c9d183..17cfb53 100644 (file)
--- a/tests/sav/error_redef2_1alt2_alt9.sav
+++ b/tests/sav/error_redef2_1alt2_alt9.sav
@@ -1,2 +1,2 @@
+alt/error_redef2_1alt2_alt9.nit:34,6--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.
 alt/error_redef2_1alt2_alt9.nit:34,9: Syntax error: untyped parameter.
-alt/error_redef2_1alt2_alt9.nit:26,2--34,31: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_redef2_1alt3_alt1.sav b/tests/sav/error_redef2_1alt3_alt1.sav
index f257748..dd6782e 100644 (file)
--- a/tests/sav/error_redef2_1alt3_alt1.sav
+++ b/tests/sav/error_redef2_1alt3_alt1.sav
@@ -1 +1 @@
-alt/error_redef2_1alt3_alt1.nit:26,2--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.
+alt/error_redef2_1alt3_alt1.nit:26,6--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_redef2_1alt3_alt2.sav b/tests/sav/error_redef2_1alt3_alt2.sav
index e503951..a4f042f 100644 (file)
--- a/tests/sav/error_redef2_1alt3_alt2.sav
+++ b/tests/sav/error_redef2_1alt3_alt2.sav
@@ -1 +1 @@
-alt/error_redef2_1alt3_alt2.nit:26,2--27,14: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.
+alt/error_redef2_1alt3_alt2.nit:27,6--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_redef2_1alt3_alt3.sav b/tests/sav/error_redef2_1alt3_alt3.sav
index 5fe8e50..b3bf863 100644 (file)
--- a/tests/sav/error_redef2_1alt3_alt3.sav
+++ b/tests/sav/error_redef2_1alt3_alt3.sav
@@ -1 +1 @@
-alt/error_redef2_1alt3_alt3.nit:26,2--28,9: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.
+alt/error_redef2_1alt3_alt3.nit:28,6--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_redef2_1alt3_alt4.sav b/tests/sav/error_redef2_1alt3_alt4.sav
index 425f060..8ba1a15 100644 (file)
--- a/tests/sav/error_redef2_1alt3_alt4.sav
+++ b/tests/sav/error_redef2_1alt3_alt4.sav
@@ -1 +1 @@
-alt/error_redef2_1alt3_alt4.nit:26,2--29,19: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.
+alt/error_redef2_1alt3_alt4.nit:29,6--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_redef2_1alt3_alt5.sav b/tests/sav/error_redef2_1alt3_alt5.sav
index 609238d..d77c465 100644 (file)
--- a/tests/sav/error_redef2_1alt3_alt5.sav
+++ b/tests/sav/error_redef2_1alt3_alt5.sav
@@ -1 +1 @@
-alt/error_redef2_1alt3_alt5.nit:26,2--30,31: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.
+alt/error_redef2_1alt3_alt5.nit:30,6--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_redef2_1alt3_alt6.sav b/tests/sav/error_redef2_1alt3_alt6.sav
index 6449580..d6f25ab 100644 (file)
--- a/tests/sav/error_redef2_1alt3_alt6.sav
+++ b/tests/sav/error_redef2_1alt3_alt6.sav
@@ -1 +1 @@
-alt/error_redef2_1alt3_alt6.nit:26,2--31,26: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.
+alt/error_redef2_1alt3_alt6.nit:31,6--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_redef2_1alt3_alt7.sav b/tests/sav/error_redef2_1alt3_alt7.sav
index cc1a487..76ecfe4 100644 (file)
--- a/tests/sav/error_redef2_1alt3_alt7.sav
+++ b/tests/sav/error_redef2_1alt3_alt7.sav
@@ -1 +1 @@
-alt/error_redef2_1alt3_alt7.nit:26,2--32,24: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.
+alt/error_redef2_1alt3_alt7.nit:32,6--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_redef2_1alt3_alt8.sav b/tests/sav/error_redef2_1alt3_alt8.sav
index 89da193..703266e 100644 (file)
--- a/tests/sav/error_redef2_1alt3_alt8.sav
+++ b/tests/sav/error_redef2_1alt3_alt8.sav
@@ -1 +1 @@
-alt/error_redef2_1alt3_alt8.nit:26,2--33,36: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.
+alt/error_redef2_1alt3_alt8.nit:33,6--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_redef2_1alt3_alt9.sav b/tests/sav/error_redef2_1alt3_alt9.sav
index 79b21e8..5c1fcd7 100644 (file)
--- a/tests/sav/error_redef2_1alt3_alt9.sav
+++ b/tests/sav/error_redef2_1alt3_alt9.sav
@@ -1,2 +1,2 @@
+alt/error_redef2_1alt3_alt9.nit:34,6--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.
 alt/error_redef2_1alt3_alt9.nit:34,9: Syntax error: untyped parameter.
-alt/error_redef2_1alt3_alt9.nit:26,2--34,31: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_redef2_1alt4_alt1.sav b/tests/sav/error_redef2_1alt4_alt1.sav
index b93e18b..674efee 100644 (file)
--- a/tests/sav/error_redef2_1alt4_alt1.sav
+++ b/tests/sav/error_redef2_1alt4_alt1.sav
@@ -1 +1 @@
-alt/error_redef2_1alt4_alt1.nit:26,2--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.
+alt/error_redef2_1alt4_alt1.nit:26,6--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_redef2_1alt4_alt2.sav b/tests/sav/error_redef2_1alt4_alt2.sav
index 4cbf9f3..7636815 100644 (file)
--- a/tests/sav/error_redef2_1alt4_alt2.sav
+++ b/tests/sav/error_redef2_1alt4_alt2.sav
@@ -1 +1 @@
-alt/error_redef2_1alt4_alt2.nit:26,2--27,14: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.
+alt/error_redef2_1alt4_alt2.nit:27,6--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_redef2_1alt4_alt3.sav b/tests/sav/error_redef2_1alt4_alt3.sav
index 2f06e97..bc8757b 100644 (file)
--- a/tests/sav/error_redef2_1alt4_alt3.sav
+++ b/tests/sav/error_redef2_1alt4_alt3.sav
@@ -1 +1 @@
-alt/error_redef2_1alt4_alt3.nit:26,2--28,9: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.
+alt/error_redef2_1alt4_alt3.nit:28,6--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_redef2_1alt4_alt4.sav b/tests/sav/error_redef2_1alt4_alt4.sav
index 7ed9028..efdaf6a 100644 (file)
--- a/tests/sav/error_redef2_1alt4_alt4.sav
+++ b/tests/sav/error_redef2_1alt4_alt4.sav
@@ -1 +1 @@
-alt/error_redef2_1alt4_alt4.nit:26,2--29,19: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.
+alt/error_redef2_1alt4_alt4.nit:29,6--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_redef2_1alt4_alt5.sav b/tests/sav/error_redef2_1alt4_alt5.sav
index 92ac56b..e0d8a6e 100644 (file)
--- a/tests/sav/error_redef2_1alt4_alt5.sav
+++ b/tests/sav/error_redef2_1alt4_alt5.sav
@@ -1 +1 @@
-alt/error_redef2_1alt4_alt5.nit:26,2--30,31: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.
+alt/error_redef2_1alt4_alt5.nit:30,6--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_redef2_1alt4_alt6.sav b/tests/sav/error_redef2_1alt4_alt6.sav
index b235f5b..99f9c86 100644 (file)
--- a/tests/sav/error_redef2_1alt4_alt6.sav
+++ b/tests/sav/error_redef2_1alt4_alt6.sav
@@ -1 +1 @@
-alt/error_redef2_1alt4_alt6.nit:26,2--31,26: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.
+alt/error_redef2_1alt4_alt6.nit:31,6--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_redef2_1alt4_alt7.sav b/tests/sav/error_redef2_1alt4_alt7.sav
index cb2bd0e..e02052d 100644 (file)
--- a/tests/sav/error_redef2_1alt4_alt7.sav
+++ b/tests/sav/error_redef2_1alt4_alt7.sav
@@ -1 +1 @@
-alt/error_redef2_1alt4_alt7.nit:26,2--32,24: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.
+alt/error_redef2_1alt4_alt7.nit:32,6--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_redef2_1alt4_alt8.sav b/tests/sav/error_redef2_1alt4_alt8.sav
index c4c3c92..6121521 100644 (file)
--- a/tests/sav/error_redef2_1alt4_alt8.sav
+++ b/tests/sav/error_redef2_1alt4_alt8.sav
@@ -1 +1 @@
-alt/error_redef2_1alt4_alt8.nit:26,2--33,36: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.
+alt/error_redef2_1alt4_alt8.nit:33,6--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_redef2_1alt4_alt9.sav b/tests/sav/error_redef2_1alt4_alt9.sav
index 2c8ea0a..924ca54 100644 (file)
--- a/tests/sav/error_redef2_1alt4_alt9.sav
+++ b/tests/sav/error_redef2_1alt4_alt9.sav
@@ -1,2 +1,2 @@
+alt/error_redef2_1alt4_alt9.nit:34,6--7: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.
 alt/error_redef2_1alt4_alt9.nit:34,9: Syntax error: untyped parameter.
-alt/error_redef2_1alt4_alt9.nit:26,2--34,31: Redef error: B::f1 is an inherited property. To redefine it, add the redef keyword.

diff --git a/tests/sav/error_redef_1alt1_alt2.sav b/tests/sav/error_redef_1alt1_alt2.sav
index 9efd037..8bdb482 100644 (file)
--- a/tests/sav/error_redef_1alt1_alt2.sav
+++ b/tests/sav/error_redef_1alt1_alt2.sav
@@ -1 +1 @@
-alt/error_redef_1alt1_alt2.nit:26,2--27,20: Redef error: B::f1 redefines A::f1 with 0 parameter(s).
+alt/error_redef_1alt1_alt2.nit:27,12--13: Redef error: B::f1 redefines A::f1 with 0 parameter(s).

diff --git a/tests/sav/error_redef_1alt1_alt3.sav b/tests/sav/error_redef_1alt1_alt3.sav
index 834c9e1..e697109 100644 (file)
--- a/tests/sav/error_redef_1alt1_alt3.sav
+++ b/tests/sav/error_redef_1alt1_alt3.sav
@@ -1 +1 @@
-alt/error_redef_1alt1_alt3.nit:26,2--28,15: Redef error: B::f1 redefines A::f1 with 0 parameter(s).
+alt/error_redef_1alt1_alt3.nit:28,12--13: Redef error: B::f1 redefines A::f1 with 0 parameter(s).

diff --git a/tests/sav/error_redef_1alt1_alt5.sav b/tests/sav/error_redef_1alt1_alt5.sav
index 2742a7e..c4e9037 100644 (file)
--- a/tests/sav/error_redef_1alt1_alt5.sav
+++ b/tests/sav/error_redef_1alt1_alt5.sav
@@ -1 +1 @@
-alt/error_redef_1alt1_alt5.nit:26,2--30,37: Redef error: B::f1 redefines A::f1 with 0 parameter(s).
+alt/error_redef_1alt1_alt5.nit:30,12--13: Redef error: B::f1 redefines A::f1 with 0 parameter(s).

diff --git a/tests/sav/error_redef_1alt1_alt6.sav b/tests/sav/error_redef_1alt1_alt6.sav
index 52fa04d..96b2749 100644 (file)
--- a/tests/sav/error_redef_1alt1_alt6.sav
+++ b/tests/sav/error_redef_1alt1_alt6.sav
@@ -1 +1 @@
-alt/error_redef_1alt1_alt6.nit:26,2--31,32: Redef error: B::f1 redefines A::f1 with 0 parameter(s).
+alt/error_redef_1alt1_alt6.nit:31,12--13: Redef error: B::f1 redefines A::f1 with 0 parameter(s).

diff --git a/tests/sav/error_redef_1alt1_alt7.sav b/tests/sav/error_redef_1alt1_alt7.sav
index 61c1d38..817ad6d 100644 (file)
--- a/tests/sav/error_redef_1alt1_alt7.sav
+++ b/tests/sav/error_redef_1alt1_alt7.sav
@@ -1 +1 @@
-alt/error_redef_1alt1_alt7.nit:26,2--32,30: Redef error: The function B::f1 redefines the procedure A::f1.
+alt/error_redef_1alt1_alt7.nit:32,12--13: Redef error: The function B::f1 redefines the procedure A::f1.

diff --git a/tests/sav/error_redef_1alt1_alt8.sav b/tests/sav/error_redef_1alt1_alt8.sav
index 71856ba..6ca4d20 100644 (file)
--- a/tests/sav/error_redef_1alt1_alt8.sav
+++ b/tests/sav/error_redef_1alt1_alt8.sav
@@ -1,2 +1,2 @@
-alt/error_redef_1alt1_alt8.nit:26,2--33,42: Redef error: B::f1 redefines A::f1 with 0 parameter(s).
-alt/error_redef_1alt1_alt8.nit:26,2--33,42: Redef error: The function B::f1 redefines the procedure A::f1.
+alt/error_redef_1alt1_alt8.nit:33,12--13: Redef error: B::f1 redefines A::f1 with 0 parameter(s).
+alt/error_redef_1alt1_alt8.nit:33,12--13: Redef error: The function B::f1 redefines the procedure A::f1.

diff --git a/tests/sav/error_redef_1alt1_alt9.sav b/tests/sav/error_redef_1alt1_alt9.sav
index 9a3e6fc..0dcdd18 100644 (file)
--- a/tests/sav/error_redef_1alt1_alt9.sav
+++ b/tests/sav/error_redef_1alt1_alt9.sav
@@ -1,2 +1,2 @@
+alt/error_redef_1alt1_alt9.nit:34,12--13: Redef error: B::f1 redefines A::f1 with 0 parameter(s).
 alt/error_redef_1alt1_alt9.nit:34,15: Syntax error: untyped parameter.
-alt/error_redef_1alt1_alt9.nit:26,2--34,37: Redef error: B::f1 redefines A::f1 with 0 parameter(s).

diff --git a/tests/sav/error_redef_1alt2_alt1.sav b/tests/sav/error_redef_1alt2_alt1.sav
index 32874f7..e3224da 100644 (file)
--- a/tests/sav/error_redef_1alt2_alt1.sav
+++ b/tests/sav/error_redef_1alt2_alt1.sav
@@ -1 +1 @@
-alt/error_redef_1alt2_alt1.nit:26,2--13: Redef error: B::f1 redefines A::f1 with 1 parameter(s).
+alt/error_redef_1alt2_alt1.nit:26,12--13: Redef error: B::f1 redefines A::f1 with 1 parameter(s).

diff --git a/tests/sav/error_redef_1alt2_alt4.sav b/tests/sav/error_redef_1alt2_alt4.sav
index 3727531..cad987c 100644 (file)
--- a/tests/sav/error_redef_1alt2_alt4.sav
+++ b/tests/sav/error_redef_1alt2_alt4.sav
@@ -1 +1 @@
-alt/error_redef_1alt2_alt4.nit:26,2--29,25: Redef error: B::f1 redefines A::f1 with 1 parameter(s).
+alt/error_redef_1alt2_alt4.nit:29,12--13: Redef error: B::f1 redefines A::f1 with 1 parameter(s).

diff --git a/tests/sav/error_redef_1alt2_alt7.sav b/tests/sav/error_redef_1alt2_alt7.sav
index 48aa844..0fae45d 100644 (file)
--- a/tests/sav/error_redef_1alt2_alt7.sav
+++ b/tests/sav/error_redef_1alt2_alt7.sav
@@ -1,2 +1,2 @@
-alt/error_redef_1alt2_alt7.nit:26,2--32,30: Redef error: B::f1 redefines A::f1 with 1 parameter(s).
-alt/error_redef_1alt2_alt7.nit:26,2--32,30: Redef error: The function B::f1 redefines the procedure A::f1.
+alt/error_redef_1alt2_alt7.nit:32,12--13: Redef error: B::f1 redefines A::f1 with 1 parameter(s).
+alt/error_redef_1alt2_alt7.nit:32,12--13: Redef error: The function B::f1 redefines the procedure A::f1.

diff --git a/tests/sav/error_redef_1alt2_alt8.sav b/tests/sav/error_redef_1alt2_alt8.sav
index 7940908..dc2e3bf 100644 (file)
--- a/tests/sav/error_redef_1alt2_alt8.sav
+++ b/tests/sav/error_redef_1alt2_alt8.sav
@@ -1 +1 @@
-alt/error_redef_1alt2_alt8.nit:26,2--33,42: Redef error: The function B::f1 redefines the procedure A::f1.
+alt/error_redef_1alt2_alt8.nit:33,12--13: Redef error: The function B::f1 redefines the procedure A::f1.

diff --git a/tests/sav/error_redef_1alt3_alt1.sav b/tests/sav/error_redef_1alt3_alt1.sav
index a2ba521..6116592 100644 (file)
--- a/tests/sav/error_redef_1alt3_alt1.sav
+++ b/tests/sav/error_redef_1alt3_alt1.sav
@@ -1 +1 @@
-alt/error_redef_1alt3_alt1.nit:26,2--13: Control error: Reached end of function (a 'return' with a value was expected).
+alt/error_redef_1alt3_alt1.nit:26,12--13: Control error: Reached end of function (a 'return' with a value was expected).

diff --git a/tests/sav/error_redef_1alt3_alt2.sav b/tests/sav/error_redef_1alt3_alt2.sav
index cbcbd61..3b6c713 100644 (file)
--- a/tests/sav/error_redef_1alt3_alt2.sav
+++ b/tests/sav/error_redef_1alt3_alt2.sav
@@ -1,2 +1,2 @@
-alt/error_redef_1alt3_alt2.nit:26,2--27,20: Redef error: B::f1 redefines A::f1 with 0 parameter(s).
-alt/error_redef_1alt3_alt2.nit:26,2--27,20: Redef error: The procedure B::f1 redefines the function A::f1.
+alt/error_redef_1alt3_alt2.nit:27,12--13: Redef error: B::f1 redefines A::f1 with 0 parameter(s).
+alt/error_redef_1alt3_alt2.nit:27,12--13: Redef error: The procedure B::f1 redefines the function A::f1.

diff --git a/tests/sav/error_redef_1alt3_alt3.sav b/tests/sav/error_redef_1alt3_alt3.sav
index 6bd550e..b873d08 100644 (file)
--- a/tests/sav/error_redef_1alt3_alt3.sav
+++ b/tests/sav/error_redef_1alt3_alt3.sav
@@ -1 +1 @@
-alt/error_redef_1alt3_alt3.nit:26,2--28,15: Redef error: B::f1 redefines A::f1 with 0 parameter(s).
+alt/error_redef_1alt3_alt3.nit:28,12--13: Redef error: B::f1 redefines A::f1 with 0 parameter(s).

diff --git a/tests/sav/error_redef_1alt3_alt5.sav b/tests/sav/error_redef_1alt3_alt5.sav
index 8f131f8..e692593 100644 (file)
--- a/tests/sav/error_redef_1alt3_alt5.sav
+++ b/tests/sav/error_redef_1alt3_alt5.sav
@@ -1,2 +1,2 @@
-alt/error_redef_1alt3_alt5.nit:26,2--30,37: Redef error: B::f1 redefines A::f1 with 0 parameter(s).
-alt/error_redef_1alt3_alt5.nit:26,2--30,37: Redef error: The procedure B::f1 redefines the function A::f1.
+alt/error_redef_1alt3_alt5.nit:30,12--13: Redef error: B::f1 redefines A::f1 with 0 parameter(s).
+alt/error_redef_1alt3_alt5.nit:30,12--13: Redef error: The procedure B::f1 redefines the function A::f1.

diff --git a/tests/sav/error_redef_1alt3_alt6.sav b/tests/sav/error_redef_1alt3_alt6.sav
index 9f529f5..9e20140 100644 (file)
--- a/tests/sav/error_redef_1alt3_alt6.sav
+++ b/tests/sav/error_redef_1alt3_alt6.sav
@@ -1 +1 @@
-alt/error_redef_1alt3_alt6.nit:26,2--31,32: Redef error: B::f1 redefines A::f1 with 0 parameter(s).
+alt/error_redef_1alt3_alt6.nit:31,12--13: Redef error: B::f1 redefines A::f1 with 0 parameter(s).

diff --git a/tests/sav/error_redef_1alt3_alt8.sav b/tests/sav/error_redef_1alt3_alt8.sav
index b4a8c83..44cdabd 100644 (file)
--- a/tests/sav/error_redef_1alt3_alt8.sav
+++ b/tests/sav/error_redef_1alt3_alt8.sav
@@ -1 +1 @@
-alt/error_redef_1alt3_alt8.nit:26,2--33,42: Redef error: B::f1 redefines A::f1 with 0 parameter(s).
+alt/error_redef_1alt3_alt8.nit:33,12--13: Redef error: B::f1 redefines A::f1 with 0 parameter(s).

diff --git a/tests/sav/error_redef_1alt3_alt9.sav b/tests/sav/error_redef_1alt3_alt9.sav
index 2be5536..40957f6 100644 (file)
--- a/tests/sav/error_redef_1alt3_alt9.sav
+++ b/tests/sav/error_redef_1alt3_alt9.sav
@@ -1,2 +1,2 @@
+alt/error_redef_1alt3_alt9.nit:34,12--13: Redef error: B::f1 redefines A::f1 with 0 parameter(s).
 alt/error_redef_1alt3_alt9.nit:34,15: Syntax error: untyped parameter.
-alt/error_redef_1alt3_alt9.nit:26,2--34,37: Redef error: B::f1 redefines A::f1 with 0 parameter(s).

diff --git a/tests/sav/error_redef_1alt4_alt1.sav b/tests/sav/error_redef_1alt4_alt1.sav
index 95f63c9..c9951a7 100644 (file)
--- a/tests/sav/error_redef_1alt4_alt1.sav
+++ b/tests/sav/error_redef_1alt4_alt1.sav
@@ -1 +1 @@
-alt/error_redef_1alt4_alt1.nit:26,2--13: Redef error: B::f1 redefines A::f1 with 1 parameter(s).
+alt/error_redef_1alt4_alt1.nit:26,12--13: Redef error: B::f1 redefines A::f1 with 1 parameter(s).

diff --git a/tests/sav/error_redef_1alt4_alt2.sav b/tests/sav/error_redef_1alt4_alt2.sav
index b1a83fe..8a3bc78 100644 (file)
--- a/tests/sav/error_redef_1alt4_alt2.sav
+++ b/tests/sav/error_redef_1alt4_alt2.sav
@@ -1 +1 @@
-alt/error_redef_1alt4_alt2.nit:26,2--27,20: Redef error: The procedure B::f1 redefines the function A::f1.
+alt/error_redef_1alt4_alt2.nit:27,12--13: Redef error: The procedure B::f1 redefines the function A::f1.

diff --git a/tests/sav/error_redef_1alt4_alt3.sav b/tests/sav/error_redef_1alt4_alt3.sav
index 53dbf1d..e10d510 100644 (file)
--- a/tests/sav/error_redef_1alt4_alt3.sav
+++ b/tests/sav/error_redef_1alt4_alt3.sav
@@ -1 +1 @@
-alt/error_redef_1alt4_alt3.nit:26,2--28,15: Control error: Reached end of function (a 'return' with a value was expected).
+alt/error_redef_1alt4_alt3.nit:28,12--13: Control error: Reached end of function (a 'return' with a value was expected).

diff --git a/tests/sav/error_redef_1alt4_alt4.sav b/tests/sav/error_redef_1alt4_alt4.sav
index 37bed5e..b11d25a 100644 (file)
--- a/tests/sav/error_redef_1alt4_alt4.sav
+++ b/tests/sav/error_redef_1alt4_alt4.sav
@@ -1 +1 @@
-alt/error_redef_1alt4_alt4.nit:26,2--29,25: Redef error: B::f1 redefines A::f1 with 1 parameter(s).
+alt/error_redef_1alt4_alt4.nit:29,12--13: Redef error: B::f1 redefines A::f1 with 1 parameter(s).

diff --git a/tests/sav/error_redef_1alt4_alt5.sav b/tests/sav/error_redef_1alt4_alt5.sav
index d590ee5..18f8f3d 100644 (file)
--- a/tests/sav/error_redef_1alt4_alt5.sav
+++ b/tests/sav/error_redef_1alt4_alt5.sav
@@ -1 +1 @@
-alt/error_redef_1alt4_alt5.nit:26,2--30,37: Redef error: The procedure B::f1 redefines the function A::f1.
+alt/error_redef_1alt4_alt5.nit:30,12--13: Redef error: The procedure B::f1 redefines the function A::f1.

diff --git a/tests/sav/error_redef_1alt4_alt7.sav b/tests/sav/error_redef_1alt4_alt7.sav
index eb1da5e..3b3a71b 100644 (file)
--- a/tests/sav/error_redef_1alt4_alt7.sav
+++ b/tests/sav/error_redef_1alt4_alt7.sav
@@ -1 +1 @@
-alt/error_redef_1alt4_alt7.nit:26,2--32,30: Redef error: B::f1 redefines A::f1 with 1 parameter(s).
+alt/error_redef_1alt4_alt7.nit:32,12--13: Redef error: B::f1 redefines A::f1 with 1 parameter(s).

diff --git a/tests/sav/error_redef_alt1.sav b/tests/sav/error_redef_alt1.sav
index 0f8df5a..4ec858f 100644 (file)
--- a/tests/sav/error_redef_alt1.sav
+++ b/tests/sav/error_redef_alt1.sav
@@ -1 +1 @@
-alt/error_redef_alt1.nit:26,2--13: Error: No property B::f1 is inherited. Remove the redef keyword to define a new property.
+alt/error_redef_alt1.nit:26,12--13: Error: No property B::f1 is inherited. Remove the redef keyword to define a new property.

diff --git a/tests/sav/error_redef_alt2.sav b/tests/sav/error_redef_alt2.sav
index 30d7199..0d14b2b 100644 (file)
--- a/tests/sav/error_redef_alt2.sav
+++ b/tests/sav/error_redef_alt2.sav
@@ -1 +1 @@
-alt/error_redef_alt2.nit:26,2--27,20: Error: No property B::f1 is inherited. Remove the redef keyword to define a new property.
+alt/error_redef_alt2.nit:27,12--13: Error: No property B::f1 is inherited. Remove the redef keyword to define a new property.

diff --git a/tests/sav/error_redef_alt3.sav b/tests/sav/error_redef_alt3.sav
index 95689e7..f1f7a14 100644 (file)
--- a/tests/sav/error_redef_alt3.sav
+++ b/tests/sav/error_redef_alt3.sav
@@ -1,2 +1,2 @@
+alt/error_redef_alt3.nit:28,12--13: Error: No property B::f1 is inherited. Remove the redef keyword to define a new property.
 alt/error_redef_alt3.nit:28,15: Error: Untyped parameter.
-alt/error_redef_alt3.nit:26,2--28,15: Error: No property B::f1 is inherited. Remove the redef keyword to define a new property.

diff --git a/tests/sav/error_redef_alt4.sav b/tests/sav/error_redef_alt4.sav
index c2df203..2898003 100644 (file)
--- a/tests/sav/error_redef_alt4.sav
+++ b/tests/sav/error_redef_alt4.sav
@@ -1 +1 @@
-alt/error_redef_alt4.nit:26,2--29,25: Error: No property B::f1 is inherited. Remove the redef keyword to define a new property.
+alt/error_redef_alt4.nit:29,12--13: Error: No property B::f1 is inherited. Remove the redef keyword to define a new property.

diff --git a/tests/sav/error_redef_alt5.sav b/tests/sav/error_redef_alt5.sav
index f1264fc..4c0f8ab 100644 (file)
--- a/tests/sav/error_redef_alt5.sav
+++ b/tests/sav/error_redef_alt5.sav
@@ -1 +1 @@
-alt/error_redef_alt5.nit:26,2--30,37: Error: No property B::f1 is inherited. Remove the redef keyword to define a new property.
+alt/error_redef_alt5.nit:30,12--13: Error: No property B::f1 is inherited. Remove the redef keyword to define a new property.

diff --git a/tests/sav/error_redef_alt6.sav b/tests/sav/error_redef_alt6.sav
index e4cd7e3..4b58734 100644 (file)
--- a/tests/sav/error_redef_alt6.sav
+++ b/tests/sav/error_redef_alt6.sav
@@ -1,2 +1,2 @@
+alt/error_redef_alt6.nit:31,12--13: Error: No property B::f1 is inherited. Remove the redef keyword to define a new property.
 alt/error_redef_alt6.nit:31,15: Error: Untyped parameter.
-alt/error_redef_alt6.nit:26,2--31,32: Error: No property B::f1 is inherited. Remove the redef keyword to define a new property.

diff --git a/tests/sav/error_redef_alt7.sav b/tests/sav/error_redef_alt7.sav
index 169654b..aa0068b 100644 (file)
--- a/tests/sav/error_redef_alt7.sav
+++ b/tests/sav/error_redef_alt7.sav
@@ -1 +1 @@
-alt/error_redef_alt7.nit:26,2--32,30: Error: No property B::f1 is inherited. Remove the redef keyword to define a new property.
+alt/error_redef_alt7.nit:32,12--13: Error: No property B::f1 is inherited. Remove the redef keyword to define a new property.

diff --git a/tests/sav/error_redef_alt8.sav b/tests/sav/error_redef_alt8.sav
index 776ffba..5780748 100644 (file)
--- a/tests/sav/error_redef_alt8.sav
+++ b/tests/sav/error_redef_alt8.sav
@@ -1 +1 @@
-alt/error_redef_alt8.nit:26,2--33,42: Error: No property B::f1 is inherited. Remove the redef keyword to define a new property.
+alt/error_redef_alt8.nit:33,12--13: Error: No property B::f1 is inherited. Remove the redef keyword to define a new property.

diff --git a/tests/sav/error_redef_alt9.sav b/tests/sav/error_redef_alt9.sav
index 2bd5210..f29d3f1 100644 (file)
--- a/tests/sav/error_redef_alt9.sav
+++ b/tests/sav/error_redef_alt9.sav
@@ -1,3 +1,3 @@
+alt/error_redef_alt9.nit:34,12--13: Error: No property B::f1 is inherited. Remove the redef keyword to define a new property.
 alt/error_redef_alt9.nit:34,15: Syntax error: untyped parameter.
 alt/error_redef_alt9.nit:34,15: Error: Untyped parameter.
-alt/error_redef_alt9.nit:26,2--34,37: Error: No property B::f1 is inherited. Remove the redef keyword to define a new property.

diff --git a/tests/sav/error_ref_fun.sav b/tests/sav/error_ref_fun.sav
index 901984b..db216a9 100644 (file)
--- a/tests/sav/error_ref_fun.sav
+++ b/tests/sav/error_ref_fun.sav
@@ -1 +1 @@
-./error_ref_fun.nit:20,2--12: Control error: Reached end of function (a 'return' with a value was expected).
+./error_ref_fun.nit:20,12: Control error: Reached end of function (a 'return' with a value was expected).

diff --git a/tests/sav/error_ref_proc.sav b/tests/sav/error_ref_proc.sav
index a679188..ee75068 100644 (file)
--- a/tests/sav/error_ref_proc.sav
+++ b/tests/sav/error_ref_proc.sav
@@ -1 +1 @@
-./error_ref_proc.nit:20,2--36: Redef error: The function C::r redefines the procedure C::r.
+./error_ref_proc.nit:20,12: Redef error: The function C::r redefines the procedure C::r.

diff --git a/tests/sav/error_spe_fun.sav b/tests/sav/error_spe_fun.sav
index daab3fd..423c95a 100644 (file)
--- a/tests/sav/error_spe_fun.sav
+++ b/tests/sav/error_spe_fun.sav
@@ -1 +1 @@
-./error_spe_fun.nit:23,1--14: Control error: Reached end of function (a 'return' with a value was expected).
+./error_spe_fun.nit:23,11--14: Control error: Reached end of function (a 'return' with a value was expected).

diff --git a/tests/sav/error_spe_proc.sav b/tests/sav/error_spe_proc.sav
index cccbec6..31fba27 100644 (file)
--- a/tests/sav/error_spe_proc.sav
+++ b/tests/sav/error_spe_proc.sav
@@ -1 +1 @@
-./error_spe_proc.nit:23,1--31: Redef error: The function B::toto redefines the procedure A::toto.
+./error_spe_proc.nit:23,11--14: Redef error: The function B::toto redefines the procedure A::toto.

diff --git a/tests/sav/test_multiconstraint.sav b/tests/sav/test_multiconstraint.sav
index faa13ef..1a85053 100644 (file)
--- a/tests/sav/test_multiconstraint.sav
+++ b/tests/sav/test_multiconstraint.sav
@@ -1,2 +1,2 @@
-./test_multiconstraint.nit:64,1--67,11: Error: A class G is already defined at line 56.
-./test_multiconstraint.nit:70,1--74,11: Error: A class G is already defined at line 56.
+./test_multiconstraint.nit:64,7: Error: A class G is already defined at line 56.
+./test_multiconstraint.nit:70,7: Error: A class G is already defined at line 56.

diff --git a/tests/sav/test_multiconstraint_ref.sav b/tests/sav/test_multiconstraint_ref.sav
index faa13ef..1a85053 100644 (file)
--- a/tests/sav/test_multiconstraint_ref.sav
+++ b/tests/sav/test_multiconstraint_ref.sav
@@ -1,2 +1,2 @@
-./test_multiconstraint.nit:64,1--67,11: Error: A class G is already defined at line 56.
-./test_multiconstraint.nit:70,1--74,11: Error: A class G is already defined at line 56.
+./test_multiconstraint.nit:64,7: Error: A class G is already defined at line 56.
+./test_multiconstraint.nit:70,7: Error: A class G is already defined at line 56.

diff --git a/tests/sav/test_multiconstraint_ref2.sav b/tests/sav/test_multiconstraint_ref2.sav
index faa13ef..1a85053 100644 (file)
--- a/tests/sav/test_multiconstraint_ref2.sav
+++ b/tests/sav/test_multiconstraint_ref2.sav
@@ -1,2 +1,2 @@
-./test_multiconstraint.nit:64,1--67,11: Error: A class G is already defined at line 56.
-./test_multiconstraint.nit:70,1--74,11: Error: A class G is already defined at line 56.
+./test_multiconstraint.nit:64,7: Error: A class G is already defined at line 56.
+./test_multiconstraint.nit:70,7: Error: A class G is already defined at line 56.

diff --git a/tests/sav/test_paire.fail b/tests/sav/test_paire.fail
index 7f5899b..9eee1ce 100644 (file)
--- a/tests/sav/test_paire.fail
+++ b/tests/sav/test_paire.fail
@@ -1,2 +1,2 @@
-./test_paire.nit:45,1--50,43: Error: A class Pair is already defined at line 17.
-./test_paire.nit:54,1--58,25: Error: A class Pair is already defined at line 17.
+./test_paire.nit:45,7--10: Error: A class Pair is already defined at line 17.
+./test_paire.nit:54,7--10: Error: A class Pair is already defined at line 17.