rley 0.6.04 → 0.6.05

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7dde019f49699000c53d19d500ccf1e5497ab155
-  data.tar.gz: 967a24d5da4566776c5d011971801aec07e0dbc8
+  metadata.gz: 3083af262074f545ce6cdb9afed83c0d8a5cd255
+  data.tar.gz: d99c85423dde12c232681524dc9f8692bbd1d0ce
 SHA512:
-  metadata.gz: 6415d986dd8296c28f7af9d32b8329a03c8861386830eb915ffa196de311848420cd35a171d661a7ce68948d428b224f1a8c2f009aa2b734477eecb9bf32a679
-  data.tar.gz: a0453cd6917b6658d549053216cfb9134ec5dc3e7de7e6cf0e2f3240502532077897264d456be748c7bdd8a5adeb9104f266b8004f7d19fef0e9fe9db3ade1c9
+  metadata.gz: 27b474bb46b84aad4cfa74f72cdadc4d7da99bb0a80e5d6f8e4176716a6297a5be9495adac0202f2c5791ddbeb728ef7a35a5f0dd0e22504cb3d934c2d4446c9
+  data.tar.gz: 296215d53be774b54bff3b1b4ee316afab8ea86282d507cb72fac36f55b810c694e45554b2758a4b18c9008cb75030147129b20b730ce1b8cd1077ff582438df

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 0.6.05 / 2018-04-02
+* [CHANGE] Method `ParseTreeBuilder#process_end_entry`: added an explicit message in case of ambiguous parse.
+* [CHANGE] Method `ParseTreeBuilder#process_item_entry`: added an explicit message in case of ambiguous parse.
+* [FIX] Method `ParseEntry#add_antecedent` now checks for the unicity of antecedent entries.
+
 ### 0.6.04 / 2018-03-30
 * [CHANGE] Method `GrammarBuilder#add_production` Simplified rule entry syntax
 * [CHANGE] File `examples/NML/pico_en_demo.rb` updated to reflect the simplified rule syntax.

data/lib/rley/constants.rb

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

data/lib/rley/engine.rb

@@ -61,7 +61,10 @@ module Rley # This module is used as a namespace
       end
       parser = build_parser(grammar)
       parser.gf_graph.diagnose if configuration.diagnose
-      return parser.parse(tokens)
+      result = parser.parse(tokens)
+      result.tidy_up!
+      
+      return result
     end
 
     # Convert raw parse result into a more convenient representation

data/lib/rley/parse_rep/parse_tree_builder.rb

@@ -101,8 +101,11 @@ module Rley # This module is used as a namespace
             non_terminal = entry2nonterm(anEntry)
             # Create raw node and push onto stack
             push_raw_node(range, non_terminal)
-          # when :revisit
-          #  # TODO: design specification
+
+          when :backtrack
+            msg_prefix = 'Ambiguous parse detected at '
+            msg_suffix = "entry: #{anEntry}, index: #{anIndex}"
+            raise StandardError, msg_prefix + msg_suffix
           else
             raise NotImplementedError, "Cannot handle event #{anEvent}"
         end
@@ -135,10 +138,14 @@ module Rley # This module is used as a namespace
               # (pattern: N => alpha+ . beta+)
               process_middle_entry(anEntry, anIndex)
             end
+          when :backtrack
+            msg_prefix = 'Ambiguous parse detected at '
+            msg_suffix = "entry: #{anEntry}, index: #{anIndex}"
+            raise StandardError, msg_prefix + msg_suffix
           else
             msg_prefix = "Internal Error '#{anEvent}', "
-            $stderr.puts msg_prefix + "entry: #{anEntry}, index: #{anIndex}"
-            raise NotImplementedError
+            msg_suffix = "entry: #{anEntry}, index: #{anIndex}"
+            raise NotImplementedError, msg_prefix + msg_suffix
         end
       end
 

data/lib/rley/parser/gfg_parsing.rb

@@ -78,7 +78,6 @@ module Rley # This module is used as a namespace
         start_entry = apply_rule(anEntry, start, pos, pos, :nullable_rule)
 
         end_vertex = gf_graph.end_vertex_for[next_symbol]
-        end_entry = push_entry(end_vertex, pos, pos, :nullable_rule)
 
         start.edges.each do |edge|
           succ = edge.successor # succ always an ItemVertex
@@ -89,6 +88,7 @@ module Rley # This module is used as a namespace
 
         curr_vertex = anEntry.vertex
         next_vertex = curr_vertex.shortcut.successor
+        end_entry = push_entry(end_vertex, pos, pos, :nullable_rule)        
         apply_rule(end_entry, next_vertex, anEntry.origin, pos, :nullable_rule)
       end
 
@@ -190,7 +190,7 @@ module Rley # This module is used as a namespace
       def parse_forest()
         msg = <<-END_MSG
  Method Rley::Parser::GFGParsing.parse_forest is deprecated, call
- Rley::Engine::to_pforest. It will be removed April 1st
+ Rley::Engine::to_pforest. It will be removed June 1st
  or version 0.6.1 (whichever is first)
 END_MSG
         # warn(msg)
@@ -240,6 +240,15 @@ END_MSG
         premature_end unless success? || failure_reason
       end
 
+      # Clean and normalize the object.
+      # Call this method when the parsing is complete.
+      def tidy_up!()
+        antecedence.each_key do |entry|
+          antecedence[entry].uniq!
+        end
+      end
+
+
       private
 
       # Parse error detected: all input tokens were consumed and
@@ -266,8 +275,42 @@ END_MSG
 
       def apply_rule(antecedentEntry, aVertex, anOrigin, aPosition, aRuleId)
         consequent = push_entry(aVertex, anOrigin, aPosition, aRuleId)
+
         antecedence[consequent] << antecedentEntry
+
+        # Invariant checks
+        antecedents = antecedence[consequent]
+        case aVertex
+          when Rley::GFG::EndVertex
+            # Rule: has 1..* antecedents, all of them are exit items
+            antecedents.each do |antec|
+              next if antec.exit_entry?
+              msg_prefix = "Parse entry #{consequent}"
+              msg_suffix = " has for antecedent #{antec}"              
+              raise StandardError, msg_prefix + msg_suffix
+            end
+          
+          when Rley::GFG::ItemVertex
+            # Rule: has exactly one antecedent
+            # if antecedents.size > 1
+              # msg_prefix = "Parse entry #{consequent} | #{aPosition}"
+              # msg = " has more than one antecedent:\n"
+              # msg_suffix = antecedents.map(&:to_s).join("\n")
+              # raise(StandardError, msg_prefix + msg + msg_suffix)
+            # end
+            
+          when Rley::GFG::StartVertex
+            # Rule: has 0..* antecedents, all of them are item vertices but not exit items
+            antecedents.each do |antec|
+              next if antec.dotted_entry? && !antec.end_entry?
+              msg_prefix = "Parse entry #{consequent}"
+              msg_suffix = " has for antecedent #{antec}"              
+              raise StandardError, msg_prefix + msg_suffix
+            end            
+        end
+
         consequent.add_antecedent(antecedentEntry)
+        return consequent
       end
 
       # Push a parse entry (vertex + origin) to the

data/lib/rley/parser/parse_entry.rb

@@ -43,7 +43,7 @@ module Rley # This module is used as a namespace
 
       # Add a link to an antecedent parse entry
       def add_antecedent(anAntecedent)
-        antecedents << anAntecedent
+        antecedents << anAntecedent unless antecedents.include?(anAntecedent)
       end
 
       # Equality comparison. A parse entry behaves as a value object.

data/spec/rley/parser/gfg_parsing_spec.rb

@@ -254,7 +254,7 @@ SNIPPET
           end_entry = subject.chart[1].last
           expect(end_entry.vertex.label).to eq('S => A .')
           expect(end_entry.origin).to eq(0)
-          expect(subject.antecedence.fetch(end_entry)).to eq([exit_entry]) 
+          expect(subject.antecedence.fetch(end_entry)).to eq([exit_entry])
         end
 =begin
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rley
 version: !ruby/object:Gem::Version
-  version: 0.6.04
+  version: 0.6.05
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-30 00:00:00.000000000 Z
+date: 2018-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls