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

Fix merge conflict in lib/yarp/lex_compat.rb

Browse Source
This commit is contained in:
Kevin Newton 2023-08-25 09:00:04 -04:00
parent ec7a2fdc03
commit 7002d44c10
No known key found for this signature in database
GPG Key ID: 0EAD74C79EC73F26
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/yarp/lex_compat.rb
View File

@ -593,12 +593,7 @@ module YARP
if bom && lineno == 1 if bom && lineno == 1
column -= 3 column -= 3
<<<<<<< HEAD
=begin
if index == 0 && column == 0
=======
if index == 0 && column == 0 && !bom_flushed if index == 0 && column == 0 && !bom_flushed
>>>>>>> 7710cee2480 (Fix up lex compat on Ruby HEAD)
flushed = flushed =
case token.type case token.type
when :BACK_REFERENCE, :INSTANCE_VARIABLE, :CLASS_VARIABLE, when :BACK_REFERENCE, :INSTANCE_VARIABLE, :CLASS_VARIABLE,
@ -618,7 +613,6 @@ module YARP
value.prepend(String.new("\xEF\xBB\xBF", encoding: value.encoding)) value.prepend(String.new("\xEF\xBB\xBF", encoding: value.encoding))
end end
end end
=end
end end
event = RIPPER.fetch(token.type) event = RIPPER.fetch(token.type)