archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-28 15:36:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

parse.y: no punctuation instance/class variables

Browse source 
* parse.y (parse_atmark): exclude punctuation follows @ marks,
  whereas it is inclusive after $ mark as some punctuation global
  variables exist.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67254 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2019-03-14 08:13:46 +00:00
parent 277af37b42
commit 9800fc26b0
3 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
parse.y
View file

@ -7596,7 +7596,8 @@ parse_atmark(struct parser_params *p, const enum lex_state_e last_state)
tokadd(p, '@'); tokadd(p, '@');
c = nextc(p); c = nextc(p);
} }
if (c == -1 || ISSPACE(c)) { if (c == -1 || !parser_is_identchar(p)) {
pushback(p, c);
if (result == tIVAR) { if (result == tIVAR) {
compile_error(p, "`@' without identifiers is not allowed as an instance variable name"); compile_error(p, "`@' without identifiers is not allowed as an instance variable name");
} }
@ -7605,7 +7606,7 @@ parse_atmark(struct parser_params *p, const enum lex_state_e last_state)
} }
return 0; return 0;
} }
else if (ISDIGIT(c) || !parser_is_identchar(p)) { else if (ISDIGIT(c)) {
pushback(p, c); pushback(p, c);
if (result == tIVAR) { if (result == tIVAR) {
compile_error(p, "`@%c' is not allowed as an instance variable name", c); compile_error(p, "`@%c' is not allowed as an instance variable name", c);

4
test/ripper/test_parser_events.rb
View file

@ -1479,13 +1479,13 @@ class TestRipper::ParserEvents < Test::Unit::TestCase
def test_invalid_instance_variable_name def test_invalid_instance_variable_name
assert_equal("`@1' is not allowed as an instance variable name", compile_error('@1')) assert_equal("`@1' is not allowed as an instance variable name", compile_error('@1'))
assert_equal("`@%' is not allowed as an instance variable name", compile_error('@%')) assert_equal("`@' without identifiers is not allowed as an instance variable name", compile_error('@%'))
assert_equal("`@' without identifiers is not allowed as an instance variable name", compile_error('@')) assert_equal("`@' without identifiers is not allowed as an instance variable name", compile_error('@'))
end end
def test_invalid_class_variable_name def test_invalid_class_variable_name
assert_equal("`@@1' is not allowed as a class variable name", compile_error('@@1')) assert_equal("`@@1' is not allowed as a class variable name", compile_error('@@1'))
assert_equal("`@@%' is not allowed as a class variable name", compile_error('@@%')) assert_equal("`@@' without identifiers is not allowed as a class variable name", compile_error('@@%'))
assert_equal("`@@' without identifiers is not allowed as a class variable name", compile_error('@@')) assert_equal("`@@' without identifiers is not allowed as a class variable name", compile_error('@@'))
end end

12
test/ruby/test_parse.rb
View file

@ -376,23 +376,25 @@ class TestParse < Test::Unit::TestCase
assert_nothing_raised { eval(':""') } assert_nothing_raised { eval(':""') }
end end
def assert_disallowed_variable(type, noname, *invalid) def assert_disallowed_variable(type, noname, invalid)
assert_syntax_error("a = #{noname}", "`#{noname}' without identifiers is not allowed as #{type} variable name") noname.each do |name|
assert_syntax_error("a = #{name}", "`#{noname[0]}' without identifiers is not allowed as #{type} variable name")
end
invalid.each do |name| invalid.each do |name|
assert_syntax_error("a = #{name}", "`#{name}' is not allowed as #{type} variable name") assert_syntax_error("a = #{name}", "`#{name}' is not allowed as #{type} variable name")
end end
end end
def test_disallowed_instance_variable def test_disallowed_instance_variable
assert_disallowed_variable("an instance", *%w[@ @1 @.]) assert_disallowed_variable("an instance", %w[@ @.], %w[@1])
end end
def test_disallowed_class_variable def test_disallowed_class_variable
assert_disallowed_variable("a class", *%w[@@ @@1 @@.]) assert_disallowed_variable("a class", %w[@@ @@.], %w[@@1])
end end
def test_disallowed_gloal_variable def test_disallowed_gloal_variable
assert_disallowed_variable("a global", *%w[$ $%]) assert_disallowed_variable("a global", %w[$], %w[$%])
end end
def test_arg2 def test_arg2