- Update tests after manually verifying results using gdb

diff --git a/test/bug1454253.c b/test/bug1454253.c
index d877a8da9fd5daebd622771ab36fca25757cfb32..8e1fc98d919c175e423dbf9b28035a38512c0d1c 100755 (executable)
--- a/test/bug1454253.c
+++ b/test/bug1454253.c
@@ -306,11 +306,18 @@ void _do_scan(const char * str, size_t str_len, size_t scn_len, const char * exp
 
 main()
 {
+       do_scan("?1??",         2, "20");
        do_scan("#",            1, "0");
+       do_scan("##",           2, "0");
+       do_scan("##?",          2, "0");
+       do_scan("##|",          3, "0");
+       do_scan("?!|",          3, "10");
+       do_scan("?!?1|",        5, "120");
        do_scan("?!?a+",        5, "120");
+       do_scan("?2!1?2??",     4, "20");
        do_scan("?1?2!1?2??",   6, "220");
-       do_scan("?1?2?!1?2??", 11, "22120");
+       do_scan("?1?2?!1?2??",  9, "22120");
        do_scan("?1?2?!1?2?!", 12, "221213");
-       do_scan("?1?123?45??", 11, "2220");
+       do_scan("?1?123?45??",  9, "2220");
        do_scan("?1?123?45?!", 12, "22213");
 }

diff --git a/test/bug1454253.re b/test/bug1454253.re
index 69cbc2a33646b334f792fddacfb88fe4084a6332..3a7e7137050a9337b11e98120652aa35dbd1d270 100755 (executable)
--- a/test/bug1454253.re
+++ b/test/bug1454253.re
@@ -67,11 +67,18 @@ void _do_scan(const char * str, size_t str_len, size_t scn_len, const char * exp
 
 main()
 {
+       do_scan("?1??",         2, "20");
        do_scan("#",            1, "0");
+       do_scan("##",           2, "0");
+       do_scan("##?",          2, "0");
+       do_scan("##|",          3, "0");
+       do_scan("?!|",          3, "10");
+       do_scan("?!?1|",        5, "120");
        do_scan("?!?a+",        5, "120");
+       do_scan("?2!1?2??",     4, "20");
        do_scan("?1?2!1?2??",   6, "220");
-       do_scan("?1?2?!1?2??", 11, "22120");
+       do_scan("?1?2?!1?2??",  9, "22120");
        do_scan("?1?2?!1?2?!", 12, "221213");
-       do_scan("?1?123?45??", 11, "2220");
+       do_scan("?1?123?45??",  9, "2220");
        do_scan("?1?123?45?!", 12, "22213");
 }

diff --git a/test/bug1454253.s.c b/test/bug1454253.s.c
index 5ad6df3af5ea4be38a3b856b78680aa7fa90586b..eb0415a1eb369e221349fe5a570a3a65673b9f17 100755 (executable)
--- a/test/bug1454253.s.c
+++ b/test/bug1454253.s.c
@@ -133,11 +133,18 @@ void _do_scan(const char * str, size_t str_len, size_t scn_len, const char * exp
 
 main()
 {
+       do_scan("?1??",         2, "20");
        do_scan("#",            1, "0");
+       do_scan("##",           2, "0");
+       do_scan("##?",          2, "0");
+       do_scan("##|",          3, "0");
+       do_scan("?!|",          3, "10");
+       do_scan("?!?1|",        5, "120");
        do_scan("?!?a+",        5, "120");
+       do_scan("?2!1?2??",     4, "20");
        do_scan("?1?2!1?2??",   6, "220");
-       do_scan("?1?2?!1?2??", 11, "22120");
+       do_scan("?1?2?!1?2??",  9, "22120");
        do_scan("?1?2?!1?2?!", 12, "221213");
-       do_scan("?1?123?45??", 11, "2220");
+       do_scan("?1?123?45??",  9, "2220");
        do_scan("?1?123?45?!", 12, "22213");
 }

diff --git a/test/bug1454253.s.re b/test/bug1454253.s.re
index 69cbc2a33646b334f792fddacfb88fe4084a6332..3a7e7137050a9337b11e98120652aa35dbd1d270 100755 (executable)
--- a/test/bug1454253.s.re
+++ b/test/bug1454253.s.re
@@ -67,11 +67,18 @@ void _do_scan(const char * str, size_t str_len, size_t scn_len, const char * exp
 
 main()
 {
+       do_scan("?1??",         2, "20");
        do_scan("#",            1, "0");
+       do_scan("##",           2, "0");
+       do_scan("##?",          2, "0");
+       do_scan("##|",          3, "0");
+       do_scan("?!|",          3, "10");
+       do_scan("?!?1|",        5, "120");
        do_scan("?!?a+",        5, "120");
+       do_scan("?2!1?2??",     4, "20");
        do_scan("?1?2!1?2??",   6, "220");
-       do_scan("?1?2?!1?2??", 11, "22120");
+       do_scan("?1?2?!1?2??",  9, "22120");
        do_scan("?1?2?!1?2?!", 12, "221213");
-       do_scan("?1?123?45??", 11, "2220");
+       do_scan("?1?123?45??",  9, "2220");
        do_scan("?1?123?45?!", 12, "22213");
 }

diff --git a/test/bug1454253b.s.c b/test/bug1454253b.s.c
index 246fe372b383d1f4236dfc7cd7c32ad53d0c92cd..45aea09679112ecb65907d268f13bd364cc8187d 100755 (executable)
--- a/test/bug1454253b.s.c
+++ b/test/bug1454253b.s.c
@@ -113,8 +113,15 @@ void _do_scan(const char * str, size_t str_len, size_t scn_len, const char * exp
 
 main()
 {
+       do_scan("?1??",         4, "20");
        do_scan("#",            1, "0");
+       do_scan("##",           1, "0");
+       do_scan("##?",          1, "0");
+       do_scan("##|",          1, "0");
+       do_scan("?!|",          3, "10");
+       do_scan("?!?1|",        5, "120");
        do_scan("?!?a+",        5, "120");
+       do_scan("?2!1?2??",     3, "20");
        do_scan("?1?2!1?2??",   5, "220");
        do_scan("?1?2?!1?2??", 11, "22120");
        do_scan("?1?2?!1?2?!", 12, "221210");

diff --git a/test/bug1454253b.s.re b/test/bug1454253b.s.re
index 1f3a63da3d4268524370941133e104c3158e0b7c..aca10160352997833bbbbff6404d56e455b70399 100755 (executable)
--- a/test/bug1454253b.s.re
+++ b/test/bug1454253b.s.re
@@ -60,8 +60,15 @@ void _do_scan(const char * str, size_t str_len, size_t scn_len, const char * exp
 
 main()
 {
+       do_scan("?1??",         4, "20");
        do_scan("#",            1, "0");
+       do_scan("##",           1, "0");
+       do_scan("##?",          1, "0");
+       do_scan("##|",          1, "0");
+       do_scan("?!|",          3, "10");
+       do_scan("?!?1|",        5, "120");
        do_scan("?!?a+",        5, "120");
+       do_scan("?2!1?2??",     3, "20");
        do_scan("?1?2!1?2??",   5, "220");
        do_scan("?1?2?!1?2??", 11, "22120");
        do_scan("?1?2?!1?2?!", 12, "221210");