rley 0.4.01 → 0.4.02

data/spec/rley/parser/parse_tree_factory_spec.rb

@@ -0,0 +1,85 @@
+require_relative '../../spec_helper'
+
+require_relative '../../../lib/rley/parser/gfg_earley_parser'
+
+require_relative '../../../lib/rley/syntax/grammar_builder'
+require_relative '../support/grammar_helper'
+require_relative '../support/expectation_helper'
+
+# Load the class under test
+require_relative '../../../lib/rley/parser/parse_forest_factory'
+
+module Rley # Open this namespace to avoid module qualifier prefixes
+  module Parser
+    describe ParseForestFactory do
+      include GrammarHelper     # Mix-in with token factory method
+      include ExpectationHelper # Mix-in with expectation on parse entry sets
+
+      let(:sample_grammar) do
+          # Grammar based on paper from Elisabeth Scott
+          # "SPPF-Style Parsing From Earley Recognizers" in
+          # Notes in Theoretical Computer Science 203, (2008), pp. 53-67
+          # contains a hidden left recursion and a cycle
+          builder = Syntax::GrammarBuilder.new do
+            add_terminals('a', 'b')
+            rule 'Phi' => 'S'
+            rule 'S' => %w(A T)
+            rule 'S' => %w(a T)
+            rule 'A' => 'a'
+            rule 'A' => %w(B A)
+            rule 'B' => []
+            rule 'T' => %w(b b b)
+          end
+          builder.grammar
+      end
+
+      let(:sample_tokens) do
+        build_token_sequence(%w(a b b b), sample_grammar)
+      end
+
+      let(:sample_result) do
+        parser = Parser::GFGEarleyParser.new(sample_grammar)
+        parser.parse(sample_tokens)
+      end
+
+
+      subject do
+        ParseForestFactory.new(sample_result)
+      end
+
+      # Emit a text representation of the current path.
+      def path_to_s()
+        text_parts = subject.curr_path.map do |path_element|
+          path_element.to_string(0)
+        end
+        return text_parts.join('/')
+      end
+
+
+      context 'Initialization:' do
+        it 'should be created with a GFGParsing' do
+          expect { ParseForestFactory.new(sample_result) }.not_to raise_error
+        end
+
+        it 'should know the parse result' do
+          expect(subject.parsing).to eq(sample_result)
+        end
+      end
+
+      context 'Parse forest construction' do
+        it 'should build a parse forest' do
+          forest = subject.build_parse_forest
+          expect(forest).to be_kind_of(SPPF::ParseForest)
+=begin
+          require 'yaml'
+          require_relative '../../../exp/lab/forest_representation'
+          File.open("forest.yml", "w") { |f| YAML.dump(forest, f) }
+          pen = ForestRepresentation.new
+          pen.generate_graph(forest, File.open("forest.dot", "w"))
+=end
+        end
+      end # context
+    end # describe
+  end # module
+end # module
+# End of file

data/spec/rley/parser/parse_walker_factory_spec.rb

@@ -29,7 +29,7 @@ module Rley # Open this namespace to avoid module qualifier prefixes
           case entry
             when Parser::ParseEntry
               expect(entry.to_s).to eq(expectations[1])
-            when Parser::Token
+            when Tokens::Token
               expect(entry.lexeme).to eq(expectations[1])
           end
         else
@@ -43,15 +43,16 @@ module Rley # Open this namespace to avoid module qualifier prefixes
           # "SPPF=Style Parsing From Earley Recognizers" in
           # Notes in Theoretical Computer Science 203, (2008), pp. 53-67
           # contains a hidden left recursion and a cycle
-          builder = Syntax::GrammarBuilder.new
-          builder.add_terminals('a', 'b')
-          builder.add_production('Phi' => 'S')
-          builder.add_production('S' => %w(A T))
-          builder.add_production('S' => %w(a T))
-          builder.add_production('A' => 'a')
-          builder.add_production('A' => %w(B A))
-          builder.add_production('B' => [])
-          builder.add_production('T' => %w(b b b))
+          builder = Syntax::GrammarBuilder.new do
+            add_terminals('a', 'b')
+            rule'Phi' => 'S'
+            rule'S' => %w(A T)
+            rule'S' => %w(a T)
+            rule'A' => 'a'
+            rule'A' => %w(B A)
+            rule'B' => []
+            rule'T' => %w(b b b)
+          end
           builder.grammar
       end
 

data/spec/rley/ptree/non_terminal_node_spec.rb

@@ -10,7 +10,7 @@ module Rley # Open this namespace to avoid module qualifier prefixes
     describe NonTerminalNode do
       # Factory method. Generate a range from its boundary values.
       def range(low, high)
-        return TokenRange.new(low: low, high: high)
+        return Tokens::TokenRange.new(low: low, high: high)
       end
 
       let(:sample_symbol) do
@@ -21,20 +21,25 @@ module Rley # Open this namespace to avoid module qualifier prefixes
       subject { NonTerminalNode.new(sample_symbol, sample_range) }
 
       context 'Initialization:' do
-        it "shouldn't have children yet" do
-          expect(subject.children).to be_empty
+        it "shouldn't have subnodes yet" do
+          expect(subject.subnodes).to be_empty
         end
       end # context
 
       context 'Provided services:' do
-        it 'should accept the addition of children' do
+        def build_token(aLexeme, aSymbolName)
+          terminal = OpenStruct.new(name: aSymbolName)
+          return OpenStruct.new(lexeme: aLexeme, terminal: terminal)
+        end
+        
+        it 'should accept the addition of subnodes' do
           child1 = double('first_child')
           child2 = double('second_child')
           child3 = double('third_child')
-          expect { subject.add_child(child1) }.not_to raise_error
-          subject.add_child(child2)
-          subject.add_child(child3)
-          expect(subject.children).to eq([child1, child2, child3])
+          expect { subject.add_subnode(child1) }.not_to raise_error
+          subject.add_subnode(child2)
+          subject.add_subnode(child3)
+          expect(subject.subnodes).to eq([child3, child2, child1])
         end
 
         it 'should provide a text representation of itself' do
@@ -42,25 +47,23 @@ module Rley # Open this namespace to avoid module qualifier prefixes
           expected_text = 'VP[0, 3]'
           expect(subject.to_string(0)).to eq(expected_text)
 
-          # Case 2: with children
-          verb = OpenStruct.new(name: 'Verb')
+          # Case 2: with subnodes
+          verb = build_token('catch', 'Verb')
           child_1_1 = TerminalNode.new(verb, range(0, 1))
           np = OpenStruct.new(name: 'NP')
           child_1_2 = NonTerminalNode.new(np, range(1, 3))
-          det = OpenStruct.new(name: 'Determiner')
+          det = build_token('that', 'Determiner')
           child_2_1 = TerminalNode.new(det, range(1, 2))
           nominal = OpenStruct.new(name: 'Nominal')
           child_2_2 = NonTerminalNode.new(nominal, range(2, 3))
-          noun = OpenStruct.new(name: 'Noun')
+          noun = build_token('bus', 'Noun')
           child_3_1 = TerminalNode.new(noun, range(2, 3))
-          subject.add_child(child_1_1)
-          subject.add_child(child_1_2)
-          child_1_2.add_child(child_2_1)
-          child_1_2.add_child(child_2_2)
-          child_2_2.add_child(child_3_1)
-          child_1_1.token = OpenStruct.new(lexeme: 'catch')
-          child_2_1.token = OpenStruct.new(lexeme: 'that')
-          child_3_1.token = OpenStruct.new(lexeme: 'bus')
+          # We reverse the sequence of subnode addition
+          subject.add_subnode(child_1_2)          
+          subject.add_subnode(child_1_1)
+          child_1_2.add_subnode(child_2_2)          
+          child_1_2.add_subnode(child_2_1)
+          child_2_2.add_subnode(child_3_1)
           expected_text = <<-SNIPPET
 VP[0, 3]
 +- Verb[0, 1]: 'catch'

data/spec/rley/ptree/terminal_node_spec.rb

@@ -7,28 +7,23 @@ require_relative '../../../lib/rley/ptree/terminal_node'
 module Rley # Open this namespace to avoid module qualifier prefixes
   module PTree # Open this namespace to avoid module qualifier prefixes
     describe TerminalNode do
-      let(:sample_symbol) do
-        OpenStruct.new(name: 'Noun')
+      let(:sample_symbol) { OpenStruct.new(name: 'Noun') }
+      let(:sample_token) do 
+        OpenStruct.new(lexeme: 'world', terminal: sample_symbol) 
       end
       let(:sample_range) { double('fake-range') }
       
-      subject { TerminalNode.new(sample_symbol, sample_range) }
+      subject { TerminalNode.new(sample_token, sample_range) }
       
       context 'Initialization:' do
-        it "shouldn't be already bound to a token" do
-          expect(subject.token).to be_nil
+        it "should be bound to a token" do
+          expect(subject.token).to eq(sample_token)
         end
       end # context
       
       context 'Provided services:' do
         it 'should provide a text representation of itself' do
-          # Case 1: not bound to a token
-          expected_text = "Noun[?, ?]: '(nil)'"
-          expect(subject.to_string(0)).to eq(expected_text)
-          
-          # Case 2: bound to token
-          subject.token = OpenStruct.new(lexeme: 'peace')
-          expected_text = "Noun[?, ?]: 'peace'"
+          expected_text = "Noun[?, ?]: 'world'"
           expect(subject.to_string(0)).to eq(expected_text)          
         end
       end # context

data/spec/rley/sppf/alternative_node_spec.rb

@@ -4,7 +4,7 @@ require_relative '../../spec_helper'
 require_relative '../../../lib/rley/gfg/item_vertex'
 require_relative '../../../lib/rley/syntax/terminal'
 require_relative '../../../lib/rley/syntax/production'
-require_relative '../../../lib/rley/ptree/token_range'
+require_relative '../../../lib/rley/tokens/token_range'
 require_relative '../../../lib/rley/parser/dotted_item'
 
 # Load the class under test
@@ -15,7 +15,7 @@ module Rley # Open this namespace to avoid module qualifier prefixes
     describe AlternativeNode do
       # Factory method. Generate a range from its boundary values.
       def range(low, high)
-        return PTree::TokenRange.new(low: low, high: high)
+        return Tokens::TokenRange.new(low: low, high: high)
       end
       
       let(:t_a) { Syntax::Terminal.new('A') }

data/spec/rley/sppf/non_terminal_node_spec.rb

@@ -2,7 +2,7 @@ require 'ostruct'
 require_relative '../../spec_helper'
 
 require_relative '../../../lib/rley/syntax/non_terminal'
-require_relative '../../../lib/rley/ptree/token_range'
+require_relative '../../../lib/rley/tokens/token_range'
 
 # Load the class under test
 require_relative '../../../lib/rley/sppf/non_terminal_node'
@@ -12,7 +12,7 @@ module Rley # Open this namespace to avoid module qualifier prefixes
     describe NonTerminalNode do
       # Factory method. Generate a range from its boundary values.
       def range(low, high)
-        return PTree::TokenRange.new(low: low, high: high)
+        return Tokens::TokenRange.new(low: low, high: high)
       end
 
       let(:sample_symbol) do

data/spec/rley/support/ambiguous_grammar_helper.rb

@@ -1,6 +1,6 @@
 # Load the builder class
 require_relative '../../../lib/rley/syntax/grammar_builder'
-require_relative '../../../lib/rley/parser/token'
+require_relative '../../../lib/rley/tokens/token'
 
 
 module AmbiguousGrammarHelper
@@ -29,7 +29,7 @@ module AmbiguousGrammarHelper
           msg = "Unknown input text '#{lexeme}'"
           raise StandardError, msg
       end
-      Rley::Parser::Token.new(lexeme, terminal)
+      Rley::Tokens::Token.new(lexeme, terminal)
     end
 
     return tokens

data/spec/rley/support/expectation_helper.rb

@@ -1,5 +1,5 @@
 # Load the builder class
-require_relative '../../../lib/rley/parser/token'
+require_relative '../../../lib/rley/tokens/token'
 
 
 # Mixin module implementing expectation helper methods.

data/spec/rley/support/grammar_ambig01_helper.rb

@@ -1,6 +1,6 @@
 # Load the builder class
 require_relative '../../../lib/rley/syntax/grammar_builder'
-require_relative '../../../lib/rley/parser/token'
+require_relative '../../../lib/rley/tokens/token'
 
 
 module GrammarAmbig01Helper
@@ -33,7 +33,7 @@ module GrammarAmbig01Helper
           msg = "Unknown input text '#{lexeme}'"
           raise StandardError, msg
       end
-      Rley::Parser::Token.new(lexeme, terminal)
+      Rley::Tokens::Token.new(lexeme, terminal)
     end
 
     return tokens

data/spec/rley/support/grammar_b_expr_helper.rb

@@ -1,6 +1,6 @@
 # Load the builder class
 require_relative '../../../lib/rley/syntax/grammar_builder'
-require_relative '../../../lib/rley/parser/token'
+require_relative '../../../lib/rley/tokens/token'
 
 
 module GrammarBExprHelper
@@ -32,7 +32,7 @@ module GrammarBExprHelper
           msg = "Unknown input text '#{lexeme}'"
           raise StandardError, msg
       end
-      Rley::Parser::Token.new(lexeme, terminal)
+      Rley::Tokens::Token.new(lexeme, terminal)
     end
 
     return tokens

data/spec/rley/support/grammar_helper.rb

@@ -1,5 +1,5 @@
 # Load the builder class
-require_relative '../../../lib/rley/parser/token'
+require_relative '../../../lib/rley/tokens/token'
 
 
 # Mixin module implementing helper methods.
@@ -12,13 +12,13 @@ module GrammarHelper
       case lexeme
         when String
           terminal = aGrammar.name2symbol[lexeme]
-          Rley::Parser::Token.new(lexeme, terminal)
+          Rley::Tokens::Token.new(lexeme, terminal)
 
         when Hash # lexeme is reality a Hash: literal => terminal name
           sub_array = lexeme.to_a
           sub_array.map do |(literal, name)|
             terminal = aGrammar.name2symbol[name]
-            Rley::Parser::Token.new(literal, terminal)
+            Rley::Tokens::Token.new(literal, terminal)
           end
       end
     end

data/spec/rley/support/grammar_l0_helper.rb

@@ -1,6 +1,6 @@
 # Load the builder class
 require_relative '../../../lib/rley/syntax/grammar_builder'
-require_relative '../../../lib/rley/parser/token'
+require_relative '../../../lib/rley/tokens/token'
 
 
 module GrammarL0Helper
@@ -74,7 +74,7 @@ module GrammarL0Helper
         raise StandardError, "Word '#{word}' not found in lexicon"
       end
       terminal = aGrammar.name2symbol[term_name]
-      Rley::Parser::Token.new(word, terminal)
+      Rley::Tokens::Token.new(word, terminal)
     end
 
     return tokens

data/spec/rley/support/grammar_pb_helper.rb

@@ -1,6 +1,6 @@
 # Load the builder class
 require_relative '../../../lib/rley/syntax/grammar_builder'
-require_relative '../../../lib/rley/parser/token'
+require_relative '../../../lib/rley/tokens/token'
 
 
 # Utility class.
@@ -39,7 +39,7 @@ class GrammarPBHelper
           msg = "Unknown input text '#{lexeme}'"
           raise StandardError, msg
       end
-      Rley::Parser::Token.new(lexeme, terminal)
+      Rley::Tokens::Token.new(lexeme, terminal)
     end
 
     return tokens

data/spec/rley/{ptree → tokens}/token_range_spec.rb

@@ -1,10 +1,10 @@
 require_relative '../../spec_helper'
 
 # Load the class under test
-require_relative '../../../lib/rley/ptree/token_range'
+require_relative '../../../lib/rley/tokens/token_range'
 
 module Rley # Open this namespace to avoid module qualifier prefixes
-  module PTree # Open this namespace to avoid module qualifier prefixes
+  module Tokens # Open this namespace to avoid module qualifier prefixes
     describe TokenRange do
       let(:sample_range) { { low: 0, high: 5 } }
 

data/spec/rley/{parser → tokens}/token_spec.rb

@@ -3,10 +3,10 @@ require_relative '../../spec_helper'
 require_relative '../../../lib/rley/syntax/terminal'
 
 # Load the class under test
-require_relative '../../../lib/rley/parser/token'
+require_relative '../../../lib/rley/tokens/token'
 
 module Rley # Open this namespace to avoid module qualifier prefixes
-  module Parser # Open this namespace to avoid module qualifier prefixes
+  module Tokens # Open this namespace to avoid module qualifier prefixes
     describe Token do
       let(:lexeme) { '"some text"' }
       let(:sample_terminal) { Syntax::Terminal.new('if') }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rley
 version: !ruby/object:Gem::Version
-  version: 0.4.01
+  version: 0.4.02
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-21 00:00:00.000000000 Z
+date: 2017-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -159,9 +159,7 @@ files:
 - lib/rley/parse_forest_visitor.rb
 - lib/rley/parse_tree_visitor.rb
 - lib/rley/parser/base_parser.rb
-- lib/rley/parser/chart.rb
 - lib/rley/parser/dotted_item.rb
-- lib/rley/parser/earley_parser.rb
 - lib/rley/parser/error_reason.rb
 - lib/rley/parser/gfg_chart.rb
 - lib/rley/parser/gfg_earley_parser.rb
@@ -176,15 +174,13 @@ files:
 - lib/rley/parser/parse_state_tracker.rb
 - lib/rley/parser/parse_tracer.rb
 - lib/rley/parser/parse_tree_builder.rb
+- lib/rley/parser/parse_tree_factory.rb
 - lib/rley/parser/parse_walker_factory.rb
-- lib/rley/parser/parsing.rb
 - lib/rley/parser/state_set.rb
-- lib/rley/parser/token.rb
 - lib/rley/ptree/non_terminal_node.rb
 - lib/rley/ptree/parse_tree.rb
 - lib/rley/ptree/parse_tree_node.rb
 - lib/rley/ptree/terminal_node.rb
-- lib/rley/ptree/token_range.rb
 - lib/rley/rley_error.rb
 - lib/rley/sppf/alternative_node.rb
 - lib/rley/sppf/composite_node.rb
@@ -203,6 +199,8 @@ files:
 - lib/rley/syntax/symbol_seq.rb
 - lib/rley/syntax/terminal.rb
 - lib/rley/syntax/verbatim_symbol.rb
+- lib/rley/tokens/token.rb
+- lib/rley/tokens/token_range.rb
 - spec/rley/formatter/debug_spec.rb
 - spec/rley/formatter/json_spec.rb
 - spec/rley/gfg/call_edge_spec.rb
@@ -220,9 +218,7 @@ files:
 - spec/rley/parse_forest_visitor_spec.rb
 - spec/rley/parse_tree_visitor_spec.rb
 - spec/rley/parser/ambiguous_parse_spec.rb
-- spec/rley/parser/chart_spec.rb
 - spec/rley/parser/dotted_item_spec.rb
-- spec/rley/parser/earley_parser_spec.rb
 - spec/rley/parser/error_reason_spec.rb
 - spec/rley/parser/gfg_chart_spec.rb
 - spec/rley/parser/gfg_earley_parser_spec.rb
@@ -236,15 +232,13 @@ files:
 - spec/rley/parser/parse_state_spec.rb
 - spec/rley/parser/parse_tracer_spec.rb
 - spec/rley/parser/parse_tree_builder_spec.rb
+- spec/rley/parser/parse_tree_factory_spec.rb
 - spec/rley/parser/parse_walker_factory_spec.rb
-- spec/rley/parser/parsing_spec.rb
 - spec/rley/parser/state_set_spec.rb
-- spec/rley/parser/token_spec.rb
 - spec/rley/ptree/non_terminal_node_spec.rb
 - spec/rley/ptree/parse_tree_node_spec.rb
 - spec/rley/ptree/parse_tree_spec.rb
 - spec/rley/ptree/terminal_node_spec.rb
-- spec/rley/ptree/token_range_spec.rb
 - spec/rley/sppf/alternative_node_spec.rb
 - spec/rley/sppf/non_terminal_node_spec.rb
 - spec/rley/support/ambiguous_grammar_helper.rb
@@ -265,6 +259,8 @@ files:
 - spec/rley/syntax/symbol_seq_spec.rb
 - spec/rley/syntax/terminal_spec.rb
 - spec/rley/syntax/verbatim_symbol_spec.rb
+- spec/rley/tokens/token_range_spec.rb
+- spec/rley/tokens/token_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/famished-tiger/Rley
 licenses:
@@ -310,9 +306,7 @@ test_files:
 - spec/rley/gfg/start_vertex_spec.rb
 - spec/rley/gfg/vertex_spec.rb
 - spec/rley/parser/ambiguous_parse_spec.rb
-- spec/rley/parser/chart_spec.rb
 - spec/rley/parser/dotted_item_spec.rb
-- spec/rley/parser/earley_parser_spec.rb
 - spec/rley/parser/error_reason_spec.rb
 - spec/rley/parser/gfg_chart_spec.rb
 - spec/rley/parser/gfg_earley_parser_spec.rb
@@ -326,17 +320,15 @@ test_files:
 - spec/rley/parser/parse_state_spec.rb
 - spec/rley/parser/parse_tracer_spec.rb
 - spec/rley/parser/parse_tree_builder_spec.rb
+- spec/rley/parser/parse_tree_factory_spec.rb
 - spec/rley/parser/parse_walker_factory_spec.rb
-- spec/rley/parser/parsing_spec.rb
 - spec/rley/parser/state_set_spec.rb
-- spec/rley/parser/token_spec.rb
 - spec/rley/parse_forest_visitor_spec.rb
 - spec/rley/parse_tree_visitor_spec.rb
 - spec/rley/ptree/non_terminal_node_spec.rb
 - spec/rley/ptree/parse_tree_node_spec.rb
 - spec/rley/ptree/parse_tree_spec.rb
 - spec/rley/ptree/terminal_node_spec.rb
-- spec/rley/ptree/token_range_spec.rb
 - spec/rley/sppf/alternative_node_spec.rb
 - spec/rley/sppf/non_terminal_node_spec.rb
 - spec/rley/syntax/grammar_builder_spec.rb
@@ -348,3 +340,5 @@ test_files:
 - spec/rley/syntax/symbol_seq_spec.rb
 - spec/rley/syntax/terminal_spec.rb
 - spec/rley/syntax/verbatim_symbol_spec.rb
+- spec/rley/tokens/token_range_spec.rb
+- spec/rley/tokens/token_spec.rb