archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[ruby/prism] Handle single global variable character name

Browse source 
7a0af49997
This commit is contained in:
Kevin Newton 2024-10-03 13:33:14 -04:00 • committed by git
parent f8568fbd7f
commit 568511f393
2 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
prism/prism.c
View file

@ -9048,6 +9048,10 @@ lex_global_variable(pm_parser_t *parser) {
return PM_TOKEN_GLOBAL_VARIABLE;
}
// True if multiple characters are allowed after the declaration of the
// global variable. Not true when it starts with "$-".
bool allow_multiple = true;
switch (*parser->current.end) {
case '~': // $~: match-data
case '*': // $*: argv
@ -9106,6 +9110,7 @@ lex_global_variable(pm_parser_t *parser) {
case '-':
parser->current.end++;
allow_multiple = false;
/* fallthrough */
default: {
size_t width;
@ -9113,7 +9118,7 @@ lex_global_variable(pm_parser_t *parser) {
if ((width = char_is_identifier(parser, parser->current.end)) > 0) {
do {
parser->current.end += width;
} while (parser->current.end < parser->end && (width = char_is_identifier(parser, parser->current.end)) > 0);
} while (allow_multiple && parser->current.end < parser->end && (width = char_is_identifier(parser, parser->current.end)) > 0);
} else if (pm_char_is_whitespace(peek(parser))) {
// If we get here, then we have a $ followed by whitespace,
// which is not allowed.

9
test/prism/magic_comment_test.rb
View file

@ -87,7 +87,14 @@ module Prism
# Compare against Ruby's expectation.
if defined?(RubyVM::InstructionSequence)
expected = RubyVM::InstructionSequence.compile(source).eval.encoding
previous = $VERBOSE
expected =
begin
$VERBOSE = nil
RubyVM::InstructionSequence.compile(source).eval.encoding
ensure
$VERBOSE = previous
end
assert_equal expected, actual
end
end