diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | bignum.c | 2 | ||||
| -rw-r--r-- | class.c | 1 | ||||
| -rw-r--r-- | object.c | 15 |
4 files changed, 22 insertions, 5 deletions
@@ -1,3 +1,12 @@ +Wed Jan 16 11:12:30 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp> + + * object.c (rb_Float): remove underscores between digits. + + * bignum.c (rb_cstr2inum): reject prefix followed by spaces only. + + * class.c (rb_class_inherited): should use Object when no super + class. + Tue Jan 15 12:43:34 2002 Minero Aoki <aamine@loveruby.net> * lib/net/protocol.rb: Protocol#start returns the return value of @@ -252,8 +252,8 @@ rb_cstr2inum(str, base) if (*end == '_') goto bigparse; if (badcheck) { - while (*end && ISSPACE(*end)) end++; if (end == str) goto bad; /* no number */ + while (*end && ISSPACE(*end)) end++; if (*end) { /* trailing garbage */ bad: rb_raise(rb_eArgError, "invalid value for Integer: \"%s\"", s); @@ -149,6 +149,7 @@ VALUE rb_class_inherited(super, klass) VALUE super, klass; { + if (!super) super = rb_cObject; return rb_funcall(super, rb_intern("inherited"), 1, klass); } @@ -940,7 +940,6 @@ rb_Float(val) q = p = STR2CSTR(val); while (*p && ISSPACE(*p)) p++; - again: d = strtod(p, &end); if (p == end) { bad: @@ -949,13 +948,20 @@ rb_Float(val) if (*end) { if (*end == '_') { char *buf = ALLOCA_N(char, strlen(p)); - char *n = buf, *last; + char *n = buf, *last = p; + while (p < end) *n++ = *p++; while (*p) { - if (*p == '_') { + if (*p == '_' && (n > buf && ISDIGIT(n[-1]))) { + /* remove underscores between digits */ last = ++p; + while (*p == '_') ++p; + if (!ISDIGIT(*p)) { + while (last < p) *n++ = *last++; continue; } + last = p; + } *n++ = *p++; } while (*last && (*last == '_' || ISSPACE(*last))) @@ -963,7 +969,8 @@ rb_Float(val) if (!*last) goto bad; *n = '\0'; p = buf; - goto again; + d = strtod(p, &end); + if (p == end) goto bad; } while (*end && ISSPACE(*end)) end++; if (*end) goto bad; |