From e3a8c626308cb8546baaf75e6133df304142f0c8 Mon Sep 17 00:00:00 2001 From: matz Date: Wed, 24 Apr 2002 04:54:16 +0000 Subject: * io.c (rb_io_mode_flags): both 'r+b' and 'rb+' should be allowed. * io.c (rb_io_mode_modenum): ditto. * gc.c (rb_memerror): rename from mem_error, and exported. * gc.c (Init_GC): pre-allocate NoMemoryError instance. * object.c (convert_type): error message changed from "failed to convert" to "cannot convert", since it does not try to convert if an object does not respond to the converting method. * eval.c (block_pass): convert Method to Proc using rb_check_convert_type(). * object.c (rb_check_convert_type): always convert T_DATA * eval.c (rb_thread_cleanup): should not terminate main_thread by Fatal error. * regex.c (is_in_list): need to not exclude NUL and NEWLINE. * re.c (rb_reg_expr_str): wrong backslash escapement. * re.c (rb_reg_expr_str): do not escape embedded space characters. * marshal.c (w_object): T_DATA process patch from Joel VanderWerf . This is temporary hack; it remains undocumented, and it will be removed when marshaling is re-designed. * marshal.c (r_object): ditto. * numeric.c (num_step): Integer#step is moved to Numeric#step; Fixnum#step is merged into this method. * numeric.c (int_dotimes): Fixnum#times is merged. * numeric.c (int_upto): Fixnum#upto is merged. * numeric.c (int_downto): Fixnum#downto is merged. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2401 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- regex.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'regex.c') diff --git a/regex.c b/regex.c index 96f16de7e2..020b8c8d43 100644 --- a/regex.c +++ b/regex.c @@ -720,9 +720,9 @@ is_in_list(c, b) else j = k; } - if (i < size && EXTRACT_MBC(&b[i*8]) <= c - && ((unsigned char)c != '\n' && (unsigned char)c != '\0')) + if (i < size && EXTRACT_MBC(&b[i*8]) <= c) return 1; + return 0; } @@ -832,7 +832,7 @@ print_partial_compiled_pattern(start, end) unsigned bit; unsigned char map_byte = p[c]; - putchar ('/'); + putchar('/'); for (bit = 0; bit < BYTEWIDTH; bit++) if (map_byte & (1 << bit)) @@ -840,10 +840,10 @@ print_partial_compiled_pattern(start, end) } p += mcnt; mcnt = EXTRACT_UNSIGNED_AND_INCR(p); - printf("/"); + putchar('/'); while (mcnt--) { print_mbc(EXTRACT_MBC_AND_INCR(p)); - printf("-"); + putchar('-'); print_mbc(EXTRACT_MBC_AND_INCR(p)); } break; -- cgit v1.2.3