rley 0.7.00 → 0.7.01

data/spec/rley/parse_rep/groucho_spec.rb

@@ -54,6 +54,7 @@ module Rley # Open this namespace to avoid module qualifier prefixes
           if term_name.nil?
             raise StandardError, "Word '#{word}' not found in lexicon"
           end
+
           terminal = aGrammar.name2symbol[term_name]
           Rley::Lexical::Token.new(word, terminal, pos)
         end
@@ -98,10 +99,10 @@ module Rley # Open this namespace to avoid module qualifier prefixes
           child = subject.curr_parent.subnodes.first
           expect(child.to_string(0)).to eq(anExpectation)
       end
-      
+
       def root_children
-          subject.result.root.subnodes    
-      end      
+          subject.result.root.subnodes
+      end
 
 
       before(:each) do
@@ -125,7 +126,7 @@ module Rley # Open this namespace to avoid module qualifier prefixes
 
           next_event(:visit, 'VP. | 1') # Event 3
           expected_curr_path('S[0, 7]/VP[1, 7]')
-          # Root node should have one child          
+          # Root node should have one child
           expect(root_children.size).to eq(1)
           expect(root_children.first.to_string(0)).to eq('VP[1, 7]')
 
@@ -139,16 +140,16 @@ module Rley # Open this namespace to avoid module qualifier prefixes
           # Root node should have two children
           expect(root_children.size).to eq(2)
           expect(root_children.first.to_string(0)).to eq('NP[0, 1]')
-          
+
           18.times do
             event = @walker.next
             subject.receive_event(*event)
           end
-         
+
           next_event(:revisit, 'NP. | 0') # Event 48
           expected_curr_path('S[0, 7]')
-          # Root node should still have two children          
-          expect(root_children.size).to eq(2)         
+          # Root node should still have two children
+          expect(root_children.size).to eq(2)
         end
       end # context
     end # describe

data/spec/rley/parse_tree_visitor_spec.rb

@@ -235,7 +235,7 @@ module Rley # Open this namespace to avoid module qualifier prefixes
         big_a_3 = big_a_2_children[1]
         big_a_3_children = big_a_3.subnodes
         expectations = [
-          [:before_ptree, [grm_abc_ptree1]],
+          [:before_ptree, [grm_abc_ptree1]]
           # TODO: fix this test
           # [:before_subnodes, [root, children]],          
           # [:before_non_terminal, [root]],

data/spec/rley/parser/gfg_earley_parser_spec.rb

@@ -587,12 +587,12 @@ MSG
           ###################### S(0) == . 1 +
           # Expectation chart[0]:
           expected = [
-            '.S | 0',                     # initialization
-            'S => . E | 0',               # start rule
-            '.E | 0',                     # call rule
-            'E => . int | 0',             # start rule
-            "E => . ( E + E ) | 0", # start rule
-            "E => . E + E | 0"          # start rule
+            '.S | 0',               # initialization
+            'S => . E | 0',         # start rule
+            '.E | 0',               # call rule
+            'E => . int | 0',       # start rule
+            'E => . ( E + E ) | 0', # start rule
+            'E => . E + E | 0'      # start rule
           ]
           compare_entry_texts(parse_result.chart[0], expected)
 
@@ -619,7 +619,7 @@ MSG
           compare_entry_texts(parse_result.chart[2], expected)
 
           err_msg = "Premature end of input after '+' at position line 1, "
-          err_msg << "column 3"
+          err_msg << 'column 3'
           err_msg << "\nExpected one of: ['int', '(']."
           expect(parse_result.failure_reason.message).to eq(err_msg)
         end

data/spec/rley/parser/gfg_parsing_spec.rb

@@ -314,9 +314,7 @@ SNIPPET
         end
 
         it 'should build a parse forest' do
-          if subject.success?
-            expect { subject.parse_forest }.not_to raise_error
-          end
+          expect { subject.parse_forest }.not_to raise_error if subject.success?
         end
 =begin
         it 'should create the root of a parse forest' do

data/spec/rley/parser/parse_entry_spec.rb

@@ -199,7 +199,7 @@ module Rley # Open this namespace to avoid module qualifier prefixes
         
         it 'should be inspectable' do
           subject.add_antecedent(subject) # Cheat for the good cause...
-          expected = '.sentence | 3'
+          # expected = '.sentence | 3'
           prefix = /^#<Rley::Parser::ParseEntry:\d+ @vertex/
           expect(subject.inspect).to match(prefix)
           pattern = /@vertex=<Rley::GFG::StartVertex:\d+ label=\.sentence/

data/spec/rley/support/expectation_helper.rb

@@ -7,7 +7,8 @@ module ExpectationHelper
   # Helper method. Compare the data from all the parse entries
   # of a given ParseEntrySet with an array of expectation strings.
   def compare_entry_texts(anEntrySet, expectations)
-    raise StandardError, "Nil entry set" if anEntrySet.nil?
+    raise StandardError, 'Nil entry set' if anEntrySet.nil?
+
     (0...expectations.size).each do |i|
       expect(anEntrySet.entries[i].to_s).to eq(expectations[i])
     end

data/spec/rley/support/grammar_ambig01_helper.rb

@@ -24,12 +24,13 @@ module GrammarAmbig01Helper
   def tokenizer_ambig01(aText)
     scanner = StringScanner.new(aText)
     tokens = []
-    
+
     loop do
       scanner.skip(/\s+/)
       curr_pos = scanner.pos
       lexeme = scanner.scan(/\S+/)
       break unless lexeme
+
       case lexeme
         when '+', '*'
           terminal = lexeme
@@ -41,8 +42,8 @@ module GrammarAmbig01Helper
       end
 
       pos = Rley::Lexical::Position.new(1, curr_pos + 1)
-      tokens << Rley::Lexical::Token.new(lexeme, terminal, pos)      
-    end    
+      tokens << Rley::Lexical::Token.new(lexeme, terminal, pos)
+    end
 
     return tokens
   end

data/spec/rley/support/grammar_arr_int_helper.rb

@@ -26,13 +26,14 @@ module GrammarArrIntHelper
   def arr_int_tokenizer(aText)
     scanner = StringScanner.new(aText)
     tokens = []
-    
+
     loop do
       scanner.skip(/\s+/)
       curr_ch = scanner.peek(1)
       break if curr_ch.nil? || curr_ch.empty?
+
       curr_pos = scanner.pos
-      
+
       if (lexeme = scanner.scan(/[\[\],]/))
         terminal = lexeme
       elsif (lexeme = scanner.scan(/[-+]?\d+/))
@@ -43,10 +44,10 @@ module GrammarArrIntHelper
       end
 
       pos = Rley::Lexical::Position.new(1, curr_pos + 1)
-      tokens << Rley::Lexical::Token.new(lexeme, terminal, pos)      
+      tokens << Rley::Lexical::Token.new(lexeme, terminal, pos)
     end
 
-    return tokens    
+    return tokens
   end
 end # module
 # End of file

data/spec/rley/support/grammar_b_expr_helper.rb

@@ -24,12 +24,13 @@ module GrammarBExprHelper
   def expr_tokenizer(aText)
     scanner = StringScanner.new(aText)
     tokens = []
-    
+
     loop do
       scanner.skip(/\s+/)
       curr_pos = scanner.pos
       lexeme = scanner.scan(/\S+/)
       break unless lexeme
+
       case lexeme
         when '+', '*'
           terminal = lexeme
@@ -41,10 +42,10 @@ module GrammarBExprHelper
       end
 
       pos = Rley::Lexical::Position.new(1, curr_pos + 1)
-      tokens << Rley::Lexical::Token.new(lexeme, terminal, pos)      
-    end    
+      tokens << Rley::Lexical::Token.new(lexeme, terminal, pos)
+    end
 
-    return tokens 
+    return tokens
   end
 end # module
 # End of file

data/spec/rley/support/grammar_helper.rb

@@ -23,8 +23,8 @@ module GrammarHelper
             token = Rley::Lexical::Token.new(literal, terminal, pos)
           end
       end
-        col += lexeme.length + 1
-        token
+      col += lexeme.length + 1
+      token
     end
 
     return tokens.flatten

data/spec/rley/support/grammar_l0_helper.rb

@@ -69,7 +69,7 @@ module GrammarL0Helper
   def tokenizer_l0(aText)
     scanner = StringScanner.new(aText)
     tokens = []
-    
+
     loop do
       scanner.skip(/\s+/)
       curr_pos = scanner.pos
@@ -80,8 +80,9 @@ module GrammarL0Helper
       if term_name.nil?
         raise StandardError, "Word '#{word}' not found in lexicon"
       end
+
       pos = Rley::Lexical::Position.new(1, curr_pos + 1)
-      tokens << Rley::Lexical::Token.new(word, term_name, pos)      
+      tokens << Rley::Lexical::Token.new(word, term_name, pos)
     end
 
     return tokens

data/spec/rley/support/grammar_pb_helper.rb

@@ -22,41 +22,18 @@ class GrammarPBHelper
       builder.grammar
     end
   end
-
-  # # Basic expression tokenizer
-  # def tokenize(aText)
-    # tokens = aText.scan(/\S+/).map do |lexeme|
-      # case lexeme
-        # when '+', '(', ')'
-          # terminal = @grammar.name2symbol[lexeme]
-        # when /^[-+]?\d+$/
-          # terminal = @grammar.name2symbol['int']
-        # else
-          # msg = "Unknown input text '#{lexeme}'"
-          # raise StandardError, msg
-      # end
-      # pos = Rley::Lexical::Position.new(1, 4) # Dummy position
-      # Rley::Lexical::Token.new(lexeme, terminal, pos)
-    # end
-
-    # return tokens
-  # end
-  
   
   class PB_Tokenizer < BaseTokenizer
-
     protected
 
     def recognize_token()
-      token = nil
-
       if (lexeme = scanner.scan(/[\(\)]/)) # Single characters
         # Delimiters, separators => single character token
-        token = build_token(lexeme, lexeme)
-      elsif (lexeme = scanner.scan(/(?:\+)(?=\s|$)/)) # Single char occurring alone
-        token = build_token(lexeme, lexeme)
-       elsif (lexeme = scanner.scan(/[+-]?[0-9]+/))
-        token = build_token('int', lexeme)
+        build_token(lexeme, lexeme)
+      elsif (lexeme = scanner.scan(/(?:\+)(?=\s|$)/)) # Isolated char
+        build_token(lexeme, lexeme)
+      elsif (lexeme = scanner.scan(/[+-]?[0-9]+/))
+        build_token('int', lexeme)
       end
     end
   end # class

data/spec/support/base_tokenizer_spec.rb

@@ -27,21 +27,19 @@ describe BaseTokenizer do
       @@lexeme2name = {
         '(' => 'LPAREN',
         ')' => 'RPAREN',
-        '+' => 'PLUS',
+        '+' => 'PLUS'
       }.freeze
 
       protected
 
       def recognize_token()
-        token = nil
-
         if (lexeme = scanner.scan(/[\(\)]/)) # Single characters
           # Delimiters, separators => single character token
-          token = build_token(@@lexeme2name[lexeme], lexeme)
-        elsif (lexeme = scanner.scan(/(?:\+)(?=\s)/)) # Single char occurring alone
-          token = build_token(@@lexeme2name[lexeme], lexeme)
-         elsif (lexeme = scanner.scan(/[+-]?[0-9]+/))
-          token = build_token('int', lexeme)
+          build_token(@@lexeme2name[lexeme], lexeme)
+        elsif (lexeme = scanner.scan(/(?:\+)(?=\s)/)) # Isolated char
+          build_token(@@lexeme2name[lexeme], lexeme)
+        elsif (lexeme = scanner.scan(/[+-]?[0-9]+/))
+          build_token('int', lexeme)
         end
       end
     end # class
@@ -74,4 +72,4 @@ describe BaseTokenizer do
       end
     end
   end
-end # describe
+end # describe

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rley
 version: !ruby/object:Gem::Version
-  version: 0.7.00
+  version: 0.7.01
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-24 00:00:00.000000000 Z
+date: 2019-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls