* Merge Onigmo-5.13.1. [ruby-dev:45057] [Feature ruby#5820]

https://github.com/k-takata/Onigmo cp reg{comp,enc,error,exec,parse,syntax}.c reg{enc,int,parse}.h cp oniguruma.h cp tool/enc-unicode.rb cp -r enc/ git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34663 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
jruby · Feb 17, 2012 · 0424e15 · 0424e15
1 parent 5362e7f
commit 0424e15
Show file tree

Hide file tree

Showing 54 changed files with 28,950 additions and 20,307 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,17 @@
+Fri Feb 17 15:38:53 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* Merge Onigmo-5.13.1. [ruby-dev:45057] [Feature #5820]
+	  https://github.com/k-takata/Onigmo
+	  cp reg{comp,enc,error,exec,parse,syntax}.c reg{enc,int,parse}.h
+	  cp oniguruma.h
+	  cp tool/enc-unicode.rb
+	  cp -r enc/
+
+Fri Feb 17 12:35:55 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/merger.rb: remove borders from the commit message which is used
+	  when the commit doesn't change ChangeLog.
+
 Fri Feb 17 15:20:30 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* enum.c (enum_each_slice): arrays to be yielded can be newly

diff --git a/NEWS b/NEWS
@@ -72,6 +72,9 @@ with all sufficient information, see the ChangeLog file.
 
     See above.
 
+  * Merge Onigmo.
+    https://github.com/k-takata/Onigmo
+
   * incompatible changes:
     The :close_others option is true by default for system() and exec().
     Also, the close-on-exec flag is set by default for all new file descriptors.

diff --git a/enc/ascii.c b/enc/ascii.c
@@ -1,8 +1,9 @@
 /**********************************************************************
-  ascii.c -  Oniguruma (regular expression library)
+  ascii.c -  Onigmo (Oniguruma-mod) (regular expression library)
 **********************************************************************/
 /*-
  * Copyright (c) 2002-2006  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * Copyright (c) 2011       K.Takata  <kentkt AT csc DOT jp>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -45,7 +46,9 @@ OnigEncodingDefine(ascii, ASCII) = {
   onigenc_ascii_is_code_ctype,
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match
+  onigenc_always_true_is_allowed_reverse_match,
+  0,
+  ONIGENC_FLAG_NONE,
 };
 ENC_ALIAS("BINARY", "ASCII-8BIT")
 ENC_REPLICATE("IBM437", "ASCII-8BIT")

diff --git a/enc/big5.c b/enc/big5.c
@@ -299,7 +299,9 @@ OnigEncodingDefine(big5, BIG5) = {
   big5_is_code_ctype,
   onigenc_not_support_get_ctype_code_range,
   big5_left_adjust_char_head,
-  big5_is_allowed_reverse_match
+  big5_is_allowed_reverse_match,
+  0,
+  ONIGENC_FLAG_NONE,
 };
 
 /*
@@ -331,7 +333,9 @@ OnigEncodingDefine(big5_hkscs, BIG5_HKSCS) = {
   big5_is_code_ctype,
   onigenc_not_support_get_ctype_code_range,
   big5_left_adjust_char_head,
-  big5_is_allowed_reverse_match
+  big5_is_allowed_reverse_match,
+  0,
+  ONIGENC_FLAG_NONE,
 };
 ENC_ALIAS("Big5-HKSCS:2008", "Big5-HKSCS")
 
@@ -363,5 +367,7 @@ OnigEncodingDefine(big5_uao, BIG5_UAO) = {
   big5_is_code_ctype,
   onigenc_not_support_get_ctype_code_range,
   big5_left_adjust_char_head,
-  big5_is_allowed_reverse_match
+  big5_is_allowed_reverse_match,
+  0,
+  ONIGENC_FLAG_NONE,
 };
diff --git a/enc/cp949.c b/enc/cp949.c
@@ -210,7 +210,9 @@ OnigEncodingDefine(cp949, CP949) = {
   cp949_is_code_ctype,
   onigenc_not_support_get_ctype_code_range,
   cp949_left_adjust_char_head,
-  cp949_is_allowed_reverse_match
+  cp949_is_allowed_reverse_match,
+  0,
+  ONIGENC_FLAG_NONE,
 };
 /*
  * Name: CP949

diff --git a/enc/emacs_mule.c b/enc/emacs_mule.c
@@ -334,7 +334,8 @@ OnigEncodingDefine(emacs_mule, Emacs_Mule) = {
   onigenc_not_support_get_ctype_code_range,
   left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  0
+  0,
+  ONIGENC_FLAG_NONE,
 };
 
 ENC_REPLICATE("stateless-ISO-2022-JP", "Emacs-Mule")