summaryrefslogtreecommitdiff
path: root/ruby.c
diff options
context:
space:
mode:
Diffstat (limited to 'ruby.c')
-rw-r--r--ruby.c1535
1 files changed, 1080 insertions, 455 deletions
diff --git a/ruby.c b/ruby.c
index 7c32d4170d..189f6313ab 100644
--- a/ruby.c
+++ b/ruby.c
@@ -11,36 +11,61 @@
**********************************************************************/
-#ifdef __CYGWIN__
-#include <windows.h>
-#include <sys/cygwin.h>
-#endif
-#include "internal.h"
-#include "ruby/thread.h"
-#include "eval_intern.h"
-#include "dln.h"
+#include "ruby/internal/config.h"
+
+#include <ctype.h>
#include <stdio.h>
#include <sys/types.h>
-#include <ctype.h>
+
+#ifdef __CYGWIN__
+# include <windows.h>
+# include <sys/cygwin.h>
+#endif
#ifdef __hpux
-#include <sys/pstat.h>
+# include <sys/pstat.h>
#endif
-#if defined(LOAD_RELATIVE) && defined(HAVE_DLADDR)
-#include <dlfcn.h>
+
+#if (defined(LOAD_RELATIVE) || defined(__MACH__)) && defined(HAVE_DLADDR)
+# include <dlfcn.h>
#endif
#ifdef HAVE_UNISTD_H
-#include <unistd.h>
+# include <unistd.h>
#endif
+
#if defined(HAVE_FCNTL_H)
-#include <fcntl.h>
+# include <fcntl.h>
#elif defined(HAVE_SYS_FCNTL_H)
-#include <sys/fcntl.h>
+# include <sys/fcntl.h>
#endif
+
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
#endif
+
+#include "dln.h"
+#include "eval_intern.h"
+#include "internal.h"
+#include "internal/error.h"
+#include "internal/file.h"
+#include "internal/inits.h"
+#include "internal/io.h"
+#include "internal/load.h"
+#include "internal/loadpath.h"
+#include "internal/missing.h"
+#include "internal/object.h"
+#include "internal/parse.h"
+#include "internal/process.h"
+#include "internal/variable.h"
+#include "mjit.h"
+#include "yjit.h"
+#include "ruby/encoding.h"
+#include "ruby/thread.h"
+#include "ruby/util.h"
+#include "ruby/version.h"
+#include "ruby/internal/error.h"
+
#ifndef MAXPATHLEN
# define MAXPATHLEN 1024
#endif
@@ -48,7 +73,7 @@
# define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR)
#endif
-#include "ruby/util.h"
+void Init_ruby_description(void);
#ifndef HAVE_STDLIB_H
char *getenv();
@@ -63,43 +88,93 @@ char *getenv();
#define DEFAULT_RUBYGEMS_ENABLED "enabled"
#endif
+void rb_warning_category_update(unsigned int mask, unsigned int bits);
+
+#define COMMA ,
#define FEATURE_BIT(bit) (1U << feature_##bit)
+#define EACH_FEATURES(X, SEP) \
+ X(gems) \
+ SEP \
+ X(error_highlight) \
+ SEP \
+ X(did_you_mean) \
+ SEP \
+ X(rubyopt) \
+ SEP \
+ X(frozen_string_literal) \
+ SEP \
+ X(mjit) \
+ SEP \
+ X(yjit)
+ /* END OF FEATURES */
+#define EACH_DEBUG_FEATURES(X, SEP) \
+ X(frozen_string_literal) \
+ /* END OF DEBUG FEATURES */
+#define AMBIGUOUS_FEATURE_NAMES 0 /* no ambiguous feature names now */
+#define DEFINE_FEATURE(bit) feature_##bit
+#define DEFINE_DEBUG_FEATURE(bit) feature_debug_##bit
enum feature_flag_bits {
- feature_gems,
- feature_did_you_mean,
- feature_rubyopt,
- feature_frozen_string_literal,
- feature_debug_frozen_string_literal,
+ EACH_FEATURES(DEFINE_FEATURE, COMMA),
+ feature_debug_flag_first,
+ feature_debug_flag_begin = feature_debug_flag_first - 1,
+ EACH_DEBUG_FEATURES(DEFINE_DEBUG_FEATURE, COMMA),
feature_flag_count
};
#define DEBUG_BIT(bit) (1U << feature_debug_##bit)
#define DUMP_BIT(bit) (1U << dump_##bit)
+#define DEFINE_DUMP(bit) dump_##bit
+#define EACH_DUMPS(X, SEP) \
+ X(version) \
+ SEP \
+ X(copyright) \
+ SEP \
+ X(usage) \
+ SEP \
+ X(help) \
+ SEP \
+ X(yydebug) \
+ SEP \
+ X(syntax) \
+ SEP \
+ X(parsetree) \
+ SEP \
+ X(parsetree_with_comment) \
+ SEP \
+ X(insns) \
+ SEP \
+ X(insns_without_opt) \
+ /* END OF DUMPS */
enum dump_flag_bits {
- dump_version,
dump_version_v,
- dump_copyright,
- dump_usage,
- dump_help,
- dump_yydebug,
- dump_syntax,
- dump_parsetree,
- dump_parsetree_with_comment,
- dump_insns,
- dump_flag_count
+ EACH_DUMPS(DEFINE_DUMP, COMMA),
+ dump_exit_bits = (DUMP_BIT(yydebug) | DUMP_BIT(syntax) |
+ DUMP_BIT(parsetree) | DUMP_BIT(parsetree_with_comment) |
+ DUMP_BIT(insns) | DUMP_BIT(insns_without_opt))
};
-struct cmdline_options {
- int sflag, xflag;
- int do_loop, do_print;
- int do_line, do_split;
- int do_search;
- unsigned int features;
- int verbose;
- int safe_level;
- unsigned int setids;
- unsigned int dump;
+typedef struct ruby_cmdline_options ruby_cmdline_options_t;
+
+typedef struct {
+ unsigned int mask;
+ unsigned int set;
+} ruby_features_t;
+
+static inline void
+rb_feature_set_to(ruby_features_t *feat, unsigned int bit_mask, unsigned int bit_set)
+{
+ feat->mask |= bit_mask;
+ feat->set = (feat->set & ~bit_mask) | bit_set;
+}
+
+#define FEATURE_SET_TO(feat, bit_mask, bit_set) \
+ rb_feature_set_to(&(feat), bit_mask, bit_set)
+#define FEATURE_SET(feat, bits) FEATURE_SET_TO(feat, bits, bits)
+#define FEATURE_SET_RESTORE(feat, save) FEATURE_SET_TO(feat, (save).mask, (save).set & (save).mask)
+#define FEATURE_SET_P(feat, bits) ((feat).set & (bits))
+
+struct ruby_cmdline_options {
const char *script;
VALUE script_name;
VALUE e_script;
@@ -110,9 +185,26 @@ struct cmdline_options {
} enc;
} src, ext, intern;
VALUE req_list;
+ ruby_features_t features;
+ ruby_features_t warn;
+ unsigned int dump;
+#if USE_MJIT
+ struct mjit_options mjit;
+#endif
+ struct rb_yjit_options yjit;
+
+ int sflag, xflag;
+ unsigned int warning: 1;
+ unsigned int verbose: 1;
+ unsigned int do_loop: 1;
+ unsigned int do_print: 1;
+ unsigned int do_line: 1;
+ unsigned int do_split: 1;
+ unsigned int do_search: 1;
+ unsigned int setids: 2;
};
-static void init_ids(struct cmdline_options *);
+static void init_ids(ruby_cmdline_options_t *);
#define src_encoding_index GET_VM()->src_encoding_index
@@ -123,29 +215,42 @@ enum {
| FEATURE_BIT(debug_frozen_string_literal)
),
DEFAULT_FEATURES = (
- ~0U
+ (FEATURE_BIT(debug_flag_first)-1)
#if DISABLE_RUBYGEMS
& ~FEATURE_BIT(gems)
#endif
& ~FEATURE_BIT(frozen_string_literal)
- & ~FEATURE_BIT(debug_frozen_string_literal)
+ & ~FEATURE_BIT(mjit)
+ & ~FEATURE_BIT(yjit)
)
};
-static struct cmdline_options *
-cmdline_options_init(struct cmdline_options *opt)
+static ruby_cmdline_options_t *
+cmdline_options_init(ruby_cmdline_options_t *opt)
{
MEMZERO(opt, *opt, 1);
init_ids(opt);
opt->src.enc.index = src_encoding_index;
opt->ext.enc.index = -1;
opt->intern.enc.index = -1;
- opt->features = DEFAULT_FEATURES;
+ opt->features.set = DEFAULT_FEATURES;
+#ifdef MJIT_FORCE_ENABLE /* to use with: ./configure cppflags="-DMJIT_FORCE_ENABLE" */
+ opt->features.set |= FEATURE_BIT(mjit);
+#elif defined(YJIT_FORCE_ENABLE)
+ opt->features.set |= FEATURE_BIT(yjit);
+#endif
+
+ if (getenv("RUBY_YJIT_ENABLE")) {
+ opt->features.set |= FEATURE_BIT(yjit);
+ }
+
return opt;
}
-static NODE *load_file(VALUE, VALUE, int, struct cmdline_options *);
-static void forbid_setid(const char *, struct cmdline_options *);
+static rb_ast_t *load_file(VALUE parser, VALUE fname, VALUE f, int script,
+ ruby_cmdline_options_t *opt);
+static VALUE open_load_file(VALUE fname_v, int *xflag);
+static void forbid_setid(const char *, const ruby_cmdline_options_t *);
#define forbid_setid(s) forbid_setid((s), opt)
static struct {
@@ -153,20 +258,26 @@ static struct {
char **argv;
} origarg;
+static const char esc_standout[] = "\n\033[1;7m";
+static const char esc_bold[] = "\033[1m";
+static const char esc_reset[] = "\033[0m";
+static const char esc_none[] = "";
+
static void
-show_usage_line(const char *str, unsigned int namelen, unsigned int secondlen, int help)
+show_usage_line(const char *str, unsigned int namelen, unsigned int secondlen, int help, int highlight, unsigned int w)
{
- const unsigned int w = 16;
- const int wrap = help && namelen + secondlen - 2 > w;
- printf(" %.*s%-*.*s%-*s%s\n", namelen-1, str,
+ const char *sb = highlight ? esc_bold : esc_none;
+ const char *se = highlight ? esc_reset : esc_none;
+ const int wrap = help && namelen + secondlen - 1 > w;
+ printf(" %s%.*s%-*.*s%s%-*s%s\n", sb, namelen-1, str,
(wrap ? 0 : w - namelen + 1),
- (help ? secondlen-1 : 0), str + namelen,
+ (help ? secondlen-1 : 0), str + namelen, se,
(wrap ? w + 3 : 0), (wrap ? "\n" : ""),
str + namelen + secondlen);
}
static void
-usage(const char *name, int help)
+usage(const char *name, int help, int highlight, int columns)
{
/* This message really ought to be max 23 lines.
* Removed -h because the user already knows that option. Others? */
@@ -180,6 +291,11 @@ usage(const char *name, int help)
(unsigned short)sizeof(shortopt), \
(unsigned short)sizeof(longopt), \
}
+#if YJIT_SUPPORTED_P
+# define PLATFORM_JIT_OPTION "--yjit"
+#else
+# define PLATFORM_JIT_OPTION "--mjit"
+#endif
static const struct message usage_msg[] = {
M("-0[octal]", "", "specify record separator (\\0, if no argument)"),
M("-a", "", "autosplit mode with -n or -p (splits $_ into $F)"),
@@ -197,43 +313,98 @@ usage(const char *name, int help)
M("-rlibrary", "", "require the library before executing your script"),
M("-s", "", "enable some switch parsing for switches after script name"),
M("-S", "", "look for the script using PATH environment variable"),
- M("-T[level=1]", "", "turn on tainting checks"),
- M("-v", ", --verbose", "print version number, then turn on verbose mode"),
+ M("-v", "", "print the version number, then turn on verbose mode"),
M("-w", "", "turn warnings on for your script"),
- M("-W[level=2]", "", "set warning level; 0=silence, 1=medium, 2=verbose"),
+ M("-W[level=2|:category]", "", "set warning level; 0=silence, 1=medium, 2=verbose"),
M("-x[directory]", "", "strip off text before #!ruby line and perhaps cd to directory"),
+ M("--jit", "", "enable JIT for the platform, same as " PLATFORM_JIT_OPTION " (experimental)"),
+ M("--mjit", "", "enable C compiler-based JIT compiler (experimental)"),
+ M("--yjit", "", "enable in-process JIT compiler (experimental)"),
M("-h", "", "show this message, --help for more info"),
};
static const struct message help_msg[] = {
- M("--copyright", "", "print the copyright"),
- M("--enable=feature[,...]", ", --disable=feature[,...]",
- "enable or disable features"),
- M("--external-encoding=encoding", ", --internal-encoding=encoding",
+ M("--copyright", "", "print the copyright"),
+ M("--dump={insns|parsetree|...}[,...]", "",
+ "dump debug information. see below for available dump list"),
+ M("--enable={mjit|rubyopt|...}[,...]", ", --disable={mjit|rubyopt|...}[,...]",
+ "enable or disable features. see below for available features"),
+ M("--external-encoding=encoding", ", --internal-encoding=encoding",
"specify the default external or internal character encoding"),
- M("--version", "", "print the version"),
- M("--help", "", "show this message, -h for short message"),
+ M("--backtrace-limit=num", "", "limit the maximum length of backtrace"),
+ M("--verbose", "", "turn on verbose mode and disable script from stdin"),
+ M("--version", "", "print the version number, then exit"),
+ M("--help", "", "show this message, -h for short message"),
+ };
+ static const struct message dumps[] = {
+ M("insns", "", "instruction sequences"),
+ M("insns_without_opt", "", "instruction sequences compiled with no optimization"),
+ M("yydebug", "", "yydebug of yacc parser generator"),
+ M("parsetree", "", "AST"),
+ M("parsetree_with_comment", "", "AST with comments"),
};
static const struct message features[] = {
- M("gems", "", "rubygems (default: "DEFAULT_RUBYGEMS_ENABLED")"),
+ M("gems", "", "rubygems (only for debugging, default: "DEFAULT_RUBYGEMS_ENABLED")"),
+ M("error_highlight", "", "error_highlight (default: "DEFAULT_RUBYGEMS_ENABLED")"),
M("did_you_mean", "", "did_you_mean (default: "DEFAULT_RUBYGEMS_ENABLED")"),
M("rubyopt", "", "RUBYOPT environment variable (default: enabled)"),
M("frozen-string-literal", "", "freeze all string literals (default: disabled)"),
+ M("mjit", "", "C compiler-based JIT compiler (default: disabled)"),
+ M("yjit", "", "in-process JIT compiler (default: disabled)"),
+ };
+ static const struct message warn_categories[] = {
+ M("deprecated", "", "deprecated features"),
+ M("experimental", "", "experimental features"),
+ };
+ static const struct message mjit_options[] = {
+ M("--mjit-warnings", "", "Enable printing JIT warnings"),
+ M("--mjit-debug", "", "Enable JIT debugging (very slow), or add cflags if specified"),
+ M("--mjit-wait", "", "Wait until JIT compilation finishes every time (for testing)"),
+ M("--mjit-save-temps", "", "Save JIT temporary files in $TMP or /tmp (for testing)"),
+ M("--mjit-verbose=num", "", "Print JIT logs of level num or less to stderr (default: 0)"),
+ M("--mjit-max-cache=num", "", "Max number of methods to be JIT-ed in a cache (default: 10000)"),
+ M("--mjit-min-calls=num", "", "Number of calls to trigger JIT (for testing, default: 10000)"),
+ };
+ static const struct message yjit_options[] = {
+#if YJIT_STATS
+ M("--yjit-stats", "", "Enable collecting YJIT statistics"),
+#endif
+ M("--yjit-exec-mem-size=num", "", "Size of executable memory block in MiB (default: 256)"),
+ M("--yjit-call-threshold", "", "Number of calls to trigger JIT (default: 10)"),
+ M("--yjit-max-versions", "", "Maximum number of versions per basic block (default: 4)"),
+ M("--yjit-greedy-versioning", "", "Greedy versioning mode (default: disabled)"),
};
int i;
+ const char *sb = highlight ? esc_standout+1 : esc_none;
+ const char *se = highlight ? esc_reset : esc_none;
const int num = numberof(usage_msg) - (help ? 1 : 0);
-#define SHOW(m) show_usage_line((m).str, (m).namelen, (m).secondlen, help)
+ unsigned int w = (columns > 80 ? (columns - 79) / 2 : 0) + 16;
+#define SHOW(m) show_usage_line((m).str, (m).namelen, (m).secondlen, help, highlight, w)
- printf("Usage: %s [switches] [--] [programfile] [arguments]\n", name);
+ printf("%sUsage:%s %s [switches] [--] [programfile] [arguments]\n", sb, se, name);
for (i = 0; i < num; ++i)
SHOW(usage_msg[i]);
if (!help) return;
+ if (highlight) sb = esc_standout;
+
for (i = 0; i < numberof(help_msg); ++i)
SHOW(help_msg[i]);
- puts("Features:");
+ printf("%s""Dump List:%s\n", sb, se);
+ for (i = 0; i < numberof(dumps); ++i)
+ SHOW(dumps[i]);
+ printf("%s""Features:%s\n", sb, se);
for (i = 0; i < numberof(features); ++i)
SHOW(features[i]);
+ printf("%s""Warning categories:%s\n", sb, se);
+ for (i = 0; i < numberof(warn_categories); ++i)
+ SHOW(warn_categories[i]);
+ printf("%s""MJIT options (experimental):%s\n", sb, se);
+ for (i = 0; i < numberof(mjit_options); ++i)
+ SHOW(mjit_options[i]);
+ printf("%s""YJIT options (experimental):%s\n", sb, se);
+ for (i = 0; i < numberof(yjit_options); ++i)
+ SHOW(yjit_options[i]);
}
#define rubylib_path_new rb_str_new
@@ -378,6 +549,11 @@ translit_char_bin(char *p, int from, int to)
#ifndef UTF8_PATH
# define UTF8_PATH 0
#endif
+#if UTF8_PATH
+# define IF_UTF8_PATH(t, f) t
+#else
+# define IF_UTF8_PATH(t, f) f
+#endif
#if UTF8_PATH
static VALUE
@@ -387,28 +563,74 @@ str_conv_enc(VALUE str, rb_encoding *from, rb_encoding *to)
ECONV_UNDEF_REPLACE|ECONV_INVALID_REPLACE,
Qnil);
}
+#else
+# define str_conv_enc(str, from, to) (str)
#endif
-void ruby_init_loadpath_safe(int safe_level);
-
-void
-ruby_init_loadpath(void)
-{
- ruby_init_loadpath_safe(0);
-}
+void ruby_init_loadpath(void);
-#if defined(LOAD_RELATIVE) && defined(HAVE_DLADDR)
+#if defined(LOAD_RELATIVE) || defined(__MACH__)
static VALUE
-dladdr_path(const void* addr)
+runtime_libruby_path(void)
{
+#if defined _WIN32 || defined __CYGWIN__
+ DWORD len, ret;
+#if USE_RVARGC
+ len = 32;
+#else
+ len = RSTRING_EMBED_LEN_MAX;
+#endif
+ VALUE path;
+ VALUE wsopath = rb_str_new(0, len*sizeof(WCHAR));
+ WCHAR *wlibpath;
+ char *libpath;
+
+ while (wlibpath = (WCHAR *)RSTRING_PTR(wsopath),
+ ret = GetModuleFileNameW(libruby, wlibpath, len),
+ (ret == len))
+ {
+ rb_str_modify_expand(wsopath, len*sizeof(WCHAR));
+ rb_str_set_len(wsopath, (len += len)*sizeof(WCHAR));
+ }
+ if (!ret || ret > len) rb_fatal("failed to get module file name");
+#if defined __CYGWIN__
+ {
+ const int win_to_posix = CCP_WIN_W_TO_POSIX | CCP_RELATIVE;
+ size_t newsize = cygwin_conv_path(win_to_posix, wlibpath, 0, 0);
+ if (!newsize) rb_fatal("failed to convert module path to cygwin");
+ path = rb_str_new(0, newsize);
+ libpath = RSTRING_PTR(path);
+ if (cygwin_conv_path(win_to_posix, wlibpath, libpath, newsize)) {
+ rb_str_resize(path, 0);
+ }
+ }
+#else
+ {
+ DWORD i;
+ for (len = ret, i = 0; i < len; ++i) {
+ if (wlibpath[i] == L'\\') {
+ wlibpath[i] = L'/';
+ ret = i+1; /* chop after the last separator */
+ }
+ }
+ }
+ len = WideCharToMultiByte(CP_UTF8, 0, wlibpath, ret, NULL, 0, NULL, NULL);
+ path = rb_utf8_str_new(0, len);
+ libpath = RSTRING_PTR(path);
+ WideCharToMultiByte(CP_UTF8, 0, wlibpath, ret, libpath, len, NULL, NULL);
+#endif
+ rb_str_resize(wsopath, 0);
+ return path;
+#elif defined(HAVE_DLADDR)
Dl_info dli;
VALUE fname, path;
+ const void* addr = (void *)(VALUE)expand_include_path;
- if (!dladdr(addr, &dli)) {
+ if (!dladdr((void *)addr, &dli)) {
return rb_str_new(0, 0);
}
#ifdef __linux__
- else if (dli.dli_fname == origarg.argv[0]) {
+ else if (origarg.argc > 0 && origarg.argv && dli.dli_fname == origarg.argv[0]) {
fname = rb_str_new_cstr("/proc/self/exe");
path = rb_readlink(fname, NULL);
}
@@ -419,81 +641,78 @@ dladdr_path(const void* addr)
}
rb_str_resize(fname, 0);
return path;
+#else
+# error relative load path is not supported on this platform.
+#endif
}
#endif
#define INITIAL_LOAD_PATH_MARK rb_intern_const("@gem_prelude_index")
+VALUE ruby_archlibdir_path, ruby_prefix_path;
+#if defined(__MACH__)
+// A path to libruby.dylib itself or where it's statically linked to.
+VALUE rb_libruby_selfpath;
+#endif
+
void
-ruby_init_loadpath_safe(int safe_level)
+ruby_init_loadpath(void)
{
- VALUE load_path;
+ VALUE load_path, archlibdir = 0;
ID id_initial_load_path_mark;
const char *paths = ruby_initial_load_paths;
-#if defined LOAD_RELATIVE
-# if defined HAVE_DLADDR || defined __CYGWIN__ || defined _WIN32
-# define VARIABLE_LIBPATH 1
-# else
-# define VARIABLE_LIBPATH 0
+#if defined(LOAD_RELATIVE) || defined(__MACH__)
+ VALUE libruby_path = runtime_libruby_path();
+# if defined(__MACH__)
+ rb_libruby_selfpath = libruby_path;
+ rb_gc_register_address(&rb_libruby_selfpath);
# endif
-# if VARIABLE_LIBPATH
+#endif
+
+#if defined LOAD_RELATIVE
+#if !defined ENABLE_MULTIARCH
+# define RUBY_ARCH_PATH ""
+#elif defined RUBY_ARCH
+# define RUBY_ARCH_PATH "/"RUBY_ARCH
+#else
+# define RUBY_ARCH_PATH "/"RUBY_PLATFORM
+#endif
char *libpath;
VALUE sopath;
-# else
- char libpath[MAXPATHLEN + 1];
-# endif
size_t baselen;
- char *p;
+ const char *p;
-#if defined _WIN32 || defined __CYGWIN__
- sopath = rb_str_new(0, MAXPATHLEN);
- libpath = RSTRING_PTR(sopath);
- GetModuleFileName(libruby, libpath, MAXPATHLEN);
-#elif defined(HAVE_DLADDR)
- sopath = dladdr_path((void *)(VALUE)expand_include_path);
+ sopath = libruby_path;
libpath = RSTRING_PTR(sopath);
-#endif
-#if !VARIABLE_LIBPATH
- libpath[sizeof(libpath) - 1] = '\0';
-#endif
-#if defined DOSISH
- translit_char(libpath, '\\', '/');
-#elif defined __CYGWIN__
- {
- const int win_to_posix = CCP_WIN_A_TO_POSIX | CCP_RELATIVE;
- size_t newsize = cygwin_conv_path(win_to_posix, libpath, 0, 0);
- if (newsize > 0) {
- VALUE rubylib = rb_str_new(0, newsize);
- p = RSTRING_PTR(rubylib);
- if (cygwin_conv_path(win_to_posix, libpath, p, newsize) == 0) {
- rb_str_resize(sopath, 0);
- sopath = rubylib;
- libpath = p;
- }
- }
- }
-#endif
p = strrchr(libpath, '/');
if (p) {
- static const char bindir[] = "/bin";
+ static const char libdir[] = "/"
#ifdef LIBDIR_BASENAME
- static const char libdir[] = "/"LIBDIR_BASENAME;
+ LIBDIR_BASENAME
#else
- static const char libdir[] = "/lib";
+ "lib"
#endif
+ RUBY_ARCH_PATH;
+ const ptrdiff_t libdir_len = (ptrdiff_t)sizeof(libdir)
+ - rb_strlen_lit(RUBY_ARCH_PATH) - 1;
+ static const char bindir[] = "/bin";
const ptrdiff_t bindir_len = (ptrdiff_t)sizeof(bindir) - 1;
- const ptrdiff_t libdir_len = (ptrdiff_t)sizeof(libdir) - 1;
-#ifdef ENABLE_MULTIARCH
- char *p2 = NULL;
+ const char *p2 = NULL;
+#ifdef ENABLE_MULTIARCH
multiarch:
#endif
if (p - libpath >= bindir_len && !STRNCASECMP(p - bindir_len, bindir, bindir_len)) {
p -= bindir_len;
+ archlibdir = rb_str_subseq(sopath, 0, p - libpath);
+ rb_str_cat_cstr(archlibdir, libdir);
+ OBJ_FREEZE_RAW(archlibdir);
}
else if (p - libpath >= libdir_len && !strncmp(p - libdir_len, libdir, libdir_len)) {
+ archlibdir = rb_str_subseq(sopath, 0, (p2 ? p2 : p) - libpath);
+ OBJ_FREEZE_RAW(archlibdir);
p -= libdir_len;
}
#ifdef ENABLE_MULTIARCH
@@ -507,37 +726,31 @@ ruby_init_loadpath_safe(int safe_level)
p = p2;
}
#endif
-#if !VARIABLE_LIBPATH
- *p = 0;
-#endif
+ baselen = p - libpath;
}
-#if !VARIABLE_LIBPATH
else {
- strlcpy(libpath, ".", sizeof(libpath));
- p = libpath + 1;
+ baselen = 0;
}
- baselen = p - libpath;
-#define PREFIX_PATH() rb_str_new(libpath, baselen)
-#else
- baselen = p - libpath;
rb_str_resize(sopath, baselen);
libpath = RSTRING_PTR(sopath);
#define PREFIX_PATH() sopath
-#endif
-
#define BASEPATH() rb_str_buf_cat(rb_str_buf_new(baselen+len), libpath, baselen)
-
#define RUBY_RELATIVE(path, len) rb_str_buf_cat(BASEPATH(), (path), (len))
#else
const size_t exec_prefix_len = strlen(ruby_exec_prefix);
#define RUBY_RELATIVE(path, len) rubylib_path_new((path), (len))
#define PREFIX_PATH() RUBY_RELATIVE(ruby_exec_prefix, exec_prefix_len)
#endif
+ rb_gc_register_address(&ruby_prefix_path);
+ ruby_prefix_path = PREFIX_PATH();
+ OBJ_FREEZE_RAW(ruby_prefix_path);
+ if (!archlibdir) archlibdir = ruby_prefix_path;
+ rb_gc_register_address(&ruby_archlibdir_path);
+ ruby_archlibdir_path = archlibdir;
+
load_path = GET_VM()->load_path;
- if (safe_level == 0) {
- ruby_push_include(getenv("RUBYLIB"), identical_path);
- }
+ ruby_push_include(getenv("RUBYLIB"), identical_path);
id_initial_load_path_mark = INITIAL_LOAD_PATH_MARK;
while (*paths) {
@@ -548,7 +761,7 @@ ruby_init_loadpath_safe(int safe_level)
paths += len + 1;
}
- rb_const_set(rb_cObject, rb_intern_const("TMP_RUBY_PREFIX"), rb_obj_freeze(PREFIX_PATH()));
+ rb_const_set(rb_cObject, rb_intern_const("TMP_RUBY_PREFIX"), ruby_prefix_path);
}
@@ -559,11 +772,9 @@ add_modules(VALUE *req_list, const char *mod)
VALUE feature;
if (!list) {
- *req_list = list = rb_ary_new();
- RBASIC_CLEAR_CLASS(list);
+ *req_list = list = rb_ary_tmp_new(0);
}
- feature = rb_str_new2(mod);
- RBASIC_CLEAR_CLASS(feature);
+ feature = rb_str_cat_cstr(rb_str_tmp_new(0), mod);
rb_ary_push(list, feature);
}
@@ -573,10 +784,7 @@ require_libraries(VALUE *req_list)
VALUE list = *req_list;
VALUE self = rb_vm_top_self();
ID require;
- rb_thread_t *th = GET_THREAD();
rb_encoding *extenc = rb_default_external_encoding();
- int prev_parse_in_eval = th->parse_in_eval;
- th->parse_in_eval = 0;
CONST_ID(require, "require");
while (list && RARRAY_LEN(list) > 0) {
@@ -584,22 +792,15 @@ require_libraries(VALUE *req_list)
rb_enc_associate(feature, extenc);
RBASIC_SET_CLASS_RAW(feature, rb_cString);
OBJ_FREEZE(feature);
- rb_funcall2(self, require, 1, &feature);
+ rb_funcallv(self, require, 1, &feature);
}
*req_list = 0;
-
- th->parse_in_eval = prev_parse_in_eval;
}
-static rb_env_t*
-toplevel_context(VALUE toplevel_binding)
+static const struct rb_block*
+toplevel_context(rb_binding_t *bind)
{
- rb_env_t *env;
- rb_binding_t *bind;
-
- GetBindingPtr(toplevel_binding, bind);
- GetEnvPtr(bind->env, env);
- return env;
+ return &bind->block;
}
static void
@@ -666,23 +867,24 @@ process_sflag(int *sflag)
}
}
-static long proc_options(long argc, char **argv, struct cmdline_options *opt, int envopt);
+static long proc_options(long argc, char **argv, ruby_cmdline_options_t *opt, int envopt);
static void
-moreswitches(const char *s, struct cmdline_options *opt, int envopt)
+moreswitches(const char *s, ruby_cmdline_options_t *opt, int envopt)
{
long argc, i, len;
char **argv, *p;
const char *ap = 0;
VALUE argstr, argary;
+ void *ptr;
while (ISSPACE(*s)) s++;
if (!*s) return;
- argstr = rb_str_tmp_new((len = strlen(s)) + 2);
+ argstr = rb_str_tmp_new((len = strlen(s)) + (envopt!=0));
argary = rb_str_tmp_new(0);
p = RSTRING_PTR(argstr);
- *p++ = ' ';
+ if (envopt) *p++ = ' ';
memcpy(p, s, len + 1);
ap = 0;
rb_str_cat(argary, (char *)&ap, sizeof(ap));
@@ -697,9 +899,10 @@ moreswitches(const char *s, struct cmdline_options *opt, int envopt)
argc = RSTRING_LEN(argary) / sizeof(ap);
ap = 0;
rb_str_cat(argary, (char *)&ap, sizeof(ap));
- argv = (char **)RSTRING_PTR(argary);
+ argv = ptr = ALLOC_N(char *, argc);
+ MEMMOVE(argv, RSTRING_PTR(argary), char *, argc);
- while ((i = proc_options(argc, argv, opt, envopt)) > 1 && (argc -= i) > 0) {
+ while ((i = proc_options(argc, argv, opt, envopt)) > 1 && envopt && (argc -= i) > 0) {
argv += i;
if (**argv != '-') {
*--*argv = '-';
@@ -710,6 +913,7 @@ moreswitches(const char *s, struct cmdline_options *opt, int envopt)
}
}
+ ruby_xfree(ptr);
/* get rid of GC */
rb_str_resize(argary, 0);
rb_str_resize(argstr, 0);
@@ -719,7 +923,7 @@ static int
name_match_p(const char *name, const char *str, size_t len)
{
if (len == 0) return 0;
- do {
+ while (1) {
while (TOLOWER(*str) == *name) {
if (!--len || !*++str) return 1;
++name;
@@ -729,8 +933,7 @@ name_match_p(const char *name, const char *str, size_t len)
if (*name != '-' && *name != '_') return 0;
++name;
++str;
- } while (len > 0);
- return !*name;
+ }
}
#define NAME_MATCH_P(name, str, len) \
@@ -748,24 +951,66 @@ name_match_p(const char *name, const char *str, size_t len)
return; \
}
+#define LITERAL_NAME_ELEMENT(name) #name
+
static void
feature_option(const char *str, int len, void *arg, const unsigned int enable)
{
- unsigned int *argp = arg;
+ static const char list[] = EACH_FEATURES(LITERAL_NAME_ELEMENT, ", ");
+ ruby_features_t *argp = arg;
unsigned int mask = ~0U;
+ unsigned int set = 0U;
+#if AMBIGUOUS_FEATURE_NAMES
+ int matched = 0;
+# define FEATURE_FOUND ++matched
+#else
+# define FEATURE_FOUND goto found
+#endif
#define SET_FEATURE(bit) \
- if (NAME_MATCH_P(#bit, str, len)) {mask = FEATURE_BIT(bit); goto found;}
- SET_FEATURE(gems);
- SET_FEATURE(did_you_mean);
- SET_FEATURE(rubyopt);
- SET_FEATURE(frozen_string_literal);
+ if (NAME_MATCH_P(#bit, str, len)) {set |= mask = FEATURE_BIT(bit); FEATURE_FOUND;}
+ EACH_FEATURES(SET_FEATURE, ;);
+ if (NAME_MATCH_P("jit", str, len)) { // This allows you to cancel --jit
+#if defined(MJIT_FORCE_ENABLE) || !YJIT_SUPPORTED_P
+ set |= mask = FEATURE_BIT(mjit);
+#else
+ set |= mask = FEATURE_BIT(yjit);
+#endif
+ goto found;
+ }
if (NAME_MATCH_P("all", str, len)) {
- found:
- *argp = (*argp & ~mask) | (mask & enable);
- return;
+ // YJIT and MJIT cannot be enabled at the same time. We enable only YJIT for --enable=all.
+#if defined(MJIT_FORCE_ENABLE) || !YJIT_SUPPORTED_P
+ mask &= ~(FEATURE_BIT(yjit));
+#else
+ mask &= ~(FEATURE_BIT(mjit));
+#endif
+ goto found;
+ }
+#if AMBIGUOUS_FEATURE_NAMES
+ if (matched == 1) goto found;
+ if (matched > 1) {
+ VALUE mesg = rb_sprintf("ambiguous feature: `%.*s' (", len, str);
+#define ADD_FEATURE_NAME(bit) \
+ if (FEATURE_BIT(bit) & set) { \
+ rb_str_cat_cstr(mesg, #bit); \
+ if (--matched) rb_str_cat_cstr(mesg, ", "); \
+ }
+ EACH_FEATURES(ADD_FEATURE_NAME, ;);
+ rb_str_cat_cstr(mesg, ")");
+ rb_exc_raise(rb_exc_new_str(rb_eRuntimeError, mesg));
+#undef ADD_FEATURE_NAME
}
+#else
+ (void)set;
+#endif
rb_warn("unknown argument for --%s: `%.*s'",
enable ? "enable" : "disable", len, str);
+ rb_warn("features are [%.*s].", (int)strlen(list), list);
+ return;
+
+ found:
+ FEATURE_SET_TO(*argp, mask, (mask & enable));
+ return;
}
static void
@@ -780,29 +1025,35 @@ disable_option(const char *str, int len, void *arg)
feature_option(str, len, arg, 0U);
}
+RUBY_EXTERN const int ruby_patchlevel;
+int ruby_env_debug_option(const char *str, int len, void *arg);
+
static void
debug_option(const char *str, int len, void *arg)
{
-#define SET_WHEN_DEBUG(t, bit) SET_WHEN(#bit, t##_BIT(bit), str, len)
- SET_WHEN_DEBUG(DEBUG, frozen_string_literal);
+ static const char list[] = EACH_DEBUG_FEATURES(LITERAL_NAME_ELEMENT, ", ");
+ ruby_features_t *argp = arg;
+#define SET_WHEN_DEBUG(bit) \
+ if (NAME_MATCH_P(#bit, str, len)) { \
+ FEATURE_SET(*argp, DEBUG_BIT(bit)); \
+ return; \
+ }
+ EACH_DEBUG_FEATURES(SET_WHEN_DEBUG, ;);
+#ifdef RUBY_DEVEL
+ if (ruby_patchlevel < 0 && ruby_env_debug_option(str, len, 0)) return;
+#endif
rb_warn("unknown argument for --debug: `%.*s'", len, str);
+ rb_warn("debug features are [%.*s].", (int)strlen(list), list);
}
static void
dump_option(const char *str, int len, void *arg)
{
+ static const char list[] = EACH_DUMPS(LITERAL_NAME_ELEMENT, ", ");
#define SET_WHEN_DUMP(bit) SET_WHEN(#bit, DUMP_BIT(bit), str, len)
- SET_WHEN_DUMP(version);
- SET_WHEN_DUMP(copyright);
- SET_WHEN_DUMP(usage);
- SET_WHEN_DUMP(help);
- SET_WHEN_DUMP(yydebug);
- SET_WHEN_DUMP(syntax);
- SET_WHEN_DUMP(parsetree);
- SET_WHEN_DUMP(parsetree_with_comment);
- SET_WHEN_DUMP(insns);
+ EACH_DUMPS(SET_WHEN_DUMP, ;);
rb_warn("don't know how to dump `%.*s',", len, str);
- rb_warn("but only [version, copyright, usage, yydebug, syntax, parsetree, parsetree_with_comment, insns].");
+ rb_warn("but only [%.*s].", (int)strlen(list), list);
}
static void
@@ -828,13 +1079,105 @@ set_option_encoding_once(const char *type, VALUE *name, const char *e, long elen
#define set_source_encoding_once(opt, e, elen) \
set_option_encoding_once("source", &(opt)->src.enc.name, (e), (elen))
+#define opt_match(s, l, name) \
+ ((((l) > rb_strlen_lit(name)) ? (s)[rb_strlen_lit(name)] == '=' : \
+ (l) == rb_strlen_lit(name)) && \
+ memcmp((s), name, rb_strlen_lit(name)) == 0 && \
+ (((s) += rb_strlen_lit(name)), 1))
+#define opt_match_noarg(s, l, name) \
+ opt_match(s, l, name) && (*(s) ? (rb_warn("argument to --jit-" name " is ignored"), 1) : 1)
+#define opt_match_arg(s, l, name) \
+ opt_match(s, l, name) && (*(s) ? 1 : (rb_raise(rb_eRuntimeError, "--jit-" name " needs an argument"), 0))
+
+#define yjit_opt_match_noarg(s, l, name) \
+ opt_match(s, l, name) && (*(s) ? (rb_warn("argument to --yjit-" name " is ignored"), 1) : 1)
+#define yjit_opt_match_arg(s, l, name) \
+ opt_match(s, l, name) && (*(s) && *(s+1) ? 1 : (rb_raise(rb_eRuntimeError, "--yjit-" name " needs an argument"), 0))
+
+static bool
+setup_yjit_options(const char *s, struct rb_yjit_options *yjit_opt)
+{
+ const char prefix[] = "yjit-";
+ if (strncmp(prefix, s, sizeof(prefix)-1) != 0) {
+ return false;
+ }
+ s += sizeof(prefix)-1;
+ const size_t l = strlen(s);
+ if (l == 0) {
+ return false;
+ }
+
+ if (yjit_opt_match_arg(s, l, "exec-mem-size")) {
+ yjit_opt->exec_mem_size = atoi(s + 1);
+ }
+ else if (yjit_opt_match_arg(s, l, "call-threshold")) {
+ yjit_opt->call_threshold = atoi(s + 1);
+ }
+ else if (yjit_opt_match_arg(s, l, "max-versions")) {
+ yjit_opt->max_versions = atoi(s + 1);
+ }
+ else if (yjit_opt_match_noarg(s, l, "greedy-versioning")) {
+ yjit_opt->greedy_versioning = true;
+ }
+ else if (yjit_opt_match_noarg(s, l, "no-type-prop")) {
+ yjit_opt->no_type_prop = true;
+ }
+ else if (yjit_opt_match_noarg(s, l, "stats")) {
+ yjit_opt->gen_stats = true;
+ }
+ else {
+ rb_raise(rb_eRuntimeError,
+ "invalid yjit option `%s' (--help will show valid yjit options)", s);
+ }
+ return true;
+}
+
+#if USE_MJIT
+static void
+setup_mjit_options(const char *s, struct mjit_options *mjit_opt)
+{
+ if (*s != '-') return;
+ const size_t l = strlen(++s);
+ if (*s == 0) return;
+ else if (opt_match_noarg(s, l, "warnings")) {
+ mjit_opt->warnings = 1;
+ }
+ else if (opt_match(s, l, "debug")) {
+ if (*s)
+ mjit_opt->debug_flags = strdup(s + 1);
+ else
+ mjit_opt->debug = 1;
+ }
+ else if (opt_match_noarg(s, l, "wait")) {
+ mjit_opt->wait = 1;
+ }
+ else if (opt_match_noarg(s, l, "save-temps")) {
+ mjit_opt->save_temps = 1;
+ }
+ else if (opt_match(s, l, "verbose")) {
+ mjit_opt->verbose = *s ? atoi(s + 1) : 1;
+ }
+ else if (opt_match_arg(s, l, "max-cache")) {
+ mjit_opt->max_cache_size = atoi(s + 1);
+ }
+ else if (opt_match_arg(s, l, "min-calls")) {
+ mjit_opt->min_calls = atoi(s + 1);
+ }
+ else {
+ rb_raise(rb_eRuntimeError,
+ "invalid MJIT option `%s' (--help will show valid MJIT options)", s);
+ }
+}
+#endif
+
static long
-proc_options(long argc, char **argv, struct cmdline_options *opt, int envopt)
+proc_options(long argc, char **argv, ruby_cmdline_options_t *opt, int envopt)
{
long n, argc0 = argc;
const char *s;
+ int warning = opt->warning;
- if (argc == 0)
+ if (argc <= 0 || !argv)
return 0;
for (argc--, argv++; argc > 0; argc--, argv++) {
@@ -881,11 +1224,33 @@ proc_options(long argc, char **argv, struct cmdline_options *opt, int envopt)
opt->dump |= DUMP_BIT(version_v);
opt->verbose = 1;
case 'w':
- ruby_verbose = Qtrue;
+ if (!opt->warning) {
+ warning = 1;
+ ruby_verbose = Qtrue;
+ }
+ FEATURE_SET(opt->warn, RB_WARN_CATEGORY_ALL_BITS);
s++;
goto reswitch;
case 'W':
+ if (s[1] == ':') {
+ unsigned int bits = 0;
+ static const char no_prefix[] = "no-";
+ int enable = strncmp(s += 2, no_prefix, sizeof(no_prefix)-1) != 0;
+ if (!enable) s += sizeof(no_prefix)-1;
+ size_t len = strlen(s);
+ if (NAME_MATCH_P("deprecated", s, len)) {
+ bits = 1U << RB_WARN_CATEGORY_DEPRECATED;
+ }
+ else if (NAME_MATCH_P("experimental", s, len)) {
+ bits = 1U << RB_WARN_CATEGORY_EXPERIMENTAL;
+ }
+ else {
+ rb_warn("unknown warning category: `%s'", s);
+ }
+ if (bits) FEATURE_SET_TO(opt->warn, bits, enable ? bits : 0);
+ break;
+ }
{
size_t numlen;
int v = 2; /* -W as -W2 */
@@ -893,18 +1258,32 @@ proc_options(long argc, char **argv, struct cmdline_options *opt, int envopt)
if (*++s) {
v = scan_oct(s, 1, &numlen);
if (numlen == 0)
- v = 1;
+ v = 2;
s += numlen;
}
+ if (!opt->warning) {
+ switch (v) {
+ case 0:
+ ruby_verbose = Qnil;
+ break;
+ case 1:
+ ruby_verbose = Qfalse;
+ break;
+ default:
+ ruby_verbose = Qtrue;
+ break;
+ }
+ }
+ warning = 1;
switch (v) {
case 0:
- ruby_verbose = Qnil;
+ FEATURE_SET_TO(opt->warn, RB_WARN_CATEGORY_ALL_BITS, 0);
break;
case 1:
- ruby_verbose = Qfalse;
+ FEATURE_SET_TO(opt->warn, 1U << RB_WARN_CATEGORY_DEPRECATED, 0);
break;
default:
- ruby_verbose = Qtrue;
+ FEATURE_SET(opt->warn, RB_WARN_CATEGORY_ALL_BITS);
break;
}
}
@@ -978,6 +1357,7 @@ proc_options(long argc, char **argv, struct cmdline_options *opt, int envopt)
case 'x':
if (envopt) goto noenvopt;
+ forbid_setid("-x");
opt->xflag = TRUE;
s++;
if (*s && chdir(s) < 0) {
@@ -1040,21 +1420,6 @@ proc_options(long argc, char **argv, struct cmdline_options *opt, int envopt)
}
goto reswitch;
- case 'T':
- {
- size_t numlen;
- int v = 1;
-
- if (*++s) {
- v = scan_oct(s, 2, &numlen);
- if (numlen == 0)
- v = 1;
- s += numlen;
- }
- if (v > opt->safe_level) opt->safe_level = v;
- }
- goto reswitch;
-
case 'I':
forbid_setid("-I");
if (*++s)
@@ -1077,7 +1442,7 @@ proc_options(long argc, char **argv, struct cmdline_options *opt, int envopt)
if (v > 0377)
rb_rs = Qnil;
else if (v == 0 && numlen >= 2) {
- rb_rs = rb_str_new2("\n\n");
+ rb_rs = rb_str_new2("");
}
else {
c = v & 0xff;
@@ -1172,6 +1537,30 @@ proc_options(long argc, char **argv, struct cmdline_options *opt, int envopt)
opt->verbose = 1;
ruby_verbose = Qtrue;
}
+ else if (strcmp("jit", s) == 0) {
+#if !USE_MJIT
+ rb_warn("Ruby was built without JIT support");
+#elif defined(MJIT_FORCE_ENABLE) || !YJIT_SUPPORTED_P
+ FEATURE_SET(opt->features, FEATURE_BIT(mjit));
+#else
+ FEATURE_SET(opt->features, FEATURE_BIT(yjit));
+#endif
+ }
+ else if (strncmp("mjit", s, 4) == 0) {
+#if USE_MJIT
+ FEATURE_SET(opt->features, FEATURE_BIT(mjit));
+ setup_mjit_options(s + 4, &opt->mjit);
+#else
+ rb_warn("MJIT support is disabled.");
+#endif
+ }
+ else if (strcmp("yjit", s) == 0 || setup_yjit_options(s, &opt->yjit)) {
+#if USE_MJIT
+ FEATURE_SET(opt->features, FEATURE_BIT(yjit));
+#else
+ rb_warn("Ruby was built without JIT support");
+#endif
+ }
else if (strcmp("yydebug", s) == 0) {
if (envopt) goto noenvopt_long;
opt->dump |= DUMP_BIT(yydebug);
@@ -1184,6 +1573,12 @@ proc_options(long argc, char **argv, struct cmdline_options *opt, int envopt)
opt->dump |= DUMP_BIT(help);
goto switch_end;
}
+ else if (is_option_with_arg("backtrace-limit", Qfalse, Qfalse)) {
+ char *e;
+ long n = strtol(s, &e, 10);
+ if (errno == ERANGE || n < 0 || *e) rb_raise(rb_eRuntimeError, "wrong limit for backtrace length");
+ rb_backtrace_length_limit = n;
+ }
else {
rb_raise(rb_eRuntimeError,
"invalid option --%s (-h will show valid options)", s);
@@ -1196,16 +1591,9 @@ proc_options(long argc, char **argv, struct cmdline_options *opt, int envopt)
default:
{
- if (ISPRINT(*s)) {
- rb_raise(rb_eRuntimeError,
+ rb_raise(rb_eRuntimeError,
"invalid option -%c (-h will show valid options)",
(int)(unsigned char)*s);
- }
- else {
- rb_raise(rb_eRuntimeError,
- "invalid option -\\x%02X (-h will show valid options)",
- (int)(unsigned char)*s);
- }
}
goto switch_end;
@@ -1229,16 +1617,46 @@ proc_options(long argc, char **argv, struct cmdline_options *opt, int envopt)
}
switch_end:
+ if (warning) opt->warning = warning;
return argc0 - argc;
}
+void Init_builtin_features(void);
+
static void
ruby_init_prelude(void)
{
- Init_prelude();
+ Init_builtin_features();
rb_const_remove(rb_cObject, rb_intern_const("TMP_RUBY_PREFIX"));
}
+void rb_call_builtin_inits(void);
+
+static void
+ruby_opt_init(ruby_cmdline_options_t *opt)
+{
+ if (opt->dump & dump_exit_bits) return;
+
+ if (opt->features.set & FEATURE_BIT(gems)) {
+ rb_define_module("Gem");
+ if (opt->features.set & FEATURE_BIT(error_highlight)) {
+ rb_define_module("ErrorHighlight");
+ }
+ if (opt->features.set & FEATURE_BIT(did_you_mean)) {
+ rb_define_module("DidYouMean");
+ }
+ }
+
+ rb_warning_category_update(opt->warn.mask, opt->warn.set);
+
+ Init_ext(); /* load statically linked extensions before rubygems */
+ rb_call_builtin_inits();
+ ruby_init_prelude();
+
+ ruby_set_script_name(opt->script_name);
+ require_libraries(&opt->req_list);
+}
+
static int
opt_enc_index(VALUE enc_name)
{
@@ -1257,15 +1675,16 @@ opt_enc_index(VALUE enc_name)
#define rb_progname (GET_VM()->progname)
#define rb_orig_progname (GET_VM()->orig_progname)
VALUE rb_argv0;
+VALUE rb_e_script;
static VALUE
-false_value(void)
+false_value(ID _x, VALUE *_y)
{
return Qfalse;
}
static VALUE
-true_value(void)
+true_value(ID _x, VALUE *_y)
{
return Qtrue;
}
@@ -1297,7 +1716,7 @@ uscore_get(void)
*/
static VALUE
-rb_f_sub(int argc, VALUE *argv)
+rb_f_sub(int argc, VALUE *argv, VALUE _)
{
VALUE str = rb_funcall_passing_block(uscore_get(), rb_intern("sub"), argc, argv);
rb_lastline_set(str);
@@ -1316,7 +1735,7 @@ rb_f_sub(int argc, VALUE *argv)
*/
static VALUE
-rb_f_gsub(int argc, VALUE *argv)
+rb_f_gsub(int argc, VALUE *argv, VALUE _)
{
VALUE str = rb_funcall_passing_block(uscore_get(), rb_intern("gsub"), argc, argv);
rb_lastline_set(str);
@@ -1328,13 +1747,13 @@ rb_f_gsub(int argc, VALUE *argv)
* chop -> $_
*
* Equivalent to <code>($_.dup).chop!</code>, except <code>nil</code>
- * is never returned. See <code>String#chop!</code>.
+ * is never returned. See String#chop!.
* Available only when -p/-n command line option specified.
*
*/
static VALUE
-rb_f_chop(void)
+rb_f_chop(VALUE _)
{
VALUE str = rb_funcall_passing_block(uscore_get(), rb_intern("chop"), 0, 0);
rb_lastline_set(str);
@@ -1348,48 +1767,141 @@ rb_f_chop(void)
* chomp(string) -> $_
*
* Equivalent to <code>$_ = $_.chomp(<em>string</em>)</code>. See
- * <code>String#chomp</code>.
+ * String#chomp.
* Available only when -p/-n command line option specified.
*
*/
static VALUE
-rb_f_chomp(int argc, VALUE *argv)
+rb_f_chomp(int argc, VALUE *argv, VALUE _)
{
VALUE str = rb_funcall_passing_block(uscore_get(), rb_intern("chomp"), argc, argv);
rb_lastline_set(str);
return str;
}
+static void
+setup_pager_env(void)
+{
+ if (!getenv("LESS")) ruby_setenv("LESS", "-R"); // Output "raw" control characters.
+}
+
+#ifdef _WIN32
+static int
+tty_enabled(void)
+{
+ HANDLE h = GetStdHandle(STD_OUTPUT_HANDLE);
+ DWORD m;
+ if (!GetConsoleMode(h, &m)) return 0;
+# ifndef ENABLE_VIRTUAL_TERMINAL_PROCESSING
+# define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x4
+# endif
+ if (!(m & ENABLE_VIRTUAL_TERMINAL_PROCESSING)) return 0;
+ return 1;
+}
+#elif !defined(HAVE_WORKING_FORK)
+# define tty_enabled() 0
+#endif
+
+static VALUE
+copy_str(VALUE str, rb_encoding *enc, bool intern)
+{
+ if (!intern) {
+ if (rb_enc_str_coderange_scan(str, enc) == ENC_CODERANGE_BROKEN)
+ return 0;
+ return rb_enc_associate(rb_str_dup(str), enc);
+ }
+ return rb_enc_interned_str(RSTRING_PTR(str), RSTRING_LEN(str), enc);
+}
+
static VALUE
-process_options(int argc, char **argv, struct cmdline_options *opt)
+process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
{
- NODE *tree = 0;
+ rb_ast_t *ast = 0;
VALUE parser;
+ VALUE script_name;
const rb_iseq_t *iseq;
rb_encoding *enc, *lenc;
#if UTF8_PATH
- rb_encoding *uenc, *ienc = 0;
+ rb_encoding *ienc = 0;
+ rb_encoding *const uenc = rb_utf8_encoding();
#endif
const char *s;
char fbuf[MAXPATHLEN];
int i = (int)proc_options(argc, argv, opt, 0);
- rb_thread_t *th = GET_THREAD();
- VALUE toplevel_binding = Qundef;
-
- argc -= i;
- argv += i;
+ unsigned int dump = opt->dump & dump_exit_bits;
+ rb_vm_t *vm = GET_VM();
+ const long loaded_before_enc = RARRAY_LEN(vm->loaded_features);
if (opt->dump & (DUMP_BIT(usage)|DUMP_BIT(help))) {
- usage(origarg.argv[0], (opt->dump & DUMP_BIT(help)));
+ int tty = isatty(1);
+ const char *const progname =
+ (argc > 0 && argv && argv[0] ? argv[0] :
+ origarg.argc > 0 && origarg.argv && origarg.argv[0] ? origarg.argv[0] :
+ ruby_engine);
+ int columns = 0;
+ if ((opt->dump & DUMP_BIT(help)) && tty) {
+ const char *pager_env = getenv("RUBY_PAGER");
+ if (!pager_env) pager_env = getenv("PAGER");
+ if (pager_env && *pager_env && isatty(0)) {
+ const char *columns_env = getenv("COLUMNS");
+ if (columns_env) columns = atoi(columns_env);
+ VALUE pager = rb_str_new_cstr(pager_env);
+#ifdef HAVE_WORKING_FORK
+ int fds[2];
+ if (rb_pipe(fds) == 0) {
+ rb_pid_t pid = rb_fork();
+ if (pid > 0) {
+ /* exec PAGER with reading from child */
+ dup2(fds[0], 0);
+ }
+ else if (pid == 0) {
+ /* send the help message to the parent PAGER */
+ dup2(fds[1], 1);
+ dup2(fds[1], 2);
+ }
+ close(fds[0]);
+ close(fds[1]);
+ if (pid > 0) {
+ setup_pager_env();
+ rb_f_exec(1, &pager);
+ kill(SIGTERM, pid);
+ rb_waitpid(pid, 0, 0);
+ }
+ }
+#else
+ setup_pager_env();
+ VALUE port = rb_io_popen(pager, rb_str_new_lit("w"), Qnil, Qnil);
+ if (!NIL_P(port)) {
+ int oldout = dup(1);
+ int olderr = dup(2);
+ int fd = RFILE(port)->fptr->fd;
+ tty = tty_enabled();
+ dup2(fd, 1);
+ dup2(fd, 2);
+ usage(progname, 1, tty, columns);
+ fflush(stdout);
+ dup2(oldout, 1);
+ dup2(olderr, 2);
+ rb_io_close(port);
+ return Qtrue;
+ }
+#endif
+ }
+ }
+ usage(progname, (opt->dump & DUMP_BIT(help)), tty, columns);
return Qtrue;
}
- if ((opt->features & FEATURE_BIT(rubyopt)) &&
- opt->safe_level == 0 && (s = getenv("RUBYOPT"))) {
+ argc -= i;
+ argv += i;
+
+ if ((opt->features.set & FEATURE_BIT(rubyopt)) && (s = getenv("RUBYOPT"))) {
VALUE src_enc_name = opt->src.enc.name;
VALUE ext_enc_name = opt->ext.enc.name;
VALUE int_enc_name = opt->intern.enc.name;
+ ruby_features_t feat = opt->features;
+ ruby_features_t warn = opt->warn;
opt->src.enc.name = opt->ext.enc.name = opt->intern.enc.name = 0;
moreswitches(s, opt, 1);
@@ -1399,21 +1911,44 @@ process_options(int argc, char **argv, struct cmdline_options *opt)
opt->ext.enc.name = ext_enc_name;
if (int_enc_name)
opt->intern.enc.name = int_enc_name;
+ FEATURE_SET_RESTORE(opt->features, feat);
+ FEATURE_SET_RESTORE(opt->warn, warn);
}
if (opt->src.enc.name)
- rb_warning("-K is specified; it is for 1.8 compatibility and may cause odd behavior");
+ /* cannot set deprecated category, as enabling deprecation warnings based on flags
+ * has not happened yet.
+ */
+ rb_warning("-K is specified; it is for 1.8 compatibility and may cause odd behavior");
+#if USE_MJIT
+ if (opt->features.set & FEATURE_BIT(mjit)) {
+ opt->mjit.on = TRUE; /* set mjit.on for ruby_show_version() API and check to call mjit_init() */
+ }
+#endif
+ if (opt->features.set & FEATURE_BIT(yjit)) {
+#if USE_MJIT
+ if (opt->mjit.on) {
+ rb_warn("MJIT and YJIT cannot both be enabled at the same time. Exiting");
+ exit(1);
+ }
+#endif
+ rb_yjit_init(&opt->yjit);
+ }
if (opt->dump & (DUMP_BIT(version) | DUMP_BIT(version_v))) {
+#if USE_MJIT
+ mjit_opts.on = opt->mjit.on; /* used by ruby_show_version(). mjit_init() still can't be called here. */
+#endif
ruby_show_version();
if (opt->dump & DUMP_BIT(version)) return Qtrue;
}
if (opt->dump & DUMP_BIT(copyright)) {
ruby_show_copyright();
+ return Qtrue;
}
if (!opt->e_script) {
- if (argc == 0) { /* no more args */
+ if (argc <= 0) { /* no more args */
if (opt->verbose)
return Qtrue;
opt->script = "-";
@@ -1424,7 +1959,7 @@ process_options(int argc, char **argv, struct cmdline_options *opt)
opt->script = "-";
}
else if (opt->do_search) {
- char *path = getenv("RUBYPATH");
+ const char *path = getenv("RUBYPATH");
opt->script = 0;
if (path) {
@@ -1439,19 +1974,30 @@ process_options(int argc, char **argv, struct cmdline_options *opt)
argc--;
argv++;
}
+ if (opt->script[0] == '-' && !opt->script[1]) {
+ forbid_setid("program input from stdin");
+ }
}
opt->script_name = rb_str_new_cstr(opt->script);
opt->script = RSTRING_PTR(opt->script_name);
-#if _WIN32
+#ifdef _WIN32
translit_char_bin(RSTRING_PTR(opt->script_name), '\\', '/');
#elif defined DOSISH
translit_char(RSTRING_PTR(opt->script_name), '\\', '/');
#endif
- ruby_gc_set_params(opt->safe_level);
- ruby_init_loadpath_safe(opt->safe_level);
+ ruby_gc_set_params();
+ ruby_init_loadpath();
+
+#if USE_MJIT
+ if (opt->mjit.on)
+ /* Using TMP_RUBY_PREFIX created by ruby_init_loadpath(). */
+ mjit_init(&opt->mjit);
+#endif
+
+ Init_ruby_description();
Init_enc();
lenc = rb_locale_encoding();
rb_enc_associate(rb_progname, lenc);
@@ -1474,7 +2020,7 @@ process_options(int argc, char **argv, struct cmdline_options *opt)
enc = rb_enc_from_index(opt->ext.enc.index);
}
else {
- enc = lenc;
+ enc = IF_UTF8_PATH(uenc, lenc);
}
rb_enc_set_default_external(rb_enc_from_encoding(enc));
if (opt->intern.enc.index >= 0) {
@@ -1485,58 +2031,71 @@ process_options(int argc, char **argv, struct cmdline_options *opt)
ienc = enc;
#endif
}
- rb_enc_associate(opt->script_name, lenc);
+ script_name = opt->script_name;
+ rb_enc_associate(opt->script_name, IF_UTF8_PATH(uenc, lenc));
+#if UTF8_PATH
+ if (uenc != lenc) {
+ opt->script_name = str_conv_enc(opt->script_name, uenc, lenc);
+ opt->script = RSTRING_PTR(opt->script_name);
+ }
+#endif
rb_obj_freeze(opt->script_name);
- {
+ if (IF_UTF8_PATH(uenc != lenc, 1)) {
long i;
- VALUE load_path = GET_VM()->load_path;
+ VALUE load_path = vm->load_path;
const ID id_initial_load_path_mark = INITIAL_LOAD_PATH_MARK;
+ int modifiable = FALSE;
+
+ rb_get_expanded_load_path();
for (i = 0; i < RARRAY_LEN(load_path); ++i) {
VALUE path = RARRAY_AREF(load_path, i);
int mark = rb_attr_get(path, id_initial_load_path_mark) == path;
- path = rb_enc_associate(rb_str_dup(path), lenc);
+#if UTF8_PATH
+ VALUE newpath = rb_str_conv_enc(path, uenc, lenc);
+ if (newpath == path) continue;
+ path = newpath;
+#else
+ if (!(path = copy_str(path, lenc, !mark))) continue;
+#endif
if (mark) rb_ivar_set(path, id_initial_load_path_mark, path);
+ if (!modifiable) {
+ rb_ary_modify(load_path);
+ modifiable = TRUE;
+ }
RARRAY_ASET(load_path, i, path);
}
+ if (modifiable) {
+ rb_ary_replace(vm->load_path_snapshot, load_path);
+ }
}
- Init_ext(); /* load statically linked extensions before rubygems */
- if (opt->features & FEATURE_BIT(gems)) {
- rb_define_module("Gem");
- }
- if (opt->features & FEATURE_BIT(did_you_mean)) {
- rb_define_module("DidYouMean");
+ {
+ VALUE loaded_features = vm->loaded_features;
+ bool modified = false;
+ for (long i = loaded_before_enc; i < RARRAY_LEN(loaded_features); ++i) {
+ VALUE path = RARRAY_AREF(loaded_features, i);
+ if (!(path = copy_str(path, IF_UTF8_PATH(uenc, lenc), true))) continue;
+ modified = true;
+ RARRAY_ASET(loaded_features, i, path);
+ }
+ if (modified) {
+ rb_ary_replace(vm->loaded_features_snapshot, loaded_features);
+ }
}
- ruby_init_prelude();
- if ((opt->features ^ DEFAULT_FEATURES) & COMPILATION_FEATURES) {
+
+ if (opt->features.mask & COMPILATION_FEATURES) {
VALUE option = rb_hash_new();
#define SET_COMPILE_OPTION(h, o, name) \
rb_hash_aset((h), ID2SYM(rb_intern_const(#name)), \
- ((o)->features & FEATURE_BIT(name) ? Qtrue : Qfalse));
+ RBOOL(FEATURE_SET_P(o->features, FEATURE_BIT(name))));
SET_COMPILE_OPTION(option, opt, frozen_string_literal);
SET_COMPILE_OPTION(option, opt, debug_frozen_string_literal);
rb_funcallv(rb_cISeq, rb_intern_const("compile_option="), 1, &option);
#undef SET_COMPILE_OPTION
}
-#if UTF8_PATH
- uenc = rb_utf8_encoding();
- if (uenc != lenc) {
- opt->script_name = str_conv_enc(opt->script_name, uenc, lenc);
- opt->script = RSTRING_PTR(opt->script_name);
- }
-#endif
ruby_set_argv(argc, argv);
process_sflag(&opt->sflag);
- toplevel_binding = rb_const_get(rb_cObject, rb_intern("TOPLEVEL_BINDING"));
-
-#define PREPARE_PARSE_MAIN(expr) do { \
- rb_env_t *env = toplevel_context(toplevel_binding); \
- th->parse_in_eval--; \
- th->base_block = &env->block; \
- expr; \
- th->parse_in_eval++; \
- th->base_block = 0; \
-} while (0)
+ rb_parser_set_context(parser, 0, TRUE);
if (opt->e_script) {
VALUE progname = rb_progname;
@@ -1556,33 +2115,28 @@ process_options(int argc, char **argv, struct cmdline_options *opt)
}
#endif
rb_enc_associate(opt->e_script, eenc);
- if (!(opt->dump & ~DUMP_BIT(version_v))) {
- ruby_set_script_name(opt->script_name);
- require_libraries(&opt->req_list);
- }
+ ruby_opt_init(opt);
ruby_set_script_name(progname);
-
- PREPARE_PARSE_MAIN({
- tree = rb_parser_compile_string(parser, opt->script, opt->e_script, 1);
- });
+ rb_parser_set_options(parser, opt->do_print, opt->do_loop,
+ opt->do_line, opt->do_split);
+ ast = rb_parser_compile_string(parser, opt->script, opt->e_script, 1);
}
else {
- if (opt->script[0] == '-' && !opt->script[1]) {
- forbid_setid("program input from stdin");
- }
-
- PREPARE_PARSE_MAIN({
- tree = load_file(parser, opt->script_name, 1, opt);
- });
+ VALUE f;
+ f = open_load_file(script_name, &opt->xflag);
+ ast = load_file(parser, opt->script_name, f, 1, opt);
}
ruby_set_script_name(opt->script_name);
- if (opt->dump & DUMP_BIT(yydebug)) return Qtrue;
+ if (dump & DUMP_BIT(yydebug)) {
+ dump &= ~DUMP_BIT(yydebug);
+ if (!dump) return Qtrue;
+ }
if (opt->ext.enc.index >= 0) {
enc = rb_enc_from_index(opt->ext.enc.index);
}
else {
- enc = lenc;
+ enc = IF_UTF8_PATH(uenc, lenc);
}
rb_enc_set_default_external(rb_enc_from_encoding(enc));
if (opt->intern.enc.index >= 0) {
@@ -1595,68 +2149,113 @@ process_options(int argc, char **argv, struct cmdline_options *opt)
rb_enc_set_default_internal(Qnil);
rb_stdio_set_default_encoding();
- if (!tree) return Qfalse;
+ if (!ast->body.root) {
+ rb_ast_dispose(ast);
+ return Qfalse;
+ }
process_sflag(&opt->sflag);
opt->xflag = 0;
- if (opt->dump & DUMP_BIT(syntax)) {
+ if (dump & DUMP_BIT(syntax)) {
printf("Syntax OK\n");
- return Qtrue;
+ dump &= ~DUMP_BIT(syntax);
+ if (!dump) return Qtrue;
}
- if (opt->do_print) {
- PREPARE_PARSE_MAIN({
- tree = rb_parser_append_print(parser, tree);
- });
- }
if (opt->do_loop) {
- PREPARE_PARSE_MAIN({
- tree = rb_parser_while_loop(parser, tree, opt->do_line, opt->do_split);
- });
rb_define_global_function("sub", rb_f_sub, -1);
rb_define_global_function("gsub", rb_f_gsub, -1);
rb_define_global_function("chop", rb_f_chop, 0);
rb_define_global_function("chomp", rb_f_chomp, -1);
}
- if (opt->dump & DUMP_BIT(parsetree) || opt->dump & DUMP_BIT(parsetree_with_comment)) {
- rb_io_write(rb_stdout, rb_parser_dump_tree(tree, opt->dump & DUMP_BIT(parsetree_with_comment)));
+ if (dump & (DUMP_BIT(parsetree)|DUMP_BIT(parsetree_with_comment))) {
+ rb_io_write(rb_stdout, rb_parser_dump_tree(ast->body.root, dump & DUMP_BIT(parsetree_with_comment)));
rb_io_flush(rb_stdout);
- return Qtrue;
+ dump &= ~DUMP_BIT(parsetree)&~DUMP_BIT(parsetree_with_comment);
+ if (!dump) {
+ rb_ast_dispose(ast);
+ return Qtrue;
+ }
}
- PREPARE_PARSE_MAIN({
+ {
VALUE path = Qnil;
if (!opt->e_script && strcmp(opt->script, "-")) {
- path = rb_realpath_internal(Qnil, opt->script_name, 1);
+ path = rb_realpath_internal(Qnil, script_name, 1);
+#if UTF8_PATH
+ if (uenc != lenc) {
+ path = str_conv_enc(path, uenc, lenc);
+ }
+#endif
+ if (!ENCODING_GET(path)) { /* ASCII-8BIT */
+ rb_enc_copy(path, opt->script_name);
+ }
}
- iseq = rb_iseq_new_main(tree, opt->script_name, path);
- });
- if (opt->dump & DUMP_BIT(insns)) {
+ rb_binding_t *toplevel_binding;
+ GetBindingPtr(rb_const_get(rb_cObject, rb_intern("TOPLEVEL_BINDING")),
+ toplevel_binding);
+ const struct rb_block *base_block = toplevel_context(toplevel_binding);
+ iseq = rb_iseq_new_main(&ast->body, opt->script_name, path, vm_block_iseq(base_block), !(dump & DUMP_BIT(insns_without_opt)));
+ rb_ast_dispose(ast);
+ }
+
+ if (dump & (DUMP_BIT(insns) | DUMP_BIT(insns_without_opt))) {
rb_io_write(rb_stdout, rb_iseq_disasm((const rb_iseq_t *)iseq));
rb_io_flush(rb_stdout);
- return Qtrue;
+ dump &= ~DUMP_BIT(insns);
+ if (!dump) return Qtrue;
}
+ if (opt->dump & dump_exit_bits) return Qtrue;
rb_define_readonly_boolean("$-p", opt->do_print);
rb_define_readonly_boolean("$-l", opt->do_line);
rb_define_readonly_boolean("$-a", opt->do_split);
- rb_set_safe_level(opt->safe_level);
+ rb_gvar_ractor_local("$-p");
+ rb_gvar_ractor_local("$-l");
+ rb_gvar_ractor_local("$-a");
+
+ if ((rb_e_script = opt->e_script) != 0) {
+ rb_str_freeze(rb_e_script);
+ rb_gc_register_mark_object(opt->e_script);
+ }
+
+ {
+ rb_execution_context_t *ec = GET_EC();
+ if (opt->e_script) {
+ /* -e */
+ rb_exec_event_hook_script_compiled(ec, iseq, opt->e_script);
+ }
+ else {
+ /* file */
+ rb_exec_event_hook_script_compiled(ec, iseq, Qnil);
+ }
+ }
return (VALUE)iseq;
}
+#ifndef DOSISH
+static void
+warn_cr_in_shebang(const char *str, long len)
+{
+ if (str[len-1] == '\n' && str[len-2] == '\r') {
+ rb_warn("shebang line ending with \\r may cause problems");
+ }
+}
+#else
+#define warn_cr_in_shebang(str, len) (void)0
+#endif
+
struct load_file_arg {
VALUE parser;
VALUE fname;
int script;
- int xflag;
- struct cmdline_options *opt;
+ ruby_cmdline_options_t *opt;
VALUE f;
- VALUE lineno;
};
static VALUE
@@ -1666,20 +2265,19 @@ load_file_internal(VALUE argp_v)
VALUE parser = argp->parser;
VALUE orig_fname = argp->fname;
int script = argp->script;
- struct cmdline_options *opt = argp->opt;
+ ruby_cmdline_options_t *opt = argp->opt;
VALUE f = argp->f;
int line_start = 1;
- NODE *tree = 0;
+ rb_ast_t *ast = 0;
rb_encoding *enc;
ID set_encoding;
- int xflag = argp->xflag;
- argp->script = 0;
CONST_ID(set_encoding, "set_encoding");
if (script) {
VALUE c = 1; /* something not nil */
VALUE line;
- char *p;
+ char *p, *str;
+ long len;
int no_src_enc = !opt->src.enc.name;
int no_ext_enc = !opt->ext.enc.name;
int no_int_enc = !opt->intern.enc.name;
@@ -1687,17 +2285,15 @@ load_file_internal(VALUE argp_v)
enc = rb_ascii8bit_encoding();
rb_funcall(f, set_encoding, 1, rb_enc_from_encoding(enc));
- if (xflag || opt->xflag) {
+ if (opt->xflag) {
line_start--;
search_shebang:
- forbid_setid("-x");
- opt->xflag = FALSE;
while (!NIL_P(line = rb_io_gets(f))) {
line_start++;
- if (RSTRING_LEN(line) > 2
- && RSTRING_PTR(line)[0] == '#'
- && RSTRING_PTR(line)[1] == '!') {
- if ((p = strstr(RSTRING_PTR(line), ruby_engine)) != 0) {
+ RSTRING_GETMEM(line, str, len);
+ if (len > 2 && str[0] == '#' && str[1] == '!') {
+ if (line_start == 1) warn_cr_in_shebang(str, len);
+ if ((p = strstr(str+2, ruby_engine)) != 0) {
goto start_read;
}
}
@@ -1708,22 +2304,21 @@ load_file_internal(VALUE argp_v)
c = rb_io_getbyte(f);
if (c == INT2FIX('#')) {
c = rb_io_getbyte(f);
- if (c == INT2FIX('!')) {
- line = rb_io_gets(f);
- if (NIL_P(line))
- return 0;
-
- if ((p = strstr(RSTRING_PTR(line), ruby_engine)) == 0) {
+ if (c == INT2FIX('!') && !NIL_P(line = rb_io_gets(f))) {
+ RSTRING_GETMEM(line, str, len);
+ warn_cr_in_shebang(str, len);
+ if ((p = strstr(str, ruby_engine)) == 0) {
/* not ruby script, assume -x flag */
goto search_shebang;
}
start_read:
- p += 4;
- RSTRING_PTR(line)[RSTRING_LEN(line) - 1] = '\0';
- if (RSTRING_PTR(line)[RSTRING_LEN(line) - 2] == '\r')
- RSTRING_PTR(line)[RSTRING_LEN(line) - 2] = '\0';
+ str += len - 1;
+ if (*str == '\n') *str-- = '\0';
+ if (*str == '\r') *str-- = '\0';
+ /* ruby_engine should not contain a space */
if ((p = strstr(p, " -")) != 0) {
+ opt->warning = 0;
moreswitches(p + 1, opt, 0);
}
@@ -1748,14 +2343,10 @@ load_file_internal(VALUE argp_v)
else if (!NIL_P(c)) {
rb_io_ungetbyte(f, c);
}
- else {
- if (f != rb_stdin) rb_io_close(f);
- f = Qnil;
- }
- if (!(opt->dump & ~DUMP_BIT(version_v))) {
- ruby_set_script_name(opt->script_name);
- require_libraries(&opt->req_list); /* Why here? unnatural */
+ if (NIL_P(c)) {
+ argp->f = f = Qnil;
}
+ ruby_opt_init(opt);
}
if (opt->src.enc.index >= 0) {
enc = rb_enc_from_index(opt->src.enc.index);
@@ -1766,26 +2357,65 @@ load_file_internal(VALUE argp_v)
else {
enc = rb_utf8_encoding();
}
+ rb_parser_set_options(parser, opt->do_print, opt->do_loop,
+ opt->do_line, opt->do_split);
if (NIL_P(f)) {
f = rb_str_new(0, 0);
rb_enc_associate(f, enc);
return (VALUE)rb_parser_compile_string_path(parser, orig_fname, f, line_start);
}
rb_funcall(f, set_encoding, 2, rb_enc_from_encoding(enc), rb_str_new_cstr("-"));
- tree = rb_parser_compile_file_path(parser, orig_fname, f, line_start);
+ ast = rb_parser_compile_file_path(parser, orig_fname, f, line_start);
rb_funcall(f, set_encoding, 1, rb_parser_encoding(parser));
- if (script && rb_parser_end_seen_p(parser)) argp->script = script;
- return (VALUE)tree;
+ if (script && rb_parser_end_seen_p(parser)) {
+ /*
+ * DATA is a File that contains the data section of the executed file.
+ * To create a data section use <tt>__END__</tt>:
+ *
+ * $ cat t.rb
+ * puts DATA.gets
+ * __END__
+ * hello world!
+ *
+ * $ ruby t.rb
+ * hello world!
+ */
+ rb_define_global_const("DATA", f);
+ argp->f = Qnil;
+ }
+ return (VALUE)ast;
+}
+
+/* disabling O_NONBLOCK, and returns 0 on success, otherwise errno */
+static inline int
+disable_nonblock(int fd)
+{
+#if defined(HAVE_FCNTL) && defined(F_SETFL)
+ if (fcntl(fd, F_SETFL, 0) < 0) {
+ const int e = errno;
+ ASSUME(e != 0);
+# if defined ENOTSUP
+ if (e == ENOTSUP) return 0;
+# endif
+# if defined B_UNSUPPORTED
+ if (e == B_UNSUPPORTED) return 0;
+# endif
+ return e;
+ }
+#endif
+ return 0;
}
static VALUE
open_load_file(VALUE fname_v, int *xflag)
{
- const char *fname = StringValueCStr(fname_v);
+ const char *fname = (fname_v = rb_str_encode_ospath(fname_v),
+ StringValueCStr(fname_v));
+ long flen = RSTRING_LEN(fname_v);
VALUE f;
int e;
- if (RSTRING_LEN(fname_v) == 1 && fname[0] == '-') {
+ if (flen == 1 && fname[0] == '-') {
f = rb_stdin;
}
else {
@@ -1802,9 +2432,12 @@ open_load_file(VALUE fname_v, int *xflag)
#endif
int mode = MODE_TO_LOAD;
#if defined DOSISH || defined __CYGWIN__
+# define isdirsep(x) ((x) == '/' || (x) == '\\')
{
- const char *ext = strrchr(fname, '.');
- if (ext && STRCASECMP(ext, ".exe") == 0) {
+ static const char exeext[] = ".exe";
+ enum {extlen = sizeof(exeext)-1};
+ if (flen > extlen && !isdirsep(fname[flen-extlen-1]) &&
+ STRNCASECMP(fname+flen-extlen, exeext, extlen) == 0) {
mode |= O_BINARY;
*xflag = 1;
}
@@ -1812,43 +2445,36 @@ open_load_file(VALUE fname_v, int *xflag)
#endif
if ((fd = rb_cloexec_open(fname, mode, 0)) < 0) {
- rb_load_fail(fname_v, strerror(errno));
+ e = errno;
+ if (!rb_gc_for_fd(e)) {
+ rb_load_fail(fname_v, strerror(e));
+ }
+ if ((fd = rb_cloexec_open(fname, mode, 0)) < 0) {
+ rb_load_fail(fname_v, strerror(errno));
+ }
}
rb_update_max_fd(fd);
-#if defined HAVE_FCNTL && MODE_TO_LOAD != O_RDONLY
- /* disabling O_NONBLOCK */
- if (fcntl(fd, F_SETFL, 0) < 0) {
- e = errno;
+ if (MODE_TO_LOAD != O_RDONLY && (e = disable_nonblock(fd)) != 0) {
(void)close(fd);
rb_load_fail(fname_v, strerror(e));
}
-#endif
-#ifdef S_ISFIFO
- {
- struct stat st;
- if (fstat(fd, &st) != 0) {
- e = errno;
- (void)close(fd);
- rb_load_fail(fname_v, strerror(e));
- }
- if (S_ISFIFO(st.st_mode)) {
- /*
- We need to wait if FIFO is empty. It's FIFO's semantics.
- rb_thread_wait_fd() release GVL. So, it's safe.
- */
- rb_thread_wait_fd(fd);
- }
- }
-#endif
- if (!ruby_is_fd_loadable(fd)) {
+ e = ruby_is_fd_loadable(fd);
+ if (!e) {
e = errno;
(void)close(fd);
rb_load_fail(fname_v, strerror(e));
}
f = rb_io_fdopen(fd, mode, fname);
+ if (e < 0) {
+ /*
+ We need to wait if FIFO is empty. It's FIFO's semantics.
+ rb_thread_wait_fd() release GVL. So, it's safe.
+ */
+ rb_io_wait(f, RB_INT2NUM(RUBY_IO_READABLE), Qnil);
+ }
}
return f;
}
@@ -1858,42 +2484,24 @@ restore_load_file(VALUE arg)
{
struct load_file_arg *argp = (struct load_file_arg *)arg;
VALUE f = argp->f;
- VALUE lineno = argp->lineno;
- if (argp->script) {
- /*
- * DATA is a File that contains the data section of the executed file.
- * To create a data section use <tt>__END__</tt>:
- *
- * $ cat t.rb
- * puts DATA.gets
- * __END__
- * hello world!
- *
- * $ ruby t.rb
- * hello world!
- */
- rb_define_global_const("DATA", f);
- }
- else if (f != rb_stdin) {
+ if (!NIL_P(f) && f != rb_stdin) {
rb_io_close(f);
}
- return rb_gv_set("$.", lineno);
+ return Qnil;
}
-static NODE *
-load_file(VALUE parser, VALUE fname, int script, struct cmdline_options *opt)
+static rb_ast_t *
+load_file(VALUE parser, VALUE fname, VALUE f, int script, ruby_cmdline_options_t *opt)
{
struct load_file_arg arg;
arg.parser = parser;
arg.fname = fname;
arg.script = script;
arg.opt = opt;
- arg.xflag = 0;
- arg.lineno = rb_gv_get("$.");
- arg.f = open_load_file(rb_str_encode_ospath(fname), &arg.xflag);
- return (NODE *)rb_ensure(load_file_internal, (VALUE)&arg,
- restore_load_file, (VALUE)&arg);
+ arg.f = f;
+ return (rb_ast_t *)rb_ensure(load_file_internal, (VALUE)&arg,
+ restore_load_file, (VALUE)&arg);
}
void *
@@ -1906,9 +2514,15 @@ rb_load_file(const char *fname)
void *
rb_load_file_str(VALUE fname_v)
{
- struct cmdline_options opt;
+ return rb_parser_load_file(rb_parser_new(), fname_v);
+}
- return load_file(rb_parser_new(), fname_v, 0, cmdline_options_init(&opt));
+void *
+rb_parser_load_file(VALUE parser, VALUE fname_v)
+{
+ ruby_cmdline_options_t opt;
+ VALUE f = open_load_file(fname_v, &cmdline_options_init(&opt)->xflag);
+ return load_file(parser, fname_v, f, 0, &opt);
}
/*
@@ -1928,6 +2542,8 @@ proc_argv0(VALUE process)
return rb_orig_progname;
}
+static VALUE ruby_setproctitle(VALUE title);
+
/*
* call-seq:
* Process.setproctitle(string) -> string
@@ -1948,20 +2564,24 @@ proc_argv0(VALUE process)
static VALUE
proc_setproctitle(VALUE process, VALUE title)
{
- StringValue(title);
-
- setproctitle("%.*s", RSTRING_LENINT(title), RSTRING_PTR(title));
+ return ruby_setproctitle(title);
+}
+static VALUE
+ruby_setproctitle(VALUE title)
+{
+ const char *ptr = StringValueCStr(title);
+ setproctitle("%.*s", RSTRING_LENINT(title), ptr);
return title;
}
static void
-set_arg0(VALUE val, ID id)
+set_arg0(VALUE val, ID id, VALUE *_)
{
if (origarg.argv == 0)
rb_raise(rb_eRuntimeError, "$0 not initialized");
- rb_progname = rb_str_new_frozen(proc_setproctitle(rb_mProcess, val));
+ rb_progname = rb_str_new_frozen(ruby_setproctitle(val));
}
static inline VALUE
@@ -1969,17 +2589,13 @@ external_str_new_cstr(const char *p)
{
#if UTF8_PATH
VALUE str = rb_utf8_str_new_cstr(p);
- return str_conv_enc(str, NULL, rb_default_external_encoding());
+ str = str_conv_enc(str, NULL, rb_default_external_encoding());
+ return str;
#else
return rb_external_str_new_cstr(p);
#endif
}
-/*! Sets the current script name to this value.
- *
- * This is similar to <code>$0 = name</code> in Ruby level but also affects
- * <code>Method#location</code> and others.
- */
void
ruby_script(const char *name)
{
@@ -2001,7 +2617,7 @@ ruby_set_script_name(VALUE name)
}
static void
-init_ids(struct cmdline_options *opt)
+init_ids(ruby_cmdline_options_t *opt)
{
rb_uid_t uid = getuid();
rb_uid_t euid = geteuid();
@@ -2010,35 +2626,36 @@ init_ids(struct cmdline_options *opt)
if (uid != euid) opt->setids |= 1;
if (egid != gid) opt->setids |= 2;
- if (uid && opt->setids) {
- if (opt->safe_level < 1) opt->safe_level = 1;
- }
}
#undef forbid_setid
static void
-forbid_setid(const char *s, struct cmdline_options *opt)
+forbid_setid(const char *s, const ruby_cmdline_options_t *opt)
{
if (opt->setids & 1)
rb_raise(rb_eSecurityError, "no %s allowed while running setuid", s);
if (opt->setids & 2)
rb_raise(rb_eSecurityError, "no %s allowed while running setgid", s);
- if (opt->safe_level > 0)
- rb_raise(rb_eSecurityError, "no %s allowed in tainted mode", s);
+}
+
+static VALUE
+verbose_getter(ID id, VALUE *ptr)
+{
+ return *rb_ruby_verbose_ptr();
}
static void
-verbose_setter(VALUE val, ID id, void *data)
+verbose_setter(VALUE val, ID id, VALUE *variable)
{
- VALUE *variable = data;
- *variable = RTEST(val) ? Qtrue : val;
+ *rb_ruby_verbose_ptr() = RTEST(val) ? Qtrue : val;
}
static VALUE
-opt_W_getter(ID id, void *data)
+opt_W_getter(ID id, VALUE *dmy)
{
- VALUE *variable = data;
- switch (*variable) {
+ VALUE v = *rb_ruby_verbose_ptr();
+
+ switch (v) {
case Qnil:
return INT2FIX(0);
case Qfalse:
@@ -2050,16 +2667,34 @@ opt_W_getter(ID id, void *data)
}
}
-/*! Defines built-in variables */
+static VALUE
+debug_getter(ID id, VALUE *dmy)
+{
+ return *rb_ruby_debug_ptr();
+}
+
+static void
+debug_setter(VALUE val, ID id, VALUE *dmy)
+{
+ *rb_ruby_debug_ptr() = val;
+}
+
void
ruby_prog_init(void)
{
- rb_define_hooked_variable("$VERBOSE", &ruby_verbose, 0, verbose_setter);
- rb_define_hooked_variable("$-v", &ruby_verbose, 0, verbose_setter);
- rb_define_hooked_variable("$-w", &ruby_verbose, 0, verbose_setter);
- rb_define_hooked_variable("$-W", &ruby_verbose, opt_W_getter, rb_gvar_readonly_setter);
- rb_define_variable("$DEBUG", &ruby_debug);
- rb_define_variable("$-d", &ruby_debug);
+ rb_define_virtual_variable("$VERBOSE", verbose_getter, verbose_setter);
+ rb_define_virtual_variable("$-v", verbose_getter, verbose_setter);
+ rb_define_virtual_variable("$-w", verbose_getter, verbose_setter);
+ rb_define_virtual_variable("$-W", opt_W_getter, rb_gvar_readonly_setter);
+ rb_define_virtual_variable("$DEBUG", debug_getter, debug_setter);
+ rb_define_virtual_variable("$-d", debug_getter, debug_setter);
+
+ rb_gvar_ractor_local("$VERBOSE");
+ rb_gvar_ractor_local("$-v");
+ rb_gvar_ractor_local("$-w");
+ rb_gvar_ractor_local("$-W");
+ rb_gvar_ractor_local("$DEBUG");
+ rb_gvar_ractor_local("$-d");
rb_define_hooked_variable("$0", &rb_progname, 0, set_arg0);
rb_define_hooked_variable("$PROGRAM_NAME", &rb_progname, 0, set_arg0);
@@ -2082,12 +2717,6 @@ ruby_set_argv(int argc, char **argv)
int i;
VALUE av = rb_argv;
-#if defined(USE_DLN_A_OUT)
- if (origarg.argv)
- dln_argv0 = origarg.argv[0];
- else
- dln_argv0 = argv[0];
-#endif
rb_ary_clear(av);
for (i = 0; i < argc; i++) {
VALUE arg = external_str_new_cstr(argv[i]);
@@ -2100,10 +2729,14 @@ ruby_set_argv(int argc, char **argv)
void *
ruby_process_options(int argc, char **argv)
{
- struct cmdline_options opt;
+ ruby_cmdline_options_t opt;
VALUE iseq;
const char *script_name = (argc > 0 && argv[0]) ? argv[0] : ruby_engine;
+ if (!origarg.argv || origarg.argc <= 0) {
+ origarg.argc = argc;
+ origarg.argv = argv;
+ }
ruby_script(script_name); /* for the time being */
rb_argv0 = rb_str_new4(rb_progname);
rb_gc_register_mark_object(rb_argv0);
@@ -2146,23 +2779,15 @@ fill_standard_fds(void)
}
}
-/*! Initializes the process for ruby(1).
- *
- * This function assumes this process is ruby(1) and it has just started.
- * Usually programs that embeds CRuby interpreter should not call this function,
- * and should do their own initialization.
- */
void
ruby_sysinit(int *argc, char ***argv)
{
#if defined(_WIN32)
- void rb_w32_sysinit(int *argc, char ***argv);
rb_w32_sysinit(argc, argv);
#endif
- origarg.argc = *argc;
- origarg.argv = *argv;
-#if defined(USE_DLN_A_OUT)
- dln_argv0 = origarg.argv[0];
-#endif
+ if (*argc >= 0 && *argv) {
+ origarg.argc = *argc;
+ origarg.argv = *argv;
+ }
fill_standard_fds();
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-06-04 23:34:08 +0000