1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resync YARP (#8036)

Browse Source 
It got out of sync again. After this re-sync, it should happen
cherry-picking automatically.
This commit is contained in:
Jemma Issroff 2023-07-06 13:26:26 -04:00 committed by GitHub
parent 055f7219bc
commit 06c2d3e0a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
Notes: git 2023-07-06 17:26:46 +00:00 
Merged-By: jemmaissroff
5 changed files with 44 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/yarp.rb
View File

@ -44,6 +44,10 @@ module YARP
@length = length @length = length
end end
def inspect
"#<YARP::Location @start_offset=#{@start_offset} @length=#{@length}>"
end
# The source code that this location represents. # The source code that this location represents.
def slice def slice
source.slice(start_offset, length) source.slice(start_offset, length)

4
test/yarp/fixtures/global_variables.txt
View File

@ -36,6 +36,8 @@ $DEBUG
$FILENAME $FILENAME
$0
$-0 $-0
$LOADED_FEATURES $LOADED_FEATURES
@ -80,6 +82,8 @@ $-K
:$FILENAME :$FILENAME
:$0
:$-0 :$-0
:$LOADED_FEATURES :$LOADED_FEATURES

5
test/yarp/parse_test.rb
View File

@ -42,6 +42,11 @@ class ParseTest < Test::Unit::TestCase
end end
end end
def test_parse_dollar0
parsed_result = YARP.parse("$0", "-e")
assert_equal 2, parsed_result.value.location.length
end
def test_parse_takes_file_path def test_parse_takes_file_path
filepath = "filepath.rb" filepath = "filepath.rb"
parsed_result = YARP.parse("def foo; __FILE__; end", filepath) parsed_result = YARP.parse("def foo; __FILE__; end", filepath)

58
test/yarp/snapshots/global_variables.txt
View File

@ -1,6 +1,6 @@
ProgramNode(0...340)( ProgramNode(0...349)(
[], [],
StatementsNode(0...340)( StatementsNode(0...349)(
[GlobalVariableReadNode(0...16)(), [GlobalVariableReadNode(0...16)(),
GlobalVariableReadNode(18...20)(), GlobalVariableReadNode(18...20)(),
GlobalVariableReadNode(22...25)(), GlobalVariableReadNode(22...25)(),
@ -20,31 +20,33 @@ ProgramNode(0...340)(
GlobalVariableReadNode(101...103)(), GlobalVariableReadNode(101...103)(),
GlobalVariableReadNode(105...111)(), GlobalVariableReadNode(105...111)(),
GlobalVariableReadNode(113...122)(), GlobalVariableReadNode(113...122)(),
GlobalVariableReadNode(124...127)(), GlobalVariableReadNode(124...126)(),
GlobalVariableReadNode(129...145)(), GlobalVariableReadNode(128...131)(),
GlobalVariableReadNode(147...155)(), GlobalVariableReadNode(133...149)(),
GlobalVariableReadNode(157...160)(), GlobalVariableReadNode(151...159)(),
SymbolNode(162...179)((162...163), (163...179), nil, "$global_variable"), GlobalVariableReadNode(161...164)(),
SymbolNode(181...184)((181...182), (182...184), nil, "$_"), SymbolNode(166...183)((166...167), (167...183), nil, "$global_variable"),
SymbolNode(186...190)((186...187), (187...190), nil, "$-w"), SymbolNode(185...188)((185...186), (186...188), nil, "$_"),
SymbolNode(192...203)((192...193), (193...203), nil, "$LOAD_PATH"), SymbolNode(190...194)((190...191), (191...194), nil, "$-w"),
SymbolNode(205...212)((205...206), (206...212), nil, "$stdin"), SymbolNode(196...207)((196...197), (197...207), nil, "$LOAD_PATH"),
SymbolNode(214...222)((214...215), (215...222), nil, "$stdout"), SymbolNode(209...216)((209...210), (210...216), nil, "$stdin"),
SymbolNode(224...232)((224...225), (225...232), nil, "$stderr"), SymbolNode(218...226)((218...219), (219...226), nil, "$stdout"),
SymbolNode(234...237)((234...235), (235...237), nil, "$!"), SymbolNode(228...236)((228...229), (229...236), nil, "$stderr"),
SymbolNode(239...242)((239...240), (240...242), nil, "$?"), SymbolNode(238...241)((238...239), (239...241), nil, "$!"),
SymbolNode(244...247)((244...245), (245...247), nil, "$~"), SymbolNode(243...246)((243...244), (244...246), nil, "$?"),
SymbolNode(249...252)((249...250), (250...252), nil, "$&"), SymbolNode(248...251)((248...249), (249...251), nil, "$~"),
SymbolNode(254...257)((254...255), (255...257), nil, "$`"), SymbolNode(253...256)((253...254), (254...256), nil, "$&"),
SymbolNode(259...262)((259...260), (260...262), nil, "$'"), SymbolNode(258...261)((258...259), (259...261), nil, "$`"),
SymbolNode(264...267)((264...265), (265...267), nil, "$+"), SymbolNode(263...266)((263...264), (264...266), nil, "$'"),
SymbolNode(269...272)((269...270), (270...272), nil, "$:"), SymbolNode(268...271)((268...269), (269...271), nil, "$+"),
SymbolNode(274...277)((274...275), (275...277), nil, "$;"), SymbolNode(273...276)((273...274), (274...276), nil, "$:"),
SymbolNode(279...286)((279...280), (280...286), nil, "$DEBUG"), SymbolNode(278...281)((278...279), (279...281), nil, "$;"),
SymbolNode(288...298)((288...289), (289...298), nil, "$FILENAME"), SymbolNode(283...290)((283...284), (284...290), nil, "$DEBUG"),
SymbolNode(300...304)((300...301), (301...304), nil, "$-0"), SymbolNode(292...302)((292...293), (293...302), nil, "$FILENAME"),
SymbolNode(306...323)((306...307), (307...323), nil, "$LOADED_FEATURES"), SymbolNode(304...307)((304...305), (305...307), nil, "$0"),
SymbolNode(325...334)((325...326), (326...334), nil, "$VERBOSE"), SymbolNode(309...313)((309...310), (310...313), nil, "$-0"),
SymbolNode(336...340)((336...337), (337...340), nil, "$-K")] SymbolNode(315...332)((315...316), (316...332), nil, "$LOADED_FEATURES"),
SymbolNode(334...343)((334...335), (335...343), nil, "$VERBOSE"),
SymbolNode(345...349)((345...346), (346...349), nil, "$-K")]
) )
) )

2
yarp/yarp.c
View File

@ -4868,7 +4868,7 @@ lex_global_variable(yp_parser_t *parser) {
parser->current.end++; parser->current.end++;
size_t width; size_t width;
if ((width = char_is_identifier(parser, parser->current.end)) > 0) { if (parser->current.end < parser->end && (width = char_is_identifier(parser, parser->current.end)) > 0) {
do { do {
parser->current.end += width; parser->current.end += width;
} while (parser->current.end < parser->end && (width = char_is_identifier(parser, parser->current.end)) > 0); } while (parser->current.end < parser->end && (width = char_is_identifier(parser, parser->current.end)) > 0);