зеркало из https://github.com/github/ruby.git
* rational.c (string_to_r_internal): use rb_isdigit.
* marshal.c (long_toobig): use %zd. * ruby.c (set_arg0): move unused variable definition. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16736 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
9256f94d9a
Коммит
ccb61351ea
|
@ -1,3 +1,11 @@
|
||||||
|
Sun Jun 1 22:29:35 2008 NARUSE, Yui <naruse@ruby-lang.org>
|
||||||
|
|
||||||
|
* rational.c (string_to_r_internal): use rb_isdigit.
|
||||||
|
|
||||||
|
* marshal.c (long_toobig): use %zd.
|
||||||
|
|
||||||
|
* ruby.c (set_arg0): move unused variable definition.
|
||||||
|
|
||||||
Sun Jun 1 12:18:12 2008 NARUSE, Yui <naruse@ruby-lang.org>
|
Sun Jun 1 12:18:12 2008 NARUSE, Yui <naruse@ruby-lang.org>
|
||||||
|
|
||||||
* insns.def (DEFINE_INSN): subtract of pointers is ptrdiff_t.
|
* insns.def (DEFINE_INSN): subtract of pointers is ptrdiff_t.
|
||||||
|
|
|
@ -937,7 +937,7 @@ r_byte(struct load_arg *arg)
|
||||||
static void
|
static void
|
||||||
long_toobig(int size)
|
long_toobig(int size)
|
||||||
{
|
{
|
||||||
rb_raise(rb_eTypeError, "long too big for this architecture (size %d, given %d)",
|
rb_raise(rb_eTypeError, "long too big for this architecture (size %zd, given %d)",
|
||||||
sizeof(long), size);
|
sizeof(long), size);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1371,7 +1371,7 @@ string_to_r_internal(VALUE self)
|
||||||
VALUE l;
|
VALUE l;
|
||||||
|
|
||||||
while (*p) {
|
while (*p) {
|
||||||
if (isdigit(*p))
|
if (rb_isdigit(*p))
|
||||||
count++;
|
count++;
|
||||||
p++;
|
p++;
|
||||||
}
|
}
|
||||||
|
|
11
ruby.c
11
ruby.c
|
@ -1357,7 +1357,7 @@ get_arglen(int argc, char **argv)
|
||||||
static void
|
static void
|
||||||
set_arg0(VALUE val, ID id)
|
set_arg0(VALUE val, ID id)
|
||||||
{
|
{
|
||||||
char *s, *t;
|
char *s;
|
||||||
long i;
|
long i;
|
||||||
|
|
||||||
if (origarg.argv == 0)
|
if (origarg.argv == 0)
|
||||||
|
@ -1388,13 +1388,12 @@ set_arg0(VALUE val, ID id)
|
||||||
}
|
}
|
||||||
|
|
||||||
memcpy(origarg.argv[0], s, i);
|
memcpy(origarg.argv[0], s, i);
|
||||||
t = origarg.argv[0] + i;
|
|
||||||
*t = '\0';
|
|
||||||
|
|
||||||
if (i + 1 < origarg.len) memset(t + 1, ' ', origarg.len - i - 1);
|
|
||||||
|
|
||||||
{
|
{
|
||||||
int j;
|
char *t = origarg.argv[0] + i;
|
||||||
|
*t = '\0';
|
||||||
|
|
||||||
|
if (i + 1 < origarg.len) memset(t + 1, ' ', origarg.len - i - 1);
|
||||||
for (j = 1; j < origarg.argc; j++) {
|
for (j = 1; j < origarg.argc; j++) {
|
||||||
origarg.argv[j] = t;
|
origarg.argv[j] = t;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#define RUBY_VERSION "1.9.0"
|
#define RUBY_VERSION "1.9.0"
|
||||||
#define RUBY_RELEASE_DATE "2008-06-01"
|
#define RUBY_RELEASE_DATE "2008-06-02"
|
||||||
#define RUBY_VERSION_CODE 190
|
#define RUBY_VERSION_CODE 190
|
||||||
#define RUBY_RELEASE_CODE 20080601
|
#define RUBY_RELEASE_CODE 20080602
|
||||||
#define RUBY_PATCHLEVEL 0
|
#define RUBY_PATCHLEVEL 0
|
||||||
|
|
||||||
#define RUBY_VERSION_MAJOR 1
|
#define RUBY_VERSION_MAJOR 1
|
||||||
|
@ -9,7 +9,7 @@
|
||||||
#define RUBY_VERSION_TEENY 0
|
#define RUBY_VERSION_TEENY 0
|
||||||
#define RUBY_RELEASE_YEAR 2008
|
#define RUBY_RELEASE_YEAR 2008
|
||||||
#define RUBY_RELEASE_MONTH 6
|
#define RUBY_RELEASE_MONTH 6
|
||||||
#define RUBY_RELEASE_DAY 1
|
#define RUBY_RELEASE_DAY 2
|
||||||
|
|
||||||
#ifdef RUBY_EXTERN
|
#ifdef RUBY_EXTERN
|
||||||
RUBY_EXTERN const char ruby_version[];
|
RUBY_EXTERN const char ruby_version[];
|
||||||
|
|
Загрузка…
Ссылка в новой задаче