From 02c81cd340139c89685ccb2005e900ad948dc72c Mon Sep 17 00:00:00 2001 From: Jean Privat Date: Tue, 28 Jul 2009 22:45:15 -0400 Subject: [PATCH] tools: correctly display multiline locations Signed-off-by: Jean Privat --- src/location.nit | 2 +- tests/sav/base_closure1_alt11.sav | 2 +- tests/sav/base_closure2_alt11.sav | 2 +- tests/sav/base_closure3_alt2.sav | 2 +- tests/sav/base_closure4_alt11.sav | 2 +- tests/sav/base_closure5_alt9.sav | 2 +- tests/sav/base_closure6_alt1.sav | 2 +- tests/sav/base_closure_break_alt11.sav | 2 +- tests/sav/base_closure_break_alt13.sav | 2 +- tests/sav/base_closure_multi_alt1.sav | 2 +- tests/sav/base_closure_multi_alt2.sav | 2 +- tests/sav/base_closure_multi_alt3.sav | 2 +- tests/sav/base_closure_multi_alt4.sav | 2 +- tests/sav/base_closure_raf_alt11.fail | 2 +- tests/sav/base_control_flow_alt1.sav | 4 ++-- tests/sav/base_init_inherit2_alt3.sav | 2 +- tests/sav/base_init_inherit3.sav | 2 +- tests/sav/base_init_linext2_alt2.sav | 2 +- tests/sav/base_init_linext2_alt4.sav | 2 +- tests/sav/error_defs_alt1.sav | 2 +- tests/sav/error_defs_alt3.sav | 2 +- tests/sav/error_defs_alt4.sav | 2 +- tests/sav/error_defs_alt5.sav | 4 ++-- tests/sav/error_defs_alt6.sav | 2 +- tests/sav/error_defs_alt7.sav | 2 +- tests/sav/error_defs_alt8.sav | 2 +- tests/sav/error_fun_ret2.sav | 2 +- tests/sav/error_fun_ret3.sav | 2 +- tests/sav/error_fun_ret4.sav | 2 +- tests/sav/error_fun_ret5.sav | 2 +- tests/sav/test_multiconstraint.sav | 4 ++-- tests/sav/test_multiconstraint_ref.sav | 4 ++-- tests/sav/test_multiconstraint_ref2.sav | 4 ++-- tests/sav/test_paire.fail | 4 ++-- 34 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/location.nit b/src/location.nit index c3eb80d..3d2a5fd 100644 --- a/src/location.nit +++ b/src/location.nit @@ -78,7 +78,7 @@ special Comparable return "{file_part}{line_start},{column_start}--{column_end}" end else - return "{file_part}{line_start},{column_start}--{line_end}:{column_end}" + return "{file_part}{line_start},{column_start}--{line_end},{column_end}" end end diff --git a/tests/sav/base_closure1_alt11.sav b/tests/sav/base_closure1_alt11.sav index 166186e..6486abd 100644 --- a/tests/sav/base_closure1_alt11.sav +++ b/tests/sav/base_closure1_alt11.sav @@ -1 +1 @@ -alt/base_closure1_alt11.nit:34,8--42:10: Error: 0 automatic variable names expected, 1 found. +alt/base_closure1_alt11.nit:34,8--42,10: Error: 0 automatic variable names expected, 1 found. diff --git a/tests/sav/base_closure2_alt11.sav b/tests/sav/base_closure2_alt11.sav index 6e210a6..ded6ba6 100644 --- a/tests/sav/base_closure2_alt11.sav +++ b/tests/sav/base_closure2_alt11.sav @@ -1 +1 @@ -alt/base_closure2_alt11.nit:35,8--43:14: Error: 1 automatic variable names expected, 0 found. +alt/base_closure2_alt11.nit:35,8--43,14: Error: 1 automatic variable names expected, 0 found. diff --git a/tests/sav/base_closure3_alt2.sav b/tests/sav/base_closure3_alt2.sav index f2a8a61..ce88f76 100644 --- a/tests/sav/base_closure3_alt2.sav +++ b/tests/sav/base_closure3_alt2.sav @@ -1 +1 @@ -alt/base_closure3_alt2.nit:32,12--44:9: Error: 3 automatic variable names expected, 2 found. +alt/base_closure3_alt2.nit:32,12--44,9: Error: 3 automatic variable names expected, 2 found. diff --git a/tests/sav/base_closure4_alt11.sav b/tests/sav/base_closure4_alt11.sav index c79e06e..ee8fa19 100644 --- a/tests/sav/base_closure4_alt11.sav +++ b/tests/sav/base_closure4_alt11.sav @@ -1 +1 @@ -alt/base_closure4_alt11.nit:34,8--42:12: Error: 0 automatic variable names expected, 1 found. +alt/base_closure4_alt11.nit:34,8--42,12: Error: 0 automatic variable names expected, 1 found. diff --git a/tests/sav/base_closure5_alt9.sav b/tests/sav/base_closure5_alt9.sav index 6a3b6d1..2d9e8a4 100644 --- a/tests/sav/base_closure5_alt9.sav +++ b/tests/sav/base_closure5_alt9.sav @@ -1 +1 @@ -alt/base_closure5_alt9.nit:33,16--34:10: Control error: Reached end of block (a 'continue' with a value was expected). +alt/base_closure5_alt9.nit:33,16--34,10: Control error: Reached end of block (a 'continue' with a value was expected). diff --git a/tests/sav/base_closure6_alt1.sav b/tests/sav/base_closure6_alt1.sav index bf562be..6621084 100644 --- a/tests/sav/base_closure6_alt1.sav +++ b/tests/sav/base_closure6_alt1.sav @@ -1,4 +1,4 @@ alt/base_closure6_alt1.nit:53,5--25: Type error: expected U, got T alt/base_closure6_alt1.nit:55,25: Type error: no most general type. Got V and U. -alt/base_closure6_alt1.nit:57,5--61:8: Type error: expected U, got T +alt/base_closure6_alt1.nit:57,5--61,8: Type error: expected U, got T alt/base_closure6_alt1.nit:65,8: Type error: no most general type. Got V and U at 64,8. diff --git a/tests/sav/base_closure_break_alt11.sav b/tests/sav/base_closure_break_alt11.sav index 892cd56..0da736c 100644 --- a/tests/sav/base_closure_break_alt11.sav +++ b/tests/sav/base_closure_break_alt11.sav @@ -1 +1 @@ -alt/base_closure_break_alt11.nit:35,8--44:7: Error: 0 automatic variable names expected, 1 found. +alt/base_closure_break_alt11.nit:35,8--44,7: Error: 0 automatic variable names expected, 1 found. diff --git a/tests/sav/base_closure_break_alt13.sav b/tests/sav/base_closure_break_alt13.sav index fc12a48..eec06e9 100644 --- a/tests/sav/base_closure_break_alt13.sav +++ b/tests/sav/base_closure_break_alt13.sav @@ -1 +1 @@ -alt/base_closure_break_alt13.nit:35,8--44:10: Control error: Reached end of break block (a 'break' was expected). +alt/base_closure_break_alt13.nit:35,8--44,10: Control error: Reached end of break block (a 'break' was expected). diff --git a/tests/sav/base_closure_multi_alt1.sav b/tests/sav/base_closure_multi_alt1.sav index 1136ee9..cba492b 100644 --- a/tests/sav/base_closure_multi_alt1.sav +++ b/tests/sav/base_closure_multi_alt1.sav @@ -1 +1 @@ -alt/base_closure_multi_alt1.nit:52,1--61:9: Error: a requires 1 blocks, 2 found. +alt/base_closure_multi_alt1.nit:52,1--61,9: Error: a requires 1 blocks, 2 found. diff --git a/tests/sav/base_closure_multi_alt2.sav b/tests/sav/base_closure_multi_alt2.sav index 1a2032d..95fd897 100644 --- a/tests/sav/base_closure_multi_alt2.sav +++ b/tests/sav/base_closure_multi_alt2.sav @@ -1 +1 @@ -alt/base_closure_multi_alt2.nit:54,1--63:9: Error: a requires 3 blocks, 2 found. +alt/base_closure_multi_alt2.nit:54,1--63,9: Error: a requires 3 blocks, 2 found. diff --git a/tests/sav/base_closure_multi_alt3.sav b/tests/sav/base_closure_multi_alt3.sav index 4e39c20..947dfe7 100644 --- a/tests/sav/base_closure_multi_alt3.sav +++ b/tests/sav/base_closure_multi_alt3.sav @@ -1 +1 @@ -alt/base_closure_multi_alt3.nit:55,2--56:10: Error: b requires 2 blocks, 1 found. +alt/base_closure_multi_alt3.nit:55,2--56,10: Error: b requires 2 blocks, 1 found. diff --git a/tests/sav/base_closure_multi_alt4.sav b/tests/sav/base_closure_multi_alt4.sav index d15a655..3cd3b74 100644 --- a/tests/sav/base_closure_multi_alt4.sav +++ b/tests/sav/base_closure_multi_alt4.sav @@ -1 +1 @@ -alt/base_closure_multi_alt4.nit:55,2--60:11: Error: b requires 2 blocks, 3 found. +alt/base_closure_multi_alt4.nit:55,2--60,11: Error: b requires 2 blocks, 3 found. diff --git a/tests/sav/base_closure_raf_alt11.fail b/tests/sav/base_closure_raf_alt11.fail index 03642ee..8ea336c 100644 --- a/tests/sav/base_closure_raf_alt11.fail +++ b/tests/sav/base_closure_raf_alt11.fail @@ -1 +1 @@ -alt/base_closure_raf_alt11.nit:39,8--47:14: Error: 1 automatic variable names expected, 0 found. +alt/base_closure_raf_alt11.nit:39,8--47,14: Error: 1 automatic variable names expected, 0 found. diff --git a/tests/sav/base_control_flow_alt1.sav b/tests/sav/base_control_flow_alt1.sav index f08ad05..7013490 100644 --- 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,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). diff --git a/tests/sav/base_init_inherit2_alt3.sav b/tests/sav/base_init_inherit2_alt3.sav index 70caf2f..e280b79 100644 --- 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::A::ca, base_init_inherit2_alt3::B::cb, base_init_inherit2_alt3::C::cc. +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::A::ca, base_init_inherit2_alt3::B::cb, base_init_inherit2_alt3::C::cc. diff --git a/tests/sav/base_init_inherit3.sav b/tests/sav/base_init_inherit3.sav index f8caa8c..7cf110c 100644 --- a/tests/sav/base_init_inherit3.sav +++ b/tests/sav/base_init_inherit3.sav @@ -1 +1 @@ -./base_init_inherit3.nit:82,1--87:7: Error: No property Q::foo is inherited. Remove the redef keyword to define a new property. +./base_init_inherit3.nit:82,1--87,7: 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 d76e844..ce93357 100644 --- 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--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). diff --git a/tests/sav/base_init_linext2_alt4.sav b/tests/sav/base_init_linext2_alt4.sav index 0897605..3be440e 100644 --- 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: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). +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/error_defs_alt1.sav b/tests/sav/error_defs_alt1.sav index 2e1f7d7..95b008c 100644 --- 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,1--20,32: Redef error: Object is an imported class. Add the redef keyword to refine it. diff --git a/tests/sav/error_defs_alt3.sav b/tests/sav/error_defs_alt3.sav index c723424..f3e5eb4 100644 --- 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:26,1--27,32: 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 f8a8283..f83c589 100644 --- 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:28,1--29,29: 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 69abf33..df92802 100644 --- 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: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. diff --git a/tests/sav/error_defs_alt6.sav b/tests/sav/error_defs_alt6.sav index 304f9b6..feb1fa0 100644 --- 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,1--36,33: 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 b2dc6ba..6b54313 100644 --- 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:35,1--39,33: 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 e4c28b9..af58be8 100644 --- 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:35,1--42,39: Error: A class A is already defined at line 24. diff --git a/tests/sav/error_fun_ret2.sav b/tests/sav/error_fun_ret2.sav index 8143716..aed0a45 100644 --- 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,1--20,10: 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 47c223a..c89fa83 100644 --- 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,1--21,10: 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 3ad3d28..93095b5 100644 --- 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,1--21,10: 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 41a4c7d..163a47d 100644 --- 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,1--20,10: Control error: Reached end of function (a 'return' with a value was expected). diff --git a/tests/sav/test_multiconstraint.sav b/tests/sav/test_multiconstraint.sav index 61b6afb..faa13ef 100644 --- 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,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. diff --git a/tests/sav/test_multiconstraint_ref.sav b/tests/sav/test_multiconstraint_ref.sav index 61b6afb..faa13ef 100644 --- 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,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. diff --git a/tests/sav/test_multiconstraint_ref2.sav b/tests/sav/test_multiconstraint_ref2.sav index 61b6afb..faa13ef 100644 --- 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,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. diff --git a/tests/sav/test_paire.fail b/tests/sav/test_paire.fail index 2aca21f..7f5899b 100644 --- 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,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. -- 1.7.9.5