[前][次][番号順一覧][スレッド一覧]

ruby-changes:7810

From: akr <ko1@a...>
Date: Sun, 14 Sep 2008 02:06:07 +0900 (JST)
Subject: [ruby-changes:7810] Ruby:r19331 (trunk): * include/ruby/oniguruma.h

akr	2008-09-14 02:05:49 +0900 (Sun, 14 Sep 2008)

  New Revision: 19331

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=19331

  Log:
    * include/ruby/oniguruma.h
      (onigenc_get_right_adjust_char_head_with_prev): add end argument.
    
    * regenc.c (onigenc_get_right_adjust_char_head_with_prev): use end
      argument.
    
    * regexec.c (forward_search_range): follow the interface change.

  Modified files:
    trunk/ChangeLog
    trunk/include/ruby/oniguruma.h
    trunk/regenc.c
    trunk/regexec.c

Index: include/ruby/oniguruma.h
===================================================================
--- include/ruby/oniguruma.h	(revision 19330)
+++ include/ruby/oniguruma.h	(revision 19331)
@@ -303,7 +303,7 @@
 ONIG_EXTERN
 void  onigenc_set_default_caseconv_table P_((const OnigUChar* table));
 ONIG_EXTERN
-OnigUChar* onigenc_get_right_adjust_char_head_with_prev P_((OnigEncoding enc, const OnigUChar* start, const OnigUChar* s, const OnigUChar** prev));
+OnigUChar* onigenc_get_right_adjust_char_head_with_prev P_((OnigEncoding enc, const OnigUChar* start, const OnigUChar* s, const OnigUChar* end, const OnigUChar** prev));
 ONIG_EXTERN
 OnigUChar* onigenc_get_prev_char_head P_((OnigEncoding enc, const OnigUChar* start, const OnigUChar* s));
 ONIG_EXTERN
Index: regenc.c
===================================================================
--- regenc.c	(revision 19330)
+++ regenc.c	(revision 19331)
@@ -73,13 +73,13 @@
 
 extern UChar*
 onigenc_get_right_adjust_char_head_with_prev(OnigEncoding enc,
-				   const UChar* start, const UChar* s, const UChar** prev)
+				   const UChar* start, const UChar* s, const UChar* end, const UChar** prev)
 {
   UChar* p = ONIGENC_LEFT_ADJUST_CHAR_HEAD(enc, start, s);
 
   if (p < s) {
     if (prev) *prev = (const UChar* )p;
-    p += enclen(enc, p, s);
+    p += enclen(enc, p, end);
   }
   else {
     if (prev) *prev = (const UChar* )NULL; /* Sorry */
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19330)
+++ ChangeLog	(revision 19331)
@@ -1,3 +1,13 @@
+Sun Sep 14 02:04:28 2008  Tanaka Akira  <akr@f...>
+
+	* include/ruby/oniguruma.h
+	  (onigenc_get_right_adjust_char_head_with_prev): add end argument.
+
+	* regenc.c (onigenc_get_right_adjust_char_head_with_prev): use end
+	  argument.
+
+	* regexec.c (forward_search_range): follow the interface change.
+
 Sun Sep 14 01:38:26 2008  Tanaka Akira  <akr@f...>
 
 	* include/ruby/oniguruma.h (onigenc_get_right_adjust_char_head): add
Index: regexec.c
===================================================================
--- regexec.c	(revision 19330)
+++ regexec.c	(revision 19331)
@@ -3230,7 +3230,7 @@
 	*low = p - reg->dmax;
 	if (*low > s) {
 	  *low = onigenc_get_right_adjust_char_head_with_prev(reg->enc, s,
-							      *low, (const UChar** )low_prev);
+							      *low, end, (const UChar** )low_prev);
 	  if (low_prev && IS_NULL(*low_prev))
 	    *low_prev = onigenc_get_prev_char_head(reg->enc,
 						   (pprev ? pprev : s), *low);

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]