зеркало из https://github.com/github/ruby.git
* ruby.c (proc_options): script is never used while recursing.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10583 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
7265bd401d
Коммит
b4f1270f6d
|
@ -1,3 +1,7 @@
|
||||||
|
Fri Jul 21 23:57:26 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
|
* ruby.c (proc_options): script is never used while recursing.
|
||||||
|
|
||||||
Fri Jul 21 21:21:08 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
Fri Jul 21 21:21:08 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* eval.c (rb_call0): include funcalled methods in caller list.
|
* eval.c (rb_call0): include funcalled methods in caller list.
|
||||||
|
|
13
ruby.c
13
ruby.c
|
@ -62,8 +62,6 @@ static VALUE do_loop = Qfalse, do_print = Qfalse;
|
||||||
static VALUE do_check = Qfalse, do_line = Qfalse;
|
static VALUE do_check = Qfalse, do_line = Qfalse;
|
||||||
static VALUE do_split = Qfalse;
|
static VALUE do_split = Qfalse;
|
||||||
|
|
||||||
static const char *script;
|
|
||||||
|
|
||||||
static int origargc;
|
static int origargc;
|
||||||
static char **origargv;
|
static char **origargv;
|
||||||
|
|
||||||
|
@ -447,10 +445,10 @@ process_sflag(void)
|
||||||
static void proc_options(int argc, char **argv);
|
static void proc_options(int argc, char **argv);
|
||||||
|
|
||||||
static char*
|
static char*
|
||||||
moreswitches(char *s)
|
moreswitches(const char *s)
|
||||||
{
|
{
|
||||||
int argc; char *argv[3];
|
int argc; char *argv[3];
|
||||||
char *p = s;
|
const char *p = s;
|
||||||
|
|
||||||
argc = 2; argv[0] = argv[2] = 0;
|
argc = 2; argv[0] = argv[2] = 0;
|
||||||
while (*s && !ISSPACE(*s))
|
while (*s && !ISSPACE(*s))
|
||||||
|
@ -462,7 +460,7 @@ moreswitches(char *s)
|
||||||
proc_options(argc, argv);
|
proc_options(argc, argv);
|
||||||
while (*s && ISSPACE(*s))
|
while (*s && ISSPACE(*s))
|
||||||
s++;
|
s++;
|
||||||
return s;
|
return (char *)s;
|
||||||
}
|
}
|
||||||
|
|
||||||
NODE *ruby_eval_tree;
|
NODE *ruby_eval_tree;
|
||||||
|
@ -472,7 +470,8 @@ proc_options(int argc, char **argv)
|
||||||
{
|
{
|
||||||
char *argv0 = argv[0];
|
char *argv0 = argv[0];
|
||||||
int do_search;
|
int do_search;
|
||||||
char *s;
|
const char *s;
|
||||||
|
char *script = 0;
|
||||||
NODE *volatile script_node = 0;
|
NODE *volatile script_node = 0;
|
||||||
|
|
||||||
int version = 0;
|
int version = 0;
|
||||||
|
@ -812,7 +811,7 @@ proc_options(int argc, char **argv)
|
||||||
}
|
}
|
||||||
#if defined DOSISH || defined __CYGWIN__
|
#if defined DOSISH || defined __CYGWIN__
|
||||||
/* assume that we can change argv[n] if never change its length. */
|
/* assume that we can change argv[n] if never change its length. */
|
||||||
translate_char((char *)script, '\\', '/');
|
translate_char(script, '\\', '/');
|
||||||
#endif
|
#endif
|
||||||
argc--; argv++;
|
argc--; argv++;
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче