Completely rewrite QUtil::parse_numrange

1 files changed, 15 insertions, 15 deletions

diff --git a/libtests/qtest/numrange.test b/libtests/qtest/numrange.test
index 896c44d2..b1a04c98 100644
--- a/libtests/qtest/numrange.test
+++ b/libtests/qtest/numrange.test
@@ -9,37 +9,37 @@ my $td = new TestDriver('numrange');
 
 my @nrange_tests = (
     [",5",
-     "error at * in numeric range *,5: unexpected separator",
+     "error at * in numeric range *,5: invalid range syntax",
      2],
     ["4,,5",
-     "error at * in numeric range 4,*,5: unexpected separator",
+     "error at * in numeric range 4,*,5: invalid range syntax",
      2],
     ["4,5,",
-     "error at * in numeric range 4,5,*: number expected",
+     "error at * in numeric range 4,5,*: trailing comma",
      2],
     ["z1,",
-     "error at * in numeric range z*1,: digit not expected",
+     "error at * in numeric range *z1,: invalid range syntax",
      2],
     ["1z,",
-     "error at * in numeric range 1*z,: z not expected",
+     "error at * in numeric range *1z,: invalid range syntax",
      2],
     ["1-5?",
-     "error at * in numeric range 1-5*?: unexpected character",
+     "error at * in numeric range *1-5?: invalid range syntax",
      2],
     ["1-30",
-     "error in numeric range 1-30: number 30 out of range",
+     "error at * in numeric range *1-30: number 30 out of range",
      2],
     ["1-10,0,5",
-     "error in numeric range 1-10,0,5: number 0 out of range",
+     "error at * in numeric range 1-10,*0,5: number 0 out of range",
      2],
     ["1-10,1234,5",
-     "error in numeric range 1-10,1234,5: number 1234 out of range",
+     "error at * in numeric range 1-10,*1234,5: number 1234 out of range",
      2],
     ["1,r,3",
-     "error in numeric range 1,r,3: number 16 out of range",
+     "error at * in numeric range 1,*r,3: invalid range syntax",
      2],
     ["1,r16,3",
-     "error in numeric range 1,r16,3: number 0 out of range",
+     "error at * in numeric range 1,*r16,3: number 0 out of range",
      2],
     ["1,3,5-10,z-13,13,9,z,2,r2-r4",
      "numeric range 1,3,5-10,z-13,13,9,z,2,r2-r4" .
@@ -50,16 +50,16 @@ my @nrange_tests = (
      " -> 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1",
      0],
     ["1-10:quack",
-     "error at * in numeric range 1-10*:quack: unexpected even/odd modifier",
+     "error at * in numeric range 1-10*:quack: expected :even or :odd",
      2],
     ["1-10:",
-     "error at * in numeric range 1-10*:: unexpected even/odd modifier",
+     "error at * in numeric range 1-10*:: expected :even or :odd",
      2],
     ["1-10,r:",
-     "error at * in numeric range 1-10,r*:: unexpected even/odd modifier",
+     "error at * in numeric range 1-10,r*:: expected :even or :odd",
      2],
     ["1-10,:",
-     "error at * in numeric range 1-10,*:: unexpected colon",
+     "error at * in numeric range 1-10,*:: expected :even or :odd",
      2],
     ["1-6,8-12:odd",
      "numeric range 1-6,8-12:odd -> 1 3 5 8 10 12",