Skip to content

Commit

Permalink
Merge pull request #481 from ydah/bump-rbs-and-steep
Browse files Browse the repository at this point in the history
Bump rbs from v3.6.0 to v3.7.0 and steep from v1.8.0 to v1.8.1
  • Loading branch information
ydah authored Dec 16, 2024
2 parents 64d26c4 + 12516fa commit 5e819cf
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 12 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ gem "memory_profiler"
# Recent steep requires Ruby >= 3.0.0.
# Then skip install on some CI jobs.
if !ENV['GITHUB_ACTION'] || ENV['INSTALL_STEEP'] == 'true'
gem "rbs", "3.6.0", require: false
gem "steep", "1.8.0", require: false
gem "rbs", "3.7.0", require: false
gem "steep", "1.9.1", require: false
end
2 changes: 1 addition & 1 deletion lib/lrama/bitmap.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def self.from_array(ary)
end

def self.to_array(int)
a = []
a = [] #: Array[Integer]
i = 0

while int > 0 do
Expand Down
2 changes: 1 addition & 1 deletion lib/lrama/grammar.rb
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ def fill_sym_to_rules
end

def validate_rule_lhs_is_nterm!
errors = []
errors = [] #: Array[String]

rules.each do |rule|
next if rule.lhs.nterm?
Expand Down
2 changes: 1 addition & 1 deletion lib/lrama/grammar/parameterizing_rule/rhs.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def resolve_user_code(bindings)
return unless user_code

resolved = Lexer::Token::UserCode.new(s_value: user_code.s_value, location: user_code.location)
var_to_arg = {}
var_to_arg = {} #: Hash[String, String]
symbols.each do |sym|
resolved_sym = bindings.resolve_symbol(sym)
if resolved_sym != sym
Expand Down
2 changes: 1 addition & 1 deletion lib/lrama/grammar/rule_builder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def has_inline_rules?
end

def resolve_inline_rules
resolved_builders = []
resolved_builders = [] #: Array[RuleBuilder]
rhs.each_with_index do |token, i|
if (inline_rule = @parameterizing_rule_resolver.find_inline(token))
inline_rule.rhs_list.each do |inline_rhs|
Expand Down
2 changes: 1 addition & 1 deletion lib/lrama/lexer/token/user_code.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def references

def _references
scanner = StringScanner.new(s_value)
references = []
references = [] #: Array[Grammar::Reference]

until scanner.eos? do
case
Expand Down
5 changes: 2 additions & 3 deletions lib/lrama/state/reduce.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,8 @@ def add_not_selected_symbol(sym)
end

def selected_look_ahead
if @look_ahead
# @type ivar @look_ahead: Array<Grammar::Symbol>
@look_ahead - @not_selected_symbols
if look_ahead
look_ahead - @not_selected_symbols
else
[]
end
Expand Down
12 changes: 10 additions & 2 deletions rbs_collection.lock.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
---
path: ".gem_rbs_collection"
gems:
- name: diff-lcs
version: '1.5'
source:
type: git
name: ruby/gem_rbs_collection
revision: f2fa96be08e0f7fe5237a45d2b69d9d7a5d0b416
remote: https://github.com/ruby/gem_rbs_collection.git
repo_dir: gems
- name: erb
version: '0'
source:
Expand All @@ -18,15 +26,15 @@ gems:
source:
type: git
name: ruby/gem_rbs_collection
revision: 4b0d2f72e63b6c3e92dc54e19ce23dd24524f9a7
revision: f2fa96be08e0f7fe5237a45d2b69d9d7a5d0b416
remote: https://github.com/ruby/gem_rbs_collection.git
repo_dir: gems
- name: stackprof
version: '0.2'
source:
type: git
name: ruby/gem_rbs_collection
revision: 4b0d2f72e63b6c3e92dc54e19ce23dd24524f9a7
revision: f2fa96be08e0f7fe5237a45d2b69d9d7a5d0b416
remote: https://github.com/ruby/gem_rbs_collection.git
repo_dir: gems
- name: strscan
Expand Down

0 comments on commit 5e819cf

Please sign in to comment.