summaryrefslogtreecommitdiff
path: root/test/testc.c
diff options
context:
space:
mode:
authorJ旦rg Frings-F端rst <debian@jff.email>2020-04-20 20:33:58 +0200
committerJ旦rg Frings-F端rst <debian@jff.email>2020-04-20 20:33:58 +0200
commit73c6133c32cddae59813cbadf655cb50a3a7356a (patch)
tree0935fb6da7f1d9728b42ddf08395a0e977e1c228 /test/testc.c
parent043fff5b6f2461aeccb1c62cb771826cfe301832 (diff)
parent6b986090d954dbac91bbb3c43ce7c3328c91a780 (diff)
Update upstream source from tag 'upstream/6.9.5'
Update to upstream version '6.9.5' with Debian dir 1312d9badb7f1c47d032cf09765074e8fd80c991
Diffstat (limited to 'test/testc.c')
-rw-r--r--test/testc.c76
1 files changed, 2 insertions, 74 deletions
diff --git a/test/testc.c b/test/testc.c
index 5c60764..fbede67 100644
--- a/test/testc.c
+++ b/test/testc.c
@@ -1,17 +1,12 @@
/*
* testc.c
- * Copyright (c) 2019 K.Kosako
+ * Copyright (c) 2019-2020 K.Kosako
*/
#include "config.h"
#include <stdio.h>
+#include <string.h>
-#ifdef POSIX_TEST
-#include "onigposix.h"
-#else
#include "oniguruma.h"
-#endif
-
-#include <string.h>
#define SLEN(s) strlen(s)
@@ -20,66 +15,11 @@ static int nfail = 0;
static int nerror = 0;
static FILE* err_file;
-
-#ifndef POSIX_TEST
static OnigRegion* region;
-#endif
static void xx(char* pattern, char* str, int from, int to, int mem, int not)
{
int r;
-
-#ifdef POSIX_TEST
- regex_t reg;
- char buf[200];
- regmatch_t pmatch[25];
-
- r = regcomp(&reg, pattern, REG_EXTENDED | REG_NEWLINE);
- if (r) {
- regerror(r, &reg, buf, sizeof(buf));
- fprintf(err_file, "ERROR: %s\n", buf);
- nerror++;
- return ;
- }
-
- r = regexec(&reg, str, reg.re_nsub + 1, pmatch, 0);
- if (r != 0 && r != REG_NOMATCH) {
- regerror(r, &reg, buf, sizeof(buf));
- fprintf(err_file, "ERROR: %s\n", buf);
- nerror++;
- return ;
- }
-
- if (r == REG_NOMATCH) {
- if (not) {
- fprintf(stdout, "OK(N): /%s/ '%s'\n", pattern, str);
- nsucc++;
- }
- else {
- fprintf(stdout, "FAIL: /%s/ '%s'\n", pattern, str);
- nfail++;
- }
- }
- else {
- if (not) {
- fprintf(stdout, "FAIL(N): /%s/ '%s'\n", pattern, str);
- nfail++;
- }
- else {
- if (pmatch[mem].rm_so == from && pmatch[mem].rm_eo == to) {
- fprintf(stdout, "OK: /%s/ '%s'\n", pattern, str);
- nsucc++;
- }
- else {
- fprintf(stdout, "FAIL: /%s/ '%s' %d-%d : %d-%d\n", pattern, str,
- from, to, pmatch[mem].rm_so, pmatch[mem].rm_eo);
- nfail++;
- }
- }
- }
- regfree(&reg);
-
-#else
regex_t* reg;
OnigErrorInfo einfo;
@@ -132,7 +72,6 @@ static void xx(char* pattern, char* str, int from, int to, int mem, int not)
}
}
onig_free(reg);
-#endif
}
static void x2(char* pattern, char* str, int from, int to)
@@ -152,20 +91,13 @@ static void n(char* pattern, char* str)
extern int main(int argc, char* argv[])
{
-#ifndef POSIX_TEST
OnigEncoding use_encs[1];
use_encs[0] = ONIG_ENCODING_EUC_JP;
onig_initialize(use_encs, sizeof(use_encs)/sizeof(use_encs[0]));
-#endif
err_file = stdout;
-
-#ifdef POSIX_TEST
- reg_set_encoding(REG_POSIX_ENCODING_EUC_JP);
-#else
region = onig_region_new();
-#endif
x2("", "", 0, 0);
x2("^", "", 0, 0);
@@ -961,19 +893,15 @@ extern int main(int argc, char* argv[])
x2(".<b>バージョンのダウンロード<\\/b>", "a<b>バージョンのダウンロード</b>", 0, 32);
x2("\\n?\\z", "こんにちは", 10, 10);
-#ifndef POSIX_TEST
x2("\\p{Hiragana}", "ぴ", 0, 2);
n("\\P{Hiragana}", "ぴ");
-#endif
fprintf(stdout,
"\nRESULT SUCC: %4d, FAIL: %d, ERROR: %d (by Oniguruma %s)\n",
nsucc, nfail, nerror, onig_version());
-#ifndef POSIX_TEST
onig_region_free(region, 1);
onig_end();
-#endif
return ((nfail == 0 && nerror == 0) ? 0 : -1);
}