From 2d23a432d9891b7b65d3480fc63d11bc896612c7 Mon Sep 17 00:00:00 2001 From: "K.Kosako" Date: Wed, 14 Mar 2018 09:46:13 +0900 Subject: [PATCH] remove builtin (*SUCCESS) entries --- sample/callout.c | 1 - src/ascii.c | 1 - src/utf16_be.c | 5 ++--- src/utf16_le.c | 5 ++--- test/test_utf8.c | 2 +- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/sample/callout.c b/sample/callout.c index 1126c18..ee4c702 100644 --- a/sample/callout.c +++ b/sample/callout.c @@ -228,7 +228,6 @@ extern int main(int argc, char* argv[]) // callout of name test(enc, "\\A(*foo)abc", "abc"); - test(enc, "abc(*SUCCESS)", "abcabc"); test(enc, "abc(?:(*FAIL)|$)", "abcabc"); test(enc, "abc(?:(*ABORT)|$)", "abcabc"); test(enc, "ab(*foo{})(*FAIL)", "abc"); diff --git a/src/ascii.c b/src/ascii.c index 7483c25..83ea87b 100644 --- a/src/ascii.c +++ b/src/ascii.c @@ -45,7 +45,6 @@ init(void) t_long = ONIG_TYPE_LONG; name = "FAIL"; BC0_P(name, fail); - name = "SUCCESS"; BC0_P(name, success); name = "ABORT"; BC0_P(name, abort); name = "ERROR"; BC_P(name, error, 1, &t_long); name = "MAX"; BC_B(name, max, 1, &t_long); diff --git a/src/utf16_be.c b/src/utf16_be.c index f308968..552bece 100644 --- a/src/utf16_be.c +++ b/src/utf16_be.c @@ -45,9 +45,8 @@ init(void) enc = ONIG_ENCODING_UTF16_BE; t_long = ONIG_TYPE_LONG; - name = "\000F\000A\000I\000L\000\000"; BC0_P(name, fail); - name = "\000S\000U\000C\000C\000E\000S\000S\000\000"; BC0_P(name, success); - name = "\000A\000B\000O\000R\000T\000\000"; BC0_P(name, abort); + name = "\000F\000A\000I\000L\000\000"; BC0_P(name, fail); + name = "\000A\000B\000O\000R\000T\000\000"; BC0_P(name, abort); name = "\000E\000R\000R\000O\000R\000\000"; BC_P(name, error, 1, &t_long); name = "\000M\000A\000X\000\000"; BC_B(name, max, 1, &t_long); diff --git a/src/utf16_le.c b/src/utf16_le.c index 4d377e5..8ffb811 100644 --- a/src/utf16_le.c +++ b/src/utf16_le.c @@ -43,9 +43,8 @@ init(void) enc = ONIG_ENCODING_UTF16_LE; t_long = ONIG_TYPE_LONG; - name = "F\000A\000I\000L\000\000\000"; BC0_P(name, fail); - name = "S\000U\000C\000C\000E\000S\000S\000\000\000"; BC0_P(name, success); - name = "A\000B\000O\000R\000T\000\000\000"; BC0_P(name, abort); + name = "F\000A\000I\000L\000\000\000"; BC0_P(name, fail); + name = "A\000B\000O\000R\000T\000\000\000"; BC0_P(name, abort); name = "E\000R\000R\000O\000R\000\000\000"; BC_P(name, error, 1, &t_long); name = "M\000A\000X\000\000\000"; BC_B(name, max, 1, &t_long); diff --git a/test/test_utf8.c b/test/test_utf8.c index 02bc449..286158d 100644 --- a/test/test_utf8.c +++ b/test/test_utf8.c @@ -1065,7 +1065,6 @@ extern int main(int argc, char* argv[]) x2("c.*\\b", "abc", 2, 3); x2("\\b.*abc.*\\b", "abc", 0, 3); - x2("(*SUCCESS)", "abcdefg", 0, 0); n("(*FAIL)", "abcdefg"); n("abcd(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)(*FAIL)", "abcdefg"); x2("(?:[ab]|(*MAX{2}).)*", "abcbaaccaaa", 0, 7); @@ -1078,6 +1077,7 @@ extern int main(int argc, char* argv[]) e("\\u040", "@", ONIGERR_INVALID_CODE_POINT_VALUE); e("(?\\g)", "zzzz", ONIGERR_NEVER_ENDING_RECURSION); e("(?<=(?>abc))", "abc", ONIGERR_INVALID_LOOK_BEHIND_PATTERN); + e("(*FOO)", "abcdefg", ONIGERR_UNDEFINED_CALLOUT_NAME); fprintf(stdout, "\nRESULT SUCC: %d, FAIL: %d, ERROR: %d (by Oniguruma %s)\n", -- 2.50.1