antlr4-runtime 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 997ff14a7653228bf76c3d4d73fd9142681b71c8b561483612980271994ccda4
-  data.tar.gz: 0de09a9522e1be8df33d96c4e7a9ab3f5a1b249bfd387f32711ff7ff76d778a5
+  metadata.gz: 5165fac45561907bd5e9cde985579f737341e00a9be7ce3778702e8069c6bc01
+  data.tar.gz: 84cc7c66ea621d2e44005b38fa0cf990789cac845521f8c9825a1f0b4df2492b
 SHA512:
-  metadata.gz: f9b785bcdea37bfd5503584560edd44cb34f938b674924e17b7105d9b26f2b91321a6e7b275b14de62647693c679207594aba615d13d6403b34abd6803f9aca4
-  data.tar.gz: 392d73af0a74e61cde891d94afce425c4283880faf30a140c2bc1488c3ff843e7497417d5e2fceae5ed94bf40bf492bf26c5642e10c67221c0c4eba652714eba
+  metadata.gz: 4ec4d1b05f35fe1ce3fc9cd4478ab8ce70dad8457ff39310429839e48dbe4dc7bbd258f5fefc2caee95728c5353ccb8e1d01f26082dbb71b827d3b113c90b012
+  data.tar.gz: c2ac519ccaadc6c7481a9a4d39b2c8a7542fb3726f934626d074e63195c20da28f6a5beef68ad5c49e983716d199a7dfbaf79e02d582f5306e0ed9256aceafd4

data/CHANGELOG.md

@@ -0,0 +1,28 @@
+0.2.2
+===
+- Added a unit test for IntervalSet, fixed some bugs, removed some unused code, renamed `or_sets` to `or`.
+- Fixed eql? and <=> for ATNConfig
+- Fixed compare method for ATNConfigSet
+- Fixed a ParseATNSimulator problem when checking for values added to closure_busy.
+- Fixed a loop error in PredictionContextUtils
+- Fixed use of ObjectEqualityComparator in Triple.
+
+0.2.1
+===
+- Call IntervalSet#or_sets (instead of #or or ||) to better match the Java version.
+
+0.2.0
+===
+- A few small fixes:
+  * Fixed a misspelled attr_reader in LexerCustomAction.
+  * Fixed a reference to IntervalSet#or, which doesn't exist.
+  * A few requires were missing. Decided to move all requires to autoloads.
+  * Added require 'spec_helper' to all spec files.
+  * Removed bundler as a dev dependency.
+  * Added LexerATNConfig.create_from_config and LexerATNConfig.create_from_config2.
+  * Fixed instance variable reference in LexerATNSimulator.
+  * Removed Gemfile.lock from source control.
+
+0.1.0
+===
+- Initial release

data/antlr4-runtime.gemspec

@@ -25,5 +25,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "simplecov", "~> 0.16.1"
   spec.extensions = %w[ext/rumourhash/extconf.rb]
 end

data/lib/antlr4/runtime/array_2d_hash_set.rb

@@ -1,10 +1,12 @@
 module Antlr4::Runtime
 
   class Array2DHashSet
-    INITIAL_CAPACITY = 16 # must be power of 2
-    INITIAL_BUCKET_CAPACITY = 8
+    INITIAL_CAPACITY = 32 # must be power of 2
+    INITIAL_BUCKET_CAPACITY = 4
     LOAD_FACTOR = 0.75
 
+    attr_reader :buckets
+
     def initialize(comparator = nil, initial_capacity = INITIAL_CAPACITY, initial_bucket_capacity = INITIAL_BUCKET_CAPACITY)
       comparator.nil? ? @comparator = ObjectEqualityComparator.instance : @comparator = comparator
 
@@ -41,7 +43,7 @@ module Antlr4::Runtime
           @n_elements += 1
           return o
         end
-        if @comparator.equals(existing, o)
+        if @comparator.compare(existing, o).zero?
           return existing # found existing, quit
         end
 
@@ -68,17 +70,18 @@ module Antlr4::Runtime
       while i < bucket.length
         e = bucket[i]
         if e.nil?
-          return nil # empty slot not there
+          i += 1
+          next
         end
-        return e if @comparator.equals(e, o)
+        return e if @comparator.compare(e, o).zero?
         i += 1
       end
       nil
     end
 
     def get_bucket(o)
-      hash = @comparator.hash(o)
-      hash & (@buckets.length - 1) # assumes len is power of 2
+      h = @comparator.hash(o)
+      h & (@buckets.length - 1) # assumes len is power of 2
     end
 
     def hash
@@ -94,7 +97,10 @@ module Antlr4::Runtime
         j = 0
         while j < bucket.length
           o = bucket[j]
-          break if o.nil?
+          if o.nil?
+            j += 1
+            next
+          end
 
           objs << o
           j += 1
@@ -102,26 +108,16 @@ module Antlr4::Runtime
         i += 1
       end
 
-      hash_code = MurmurHash.hash_objs(objs)
-
-      if !@_hash.nil?
-        if hash_code == @_hash
-          puts 'Same hash_code for Array2DHashSet'
-        else
-          puts 'Different hash_code for Array2DHashSet'
-        end
-      end
-      @_hash = hash_code
+      @_hash = MurmurHash.hash_objs(objs)
     end
 
-    def equals(o)
-      return true if o == self
+    def ==(o)
+      return true if o.equal?(self)
       return false unless o.is_a? Array2DHashSet
 
-      other = o
-      return false if other.size != size
+      return false if o.size != size
 
-      contains_all(other)
+      contains_all(o)
     end
 
     def add(t)
@@ -149,12 +145,12 @@ module Antlr4::Runtime
 
     def iterator
       a = to_a
-      a.sort(@comparator) unless @comparator.nil?
+      a.sort! {|a, b| @comparator.compare(a, b)} unless @comparator.nil?
       SetIterator.new(a, self)
     end
 
     def to_a
-      a = create_bucket(size)
+      a = []
       i = 0
       j = 0
       while j < @buckets.length
@@ -167,9 +163,12 @@ module Antlr4::Runtime
         k = 0
         while k < bucket.length
           o = bucket[k]
-          break if o.nil?
+          if o.nil?
+            k += 1
+            next
+          end
 
-          a[i] = o
+          a << o
           i += 1
           k += 1
         end
@@ -196,12 +195,13 @@ module Antlr4::Runtime
       while i < bucket.length
         e = bucket[i]
         if e.nil?
-          # empty slot not there
-          return false
+          i += 1
+          next
         end
 
-        if @comparator.eql?(e, obj) # found it
+        if @comparator.compare(e, obj).zero? # found it
           bucket[i] = nil
+          @n_elements -= 1
           return true
         end
         i += 1
@@ -210,9 +210,8 @@ module Antlr4::Runtime
       false
     end
 
-    def contains_all(collection)
-      if collection.is_a? Array2DHashSet
-        s = collection
+    def contains_all(s)
+      if s.is_a? Array2DHashSet
         i = 0
         while i < s.buckets.length
           bucket = s.buckets[i]
@@ -224,7 +223,10 @@ module Antlr4::Runtime
           j = 0
           while j < bucket.length
             o = bucket[j]
-            break if o.nil?
+            if o.nil?
+              j += 1
+              next
+            end
             return false unless contains_fast(o)
             j += 1
           end
@@ -232,8 +234,8 @@ module Antlr4::Runtime
         end
       else
         i = 0
-        while i < collection.length
-          o = collection[i]
+        while i < s.length
+          o = s[i]
           return false unless contains_fast(o)
           i += 1
         end
@@ -266,9 +268,12 @@ module Antlr4::Runtime
         i = 0
         j = 0
         while i < bucket.length
-          break if bucket[i].nil?
+          if bucket[i].nil?
+            i += 1
+            next
+          end
 
-          if c.contains(bucket[i])
+          if c.include?(bucket[i])
             # keep
             bucket[j] = bucket[i] if i != j
 
@@ -317,27 +322,24 @@ module Antlr4::Runtime
       buf = ''
       buf << '{'
       first = true
+      items = to_a
+      items.sort! {|a, b| @comparator.compare(a, b)} unless @comparator.nil?
+
       i = 0
-      while i < @buckets.length
-        bucket = @buckets[i]
-        if bucket.nil?
+      while i < items.length
+        item = items[i]
+        if item.nil?
           i += 1
           next
         end
 
-        j = 0
-        while j < bucket.length
-          o = bucket[j]
-          break if o.nil?
-
-          if first
-            first = false
-          else
-            buf << ', '
-            buf << o.to_s
-          end
-          j += 1
+        if first
+          first = false
+        else
+          buf << ', '
         end
+        buf << item.to_s
+
         i += 1
       end
       buf << '}'

data/lib/antlr4/runtime/atn_config.rb

@@ -119,7 +119,19 @@ module Antlr4::Runtime
         return false
       end
 
-      @state.state_number == other.state.state_number && @alt == other.alt && (@context == other.context || (!@context.nil? && @context.<=>(other.context))) && @semantic_context.<=>(other.semantic_context) && precedence_filter_suppressed? == other.precedence_filter_suppressed?
+      return true if @state.state_number == other.state.state_number && @alt == other.alt && (@context == other.context || (!@context.nil? && @context.<=>(other.context))) && @semantic_context.<=>(other.semantic_context) && precedence_filter_suppressed? == other.precedence_filter_suppressed?
+      false
+    end
+
+    def <=>(other)
+      if self == other
+        return 0
+      elsif other.nil?
+        return 1
+      end
+
+      return 0 if @state.state_number == other.state.state_number && @alt == other.alt && (@context == other.context || (!@context.nil? && @context.<=>(other.context))) && @semantic_context.<=>(other.semantic_context) && precedence_filter_suppressed? == other.precedence_filter_suppressed?
+      -1
     end
 
     def hash

data/lib/antlr4/runtime/atn_config_set.rb

@@ -103,7 +103,7 @@ module Antlr4::Runtime
 
     class AbstractConfigHashSet < Array2DHashSet
       def initialize(comparator)
-        super(comparator, 64, 64)
+        super(comparator, 128, 8)
       end
     end
 
@@ -132,11 +132,10 @@ module Antlr4::Runtime
         o.bucket_hash
       end
 
-      def equals(a, b)
-        return true if a == b
-        return false if a.nil? || b.nil?
-
-        a.state.state_number == b.state.state_number && a.alt == b.alt && a.semantic_context.eql?(b.semantic_context)
+      def compare(a, b)
+        return 1 if a.nil? || b.nil?
+        return 0 if a.state.state_number == b.state.state_number && a.alt == b.alt && a.semantic_context.eql?(b.semantic_context)
+        -1
       end
     end
 

data/lib/antlr4/runtime/default_error_strategy.rb

@@ -111,7 +111,7 @@ module Antlr4::Runtime
         #      System.err.println("at loop back: "+s.getClass().getSimpleName())
         report_unwanted_token(recognizer)
         expecting = recognizer.expected_tokens
-        what_follows_loop_iteration_or_rule = expecting.or_sets(error_recovery_set(recognizer))
+        what_follows_loop_iteration_or_rule = expecting.or(error_recovery_set(recognizer))
         consume_until(recognizer, what_follows_loop_iteration_or_rule)
 
       else # do nothing if we can't identify the exact kind of ATN state end

data/lib/antlr4/runtime/interval.rb

@@ -46,9 +46,10 @@ module Antlr4::Runtime
     end
 
     def hash
-      hash = 23
-      hash = hash * 31 + @a
-      hash * 31 + @b
+      return @_hash unless @_hash.nil?
+      @_hash = 23
+      @_hash = @_hash * 31 + @a
+      @_hash = @_hash * 31 + @b
     end
 
     def starts_before_disjoint(other)

data/lib/antlr4/runtime/interval_set.rb

@@ -30,6 +30,8 @@ module Antlr4::Runtime
 
       if el1.is_a? Interval
         add_interval(el1)
+      elsif el1.is_a? IntervalSet
+        add_all(el1)
       elsif el2.nil?
         add_interval(Interval.of(el1, el1))
       else
@@ -76,7 +78,7 @@ module Antlr4::Runtime
       @intervals << addition
     end
 
-    def or_sets(sets)
+    def self.or_sets(sets)
       r = IntervalSet.new
       i = 0
       while i < sets.length
@@ -99,13 +101,6 @@ module Antlr4::Runtime
           add(interval.a, interval.b)
           i += 1
         end
-      else
-        i = 0
-        list = set.to_list
-        while i < list.length
-          add(list[i])
-          i += 1
-        end
       end
 
       self
@@ -115,30 +110,21 @@ module Antlr4::Runtime
       complement_interval_set(IntervalSet.of(min_element, max_element))
     end
 
-    def complement_interval_set(vocabulary)
-      if vocabulary.nil? || vocabulary.is_nil
+    def complement_interval_set(intervalSet)
+      if intervalSet.nil? || intervalSet.is_nil
         return nil # nothing in common with nil set
       end
 
-      vocabularyIS = nil
-      if vocabulary.is_a? IntervalSet
-        vocabularyIS = vocabulary
-      else
-        vocabularyIS = IntervalSet.new
-        vocabularyIS.add_all(vocabulary)
+      if intervalSet.is_a? IntervalSet
+        intervalSet.subtract(self)
       end
 
-      vocabularyIS.subtract(self)
     end
 
     def subtract(a)
       return IntervalSet.new self if a.nil? || a.is_nil
 
-      return subtract_interval_sets(self, a) if a.is_a? IntervalSet
-
-      other = IntervalSet.new
-      other.add_all(a)
-      subtract_interval_sets(self, other)
+      return subtract_interval_sets(self, a)
     end
 
     def subtract_interval_sets(left, right)
@@ -176,23 +162,23 @@ module Antlr4::Runtime
         if !before_current.nil?
           if !after_current.nil?
             # split the current interval into two
-            result.intervals.set(result_i, before_current)
-            result.intervals.add(result_i + 1, after_current)
+            result.intervals[result_i] = before_current
+            result.intervals[result_i + 1] = after_current
             result_i += 1
             right_i += 1
             next
           else # replace the current interval
-            result.intervals.set(result_i, before_current)
+            result.intervals[result_i] = before_current
             result_i += 1
             next
           end
         else
           if !after_current.nil?
-            result.intervals.set(result_i, after_current)
+            result.intervals[result_i] = after_current
             right_i += 1
             next
           else
-            result.intervals.remove(result_i)
+            result.intervals.delete_at(result_i)
             next
           end
         end
@@ -201,7 +187,7 @@ module Antlr4::Runtime
       result
     end
 
-    def or_list(a)
+    def or(a)
       o = IntervalSet.new
       o.add_all(self)
       o.add_all(a)
@@ -308,8 +294,8 @@ module Antlr4::Runtime
       i = 0
       while i < @intervals.length
         interval = @intervals[i]
-        ints <<  interval.a
-        ints <<  interval.b
+        ints << interval.a
+        ints << interval.b
         i += 1
       end
 
@@ -365,10 +351,6 @@ module Antlr4::Runtime
       buf
     end
 
-    # def toString(tokenNames)
-    #  return toString(VocabularyImpl.fromTokenNames(tokenNames))
-    # end
-
     def to_string_from_vocabulary(vocabulary)
       buf = ''
       return 'end' if @intervals.nil? || @intervals.empty?
@@ -423,7 +405,7 @@ module Antlr4::Runtime
     end
 
     def to_integer_list
-      values = IntegerList.new
+      values = []
       n = @intervals.length
       i = 0
       while i < n
@@ -432,7 +414,7 @@ module Antlr4::Runtime
         b = interval.b
         v = a
         while v <= b
-          values.add(v)
+          values.push(v)
           v += 1
         end
         i += 1
@@ -461,26 +443,6 @@ module Antlr4::Runtime
       s
     end
 
-    def get(i)
-      n = @intervals.length
-      index = 0
-      j = 0
-      while j < n
-        interval = @intervals[j]
-        a = interval.a
-        b = interval.b
-        v = a
-        while v <= b
-          return v if index == i
-
-          index += 1
-          v += 1
-        end
-        j += 1
-      end
-      -1
-    end
-
     def to_a
       to_integer_list
     end
@@ -515,7 +477,7 @@ module Antlr4::Runtime
         end
         # if in middle a..x..b, split interval
         if el > a && el < b # found in this interval
-          int oldb = interval.b
+          oldb = interval.b
           interval.b = el - 1 # [a..x-1]
           add(el + 1, oldb) # add [x+1..b]
         end

data/lib/antlr4/runtime/object_equality_comparator.rb

@@ -9,10 +9,10 @@ module Antlr4::Runtime
       obj.hash
     end
 
-    def equals(a, b)
-      return b.nil? if a.nil?
+    def compare(a, b)
+      return 1 if a.nil? || b.nil?
 
-      a.eql?(b)
+      a <=> b
     end
   end
 end

data/lib/antlr4/runtime/parser_atn_simulator.rb

@@ -792,7 +792,7 @@ module Antlr4::Runtime
 
             c.reaches_into_outer_context += 1
 
-            added = closure_busy.add?(c)
+            added = !closure_busy.add?(c).nil?
             unless added
               i += 1
               next
@@ -802,7 +802,7 @@ module Antlr4::Runtime
             new_depth -= 1
             puts('dips into outer ctx: ' << c.to_s) if @debug
           else
-            added = closure_busy.add?(c)
+            added = !closure_busy.add?(c).nil?
             if !t.epsilon? && !added
               i += 1
               next

data/lib/antlr4/runtime/prediction_context_utils.rb

@@ -329,7 +329,7 @@ module Antlr4::Runtime
       changed = false
       parents = []
       i = 0
-      while i < parents.length
+      while i < context.size
         parent = cached_context(context.get_parent(i), context_cache, visited)
         if changed || parent != context.get_parent(i)
           unless changed

data/lib/antlr4/runtime/semantic_context.rb

@@ -89,8 +89,6 @@ module Antlr4::Runtime
     end
 
     class Operator < SemanticContext
-      def operands
-      end
     end
 
     class AND < Operator

data/lib/antlr4/runtime/triple.rb

@@ -17,7 +17,7 @@ module Antlr4::Runtime
         return false unless obj.is_a? Triple
       end
 
-      ObjectEqualityComparator.instance.eql?(a, obj.a) && ObjectEqualityComparator.instance.eql?(b, obj.b) && ObjectEqualityComparator.instance.eql?(c, obj.c)
+      ObjectEqualityComparator.instance.compare(a, obj.a).zero? && ObjectEqualityComparator.instance.compare(b, obj.b).zero? && ObjectEqualityComparator.instance.compare(c, obj.c).zero?
     end
 
     def hash

data/lib/antlr4/runtime/version.rb

@@ -1,5 +1,5 @@
 module Antlr4
   module Runtime
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: antlr4-runtime
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Tony Walmsley
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-07 00:00:00.000000000 Z
+date: 2019-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.1
 description: This gem implements a runtime for ANTLR4 in Ruby for lexers and parsers
   generated using the Ruby language target.
 email:
@@ -50,6 +64,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt