rley 0.8.06 → 0.8.08

data/spec/rley/{notation → rgn}/grammar_builder_spec.rb

@@ -3,10 +3,10 @@
 require_relative '../../spec_helper'
 
 # Load the class under test
-require_relative '../../../lib/rley/notation/grammar_builder'
+require_relative '../../../lib/rley/rgn/grammar_builder'
 
 module Rley # Open this namespace to avoid module qualifier prefixes
-  module Notation # Open this namespace to avoid module qualifier prefixes
+  module RGN # Open this namespace to avoid module qualifier prefixes
     describe GrammarBuilder do
       context 'Initialization without argument:' do
         it 'could be created without argument' do
@@ -123,11 +123,12 @@ module Rley # Open this namespace to avoid module qualifier prefixes
           # implicitly called: rule('arguments_qmark' => 'arguments').tag suffix_qmark_one
           # implicitly called: rule('arguments_qmark' => '').tag suffix_qmark_none
           expect(instance.productions.size).to eq(3)
-          prod_star = instance.productions.select { |prod| prod.lhs.name == 'arguments_qmark' }
+          prod_star = instance.productions.select { |prod| prod.lhs.name == 'rep_arguments_qmark' }
           expect(prod_star.size).to eq(2)
           first_prod = instance.productions.first
           expect(first_prod.lhs.name).to eq('argument_list')
-          expect(first_prod.rhs.members[1].name).to eq('arguments_qmark')
+          expect(first_prod.rhs.members[1].name).to eq('rep_arguments_qmark')
+          expect(instance.productions.last.rhs.members).to be_empty
         end
 
         it "should support Kleene's star" do
@@ -137,14 +138,14 @@ module Rley # Open this namespace to avoid module qualifier prefixes
           instance.rule 'program' => 'declaration* EOF'
           instance.grammar_complete!
 
-          # implicitly called: rule('declaration_star' => 'declaration_star declaration').tag suffix_star_more
-          # implicitly called: rule('declaration_star' => '').tag suffix_star_last
+          # implicitly called: rule('rep_declaration_star' => 'rep_declaration_star declaration').tag suffix_star_more
+          # implicitly called: rule('rep_declaration_star' => '').tag suffix_star_last
           expect(instance.productions.size).to eq(3)
-          prod_star = instance.productions.select { |prod| prod.lhs.name == 'declaration_star' }
+          prod_star = instance.productions.select { |prod| prod.lhs.name == 'rep_declaration_star' }
           expect(prod_star.size).to eq(2)
           first_prod = instance.productions.first
           expect(first_prod.lhs.name).to eq('program')
-          expect(first_prod.rhs.members[0].name).to eq('declaration_star')
+          expect(first_prod.rhs.members[0].name).to eq('rep_declaration_star')
         end
 
         it "should support symbols decorated with Kleene's plus" do
@@ -163,11 +164,11 @@ module Rley # Open this namespace to avoid module qualifier prefixes
           # implicitly called: rule('digit_plus' => 'digit_plus digit').tag suffix_plus_more
           # implicitly called: rule('digit_plus' => 'digit').tag suffix_plus_last
           expect(instance.productions.size).to eq(7) # Two additional rules generated
-          prod_plus = instance.productions.select { |prod| prod.lhs.name == 'digit_plus' }
+          prod_plus = instance.productions.select { |prod| prod.lhs.name == 'rep_digit_plus' }
           expect(prod_plus.size).to eq(2)
           val_prod = instance.productions[4]
           expect(val_prod.lhs.name).to eq('value')
-          expect(val_prod.rhs.members[0].name).to eq('digit_plus')
+          expect(val_prod.rhs.members[0].name).to eq('rep_digit_plus')
         end
 
         it 'should support optional grouping' do
@@ -180,21 +181,23 @@ module Rley # Open this namespace to avoid module qualifier prefixes
           # implicitly called: rule('seq_EQUAL_expression' => 'EQUAL expression').tag 'return_children'
           # implicitly called: rule('seq_EQUAL_expression_qmark' => 'seq_EQUAL_expression').tag suffix_qmark_one
           # implicitly called: rule('seq_EQUAL_expression_qmark' => '').tag suffix_qmark_none
-          expect(instance.productions.size).to eq(4)
+          expect(instance.productions.size).to eq(3)
           first_prod = instance.productions.first
           expect(first_prod.lhs.name).to eq('var_decl')
-          expect(first_prod.rhs.members[2].name).to eq('seq_EQUAL_expression_qmark')
-          (p0, p1, p2) = instance.productions[1..3]
-          expect(p0.lhs.name).to eq('seq_EQUAL_expression')
-          expect(p0.rhs[0].name).to eq('EQUAL')
-          expect(p0.rhs[1].name).to eq('expression')
-          expect(p0.name).to eq('return_children')
-
-          expect(p1.lhs.name).to eq('seq_EQUAL_expression_qmark')
-          expect(p1.rhs[0].name).to eq('seq_EQUAL_expression')
-          expect(p1.name).to eq('_qmark_one')
-
-          expect(p2.lhs.name).to eq('seq_EQUAL_expression_qmark')
+          expect(first_prod.rhs.members[2].name).to eq('rep_seq_EQUAL_expression_qmark')
+          (p1, p2) = instance.productions[1..2]
+          # expect(p0.lhs.name).to eq('rep_seq_EQUAL_expression_qmark')
+          # expect(p0.rhs[0].name).to eq('EQUAL')
+          # expect(p0.rhs[1].name).to eq('expression')
+          # expect(p0.name).to eq('return_children')
+
+          expect(p1.lhs.name).to eq('rep_seq_EQUAL_expression_qmark')
+          expect(p1.rhs[0].name).to eq('EQUAL')
+          expect(p1.rhs[1].name).to eq('expression')
+          # expect(p1.rhs[0].name).to eq('seq_EQUAL_expression')
+          expect(p1.name).to eq('return_children') # TODO _qmark_one
+
+          expect(p2.lhs.name).to eq('rep_seq_EQUAL_expression_qmark')
           expect(p2.rhs).to be_empty
           expect(p2.name).to eq('_qmark_none')
         end
@@ -212,7 +215,7 @@ module Rley # Open this namespace to avoid module qualifier prefixes
           expect(instance.productions.size).to eq(4)
           first_prod = instance.productions.first
           expect(first_prod.lhs.name).to eq('logic_or')
-          expect(first_prod.rhs.members[1].name).to eq('seq_OR_logic_and_star')
+          expect(first_prod.rhs.members[1].name).to eq('rep_seq_OR_logic_and_star')
 
           (p0, p1, p2) = instance.productions[1..3]
           expect(p0.lhs.name).to eq('seq_OR_logic_and')
@@ -220,12 +223,12 @@ module Rley # Open this namespace to avoid module qualifier prefixes
           expect(p0.rhs[1].name).to eq('logic_and')
           expect(p0.name).to eq('return_children')
 
-          expect(p1.lhs.name).to eq('seq_OR_logic_and_star')
-          expect(p1.rhs[0].name).to eq('seq_OR_logic_and_star')
+          expect(p1.lhs.name).to eq('rep_seq_OR_logic_and_star')
+          expect(p1.rhs[0].name).to eq('rep_seq_OR_logic_and_star')
           expect(p1.rhs[1].name).to eq('seq_OR_logic_and')
           expect(p1.name).to eq('_star_more')
 
-          expect(p2.lhs.name).to eq('seq_OR_logic_and_star')
+          expect(p2.lhs.name).to eq('rep_seq_OR_logic_and_star')
           expect(p2.rhs).to be_empty
           expect(p2.name).to eq('_star_none')
         end
@@ -243,7 +246,7 @@ module Rley # Open this namespace to avoid module qualifier prefixes
           expect(instance.productions.size).to eq(4)
           first_prod = instance.productions.first
           expect(first_prod.lhs.name).to eq('path')
-          expect(first_prod.rhs.members[1].name).to eq('seq_TO_POINT_plus')
+          expect(first_prod.rhs.members[1].name).to eq('rep_seq_TO_POINT_plus')
 
           (p0, p1, p2) = instance.productions[1..3]
           expect(p0.lhs.name).to eq('seq_TO_POINT')
@@ -251,12 +254,12 @@ module Rley # Open this namespace to avoid module qualifier prefixes
           expect(p0.rhs[1].name).to eq('POINT')
           expect(p0.name).to eq('return_children')
 
-          expect(p1.lhs.name).to eq('seq_TO_POINT_plus')
-          expect(p1.rhs[0].name).to eq('seq_TO_POINT_plus')
+          expect(p1.lhs.name).to eq('rep_seq_TO_POINT_plus')
+          expect(p1.rhs[0].name).to eq('rep_seq_TO_POINT_plus')
           expect(p1.rhs[1].name).to eq('seq_TO_POINT')
           expect(p1.name).to eq('_plus_more')
 
-          expect(p2.lhs.name).to eq('seq_TO_POINT_plus')
+          expect(p2.lhs.name).to eq('rep_seq_TO_POINT_plus')
           expect(p2.rhs[0].name).to eq('seq_TO_POINT')
           expect(p2.name).to eq('_plus_one')
         end
@@ -268,29 +271,30 @@ module Rley # Open this namespace to avoid module qualifier prefixes
           instance.rule('if_stmt' => st)
           instance.grammar_complete!
 
-          # implicitly called: rule('seq_ELSE_stmt' => 'ELSE stmt').tag 'return_children'
-          # implicitly called: rule('seq_ELSE_stmt_qmark' => 'seq_ELSE_stmt ').tag suffix_plus_more
-          # implicitly called: rule('seq_ELSE_stmt_qmark' => '').tag suffix_plus_one
-          expect(instance.productions.size).to eq(4)
-          first_prod = instance.productions.first
-          expect(first_prod.lhs.name).to eq('if_stmt')
-          expect(first_prod.rhs.members[5].name).to eq('seq_ELSE_stmt_qmark')
-
-          (p0, p1, p2) = instance.productions[1..3]
-          expect(p0.lhs.name).to eq('seq_ELSE_stmt')
-          expect(p0.rhs[0].name).to eq('ELSE')
-          expect(p0.rhs[1].name).to eq('stmt')
-          expect(p0.name).to eq('return_children')
-          expect(p0.constraints.size).to eq(1)
-          expect(p0.constraints[0]).to be_kind_of(Syntax::MatchClosest)
-          expect(p0.constraints[0].idx_symbol).to eq(0) # ELSE is on position 0
-          expect(p0.constraints[0].closest_symb).to eq('IF')
-
-          expect(p1.lhs.name).to eq('seq_ELSE_stmt_qmark')
-          expect(p1.rhs[0].name).to eq('seq_ELSE_stmt')
-          expect(p1.name).to eq('_qmark_one')
-
-          expect(p2.lhs.name).to eq('seq_ELSE_stmt_qmark')
+          # implicitly called: rule('rep_seq_ELSE_stmt_qmark' => 'ELSE stmt').tag return_children'
+          # implicitly called: rule('rep_seq_ELSE_stmt_qmark' => '').tag suffix_qmark_none
+          expect(instance.productions.size).to eq(3)
+          (p0, p1, p2) = instance.productions[0..2]
+          expect(p0.lhs.name).to eq('if_stmt')
+          expect(p0.rhs.members[5].name).to eq('rep_seq_ELSE_stmt_qmark')
+          # expect(p0.lhs.name).to eq('seq_ELSE_stmt')
+          # expect(p0.rhs[0].name).to eq('ELSE')
+          # expect(p0.rhs[1].name).to eq('stmt')
+          # expect(p0.name).to eq('return_children')
+          # expect(p0.constraints.size).to eq(1)
+          # expect(p0.constraints[0]).to be_kind_of(Syntax::MatchClosest)
+          # expect(p0.constraints[0].idx_symbol).to eq(0) # ELSE is on position 0
+          # expect(p0.constraints[0].closest_symb).to eq('IF')
+
+          expect(p1.lhs.name).to eq('rep_seq_ELSE_stmt_qmark')
+          expect(p1.rhs[0].name).to eq('ELSE')
+          expect(p1.rhs[1].name).to eq('stmt')
+          expect(p1.name).to eq('return_children')
+          expect(p1.constraints.size).to eq(1)
+          expect(p1.constraints[0]).to be_kind_of(Syntax::MatchClosest)
+          expect(p1.constraints[0].closest_symb).to eq('IF')
+
+          expect(p2.lhs.name).to eq('rep_seq_ELSE_stmt_qmark')
           expect(p2.rhs).to be_empty
           expect(p2.name).to eq('_qmark_none')
         end

data/spec/rley/{notation → rgn}/parser_spec.rb

@@ -2,12 +2,12 @@
 
 require_relative '../../spec_helper' # Use the RSpec framework
 
-require_relative '../../../lib/rley/notation/ast_builder'
+require_relative '../../../lib/rley/rgn/ast_builder'
 # Load the class under test
-require_relative '../../../lib/rley/notation/parser'
+require_relative '../../../lib/rley/rgn/parser'
 
 module Rley
-  module Notation
+  module RGN
     describe Parser do
       subject { Parser.new }
 
@@ -44,7 +44,7 @@ module Rley
         it 'should parse single symbol names' do
           samples = %w[IF ifCondition statement]
 
-          # One drawback od CSTs: they have a deeply nested structure
+          # One drawback of CSTs: they have a deeply nested structure
           samples.each do |source|
             ptree = subject.parse(source)
             expect(ptree.root).to be_kind_of(Rley::PTree::NonTerminalNode)
@@ -82,7 +82,7 @@ module Rley
             ptree = subject.parse(source)
             expect(ptree.root).to be_kind_of(SymbolNode)
             expect(ptree.root.name).to eq(source)
-            expect(ptree.root.repetition).to eq(:exactly_one)
+            expect(ptree.root.annotation).to be_empty
           end
         end
 
@@ -103,8 +103,10 @@ module Rley
           optional = 'member_seq?'
 
           ptree = subject.parse(optional)
-          expect(ptree.root).to be_kind_of(SymbolNode)
-          expect(ptree.root.name).to eq('member_seq')
+          expect(ptree.root).to be_kind_of(RepetitionNode)
+          expect(ptree.root.name).to eq('rep_member_seq_qmark')
+          expect(ptree.root.child).to be_kind_of(SymbolNode)
+          expect(ptree.root.child.name).to eq('member_seq')
           expect(ptree.root.repetition).to eq(:zero_or_one)
         end
 
@@ -112,8 +114,10 @@ module Rley
           one_or_more = 'member+'
 
           ptree = subject.parse(one_or_more)
-          expect(ptree.root).to be_kind_of(SymbolNode)
-          expect(ptree.root.name).to eq('member')
+          expect(ptree.root).to be_kind_of(RepetitionNode)
+          expect(ptree.root.name).to eq('rep_member_plus')
+          expect(ptree.root.child).to be_kind_of(SymbolNode)
+          expect(ptree.root.child.name).to eq('member')
           expect(ptree.root.repetition).to eq(:one_or_more)
         end
 
@@ -122,12 +126,14 @@ module Rley
 
           ptree = subject.parse(zero_or_more)
           expect(ptree.root).to be_kind_of(SequenceNode)
-          expect(ptree.root.subnodes[0]).to be_kind_of(SymbolNode)
-          expect(ptree.root.subnodes[0].name).to eq('declaration')
+          expect(ptree.root.name).to eq('seq_rep_declaration_star_EOF')
+          expect(ptree.root.subnodes[0]).to be_kind_of(RepetitionNode)
+          expect(ptree.root.subnodes[0].name).to eq('rep_declaration_star')
           expect(ptree.root.subnodes[0].repetition).to eq(:zero_or_more)
+          expect(ptree.root.subnodes[0].child).to be_kind_of(SymbolNode)
+          expect(ptree.root.subnodes[0].child.name).to eq('declaration')
           expect(ptree.root.subnodes[1]).to be_kind_of(SymbolNode)
           expect(ptree.root.subnodes[1].name).to eq('EOF')
-          expect(ptree.root.subnodes[1].repetition).to eq(:exactly_one)
         end
 
         it 'should parse a grouping with a modifier' do
@@ -141,21 +147,25 @@ module Rley
           expect(ptree.root.subnodes[1].name).to eq('ifCondition')
           expect(ptree.root.subnodes[2]).to be_kind_of(SymbolNode)
           expect(ptree.root.subnodes[2].name).to eq('statement')
-          expect(ptree.root.subnodes[3]).to be_kind_of(SequenceNode)
+          expect(ptree.root.subnodes[3]).to be_kind_of(RepetitionNode)
+          expect(ptree.root.subnodes[3].name).to eq('rep_seq_ELSE_statement_qmark')
           expect(ptree.root.subnodes[3].repetition).to eq(:zero_or_one)
-          expect(ptree.root.subnodes[3].subnodes[0]).to be_kind_of(SymbolNode)
-          expect(ptree.root.subnodes[3].subnodes[0].name).to eq('ELSE')
-          expect(ptree.root.subnodes[3].subnodes[1]).to be_kind_of(SymbolNode)
-          expect(ptree.root.subnodes[3].subnodes[1].name).to eq('statement')
+          expect(ptree.root.subnodes[3].child).to be_kind_of(SequenceNode)
+          expect(ptree.root.subnodes[3].child.subnodes[0]).to be_kind_of(SymbolNode)
+          expect(ptree.root.subnodes[3].child.subnodes[0].name).to eq('ELSE')
+          expect(ptree.root.subnodes[3].child.subnodes[1]).to be_kind_of(SymbolNode)
+          expect(ptree.root.subnodes[3].child.subnodes[1].name).to eq('statement')
         end
 
         it 'should parse an annotated symbol' do
           optional = 'member_seq{repeat: 0..1}'
 
           ptree = subject.parse(optional)
-          expect(ptree.root).to be_kind_of(SymbolNode)
-          expect(ptree.root.name).to eq('member_seq')
+          expect(ptree.root).to be_kind_of(RepetitionNode)
+          expect(ptree.root.name).to eq('rep_member_seq_qmark')
           expect(ptree.root.repetition).to eq(:zero_or_one)
+          expect(ptree.root.child).to be_kind_of(SymbolNode)
+          expect(ptree.root.child.name).to eq('member_seq')
         end
 
         it 'should parse a grouping with embedded annotation' do
@@ -170,12 +180,14 @@ module Rley
           expect(ptree.root.subnodes[2]).to be_kind_of(SymbolNode)
           expect(ptree.root.subnodes[2].name).to eq('statement')
           optional = ptree.root.subnodes[3]
-          expect(optional).to be_kind_of(SequenceNode)
+          expect(optional).to be_kind_of(RepetitionNode)
+          expect(optional.name).to eq('rep_seq_ELSE_statement_qmark')
           expect(optional.repetition).to eq(:zero_or_one)
-          expect(optional.subnodes[0]).to be_kind_of(SymbolNode)
-          expect(optional.subnodes[0].name).to eq('ELSE')
-          expect(optional.subnodes[0].annotation).to eq({ 'match_closest' => 'IF' })
-          expect(optional.subnodes[1].name).to eq('statement')
+          expect(optional.child).to be_kind_of(SequenceNode)
+          expect(optional.child.subnodes[0]).to be_kind_of(SymbolNode)
+          expect(optional.child.subnodes[0].name).to eq('ELSE')
+          expect(optional.child.subnodes[0].annotation).to eq({ 'match_closest' => 'IF' })
+          expect(optional.child.subnodes[1].name).to eq('statement')
         end
       end # context
     end # describe

data/spec/rley/rgn/repetition_node_spec.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require_relative '../../spec_helper'
+
+require_relative '../../../lib/rley/lexical/token'
+require_relative '../../../lib/rley/rgn/symbol_node'
+
+# Load the class under test
+require_relative '../../../lib/rley/rgn/repetition_node'
+
+module Rley # Open this namespace to avoid module qualifier prefixes
+  module RGN # Open this namespace to avoid module qualifier prefixes
+    describe RepetitionNode do
+      let(:a_name) { 'arguments' }
+      let(:a_pos) { Lexical::Position.new(3, 4) }
+      let(:a_child) { SymbolNode.new(a_pos, a_name) }
+      let(:star) { :zero_or_more }
+
+      # Default instantiation rule
+      subject { RepetitionNode.new(a_child, star) }
+
+      context 'Initialization:' do
+        it 'should be created with a child node and a symbol' do
+          expect { RepetitionNode.new(a_child, star) }.not_to raise_error
+        end
+
+        it 'should know its child' do
+          expect(subject.subnodes.size).to eq(1)
+          expect(subject.subnodes.first).to eq(a_child)
+          expect(subject.child).to eq(a_child)
+        end
+
+        it 'should know its repetition' do
+          expect(subject.repetition).to eq(star)
+        end
+      end # context
+
+      context 'Provided services:' do
+        it 'should know its name' do
+          # Case repetition == :zero_or_one
+          instance = RepetitionNode.new(a_child, :zero_or_one)
+          expect(instance.name).to eq('rep_arguments_qmark')
+
+          # Case repetition == :zero_or_more
+          expect(subject.name).to eq('rep_arguments_star')
+
+          # Case repetition == :one_or_more
+          instance = RepetitionNode.new(a_child, :one_or_more)
+          expect(instance.name).to eq('rep_arguments_plus')
+        end
+      end # context
+    end # describe
+  end # module
+end # module
+
+# End of file

data/spec/rley/rgn/sequence_node_spec.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require_relative '../../spec_helper'
+
+require_relative '../../../lib/rley/lexical/token'
+require_relative '../../../lib/rley/rgn/symbol_node'
+
+# Load the class under test
+require_relative '../../../lib/rley/rgn/sequence_node'
+
+module Rley # Open this namespace to avoid module qualifier prefixes
+  module RGN # Open this namespace to avoid module qualifier prefixes
+    describe SequenceNode do
+      let(:name1) { 'LPAR' }
+      let(:name2) { 'arguments' }
+      let(:name3) { 'RPAR' }
+      let(:pos1) { Lexical::Position.new(3, 7) }
+      let(:pos2) { Lexical::Position.new(3, 9) }
+      let(:pos3) { Lexical::Position.new(3, 19) }
+      let(:child1) { SymbolNode.new(pos1, name1) }
+      let(:child2) { SymbolNode.new(pos2, name2) }
+      let(:child3) { SymbolNode.new(pos3, name3) }
+
+      # Default instantiation rule
+      subject { SequenceNode.new([child1, child2, child3]) }
+
+      context 'Initialization:' do
+        it 'should be created with an array of child nodes' do
+          children = [child1, child2, child3]
+          expect { SequenceNode.new(children) }.not_to raise_error
+        end
+
+        it 'should know its subnodes' do
+          expect(subject.subnodes.size).to eq(3)
+          expect(subject.subnodes).to eq([child1, child2, child3])
+        end
+      end # context
+
+      context 'Provided services:' do
+        it 'should know its name' do
+          expect(subject.name).to eq('seq_LPAR_arguments_RPAR')
+        end
+      end # context
+    end # describe
+  end # module
+end # module
+
+# End of file

data/spec/rley/rgn/symbol_node_spec.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require_relative '../../spec_helper'
+
+require_relative '../../../lib/rley/lexical/token'
+
+# Load the class under test
+require_relative '../../../lib/rley/rgn/symbol_node'
+
+
+module Rley # Open this namespace to avoid module qualifier prefixes
+  module RGN # Open this namespace to avoid module qualifier prefixes
+    describe SymbolNode do
+      let(:a_name) { 'arguments' }
+      let(:a_pos) { Lexical::Position.new(3, 4) }
+
+      context 'Initialization:' do
+        # Default instantiation rule
+        subject { SymbolNode.new(a_pos, a_name) }
+
+        it 'should be created with a name and position' do
+          expect { SymbolNode.new(a_pos, a_name) }.not_to raise_error
+        end
+
+        it 'should know its name' do
+          expect(subject.name).to eq(a_name)
+        end
+      end # context
+    end # describe
+  end # module
+end # module
+
+# End of file

data/spec/rley/{notation → rgn}/tokenizer_spec.rb

@@ -3,10 +3,10 @@
 require_relative '../../spec_helper'
 
 # Load the class under test
-require_relative '../../../lib/rley/notation/tokenizer'
+require_relative '../../../lib/rley/rgn/tokenizer'
 
 module Rley # Open this namespace to avoid module qualifier prefixes
-  module Notation # Open this namespace to avoid module qualifier prefixes
+  module RGN # Open this namespace to avoid module qualifier prefixes
     describe Tokenizer do
       # Utility method for comparing actual and expected token
       # sequence. The final EOF is removed from the input sequence.

data/spec/rley/support/ambiguous_grammar_helper.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Load the builder class
-require_relative '../../../lib/rley/notation/grammar_builder'
+require_relative '../../../lib/rley/rgn/grammar_builder'
 require_relative '../../../lib/rley/lexical/token'
 
 
@@ -10,7 +10,7 @@ module AmbiguousGrammarHelper
   # expression grammar.
   # (based on an example from Fisher and LeBlanc: "Crafting a Compiler")
   def grammar_builder
-    Rley::Notation::GrammarBuilder.new do
+    Rley::RGN::GrammarBuilder.new do
       add_terminals('+', 'id')
       rule 'S' => 'E'
       rule 'E' => 'E + E'

data/spec/rley/support/grammar_int_seq_helper.rb

@@ -3,7 +3,7 @@
 require 'strscan'
 
 # Load the builder class
-require_relative '../../../lib/rley/notation/grammar_builder'
+require_relative '../../../lib/rley/rgn/grammar_builder'
 require_relative '../../../lib/rley/lexical/token'
 
 
@@ -11,7 +11,7 @@ module GrammarIntSeqHelper
   # Factory method. Creates a builder for a grammar of sequence
   # of positive integers.
   def grammar_int_seq_builder
-    Rley::Notation::GrammarBuilder.new do
+    Rley::RGN::GrammarBuilder.new do
       add_terminals('comma', 'digit')
       rule 'S' => 'sequence'
       rule 'S' => ''

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rley
 version: !ruby/object:Gem::Version
-  version: 0.8.06
+  version: 0.8.08
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-06 00:00:00.000000000 Z
+date: 2021-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.0.0
+        version: 13.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.0.0
+        version: 13.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +128,7 @@ files:
 - examples/tokenizer/loxxy_raw_scanner.rex.rb
 - examples/tokenizer/loxxy_tokenizer.rb
 - examples/tokenizer/run_tokenizer.rb
-- examples/tokenizer/tokens.yaml
+- examples/tokenizer/tokens.yml
 - lib/rley.rb
 - lib/rley/base/base_parser.rb
 - lib/rley/base/dotted_item.rb
@@ -156,17 +156,6 @@ files:
 - lib/rley/lexical/literal.rb
 - lib/rley/lexical/token.rb
 - lib/rley/lexical/token_range.rb
-- lib/rley/notation/all_notation_nodes.rb
-- lib/rley/notation/ast_builder.rb
-- lib/rley/notation/ast_node.rb
-- lib/rley/notation/ast_visitor.rb
-- lib/rley/notation/grammar.rb
-- lib/rley/notation/grammar_builder.rb
-- lib/rley/notation/grouping_node.rb
-- lib/rley/notation/parser.rb
-- lib/rley/notation/sequence_node.rb
-- lib/rley/notation/symbol_node.rb
-- lib/rley/notation/tokenizer.rb
 - lib/rley/parse_forest_visitor.rb
 - lib/rley/parse_rep/ast_base_builder.rb
 - lib/rley/parse_rep/cst_builder.rb
@@ -188,6 +177,18 @@ files:
 - lib/rley/ptree/parse_tree.rb
 - lib/rley/ptree/parse_tree_node.rb
 - lib/rley/ptree/terminal_node.rb
+- lib/rley/rgn/all_notation_nodes.rb
+- lib/rley/rgn/ast_builder.rb
+- lib/rley/rgn/ast_node.rb
+- lib/rley/rgn/ast_visitor.rb
+- lib/rley/rgn/composite_node.rb
+- lib/rley/rgn/grammar.rb
+- lib/rley/rgn/grammar_builder.rb
+- lib/rley/rgn/parser.rb
+- lib/rley/rgn/repetition_node.rb
+- lib/rley/rgn/sequence_node.rb
+- lib/rley/rgn/symbol_node.rb
+- lib/rley/rgn/tokenizer.rb
 - lib/rley/rley_error.rb
 - lib/rley/sppf/alternative_node.rb
 - lib/rley/sppf/composite_node.rb
@@ -228,9 +229,6 @@ files:
 - spec/rley/lexical/literal_spec.rb
 - spec/rley/lexical/token_range_spec.rb
 - spec/rley/lexical/token_spec.rb
-- spec/rley/notation/grammar_builder_spec.rb
-- spec/rley/notation/parser_spec.rb
-- spec/rley/notation/tokenizer_spec.rb
 - spec/rley/parse_forest_visitor_spec.rb
 - spec/rley/parse_rep/ambiguous_parse_spec.rb
 - spec/rley/parse_rep/ast_builder_spec.rb
@@ -252,6 +250,12 @@ files:
 - spec/rley/ptree/parse_tree_node_spec.rb
 - spec/rley/ptree/parse_tree_spec.rb
 - spec/rley/ptree/terminal_node_spec.rb
+- spec/rley/rgn/grammar_builder_spec.rb
+- spec/rley/rgn/parser_spec.rb
+- spec/rley/rgn/repetition_node_spec.rb
+- spec/rley/rgn/sequence_node_spec.rb
+- spec/rley/rgn/symbol_node_spec.rb
+- spec/rley/rgn/tokenizer_spec.rb
 - spec/rley/sppf/alternative_node_spec.rb
 - spec/rley/sppf/non_terminal_node_spec.rb
 - spec/rley/sppf/token_node_spec.rb
@@ -326,9 +330,6 @@ test_files:
 - spec/rley/lexical/literal_spec.rb
 - spec/rley/lexical/token_range_spec.rb
 - spec/rley/lexical/token_spec.rb
-- spec/rley/notation/grammar_builder_spec.rb
-- spec/rley/notation/parser_spec.rb
-- spec/rley/notation/tokenizer_spec.rb
 - spec/rley/parser/dangling_else_spec.rb
 - spec/rley/parser/error_reason_spec.rb
 - spec/rley/parser/gfg_chart_spec.rb
@@ -350,6 +351,12 @@ test_files:
 - spec/rley/ptree/parse_tree_node_spec.rb
 - spec/rley/ptree/parse_tree_spec.rb
 - spec/rley/ptree/terminal_node_spec.rb
+- spec/rley/rgn/grammar_builder_spec.rb
+- spec/rley/rgn/parser_spec.rb
+- spec/rley/rgn/repetition_node_spec.rb
+- spec/rley/rgn/sequence_node_spec.rb
+- spec/rley/rgn/symbol_node_spec.rb
+- spec/rley/rgn/tokenizer_spec.rb
 - spec/rley/sppf/alternative_node_spec.rb
 - spec/rley/sppf/non_terminal_node_spec.rb
 - spec/rley/sppf/token_node_spec.rb

data/lib/rley/notation/all_notation_nodes.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'grouping_node'
-require_relative 'symbol_node'