merge from develop to master

kkos · Jan 25, 2018 · a4020e7 · a4020e7
2 parents 5c38b05 + 70f6697
commit a4020e7
Show file tree

Hide file tree

Showing 31 changed files with 1,316 additions and 1,738 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -40,6 +40,7 @@ check_include_files(stdint.h    HAVE_STDINT_H)
 check_include_files(stdlib.h    HAVE_STDLIB_H)
 check_include_files(strings.h   HAVE_STRINGS_H)
 check_include_files(string.h    HAVE_STRING_H)
+check_include_files(limits.h    HAVE_LIMITS_H)
 check_include_files(sys/times.h HAVE_SYS_TIMES_H)
 check_include_files(sys/time.h  HAVE_SYS_TIME_H)
 check_include_files(sys/types.h HAVE_SYS_TYPES_H)

diff --git a/HISTORY b/HISTORY
@@ -1,7 +1,18 @@
 History
 
+2018/01/26: Version 6.7.1
+
+2018/01/25: disable USE_TRY_IN_MATCH_LIMIT by default
+2018/01/24: implement mechanism of try-in-match-limit
+2018/01/24: #76: rename EXPORT to ONIGURUMA_EXPORT
+2018/01/15: #73: update for automake 1.15.1
+2018/01/14: #74: update description of README
+2018/01/10: #72: Correct spelling and grammar in FAQ (English)
+2017/12/25: remove USE_COMBINATION_EXPLOSION_CHECK codes
+
 2017/12/11: Version 6.7.0
 
+2017/12/08: Disable \N and \O on ONIG_SYNTAX_RUBY
 2017/12/08: add ONIG_SYNTAX_ONIGURUMA (default syntax)
 2017/12/05: restructure StackType
 2017/11/13: implement subexp calls (?R), (?&name), (?-n), (?+n) for Perl syntax

diff --git a/INSTALL b/INSTALL
diff --git a/README b/README
@@ -1,4 +1,4 @@
-README  2017/08/25
+README  2018/01/14
 
 Oniguruma  ----   (C) K.Kosako
 
@@ -9,9 +9,22 @@ FIXED Security Issues:
   CVE-2017-9227, CVE-2017-9228, CVE-2017-9229
 
 ---
-Oniguruma is a regular expressions library.
-The characteristics of this library is that different character encoding
-for every regular expression object can be specified.
+Oniguruma is a modern and flexible regular expressions library. It
+encompasses features from different regular expression implementations
+that traditionally exist in different languages. It comes close to
+being a complete superset of all regular expression features found
+in other regular expression implementations.
+
+Its features include:
+* Character encoding can be specified per regular expression object.
+* Several regular expression types are supported:
+  * POSIX
+  * Grep
+  * GNU Regex
+  * Perl
+  * Java
+  * Ruby
+  * Emacs
 
 Supported character encodings:
 

diff --git a/README.md b/README.md
@@ -8,10 +8,22 @@ FIXED Security Issues:
   **CVE-2017-9224, CVE-2017-9225, CVE-2017-9226**
   **CVE-2017-9227, CVE-2017-9228, CVE-2017-9229**
 
-
-Oniguruma is a regular expressions library.
-The characteristics of this library is that different character encoding
-for every regular expression object can be specified.
+Oniguruma is a modern and flexible regular expressions library. It
+encompasses features from different regular expression implementations
+that traditionally exist in different languages. It comes close to
+being a complete superset of all regular expression features found
+in other regular expression implementations.
+
+Its features include:
+* Character encoding can be specified per regular expression object.
+* Several regular expression types are supported:
+  * POSIX
+  * Grep
+  * GNU Regex
+  * Perl
+  * Java
+  * Ruby
+  * Emacs
 
 Supported character encodings:
 
@@ -26,6 +38,12 @@ Supported character encodings:
 * CP1251:  contributed by Byte
 
 
+New feature of version 6.7.1
+--------------------------
+
+* NEW: Mechanism of try-in-match-limit (* disabled by default)
+
+
 New feature of version 6.7.0
 --------------------------
 

diff --git a/autogen.sh b/autogen.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+# autogen.sh for Oniguruma
+
+echo "Generating autotools files."
+#autoreconf --install --force --symlink || exit 1
+autoreconf --install --force || exit 1
+
+echo ""
+echo "Run ./configure, make, and make install."
diff --git a/compile b/compile
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2016-01-11.22; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -255,7 +255,8 @@ EOF
     echo "compile $scriptversion"
     exit $?
     ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
     func_cl_wrapper "$@"      # Doesn't return...
     ;;
 esac
@@ -342,6 +343,6 @@ exit $ret
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End: