rley 0.5.05 → 0.5.06

data/spec/rley/parser/parse_entry_spec.rb

@@ -3,7 +3,7 @@ require_relative '../../spec_helper'
 require_relative '../../../lib/rley/syntax/terminal'
 require_relative '../../../lib/rley/syntax/non_terminal'
 require_relative '../../../lib/rley/syntax/production'
-require_relative '../../../lib/rley/parser/dotted_item'
+require_relative '../../../lib/rley/base/dotted_item'
 
 # Load the class under test
 require_relative '../../../lib/rley/parser/parse_entry'
@@ -24,7 +24,7 @@ module Rley # Open this namespace to avoid module qualifier prefixes
         Syntax::Production.new(nt_sentence, [])
       end
 
-      let(:dotted_rule) { DottedItem.new(sample_prod, 2) }
+      let(:dotted_rule) { Base::DottedItem.new(sample_prod, 2) }
       let(:origin_val) { 3 }
       let(:vertex_faked) { double('fake-vertex') }
       let(:vertex2) { double('vertex-mock') }
@@ -129,13 +129,13 @@ module Rley # Open this namespace to avoid module qualifier prefixes
           expect(instance2).not_to be_entry_entry
 
           # Case: item vertex not at begin of rhs
-          d1 = DottedItem.new(sample_prod, 1)          
+          d1 = Base::DottedItem.new(sample_prod, 1)          
           v1 = GFG::ItemVertex.new(d1)
           instance3 = ParseEntry.new(v1, 3)
           expect(instance3).not_to be_entry_entry
 
           # Case: item vertex at end of rhs
-          d2 = DottedItem.new(sample_prod, 0)          
+          d2 = Base::DottedItem.new(sample_prod, 0)          
           v2 = GFG::ItemVertex.new(d2)          
           instance4 = ParseEntry.new(v2, 3)
           expect(instance4).to be_entry_entry

data/spec/rley/parser/parse_state_spec.rb

@@ -3,7 +3,7 @@ require_relative '../../spec_helper'
 require_relative '../../../lib/rley/syntax/terminal'
 require_relative '../../../lib/rley/syntax/non_terminal'
 require_relative '../../../lib/rley/syntax/production'
-require_relative '../../../lib/rley/parser/dotted_item'
+require_relative '../../../lib/rley/base/dotted_item'
 
 # Load the class under test
 require_relative '../../../lib/rley/parser/parse_state'
@@ -29,7 +29,7 @@ module Rley # Open this namespace to avoid module qualifier prefixes
       end
 
       let(:origin_val) { 3 }
-      let(:dotted_rule) { DottedItem.new(sample_prod, 2) }
+      let(:dotted_rule) { Base::DottedItem.new(sample_prod, 2) }
       let(:other_dotted_rule) { double('mock-dotted-item') }
 
       # Default instantiation rule
@@ -77,7 +77,7 @@ module Rley # Open this namespace to avoid module qualifier prefixes
         
         it 'should know if the parsing is at the start of the production' do
           expect(subject).not_to be_predicted
-          at_start = DottedItem.new(sample_prod, 0)
+          at_start = Base::DottedItem.new(sample_prod, 0)
 
           instance = ParseState.new(at_start, 0)
           expect(instance).to be_predicted
@@ -85,7 +85,7 @@ module Rley # Open this namespace to avoid module qualifier prefixes
 
         it 'should know if the parsing reached the end of the production' do
           expect(subject).not_to be_complete
-          at_end = DottedItem.new(sample_prod, 3)
+          at_end = Base::DottedItem.new(sample_prod, 3)
 
           instance = ParseState.new(at_end, 2)
           expect(instance).to be_complete
@@ -97,12 +97,12 @@ module Rley # Open this namespace to avoid module qualifier prefixes
         
         it 'should know whether another instance follows this one' do
           expect(subject.precedes?(subject)).to eq(false)
-          state1 = ParseState.new(DottedItem.new(sample_prod, 1), origin_val)
+          state1 = ParseState.new(Base::DottedItem.new(sample_prod, 1), origin_val)
           expect(state1.precedes?(subject)).to eq(true)
-          state0 = ParseState.new(DottedItem.new(sample_prod, 0), origin_val)
+          state0 = ParseState.new(Base::DottedItem.new(sample_prod, 0), origin_val)
           expect(state0.precedes?(state1)).to eq(true)
           expect(state0.precedes?(subject)).to eq(false)
-          state3 = ParseState.new(DottedItem.new(sample_prod, 3), origin_val)
+          state3 = ParseState.new(Base::DottedItem.new(sample_prod, 3), origin_val)
           expect(state3.precedes?(state0)).to eq(false)
         end
         

data/spec/rley/parser/parse_tracer_spec.rb

@@ -4,9 +4,9 @@ require 'stringio'
 require_relative '../../../lib/rley/syntax/terminal'
 require_relative '../../../lib/rley/syntax/non_terminal'
 require_relative '../../../lib/rley/syntax/production'
-require_relative '../../../lib/rley/parser/dotted_item'
+require_relative '../../../lib/rley/base/dotted_item'
 require_relative '../../../lib/rley/parser/parse_state'
-require_relative '../../../lib/rley/tokens/token'
+require_relative '../../../lib/rley/lexical/token'
 
 # Load the class under test
 require_relative '../../../lib/rley/parser/parse_tracer'
@@ -18,7 +18,7 @@ module Rley # Open this namespace to avoid module qualifier prefixes
 
       let(:token_seq) do
         literals = %w[I saw John with a dog]
-        literals.map { |lexeme| Tokens::Token.new(lexeme, nil) }
+        literals.map { |lexeme| Lexical::Token.new(lexeme, nil) }
       end
 
       subject { ParseTracer.new(1, output, token_seq) }
@@ -68,8 +68,8 @@ SNIPPET
         end
 
         let(:origin_val) { 3 }
-        let(:dotted_rule) { DottedItem.new(sample_prod, 2) }
-        let(:complete_rule) { DottedItem.new(sample_prod, 3) }
+        let(:dotted_rule) { Base::DottedItem.new(sample_prod, 2) }
+        let(:complete_rule) { Base::DottedItem.new(sample_prod, 3) }
         let(:sample_parse_state) { ParseState.new(dotted_rule, origin_val) }
 
         # Factory method.

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 Tokens::Token
+            when Lexical::Token
               expect(entry.lexeme).to eq(expectations[1])
           end
         else

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 Tokens::TokenRange.new(low: low, high: high)
+        return Lexical::TokenRange.new(low: low, high: high)
       end
 
       let(:sample_symbol) do

data/spec/rley/sppf/alternative_node_spec.rb

@@ -4,8 +4,8 @@ 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/tokens/token_range'
-require_relative '../../../lib/rley/parser/dotted_item'
+require_relative '../../../lib/rley/lexical/token_range'
+require_relative '../../../lib/rley/base/dotted_item'
 
 # Load the class under test
 require_relative '../../../lib/rley/sppf/alternative_node'
@@ -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 Tokens::TokenRange.new(low: low, high: high)
+        return Lexical::TokenRange.new(low: low, high: high)
       end
       
       let(:t_a) { Syntax::Terminal.new('A') }
@@ -25,7 +25,7 @@ module Rley # Open this namespace to avoid module qualifier prefixes
       let(:sample_prod) do
         Syntax::Production.new(nt_sentence, [t_a, t_b, t_c])
       end
-      let(:sample_item) { Parser::DottedItem.new(sample_prod, 3) }
+      let(:sample_item) { Base::DottedItem.new(sample_prod, 3) }
       let(:sample_vertex) { GFG::ItemVertex.new(sample_item) }
       let(:sample_range) { range(0, 3) }      
 

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/tokens/token_range'
+require_relative '../../../lib/rley/lexical/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 Tokens::TokenRange.new(low: low, high: high)
+        return Lexical::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/tokens/token'
+require_relative '../../../lib/rley/lexical/token'
 
 
 module AmbiguousGrammarHelper
@@ -29,7 +29,7 @@ module AmbiguousGrammarHelper
           msg = "Unknown input text '#{lexeme}'"
           raise StandardError, msg
       end
-      Rley::Tokens::Token.new(lexeme, terminal)
+      Rley::Lexical::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/tokens/token'
+require_relative '../../../lib/rley/lexical/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/tokens/token'
+require_relative '../../../lib/rley/lexical/token'
 
 
 module GrammarAmbig01Helper
@@ -32,7 +32,7 @@ module GrammarAmbig01Helper
           msg = "Unknown input text '#{lexeme}'"
           raise StandardError, msg
       end
-      Rley::Tokens::Token.new(lexeme, terminal)
+      Rley::Lexical::Token.new(lexeme, terminal)
     end
 
     return tokens

data/spec/rley/support/grammar_arr_int_helper.rb

@@ -2,7 +2,7 @@ require 'strscan'
 
 # Load the builder class
 require_relative '../../../lib/rley/syntax/grammar_builder'
-require_relative '../../../lib/rley/tokens/token'
+require_relative '../../../lib/rley/lexical/token'
 
 
 module GrammarArrIntHelper
@@ -32,13 +32,13 @@ module GrammarArrIntHelper
       lexeme = scanner.scan(/[\[,\]]/)
       if lexeme
         terminal = aGrammar.name2symbol[lexeme]
-        tokens << Rley::Tokens::Token.new(lexeme, terminal)
+        tokens << Rley::Lexical::Token.new(lexeme, terminal)
         next
       end
       lexeme = scanner.scan(/^[-+]?\d+/)
       if lexeme
         terminal = aGrammar.name2symbol['integer']
-        tokens << Rley::Tokens::Token.new(lexeme, terminal)
+        tokens << Rley::Lexical::Token.new(lexeme, terminal)
       else
         msg = "Unknown input text '#{lexeme}'"
         raise StandardError, msg

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/tokens/token'
+require_relative '../../../lib/rley/lexical/token'
 
 
 module GrammarBExprHelper
@@ -32,7 +32,7 @@ module GrammarBExprHelper
           msg = "Unknown input text '#{lexeme}'"
           raise StandardError, msg
       end
-      Rley::Tokens::Token.new(lexeme, terminal)
+      Rley::Lexical::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/tokens/token'
+require_relative '../../../lib/rley/lexical/token'
 
 
 # Mixin module implementing helper methods.
@@ -12,13 +12,13 @@ module GrammarHelper
       case lexeme
         when String
           terminal = aGrammar.name2symbol[lexeme]
-          Rley::Tokens::Token.new(lexeme, terminal)
+          Rley::Lexical::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::Tokens::Token.new(literal, terminal)
+            Rley::Lexical::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/tokens/token'
+require_relative '../../../lib/rley/lexical/token'
 
 
 module GrammarL0Helper
@@ -73,7 +73,7 @@ module GrammarL0Helper
         raise StandardError, "Word '#{word}' not found in lexicon"
       end
       terminal = aGrammar.name2symbol[term_name]
-      Rley::Tokens::Token.new(word, terminal)
+      Rley::Lexical::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/tokens/token'
+require_relative '../../../lib/rley/lexical/token'
 
 
 # Utility class.
@@ -38,7 +38,7 @@ class GrammarPBHelper
           msg = "Unknown input text '#{lexeme}'"
           raise StandardError, msg
       end
-      Rley::Tokens::Token.new(lexeme, terminal)
+      Rley::Lexical::Token.new(lexeme, terminal)
     end
 
     return tokens

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rley
 version: !ruby/object:Gem::Version
-  version: 0.5.05
+  version: 0.5.06
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-04 00:00:00.000000000 Z
+date: 2017-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls
@@ -154,6 +154,9 @@ files:
 - examples/general/calc_iter2/calc_parser.rb
 - examples/general/calc_iter2/spec/calculator_spec.rb
 - lib/rley.rb
+- lib/rley/base/base_parser.rb
+- lib/rley/base/dotted_item.rb
+- lib/rley/base/grm_items_builder.rb
 - lib/rley/constants.rb
 - lib/rley/formatter/asciitree.rb
 - lib/rley/formatter/base_formatter.rb
@@ -172,16 +175,15 @@ files:
 - lib/rley/gfg/shortcut_edge.rb
 - lib/rley/gfg/start_vertex.rb
 - lib/rley/gfg/vertex.rb
+- lib/rley/lexical/token.rb
+- lib/rley/lexical/token_range.rb
 - lib/rley/parse_forest_visitor.rb
 - lib/rley/parse_tree_visitor.rb
-- lib/rley/parser/base_parser.rb
 - lib/rley/parser/cst_builder.rb
-- lib/rley/parser/dotted_item.rb
 - lib/rley/parser/error_reason.rb
 - lib/rley/parser/gfg_chart.rb
 - lib/rley/parser/gfg_earley_parser.rb
 - lib/rley/parser/gfg_parsing.rb
-- lib/rley/parser/grm_items_builder.rb
 - lib/rley/parser/parse_entry.rb
 - lib/rley/parser/parse_entry_set.rb
 - lib/rley/parser/parse_entry_tracker.rb
@@ -217,8 +219,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/base/dotted_item_spec.rb
+- spec/rley/base/grm_items_builder_spec.rb
 - spec/rley/formatter/asciitree_spec.rb
 - spec/rley/formatter/bracket_notation_spec.rb
 - spec/rley/formatter/debug_spec.rb
@@ -235,17 +237,17 @@ files:
 - spec/rley/gfg/shortcut_edge_spec.rb
 - spec/rley/gfg/start_vertex_spec.rb
 - spec/rley/gfg/vertex_spec.rb
+- spec/rley/lexical/token_range_spec.rb
+- spec/rley/lexical/token_spec.rb
 - spec/rley/parse_forest_visitor_spec.rb
 - spec/rley/parse_tree_visitor_spec.rb
 - spec/rley/parser/ambiguous_parse_spec.rb
 - spec/rley/parser/ast_builder_spec.rb
 - spec/rley/parser/cst_builder_spec.rb
-- spec/rley/parser/dotted_item_spec.rb
 - spec/rley/parser/error_reason_spec.rb
 - spec/rley/parser/gfg_chart_spec.rb
 - spec/rley/parser/gfg_earley_parser_spec.rb
 - spec/rley/parser/gfg_parsing_spec.rb
-- spec/rley/parser/grm_items_builder_spec.rb
 - spec/rley/parser/groucho_spec.rb
 - spec/rley/parser/parse_entry_set_spec.rb
 - spec/rley/parser/parse_entry_spec.rb
@@ -281,8 +283,6 @@ 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:
@@ -313,6 +313,8 @@ signing_key:
 specification_version: 4
 summary: Ruby implementation of the Earley's parsing algorithm
 test_files:
+- spec/rley/base/dotted_item_spec.rb
+- spec/rley/base/grm_items_builder_spec.rb
 - spec/rley/formatter/asciitree_spec.rb
 - spec/rley/formatter/bracket_notation_spec.rb
 - spec/rley/formatter/debug_spec.rb
@@ -329,15 +331,15 @@ test_files:
 - spec/rley/gfg/shortcut_edge_spec.rb
 - spec/rley/gfg/start_vertex_spec.rb
 - spec/rley/gfg/vertex_spec.rb
+- spec/rley/lexical/token_range_spec.rb
+- spec/rley/lexical/token_spec.rb
 - spec/rley/parser/ambiguous_parse_spec.rb
 - spec/rley/parser/ast_builder_spec.rb
 - spec/rley/parser/cst_builder_spec.rb
-- spec/rley/parser/dotted_item_spec.rb
 - spec/rley/parser/error_reason_spec.rb
 - spec/rley/parser/gfg_chart_spec.rb
 - spec/rley/parser/gfg_earley_parser_spec.rb
 - spec/rley/parser/gfg_parsing_spec.rb
-- spec/rley/parser/grm_items_builder_spec.rb
 - spec/rley/parser/groucho_spec.rb
 - spec/rley/parser/parse_entry_set_spec.rb
 - spec/rley/parser/parse_entry_spec.rb
@@ -365,5 +367,3 @@ 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

data/lib/rley/tokens/token.rb

@@ -1,14 +0,0 @@
-module Rley # This module is used as a namespace
-  module Tokens # This module is used as a namespace
-    class Token
-      attr_reader(:lexeme)
-      attr_reader(:terminal)
-
-      def initialize(theLexeme, aTerminal)
-        @lexeme = theLexeme
-        @terminal = aTerminal
-      end
-    end # class
-  end # module
-end # module
-# End of file