rroonga 6.1.0-x86-mingw32 → 6.1.3-x86-mingw32

data/vendor/local/include/{oniggnu.h → onigmognu.h}

@@ -1,10 +1,11 @@
-#ifndef ONIGGNU_H
-#define ONIGGNU_H
+#ifndef ONIGMOGNU_H
+#define ONIGMOGNU_H
 /**********************************************************************
-  oniggnu.h - Oniguruma (regular expression library)
+  onigmognu.h - Onigmo (Oniguruma-mod) (regular expression library)
 **********************************************************************/
 /*-
  * Copyright (c) 2002-2005  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * Copyright (c) 2011-2016  K.Takata  <kentkt AT csc DOT jp>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,7 +30,7 @@
  * SUCH DAMAGE.
  */
 
-#include "oniguruma.h"
+#include "onigmo.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -58,28 +59,28 @@ extern "C" {
 
 
 ONIG_EXTERN
-void re_mbcinit P_((int));
+void re_mbcinit(int);
 ONIG_EXTERN
-int re_compile_pattern P_((const char*, int, struct re_pattern_buffer*, char* err_buf));
+int re_compile_pattern(const char*, int, struct re_pattern_buffer*, char* err_buf);
 ONIG_EXTERN
-int re_recompile_pattern P_((const char*, int, struct re_pattern_buffer*, char* err_buf));
+int re_recompile_pattern(const char*, int, struct re_pattern_buffer*, char* err_buf);
 ONIG_EXTERN
-void re_free_pattern P_((struct re_pattern_buffer*));
+void re_free_pattern(struct re_pattern_buffer*);
 ONIG_EXTERN
-int re_adjust_startpos P_((struct re_pattern_buffer*, const char*, int, int, int));
+int re_adjust_startpos(struct re_pattern_buffer*, const char*, int, int, int);
 ONIG_EXTERN
-int re_search P_((struct re_pattern_buffer*, const char*, int, int, int, struct re_registers*));
+int re_search(struct re_pattern_buffer*, const char*, int, int, int, struct re_registers*);
 ONIG_EXTERN
-int re_match P_((struct re_pattern_buffer*, const char *, int, int, struct re_registers*));
+int re_match(struct re_pattern_buffer*, const char *, int, int, struct re_registers*);
 ONIG_EXTERN
-void re_set_casetable P_((const char*));
+void re_set_casetable(const char*);
 ONIG_EXTERN
-void re_free_registers P_((struct re_registers*));
+void re_free_registers(struct re_registers*);
 ONIG_EXTERN
-int re_alloc_pattern P_((struct re_pattern_buffer**));  /* added */
+int re_alloc_pattern(struct re_pattern_buffer**);  /* added */
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* ONIGGNU_H */
+#endif /* ONIGMOGNU_H */

data/vendor/local/include/{onigposix.h → onigmoposix.h}

@@ -1,10 +1,11 @@
-#ifndef ONIGPOSIX_H
-#define ONIGPOSIX_H
+#ifndef ONIGMOPOSIX_H
+#define ONIGMOPOSIX_H
 /**********************************************************************
-  onigposix.h - Oniguruma (regular expression library)
+  onigmoposix.h - Onigmo (Oniguruma-mod) (regular expression library)
 **********************************************************************/
 /*-
  * Copyright (c) 2002-2005  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * Copyright (c) 2011-2016  K.Takata  <kentkt AT csc DOT jp>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -61,7 +62,7 @@ extern "C" {
 #define REG_EONIG_INTERNAL  14
 #define REG_EONIG_BADWC     15
 #define REG_EONIG_BADARG    16
-#define REG_EONIG_THREAD    17
+/* #define REG_EONIG_THREAD    17 */
 
 /* character encodings (for reg_set_encoding()) */
 #define REG_POSIX_ENCODING_ASCII     0
@@ -87,29 +88,21 @@ typedef struct {
 } regex_t;
 
 
-#ifndef P_
-#if defined(__STDC__) || defined(_WIN32)
-# define P_(args) args
-#else
-# define P_(args) ()
-#endif
-#endif
-
 #ifndef ONIG_EXTERN
-#if defined(_WIN32) && !defined(__GNUC__)
-#if defined(EXPORT)
-#define ONIG_EXTERN   extern __declspec(dllexport)
-#else
-#define ONIG_EXTERN   extern __declspec(dllimport)
-#endif
-#endif
+# if defined(_WIN32) && !defined(__GNUC__)
+#  if defined(EXPORT)
+#   define ONIG_EXTERN   extern __declspec(dllexport)
+#  else
+#   define ONIG_EXTERN   extern __declspec(dllimport)
+#  endif
+# endif
 #endif
 
 #ifndef ONIG_EXTERN
-#define ONIG_EXTERN   extern
+# define ONIG_EXTERN   extern
 #endif
 
-#ifndef ONIGURUMA_H
+#ifndef ONIGMO_H
 typedef unsigned int        OnigOptionType;
 
 /* syntax */
@@ -120,14 +113,14 @@ typedef struct {
   OnigOptionType options;    /* default option */
 } OnigSyntaxType;
 
-ONIG_EXTERN OnigSyntaxType OnigSyntaxPosixBasic;
-ONIG_EXTERN OnigSyntaxType OnigSyntaxPosixExtended;
-ONIG_EXTERN OnigSyntaxType OnigSyntaxEmacs;
-ONIG_EXTERN OnigSyntaxType OnigSyntaxGrep;
-ONIG_EXTERN OnigSyntaxType OnigSyntaxGnuRegex;
-ONIG_EXTERN OnigSyntaxType OnigSyntaxJava;
-ONIG_EXTERN OnigSyntaxType OnigSyntaxPerl;
-ONIG_EXTERN OnigSyntaxType OnigSyntaxRuby;
+ONIG_EXTERN const OnigSyntaxType OnigSyntaxPosixBasic;
+ONIG_EXTERN const OnigSyntaxType OnigSyntaxPosixExtended;
+ONIG_EXTERN const OnigSyntaxType OnigSyntaxEmacs;
+ONIG_EXTERN const OnigSyntaxType OnigSyntaxGrep;
+ONIG_EXTERN const OnigSyntaxType OnigSyntaxGnuRegex;
+ONIG_EXTERN const OnigSyntaxType OnigSyntaxJava;
+ONIG_EXTERN const OnigSyntaxType OnigSyntaxPerl;
+ONIG_EXTERN const OnigSyntaxType OnigSyntaxRuby;
 
 /* predefined syntaxes (see regsyntax.c) */
 #define ONIG_SYNTAX_POSIX_BASIC        (&OnigSyntaxPosixBasic)
@@ -141,29 +134,29 @@ ONIG_EXTERN OnigSyntaxType OnigSyntaxRuby;
 /* default syntax */
 #define ONIG_SYNTAX_DEFAULT             OnigDefaultSyntax
 
-ONIG_EXTERN OnigSyntaxType*  OnigDefaultSyntax;
+ONIG_EXTERN const OnigSyntaxType*  OnigDefaultSyntax;
 
-ONIG_EXTERN int  onig_set_default_syntax P_((OnigSyntaxType* syntax));
-ONIG_EXTERN void onig_copy_syntax P_((OnigSyntaxType* to, OnigSyntaxType* from));
-ONIG_EXTERN const char* onig_version P_((void));
-ONIG_EXTERN const char* onig_copyright P_((void));
+ONIG_EXTERN int  onig_set_default_syntax(const OnigSyntaxType* syntax);
+ONIG_EXTERN void onig_copy_syntax(OnigSyntaxType* to, const OnigSyntaxType* from);
+ONIG_EXTERN const char* onig_version(void);
+ONIG_EXTERN const char* onig_copyright(void);
 
-#endif /* ONIGURUMA_H */
+#endif /* ONIGMO_H */
 
 
-ONIG_EXTERN int    regcomp P_((regex_t* reg, const char* pat, int options));
-ONIG_EXTERN int    regexec P_((regex_t* reg, const char* str, size_t nmatch, regmatch_t* matches, int options));
-ONIG_EXTERN void   regfree P_((regex_t* reg));
-ONIG_EXTERN size_t regerror P_((int code, const regex_t* reg, char* buf, size_t size));
+ONIG_EXTERN int    regcomp(regex_t* reg, const char* pat, int options);
+ONIG_EXTERN int    regexec(regex_t* reg, const char* str, size_t nmatch, regmatch_t* matches, int options);
+ONIG_EXTERN void   regfree(regex_t* reg);
+ONIG_EXTERN size_t regerror(int code, const regex_t* reg, char* buf, size_t size);
 
 /* extended API */
-ONIG_EXTERN void reg_set_encoding P_((int enc));
-ONIG_EXTERN int  reg_name_to_group_numbers P_((regex_t* reg, const unsigned char* name, const unsigned char* name_end, int** nums));
-ONIG_EXTERN int  reg_foreach_name P_((regex_t* reg, int (*func)(const unsigned char*, const unsigned char*,int,int*,regex_t*,void*), void* arg));
-ONIG_EXTERN int  reg_number_of_names P_((regex_t* reg));
+ONIG_EXTERN void reg_set_encoding(int enc);
+ONIG_EXTERN int  reg_name_to_group_numbers(regex_t* reg, const unsigned char* name, const unsigned char* name_end, int** nums);
+ONIG_EXTERN int  reg_foreach_name(regex_t* reg, int (*func)(const unsigned char*, const unsigned char*,int,int*,regex_t*,void*), void* arg);
+ONIG_EXTERN int  reg_number_of_names(regex_t* reg);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* ONIGPOSIX_H */
+#endif /* ONIGMOPOSIX_H */

data/vendor/local/lib/groonga/plugins/functions/number.la

@@ -1,5 +1,5 @@
 # number.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.11
+# Generated by libtool (GNU libtool) 2.4.6 Debian-2.4.6-2
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -13,11 +13,11 @@ library_names='number.dll.a'
 # The name of the static archive.
 old_library='number.a'
 
-# Linker flags that can not go in dependency_libs.
+# Linker flags that cannot go in dependency_libs.
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/vagrant/dist-x86/lib /vagrant/dist-x86/lib/libgroonga.la -lmsgpackc /vagrant/dist-x86/lib/libonig.la -llz4 -lz -lws2_32'
+dependency_libs=' -L/vagrant/dist-x86/lib /vagrant/dist-x86/lib/libgroonga.la -lmsgpackc /vagrant/dist-x86/lib/libonigmo.la -llz4 -lz -lws2_32'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''

data/vendor/local/lib/groonga/plugins/functions/string.la

@@ -1,5 +1,5 @@
 # string.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.11
+# Generated by libtool (GNU libtool) 2.4.6 Debian-2.4.6-2
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -13,11 +13,11 @@ library_names='string.dll.a'
 # The name of the static archive.
 old_library='string.a'
 
-# Linker flags that can not go in dependency_libs.
+# Linker flags that cannot go in dependency_libs.
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/vagrant/dist-x86/lib /vagrant/dist-x86/lib/libgroonga.la -lmsgpackc /vagrant/dist-x86/lib/libonig.la -llz4 -lz -lws2_32'
+dependency_libs=' -L/vagrant/dist-x86/lib /vagrant/dist-x86/lib/libgroonga.la -lmsgpackc /vagrant/dist-x86/lib/libonigmo.la -llz4 -lz -lws2_32'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''

data/vendor/local/lib/groonga/plugins/functions/time.la

@@ -1,5 +1,5 @@
 # time.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.11
+# Generated by libtool (GNU libtool) 2.4.6 Debian-2.4.6-2
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -13,11 +13,11 @@ library_names='time.dll.a'
 # The name of the static archive.
 old_library='time.a'
 
-# Linker flags that can not go in dependency_libs.
+# Linker flags that cannot go in dependency_libs.
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/vagrant/dist-x86/lib /vagrant/dist-x86/lib/libgroonga.la -lmsgpackc /vagrant/dist-x86/lib/libonig.la -llz4 -lz -lws2_32'
+dependency_libs=' -L/vagrant/dist-x86/lib /vagrant/dist-x86/lib/libgroonga.la -lmsgpackc /vagrant/dist-x86/lib/libonigmo.la -llz4 -lz -lws2_32'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''

data/vendor/local/lib/groonga/plugins/functions/vector.la

@@ -1,5 +1,5 @@
 # vector.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.11
+# Generated by libtool (GNU libtool) 2.4.6 Debian-2.4.6-2
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -13,11 +13,11 @@ library_names='vector.dll.a'
 # The name of the static archive.
 old_library='vector.a'
 
-# Linker flags that can not go in dependency_libs.
+# Linker flags that cannot go in dependency_libs.
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/vagrant/dist-x86/lib /vagrant/dist-x86/lib/libgroonga.la -lmsgpackc /vagrant/dist-x86/lib/libonig.la -llz4 -lz -lws2_32'
+dependency_libs=' -L/vagrant/dist-x86/lib /vagrant/dist-x86/lib/libgroonga.la -lmsgpackc /vagrant/dist-x86/lib/libonigmo.la -llz4 -lz -lws2_32'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''

data/vendor/local/lib/groonga/plugins/{table/table.la → normalizers/mysql.la}

@@ -1,28 +1,28 @@
-# table.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.11
+# mysql.la - a libtool library file
+# Generated by libtool (GNU libtool) 2.4.6 Debian-2.4.6-0.1
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
 
 # The name that we can dlopen(3).
-dlname='table.dll'
+dlname='mysql.dll'
 
 # Names of this library.
-library_names='table.dll.a'
+library_names='mysql.dll.a'
 
 # The name of the static archive.
-old_library='table.a'
+old_library='mysql.a'
 
-# Linker flags that can not go in dependency_libs.
+# Linker flags that cannot go in dependency_libs.
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/vagrant/dist-x86/lib /vagrant/dist-x86/lib/libgroonga.la /vagrant/dist-x86/lib/libonig.la -llz4 -lz -lws2_32 -lmsgpackc'
+dependency_libs=' -L/vagrant/dist-x86/lib /vagrant/dist-x86/lib/libgroonga.la -lmsgpackc /vagrant/dist-x86/lib/libonigmo.la -llz4 -lz -lws2_32'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
 
-# Version information for table.
+# Version information for mysql.
 current=0
 age=0
 revision=0
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/vagrant/dist-x86/lib/groonga/plugins/table'
+libdir='/vagrant/dist-x86/lib/groonga/plugins/normalizers'

data/vendor/local/lib/groonga/plugins/query_expanders/tsv.la

@@ -1,5 +1,5 @@
 # tsv.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.11
+# Generated by libtool (GNU libtool) 2.4.6 Debian-2.4.6-2
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -13,11 +13,11 @@ library_names='tsv.dll.a'
 # The name of the static archive.
 old_library='tsv.a'
 
-# Linker flags that can not go in dependency_libs.
+# Linker flags that cannot go in dependency_libs.
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/vagrant/dist-x86/lib /vagrant/dist-x86/lib/libgroonga.la -lmsgpackc /vagrant/dist-x86/lib/libonig.la -llz4 -lz -lws2_32'
+dependency_libs=' -L/vagrant/dist-x86/lib /vagrant/dist-x86/lib/libgroonga.la -lmsgpackc /vagrant/dist-x86/lib/libonigmo.la -llz4 -lz -lws2_32'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''

data/vendor/local/lib/groonga/plugins/sharding/logical_table_remove.rb

@@ -302,8 +302,9 @@ module Groonga
 
         database = context.database
         shard_suffix = shard.range_data.to_suffix
-        referenced_table_ids.each do |referenced_table_id|
+        referenced_table_ids.uniq.each do |referenced_table_id|
           referenced_table_name = database[referenced_table_id]
+          next if referenced_table_name.nil?
           next unless referenced_table_name.end_with?(shard_suffix)
 
           referenced_table = context[referenced_table_id]

data/vendor/local/lib/groonga/plugins/suggest/suggest.la

@@ -1,5 +1,5 @@
 # suggest.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.11
+# Generated by libtool (GNU libtool) 2.4.6 Debian-2.4.6-2
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -13,11 +13,11 @@ library_names='suggest.dll.a'
 # The name of the static archive.
 old_library='suggest.a'
 
-# Linker flags that can not go in dependency_libs.
+# Linker flags that cannot go in dependency_libs.
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/vagrant/dist-x86/lib /vagrant/dist-x86/lib/libgroonga.la /vagrant/dist-x86/lib/libonig.la -llz4 -lz -lws2_32 -lmsgpackc'
+dependency_libs=' -L/vagrant/dist-x86/lib /vagrant/dist-x86/lib/libgroonga.la /vagrant/dist-x86/lib/libonigmo.la -llz4 -lz -lws2_32 -lmsgpackc'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''

data/vendor/local/lib/groonga/plugins/token_filters/stop_word.la

@@ -1,5 +1,5 @@
 # stop_word.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.11
+# Generated by libtool (GNU libtool) 2.4.6 Debian-2.4.6-2
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -13,11 +13,11 @@ library_names='stop_word.dll.a'
 # The name of the static archive.
 old_library='stop_word.a'
 
-# Linker flags that can not go in dependency_libs.
+# Linker flags that cannot go in dependency_libs.
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/vagrant/dist-x86/lib /vagrant/dist-x86/lib/libgroonga.la -lmsgpackc /vagrant/dist-x86/lib/libonig.la -llz4 -lz -lws2_32'
+dependency_libs=' -L/vagrant/dist-x86/lib /vagrant/dist-x86/lib/libgroonga.la -lmsgpackc /vagrant/dist-x86/lib/libonigmo.la -llz4 -lz -lws2_32'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''