antlr4-runtime 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5f838157511ca399f3345a7ef863d975bfa314b384a9857988d1ba12b25dec7
-  data.tar.gz: 8a3cb7143cc24821b294a8b4b7057173cb7217c7b1fb5a522240152df3bdc7c5
+  metadata.gz: 0ec888a28668505439b0e3e2f068cd6318373095dee14c9ce0d7efc977abb159
+  data.tar.gz: 828c1614048ee0b76c8ad1814ea8e373757071bf36bed66d66286272330d88dd
 SHA512:
-  metadata.gz: bbb44e41cc7bea850e64cd865875f27b638893288b95aa42d632b992a15252b7b361697626fa8198491e7d3b38f32a808b2f4940e7a3aa3f9167151da52e6c46
-  data.tar.gz: e466a2d9d751c2d394d27f8b23d501d90c9f2608a46d8d017f25e4e6643566bc10741082c7ed0799322e6a3f4c80f653d0cb9c5644e67419423304950ba26db3
+  metadata.gz: c7c4ea5af9d828124b7fa34e43db1593c44653ca4900660c8743d9cd7871cbff9d12cf10a982006c95db41a77cf4622326d74cccf839e6a99c717a5461be6747
+  data.tar.gz: b56c6dbf61b1ef856ffd72d80ebc38e1c7cde728519a9bc471861c533ba0e74d0c36a39a8d68c6978304c24c563e02f0445601afd26d753a9b97a299331ebe92

data/.gitignore

@@ -12,6 +12,7 @@
 **/*.o
 Gemfile.lock
 .ruby-version
+ext/rumourhash/Makefile
 
 # rspec failure tracking
 .rspec_status

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+0.2.4
+===
+- Performance improvements and bug fixes from Cameron Dutro.
+
 0.2.3
 ===
 - Fixed a problem displaying error messages when parsing fails.

data/ext/rumourhash/rumourhash.c

@@ -6,11 +6,9 @@
 #define r2 13
 #define m 5
 #define n 0xE6546B64
+#define defaultSeed 7
 
-static VALUE rumour_hash_update_int(VALUE self, VALUE hashv, VALUE valuev) {
-    long hash = NUM2LONG(hashv);
-    long value = NUM2LONG(valuev);
-
+static long rumour_hash_update_int_impl(VALUE self, long hash, long value) {
     long k = value;
     k *= c1;
     k = (k << r1) | (k >> (32 - r1));
@@ -20,13 +18,17 @@ static VALUE rumour_hash_update_int(VALUE self, VALUE hashv, VALUE valuev) {
     hash = (hash << r2) | (hash >> (32 - r2));
     hash *= m + n;
 
-    return LONG2NUM(hash);
+    return hash;
 }
 
-static VALUE rumour_hash_finish(VALUE self, VALUE hashv, VALUE n_wordsv) {
+static VALUE rumour_hash_update_int(VALUE self, VALUE hashv, VALUE valuev) {
     long hash = NUM2LONG(hashv);
-    long n_words = NUM2LONG(n_wordsv);
+    long value = NUM2LONG(valuev);
+    hash = rumour_hash_update_int_impl(self, hash, value);
+    return LONG2NUM(hash);
+}
 
+static long rumour_hash_finish_impl(VALUE self, long hash, long n_words) {
     hash = hash ^ (n_words * 4);
     hash = hash ^ (hash >> 16);
     hash *= 0x85EBCA6B;
@@ -34,10 +36,52 @@ static VALUE rumour_hash_finish(VALUE self, VALUE hashv, VALUE n_wordsv) {
     hash *= 0xC2B2AE35;
     hash ^= (hash >> 16);
 
+    return hash;
+}
+
+static VALUE rumour_hash_finish(VALUE self, VALUE hashv, VALUE n_wordsv) {
+    long hash = NUM2LONG(hashv);
+    long n_words = NUM2LONG(n_wordsv);
+    hash = rumour_hash_finish_impl(self, hash, n_words);
+    return LONG2NUM(hash);
+}
+
+static VALUE rumour_hash_calculate(int argc, VALUE* argv, VALUE self) {
+    VALUE itemsv;
+    VALUE seed;
+
+    rb_scan_args(argc, argv, "11", &itemsv, &seed);
+
+    long hash;
+
+    if (seed == Qnil) {
+        hash = defaultSeed;
+    } else {
+        hash = NUM2LONG(seed);
+    }
+
+    for (int i = 0; i < RARRAY_LEN(itemsv); i ++) {
+        VALUE current = RARRAY_AREF(itemsv, i);
+        long val;
+
+        if (current == Qnil || current == Qfalse) {
+            val = 0;
+        } else if (current == Qtrue) {
+            val = 1;
+        } else if (CLASS_OF(current) == rb_cInteger) {
+            val = NUM2LONG(current);
+        } else {
+            val = NUM2LONG(rb_hash(current));
+        }
+
+        hash = rumour_hash_update_int_impl(self, hash, val);
+    }
+
+    hash = rumour_hash_finish_impl(self, hash, RARRAY_LEN(itemsv));
     return LONG2NUM(hash);
 }
 
-static VALUE bit_count(VALUE self, VALUE v) {
+static VALUE rumour_hash_bit_count(VALUE self, VALUE v) {
     long num = NUM2LONG(v);
     int count = 0;
 
@@ -52,8 +96,8 @@ static VALUE bit_count(VALUE self, VALUE v) {
 
 void Init_rumourhash() {
   VALUE mod = rb_define_module("RumourHash");
-  rb_define_method(mod, "rumour_hash_update_int", rumour_hash_update_int, 2);
-  rb_define_method(mod, "rumour_hash_finish", rumour_hash_finish, 2);
-  rb_define_method(mod, "bit_count", bit_count, 1);
+  rb_define_singleton_method(mod, "calculate", rumour_hash_calculate, -1);
+  rb_define_singleton_method(mod, "update_int", rumour_hash_update_int, 2);
+  rb_define_singleton_method(mod, "finish", rumour_hash_finish, 2);
+  rb_define_singleton_method(mod, "bit_count", rumour_hash_bit_count, 1);
 }
-

data/lib/antlr4/runtime.rb

@@ -85,7 +85,6 @@ module Antlr4
     autoload :LL1Analyzer, 'antlr4/runtime/ll1_analyzer'
     autoload :LookaheadEventInfo, 'antlr4/runtime/lookahead_event_info'
     autoload :LoopEndState, 'antlr4/runtime/loop_end_state'
-    autoload :MurmurHash, 'antlr4/runtime/murmur_hash'
     autoload :NoViableAltException, 'antlr4/runtime/no_viable_alt_exception'
     autoload :NotSetTransition, 'antlr4/runtime/not_set_transition'
     autoload :ObjectEqualityComparator, 'antlr4/runtime/object_equality_comparator'

data/lib/antlr4/runtime/array_2d_hash_set.rb

@@ -108,7 +108,7 @@ module Antlr4::Runtime
         i += 1
       end
 
-      @_hash = MurmurHash.hash_objs(objs)
+      @_hash = RumourHash.calculate(objs)
     end
 
     def ==(o)

data/lib/antlr4/runtime/atn_config.rb

@@ -24,7 +24,7 @@ module Antlr4::Runtime
           puts 'Different hash_code for ATNConfig.bucket_hash'
         end
       end
-      @_bucket_hash = MurmurHash.hash_int_int(@state.state_number, @alt)
+      @_bucket_hash = RumourHash.calculate([@state.state_number, @alt])
     end
 
     def atn_config_copy(old)
@@ -137,7 +137,7 @@ module Antlr4::Runtime
     def hash
       return @_hash unless @_hash.nil?
 
-      hash_code = MurmurHash.hash_int_int_obj_obj(@state.state_number,@alt,@context,@semantic_context)
+      hash_code = RumourHash.calculate([@state.state_number, @alt, @context, @semantic_context])
 
       if !@_hash.nil?
         if hash_code == @_hash

data/lib/antlr4/runtime/bit_set.rb

@@ -1,7 +1,3 @@
-require 'rumourhash/rumourhash'
-
-include RumourHash
-
 module Antlr4::Runtime
 
   class BitSet
@@ -17,12 +13,23 @@ module Antlr4::Runtime
       @bits |= (1 << x)
     end
 
+    def clear(idx = nil)
+      # check for zero to avoid trying to take the log2 of it, which
+      # returns -Infinity
+      if !idx || bits == 0
+        @bits = 0
+        return
+      end
+
+      @bits &= 2**Math.log2(bits).ceil - 2**idx - 1
+    end
+
     def get(x)
       (@bits & (1 << x)) > 0 ? true : false
     end
 
     def cardinality
-      bit_count(@bits)
+      RumourHash.bit_count(@bits)
     end
 
     def or(bit_set)
@@ -51,4 +58,4 @@ module Antlr4::Runtime
       buf
     end
   end
-end
+end

data/lib/antlr4/runtime/buffered_token_stream.rb

@@ -1,3 +1,6 @@
+require 'antlr4/runtime/writable_token'
+require 'antlr4/runtime/token_stream'
+
 module Antlr4::Runtime
 
   class BufferedTokenStream < TokenStream
@@ -75,7 +78,7 @@ module Antlr4::Runtime
       i = 0
       while i < n
         t = @token_source.next_token
-        t.index = @tokens.length if t.is_a? WritableToken
+        t.token_index = @tokens.length if t.is_a? WritableToken
         @tokens << t
         if t.type == Token::EOF
           @fetched_eof = true
@@ -303,7 +306,7 @@ module Antlr4::Runtime
         break if t.type == Token::EOF
 
         buf << t.text
-        i += 1
+        buf << i += 1
       end
       buf
     end
@@ -329,4 +332,4 @@ module Antlr4::Runtime
       end
     end
   end
-end
+end

data/lib/antlr4/runtime/char_streams.rb

@@ -4,7 +4,7 @@ module Antlr4::Runtime
     DEFAULT_BUFFER_SIZE = 4096
 
     def self.from_string(s, source_name)
-      CodePointCharStream.new(0, s.length, source_name, s.bytes)
+      CodePointCharStream.new(0, s.length, source_name, s.codepoints)
     end
   end
 end

data/lib/antlr4/runtime/common_token.rb

@@ -11,7 +11,7 @@ module Antlr4::Runtime
     attr_accessor :char_position_in_line
     attr_accessor :channel
     attr_accessor :source
-    attr_accessor :index
+    attr_accessor :token_index
     attr_accessor :start
     attr_accessor :stop
     attr_accessor :_text
@@ -19,7 +19,7 @@ module Antlr4::Runtime
     def initialize(type = nil)
       @char_position_in_line = -1
       @channel = Token::DEFAULT_CHANNEL
-      @index = -1
+      @token_index = -1
       @type = type
       @source = @@EMPTY_SOURCE
       @_text = nil
@@ -48,7 +48,7 @@ module Antlr4::Runtime
       result = CommonToken.new(old_token.type)
 
       result.line = old_token.line
-      result.index = old_token.token_index
+      result.token_index = old_token.token_index
       result.char_position_in_line = old_token.char_position_in_line
       result.channel = old_token.channel
       result.start = old_token.start_index
@@ -122,4 +122,4 @@ module Antlr4::Runtime
       '[@' << token_index.to_s << ',' << @start.to_s << ':' << @stop.to_s << "='" << txt << "',<" << type_string << '>' << channel_str << ',' << @line.to_s << ':' << char_position_in_line.to_s << ']'
     end
   end
-end
+end

data/lib/antlr4/runtime/default_error_strategy.rb

@@ -53,7 +53,7 @@ module Antlr4::Runtime
     end
 
     def recover(recognizer, _e)
-      if @last_error_index == recognizer._input.index && !@last_error_states.nil? && @last_error_states.include?(recognizer._state_number)
+      if @last_error_index == recognizer._input.index && !@last_error_states.nil? && @last_error_states.contains(recognizer._state_number)
         # uh oh, another error at same token index and previously-visited
         # state in ATN must be a case where lt(1) is in the recovery
         # token set so nothing got consumed. Consume a single token

data/lib/antlr4/runtime/dfa_state.rb

@@ -70,7 +70,7 @@ module Antlr4::Runtime
     def hash
       return @_hash unless @_hash.nil?
 
-      hash_code = MurmurHash.hash_int(configs.hash)
+      hash_code = RumourHash.calculate([configs.hash])
 
       if !@_hash.nil?
         if hash_code == @_hash
@@ -79,6 +79,7 @@ module Antlr4::Runtime
           puts 'Different hash_code for DFAState'
         end
       end
+
       @_hash = hash_code
     end
 

data/lib/antlr4/runtime/flexible_hash_map.rb

@@ -19,7 +19,7 @@ module Antlr4::Runtime
     end
 
     def initialize(comparator = nil, initial_capacity = nil, initial_bucket_capacity = nil)
-      comparator = ObjectEqualityComparator.INSTANCE if comparator.nil?
+      comparator = ObjectEqualityComparator.instance if comparator.nil?
 
       initial_capacity = INITIAL_CAPACITY if initial_capacity.nil?
       initial_bucket_capacity = INITIAL_BUCKET_CAPACITY if initial_bucket_capacity.nil?
@@ -132,7 +132,7 @@ module Antlr4::Runtime
         i += 1
       end
 
-      hash_code = MurmurHash.hash_objs(objs)
+      hash_code = RumourHash.calculate(objs)
 
       if !@_hash.nil?
         if hash_code == @_hash
@@ -229,4 +229,4 @@ module Antlr4::Runtime
       buf.to_s
     end
   end
-end
+end

data/lib/antlr4/runtime/interval_set.rb

@@ -290,16 +290,12 @@ module Antlr4::Runtime
     end
 
     def hash
-      ints = []
-      i = 0
-      while i < @intervals.length
-        interval = @intervals[i]
-        ints << interval.a
-        ints << interval.b
-        i += 1
+      ints = @intervals.each_with_object([]) do |interval, ret|
+        ret << interval.a
+        ret << interval.b
       end
 
-      hash_code = MurmurHash.hash_ints(ints)
+      hash_code = RumourHash.calculate(ints)
 
       if !@_hash.nil?
         if hash_code == @_hash
@@ -499,4 +495,4 @@ module Antlr4::Runtime
     @@empty_set = IntervalSet.new
     @@empty_set.readonly(true)
   end
-end
+end

data/lib/antlr4/runtime/lexer.rb

@@ -55,9 +55,17 @@ module Antlr4::Runtime
       @_factory = CommonTokenFactory.instance
     end
 
+    def token_factory
+      @_factory
+    end
+
+    def token_factory=(factory)
+      @_factory = factory
+    end
+
     def next_token
       if @_input.nil?
-        raise IllegalStateException, 'nextToken requires a non-nil input stream.'
+        raise IllegalStateException, 'next_token requires a non-nil input stream.'
       end
 
       # Mark start location in char stream so unbuffered streams are

data/lib/antlr4/runtime/lexer_action_executor.rb

@@ -6,7 +6,7 @@ module Antlr4::Runtime
 
     def initialize(lexer_actions)
       @lexer_actions = lexer_actions
-      @hash_code = MurmurHash.hash_objs(lexer_actions)
+      @hash_code = RumourHash.calculate(lexer_actions)
     end
 
     def self.append(lexer_action_executor, lexer_action)

data/lib/antlr4/runtime/lexer_atn_simulator.rb

@@ -348,26 +348,27 @@ module Antlr4::Runtime
 
     def epsilon_target(input, config, t, configs, speculative, treat_eof_as_epsilon)
       c = nil
-      case t.serialization_type
-      when Transition::RULE
+      serialization_type = t.serialization_type
+
+      if serialization_type == Transition::RULE
         rule_transition = t
         new_context = SingletonPredictionContext.new(config.context, rule_transition.follow_state.state_number)
         c = LexerATNConfig.new
         c.lexer_atn_config5(config, t.target, new_context)
 
-      when Transition::PRECEDENCE
+      elsif serialization_type == Transition::PRECEDENCE
 
         raise UnsupportedOperationException, 'Precedence predicates are not supported in lexers.'
 
-      when Transition::PREDICATE
+      elsif serialization_type == Transition::PREDICATE
         pt = t
-        puts('EVAL rule ' + pt.rule_index + ':' + pt.pred_index) if @@debug
+        # puts('EVAL rule ' + pt.rule_index + ':' + pt.pred_index) if @@debug
         configs.has_semantic_context = true
         if evaluate_predicate(input, pt.rule_index, pt.pred_index, speculative)
           c = LexerATNConfig.create_from_config(config, t.target)
         end
 
-      when Transition::ACTION
+      elsif serialization_type == Transition::ACTION
 
         if config.context.nil? || config.context.empty_path?
           # execute actions anywhere in the start rule for a token.
@@ -390,10 +391,10 @@ module Antlr4::Runtime
           c.lexer_atn_config3(config, t.target)
         end
 
-      when Transition::EPSILON
+      elsif serialization_type == Transition::EPSILON
         c = LexerATNConfig.new
         c.lexer_atn_config3(config, t.target)
-      when Transition::ATOM, Transition::RANGE, Transition::SET
+      elsif serialization_type == Transition::ATOM || serialization_type == Transition::RANGE || serialization_type == Transition::SET
         if treat_eof_as_epsilon
           if t.matches(CharStream.EOF, Lexer.MIN_CHAR_VALUE, Lexer.MAX_CHAR_VALUE)
             c = LexerATNConfig.create_from_config(config, t.target)

data/lib/antlr4/runtime/lexer_channel_action.rb

@@ -22,7 +22,7 @@ module Antlr4::Runtime
     def hash
       return @_hash unless @_hash.nil?
 
-      hash_code = MurmurHash.hash_int_int(action_type.ordinal, channel)
+      hash_code = RumourHash.calculate([action_type.ordinal, channel])
 
       if !@_hash.nil?
         if hash_code == @_hash
@@ -48,4 +48,4 @@ module Antlr4::Runtime
       'channel(' << @channel.to_s << ')'
     end
   end
-end
+end

data/lib/antlr4/runtime/lexer_custom_action.rb

@@ -24,7 +24,7 @@ module Antlr4::Runtime
     def hash
       return @_hash unless @_hash.nil?
 
-      hash_code = MurmurHash.hash_ints([action_type, rule_index, action_index])
+      hash_code = RumourHash.calculate([action_type, rule_index, action_index])
 
       if !@_hash.nil?
         if hash_code == @_hash
@@ -33,6 +33,7 @@ module Antlr4::Runtime
           puts 'Different hash_code for LexerCustomAction'
         end
       end
+
       @_hash = hash_code
     end
 

data/lib/antlr4/runtime/lexer_indexed_custom_action.rb

@@ -24,7 +24,7 @@ module Antlr4::Runtime
     def hash
       return @_hash unless @_hash.nil?
 
-      hash_code = MurmurHash.hash_int_obj(offset, action)
+      hash_code = RumourHash.calculate([offset, action])
 
       if !@_hash.nil?
         if hash_code == @_hash
@@ -46,4 +46,4 @@ module Antlr4::Runtime
       @offset == other.offset && @action == other.action
     end
   end
-end
+end

data/lib/antlr4/runtime/lexer_mode_action.rb

@@ -22,7 +22,7 @@ module Antlr4::Runtime
     def hash
       return @_hash unless @_hash.nil?
 
-      hash_code = MurmurHash.hash_int_int(action_type, mode)
+      hash_code = RumourHash.calculate([action_type, mode])
 
       if !@_hash.nil?
         if hash_code == @_hash
@@ -48,4 +48,4 @@ module Antlr4::Runtime
       'mode(' << @mode << ')'
     end
   end
-end
+end

data/lib/antlr4/runtime/lexer_more_action.rb

@@ -18,7 +18,7 @@ module Antlr4::Runtime
     def hash
       return @_hash unless @_hash.nil?
 
-      hash_code = MurmurHash.hash_int(action_type)
+      hash_code = RumourHash.calculate([action_type])
 
       if !@_hash.nil?
         if hash_code == @_hash
@@ -38,4 +38,4 @@ module Antlr4::Runtime
       'more'
     end
   end
-end
+end

data/lib/antlr4/runtime/lexer_pop_mode_action.rb

@@ -18,7 +18,7 @@ module Antlr4::Runtime
     def hash
       return @_hash unless @_hash.nil?
 
-      hash_code = MurmurHash.hash_int(action_type)
+      hash_code = RumourHash.calculate([action_type])
 
       if !@_hash.nil?
         if hash_code == @_hash
@@ -38,4 +38,4 @@ module Antlr4::Runtime
       'popMode'
     end
   end
-end
+end

data/lib/antlr4/runtime/lexer_push_mode_action.rb

@@ -22,7 +22,7 @@ module Antlr4::Runtime
     def hash
       return @_hash unless @_hash.nil?
 
-      hash_code = MurmurHash.hash_int_int(action_type, mode)
+      hash_code = RumourHash.calculate([action_type, mode])
 
       if !@_hash.nil?
         if hash_code == @_hash
@@ -48,4 +48,4 @@ module Antlr4::Runtime
       'pushMode(' << @mode << ')'
     end
   end
-end
+end

data/lib/antlr4/runtime/lexer_skip_action.rb

@@ -18,7 +18,7 @@ module Antlr4::Runtime
     def hash
       return @_hash unless @_hash.nil?
 
-      hash_code = MurmurHash.hash_int(action_type)
+      hash_code = RumourHash.calculate([action_type])
 
       if !@_hash.nil?
         if hash_code == @_hash

data/lib/antlr4/runtime/lexer_type_action.rb

@@ -22,7 +22,7 @@ module Antlr4::Runtime
     def hash
       return @_hash unless @_hash.nil?
 
-      hash_code = MurmurHash.hash_int_int(action_type, @type)
+      hash_code = RumourHash.calculate([action_type, @type])
 
       if !@_hash.nil?
         if hash_code == @_hash
@@ -48,4 +48,4 @@ module Antlr4::Runtime
       'type(' << @type << ')'
     end
   end
-end
+end

data/lib/antlr4/runtime/ll1_analyzer.rb

@@ -3,6 +3,8 @@ module Antlr4::Runtime
   class LL1Analyzer
     @@hit_pred = Token::INVALID_TYPE
 
+    attr_reader :atn
+
     def initialize(atn)
       @atn = atn
     end
@@ -29,7 +31,7 @@ module Antlr4::Runtime
       r = IntervalSet.new
       see_thru_preds = true # ignore preds get all lookahead
       look_context = !ctx.nil? ? PredictionContextUtils.from_rule_context(s.atn, ctx) : nil
-      _look(s, stop_state, look_context, r, Set.new, Set.new, see_thru_preds, true)
+      _look(s, stop_state, look_context, r, Set.new, BitSet.new, see_thru_preds, true)
       r
     end
 
@@ -70,7 +72,7 @@ module Antlr4::Runtime
             calledRuleStack.clear(s.rule_index)
             i = 0
             while i < ctx.size
-              return_state = atn.states.get(ctx.get_return_state(i))
+              return_state = atn.states[ctx.get_return_state(i)]
 
               _look(return_state, stopState, ctx.get_parent(i), look, lookBusy, calledRuleStack, seeThruPreds, addEOF)
               i += 1

data/lib/antlr4/runtime/parser.rb

@@ -171,8 +171,8 @@ module Antlr4::Runtime
       @_input.token_source.token_factory
     end
 
-    def set_token_factory(factory)
-      @_input.token_source.set_token_factory(factory)
+    def token_factory=(factory)
+      @_input.token_source.token_factory = factory
     end
 
     def get_atn_with_bypass_alts

data/lib/antlr4/runtime/parser_rule_context.rb

@@ -55,7 +55,7 @@ module Antlr4::Runtime
     end
 
     def add_error_node(error_node)
-      error_node.setParent(self)
+      error_node.parent = self
       add_any_child(error_node)
     end
 

data/lib/antlr4/runtime/prediction_context.rb

@@ -8,7 +8,7 @@ module Antlr4::Runtime
       @@global_node_count = 0
     end
 
-    attr_accessor :cachedHashCode
+    attr_accessor :cached_hash_code
 
     def initialize(cached_hash_code)
       @id = @@global_node_count

data/lib/antlr4/runtime/prediction_context_utils.rb

@@ -390,15 +390,15 @@ module Antlr4::Runtime
     def self.calculate_empty_hash_code
       return @_hash unless @_hash.nil?
 
-      @_hash = MurmurHash.hash_int(INITIAL_HASH)
+      @_hash = RumourHash.calculate([INITIAL_HASH])
     end
 
     def self.calculate_hash_code1(parent, return_state)
-      MurmurHash.hash_int_obj(return_state, parent)
+      RumourHash.calculate([return_state, parent])
     end
 
     def self.calculate_hash_code2(parents, return_states)
-      MurmurHash.hash_ints_objs(return_states, parents)
+      RumourHash.calculate(return_states + parents)
     end
   end
 end

data/lib/antlr4/runtime/prediction_mode.rb

@@ -15,7 +15,7 @@ module Antlr4::Runtime
       include Singleton
 
       def hash(o)
-        MurmurHash.hash_int_obj(o.state.state_number, o.context)
+        RumourHash.calculate([o.state.state_number, o.context])
       end
 
       def equals(a, b)

data/lib/antlr4/runtime/semantic_context.rb

@@ -26,7 +26,7 @@ module Antlr4::Runtime
       def hash
         return @_hash unless @_hash.nil?
 
-        hash_code = MurmurHash.hash_ints([@rule_index, @pred_index, @is_ctx_dependent ? 1 : 0])
+        hash_code = RumourHash.calculate([@rule_index, @pred_index, @is_ctx_dependent ? 1 : 0])
 
         if !@_hash.nil?
           if hash_code == @_hash
@@ -124,7 +124,7 @@ module Antlr4::Runtime
       end
 
       def hash
-        hash_code = MurmurHash.hash(@opnds, AND.hash)
+        hash_code = RumourHash.calculate(@opnds, AND.hash)
         if !@_hash2.nil?
           if hash_code == @_hash2
             puts 'Same hash_code for SemanticContext_2'
@@ -219,7 +219,7 @@ module Antlr4::Runtime
       end
 
       def hash
-        hash_code = MurmurHash.hash(@opnds, OR.hash)
+        hash_code = MurmurHash.calculate(@opnds, OR.hash)
         if !@_hash3.nil?
           if hash_code == @_hash3
             puts 'Same hash_code for SemanticContext_2'
@@ -308,4 +308,4 @@ module Antlr4::Runtime
 
     NONE = Predicate.new
   end
-end
+end

data/lib/antlr4/runtime/triple.rb

@@ -21,7 +21,7 @@ module Antlr4::Runtime
     end
 
     def hash
-      hash_code = MurmurHash.hash_objs([@a, @b, @c])
+      hash_code = RumourHash.hash([@a, @b, @c])
 
       if !@_hash.nil?
         if hash_code == @_hash
@@ -37,4 +37,4 @@ module Antlr4::Runtime
       '(' << @a.to_s << ',' << @b.to_s << ', ' << @c.to_s << ')'
     end
   end
-end
+end

data/lib/antlr4/runtime/version.rb

@@ -1,5 +1,5 @@
 module Antlr4
   module Runtime
-    VERSION = "0.2.3"
+    VERSION = "0.2.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: antlr4-runtime
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Tony Walmsley
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-12 00:00:00.000000000 Z
+date: 2019-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -73,7 +73,6 @@ files:
 - antlr4-runtime.gemspec
 - bin/console
 - bin/setup
-- ext/rumourhash/Makefile
 - ext/rumourhash/extconf.rb
 - ext/rumourhash/rumourhash.c
 - lib/antlr4/runtime.rb
@@ -155,7 +154,6 @@ files:
 - lib/antlr4/runtime/ll1_analyzer.rb
 - lib/antlr4/runtime/lookahead_event_info.rb
 - lib/antlr4/runtime/loop_end_state.rb
-- lib/antlr4/runtime/murmur_hash.rb
 - lib/antlr4/runtime/no_viable_alt_exception.rb
 - lib/antlr4/runtime/not_set_transition.rb
 - lib/antlr4/runtime/object_equality_comparator.rb

data/ext/rumourhash/Makefile

@@ -1,264 +0,0 @@
-
-SHELL = /bin/sh
-
-# V=0 quiet, V=1 verbose.  other values don't work.
-V = 0
-Q1 = $(V:1=)
-Q = $(Q1:0=@)
-ECHO1 = $(V:1=@ :)
-ECHO = $(ECHO1:0=@ echo)
-NULLCMD = :
-
-#### Start of system configuration section. ####
-
-srcdir = .
-topdir = /Users/tonywalmsley/.rvm/rubies/ruby-2.5.3/include/ruby-2.5.0
-hdrdir = $(topdir)
-arch_hdrdir = /Users/tonywalmsley/.rvm/rubies/ruby-2.5.3/include/ruby-2.5.0/x86_64-darwin18
-PATH_SEPARATOR = :
-VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby
-prefix = $(DESTDIR)/Users/tonywalmsley/.rvm/rubies/ruby-2.5.3
-rubysitearchprefix = $(rubylibprefix)/$(sitearch)
-rubyarchprefix = $(rubylibprefix)/$(arch)
-rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)
-exec_prefix = $(prefix)
-vendorarchhdrdir = $(vendorhdrdir)/$(sitearch)
-sitearchhdrdir = $(sitehdrdir)/$(sitearch)
-rubyarchhdrdir = $(rubyhdrdir)/$(arch)
-vendorhdrdir = $(rubyhdrdir)/vendor_ruby
-sitehdrdir = $(rubyhdrdir)/site_ruby
-rubyhdrdir = $(includedir)/$(RUBY_VERSION_NAME)
-vendorarchdir = $(vendorlibdir)/$(sitearch)
-vendorlibdir = $(vendordir)/$(ruby_version)
-vendordir = $(rubylibprefix)/vendor_ruby
-sitearchdir = $(sitelibdir)/$(sitearch)
-sitelibdir = $(sitedir)/$(ruby_version)
-sitedir = $(rubylibprefix)/site_ruby
-rubyarchdir = $(rubylibdir)/$(arch)
-rubylibdir = $(rubylibprefix)/$(ruby_version)
-sitearchincludedir = $(includedir)/$(sitearch)
-archincludedir = $(includedir)/$(arch)
-sitearchlibdir = $(libdir)/$(sitearch)
-archlibdir = $(libdir)/$(arch)
-ridir = $(datarootdir)/$(RI_BASE_NAME)
-mandir = $(datarootdir)/man
-localedir = $(datarootdir)/locale
-libdir = $(exec_prefix)/lib
-psdir = $(docdir)
-pdfdir = $(docdir)
-dvidir = $(docdir)
-htmldir = $(docdir)
-infodir = $(datarootdir)/info
-docdir = $(datarootdir)/doc/$(PACKAGE)
-oldincludedir = $(SDKROOT)/usr/include
-includedir = $(prefix)/include
-localstatedir = $(prefix)/var
-sharedstatedir = $(prefix)/com
-sysconfdir = $(prefix)/etc
-datadir = $(datarootdir)
-datarootdir = $(prefix)/share
-libexecdir = $(exec_prefix)/libexec
-sbindir = $(exec_prefix)/sbin
-bindir = $(exec_prefix)/bin
-archdir = $(rubyarchdir)
-
-
-CC = gcc
-CXX = g++
-LIBRUBY = $(LIBRUBY_SO)
-LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
-LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
-LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static -framework Foundation
-empty =
-OUTFLAG = -o $(empty)
-COUTFLAG = -o $(empty)
-CSRCFLAG = $(empty)
-
-RUBY_EXTCONF_H = 
-cflags   = $(optflags) $(debugflags) $(warnflags)
-cxxflags = $(optflags) $(debugflags) $(warnflags)
-optflags = -O3
-debugflags = -ggdb3
-warnflags = -Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wno-tautological-compare -Wno-parentheses-equality -Wno-constant-logical-operand -Wno-self-assign -Wunused-variable -Wimplicit-int -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wshorten-64-to-32 -Wimplicit-function-declaration -Wdivision-by-zero -Wdeprecated-declarations -Wextra-tokens
-CCDLFLAGS = -fno-common
-CFLAGS   = $(CCDLFLAGS) $(cflags)  -fno-common -pipe $(ARCH_FLAG)
-INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
-DEFS     = 
-CPPFLAGS =   -I/usr/local/opt/libyaml/include -I/usr/local/opt/readline/include -I/usr/local/opt/libksba/include -I/usr/local/opt/openssl@1.1/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT $(DEFS) $(cppflags)
-CXXFLAGS = $(CCDLFLAGS) $(cxxflags) $(ARCH_FLAG)
-ldflags  = -L. -fstack-protector -L/usr/local/lib -L/usr/local/opt/libyaml/lib -L/usr/local/opt/readline/lib -L/usr/local/opt/libksba/lib -L/usr/local/opt/openssl@1.1/lib
-dldflags = -Wl,-undefined,dynamic_lookup -Wl,-multiply_defined,suppress -L/usr/local/opt/libyaml/lib -L/usr/local/opt/readline/lib -L/usr/local/opt/libksba/lib -L/usr/local/opt/openssl@1.1/lib 
-ARCH_FLAG = 
-DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG)
-LDSHARED = $(CC) -dynamic -bundle
-LDSHAREDXX = $(CXX) -dynamic -bundle
-AR = libtool -static
-EXEEXT = 
-
-RUBY_INSTALL_NAME = $(RUBY_BASE_NAME)
-RUBY_SO_NAME = ruby.2.5.3
-RUBYW_INSTALL_NAME = 
-RUBY_VERSION_NAME = $(RUBY_BASE_NAME)-$(ruby_version)
-RUBYW_BASE_NAME = rubyw
-RUBY_BASE_NAME = ruby
-
-arch = x86_64-darwin18
-sitearch = $(arch)
-ruby_version = 2.5.0
-ruby = $(bindir)/$(RUBY_BASE_NAME)
-RUBY = $(ruby)
-ruby_headers = $(hdrdir)/ruby.h $(hdrdir)/ruby/backward.h $(hdrdir)/ruby/ruby.h $(hdrdir)/ruby/defines.h $(hdrdir)/ruby/missing.h $(hdrdir)/ruby/intern.h $(hdrdir)/ruby/st.h $(hdrdir)/ruby/subst.h $(arch_hdrdir)/ruby/config.h
-
-RM = rm -f
-RM_RF = $(RUBY) -run -e rm -- -rf
-RMDIRS = rmdir -p
-MAKEDIRS = /usr/local/opt/coreutils/bin/gmkdir -p
-INSTALL = /usr/local/opt/coreutils/bin/ginstall -c
-INSTALL_PROG = $(INSTALL) -m 0755
-INSTALL_DATA = $(INSTALL) -m 644
-COPY = cp
-TOUCH = exit >
-
-#### End of system configuration section. ####
-
-preload = 
-libpath = . $(libdir) /usr/local/opt/libyaml/lib /usr/local/opt/readline/lib /usr/local/opt/libksba/lib /usr/local/opt/openssl@1.1/lib
-LIBPATH =  -L. -L$(libdir) -L/usr/local/opt/libyaml/lib -L/usr/local/opt/readline/lib -L/usr/local/opt/libksba/lib -L/usr/local/opt/openssl@1.1/lib
-DEFFILE = 
-
-CLEANFILES = mkmf.log
-DISTCLEANFILES = 
-DISTCLEANDIRS = 
-
-extout = 
-extout_prefix = 
-target_prefix = 
-LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED)  -lpthread -ldl -lobjc 
-ORIG_SRCS = rumourhash.c
-SRCS = $(ORIG_SRCS) 
-OBJS = rumourhash.o
-HDRS = 
-LOCAL_HDRS = 
-TARGET = rumourhash
-TARGET_NAME = rumourhash
-TARGET_ENTRY = Init_$(TARGET_NAME)
-DLLIB = $(TARGET).bundle
-EXTSTATIC = 
-STATIC_LIB = 
-
-TIMESTAMP_DIR = .
-BINDIR        = $(bindir)
-RUBYCOMMONDIR = $(sitedir)$(target_prefix)
-RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
-RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
-HDRDIR        = $(rubyhdrdir)/ruby$(target_prefix)
-ARCHHDRDIR    = $(rubyhdrdir)/$(arch)/ruby$(target_prefix)
-TARGET_SO_DIR =
-TARGET_SO     = $(TARGET_SO_DIR)$(DLLIB)
-CLEANLIBS     = $(TARGET_SO) 
-CLEANOBJS     = *.o  *.bak
-
-all:    $(DLLIB)
-static: $(STATIC_LIB)
-.PHONY: all install static install-so install-rb
-.PHONY: clean clean-so clean-static clean-rb
-
-clean-static::
-clean-rb-default::
-clean-rb::
-clean-so::
-clean: clean-so clean-static clean-rb-default clean-rb
-		-$(Q)$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES) .*.time
-
-distclean-rb-default::
-distclean-rb::
-distclean-so::
-distclean-static::
-distclean: clean distclean-so distclean-static distclean-rb-default distclean-rb
-		-$(Q)$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
-		-$(Q)$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
-		-$(Q)$(RMDIRS) $(DISTCLEANDIRS) 2> /dev/null || true
-
-realclean: distclean
-install: install-so install-rb
-
-install-so: $(DLLIB) $(TIMESTAMP_DIR)/.sitearchdir.time
-	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
-clean-static::
-	-$(Q)$(RM) $(STATIC_LIB)
-install-rb: pre-install-rb do-install-rb install-rb-default
-install-rb-default: pre-install-rb-default do-install-rb-default
-pre-install-rb: Makefile
-pre-install-rb-default: Makefile
-do-install-rb:
-do-install-rb-default:
-pre-install-rb-default:
-	@$(NULLCMD)
-$(TIMESTAMP_DIR)/.sitearchdir.time:
-	$(Q) $(MAKEDIRS) $(@D) $(RUBYARCHDIR)
-	$(Q) $(TOUCH) $@
-
-site-install: site-install-so site-install-rb
-site-install-so: install-so
-site-install-rb: install-rb
-
-.SUFFIXES: .c .m .cc .mm .cxx .cpp .o .S
-
-.cc.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
-
-.cc.S:
-	$(ECHO) translating $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
-
-.mm.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
-
-.mm.S:
-	$(ECHO) translating $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
-
-.cxx.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
-
-.cxx.S:
-	$(ECHO) translating $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
-
-.cpp.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
-
-.cpp.S:
-	$(ECHO) translating $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
-
-.c.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
-
-.c.S:
-	$(ECHO) translating $(<)
-	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
-
-.m.o:
-	$(ECHO) compiling $(<)
-	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
-
-.m.S:
-	$(ECHO) translating $(<)
-	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
-
-$(TARGET_SO): $(OBJS) Makefile
-	$(ECHO) linking shared-object $(DLLIB)
-	-$(Q)$(RM) $(@)
-	$(Q) $(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
-	$(Q) $(POSTLINK)
-
-
-
-$(OBJS): $(HDRS) $(ruby_headers)

data/lib/antlr4/runtime/murmur_hash.rb

@@ -1,99 +0,0 @@
-require 'rumourhash/rumourhash'
-
-include RumourHash
-
-module Antlr4::Runtime
-  class MurmurHash
-    DEFAULT_SEED = 0
-    MASK_32 = 0xFFFFFFFF
-
-    def self.hash_int(num)
-      hash_code = 7
-      hash_code = RumourHash.rumour_hash_update_int(hash_code, num)
-      RumourHash.rumour_hash_finish(hash_code, 0)
-    end
-
-    def self.hash_int_obj(num, obj)
-      hash_code = 7
-      hash_code = RumourHash.rumour_hash_update_int(hash_code, num)
-      hash_code = RumourHash.rumour_hash_update_int(hash_code, !obj.nil? ? obj.hash : 0)
-      RumourHash.rumour_hash_finish(hash_code, 2)
-    end
-
-    def self.hash_int_int_obj_obj(num1, num2, obj1, obj2)
-      hash_code = 7
-      hash_code = RumourHash.rumour_hash_update_int(hash_code, num1)
-      hash_code = RumourHash.rumour_hash_update_int(hash_code, num2)
-      hash_code = RumourHash.rumour_hash_update_int(hash_code, !obj1.nil? ? obj1.hash : 0)
-      hash_code = RumourHash.rumour_hash_update_int(hash_code, !obj2.nil? ? obj2.hash : 0)
-      RumourHash.rumour_hash_finish(hash_code, 4)
-    end
-
-    def self.hash_int_int(num1, num2)
-      hash_code = 7
-      hash_code = RumourHash.rumour_hash_update_int(hash_code, num1)
-      hash_code = RumourHash.rumour_hash_update_int(hash_code, num2)
-      RumourHash.rumour_hash_finish(hash_code, 2)
-    end
-
-    def self.hash_objs(objs)
-      hash_code = 7
-
-      i = 0
-      while i < objs.length
-        obj = objs[i]
-        hash_code = RumourHash.rumour_hash_update_int(hash_code, !obj.nil? ? obj.hash : 0)
-        i += 1
-      end
-
-      RumourHash.rumour_hash_finish(hash_code, objs.length)
-    end
-
-    def self.hash_ints_objs(nums, objs)
-      hash_code = 7
-
-      i = 0
-      while i < objs.length
-        obj = objs[i]
-        hash_code = RumourHash.rumour_hash_update_int(hash_code, !obj.nil? ? obj.hash : 0)
-        i += 1
-      end
-
-      i = 0
-      while i < nums.length
-        num = nums[i]
-        hash_code = RumourHash.rumour_hash_update_int(hash_code, num)
-        i += 1
-      end
-
-      RumourHash.rumour_hash_finish(hash_code, 2 * objs.length)
-    end
-
-    def self.hash_ints(nums)
-      hash_code = 7
-
-      i = 0
-      while i < nums.length
-        num = nums[i]
-        hash_code = RumourHash.rumour_hash_update_int(hash_code, num)
-        i += 1
-      end
-
-      RumourHash.rumour_hash_finish(hash_code, 2 * nums.length)
-    end
-
-    private
-
-    def self.hash(data, seed)
-      hash = seed
-      i = 0
-      while i < data.length
-        value = data[i]
-        hash = RumourHash.rumour_hash_update_int(hash, !value.nil? ? value.hash : 0)
-        i += 1
-      end
-
-      RumourHash.rumour_hash_finish(hash, data.length)
-    end
-  end
-end