antlr4-runtime 0.2.7 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76468497514230c1b99d5112de202c0e9ac1804ff97a450929a0b504a954e9cc
-  data.tar.gz: 46393abe3b4d67c4cc7c20295ea69477547d63a06ef1fdaf5b3334d1dea0b95d
+  metadata.gz: 9ed8d46f9fdf43cb18c6ecb986de8be4779ce8637256db4bc10b92a8128b3931
+  data.tar.gz: 37a9c6a363624aa8532f5ab4dbdbd16804add37ec16def23699b10033aff2963
 SHA512:
-  metadata.gz: 7d52bdf8810d66ed1b6d4606eb049688c0872c6e92585e3cef8c0cf918f3f1573f5f4fc3bfcf5c63a12e1a400fcdf811d9226001d39dc50a96b20b1da63c525e
-  data.tar.gz: fccbe3ffd80843a92ec5c4c8b085d27cbca340f2845ffb68a46b69b9cdad04fdea0e54beea2b2f0cbf642ded2b0c62a97f1f5555cc1d49e36efc94a8246ebc07
+  metadata.gz: e1363da993fdfc239cbc75c538c0a91dd93b0ef767008be1f3c9cc6577bd192deae023c8af6ccc6467c19ec42e468b3327c10e84de360bd846bea9f993339c00
+  data.tar.gz: dcc0b856e9911e0f52a23a89f63e260e06b9aaa866b8562052299f6d053f676e6c1807f492eb523ad9405bd2df3e619f603d63c5297c1b9c6cf87daad46709af

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+0.2.12
+===
+- Another fix for channels, kindly provided by Jan Žák (zakjan).
+
+0.2.11
+===
+- Fix for channels, kindly provided by Jan Žák (zakjan).
+
+0.2.10
+===
+- Update Rake due to security advisory.
+
+0.2.9
+===
+- Minor changes to clear some ruby interpreter and code smell warnings.
+- RSpecs now run properly in RubyMine
+
+0.2.8
+===
+- Change certain error messages to match the format produced by the Java runtime.
+
 0.2.7
 ===
 - In C extension, move `for` loop variable declaration outside the loop - AWS didn't like it.

data/antlr4-runtime.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib", "ext"]
 
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "simplecov", "~> 0.16.1"
   spec.extensions = %w[ext/rumourhash/extconf.rb]

data/lib/antlr4/runtime.rb

@@ -36,7 +36,6 @@ module Antlr4
     autoload :BufferedTokenStream, 'antlr4/runtime/buffered_token_stream'
     autoload :CharStream, 'antlr4/runtime/char_stream'
     autoload :CharStreams, 'antlr4/runtime/char_streams'
-    autoload :Chunk, 'antlr4/runtime/chunk'
     autoload :CodePointCharStream, 'antlr4/runtime/code_point_char_stream'
     autoload :CommonToken, 'antlr4/runtime/common_token'
     autoload :CommonTokenFactory, 'antlr4/runtime/common_token_factory'
@@ -124,7 +123,6 @@ module Antlr4
     autoload :StarBlockStartState, 'antlr4/runtime/star_block_start_state'
     autoload :StarLoopEntryState, 'antlr4/runtime/star_loop_entry_state'
     autoload :StarLoopbackState, 'antlr4/runtime/star_loopback_state'
-    autoload :SyntaxTree, 'antlr4/runtime/syntax_tree'
     autoload :TagChunk, 'antlr4/runtime/tag_chunk'
     autoload :TerminalNode, 'antlr4/runtime/terminal_node'
     autoload :TerminalNodeImpl, 'antlr4/runtime/terminal_node_impl'
@@ -134,7 +132,6 @@ module Antlr4
     autoload :TokenTagToken, 'antlr4/runtime/token_tag_token'
     autoload :TokensStartState, 'antlr4/runtime/tokens_start_state'
     autoload :Transition, 'antlr4/runtime/transition'
-    autoload :Tree, 'antlr4/runtime/tree'
     autoload :Trees, 'antlr4/runtime/trees'
     autoload :Triple, 'antlr4/runtime/triple'
     autoload :Utils, 'antlr4/runtime/utils'

data/lib/antlr4/runtime/antlr_file_stream.rb

@@ -2,10 +2,10 @@ module Antlr4::Runtime
   class ANTLRFileStream < ANTLRInputStream
     def initialize(file_name, encoding)
       @file_name = file_name
-      load(file_name, encoding)
+      load_file(file_name, encoding)
     end
 
-    def load(file_name, encoding)
+    def load_file(file_name, encoding)
       data = Utils.read_file(file_name, encoding)
       @n_items = data.length
     end

data/lib/antlr4/runtime/array_2d_hash_set.rb

@@ -145,7 +145,7 @@ module Antlr4::Runtime
 
     def iterator
       a = to_a
-      a.sort! {|a, b| @comparator.compare(a, b)} unless @comparator.nil?
+      a.sort! {|x, y| @comparator.compare(x, y)} unless @comparator.nil?
       SetIterator.new(a, self)
     end
 

data/lib/antlr4/runtime/atn_config.rb

@@ -12,12 +12,14 @@ module Antlr4::Runtime
     def initialize
       @reaches_into_outer_context = 0
       @alt = 0
+      @_hash = nil
+      @_bucket_hash = nil
     end
 
     def bucket_hash
       return @_bucket_hash unless @_bucket_hash.nil?
 
-      if !@_bucket_hash.nil?
+      unless @_bucket_hash.nil?
         if hash_code == @_bucket_hash
           puts 'Same hash_code for ATNConfig.bucket_hash'
         else
@@ -139,7 +141,7 @@ module Antlr4::Runtime
 
       hash_code = RumourHash.calculate([@state.state_number, @alt, @context, @semantic_context])
 
-      if !@_hash.nil?
+      unless @_hash.nil?
         if hash_code == @_hash
           puts 'Same hash_code for ATNConfig'
         else

data/lib/antlr4/runtime/buffered_token_stream.rb

@@ -109,7 +109,7 @@ module Antlr4::Runtime
         t = @tokens[i]
         break if t.type == Token::EOF
 
-        subset.add(t)
+        subset << t
         i += 1
       end
       subset
@@ -155,7 +155,7 @@ module Antlr4::Runtime
       @ptr = adjust_seek_index(0)
     end
 
-    def token_source(tokenSource)
+    def set_token_source(tokenSource)
       @token_source = tokenSource
       @tokens.clear
       @ptr = -1
@@ -177,7 +177,7 @@ module Antlr4::Runtime
       i = start
       while i <= stop
         t = @tokens[i]
-        filtered_tokens.add(t) if types.nil? || types.include?(t.type)
+        filtered_tokens << t if types.nil? || types.include?(t.type)
         i += 1
       end
       filtered_tokens = nil if filtered_tokens.empty?
@@ -186,7 +186,7 @@ module Antlr4::Runtime
 
     def get_tokens2(start, stop, ttype)
       s = Set.new
-      s.add(ttype)
+      s << ttype
       tokens1(start, stop, s)
     end
 
@@ -229,7 +229,7 @@ module Antlr4::Runtime
         raise IndexOutOfBoundsException, token_index + ' not in 0..' + (@tokens.length - 1)
       end
 
-      next_on_channel = next_token_on_channel(token_index + 1, Lexer.DEFAULT_TOKEN_CHANNEL)
+      next_on_channel = next_token_on_channel(token_index + 1, Lexer::DEFAULT_TOKEN_CHANNEL)
       from = token_index + 1
       # if none onchannel to right, next_on_channel=-1 so set to = last token
       to = next_on_channel == -1 ? size - 1 : next_on_channel
@@ -252,7 +252,7 @@ module Antlr4::Runtime
         return nil
       end
 
-      prev_on_channel = previous_token_on_channel(token_index - 1, Lexer.DEFAULT_TOKEN_CHANNEL)
+      prev_on_channel = previous_token_on_channel(token_index - 1, Lexer::DEFAULT_TOKEN_CHANNEL)
       return nil if prev_on_channel == token_index - 1
 
       # if none onchannel to left, prev_on_channel=-1 then from=0
@@ -272,9 +272,9 @@ module Antlr4::Runtime
       while i <= to
         t = @tokens[i]
         if channel == -1
-          hidden.add(t) if t.channel != Lexer.DEFAULT_TOKEN_CHANNEL
+          hidden << t if t.channel != Lexer::DEFAULT_TOKEN_CHANNEL
         else
-          hidden.add(t) if t.channel == channel
+          hidden << t if t.channel == channel
         end
         i += 1
       end

data/lib/antlr4/runtime/dfa.rb

@@ -51,7 +51,7 @@ module Antlr4::Runtime
       @s0.edges[precedence] = start_state
     end
 
-    def precedence_dfa(precedence_dfa)
+    def set_precedence_dfa(precedence_dfa)
       if precedence_dfa != @precedence_dfa
         raise UnsupportedOperationException, 'The precedence_dfa field cannot change after a DFA is constructed.'
       end

data/lib/antlr4/runtime/dfa_state.rb

@@ -20,6 +20,7 @@ module Antlr4::Runtime
       @is_accept_state = false
       @edges = []
       @state_number = -1
+      @_hash = nil
 
       if x.nil?
         @configs = ATNConfigSet.new
@@ -72,7 +73,7 @@ module Antlr4::Runtime
 
       hash_code = RumourHash.calculate([configs.hash])
 
-      if !@_hash.nil?
+      unless @_hash.nil?
         if hash_code == @_hash
           puts 'Same hash_code for DFAState'
         else

data/lib/antlr4/runtime/flexible_hash_map.rb

@@ -134,7 +134,7 @@ module Antlr4::Runtime
 
       hash_code = RumourHash.calculate(objs)
 
-      if !@_hash.nil?
+      unless @_hash.nil?
         if hash_code == @_hash
           puts 'Same hash_code for FlexibleHashMap'
         else

data/lib/antlr4/runtime/interval_set.rb

@@ -124,7 +124,7 @@ module Antlr4::Runtime
     def subtract(a)
       return IntervalSet.new self if a.nil? || a.is_nil
 
-      return subtract_interval_sets(self, a)
+      subtract_interval_sets(self, a)
     end
 
     def subtract_interval_sets(left, right)
@@ -297,7 +297,7 @@ module Antlr4::Runtime
 
       hash_code = RumourHash.calculate(ints)
 
-      if !@_hash.nil?
+      unless @_hash.nil?
         if hash_code == @_hash
           puts 'Same hash_code for IntervalSet'
         else
@@ -348,8 +348,8 @@ module Antlr4::Runtime
     end
 
     def to_string_from_vocabulary(vocabulary)
-      buf = ''
-      return 'end' if @intervals.nil? || @intervals.empty?
+      buf = '{'
+      return '{end}' if @intervals.nil? || @intervals.empty?
 
       buf << '' if size > 1
       i = 0
@@ -367,10 +367,10 @@ module Antlr4::Runtime
             j += 1
           end
         end
-        buf << ', ' if i < @intervals.length
+        buf << ', ' if i < (@intervals.length - 1)
         i += 1
       end
-      buf << 'end' if size > 1
+      buf << '}' if size > 1
       buf
     end
 

data/lib/antlr4/runtime/lexer_channel_action.rb

@@ -16,15 +16,15 @@ module Antlr4::Runtime
     end
 
     def execute(lexer)
-      lexer.setChannel(@channel)
+      lexer._channel = @channel
     end
 
     def hash
       return @_hash unless @_hash.nil?
 
-      hash_code = RumourHash.calculate([action_type.ordinal, channel])
+      hash_code = RumourHash.calculate([action_type, @channel])
 
-      if !@_hash.nil?
+      unless @_hash.nil?
         if hash_code == @_hash
           puts 'Same hash_code for LexerChannelAction'
         else

data/lib/antlr4/runtime/lexer_custom_action.rb

@@ -26,7 +26,7 @@ module Antlr4::Runtime
 
       hash_code = RumourHash.calculate([action_type, rule_index, action_index])
 
-      if !@_hash.nil?
+      unless @_hash.nil?
         if hash_code == @_hash
           puts 'Same hash_code for LexerCustomAction'
         else

data/lib/antlr4/runtime/lexer_indexed_custom_action.rb

@@ -26,7 +26,7 @@ module Antlr4::Runtime
 
       hash_code = RumourHash.calculate([offset, action])
 
-      if !@_hash.nil?
+      unless @_hash.nil?
         if hash_code == @_hash
           puts 'Same hash_code for LexerIndexedCustomAction'
         else

data/lib/antlr4/runtime/lexer_mode_action.rb

@@ -24,7 +24,7 @@ module Antlr4::Runtime
 
       hash_code = RumourHash.calculate([action_type, mode])
 
-      if !@_hash.nil?
+      unless @_hash.nil?
         if hash_code == @_hash
           puts 'Same hash_code for LexerModeAction'
         else

data/lib/antlr4/runtime/lexer_more_action.rb

@@ -20,7 +20,7 @@ module Antlr4::Runtime
 
       hash_code = RumourHash.calculate([action_type])
 
-      if !@_hash.nil?
+      unless @_hash.nil?
         if hash_code == @_hash
           puts 'Same hash_code for LexerMoreAction'
         else

data/lib/antlr4/runtime/lexer_pop_mode_action.rb

@@ -20,7 +20,7 @@ module Antlr4::Runtime
 
       hash_code = RumourHash.calculate([action_type])
 
-      if !@_hash.nil?
+      unless @_hash.nil?
         if hash_code == @_hash
           puts 'Same hash_code for LexerPopModeAction'
         else

data/lib/antlr4/runtime/lexer_push_mode_action.rb

@@ -24,7 +24,7 @@ module Antlr4::Runtime
 
       hash_code = RumourHash.calculate([action_type, mode])
 
-      if !@_hash.nil?
+      unless @_hash.nil?
         if hash_code == @_hash
           puts 'Same hash_code for LexerPushModeAction'
         else

data/lib/antlr4/runtime/lexer_skip_action.rb

@@ -3,6 +3,10 @@ module Antlr4::Runtime
   class LexerSkipAction < LexerAction
     include Singleton
 
+    def initialize
+      @_hash = nil
+    end
+
     def action_type
       LexerActionType::SKIP
     end
@@ -20,7 +24,7 @@ module Antlr4::Runtime
 
       hash_code = RumourHash.calculate([action_type])
 
-      if !@_hash.nil?
+      unless @_hash.nil?
         if hash_code == @_hash
           puts 'Same hash_code for LexerSkipAction'
         else

data/lib/antlr4/runtime/lexer_type_action.rb

@@ -24,7 +24,7 @@ module Antlr4::Runtime
 
       hash_code = RumourHash.calculate([action_type, @type])
 
-      if !@_hash.nil?
+      unless @_hash.nil?
         if hash_code == @_hash
           puts 'Same hash_code for LexerTypeAction'
         else

data/lib/antlr4/runtime/parse_tree.rb

@@ -1,5 +1,5 @@
 module Antlr4::Runtime
 
-  class ParseTree < SyntaxTree
+  class ParseTree
   end
 end

data/lib/antlr4/runtime/parser_atn_simulator.rb

@@ -246,8 +246,7 @@ module Antlr4::Runtime
       end
 
       # all adds to dfa are done after we've created full D state
-      d = add_dfa_edge(dfa, prev_d, t, d)
-      d
+      add_dfa_edge(dfa, prev_d, t, d)
     end
 
     def predicate_dfa_state(dfa_state, decision_state) # We need to test all predicates, even in DFA states that

data/lib/antlr4/runtime/prediction_context_utils.rb

@@ -4,6 +4,8 @@ module Antlr4::Runtime
     INITIAL_HASH = 1
     EMPTY_RETURN_STATE = Integer::MAX
 
+    @@_hash = nil
+
     def self.from_rule_context(atn, outer_ctx)
       outer_ctx = ParserRuleContext::EMPTY if outer_ctx.nil?
 
@@ -388,9 +390,9 @@ module Antlr4::Runtime
     end
 
     def self.calculate_empty_hash_code
-      return @_hash unless @_hash.nil?
+      return @@_hash unless @@_hash.nil?
 
-      @_hash = RumourHash.calculate([INITIAL_HASH])
+      @@_hash = RumourHash.calculate([INITIAL_HASH])
     end
 
     def self.calculate_hash_code1(parent, return_state)

data/lib/antlr4/runtime/rule_node.rb

@@ -1,6 +1,4 @@
 module Antlr4::Runtime
   class RuleNode < ParseTree
-    def rule_context
-    end
   end
 end

data/lib/antlr4/runtime/semantic_context.rb

@@ -16,6 +16,7 @@ module Antlr4::Runtime
         @rule_index = rule_index
         @pred_index = pred_index
         @is_ctx_dependent = is_ctx_dependent
+        @_hash = nil
       end
 
       def eval(parser, parser_call_stack)
@@ -28,7 +29,7 @@ module Antlr4::Runtime
 
         hash_code = RumourHash.calculate([@rule_index, @pred_index, @is_ctx_dependent ? 1 : 0])
 
-        if !@_hash.nil?
+        unless @_hash.nil?
           if hash_code == @_hash
             puts 'Same hash_code for SemanticContext'
           else
@@ -46,7 +47,7 @@ module Antlr4::Runtime
       end
 
       def to_s
-        '' + @rule_index + ':' + @pred_index + 'end?'
+        '{' + @rule_index + ':' + @pred_index + '}?'
       end
     end
 
@@ -84,7 +85,7 @@ module Antlr4::Runtime
 
       # precedence >= _precedenceStack.peek()
       def to_s
-        '' + @precedence + '>=precend?'
+        '{' + @precedence + '>=prec}?'
       end
     end
 
@@ -125,7 +126,7 @@ module Antlr4::Runtime
 
       def hash
         hash_code = RumourHash.calculate(@opnds, AND.hash)
-        if !@_hash2.nil?
+        unless @_hash2.nil?
           if hash_code == @_hash2
             puts 'Same hash_code for SemanticContext_2'
           else
@@ -220,7 +221,7 @@ module Antlr4::Runtime
 
       def hash
         hash_code = MurmurHash.calculate(@opnds, OR.hash)
-        if !@_hash3.nil?
+        unless @_hash3.nil?
           if hash_code == @_hash3
             puts 'Same hash_code for SemanticContext_2'
           else

data/lib/antlr4/runtime/tag_chunk.rb

@@ -1,6 +1,6 @@
 module Antlr4::Runtime
 
-  class TagChunk < Chunk
+  class TagChunk
     attr_reader :tag
     attr_reader :label
 

data/lib/antlr4/runtime/text_chunk.rb

@@ -1,6 +1,6 @@
 module Antlr4::Runtime
 
-  class TextChunk < Chunk
+  class TextChunk
     attr_reader :text
 
     def initialize(text)

data/lib/antlr4/runtime/triple.rb

@@ -23,7 +23,7 @@ module Antlr4::Runtime
     def hash
       hash_code = RumourHash.hash([@a, @b, @c])
 
-      if !@_hash.nil?
+      unless @_hash.nil?
         if hash_code == @_hash
           puts 'Same hash_code for Triple'
         else

data/lib/antlr4/runtime/version.rb

@@ -1,5 +1,5 @@
 module Antlr4
   module Runtime
-    VERSION = "0.2.7"
+    VERSION = "0.2.12"
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: antlr4-runtime
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.12
 platform: ruby
 authors:
 - Tony Walmsley
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-05-25 00:00:00.000000000 Z
+date: 2020-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -105,7 +105,6 @@ files:
 - lib/antlr4/runtime/buffered_token_stream.rb
 - lib/antlr4/runtime/char_stream.rb
 - lib/antlr4/runtime/char_streams.rb
-- lib/antlr4/runtime/chunk.rb
 - lib/antlr4/runtime/code_point_char_stream.rb
 - lib/antlr4/runtime/common_token.rb
 - lib/antlr4/runtime/common_token_factory.rb
@@ -193,7 +192,6 @@ files:
 - lib/antlr4/runtime/star_block_start_state.rb
 - lib/antlr4/runtime/star_loop_entry_state.rb
 - lib/antlr4/runtime/star_loopback_state.rb
-- lib/antlr4/runtime/syntax_tree.rb
 - lib/antlr4/runtime/tag_chunk.rb
 - lib/antlr4/runtime/terminal_node.rb
 - lib/antlr4/runtime/terminal_node_impl.rb
@@ -203,7 +201,6 @@ files:
 - lib/antlr4/runtime/token_tag_token.rb
 - lib/antlr4/runtime/tokens_start_state.rb
 - lib/antlr4/runtime/transition.rb
-- lib/antlr4/runtime/tree.rb
 - lib/antlr4/runtime/trees.rb
 - lib/antlr4/runtime/triple.rb
 - lib/antlr4/runtime/utils.rb
@@ -217,7 +214,7 @@ homepage: https://github.com/MODLanguage/antlr4-ruby-runtime
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -233,9 +230,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.7.9
-signing_key: 
+signing_key:
 specification_version: 4
 summary: ANTLR4 Runtime for Ruby language target lexers and parsers.
 test_files: []

data/lib/antlr4/runtime/chunk.rb

@@ -1,4 +0,0 @@
-module Antlr4::Runtime
-  class Chunk
-  end
-end

data/lib/antlr4/runtime/syntax_tree.rb

@@ -1,4 +0,0 @@
-module Antlr4::Runtime
-  class SyntaxTree < Tree
-  end
-end

data/lib/antlr4/runtime/tree.rb

@@ -1,4 +0,0 @@
-module Antlr4::Runtime
-  class Tree
-  end
-end