diff options
author | Kevin Newton <kddnewton@gmail.com> | 2023-09-22 11:47:32 -0400 |
---|---|---|
committer | Kevin Newton <kddnewton@gmail.com> | 2023-09-27 12:10:23 -0400 |
commit | 7d11f58b6ed5d995b0fd224442fe49fdfa808a4b (patch) | |
tree | 4b361103fb0f5bfbcf94de3545dbab303701d9c2 /lib | |
parent | 3e8aa3d1cc532095db88d37006beedc515e54048 (diff) | |
download | ruby-7d11f58b6ed5d995b0fd224442fe49fdfa808a4b.tar.gz |
[ruby/yarp] Move lex compat into its own file
https://github.com/ruby/yarp/commit/e90f88f21f
Diffstat (limited to 'lib')
-rw-r--r-- | lib/yarp.rb | 25 | ||||
-rw-r--r-- | lib/yarp/lex_compat.rb | 68 |
2 files changed, 52 insertions, 41 deletions
diff --git a/lib/yarp.rb b/lib/yarp.rb index 3ede97f957..2ed052c842 100644 --- a/lib/yarp.rb +++ b/lib/yarp.rb @@ -303,6 +303,8 @@ module YARP autoload :DesugarCompiler, "yarp/desugar_compiler" autoload :Dispatcher, "yarp/dispatcher" autoload :DSL, "yarp/dsl" + autoload :LexCompat, "yarp/lex_compat" + autoload :LexRipper, "yarp/lex_compat" autoload :MutationCompiler, "yarp/mutation_compiler" autoload :NodeInspector, "yarp/node_inspector" autoload :RipperCompat, "yarp/ripper_compat" @@ -311,10 +313,25 @@ module YARP autoload :Serialize, "yarp/serialize" autoload :Visitor, "yarp/visitor" - # Marking this as private so that consumers don't see it. It makes it a little - # annoying for testing since you have to const_get it to access the methods, - # but at least this way it's clear it's not meant for consumers. + # Some of these constants are not meant to be exposed, so marking them as + # private here. private_constant :Debug + private_constant :LexCompat + private_constant :LexRipper + + # Returns an array of tokens that closely resembles that of the Ripper lexer. + # The only difference is that since we don't keep track of lexer state in the + # same way, it's going to always return the NONE state. + def self.lex_compat(source, filepath = "") + LexCompat.new(source, filepath).result + end + + # This lexes with the Ripper lex. It drops any space events but otherwise + # returns the same tokens. Raises SyntaxError if the syntax in source is + # invalid. + def self.lex_ripper(source) + LexRipper.new(source).result + end # Load the serialized AST using the source as a reference into a tree. def self.load(source, serialized) @@ -322,9 +339,7 @@ module YARP end end -require_relative "yarp/lex_compat" require_relative "yarp/node" - require_relative "yarp/parse_result/comments" require_relative "yarp/parse_result/newlines" diff --git a/lib/yarp/lex_compat.rb b/lib/yarp/lex_compat.rb index 6ed7575ffd..720ac2b59b 100644 --- a/lib/yarp/lex_compat.rb +++ b/lib/yarp/lex_compat.rb @@ -795,48 +795,44 @@ module YARP end end - # The constant that wraps the behavior of the lexer to match Ripper's output - # is an implementation detail, so we don't want it to be public. - private_constant :LexCompat - - # Returns an array of tokens that closely resembles that of the Ripper lexer. - # The only difference is that since we don't keep track of lexer state in the - # same way, it's going to always return the NONE state. - def self.lex_compat(source, filepath = "") - LexCompat.new(source, filepath).result - end + # This is a class that wraps the Ripper lexer to produce almost exactly the + # same tokens. + class LexRipper + attr_reader :source - # This lexes with the Ripper lex. It drops any space events but otherwise - # returns the same tokens. Raises SyntaxError if the syntax in source is - # invalid. - def self.lex_ripper(source) - previous = [] - results = [] - - Ripper.lex(source, raise_errors: true).each do |token| - case token[1] - when :on_sp - # skip - when :on_tstring_content - if previous[1] == :on_tstring_content && (token[2].start_with?("\#$") || token[2].start_with?("\#@")) - previous[2] << token[2] - else - results << token - previous = token - end - when :on_words_sep - if previous[1] == :on_words_sep - previous[2] << token[2] + def initialize(source) + @source = source + end + + def result + previous = [] + results = [] + + Ripper.lex(source, raise_errors: true).each do |token| + case token[1] + when :on_sp + # skip + when :on_tstring_content + if previous[1] == :on_tstring_content && (token[2].start_with?("\#$") || token[2].start_with?("\#@")) + previous[2] << token[2] + else + results << token + previous = token + end + when :on_words_sep + if previous[1] == :on_words_sep + previous[2] << token[2] + else + results << token + previous = token + end else results << token previous = token end - else - results << token - previous = token end - end - results + results + end end end |