ruby-changes:14312
From: naruse <ko1@a...>
Date: Mon, 21 Dec 2009 10:11:31 +0900 (JST)
Subject: [ruby-changes:14312] Ruby:r26138 (trunk): * regcomp.c (print_enc_string): follow enclen's change.
naruse 2009-12-21 10:11:15 +0900 (Mon, 21 Dec 2009) New Revision: 26138 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=26138 Log: * regcomp.c (print_enc_string): follow enclen's change. * regcomp.c (onig_print_compiled_byte_code): ditto. * regcomp.c (onig_print_compiled_byte_code): change prototype. * regint.c (onig_print_compiled_byte_code): comment out. Modified files: trunk/ChangeLog trunk/regcomp.c trunk/regint.h Index: regcomp.c =================================================================== --- regcomp.c (revision 26137) +++ regcomp.c (revision 26138) @@ -5046,7 +5046,7 @@ fputc((int )code, fp); } - p += enclen(enc, p); + p += enclen(enc, p, end); } } else { @@ -5885,7 +5885,7 @@ } extern void -onig_print_compiled_byte_code(FILE* f, UChar* bp, UChar** nextp, +onig_print_compiled_byte_code(FILE* f, UChar* bp, UChar* bpend, UChar** nextp, OnigEncoding enc) { int i, n, arg_type; @@ -5984,7 +5984,7 @@ break; case OP_EXACT1_IC: - len = enclen(enc, bp); + len = enclen(enc, bp, bpend); p_string(f, len, bp); bp += len; break; @@ -6146,7 +6146,7 @@ else fputs(" ", f); } - onig_print_compiled_byte_code(f, bp, &bp, reg->enc); + onig_print_compiled_byte_code(f, bp, end, &bp, reg->enc); } fprintf(f, "\n"); Index: ChangeLog =================================================================== --- ChangeLog (revision 26137) +++ ChangeLog (revision 26138) @@ -1,3 +1,13 @@ +Mon Dec 21 10:03:33 2009 NARUSE, Yui <naruse@r...> + + * regcomp.c (print_enc_string): follow enclen's change. + + * regcomp.c (onig_print_compiled_byte_code): ditto. + + * regcomp.c (onig_print_compiled_byte_code): change prototype. + + * regint.c (onig_print_compiled_byte_code): comment out. + Mon Dec 21 08:04:34 2009 Marc-Andre Lafortune <ruby-core@m...> * object.c: BasicObject#initialize accepts any number of arguments Index: regint.h =================================================================== --- regint.h (revision 26137) +++ regint.h (revision 26138) @@ -788,7 +788,7 @@ extern OnigOpInfoType OnigOpInfo[]; -extern void onig_print_compiled_byte_code P_((FILE* f, UChar* bp, UChar** nextp, OnigEncoding enc)); +/* extern void onig_print_compiled_byte_code P_((FILE* f, UChar* bp, UChar* bpend, UChar** nextp, OnigEncoding enc)); */ #ifdef ONIG_DEBUG_STATISTICS extern void onig_statistics_init P_((void)); -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/