kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

ruby.c: frozen-string-literal option

Browse source 
* ruby.c (process_options): add an option to enable/disable
  frozen-string-literal.  [Feature #8976]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51954 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-09-27 06:47:00 +00:00
parent 859337b17b
commit 832c74f428
4 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,4 +1,7 @@
Sun Sep 27 15:43:59 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
Sun Sep 27 15:46:58 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ruby.c (process_options): add an option to enable/disable
frozen-string-literal. [Feature #8976]
* compile.c (iseq_compile_each): override compile option by option
given by pragma.

2
NEWS
View file

@ -15,6 +15,8 @@ with all sufficient information, see the ChangeLog file.
* frozen-string-literal pragma:
* new pragma, frozen-string-literal has been experimentally introduced.
* besides, --enable/--disable=frozen-string-literal options also have
been introduced.
=== Core classes updates (outstanding ones only)

10
ruby.c
View file

@ -64,6 +64,7 @@ enum feature_flag_bits {
feature_gems,
feature_did_you_mean,
feature_rubyopt,
feature_frozen_string_literal,
feature_flag_count
};
@ -120,6 +121,7 @@ cmdline_options_init(struct cmdline_options *opt)
#if DISABLE_RUBYGEMS
opt->features &= ~FEATURE_BIT(gems);
#endif
opt->features &= ~FEATURE_BIT(frozen_string_literal);
return opt;
}
@ -196,6 +198,7 @@ usage(const char *name, int help)
M("gems", "", "rubygems (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)"),
};
int i;
const int num = numberof(usage_msg) - (help ? 1 : 0);
@ -733,6 +736,7 @@ enable_option(const char *str, int len, void *arg)
SET_WHEN_ENABLE(gems);
SET_WHEN_ENABLE(did_you_mean);
SET_WHEN_ENABLE(rubyopt);
SET_WHEN_ENABLE(frozen_string_literal);
if (NAME_MATCH_P("all", str, len)) {
*(unsigned int *)arg = ~0U;
return;
@ -747,6 +751,7 @@ disable_option(const char *str, int len, void *arg)
UNSET_WHEN_DISABLE(gems);
UNSET_WHEN_DISABLE(did_you_mean);
UNSET_WHEN_DISABLE(rubyopt);
UNSET_WHEN_DISABLE(frozen_string_literal);
if (NAME_MATCH_P("all", str, len)) {
*(unsigned int *)arg = 0U;
return;
@ -1462,6 +1467,11 @@ process_options(int argc, char **argv, struct cmdline_options *opt)
rb_define_module("DidYouMean");
}
ruby_init_prelude();
if (opt->features & FEATURE_BIT(frozen_string_literal)) {
VALUE option = rb_hash_new();
rb_hash_aset(option, ID2SYM(rb_intern_const("frozen_string_literal")), Qtrue);
rb_funcallv(rb_cISeq, rb_intern_const("compile_option="), 1, &option);
}
#if UTF8_PATH
opt->script_name = str_conv_enc(opt->script_name, rb_utf8_encoding(), lenc);
opt->script = RSTRING_PTR(opt->script_name);

15
test/ruby/test_rubyoptions.rb
View file

@ -783,4 +783,19 @@ class TestRubyOptions < Test::Unit::TestCase
def test_dump_insns_with_rflag
assert_norun_with_rflag('--dump=insns')
end
def test_frozen_string_literal
results = {}
%W[frozen_string_literal frozen_string_literal].each do |arg|
[["disable", "false"], ["enable", "true"]].each do |opt, exp|
key = "#{opt}=#{arg}"
begin
assert_in_out_err(["--disable=gems", "--#{key}"], 'p("foo".frozen?)', [exp])
rescue MiniTest::Assertion => e
results[key] = e
end
end
end
assert_empty(results)
end
end