rley 0.3.07 → 0.3.08

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9b70296885dc161ee4fdedf19ff1c2e04256086
-  data.tar.gz: 993b5b46f0edf140140d4713161c88b3cc846ca6
+  metadata.gz: 38c77acd3a3831519aa9511c02ab2aaa7f99c962
+  data.tar.gz: bd84fe47221a72d195a92e40e8c5a62fafed562b
 SHA512:
-  metadata.gz: c390b234b9412d2b48d92ad725bfad8860dea3c1b9d21ef75ffb6191f05cc23a3bccfa8975c6a79e9651b29fba345298e1c053454523390d118eeab9f8b6ad24
-  data.tar.gz: 5358fb0d0201b821be251d47f804dd9362ea970e4765462346658106ecf8e452e6088d239b0ce63073bc7bc9db9299018f523ac9024de6cac3b85e664ba36fe8
+  metadata.gz: 7a36a172143025e47b03022dc2db7be6bcb990b21834ea51288afe9158c3fe97eaafce70cbcd36ea64841da03036a0e98e446454b4e6f8e2170e60e9fa2c0697
+  data.tar.gz: 716aa238f7f40e07118b11eb3d7c38c5a3f2cc8583c516818d1d5bcb11267a7c52b7849e049de4ecf93729f23746b1569adfbdd1d297947e787f9c82a5a0b94e

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 0.3.08 / 2016-11-17
+* [FIX] Method `ParseWalkerFactory#select_antecedent` did not support alternative nodes creation when visiting an item entry for highly ambiguous parse.
+* [FIX] Method `ParseWalkerFactory#select_antecedent` did not manage properly call/return stack for alternative nodes created when visiting an item entry for highly ambiguous parse.
+
+
 ### 0.3.07 / 2016-11-08
 * [FIX] The sharing a of forest node could be repeated in a production in a revisit event.
 * [CHANGE] Method `ParseWalkerFactory#process_end_entry`. Added a guard condition to avoid repeated node sharing

data/lib/rley/constants.rb

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

data/lib/rley/parser/parse_forest_builder.rb

@@ -82,7 +82,7 @@ module Rley # This module is used as a namespace
           when :backtrack
             # Restore path
             @curr_path = entry2path_to_alt[anEntry].dup
-            # puts "Restore path #{curr_path.join(', ')}]"
+            # puts "Restore path [#{curr_path.map{|e|e.to_string(0)}.join(', ')}]"
             antecedent_index = curr_parent.subnodes.size
             # puts "Current parent #{curr_parent.to_string(0)}"
             # puts "Antecedent index #{antecedent_index}"
@@ -103,35 +103,76 @@ module Rley # This module is used as a namespace
       end
 
 
-      def process_item_entry(_anEvent, anEntry, anIndex)
-        if anEntry.exit_entry?
-          # Previous entry was an end entry (X. pattern)
-          # Does the previous entry have multiple antecedent?
-          if last_visitee.end_entry? && last_visitee.antecedents.size > 1
-            # Store current path for later backtracking
-            # puts "Store backtrack context #{last_visitee}"
-            # puts "path [#{curr_path.join(', ')}]"
-            entry2path_to_alt[last_visitee] = curr_path.dup
-            curr_parent.refinement = :or
-
-            create_alternative_node(anEntry)
-          end
-        end
-
-        # Retrieve the grammar symbol before the dot (if any)
-        prev_symbol = anEntry.prev_symbol
-        case prev_symbol
-          when Syntax::Terminal
-            # Add node without changing current path
-            create_token_node(anEntry, anIndex)
-
-          when NilClass # Dot at the beginning of production
-            if anEntry.vertex.dotted_item.production.empty?
-              # Empty rhs => create an epsilon node ...
-              # ... without changing current path
-              create_epsilon_node(anEntry, anIndex)
+      def process_item_entry(anEvent, anEntry, anIndex)
+        case anEvent
+          when :visit      
+            if anEntry.exit_entry?
+              # Previous entry was an end entry (X. pattern)
+              # Does the previous entry have multiple antecedent?
+              if last_visitee.end_entry? && last_visitee.antecedents.size > 1
+                # Store current path for later backtracking
+                # puts "Store backtrack context #{last_visitee}"
+                # puts "path [#{curr_path.map{|e|e.to_string(0)}.join(', ')}]"
+                entry2path_to_alt[last_visitee] = curr_path.dup
+                curr_parent.refinement = :or
+
+                create_alternative_node(anEntry)
+              end
             end
-            curr_path.pop if curr_parent.kind_of?(SPPF::AlternativeNode)
+            
+            # Does this entry have multiple antecedent?
+            if anEntry.antecedents.size > 1
+              # Store current path for later backtracking
+              # puts "Store backtrack context #{anEntry}"
+              # puts "path [#{curr_path.map{|e|e.to_string(0)}.join(', ')}]"
+              entry2path_to_alt[anEntry] = curr_path.dup
+              # curr_parent.refinement = :or
+
+              create_alternative_node(anEntry)
+            end      
+
+            # Retrieve the grammar symbol before the dot (if any)
+            prev_symbol = anEntry.prev_symbol
+            case prev_symbol
+              when Syntax::Terminal
+                # Add node without changing current path
+                create_token_node(anEntry, anIndex)
+
+              when NilClass # Dot at the beginning of production
+                if anEntry.vertex.dotted_item.production.empty?
+                  # Empty rhs => create an epsilon node ...
+                  # ... without changing current path
+                  create_epsilon_node(anEntry, anIndex)
+                end
+                curr_path.pop if curr_parent.kind_of?(SPPF::AlternativeNode)
+            end
+            
+          when :backtrack
+            # Restore path
+            @curr_path = entry2path_to_alt[anEntry].dup
+            # puts "Special restore path [#{curr_path.map{|e|e.to_string(0)}.join(', ')}]"
+            antecedent_index = curr_parent.subnodes.size
+            # puts "Current parent #{curr_parent.to_string(0)}"
+            # puts "Antecedent index #{antecedent_index}"
+            
+            create_alternative_node(anEntry)            
+            
+        when :revisit
+            # Retrieve the grammar symbol before the dot (if any)
+            prev_symbol = anEntry.prev_symbol
+            case prev_symbol
+              when Syntax::Terminal
+                # Add node without changing current path
+                create_token_node(anEntry, anIndex)
+
+              when NilClass # Dot at the beginning of production
+                if anEntry.vertex.dotted_item.production.empty?
+                  # Empty rhs => create an epsilon node ...
+                  # ... without changing current path
+                  create_epsilon_node(anEntry, anIndex)
+                end
+                curr_path.pop if curr_parent.kind_of?(SPPF::AlternativeNode)
+            end        
         end
       end
 

data/lib/rley/parser/parse_walker_factory.rb

@@ -168,6 +168,7 @@ module Rley # This module is used as a namespace
           aContext.return_stack << aContext.curr_entry
         elsif traversed_edge.kind_of?(GFG::CallEdge)
           # Pop top of stack
+          fail ScriptError, "Return stack empty!" if aContext.return_stack.empty?
           aContext.return_stack.pop
           # puts "Pop from return stack matching entry #{new_entry}"
         elsif traversed_edge.kind_of?(GFG::ScanEdge)
@@ -187,13 +188,19 @@ module Rley # This module is used as a namespace
         case aContext.curr_entry.vertex
           when GFG::EndVertex
             # puts "Add backtrack point stack #{aContext.curr_entry}"
-            # An end vertex with multiple antecedents requires
-            # a backtrack point for a correct graph traversal
             bp = add_backtrack_point(aContext)
             new_entry = bp.visitee.antecedents[bp.antecedent_index]
 
           when GFG::StartVertex
             new_entry = select_calling_entry(aContext)
+            
+          when GFG::ItemVertex
+            # Push current entry onto stack
+            # puts "Special push on return stack #{aContext.curr_entry}"
+            aContext.return_stack << aContext.curr_entry        
+            # puts "Add special backtrack point stack #{aContext.curr_entry}"
+            bp = add_backtrack_point(aContext)
+            new_entry = bp.visitee.antecedents[bp.antecedent_index]          
           else
             raise StandardError, 'Internal error'
         end
@@ -239,6 +246,7 @@ module Rley # This module is used as a namespace
       # Observation: calling parse entry is an parse entry linked
       # to a item vertex
       def select_calling_entry(aContext)
+        fail ScriptError, "Empty return stack" if aContext.return_stack.empty?
         # Retrieve top of stack
         tos = aContext.return_stack.pop
         tos_dotted_item = tos.vertex.dotted_item

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rley
 version: !ruby/object:Gem::Version
-  version: 0.3.07
+  version: 0.3.08
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-08 00:00:00.000000000 Z
+date: 2016-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake