From 766e109fd638ef1eac33717b52e04a351da46483 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 14 Dec 2014 12:57:21 +0100 Subject: Imported Upstream version 5.9.6 --- HISTORY | 5 +++++ configure | 20 ++++++++++---------- configure.in | 2 +- enc/unicode.c | 20 +++++++++++++++++++- index.html | 10 +++++----- index_ja.html | 10 +++++----- oniguruma.h | 2 +- regcomp.c | 35 ++++++++++++++++++++++++++++++++++- regint.h | 11 ++++++++++- 9 files changed, 90 insertions(+), 25 deletions(-) diff --git a/HISTORY b/HISTORY index 6b3031b..9ee0a3f 100644 --- a/HISTORY +++ b/HISTORY @@ -1,5 +1,10 @@ History +2014/12/12: Version 5.9.6 + +2013/11/27: [impl] add onigenc_end_unicode(). (thanks Takenori Imoto) +2013/11/27: [impl] add onig_add_end_call(). (thanks Takenori Imoto) + 2013/10/21: Version 5.9.5 2013/10/21: [impl] escape warnings for -Wall. (regparse.c) diff --git a/configure b/configure index 84d5740..39a343c 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for onig 5.9.5. +# Generated by GNU Autoconf 2.68 for onig 5.9.6. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -567,8 +567,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='onig' PACKAGE_TARNAME='onig' -PACKAGE_VERSION='5.9.5' -PACKAGE_STRING='onig 5.9.5' +PACKAGE_VERSION='5.9.6' +PACKAGE_STRING='onig 5.9.6' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1291,7 +1291,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures onig 5.9.5 to adapt to many kinds of systems. +\`configure' configures onig 5.9.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1361,7 +1361,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of onig 5.9.5:";; + short | recursive ) echo "Configuration of onig 5.9.6:";; esac cat <<\_ACEOF @@ -1466,7 +1466,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -onig configure 5.9.5 +onig configure 5.9.6 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2063,7 +2063,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by onig $as_me 5.9.5, which was +It was created by onig $as_me 5.9.6, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2881,7 +2881,7 @@ fi # Define the identity of the package. PACKAGE='onig' - VERSION='5.9.5' + VERSION='5.9.6' cat >>confdefs.h <<_ACEOF @@ -12797,7 +12797,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by onig $as_me 5.9.5, which was +This file was extended by onig $as_me 5.9.6, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12863,7 +12863,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -onig config.status 5.9.5 +onig config.status 5.9.6 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.in b/configure.in index 9ef7c95..9e412d6 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(onig, 5.9.5) +AC_INIT(onig, 5.9.6) AC_CONFIG_MACRO_DIR([m4]) diff --git a/enc/unicode.c b/enc/unicode.c index af7a86e..e13429f 100644 --- a/enc/unicode.c +++ b/enc/unicode.c @@ -2,7 +2,7 @@ unicode.c - Oniguruma (regular expression library) **********************************************************************/ /*- - * Copyright (c) 2002-2008 K.Kosako + * Copyright (c) 2002-2013 K.Kosako * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -10891,6 +10891,21 @@ static st_table* Unfold2Table; static st_table* Unfold3Table; static int CaseFoldInited = 0; + +extern void onigenc_end_unicode(void) +{ + THREAD_ATOMIC_START; + + if (FoldTable != 0) st_free_table(FoldTable); + if (Unfold1Table != 0) st_free_table(Unfold1Table); + if (Unfold2Table != 0) st_free_table(Unfold2Table); + if (Unfold3Table != 0) st_free_table(Unfold3Table); + + CaseFoldInited = 0; + + THREAD_ATOMIC_END; +} + static int init_case_fold_table(void) { const CaseFold_11_Type *p; @@ -10952,6 +10967,9 @@ static int init_case_fold_table(void) st_add_direct(Unfold3Table, (st_data_t )p3->from, (st_data_t )(&p3->to)); } + + onig_add_end_call(onigenc_end_unicode); + CaseFoldInited = 1; THREAD_ATOMIC_END; return 0; diff --git a/index.html b/index.html index 9231942..c5bb382 100644 --- a/index.html +++ b/index.html @@ -8,7 +8,7 @@

Oniguruma

(Japanese)

-(c) K.Kosako, updated at: 2013/10/21 +(c) K.Kosako, updated at: 2014/12/12

@@ -16,7 +16,7 @@
What's new
    -
  • 2013/10/21: Version 5.9.5 released.
    • +
  • 2014/12/12: Version 5.9.6 released.
  • 2007/08/16: Version 4.7.1 released.
  • 2007/06/20: Version 2.5.9 released.
  • 2007/06/20: Maintainer of 2.x was changed.
    • @@ -62,8 +62,8 @@ ISO-8859-11, ISO-8859-13, ISO-8859-14, ISO-8859-15, ISO-8859-16
    Download:
      -
    • Latest release version 5.9.5 (2013/10/21) Change Log -
    • 5.9.4 (2013/04/04) +
    • Latest release version 5.9.6 (2014/12/12) Change Log +
    • 5.9.5 (2013/10/21)
    • Latest release version 4.7.1 (2007/08/16) Change Log
    • 4.7.0 (2007/06/18)
    • Latest release version 2.5.9 (2007/06/20) Change Log @@ -78,7 +78,7 @@ About 2.x, please contact him.
      * 2.x supports Ruby1.6/1.8.

      -
      Documents: (version 5.9.5) +
      Documents: (version 5.9.6)
      • Regular Expressions (Japanese: EUC-JP) diff --git a/index_ja.html b/index_ja.html index 4826cbc..c5d98fb 100644 --- a/index_ja.html +++ b/index_ja.html @@ -8,7 +8,7 @@

        鬼車

        -(c) K.Kosako, 最終更新: 2013/04/04 +(c) K.Kosako, 最終更新: 2014/12/12

        @@ -16,7 +16,7 @@
        更新情報
          -
        • 2013/10/21: Version 5.9.5 リリース
          • +
        • 2014/12/12: Version 5.9.6 リリース
        • 2007/08/16: Version 4.7.1 リリース
        • 2007/06/20: Version 2.5.9 リリース
        • 2007/06/20: 2.xの保守担当者を変更
          • @@ -62,8 +62,8 @@ ISO-8859-11, ISO-8859-13, ISO-8859-14, ISO-8859-15, ISO-8859-16
          ダウンロード:
            -
          • 5.9.5 最新版 (2013/10/21) 更新履歴 -
          • 5.9.4 (2013/04/04) +
          • 5.9.6 最新版 (2014/12/12) 更新履歴 +
          • 5.9.5 (2013/10/21)
          • 4.7.1 最新版 (2007/08/16) 更新履歴
          • 4.7.0 (2007/06/18)
          • 2.5.9 最新版 (2007/06/20) 更新履歴 @@ -78,7 +78,7 @@ ISO-8859-11, ISO-8859-13, ISO-8859-14, ISO-8859-15, ISO-8859-16
            * 2.xはRuby1.6/1.8組込みライブラリとして動作する。 (2006年末で保守を終了)

            -
            ドキュメント: (version 5.9.5) +
            ドキュメント: (version 5.9.6)
            • 正規表現 (日本語: EUC-JP) diff --git a/oniguruma.h b/oniguruma.h index 00f39fe..adf4efc 100644 --- a/oniguruma.h +++ b/oniguruma.h @@ -36,7 +36,7 @@ extern "C" { #define ONIGURUMA #define ONIGURUMA_VERSION_MAJOR 5 #define ONIGURUMA_VERSION_MINOR 9 -#define ONIGURUMA_VERSION_TEENY 5 +#define ONIGURUMA_VERSION_TEENY 6 #ifdef __cplusplus # ifndef HAVE_PROTOTYPES diff --git a/regcomp.c b/regcomp.c index 995e1d8..b93ca94 100644 --- a/regcomp.c +++ b/regcomp.c @@ -2,7 +2,7 @@ regcomp.c - Oniguruma (regular expression library) **********************************************************************/ /*- - * Copyright (c) 2002-2008 K.Kosako + * Copyright (c) 2002-2013 K.Kosako * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -5575,11 +5575,44 @@ onig_init(void) } +static OnigEndCallListItemType* EndCallTop; + +extern void onig_add_end_call(void (*func)(void)) +{ + OnigEndCallListItemType* item; + + item = (OnigEndCallListItemType* )xmalloc(sizeof(*item)); + if (item == 0) return ; + + item->next = EndCallTop; + item->func = func; + + EndCallTop = item; +} + +static void +exec_end_call_list(void) +{ + OnigEndCallListItemType* prev; + void (*func)(void); + + while (EndCallTop != 0) { + func = EndCallTop->func; + (*func)(); + + prev = EndCallTop; + EndCallTop = EndCallTop->next; + xfree(prev); + } +} + extern int onig_end(void) { THREAD_ATOMIC_START; + exec_end_call_list(); + #ifdef ONIG_DEBUG_STATISTICS onig_print_statistics(stderr); #endif diff --git a/regint.h b/regint.h index a0ce491..0fba09b 100644 --- a/regint.h +++ b/regint.h @@ -4,7 +4,7 @@ regint.h - Oniguruma (regular expression library) **********************************************************************/ /*- - * Copyright (c) 2002-2008 K.Kosako + * Copyright (c) 2002-2013 K.Kosako * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -750,6 +750,14 @@ typedef struct { #define IS_CODE_SB_WORD(enc,code) \ (ONIGENC_IS_CODE_ASCII(code) && ONIGENC_IS_CODE_WORD(enc,code)) +typedef struct OnigEndCallListItem { + struct OnigEndCallListItem* next; + void (*func)(void); +} OnigEndCallListItemType; + +extern void onig_add_end_call(void (*func)(void)); + + #ifdef ONIG_DEBUG typedef struct { @@ -760,6 +768,7 @@ typedef struct { extern OnigOpInfoType OnigOpInfo[]; + extern void onig_print_compiled_byte_code P_((FILE* f, UChar* bp, UChar** nextp, OnigEncoding enc)); #ifdef ONIG_DEBUG_STATISTICS -- cgit v1.2.3