2015-12-16 00:07:31 -05:00
|
|
|
# frozen_string_literal: false
|
2000-05-12 05:07:57 -04:00
|
|
|
#
|
2008-06-04 05:37:38 -04:00
|
|
|
# irb/ruby-lex.rb - ruby lexcal analyzer
|
2009-07-07 07:36:20 -04:00
|
|
|
# $Release Version: 0.9.6$
|
2000-05-12 05:07:57 -04:00
|
|
|
# $Revision$
|
2005-04-13 11:27:09 -04:00
|
|
|
# by Keiju ISHITSUKA(keiju@ruby-lang.org)
|
2000-05-12 05:07:57 -04:00
|
|
|
#
|
|
|
|
# --
|
|
|
|
#
|
2009-03-05 22:56:38 -05:00
|
|
|
#
|
2000-05-12 05:07:57 -04:00
|
|
|
#
|
|
|
|
|
2019-04-27 14:41:06 -04:00
|
|
|
require "ripper"
|
2020-03-27 22:15:01 -04:00
|
|
|
require "jruby" if RUBY_ENGINE == "jruby"
|
2000-05-12 05:07:57 -04:00
|
|
|
|
2012-12-13 00:22:30 -05:00
|
|
|
# :stopdoc:
|
2000-05-12 05:07:57 -04:00
|
|
|
class RubyLex
|
|
|
|
|
2019-11-24 15:38:09 -05:00
|
|
|
class TerminateLineInput < StandardError
|
|
|
|
def initialize
|
|
|
|
super("Terminate Line Input")
|
|
|
|
end
|
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2000-05-12 05:07:57 -04:00
|
|
|
def initialize
|
|
|
|
@exp_line_no = @line_no = 1
|
|
|
|
@indent = 0
|
2005-04-13 11:27:09 -04:00
|
|
|
@continue = false
|
|
|
|
@line = ""
|
2004-11-03 06:34:57 -05:00
|
|
|
@prompt = nil
|
2000-05-12 05:07:57 -04:00
|
|
|
end
|
|
|
|
|
2021-07-10 00:44:01 -04:00
|
|
|
def self.compile_with_errors_suppressed(code, line_no: 1)
|
2020-05-31 19:53:07 -04:00
|
|
|
begin
|
2020-06-07 10:29:01 -04:00
|
|
|
result = yield code, line_no
|
2020-07-23 10:44:25 -04:00
|
|
|
rescue ArgumentError
|
2021-07-10 00:44:01 -04:00
|
|
|
# Ruby can issue an error for the code if there is an
|
|
|
|
# incomplete magic comment for encoding in it. Force an
|
|
|
|
# expression with a new line before the code in this
|
|
|
|
# case to prevent magic comment handling. To make sure
|
|
|
|
# line numbers in the lexed code remain the same,
|
|
|
|
# decrease the line number by one.
|
2020-06-07 10:29:01 -04:00
|
|
|
code = ";\n#{code}"
|
2021-07-10 00:44:01 -04:00
|
|
|
line_no -= 1
|
2020-06-07 10:29:01 -04:00
|
|
|
result = yield code, line_no
|
2020-05-31 19:53:07 -04:00
|
|
|
end
|
|
|
|
result
|
|
|
|
end
|
|
|
|
|
2000-05-12 05:07:57 -04:00
|
|
|
# io functions
|
2021-07-10 00:44:01 -04:00
|
|
|
def set_input(io, p = nil, context: nil, &block)
|
2000-05-12 05:07:57 -04:00
|
|
|
@io = io
|
2019-04-27 14:41:06 -04:00
|
|
|
if @io.respond_to?(:check_termination)
|
|
|
|
@io.check_termination do |code|
|
2021-03-26 09:46:40 -04:00
|
|
|
if Reline::IOGate.in_pasting?
|
|
|
|
lex = RubyLex.new
|
2021-07-10 00:44:01 -04:00
|
|
|
rest = lex.check_termination_in_prev_line(code, context: context)
|
2021-03-26 09:46:40 -04:00
|
|
|
if rest
|
|
|
|
Reline.delete_text
|
|
|
|
rest.bytes.reverse_each do |c|
|
|
|
|
Reline.ungetc(c)
|
|
|
|
end
|
|
|
|
true
|
|
|
|
else
|
|
|
|
false
|
|
|
|
end
|
2019-04-27 14:41:06 -04:00
|
|
|
else
|
2021-03-26 09:46:40 -04:00
|
|
|
code.gsub!(/\s*\z/, '').concat("\n")
|
2021-07-10 00:44:01 -04:00
|
|
|
ltype, indent, continue, code_block_open = check_state(code, context: context)
|
2021-03-26 09:46:40 -04:00
|
|
|
if ltype or indent > 0 or continue or code_block_open
|
|
|
|
false
|
|
|
|
else
|
|
|
|
true
|
|
|
|
end
|
2019-04-27 14:41:06 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2019-06-13 19:26:06 -04:00
|
|
|
if @io.respond_to?(:dynamic_prompt)
|
2019-06-16 01:46:22 -04:00
|
|
|
@io.dynamic_prompt do |lines|
|
2019-06-13 19:26:06 -04:00
|
|
|
lines << '' if lines.empty?
|
|
|
|
result = []
|
2021-07-10 00:44:01 -04:00
|
|
|
tokens = self.class.ripper_lex_without_warning(lines.map{ |l| l + "\n" }.join, context: context)
|
2020-12-18 11:52:14 -05:00
|
|
|
code = String.new
|
|
|
|
partial_tokens = []
|
2020-12-19 22:20:00 -05:00
|
|
|
unprocessed_tokens = []
|
2020-12-18 11:52:14 -05:00
|
|
|
line_num_offset = 0
|
|
|
|
tokens.each do |t|
|
|
|
|
partial_tokens << t
|
2020-12-19 22:20:00 -05:00
|
|
|
unprocessed_tokens << t
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
if t.tok.include?("\n")
|
|
|
|
t_str = t.tok
|
2020-12-22 12:18:32 -05:00
|
|
|
t_str.each_line("\n") do |s|
|
|
|
|
code << s << "\n"
|
2021-07-10 00:44:01 -04:00
|
|
|
ltype, indent, continue, code_block_open = check_state(code, partial_tokens, context: context)
|
2020-12-22 12:18:32 -05:00
|
|
|
result << @prompt.call(ltype, indent, continue || code_block_open, @line_no + line_num_offset)
|
|
|
|
line_num_offset += 1
|
|
|
|
end
|
2020-12-19 22:20:00 -05:00
|
|
|
unprocessed_tokens = []
|
2020-12-22 12:18:32 -05:00
|
|
|
else
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
code << t.tok
|
2020-12-18 11:52:14 -05:00
|
|
|
end
|
|
|
|
end
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
|
2020-12-19 22:20:00 -05:00
|
|
|
unless unprocessed_tokens.empty?
|
2021-07-10 00:44:01 -04:00
|
|
|
ltype, indent, continue, code_block_open = check_state(code, unprocessed_tokens, context: context)
|
2020-12-19 22:20:00 -05:00
|
|
|
result << @prompt.call(ltype, indent, continue || code_block_open, @line_no + line_num_offset)
|
|
|
|
end
|
2019-06-13 19:26:06 -04:00
|
|
|
result
|
|
|
|
end
|
|
|
|
end
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
|
2019-06-18 20:19:41 -04:00
|
|
|
if p.respond_to?(:call)
|
|
|
|
@input = p
|
|
|
|
elsif block_given?
|
|
|
|
@input = block
|
|
|
|
else
|
|
|
|
@input = Proc.new{@io.gets}
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def set_prompt(p = nil, &block)
|
|
|
|
p = block if block_given?
|
|
|
|
if p.respond_to?(:call)
|
|
|
|
@prompt = p
|
|
|
|
else
|
|
|
|
@prompt = Proc.new{print p}
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2021-01-04 07:11:24 -05:00
|
|
|
ERROR_TOKENS = [
|
|
|
|
:on_parse_error,
|
|
|
|
:compile_error,
|
|
|
|
:on_assign_error,
|
|
|
|
:on_alias_error,
|
|
|
|
:on_class_name_error,
|
|
|
|
:on_param_error
|
|
|
|
]
|
|
|
|
|
2021-07-10 00:44:01 -04:00
|
|
|
def self.ripper_lex_without_warning(code, context: nil)
|
2019-11-13 01:10:05 -05:00
|
|
|
verbose, $VERBOSE = $VERBOSE, nil
|
2021-07-10 00:44:01 -04:00
|
|
|
if context
|
|
|
|
lvars = context&.workspace&.binding&.local_variables
|
|
|
|
if lvars && !lvars.empty?
|
|
|
|
code = "#{lvars.join('=')}=nil\n#{code}"
|
|
|
|
line_no = 0
|
|
|
|
else
|
|
|
|
line_no = 1
|
|
|
|
end
|
|
|
|
end
|
2020-12-18 11:52:14 -05:00
|
|
|
tokens = nil
|
2021-07-10 00:44:01 -04:00
|
|
|
compile_with_errors_suppressed(code, line_no: line_no) do |inner_code, line_no|
|
2021-01-02 13:25:47 -05:00
|
|
|
lexer = Ripper::Lexer.new(inner_code, '-', line_no)
|
|
|
|
if lexer.respond_to?(:scan) # Ruby 2.7+
|
2021-01-04 07:11:24 -05:00
|
|
|
tokens = []
|
|
|
|
pos_to_index = {}
|
|
|
|
lexer.scan.each do |t|
|
2021-07-10 00:44:01 -04:00
|
|
|
next if t.pos.first == 0
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
if pos_to_index.has_key?(t.pos)
|
|
|
|
index = pos_to_index[t.pos]
|
2021-01-04 07:11:24 -05:00
|
|
|
found_tk = tokens[index]
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
if ERROR_TOKENS.include?(found_tk.event) && !ERROR_TOKENS.include?(t.event)
|
2021-01-04 07:11:24 -05:00
|
|
|
tokens[index] = t
|
|
|
|
end
|
|
|
|
else
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
pos_to_index[t.pos] = tokens.size
|
2021-01-04 07:11:24 -05:00
|
|
|
tokens << t
|
|
|
|
end
|
|
|
|
end
|
2021-01-02 13:25:47 -05:00
|
|
|
else
|
2021-11-23 09:07:02 -05:00
|
|
|
tokens = lexer.parse.reject { |it| it.pos.first == 0 }
|
2021-01-02 13:25:47 -05:00
|
|
|
end
|
2020-05-31 19:53:07 -04:00
|
|
|
end
|
2019-11-13 01:10:05 -05:00
|
|
|
tokens
|
2021-01-05 03:42:05 -05:00
|
|
|
ensure
|
|
|
|
$VERBOSE = verbose
|
2019-11-13 01:10:05 -05:00
|
|
|
end
|
|
|
|
|
2021-01-01 15:20:48 -05:00
|
|
|
def find_prev_spaces(line_index)
|
|
|
|
return 0 if @tokens.size == 0
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
md = @tokens[0].tok.match(/(\A +)/)
|
2021-01-01 15:20:48 -05:00
|
|
|
prev_spaces = md.nil? ? 0 : md[1].count(' ')
|
|
|
|
line_count = 0
|
|
|
|
@tokens.each_with_index do |t, i|
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
if t.tok.include?("\n")
|
|
|
|
line_count += t.tok.count("\n")
|
2021-01-01 15:20:48 -05:00
|
|
|
if line_count >= line_index
|
|
|
|
return prev_spaces
|
|
|
|
end
|
|
|
|
if (@tokens.size - 1) > i
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
md = @tokens[i + 1].tok.match(/(\A +)/)
|
2021-01-01 15:20:48 -05:00
|
|
|
prev_spaces = md.nil? ? 0 : md[1].count(' ')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
prev_spaces
|
|
|
|
end
|
|
|
|
|
2019-06-18 20:19:41 -04:00
|
|
|
def set_auto_indent(context)
|
|
|
|
if @io.respond_to?(:auto_indent) and context.auto_indent_mode
|
2019-06-18 07:57:58 -04:00
|
|
|
@io.auto_indent do |lines, line_index, byte_pointer, is_newline|
|
|
|
|
if is_newline
|
2021-07-10 00:44:01 -04:00
|
|
|
@tokens = self.class.ripper_lex_without_warning(lines[0..line_index].join("\n"), context: context)
|
2021-01-01 15:20:48 -05:00
|
|
|
prev_spaces = find_prev_spaces(line_index)
|
2019-06-25 09:07:32 -04:00
|
|
|
depth_difference = check_newline_depth_difference
|
2020-12-31 05:10:50 -05:00
|
|
|
depth_difference = 0 if depth_difference < 0
|
2019-06-25 09:07:32 -04:00
|
|
|
prev_spaces + depth_difference * 2
|
2019-06-18 07:57:58 -04:00
|
|
|
else
|
|
|
|
code = line_index.zero? ? '' : lines[0..(line_index - 1)].map{ |l| l + "\n" }.join
|
2019-06-18 08:56:41 -04:00
|
|
|
last_line = lines[line_index]&.byteslice(0, byte_pointer)
|
|
|
|
code += last_line if last_line
|
2021-07-10 00:44:01 -04:00
|
|
|
@tokens = self.class.ripper_lex_without_warning(code, context: context)
|
2021-09-19 15:44:11 -04:00
|
|
|
corresponding_token_depth = check_corresponding_token_depth(lines, line_index)
|
2019-06-21 08:31:56 -04:00
|
|
|
if corresponding_token_depth
|
|
|
|
corresponding_token_depth
|
2019-06-18 07:57:58 -04:00
|
|
|
else
|
|
|
|
nil
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2000-05-12 05:07:57 -04:00
|
|
|
end
|
|
|
|
|
2021-07-10 00:44:01 -04:00
|
|
|
def check_state(code, tokens = nil, context: nil)
|
|
|
|
tokens = self.class.ripper_lex_without_warning(code, context: context) unless tokens
|
2020-12-18 11:52:14 -05:00
|
|
|
ltype = process_literal_type(tokens)
|
|
|
|
indent = process_nesting_level(tokens)
|
|
|
|
continue = process_continue(tokens)
|
|
|
|
code_block_open = check_code_block(code, tokens)
|
2019-06-13 19:26:06 -04:00
|
|
|
[ltype, indent, continue, code_block_open]
|
|
|
|
end
|
|
|
|
|
2000-05-12 05:07:57 -04:00
|
|
|
def prompt
|
|
|
|
if @prompt
|
|
|
|
@prompt.call(@ltype, @indent, @continue, @line_no)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def initialize_input
|
|
|
|
@ltype = nil
|
|
|
|
@indent = 0
|
2001-02-02 06:38:20 -05:00
|
|
|
@continue = false
|
2000-05-12 05:07:57 -04:00
|
|
|
@line = ""
|
|
|
|
@exp_line_no = @line_no
|
2019-04-27 14:41:06 -04:00
|
|
|
@code_block_open = false
|
2000-05-12 05:07:57 -04:00
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2000-05-12 05:07:57 -04:00
|
|
|
def each_top_level_statement
|
|
|
|
initialize_input
|
2001-05-08 05:28:19 -04:00
|
|
|
catch(:TERM_INPUT) do
|
|
|
|
loop do
|
2014-08-08 21:36:49 -04:00
|
|
|
begin
|
|
|
|
prompt
|
|
|
|
unless l = lex
|
|
|
|
throw :TERM_INPUT if @line == ''
|
|
|
|
else
|
2019-06-16 01:46:22 -04:00
|
|
|
@line_no += l.count("\n")
|
2020-03-24 02:24:01 -04:00
|
|
|
if l == "\n"
|
|
|
|
@exp_line_no += 1
|
|
|
|
next
|
|
|
|
end
|
2014-08-08 21:36:49 -04:00
|
|
|
@line.concat l
|
2019-04-27 14:41:06 -04:00
|
|
|
if @code_block_open or @ltype or @continue or @indent > 0
|
2014-08-08 21:36:49 -04:00
|
|
|
next
|
|
|
|
end
|
|
|
|
end
|
|
|
|
if @line != "\n"
|
2010-11-03 01:23:56 -04:00
|
|
|
@line.force_encoding(@io.encoding)
|
2014-08-08 21:36:49 -04:00
|
|
|
yield @line, @exp_line_no
|
|
|
|
end
|
2021-01-22 12:45:00 -05:00
|
|
|
raise TerminateLineInput if @io.eof?
|
2014-08-08 21:36:49 -04:00
|
|
|
@line = ''
|
|
|
|
@exp_line_no = @line_no
|
|
|
|
|
|
|
|
@indent = 0
|
|
|
|
rescue TerminateLineInput
|
|
|
|
initialize_input
|
|
|
|
prompt
|
|
|
|
end
|
2000-05-12 05:07:57 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def lex
|
2019-04-27 14:41:06 -04:00
|
|
|
line = @input.call
|
|
|
|
if @io.respond_to?(:check_termination)
|
|
|
|
return line # multiline
|
|
|
|
end
|
|
|
|
code = @line + (line.nil? ? '' : line)
|
2019-04-27 17:37:39 -04:00
|
|
|
code.gsub!(/\s*\z/, '').concat("\n")
|
2021-03-24 01:33:53 -04:00
|
|
|
@tokens = self.class.ripper_lex_without_warning(code)
|
2020-12-21 14:49:02 -05:00
|
|
|
@continue = process_continue
|
|
|
|
@code_block_open = check_code_block(code)
|
|
|
|
@indent = process_nesting_level
|
|
|
|
@ltype = process_literal_type
|
2019-04-27 14:41:06 -04:00
|
|
|
line
|
2019-04-23 08:55:29 -04:00
|
|
|
end
|
|
|
|
|
2020-12-21 14:49:02 -05:00
|
|
|
def process_continue(tokens = @tokens)
|
2019-04-27 14:41:06 -04:00
|
|
|
# last token is always newline
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
if tokens.size >= 2 and tokens[-2].event == :on_regexp_end
|
2019-04-27 14:41:06 -04:00
|
|
|
# end of regexp literal
|
|
|
|
return false
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
elsif tokens.size >= 2 and tokens[-2].event == :on_semicolon
|
2019-04-27 14:41:06 -04:00
|
|
|
return false
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
elsif tokens.size >= 2 and tokens[-2].event == :on_kw and ['begin', 'else', 'ensure'].include?(tokens[-2].tok)
|
2019-04-27 14:41:06 -04:00
|
|
|
return false
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
elsif !tokens.empty? and tokens.last.tok == "\\\n"
|
2019-04-27 14:41:06 -04:00
|
|
|
return true
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
elsif tokens.size >= 1 and tokens[-1].event == :on_heredoc_end # "EOH\n"
|
2019-05-30 02:34:41 -04:00
|
|
|
return false
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
elsif tokens.size >= 2 and defined?(Ripper::EXPR_BEG) and tokens[-2].state.anybits?(Ripper::EXPR_BEG | Ripper::EXPR_FNAME) and tokens[-2].tok !~ /\A\.\.\.?\z/
|
2019-04-27 14:41:06 -04:00
|
|
|
# end of literal except for regexp
|
2021-03-03 18:27:04 -05:00
|
|
|
# endless range at end of line is not a continue
|
2019-04-27 14:41:06 -04:00
|
|
|
return true
|
|
|
|
end
|
|
|
|
false
|
2019-04-23 08:55:29 -04:00
|
|
|
end
|
|
|
|
|
2020-12-21 14:49:02 -05:00
|
|
|
def check_code_block(code, tokens = @tokens)
|
2020-12-18 11:52:14 -05:00
|
|
|
return true if tokens.empty?
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
if tokens.last.event == :on_heredoc_beg
|
2019-04-27 14:41:06 -04:00
|
|
|
return true
|
|
|
|
end
|
|
|
|
|
|
|
|
begin # check if parser error are available
|
2019-05-27 12:30:15 -04:00
|
|
|
verbose, $VERBOSE = $VERBOSE, nil
|
2019-07-26 01:37:11 -04:00
|
|
|
case RUBY_ENGINE
|
2020-11-05 12:08:04 -05:00
|
|
|
when 'ruby'
|
|
|
|
self.class.compile_with_errors_suppressed(code) do |inner_code, line_no|
|
|
|
|
RubyVM::InstructionSequence.compile(inner_code, nil, nil, line_no)
|
|
|
|
end
|
2019-07-26 01:37:11 -04:00
|
|
|
when 'jruby'
|
|
|
|
JRuby.compile_ir(code)
|
|
|
|
else
|
2020-11-05 12:08:04 -05:00
|
|
|
catch(:valid) do
|
|
|
|
eval("BEGIN { throw :valid, true }\n#{code}")
|
|
|
|
false
|
2020-05-31 19:53:07 -04:00
|
|
|
end
|
2019-07-26 01:37:11 -04:00
|
|
|
end
|
2020-03-26 03:43:16 -04:00
|
|
|
rescue EncodingError
|
|
|
|
# This is for a hash with invalid encoding symbol, {"\xAE": 1}
|
2019-04-27 14:41:06 -04:00
|
|
|
rescue SyntaxError => e
|
|
|
|
case e.message
|
|
|
|
when /unterminated (?:string|regexp) meets end of file/
|
|
|
|
# "unterminated regexp meets end of file"
|
|
|
|
#
|
|
|
|
# example:
|
|
|
|
# /
|
|
|
|
#
|
|
|
|
# "unterminated string meets end of file"
|
|
|
|
#
|
|
|
|
# example:
|
|
|
|
# '
|
|
|
|
return true
|
|
|
|
when /syntax error, unexpected end-of-input/
|
|
|
|
# "syntax error, unexpected end-of-input, expecting keyword_end"
|
|
|
|
#
|
|
|
|
# example:
|
2021-04-25 14:09:04 -04:00
|
|
|
# if true
|
2019-04-27 14:41:06 -04:00
|
|
|
# hoge
|
|
|
|
# if false
|
|
|
|
# fuga
|
|
|
|
# end
|
|
|
|
return true
|
|
|
|
when /syntax error, unexpected keyword_end/
|
|
|
|
# "syntax error, unexpected keyword_end"
|
|
|
|
#
|
|
|
|
# example:
|
|
|
|
# if (
|
|
|
|
# end
|
|
|
|
#
|
|
|
|
# example:
|
|
|
|
# end
|
|
|
|
return false
|
2019-05-21 05:36:10 -04:00
|
|
|
when /syntax error, unexpected '\.'/
|
|
|
|
# "syntax error, unexpected '.'"
|
|
|
|
#
|
|
|
|
# example:
|
|
|
|
# .
|
|
|
|
return false
|
2019-04-27 14:41:06 -04:00
|
|
|
when /unexpected tREGEXP_BEG/
|
|
|
|
# "syntax error, unexpected tREGEXP_BEG, expecting keyword_do or '{' or '('"
|
|
|
|
#
|
|
|
|
# example:
|
|
|
|
# method / f /
|
|
|
|
return false
|
|
|
|
end
|
2019-05-27 12:30:15 -04:00
|
|
|
ensure
|
|
|
|
$VERBOSE = verbose
|
2019-04-27 14:41:06 -04:00
|
|
|
end
|
|
|
|
|
2019-06-12 11:29:45 -04:00
|
|
|
if defined?(Ripper::EXPR_BEG)
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
last_lex_state = tokens.last.state
|
2019-06-12 11:29:45 -04:00
|
|
|
if last_lex_state.allbits?(Ripper::EXPR_BEG)
|
|
|
|
return false
|
|
|
|
elsif last_lex_state.allbits?(Ripper::EXPR_DOT)
|
|
|
|
return true
|
|
|
|
elsif last_lex_state.allbits?(Ripper::EXPR_CLASS)
|
|
|
|
return true
|
|
|
|
elsif last_lex_state.allbits?(Ripper::EXPR_FNAME)
|
|
|
|
return true
|
|
|
|
elsif last_lex_state.allbits?(Ripper::EXPR_VALUE)
|
|
|
|
return true
|
|
|
|
elsif last_lex_state.allbits?(Ripper::EXPR_ARG)
|
|
|
|
return false
|
|
|
|
end
|
2019-04-27 14:41:06 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
false
|
2019-04-23 08:55:29 -04:00
|
|
|
end
|
|
|
|
|
2020-12-21 14:49:02 -05:00
|
|
|
def process_nesting_level(tokens = @tokens)
|
2019-07-01 14:34:08 -04:00
|
|
|
indent = 0
|
2020-06-25 10:56:03 -04:00
|
|
|
in_oneliner_def = nil
|
2020-12-18 11:52:14 -05:00
|
|
|
tokens.each_with_index { |t, index|
|
2020-06-25 10:56:03 -04:00
|
|
|
# detecting one-liner method definition
|
|
|
|
if in_oneliner_def.nil?
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
if t.state.allbits?(Ripper::EXPR_ENDFN)
|
2020-06-25 10:56:03 -04:00
|
|
|
in_oneliner_def = :ENDFN
|
|
|
|
end
|
|
|
|
else
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
if t.state.allbits?(Ripper::EXPR_ENDFN)
|
2020-06-25 10:56:03 -04:00
|
|
|
# continuing
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
elsif t.state.allbits?(Ripper::EXPR_BEG)
|
|
|
|
if t.tok == '='
|
2020-06-25 10:56:03 -04:00
|
|
|
in_oneliner_def = :BODY
|
|
|
|
end
|
2020-09-21 20:06:43 -04:00
|
|
|
else
|
2020-06-25 10:56:03 -04:00
|
|
|
if in_oneliner_def == :BODY
|
|
|
|
# one-liner method definition
|
|
|
|
indent -= 1
|
|
|
|
end
|
|
|
|
in_oneliner_def = nil
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
case t.event
|
2020-08-16 21:41:31 -04:00
|
|
|
when :on_lbracket, :on_lbrace, :on_lparen, :on_tlambeg
|
2019-06-24 10:58:50 -04:00
|
|
|
indent += 1
|
|
|
|
when :on_rbracket, :on_rbrace, :on_rparen
|
|
|
|
indent -= 1
|
|
|
|
when :on_kw
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
next if index > 0 and tokens[index - 1].state.allbits?(Ripper::EXPR_FNAME)
|
|
|
|
case t.tok
|
2019-08-19 19:24:50 -04:00
|
|
|
when 'do'
|
2020-12-31 05:10:50 -05:00
|
|
|
syntax_of_do = take_corresponding_syntax_to_kw_do(tokens, index)
|
|
|
|
indent += 1 if syntax_of_do == :method_calling
|
2019-08-19 19:24:50 -04:00
|
|
|
when 'def', 'case', 'for', 'begin', 'class', 'module'
|
2019-06-24 10:58:50 -04:00
|
|
|
indent += 1
|
|
|
|
when 'if', 'unless', 'while', 'until'
|
2020-03-02 08:16:11 -05:00
|
|
|
# postfix if/unless/while/until must be Ripper::EXPR_LABEL
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
indent += 1 unless t.state.allbits?(Ripper::EXPR_LABEL)
|
2019-06-24 10:58:50 -04:00
|
|
|
when 'end'
|
|
|
|
indent -= 1
|
|
|
|
end
|
|
|
|
end
|
|
|
|
# percent literals are not indented
|
|
|
|
}
|
|
|
|
indent
|
|
|
|
end
|
|
|
|
|
2021-01-22 21:39:51 -05:00
|
|
|
def is_method_calling?(tokens, index)
|
|
|
|
tk = tokens[index]
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
if tk.state.anybits?(Ripper::EXPR_CMDARG) and tk.event == :on_ident
|
2021-01-22 21:39:51 -05:00
|
|
|
# The target method call to pass the block with "do".
|
|
|
|
return true
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
elsif tk.state.anybits?(Ripper::EXPR_ARG) and tk.event == :on_ident
|
|
|
|
non_sp_index = tokens[0..(index - 1)].rindex{ |t| t.event != :on_sp }
|
2021-01-22 21:39:51 -05:00
|
|
|
if non_sp_index
|
|
|
|
prev_tk = tokens[non_sp_index]
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
if prev_tk.state.anybits?(Ripper::EXPR_DOT) and prev_tk.event == :on_period
|
2021-01-22 21:39:51 -05:00
|
|
|
# The target method call with receiver to pass the block with "do".
|
|
|
|
return true
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
false
|
|
|
|
end
|
|
|
|
|
2020-12-31 05:10:50 -05:00
|
|
|
def take_corresponding_syntax_to_kw_do(tokens, index)
|
|
|
|
syntax_of_do = nil
|
2021-10-05 13:44:22 -04:00
|
|
|
# Finding a syntax corresponding to "do".
|
2020-12-31 05:10:50 -05:00
|
|
|
index.downto(0) do |i|
|
|
|
|
tk = tokens[i]
|
|
|
|
# In "continue", the token isn't the corresponding syntax to "do".
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
non_sp_index = tokens[0..(i - 1)].rindex{ |t| t.event != :on_sp }
|
2020-12-31 05:10:50 -05:00
|
|
|
first_in_fomula = false
|
|
|
|
if non_sp_index.nil?
|
|
|
|
first_in_fomula = true
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
elsif [:on_ignored_nl, :on_nl, :on_comment].include?(tokens[non_sp_index].event)
|
2020-12-31 05:10:50 -05:00
|
|
|
first_in_fomula = true
|
|
|
|
end
|
2021-01-22 21:39:51 -05:00
|
|
|
if is_method_calling?(tokens, i)
|
2020-12-31 05:10:50 -05:00
|
|
|
syntax_of_do = :method_calling
|
|
|
|
break if first_in_fomula
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
elsif tk.event == :on_kw && %w{while until for}.include?(tk.tok)
|
2020-12-31 05:10:50 -05:00
|
|
|
# A loop syntax in front of "do" found.
|
|
|
|
#
|
|
|
|
# while cond do # also "until" or "for"
|
|
|
|
# end
|
|
|
|
#
|
|
|
|
# This "do" doesn't increment indent because the loop syntax already
|
|
|
|
# incremented.
|
|
|
|
syntax_of_do = :loop_syntax
|
|
|
|
break if first_in_fomula
|
|
|
|
end
|
|
|
|
end
|
|
|
|
syntax_of_do
|
|
|
|
end
|
|
|
|
|
2021-01-21 21:51:54 -05:00
|
|
|
def is_the_in_correspond_to_a_for(tokens, index)
|
|
|
|
syntax_of_in = nil
|
2021-10-05 13:44:22 -04:00
|
|
|
# Finding a syntax corresponding to "do".
|
2021-01-21 21:51:54 -05:00
|
|
|
index.downto(0) do |i|
|
|
|
|
tk = tokens[i]
|
|
|
|
# In "continue", the token isn't the corresponding syntax to "do".
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
non_sp_index = tokens[0..(i - 1)].rindex{ |t| t.event != :on_sp }
|
2021-01-21 21:51:54 -05:00
|
|
|
first_in_fomula = false
|
|
|
|
if non_sp_index.nil?
|
|
|
|
first_in_fomula = true
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
elsif [:on_ignored_nl, :on_nl, :on_comment].include?(tokens[non_sp_index].event)
|
2021-01-21 21:51:54 -05:00
|
|
|
first_in_fomula = true
|
|
|
|
end
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
if tk.event == :on_kw && tk.tok == 'for'
|
2021-01-21 21:51:54 -05:00
|
|
|
# A loop syntax in front of "do" found.
|
|
|
|
#
|
|
|
|
# while cond do # also "until" or "for"
|
|
|
|
# end
|
|
|
|
#
|
|
|
|
# This "do" doesn't increment indent because the loop syntax already
|
|
|
|
# incremented.
|
|
|
|
syntax_of_in = :for
|
|
|
|
end
|
|
|
|
break if first_in_fomula
|
|
|
|
end
|
|
|
|
syntax_of_in
|
|
|
|
end
|
|
|
|
|
2019-06-25 09:07:32 -04:00
|
|
|
def check_newline_depth_difference
|
|
|
|
depth_difference = 0
|
2019-12-30 11:18:05 -05:00
|
|
|
open_brace_on_line = 0
|
2020-06-25 10:56:03 -04:00
|
|
|
in_oneliner_def = nil
|
2019-06-25 09:07:32 -04:00
|
|
|
@tokens.each_with_index do |t, index|
|
2020-06-25 10:56:03 -04:00
|
|
|
# detecting one-liner method definition
|
|
|
|
if in_oneliner_def.nil?
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
if t.state.allbits?(Ripper::EXPR_ENDFN)
|
2020-06-25 10:56:03 -04:00
|
|
|
in_oneliner_def = :ENDFN
|
|
|
|
end
|
|
|
|
else
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
if t.state.allbits?(Ripper::EXPR_ENDFN)
|
2020-06-25 10:56:03 -04:00
|
|
|
# continuing
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
elsif t.state.allbits?(Ripper::EXPR_BEG)
|
|
|
|
if t.tok == '='
|
2020-06-25 10:56:03 -04:00
|
|
|
in_oneliner_def = :BODY
|
|
|
|
end
|
2020-09-21 20:06:43 -04:00
|
|
|
else
|
2020-06-25 10:56:03 -04:00
|
|
|
if in_oneliner_def == :BODY
|
2020-11-22 08:03:09 -05:00
|
|
|
# one-liner method definition
|
2020-06-25 10:56:03 -04:00
|
|
|
depth_difference -= 1
|
|
|
|
end
|
|
|
|
in_oneliner_def = nil
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
case t.event
|
2019-11-19 18:39:43 -05:00
|
|
|
when :on_ignored_nl, :on_nl, :on_comment
|
2020-12-26 09:34:27 -05:00
|
|
|
if index != (@tokens.size - 1) and in_oneliner_def != :BODY
|
2019-06-25 09:07:32 -04:00
|
|
|
depth_difference = 0
|
2019-12-30 11:18:05 -05:00
|
|
|
open_brace_on_line = 0
|
2019-06-25 09:07:32 -04:00
|
|
|
end
|
|
|
|
next
|
|
|
|
when :on_sp
|
|
|
|
next
|
|
|
|
end
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
|
|
|
|
case t.event
|
2020-08-16 09:25:31 -04:00
|
|
|
when :on_lbracket, :on_lbrace, :on_lparen, :on_tlambeg
|
2019-06-25 09:07:32 -04:00
|
|
|
depth_difference += 1
|
2019-12-30 11:18:05 -05:00
|
|
|
open_brace_on_line += 1
|
2019-06-25 09:07:32 -04:00
|
|
|
when :on_rbracket, :on_rbrace, :on_rparen
|
2019-12-30 11:18:05 -05:00
|
|
|
depth_difference -= 1 if open_brace_on_line > 0
|
2019-06-25 09:07:32 -04:00
|
|
|
when :on_kw
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
next if index > 0 and @tokens[index - 1].state.allbits?(Ripper::EXPR_FNAME)
|
|
|
|
case t.tok
|
2019-08-19 19:24:50 -04:00
|
|
|
when 'do'
|
2020-12-31 05:10:50 -05:00
|
|
|
syntax_of_do = take_corresponding_syntax_to_kw_do(@tokens, index)
|
|
|
|
depth_difference += 1 if syntax_of_do == :method_calling
|
2019-08-19 19:24:50 -04:00
|
|
|
when 'def', 'case', 'for', 'begin', 'class', 'module'
|
2019-06-25 09:07:32 -04:00
|
|
|
depth_difference += 1
|
2020-03-02 08:16:11 -05:00
|
|
|
when 'if', 'unless', 'while', 'until', 'rescue'
|
2019-06-25 09:07:32 -04:00
|
|
|
# postfix if/unless/while/until/rescue must be Ripper::EXPR_LABEL
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
unless t.state.allbits?(Ripper::EXPR_LABEL)
|
2019-06-25 09:07:32 -04:00
|
|
|
depth_difference += 1
|
|
|
|
end
|
2021-01-21 21:51:54 -05:00
|
|
|
when 'else', 'elsif', 'ensure', 'when'
|
2019-06-25 09:07:32 -04:00
|
|
|
depth_difference += 1
|
2021-01-21 21:51:54 -05:00
|
|
|
when 'in'
|
|
|
|
unless is_the_in_correspond_to_a_for(@tokens, index)
|
|
|
|
depth_difference += 1
|
|
|
|
end
|
2020-12-31 05:10:50 -05:00
|
|
|
when 'end'
|
|
|
|
depth_difference -= 1
|
2019-06-25 09:07:32 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
depth_difference
|
|
|
|
end
|
|
|
|
|
2021-09-19 15:44:11 -04:00
|
|
|
def check_corresponding_token_depth(lines, line_index)
|
2019-06-21 08:31:56 -04:00
|
|
|
corresponding_token_depth = nil
|
|
|
|
is_first_spaces_of_line = true
|
2019-06-21 08:57:19 -04:00
|
|
|
is_first_printable_of_line = true
|
2019-06-21 08:31:56 -04:00
|
|
|
spaces_of_nest = []
|
|
|
|
spaces_at_line_head = 0
|
2020-01-05 14:44:38 -05:00
|
|
|
open_brace_on_line = 0
|
2020-06-25 10:56:03 -04:00
|
|
|
in_oneliner_def = nil
|
2021-09-19 15:44:11 -04:00
|
|
|
|
|
|
|
if heredoc_scope?
|
|
|
|
return lines[line_index][/^ */].length
|
|
|
|
end
|
|
|
|
|
2019-07-01 14:34:08 -04:00
|
|
|
@tokens.each_with_index do |t, index|
|
2020-06-25 10:56:03 -04:00
|
|
|
# detecting one-liner method definition
|
|
|
|
if in_oneliner_def.nil?
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
if t.state.allbits?(Ripper::EXPR_ENDFN)
|
2020-06-25 10:56:03 -04:00
|
|
|
in_oneliner_def = :ENDFN
|
|
|
|
end
|
|
|
|
else
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
if t.state.allbits?(Ripper::EXPR_ENDFN)
|
2020-06-25 10:56:03 -04:00
|
|
|
# continuing
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
elsif t.state.allbits?(Ripper::EXPR_BEG)
|
|
|
|
if t.tok == '='
|
2020-06-25 10:56:03 -04:00
|
|
|
in_oneliner_def = :BODY
|
|
|
|
end
|
2020-09-21 20:06:43 -04:00
|
|
|
else
|
2020-06-25 10:56:03 -04:00
|
|
|
if in_oneliner_def == :BODY
|
|
|
|
# one-liner method definition
|
|
|
|
if is_first_printable_of_line
|
|
|
|
corresponding_token_depth = spaces_of_nest.pop
|
|
|
|
else
|
|
|
|
spaces_of_nest.pop
|
|
|
|
corresponding_token_depth = nil
|
|
|
|
end
|
|
|
|
end
|
|
|
|
in_oneliner_def = nil
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
case t.event
|
2019-11-19 18:39:43 -05:00
|
|
|
when :on_ignored_nl, :on_nl, :on_comment
|
2020-12-26 09:34:27 -05:00
|
|
|
if in_oneliner_def != :BODY
|
|
|
|
corresponding_token_depth = nil
|
|
|
|
spaces_at_line_head = 0
|
|
|
|
is_first_spaces_of_line = true
|
|
|
|
is_first_printable_of_line = true
|
|
|
|
open_brace_on_line = 0
|
|
|
|
end
|
2019-06-24 10:58:50 -04:00
|
|
|
next
|
2019-06-21 08:31:56 -04:00
|
|
|
when :on_sp
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
spaces_at_line_head = t.tok.count(' ') if is_first_spaces_of_line
|
2019-06-21 08:31:56 -04:00
|
|
|
is_first_spaces_of_line = false
|
2019-06-24 10:58:50 -04:00
|
|
|
next
|
2019-06-21 08:31:56 -04:00
|
|
|
end
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
|
|
|
|
case t.event
|
2020-08-16 09:25:31 -04:00
|
|
|
when :on_lbracket, :on_lbrace, :on_lparen, :on_tlambeg
|
2020-01-05 14:44:38 -05:00
|
|
|
spaces_of_nest.push(spaces_at_line_head + open_brace_on_line * 2)
|
|
|
|
open_brace_on_line += 1
|
2019-04-27 14:41:06 -04:00
|
|
|
when :on_rbracket, :on_rbrace, :on_rparen
|
2019-06-21 08:57:19 -04:00
|
|
|
if is_first_printable_of_line
|
|
|
|
corresponding_token_depth = spaces_of_nest.pop
|
|
|
|
else
|
2019-06-26 05:41:42 -04:00
|
|
|
spaces_of_nest.pop
|
2019-06-21 08:57:19 -04:00
|
|
|
corresponding_token_depth = nil
|
|
|
|
end
|
2020-02-10 12:11:35 -05:00
|
|
|
open_brace_on_line -= 1
|
2019-04-27 14:41:06 -04:00
|
|
|
when :on_kw
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
next if index > 0 and @tokens[index - 1].state.allbits?(Ripper::EXPR_FNAME)
|
|
|
|
case t.tok
|
2020-12-31 05:10:50 -05:00
|
|
|
when 'do'
|
|
|
|
syntax_of_do = take_corresponding_syntax_to_kw_do(@tokens, index)
|
|
|
|
if syntax_of_do == :method_calling
|
|
|
|
spaces_of_nest.push(spaces_at_line_head)
|
|
|
|
end
|
|
|
|
when 'def', 'case', 'for', 'begin', 'class', 'module'
|
2019-06-21 08:31:56 -04:00
|
|
|
spaces_of_nest.push(spaces_at_line_head)
|
2020-03-02 08:16:11 -05:00
|
|
|
when 'rescue'
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
unless t.state.allbits?(Ripper::EXPR_LABEL)
|
2020-03-02 08:16:11 -05:00
|
|
|
corresponding_token_depth = spaces_of_nest.last
|
|
|
|
end
|
2019-06-11 22:00:25 -04:00
|
|
|
when 'if', 'unless', 'while', 'until'
|
2020-03-02 08:16:11 -05:00
|
|
|
# postfix if/unless/while/until must be Ripper::EXPR_LABEL
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
unless t.state.allbits?(Ripper::EXPR_LABEL)
|
2019-06-24 10:58:50 -04:00
|
|
|
spaces_of_nest.push(spaces_at_line_head)
|
|
|
|
end
|
2021-10-25 17:32:40 -04:00
|
|
|
when 'else', 'elsif', 'ensure', 'when'
|
2019-06-25 09:00:29 -04:00
|
|
|
corresponding_token_depth = spaces_of_nest.last
|
2021-10-25 17:32:40 -04:00
|
|
|
when 'in'
|
|
|
|
if in_keyword_case_scope?
|
|
|
|
corresponding_token_depth = spaces_of_nest.last
|
|
|
|
end
|
2019-04-27 14:41:06 -04:00
|
|
|
when 'end'
|
2019-06-21 08:57:19 -04:00
|
|
|
if is_first_printable_of_line
|
|
|
|
corresponding_token_depth = spaces_of_nest.pop
|
|
|
|
else
|
2019-06-26 05:41:42 -04:00
|
|
|
spaces_of_nest.pop
|
2019-06-21 08:57:19 -04:00
|
|
|
corresponding_token_depth = nil
|
|
|
|
end
|
2019-04-23 08:55:29 -04:00
|
|
|
end
|
|
|
|
end
|
2019-06-21 08:57:19 -04:00
|
|
|
is_first_spaces_of_line = false
|
|
|
|
is_first_printable_of_line = false
|
2019-06-18 07:57:58 -04:00
|
|
|
end
|
2019-06-24 10:58:50 -04:00
|
|
|
corresponding_token_depth
|
2000-05-12 05:07:57 -04:00
|
|
|
end
|
2009-03-05 22:56:38 -05:00
|
|
|
|
2020-12-18 11:52:14 -05:00
|
|
|
def check_string_literal(tokens)
|
2019-04-27 14:41:06 -04:00
|
|
|
i = 0
|
|
|
|
start_token = []
|
|
|
|
end_type = []
|
2020-12-18 11:52:14 -05:00
|
|
|
while i < tokens.size
|
|
|
|
t = tokens[i]
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
case t.event
|
2021-09-08 09:19:52 -04:00
|
|
|
when *end_type.last
|
|
|
|
start_token.pop
|
|
|
|
end_type.pop
|
2019-04-27 14:41:06 -04:00
|
|
|
when :on_tstring_beg
|
|
|
|
start_token << t
|
JSON like label ends by differs from the start
pp Ripper.lex('{ "a": 3 }')
=>
[[[1, 0], :on_lbrace, "{", EXPR_BEG|EXPR_LABEL],
[[1, 1], :on_sp, " ", EXPR_BEG|EXPR_LABEL],
[[1, 2], :on_tstring_beg, "\"", EXPR_BEG|EXPR_LABEL],
[[1, 3], :on_tstring_content, "a", EXPR_BEG|EXPR_LABEL],
[[1, 4], :on_label_end, "\":", EXPR_BEG|EXPR_LABEL],
[[1, 6], :on_sp, " ", EXPR_BEG|EXPR_LABEL],
[[1, 7], :on_int, "3", EXPR_END],
[[1, 8], :on_sp, " ", EXPR_END],
[[1, 9], :on_rbrace, "}", EXPR_END]]
2019-05-24 21:36:30 -04:00
|
|
|
end_type << [:on_tstring_end, :on_label_end]
|
2019-04-27 14:41:06 -04:00
|
|
|
when :on_regexp_beg
|
|
|
|
start_token << t
|
|
|
|
end_type << :on_regexp_end
|
|
|
|
when :on_symbeg
|
2021-09-08 09:19:52 -04:00
|
|
|
acceptable_single_tokens = %i{on_ident on_const on_op on_cvar on_ivar on_gvar on_kw on_int on_backtick}
|
|
|
|
if (i + 1) < tokens.size
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
if acceptable_single_tokens.all?{ |st| tokens[i + 1].event != st }
|
2021-09-08 09:19:52 -04:00
|
|
|
start_token << t
|
|
|
|
end_type << :on_tstring_end
|
|
|
|
else
|
|
|
|
i += 1
|
|
|
|
end
|
2014-08-08 21:36:49 -04:00
|
|
|
end
|
2019-04-27 14:41:06 -04:00
|
|
|
when :on_backtick
|
|
|
|
start_token << t
|
|
|
|
end_type << :on_tstring_end
|
|
|
|
when :on_qwords_beg, :on_words_beg, :on_qsymbols_beg, :on_symbols_beg
|
|
|
|
start_token << t
|
|
|
|
end_type << :on_tstring_end
|
|
|
|
when :on_heredoc_beg
|
|
|
|
start_token << t
|
|
|
|
end_type << :on_heredoc_end
|
|
|
|
end
|
|
|
|
i += 1
|
|
|
|
end
|
2021-12-05 20:04:12 -05:00
|
|
|
start_token.last.nil? ? nil : start_token.last
|
2009-07-23 04:35:22 -04:00
|
|
|
end
|
2011-05-15 07:55:52 -04:00
|
|
|
|
2020-12-21 14:49:02 -05:00
|
|
|
def process_literal_type(tokens = @tokens)
|
2020-12-18 11:52:14 -05:00
|
|
|
start_token = check_string_literal(tokens)
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
return nil if start_token == ""
|
|
|
|
|
2021-12-05 20:04:12 -05:00
|
|
|
case start_token&.event
|
2019-04-27 14:41:06 -04:00
|
|
|
when :on_tstring_beg
|
2021-12-05 20:04:12 -05:00
|
|
|
case start_token&.tok
|
2019-04-27 14:41:06 -04:00
|
|
|
when ?" then ?"
|
|
|
|
when /^%.$/ then ?"
|
|
|
|
when /^%Q.$/ then ?"
|
|
|
|
when ?' then ?'
|
|
|
|
when /^%q.$/ then ?'
|
|
|
|
end
|
|
|
|
when :on_regexp_beg then ?/
|
|
|
|
when :on_symbeg then ?:
|
|
|
|
when :on_backtick then ?`
|
|
|
|
when :on_qwords_beg then ?]
|
|
|
|
when :on_words_beg then ?]
|
|
|
|
when :on_qsymbols_beg then ?]
|
|
|
|
when :on_symbols_beg then ?]
|
|
|
|
when :on_heredoc_beg
|
2021-12-05 20:04:12 -05:00
|
|
|
start_token&.tok =~ /<<[-~]?(['"`])[_a-zA-Z0-9]+\1/
|
2019-04-27 14:41:06 -04:00
|
|
|
case $1
|
|
|
|
when ?" then ?"
|
|
|
|
when ?' then ?'
|
|
|
|
when ?` then ?`
|
|
|
|
else ?"
|
2000-05-12 05:07:57 -04:00
|
|
|
end
|
|
|
|
else
|
2019-04-27 14:41:06 -04:00
|
|
|
nil
|
2000-05-12 05:07:57 -04:00
|
|
|
end
|
|
|
|
end
|
2021-03-26 09:46:40 -04:00
|
|
|
|
2021-07-10 00:44:01 -04:00
|
|
|
def check_termination_in_prev_line(code, context: nil)
|
|
|
|
tokens = self.class.ripper_lex_without_warning(code, context: context)
|
2021-03-26 09:46:40 -04:00
|
|
|
past_first_newline = false
|
|
|
|
index = tokens.rindex do |t|
|
|
|
|
# traverse first token before last line
|
|
|
|
if past_first_newline
|
|
|
|
if t.tok.include?("\n")
|
|
|
|
true
|
|
|
|
end
|
|
|
|
elsif t.tok.include?("\n")
|
|
|
|
past_first_newline = true
|
|
|
|
false
|
|
|
|
else
|
|
|
|
false
|
|
|
|
end
|
|
|
|
end
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
|
2021-03-26 09:46:40 -04:00
|
|
|
if index
|
|
|
|
first_token = nil
|
|
|
|
last_line_tokens = tokens[(index + 1)..(tokens.size - 1)]
|
|
|
|
last_line_tokens.each do |t|
|
|
|
|
unless [:on_sp, :on_ignored_sp, :on_comment].include?(t.event)
|
|
|
|
first_token = t
|
|
|
|
break
|
|
|
|
end
|
|
|
|
end
|
Compatibility with IRB
Instead of accessing the struct as an array, access it via methods. There are other places inside of this file already using this API (for example https://github.com/ruby/ruby/blob/e0a5c3d2b71dfad038d7562fdd33f02ffd79232d/lib/irb/ruby-lex.rb#L829-L830).
This commit moves all struct array-ish calls to use their method calls instead. It is also ~1.23 faster accessing values via a method instead of as an array according to this microbenchmark:
```ruby
Elem = Struct.new(:pos, :event, :tok, :state, :message) do
def initialize(pos, event, tok, state, message = nil)
super(pos, event, tok, State.new(state), message)
end
# ...
def to_a
a = super
a.pop unless a.empty?
a
end
end
class ElemClass
attr_accessor :pos, :event, :tok, :state, :message
def initialize(pos, event, tok, state, message = nil)
@pos = pos
@event = event
@tok = tok
@state = State.new(state)
@message = message
end
def to_a
if @message
[@pos, @event, @tok, @state, @message]
else
[@pos, @event, @tok, @state]
end
end
end
# stub state class creation for now
class State; def initialize(val); end; end
```
```ruby
Benchmark.ips do |x|
x.report("struct") { struct[1] }
x.report("class ") { from_class.event }
x.compare!
end; nil
```
```
Warming up --------------------------------------
struct 1.624M i/100ms
class 1.958M i/100ms
Calculating -------------------------------------
struct 17.139M (± 2.6%) i/s - 86.077M in 5.025801s
class 21.104M (± 3.4%) i/s - 105.709M in 5.015193s
Comparison:
class : 21103826.3 i/s
struct: 17139201.5 i/s - 1.23x (± 0.00) slower
```
2021-11-07 20:33:04 -05:00
|
|
|
|
2021-03-26 09:46:40 -04:00
|
|
|
if first_token.nil?
|
|
|
|
return false
|
|
|
|
elsif first_token && first_token.state == Ripper::EXPR_DOT
|
|
|
|
return false
|
|
|
|
else
|
|
|
|
tokens_without_last_line = tokens[0..index]
|
|
|
|
ltype = process_literal_type(tokens_without_last_line)
|
|
|
|
indent = process_nesting_level(tokens_without_last_line)
|
|
|
|
continue = process_continue(tokens_without_last_line)
|
|
|
|
code_block_open = check_code_block(tokens_without_last_line.map(&:tok).join(''), tokens_without_last_line)
|
|
|
|
if ltype or indent > 0 or continue or code_block_open
|
|
|
|
return false
|
|
|
|
else
|
|
|
|
return last_line_tokens.map(&:tok).join('')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
false
|
|
|
|
end
|
2021-09-19 15:44:11 -04:00
|
|
|
|
|
|
|
private
|
|
|
|
|
|
|
|
def heredoc_scope?
|
|
|
|
heredoc_tokens = @tokens.select { |t| [:on_heredoc_beg, :on_heredoc_end].include?(t.event) }
|
|
|
|
heredoc_tokens[-1]&.event == :on_heredoc_beg
|
|
|
|
end
|
2021-10-25 17:32:40 -04:00
|
|
|
|
|
|
|
def in_keyword_case_scope?
|
|
|
|
kw_tokens = @tokens.select { |t| t.event == :on_kw && ['case', 'for', 'end'].include?(t.tok) }
|
|
|
|
counter = 0
|
|
|
|
kw_tokens.reverse.each do |t|
|
|
|
|
if t.tok == 'case'
|
|
|
|
return true if counter.zero?
|
|
|
|
counter += 1
|
|
|
|
elsif t.tok == 'for'
|
|
|
|
counter += 1
|
|
|
|
elsif t.tok == 'end'
|
|
|
|
counter -= 1
|
|
|
|
end
|
|
|
|
end
|
|
|
|
false
|
|
|
|
end
|
2000-05-12 05:07:57 -04:00
|
|
|
end
|
2012-12-13 00:22:30 -05:00
|
|
|
# :startdoc:
|