[ruby-dev:15835] Re: 文字列→整数変換

なかだです。

At Fri, 1 Feb 2002 10:41:31 +0900,
[e-mail] (Yukihiro Matsumoto) wrote:
> |rb_cstr2inum()は、今のところ基数が0ならエラーで例外としてますが、
> |上の二つを追加しようとすると無理があります。badcheckを引数に追
> |加したほうがいいと思うんですが、これのインターフェースって変え
> |ちゃっても大丈夫なもんでしょうか。たぶん使ってる拡張ライブラリ
> |はないとは思うんですが。
> 
> 変えない方が良いんじゃないかなあ。実は以前にも「誰も使ってな
> いだろう」と思って変えちゃったんですが、実際に困ったという話
> を聞いたことがありますので。
> 
> たぶん、元のrb_cstr2inum()をラッパーとして残すのが良いのでは。

ということで、Integer()のほうのパッチです。Float()のほうは別に
します。


Index: bignum.c
===================================================================
RCS file: /cvs/ruby/src/ruby/bignum.c,v
retrieving revision 1.52
diff -u -2 -p -r1.52 bignum.c
--- bignum.c	2002/01/16 02:17:30	1.52
+++ bignum.c	2002/02/01 08:35:12
@@ -187,12 +187,12 @@ rb_int2inum(n)
 
 VALUE
-rb_cstr2inum(str, base)
+rb_cstr_to_inum(str, base, badcheck)
     const char *str;
     int base;
+    int badcheck;
 {
     const char *s = str;
     char *end;
-    int badcheck = (base==0)?1:0;
-    char sign = 1, c;
+    char sign = 1, c, nondigit = 0;
     BDIGIT_DBL num;
     long len, blen = 1;
@@ -201,5 +201,10 @@ rb_cstr2inum(str, base)
     BDIGIT *zds;
 
-    while (*str && ISSPACE(*str)) str++;
+    if (badcheck) {
+	while (ISSPACE(*str)) str++;
+    }
+    else {
+	while (ISSPACE(*str) || *str == '_') str++;
+    }
 
     if (str[0] == '+') {
@@ -214,5 +219,5 @@ rb_cstr2inum(str, base)
 	return INT2FIX(0);
     }
-    if (base == 0) {
+    if (base <= 0) {
 	if (str[0] == '0') {
 	    if (str[1] == 'x' || str[1] == 'X') {
@@ -226,4 +231,7 @@ rb_cstr2inum(str, base)
 	    }
 	}
+	else if (base < -1) {
+	    base = -base;
+	}
 	else {
 	    base = 10;
@@ -291,16 +299,25 @@ rb_cstr2inum(str, base)
 	  case '5': case '6': case '7': 
 	    c = c - '0';
+	    nondigit = 0;
 	    break;
 	  case 'a': case 'b': case 'c':
 	  case 'd': case 'e': case 'f':
-	    if (base != 16) c = base;
-	    else c = c - 'a' + 10;
-	    break;
+	    c -= 'a' - 'A';
 	  case 'A': case 'B': case 'C':
 	  case 'D': case 'E': case 'F':
-	    if (base != 16) c = base;
-	    else c = c - 'A' + 10;
+	    if (base != 16) {
+		nondigit = c;
+		c = base;
+	    }
+	    else {
+		c = c - 'A' + 10;
+		nondigit = 0;
+	    }
 	    break;
 	  case '_':
+	    if (badcheck) {
+		if (nondigit) goto bad;
+		nondigit = c;
+	    }
 	    continue;
 	  default:
@@ -335,7 +352,8 @@ rb_cstr2inum(str, base)
 
 VALUE
-rb_str2inum(str, base)
+rb_str_to_inum(str, base, badcheck)
     VALUE str;
     int base;
+    int badcheck;
 {
     char *s;
@@ -352,8 +370,24 @@ rb_str2inum(str, base)
 	s = p;
     }
-    if (base == 0 && len != strlen(s)) {
+    if (badcheck && len != strlen(s)) {
 	rb_raise(rb_eArgError, "string for Integer contains null byte");
     }
-    return rb_cstr2inum(s, base); 
+    return rb_cstr_to_inum(s, base, badcheck); 
+}
+
+VALUE
+rb_cstr2inum(str, base)
+    const char *str;
+    int base;
+{
+    return rb_cstr_to_inum(str, base, base==0);
+}
+
+VALUE
+rb_str2inum(str, base)
+    VALUE str;
+    int base;
+{
+    return rb_str_to_inum(str, base, base==0);
 }
 
Index: intern.h
===================================================================
RCS file: /cvs/ruby/src/ruby/intern.h,v
retrieving revision 1.77
diff -u -2 -p -u -r1.77 intern.h
--- intern.h	2002/01/11 09:18:50	1.77
+++ intern.h	2002/02/01 05:36:44
@@ -62,4 +62,6 @@ VALUE rb_int2big _((long));
 VALUE rb_uint2inum _((unsigned long));
 VALUE rb_int2inum _((long));
+VALUE rb_cstr_to_inum _((const char*, int, int));
+VALUE rb_str_to_inum _((VALUE, int, int));
 VALUE rb_cstr2inum _((const char*, int));
 VALUE rb_str2inum _((VALUE, int));
Index: object.c
===================================================================
RCS file: /cvs/ruby/src/ruby/object.c,v
retrieving revision 1.71
diff -u -2 -p -u -r1.71 object.c
--- object.c	2002/02/01 06:02:59	1.71
+++ object.c	2002/02/01 08:01:58
@@ -946,5 +946,5 @@ rb_Integer(val)
 
       case T_STRING:
-	return rb_str2inum(val, 0);
+	return rb_str_to_inum(val, 0, Qtrue);
 
       case T_FIXNUM:
Index: parse.y
===================================================================
RCS file: /cvs/ruby/src/ruby/parse.y,v
retrieving revision 1.146
diff -u -2 -p -u -r1.146 parse.y
--- parse.y	2002/01/28 09:33:56	1.146
+++ parse.y	2002/02/01 02:14:35
@@ -3346,5 +3346,5 @@ yylex()
 		    }
 		    else if (nondigit) goto trailing_uc;
-		    yylval.val = rb_cstr2inum(tok(), 16);
+		    yylval.val = rb_cstr_to_inum(tok(), 16, Qfalse);
 		    return tINTEGER;
 		}
@@ -3370,5 +3370,5 @@ yylex()
 		    }
 		    else if (nondigit) goto trailing_uc;
-		    yylval.val = rb_cstr2inum(tok(), 2);
+		    yylval.val = rb_cstr_to_inum(tok(), 2, Qfalse);
 		    return tINTEGER;
 		}
@@ -3389,5 +3389,5 @@ yylex()
 			tokfix();
 			if (nondigit) goto trailing_uc;
-			yylval.val = rb_cstr2inum(tok(), 8);
+			yylval.val = rb_cstr_to_inum(tok(), 8, Qfalse);
 			return tINTEGER;
 		    }
@@ -3483,5 +3483,5 @@ yylex()
 		return tFLOAT;
 	    }
-	    yylval.val = rb_cstr2inum(tok(), 10);
+	    yylval.val = rb_cstr_to_inum(tok(), 10, Qfalse);
 	    return tINTEGER;
 	}
Index: sprintf.c
===================================================================
RCS file: /cvs/ruby/src/ruby/sprintf.c,v
retrieving revision 1.18
diff -u -2 -p -u -r1.18 sprintf.c
--- sprintf.c	2001/10/22 06:48:14	1.18
+++ sprintf.c	2002/02/01 02:14:22
@@ -398,5 +398,5 @@ rb_f_sprintf(argc, argv)
 		    break;
 		  case T_STRING:
-		    val = rb_str2inum(val, 0);
+		    val = rb_str_to_inum(val, 0, Qtrue);
 		    goto bin_retry;
 		  case T_BIGNUM:
Index: string.c
===================================================================
RCS file: /cvs/ruby/src/ruby/string.c,v
retrieving revision 1.96
diff -u -2 -p -u -r1.96 string.c
--- string.c	2002/01/28 08:44:37	1.96
+++ string.c	2002/02/01 07:48:11
@@ -1767,5 +1767,5 @@ rb_str_to_i(argc, argv, str)
 	rb_raise(rb_eArgError, "illegal radix %d", base);
     }
-    return rb_str2inum(str, base);
+    return rb_str_to_inum(str, base, Qfalse);
 }
 
@@ -2964,5 +2964,5 @@ rb_str_hex(str)
     VALUE str;
 {
-    return rb_str2inum(str, 16);
+    return rb_str_to_inum(str, 16, Qfalse);
 }
 
@@ -2971,19 +2971,5 @@ rb_str_oct(str)
     VALUE str;
 {
-    int base = 8;
-
-    if (RSTRING(str)->len > 2 && RSTRING(str)->ptr[0] == '0') {
-	switch (RSTRING(str)->ptr[1]) {
-	  case 'x':
-	  case 'X':
-	    base = 16;
-	    break;
-	  case 'b':
-	  case 'B':
-	    base = 2;
-	    break;
-	}
-    }
-    return rb_str2inum(str, base);
+    return rb_str_to_inum(str, -8, Qfalse);
 }
 
Index: time.c
===================================================================
RCS file: /cvs/ruby/src/ruby/time.c,v
retrieving revision 1.52
diff -u -2 -p -u -r1.52 time.c
--- time.c	2001/12/22 16:58:16	1.52
+++ time.c	2002/02/01 02:12:16
@@ -219,5 +219,5 @@ obj2long(obj)
 {
     if (TYPE(obj) == T_STRING) {
-	obj = rb_str2inum(obj, 10);
+	obj = rb_str_to_inum(obj, 10, Qfalse);
     }
 


-- 
--- 僕の前にBugはない。
--- 僕の後ろにBugはできる。
    中田 伸悦