ruby-changes:2711
From: ko1@a...
Date: 12 Dec 2007 23:31:16 +0900
Subject: [ruby-changes:2711] akr - Ruby:r14202 (trunk): * re.c, regerror.c, string.c, parse.y, ruby.c, file.c:
akr 2007-12-12 23:30:54 +0900 (Wed, 12 Dec 2007)
New Revision: 14202
Modified files:
trunk/ChangeLog
trunk/file.c
trunk/parse.y
trunk/re.c
trunk/regerror.c
trunk/ruby.c
trunk/string.c
Log:
* re.c, regerror.c, string.c, parse.y, ruby.c, file.c:
use capital letter for \xHH notation. [ruby-dev:32511]
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/string.c?r1=14202&r2=14201
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/file.c?r1=14202&r2=14201
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ruby.c?r1=14202&r2=14201
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/parse.y?r1=14202&r2=14201
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14202&r2=14201
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/re.c?r1=14202&r2=14201
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/regerror.c?r1=14202&r2=14201
Index: re.c
===================================================================
--- re.c (revision 14201)
+++ re.c (revision 14202)
@@ -264,7 +264,7 @@
else if (!rb_enc_isspace(c, enc)) {
char b[8];
- sprintf(b, "\\x%02x", c);
+ sprintf(b, "\\x%02X", c);
rb_str_buf_cat(str, b, 4);
}
else {
@@ -1671,7 +1671,7 @@
}
else {
char escbuf[5];
- snprintf(escbuf, sizeof(escbuf), "\\x%02x", chbuf[0]&0xff);
+ snprintf(escbuf, sizeof(escbuf), "\\x%02X", chbuf[0]&0xff);
rb_str_buf_cat(buf, escbuf, 4);
}
*pp = p;
@@ -1697,7 +1697,7 @@
return -1;
if (uv < 0x80) {
char escbuf[5];
- snprintf(escbuf, sizeof(escbuf), "\\x%02x", (int)uv);
+ snprintf(escbuf, sizeof(escbuf), "\\x%02X", (int)uv);
rb_str_buf_cat(buf, escbuf, 4);
}
else {
Index: ChangeLog
===================================================================
--- ChangeLog (revision 14201)
+++ ChangeLog (revision 14202)
@@ -1,3 +1,8 @@
+Wed Dec 12 23:22:58 2007 Tanaka Akira <akr@f...>
+
+ * re.c, regerror.c, string.c, parse.y, ruby.c, file.c:
+ use capital letter for \xHH notation. [ruby-dev:32511]
+
Wed Dec 12 22:21:34 2007 Yukihiro Matsumoto <matz@r...>
* io.c (rb_io_mode_enc): allow specifying external encoding in
Index: regerror.c
===================================================================
--- regerror.c (revision 14201)
+++ regerror.c (revision 14202)
@@ -197,7 +197,7 @@
code = ONIGENC_MBC_TO_CODE(enc, p, end);
if (code >= 0x80) {
if (len + 5 <= buf_size) {
- sprintf((char* )(&(buf[len])), "\\x%02x",
+ sprintf((char* )(&(buf[len])), "\\x%02X",
(unsigned int )(code & 0377));
len += 5;
}
@@ -346,7 +346,7 @@
int blen;
while (len-- > 0) {
- sprintf((char* )bs, "\\x%02x", *p++ & 0377);
+ sprintf((char* )bs, "\\x%02X", *p++ & 0377);
blen = onigenc_str_bytelen_null(ONIG_ENCODING_ASCII, bs);
bp = bs;
while (blen-- > 0) *s++ = *bp++;
@@ -355,7 +355,7 @@
}
else if (!ONIGENC_IS_CODE_PRINT(enc, *p) &&
!ONIGENC_IS_CODE_SPACE(enc, *p)) {
- sprintf((char* )bs, "\\x%02x", *p++ & 0377);
+ sprintf((char* )bs, "\\x%02X", *p++ & 0377);
len = onigenc_str_bytelen_null(ONIG_ENCODING_ASCII, bs);
bp = bs;
while (len-- > 0) *s++ = *bp++;
Index: string.c
===================================================================
--- string.c (revision 14201)
+++ string.c (revision 14202)
@@ -3001,7 +3001,7 @@
escape_codepoint:
for (q = p-n; q < p; q++) {
s = buf;
- sprintf(buf, "\\x%02x", *q & 0377);
+ sprintf(buf, "\\x%02X", *q & 0377);
while (*s) {
str_cat_char(result, *s++, enc);
}
@@ -3113,7 +3113,7 @@
}
else {
*q++ = '\\';
- sprintf(q, "x%02x", c&0xff);
+ sprintf(q, "x%02X", c&0xff);
q += 3;
}
}
Index: parse.y
===================================================================
--- parse.y (revision 14201)
+++ parse.y (revision 14202)
@@ -7070,7 +7070,7 @@
default:
if (!parser_is_identchar()) {
- rb_compile_error(PARSER_ARG "Invalid char `\\x%02x' in expression", c);
+ rb_compile_error(PARSER_ARG "Invalid char `\\x%02X' in expression", c);
goto retry;
}
Index: ruby.c
===================================================================
--- ruby.c (revision 14201)
+++ ruby.c (revision 14202)
@@ -863,7 +863,7 @@
}
else {
rb_raise(rb_eRuntimeError,
- "invalid option -\\x%02x (-h will show valid options)",
+ "invalid option -\\x%02X (-h will show valid options)",
(int)(unsigned char)*s);
}
}
Index: file.c
===================================================================
--- file.c (revision 14201)
+++ file.c (revision 14202)
@@ -3486,7 +3486,7 @@
rb_raise(rb_eArgError, "unknown command ?%c", cmd);
}
else {
- rb_raise(rb_eArgError, "unknown command ?\\x%02x", cmd);
+ rb_raise(rb_eArgError, "unknown command ?\\x%02X", cmd);
}
return Qnil; /* not reached */
}
--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml