1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* 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.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26138 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2009-12-21 01:11:15 +00:00
parent dbf07b09fd
commit de341005c8
3 changed files with 15 additions and 5 deletions

View file

@ -1,3 +1,13 @@
Mon Dec 21 10:03:33 2009 NARUSE, Yui <naruse@ruby-lang.org>
* 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@marc-andre.ca> Mon Dec 21 08:04:34 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
* object.c: BasicObject#initialize accepts any number of arguments * object.c: BasicObject#initialize accepts any number of arguments

View file

@ -5046,7 +5046,7 @@ static void print_enc_string(FILE* fp, OnigEncoding enc,
fputc((int )code, fp); fputc((int )code, fp);
} }
p += enclen(enc, p); p += enclen(enc, p, end);
} }
} }
else { else {
@ -5885,7 +5885,7 @@ p_len_string(FILE* f, LengthType len, int mb_len, UChar* s)
} }
extern void 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) OnigEncoding enc)
{ {
int i, n, arg_type; int i, n, arg_type;
@ -5984,7 +5984,7 @@ onig_print_compiled_byte_code(FILE* f, UChar* bp, UChar** nextp,
break; break;
case OP_EXACT1_IC: case OP_EXACT1_IC:
len = enclen(enc, bp); len = enclen(enc, bp, bpend);
p_string(f, len, bp); p_string(f, len, bp);
bp += len; bp += len;
break; break;
@ -6146,7 +6146,7 @@ print_compiled_byte_code_list(FILE* f, regex_t* reg)
else else
fputs(" ", f); 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"); fprintf(f, "\n");

View file

@ -788,7 +788,7 @@ typedef struct {
extern OnigOpInfoType OnigOpInfo[]; 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 #ifdef ONIG_DEBUG_STATISTICS
extern void onig_statistics_init P_((void)); extern void onig_statistics_init P_((void));