antlr4-runtime 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 245b28b3ff9464508be9cdd7421d5bb4db7255a841f812bf75956e7fb3787210
-  data.tar.gz: fd3addc862687ad9ab7a1421377e89dc35141abad04c9dad4007d1bc47896249
+  metadata.gz: 78c1ec511ddcf4fec60fd365e53346033575d3921de4be084648b9cce1959e14
+  data.tar.gz: 4d27831b78dce625246739d808ed5a8417efcdf2917a0478599c4ebcaedb0d6b
 SHA512:
-  metadata.gz: 8766b0cf6d15ec643ebebe0abf7cad7aef8386fb2a959189c96349f331719d74bd07d32f1fec747b96cda21fcdc564eb72001bb250b66771f50ba30319a16f71
-  data.tar.gz: b165e132a9c5f03371118eba4e92bdc2ac90629392b5b864dd0e72ec1bcd034c018fe5f686c5bb2f4efc94f2ef128442f25a70d9445a3a21284c10d89fcac2ee
+  metadata.gz: ff1c3e79f915a0b433abed5ec837eb1523bf52b5fbb991c1be476309eefd192580e3457aaabf21aff372d2e191695ead23b1f5cc91e6ab1c69707fdb395c7030
+  data.tar.gz: b224ea329f5ec05f6f1e22867f17e6b7bd16129e691448e2bc4f0c3568e57c23bddcb97973a8930ff6f54e6e7616cab2f7d296d7a7d10c664f2bb72fb74c48ba

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+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.

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

@@ -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

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

data/lib/antlr4/runtime/lexer_channel_action.rb

@@ -24,7 +24,7 @@ module Antlr4::Runtime
 
       hash_code = RumourHash.calculate([action_type.ordinal, 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.8"
+    VERSION = "0.2.9"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: antlr4-runtime
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Tony Walmsley
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-05 00:00:00.000000000 Z
+date: 2019-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -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

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