rley 0.7.02 → 0.7.03

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 83b3751addeb91efb6316ca04e2bd24c3dbec7b8
-  data.tar.gz: 8fb879d8e65eae6638611ac78381a54cfa76ddf6
+SHA256:
+  metadata.gz: a63420880d532cd1ad4bcef4ff01cbe51de63734f5e30ecc8ffc34338079a3da
+  data.tar.gz: 0712f56c42b467cbe571c069e5c856817a856c73eb3608531517b28f61f9682a
 SHA512:
-  metadata.gz: 21ec0cbdd4fb79c6a7f45c834b9f4c1a36c7b9054d2b0c39a5c4f8bd3cf2bfef4387a501d7fc44194772191cf66d287ebe0086b558ef00474d4976a7bf0737f7
-  data.tar.gz: deb719ebd4f82db564ac42f5f40b23c5d5908bc44b8fd26788039d53493e548fa611bdfa1256bfb2ff7c0aeedb77cd1db26d88f9942b0bf95d5d86aaa8323827
+  metadata.gz: b1d6824b1e67e3a6b12f262b6e8badc8036fb09cd503de1866834400d23fa815120d71cf5474bd1fef61249836f319f121cc3cf61aff1cef001f7f122d0877e4
+  data.tar.gz: '081b167f0616abc747e9e90fbf24025e57d1442cd34699e5afd55224042264c4c15f3bcdac1e29b9760f2deba38f113f26da4d119886fc57f099395bd88407a3'

data/.travis.yml

@@ -1,4 +1,13 @@
 language: ruby
+dist: trusty
+
+before_install:
+  - gem update --system
+  - gem install bundler  
+
+script:
+  - bundle exec rake
+  
 rvm:
   - 2.6.0
   - 2.5.3
@@ -7,18 +16,13 @@ rvm:
   - ruby-head
   - jruby-9.1.9.0
   - jruby-head
+  
 matrix:
   allow_failures:
     - rvm: 2.6.0
     - rvm: ruby-head
     - rvm: jruby-head
 
-before_install:
-  - gem update --system
-  - gem install bundler
-    
-gemfile:
-  - Gemfile
 
 # whitelist
 branches:

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+### 0.7.03 / 2019-07-21
+- Minor refactoring for parsing speed improvement.
+* [CHANGE] Replacing comparison with object_id by `equal?` method
+* [CHANGE] Method `ParseEntry#hash` added
+* [CHANGE] Class `ParseEntrySet` added new Hash attribute in order to speed up membership testing.
+
+
 ### 0.7.02 / 2019-01-13
 - Removed Ruby versions older than 2.3 in CI testing because of breaking changes by Bundler 2.0
 * [CHANGE] Files `Gemfile`, `.travis.yml`, `appveyor.yml` updated.

data/lib/rley/constants.rb

@@ -3,7 +3,7 @@
 
 module Rley # Module used as a namespace
   # The version number of the gem.
-  Version = '0.7.02'.freeze
+  Version = '0.7.03'.freeze
 
   # Brief description of the gem.
   Description = "Ruby implementation of the Earley's parsing algorithm".freeze

data/lib/rley/lexical/token_range.rb

@@ -28,7 +28,7 @@ module Rley # This module is used as a namespace
       # @param other [TokenRange, Range, Hash, Array<Integer>]
       # @return [Boolean]
       def ==(other)
-        return true if object_id == other.object_id
+        return true if equal?(other)
 
         case other
           when Hash

data/lib/rley/parser/parse_entry.rb

@@ -48,11 +48,16 @@ module Rley # This module is used as a namespace
 
       # Equality comparison. A parse entry behaves as a value object.
       def ==(other)
-        return true if object_id == other.object_id
+        return true if equal? other
 
         result = (vertex == other.vertex) && (origin == other.origin)
         return result
       end
+      
+      def hash
+        @my_hash ||= "#{vertex.object_id}-#{origin}".hash
+        @my_hash
+      end
 
       # Returns true iff the vertex is a start vertex (i.e. of the form: .X)
       def start_entry?()

data/lib/rley/parser/parse_entry_set.rb

@@ -1,4 +1,5 @@
 require 'forwardable' # For the Delegation pattern
+require 'set'
 
 require_relative '../syntax/terminal'
 require_relative '../syntax/non_terminal'
@@ -11,12 +12,16 @@ module Rley # This module is used as a namespace
       extend Forwardable
       def_delegators :entries, :empty?, :size, :first, :last, :pop, :each
 
-      # @return [Array<ParseEntry>] The set of parse entries
+      # @return [Array<ParseEntry>] The array of parse entries
       attr_reader :entries
+      
+      # @return [Hash] A Hash with pairs { hash of ParseEntry => ParseEntry }
+      attr_reader :membership      
 
       # Constructor.
       def initialize()
         @entries = []
+        @membership = {}
         @entries4term = Hash.new { |hash, key| hash[key] = [] }
         @entries4n_term = Hash.new { |hash, key| hash[key] = [] }
       end
@@ -55,11 +60,14 @@ module Rley # This module is used as a namespace
       # @return [ParseEntry] the passed parse entry if it pushes it
       def push_entry(anEntry)
         # TODO: control overhead next line
-        match = entries.find { |entry| entry == anEntry }
+        #match = entries.find { |entry| entry == anEntry }
+        entry_key = anEntry.hash
+        match = membership.fetch(entry_key, false)
         if match
           result = match
         else
           @entries << anEntry
+          membership[entry_key] = anEntry
           expecting = anEntry.next_symbol
           add_lookup4symbol(anEntry) if expecting
           result = anEntry

data/lib/rley/parser/parse_state.rb

@@ -14,7 +14,7 @@ module Rley # This module is used as a namespace
 
       # Equality comparison. A parse state behaves as a value object.
       def ==(other)
-        return true if object_id == other.object_id
+        return true if equal?(other)
 
         result = (dotted_rule == other.dotted_rule) &&
                  (origin == other.origin)

data/lib/rley/syntax/symbol_seq.rb

@@ -21,7 +21,7 @@ module Rley # This module is used as a namespace
       # @param other [SymbolSeq|Array]
       # @return [Boolean]
       def ==(other)
-        return true if other.object_id == object_id
+        return true if equal?(other)
 
         case other
           when SymbolSeq then result = other.members == members

data/spec/rley/parser/parse_entry_set_spec.rb

@@ -48,7 +48,7 @@ module Rley # Open this namespace to avoid module qualifier prefixes
 
       context 'Provided services:' do
         it 'should accept the addition of an entry' do
-          # Case: first time e,try addition
+          # Case: first time entry addition
           expect(subject.push_entry(entry1)).to eq(entry1)
           expect(subject).not_to be_empty
 

metadata

@@ -1,115 +1,115 @@
 --- !ruby/object:Gem::Specification
 name: rley
 version: !ruby/object:Gem::Version
-  version: 0.7.02
+  version: 0.7.03
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-13 00:00:00.000000000 Z
+date: 2019-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.5.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.5.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: rubygems
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 description: A general parser using the Earley algorithm.
 email: famished.tiger@yahoo.com
 executables: []
@@ -315,8 +315,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Ruby implementation of the Earley's parsing algorithm