Update upstream source from tag 'upstream/6.9.4'

Update to upstream version '6.9.4'
with Debian dir 02ee3cf90d9374728e429b9f574cef3b70759f00

3 files changed, 104 insertions, 2 deletions

diff --git a/sample/Makefile.am b/sample/Makefile.am
index 320afcf..22a4989 100644
--- a/sample/Makefile.am
+++ b/sample/Makefile.am
@@ -6,7 +6,11 @@ LDADD  = $(lib_onig)
 AM_LDFLAGS  = -L$(prefix)/lib
 AM_CPPFLAGS = -I$(top_srcdir)/src
 
-TESTS = encode listcap names posix simple sql syntax user_property callout echo count bug_fix
+if ENABLE_POSIX_API
+TESTS = encode listcap names posix simple sql syntax user_property callout echo count bug_fix regset
+else
+TESTS = encode listcap names simple sql syntax user_property callout echo count bug_fix regset
+endif
 
 check_PROGRAMS = $(TESTS)
 
@@ -22,6 +26,7 @@ callout_SOURCES = callout.c
 echo_SOURCES    = echo.c
 count_SOURCES   = count.c
 bug_fix         = bug_fix.c
+regset_SOURCES  = regset.c
 
 sampledir = .
 
@@ -29,7 +34,9 @@ test: $(TESTS)
 	$(sampledir)/encode
 	$(sampledir)/listcap
 	$(sampledir)/names
+if ENABLE_POSIX_API
 	$(sampledir)/posix
+endif
 	$(sampledir)/simple
 	$(sampledir)/sql
 	$(sampledir)/syntax
@@ -38,3 +45,4 @@ test: $(TESTS)
 	$(sampledir)/echo
 	$(sampledir)/count
 	$(sampledir)/bug_fix
+	$(sampledir)/regset
diff --git a/sample/bug_fix.c b/sample/bug_fix.c
index 3f60c5b..f295bfd 100644
--- a/sample/bug_fix.c
+++ b/sample/bug_fix.c
@@ -81,7 +81,7 @@ extern int main(int argc, char* argv[])
   /* fix ignore case in look-behind
      commit: 3340ec2cc5627172665303fe248c9793354d2251 */
   exec(ONIG_ENCODING_UTF8, ONIG_OPTION_IGNORECASE,
-       "(?<=\305\211)a", "\312\274na"); /* \u{0149}a  \u{02bc}na */
+       "\305\211a", "\312\274na"); /* \u{0149}a  \u{02bc}na */
 
   exec(ONIG_ENCODING_UTF8, ONIG_OPTION_NONE, "(\\2)(\\1)", "aa"); /* fail. */
 
diff --git a/sample/regset.c b/sample/regset.c
new file mode 100644
index 0000000..ca3a10c
--- /dev/null
+++ b/sample/regset.c
@@ -0,0 +1,94 @@
+/*
+ * regset.c
+ */
+#include <stdio.h>
+#include <string.h>
+#include "oniguruma.h"
+
+extern int main(int argc, char* argv[])
+{
+  int r;
+  int i, n;
+  int match_pos;
+  unsigned char *start, *range, *end;
+  OnigRegSet* set;
+  OnigRegSetLead lead;
+  regex_t* reg;
+  OnigErrorInfo einfo;
+  char ebuf[ONIG_MAX_ERROR_MESSAGE_LEN];
+
+  static UChar* str = (UChar* )"aaaaaaaaaaaaaaaaaaaaaaca";
+
+  static char* pat[] = {
+    "a(.*)b|a(.)c",
+    "^(abc)",
+    "a(.....)c"
+  };
+
+  OnigEncoding use_encs[] = { ONIG_ENCODING_UTF8 };
+  onig_initialize(use_encs, sizeof(use_encs)/sizeof(use_encs[0]));
+
+  r = onig_regset_new(&set, 0, NULL);
+  if (r != ONIG_NORMAL) {
+    onig_error_code_to_str((UChar* )ebuf, r);
+    fprintf(stderr, "ERROR: %s\n", ebuf);
+    onig_end();
+    return -1;
+  }
+
+  n = sizeof(pat) / sizeof(pat[0]);
+
+  for (i = 0; i < n; i++) {
+    r = onig_new(&reg, (UChar* )pat[i], (UChar* )(pat[i] + strlen(pat[i])),
+                 ONIG_OPTION_DEFAULT, ONIG_ENCODING_UTF8, ONIG_SYNTAX_DEFAULT,
+                 &einfo);
+    if (r != ONIG_NORMAL) {
+      onig_error_code_to_str((UChar* )ebuf, r, &einfo);
+      fprintf(stderr, "ERROR: %s\n", ebuf);
+      onig_regset_free(set);
+      onig_end();
+      return -1;
+    }
+
+    r = onig_regset_add(set, reg);
+    if (r != ONIG_NORMAL) {
+      onig_free(reg);
+      onig_regset_free(set);
+      onig_end();
+      return -1;
+    }
+  }
+
+  end   = str + strlen((char* )str);
+  start = str;
+  range = end;
+  lead = ONIG_REGSET_POSITION_LEAD;
+  //lead = ONIG_REGSET_PRIORITY_TO_REGEX_ORDER;
+  r = onig_regset_search(set, str, end, start, range, lead, ONIG_OPTION_NONE,
+                         &match_pos);
+  if (r >= 0) {
+    OnigRegion *region;
+
+    fprintf(stderr, "match regex index: %d\n", r);
+    fprintf(stderr, "match position: %d\n", match_pos);
+
+    region = onig_regset_get_region(set, r);
+    for (i = 0; i < region->num_regs; i++) {
+      fprintf(stderr, "%d: (%d-%d)\n", i, region->beg[i], region->end[i]);
+    }
+  }
+  else if (r == ONIG_MISMATCH) {
+    fprintf(stderr, "search fail\n");
+  }
+  else { /* error */
+    onig_error_code_to_str((UChar* )ebuf, r);
+    fprintf(stderr, "ERROR: %s\n", ebuf);
+    onig_regset_free(set);
+    onig_end();
+    return -1;
+  }
+
+  onig_regset_free(set);
+  onig_end();
+  return 0;
+}