rley 0.5.05 → 0.5.06

data/spec/rley/{parser → base}/grm_items_builder_spec.rb

@@ -3,10 +3,10 @@ require_relative '../../spec_helper'
 require_relative '../support/grammar_abc_helper'
 
 # Load the module under test
-require_relative '../../../lib/rley/parser/grm_items_builder'
+require_relative '../../../lib/rley/base/grm_items_builder'
 
 module Rley # Open this namespace to avoid module qualifier prefixes
-  module Parser # Open this namespace to avoid module qualifier prefixes
+  module Base # Open this namespace to avoid module qualifier prefixes
     describe 'Testing GrmItemsBuilder' do
       include GrmItemsBuilder # Use mix-in to test
       include GrammarABCHelper # Mix-in module with builder for grammar abc

data/spec/rley/formatter/asciitree_spec.rb

@@ -2,7 +2,7 @@ require_relative '../../spec_helper'
 require 'stringio'
 
 require_relative '../support/grammar_abc_helper'
-require_relative '../../../lib/rley/tokens/token'
+require_relative '../../../lib/rley/lexical/token'
 require_relative '../../../lib/rley/parser/gfg_earley_parser'
 require_relative '../../../lib/rley/ptree/parse_tree'
 require_relative '../../../lib/rley/parse_tree_visitor'
@@ -30,11 +30,11 @@ module Rley # Re-open the module to get rid of qualified names
       # for the language specified by gramma_abc
       let(:grm_abc_tokens1) do
         [
-          Tokens::Token.new('a', a_),
-          Tokens::Token.new('a', a_),
-          Tokens::Token.new('b', b_),
-          Tokens::Token.new('c', c_),
-          Tokens::Token.new('c', c_)
+          Lexical::Token.new('a', a_),
+          Lexical::Token.new('a', a_),
+          Lexical::Token.new('b', b_),
+          Lexical::Token.new('c', c_),
+          Lexical::Token.new('c', c_)
         ]
       end
 

data/spec/rley/formatter/bracket_notation_spec.rb

@@ -2,7 +2,7 @@ require_relative '../../spec_helper'
 require 'stringio'
 
 require_relative '../support/grammar_abc_helper'
-require_relative '../../../lib/rley/tokens/token'
+require_relative '../../../lib/rley/lexical/token'
 require_relative '../../../lib/rley/parser/gfg_earley_parser'
 require_relative '../../../lib/rley/ptree/parse_tree'
 require_relative '../../../lib/rley/parse_tree_visitor'
@@ -30,11 +30,11 @@ module Rley # Re-open the module to get rid of qualified names
       # for the language specified by gramma_abc
       let(:grm_abc_tokens1) do
         [
-          Tokens::Token.new('a', a_),
-          Tokens::Token.new('a', a_),
-          Tokens::Token.new('b', b_),
-          Tokens::Token.new('c', c_),
-          Tokens::Token.new('c', c_)
+          Lexical::Token.new('a', a_),
+          Lexical::Token.new('a', a_),
+          Lexical::Token.new('b', b_),
+          Lexical::Token.new('c', c_),
+          Lexical::Token.new('c', c_)
         ]
       end
 

data/spec/rley/formatter/debug_spec.rb

@@ -2,7 +2,7 @@ require_relative '../../spec_helper'
 require 'stringio'
 
 require_relative '../support/grammar_abc_helper'
-require_relative '../../../lib/rley/tokens/token'
+require_relative '../../../lib/rley/lexical/token'
 require_relative '../../../lib/rley/parser/gfg_earley_parser'
 require_relative '../../../lib/rley/ptree/parse_tree'
 require_relative '../../../lib/rley/parse_tree_visitor'
@@ -30,11 +30,11 @@ module Rley # Re-open the module to get rid of qualified names
       # for the language specified by gramma_abc
       let(:grm_abc_tokens1) do
         [
-          Tokens::Token.new('a', a_),
-          Tokens::Token.new('a', a_),
-          Tokens::Token.new('b', b_),
-          Tokens::Token.new('c', c_),
-          Tokens::Token.new('c', c_)
+          Lexical::Token.new('a', a_),
+          Lexical::Token.new('a', a_),
+          Lexical::Token.new('b', b_),
+          Lexical::Token.new('c', c_),
+          Lexical::Token.new('c', c_)
         ]
       end
 

data/spec/rley/formatter/json_spec.rb

@@ -2,7 +2,7 @@ require_relative '../../spec_helper'
 require 'stringio'
 
 require_relative '../support/grammar_abc_helper'
-require_relative '../../../lib/rley/tokens/token'
+require_relative '../../../lib/rley/lexical/token'
 require_relative '../../../lib/rley/parser/gfg_earley_parser'
 require_relative '../../../lib/rley/ptree/parse_tree'
 require_relative '../../../lib/rley/parse_tree_visitor'
@@ -30,11 +30,11 @@ module Rley # Re-open the module to get rid of qualified names
       # for the language specified by gramma_abc
       let(:grm_abc_tokens1) do
         [
-          Tokens::Token.new('a', a_),
-          Tokens::Token.new('a', a_),
-          Tokens::Token.new('b', b_),
-          Tokens::Token.new('c', c_),
-          Tokens::Token.new('c', c_)
+          Lexical::Token.new('a', a_),
+          Lexical::Token.new('a', a_),
+          Lexical::Token.new('b', b_),
+          Lexical::Token.new('c', c_),
+          Lexical::Token.new('c', c_)
         ]
       end
 

data/spec/rley/gfg/call_edge_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'
 require_relative '../../../lib/rley/gfg/start_vertex'
 require_relative '../../../lib/rley/gfg/item_vertex'
 
@@ -25,7 +25,7 @@ module Rley # Open this namespace to avoid module qualifier prefixes
       let(:nt_sentence) { Rley::Syntax::NonTerminal.new('sentence') }
       let(:nt_b_sequence) { Rley::Syntax::NonTerminal.new('b_sequence') }
       let(:sample_prod) { build_prod(nt_sentence, t_a, nt_b_sequence, t_c) }
-      let(:sample_item) { Parser::DottedItem.new(sample_prod, 1) }
+      let(:sample_item) { Base::DottedItem.new(sample_prod, 1) }
 
       let(:vertex1) { ItemVertex.new(sample_item) }
       let(:vertex2) { StartVertex.new('to') }

data/spec/rley/gfg/grm_flow_graph_spec.rb

@@ -1,7 +1,7 @@
 require_relative '../../spec_helper'
 
 require_relative '../support/grammar_abc_helper'
-require_relative '../../../lib/rley/parser/grm_items_builder'
+require_relative '../../../lib/rley/base/grm_items_builder'
 
 # Load the module under test
 require_relative '../../../lib/rley/gfg/grm_flow_graph'
@@ -15,7 +15,7 @@ module Rley # Open this namespace to avoid module qualifier prefixes
       # from the given grammar
       def build_items_for_grammar(aGrammar)
         helper = Object.new
-        helper.extend(Parser::GrmItemsBuilder)
+        helper.extend(Base::GrmItemsBuilder)
         return helper.build_dotted_items(aGrammar)
       end
 

data/spec/rley/gfg/item_vertex_spec.rb

@@ -2,7 +2,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'
 require_relative '../../../lib/rley/gfg/shortcut_edge'
 
 # Load the class under test
@@ -27,8 +27,8 @@ module Rley # Open this namespace to avoid module qualifier prefixes
       let(:recursive_prod) { build_prod(nt_b_sequence, nt_b_sequence, t_b) }
       let(:b_prod) { build_prod(nt_b_sequence, t_b) }
       let(:empty_prod) { build_prod(nt_sentence) }
-      let(:sample_item) { Parser::DottedItem.new(sample_prod, 1) }
-      let(:next_item) { Parser::DottedItem.new(sample_prod, 2) }
+      let(:sample_item) { Base::DottedItem.new(sample_prod, 1) }
+      let(:next_item) { Base::DottedItem.new(sample_prod, 2) }
       subject { ItemVertex.new(sample_item) }
 
       context 'Initialization:' do
@@ -59,11 +59,11 @@ module Rley # Open this namespace to avoid module qualifier prefixes
           expect(subject).not_to be_complete
 
           # Case: dot at the end
-          instance1 = ItemVertex.new(Parser::DottedItem.new(sample_prod, 3))
+          instance1 = ItemVertex.new(Base::DottedItem.new(sample_prod, 3))
           expect(instance1).to be_complete
 
           # Case: empty production
-          instance2 = ItemVertex.new(Parser::DottedItem.new(empty_prod, 0))
+          instance2 = ItemVertex.new(Base::DottedItem.new(empty_prod, 0))
           expect(instance2).to be_complete
         end
 
@@ -77,11 +77,11 @@ module Rley # Open this namespace to avoid module qualifier prefixes
           expect(instance2.prev_symbol).to eq(nt_b_sequence)          
 
           # Case: dot is at begin
-          instance3 = ItemVertex.new(Parser::DottedItem.new(sample_prod, 0))
+          instance3 = ItemVertex.new(Base::DottedItem.new(sample_prod, 0))
           expect(instance3.prev_symbol).to be_nil
 
           # Case: empty production
-          instance4 = ItemVertex.new(Parser::DottedItem.new(empty_prod, 0))
+          instance4 = ItemVertex.new(Base::DottedItem.new(empty_prod, 0))
           expect(instance4.prev_symbol).to be_nil
         end
         
@@ -95,11 +95,11 @@ module Rley # Open this namespace to avoid module qualifier prefixes
           expect(instance1.next_symbol).to eq(t_c)
 
           # Case: dot is at end
-          instance2 = ItemVertex.new(Parser::DottedItem.new(sample_prod, 3))
+          instance2 = ItemVertex.new(Base::DottedItem.new(sample_prod, 3))
           expect(instance2.next_symbol).to be_nil
 
           # Case: empty production
-          instance3 = ItemVertex.new(Parser::DottedItem.new(empty_prod, 0))
+          instance3 = ItemVertex.new(Base::DottedItem.new(empty_prod, 0))
           expect(instance3.next_symbol).to be_nil
         end
 

data/spec/rley/gfg/return_edge_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'
 require_relative '../../../lib/rley/gfg/end_vertex'
 require_relative '../../../lib/rley/gfg/item_vertex'
 
@@ -25,7 +25,7 @@ module Rley # Open this namespace to avoid module qualifier prefixes
       let(:nt_sentence) { Rley::Syntax::NonTerminal.new('sentence') }
       let(:nt_b_sequence) { Rley::Syntax::NonTerminal.new('b_sequence') }
       let(:sample_prod) { build_prod(nt_sentence, t_a, nt_b_sequence, t_c) }
-      let(:sample_item) { Parser::DottedItem.new(sample_prod, 1) }
+      let(:sample_item) { Base::DottedItem.new(sample_prod, 1) }
 
       let(:vertex1) { EndVertex.new('from') }
       let(:vertex2) { ItemVertex.new(sample_item) }

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

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

data/spec/rley/{tokens → lexical}/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/tokens/token'
+require_relative '../../../lib/rley/lexical/token'
 
 module Rley # Open this namespace to avoid module qualifier prefixes
-  module Tokens # Open this namespace to avoid module qualifier prefixes
+  module Lexical # Open this namespace to avoid module qualifier prefixes
     describe Token do
       let(:lexeme) { '"some text"' }
       let(:sample_terminal) { Syntax::Terminal.new('if') }

data/spec/rley/parse_forest_visitor_spec.rb

@@ -2,7 +2,7 @@ require_relative '../spec_helper'
 
 require_relative './support/grammar_helper'
 require_relative './support/grammar_sppf_helper'
-require_relative '../../lib/rley/tokens/token'
+require_relative '../../lib/rley/lexical/token'
 require_relative '../../lib/rley/parser/gfg_earley_parser'
 require_relative '../../lib/rley/sppf/non_terminal_node'
 require_relative '../../lib/rley/sppf/parse_forest'

data/spec/rley/parse_tree_visitor_spec.rb

@@ -1,7 +1,7 @@
 require_relative '../spec_helper'
 
 require_relative './support/grammar_abc_helper'
-require_relative '../../lib/rley/tokens/token'
+require_relative '../../lib/rley/lexical/token'
 require_relative '../../lib/rley/parser/gfg_earley_parser'
 # Load the class under test
 require_relative '../../lib/rley/parse_tree_visitor'
@@ -24,11 +24,11 @@ module Rley # Open this namespace to avoid module qualifier prefixes
     # for the language specified by gramma_abc
     let(:grm_abc_tokens1) do
       [
-        Tokens::Token.new('a', a_),
-        Tokens::Token.new('a', a_),
-        Tokens::Token.new('b', b_),
-        Tokens::Token.new('c', c_),
-        Tokens::Token.new('c', c_)
+        Lexical::Token.new('a', a_),
+        Lexical::Token.new('a', a_),
+        Lexical::Token.new('b', b_),
+        Lexical::Token.new('c', c_),
+        Lexical::Token.new('c', c_)
       ]
     end
 

data/spec/rley/parser/ast_builder_spec.rb

@@ -168,7 +168,7 @@ module Rley # Open this namespace to avoid module qualifier prefixes
       end
 
       def create_range(low, high)
-        return Tokens::TokenRange.new(low: low, high: high)
+        return Lexical::TokenRange.new(low: low, high: high)
       end
 
       context 'Initialization:' do

data/spec/rley/parser/cst_builder_spec.rb

@@ -48,7 +48,7 @@ module Rley # Open this namespace to avoid module qualifier prefixes
       end
 
       def create_range(low, high)
-        return Tokens::TokenRange.new(low: low, high: high)
+        return Lexical::TokenRange.new(low: low, high: high)
       end
 
       context 'Initialization:' do

data/spec/rley/parser/error_reason_spec.rb

@@ -1,5 +1,5 @@
 require_relative '../../spec_helper'
-require_relative '../../../lib/rley/tokens/token'
+require_relative '../../../lib/rley/lexical/token'
 
 # Load the class under test
 require_relative '../../../lib/rley/parser/error_reason'
@@ -62,7 +62,7 @@ module Rley # Open this namespace to avoid module qualifier prefixes
     describe UnexpectedToken do
       let(:err_lexeme) { '-' }
       let(:err_terminal) { Syntax::Terminal.new('MINUS') }
-      let(:err_token) { Tokens::Token.new(err_lexeme, err_terminal) }
+      let(:err_token) { Lexical::Token.new(err_lexeme, err_terminal) }
       let(:terminals) do
         %w[PLUS LPAREN].map { |name| Syntax::Terminal.new(name) }
       end
@@ -93,7 +93,7 @@ MESSAGE_END
     describe PrematureInputEnd do
       let(:err_lexeme) { '+' }
       let(:err_terminal) { Syntax::Terminal.new('PLUS') }
-      let(:err_token) { Tokens::Token.new(err_lexeme, err_terminal) }
+      let(:err_token) { Lexical::Token.new(err_lexeme, err_terminal) }
       let(:terminals) do
         %w[INT LPAREN].map { |name| Syntax::Terminal.new(name) }
       end

data/spec/rley/parser/gfg_chart_spec.rb

@@ -2,11 +2,11 @@ require_relative '../../spec_helper'
 require 'stringio'
 
 require_relative '../../../lib/rley/syntax/terminal'
-require_relative '../../../lib/rley/tokens/token'
+require_relative '../../../lib/rley/lexical/token'
 require_relative '../../../lib/rley/gfg/start_vertex'
 require_relative '../../../lib/rley/parser/parse_entry'
 require_relative '../../../lib/rley/parser/parse_tracer'
-require_relative '../../../lib/rley/parser/grm_items_builder'
+require_relative '../../../lib/rley/base/grm_items_builder'
 require_relative '../../../lib/rley/gfg/grm_flow_graph'
 require_relative '../support/grammar_abc_helper'
 
@@ -23,7 +23,7 @@ module Rley # Open this namespace to avoid module qualifier prefixes
       # from the given grammar
       def build_items_for_grammar(aGrammar)
         helper = Object.new
-        helper.extend(Parser::GrmItemsBuilder)
+        helper.extend(Base::GrmItemsBuilder)
         return helper.build_dotted_items(aGrammar)
       end
 
@@ -39,7 +39,7 @@ module Rley # Open this namespace to avoid module qualifier prefixes
 
       let(:token_seq) do
         literals = %w[a a b c c]
-        literals.map { |lexeme| Tokens::Token.new(lexeme, nil) }
+        literals.map { |lexeme| Lexical::Token.new(lexeme, nil) }
       end
 
       # Helper method. Create an array of dotted items

data/spec/rley/parser/gfg_earley_parser_spec.rb

@@ -4,8 +4,8 @@ require_relative '../../../lib/rley/syntax/verbatim_symbol'
 require_relative '../../../lib/rley/syntax/non_terminal'
 require_relative '../../../lib/rley/syntax/production'
 require_relative '../../../lib/rley/syntax/grammar_builder'
-require_relative '../../../lib/rley/tokens/token'
-require_relative '../../../lib/rley/parser/dotted_item'
+require_relative '../../../lib/rley/lexical/token'
+require_relative '../../../lib/rley/base/dotted_item'
 require_relative '../../../lib/rley/parser/gfg_parsing'
 
 # Load builders and lexers for sample grammars
@@ -288,7 +288,7 @@ module Rley # Open this namespace to avoid module qualifier prefixes
           builder.add_terminals(t_x)
           builder.add_production('Ss' => %w[A A x])
           builder.add_production('A' => [])
-          tokens = [ Tokens::Token.new('x', t_x) ]
+          tokens = [ Lexical::Token.new('x', t_x) ]
 
           instance = GFGEarleyParser.new(builder.grammar)
           expect { instance.parse(tokens) }.not_to raise_error

data/spec/rley/parser/gfg_parsing_spec.rb

@@ -5,11 +5,11 @@ require_relative '../../../lib/rley/syntax/non_terminal'
 require_relative '../../../lib/rley/syntax/verbatim_symbol'
 require_relative '../../../lib/rley/syntax/production'
 require_relative '../../../lib/rley/syntax/grammar_builder'
-require_relative '../../../lib/rley/parser/dotted_item'
-require_relative '../../../lib/rley/tokens/token'
+require_relative '../../../lib/rley/base/dotted_item'
+require_relative '../../../lib/rley/lexical/token'
 require_relative '../../../lib/rley/parser/parse_tracer'
 require_relative '../../../lib/rley/gfg/grm_flow_graph'
-require_relative '../../../lib/rley/parser/grm_items_builder'
+require_relative '../../../lib/rley/base/grm_items_builder'
 require_relative '../support/grammar_abc_helper'
 require_relative '../support/grammar_b_expr_helper'
 require_relative '../support/grammar_helper'
@@ -30,7 +30,7 @@ module Rley # Open this namespace to avoid module qualifier prefixes
       # from the given grammar
       def build_items_for_grammar(aGrammar)
         helper = Object.new
-        helper.extend(Parser::GrmItemsBuilder)
+        helper.extend(Base::GrmItemsBuilder)
         return helper.build_dotted_items(aGrammar)
       end
 
@@ -298,7 +298,7 @@ SNIPPET
 
         let(:token_seq1) do
           %w[a a b c c].map do |letter|
-            Tokens::Token.new(letter, sample_grammar1.name2symbol[letter])
+            Lexical::Token.new(letter, sample_grammar1.name2symbol[letter])
           end
         end
 

data/spec/rley/parser/groucho_spec.rb

@@ -54,7 +54,7 @@ module Rley # Open this namespace to avoid module qualifier prefixes
             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/parser/parse_entry_set_spec.rb

@@ -1,7 +1,7 @@
 require_relative '../../spec_helper'
 
 require_relative '../../../lib/rley/syntax/production'
-require_relative '../../../lib/rley/parser/dotted_item'
+require_relative '../../../lib/rley/base/dotted_item'
 require_relative '../../../lib/rley/gfg/item_vertex'
 require_relative '../../../lib/rley/parser/parse_entry'
 
@@ -25,9 +25,9 @@ module Rley # Open this namespace to avoid module qualifier prefixes
       let(:nt_sentence) { Rley::Syntax::NonTerminal.new('Sentence') }
       let(:sample_prod) { build_prod(nt_sentence, t_a, t_b, t_b, nt_rep_c) }
 
-      let(:sample_item1) { Parser::DottedItem.new(sample_prod, 1) }
-      let(:sample_item2) { Parser::DottedItem.new(sample_prod, 2) }
-      let(:sample_item3) { Parser::DottedItem.new(sample_prod, 3) }
+      let(:sample_item1) { Base::DottedItem.new(sample_prod, 1) }
+      let(:sample_item2) { Base::DottedItem.new(sample_prod, 2) }
+      let(:sample_item3) { Base::DottedItem.new(sample_prod, 3) }
 
       let(:vertex1) { GFG::ItemVertex.new(sample_item1) }
       let(:entry1) { ParseEntry.new(vertex1, 2) }