ruby-changes:17910
From: naruse <ko1@a...>
Date: Thu, 25 Nov 2010 23:14:50 +0900 (JST)
Subject: [ruby-changes:17910] Ruby:r29926 (trunk): * regcomp.c (print_distance_range): use PRIuSIZE.
naruse 2010-11-25 23:14:44 +0900 (Thu, 25 Nov 2010) New Revision: 29926 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29926 Log: * regcomp.c (print_distance_range): use PRIuSIZE. * regcomp.c (print_optimize_info): use %ld because the type of calcutated value of integers is long. * regexec.c (onig_print_compiled_byte_code): add prototype. * regexec.c (match_at): add 2nd argument. Modified files: trunk/ChangeLog trunk/regcomp.c trunk/regexec.c Index: regcomp.c =================================================================== --- regcomp.c (revision 29925) +++ regcomp.c (revision 29926) @@ -5093,14 +5093,14 @@ if (a == ONIG_INFINITE_DISTANCE) fputs("inf", f); else - fprintf(f, "(%u)", a); + fprintf(f, "(%"PRIuSIZE")", a); fputs("-", f); if (b == ONIG_INFINITE_DISTANCE) fputs("inf", f); else - fprintf(f, "(%u)", b); + fprintf(f, "(%"PRIuSIZE")", b); } static void @@ -5176,7 +5176,7 @@ for (p = reg->exact; p < reg->exact_end; p++) { fputc(*p, f); } - fprintf(f, "]: length: %d\n", (reg->exact_end - reg->exact)); + fprintf(f, "]: length: %ld\n", (reg->exact_end - reg->exact)); } else if (reg->optimize & ONIG_OPTIMIZE_MAP) { int c, i, n = 0; Index: ChangeLog =================================================================== --- ChangeLog (revision 29925) +++ ChangeLog (revision 29926) @@ -1,3 +1,14 @@ +Thu Nov 25 23:10:49 2010 NARUSE, Yui <naruse@r...> + + * regcomp.c (print_distance_range): use PRIuSIZE. + + * regcomp.c (print_optimize_info): use %ld because the type of + calcutated value of integers is long. + + * regexec.c (onig_print_compiled_byte_code): add prototype. + + * regexec.c (match_at): add 2nd argument. + Thu Nov 25 10:29:55 2010 NAKAMURA Usaku <usa@r...> * ext/dl/callback/mkcallback.rb (gencallback): shouldn't assume that Index: regexec.c =================================================================== --- regexec.c (revision 29925) +++ regexec.c (revision 29926) @@ -1240,6 +1240,9 @@ regoff_t rm_eo; } posix_regmatch_t; +void onig_print_compiled_byte_code(FILE* f, UChar* bp, UChar* bpend, UChar** nextp, + OnigEncoding enc); + /* match data(str - end) from position (sstart). */ /* if sstart == str then set sprev to NULL. */ static long @@ -1314,7 +1317,7 @@ *bp = 0; fputs((char* )buf, stderr); for (i = 0; i < 20 - (bp - buf); i++) fputc(' ', stderr); - onig_print_compiled_byte_code(stderr, p, NULL, encode); + onig_print_compiled_byte_code(stderr, p, p + strlen((char *)p), NULL, encode); fprintf(stderr, "\n"); } #endif -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/