rley 0.7.07 → 0.7.08

data/lib/rley/parse_rep/parse_forest_factory.rb

@@ -15,13 +15,13 @@ module Rley # This module is used as a namespace
       def builder(aParseResult, _builder = nil)
         ParseForestBuilder.new(aParseResult.tokens)
       end
-      
+
       # When an end vertex is re-visited then jump
       # its corresponding start vertex. This behaviour
       # makes sense for sharing nodes.
-      def jump_to_start()
+      def jump_to_start
         true
-      end       
+      end
     end # class
   end # module
 end # module

data/lib/rley/parse_rep/parse_rep_creator.rb

@@ -7,18 +7,18 @@ module Rley # This module is used as a namespace
     # Utility class that helps to create a representation of a parse from
     # a given Parsing object.
     class ParseRepCreator
-      # @return [Rley::Parser::GFGParsing] 
+      # @return [Rley::Parser::GFGParsing]
       #  Link to Parsing object (= results of recognizer)
       attr_reader(:parsing)
-      
+
       # Constructor. Creates and initialize a ParseRepCreator instance.
       # @return [ParseRepCreator]
       def initialize(aParsingResult)
         @parsing = aParsingResult
-      end      
-      
+      end
+
       # Factory method that produces the representation of the parse.
-      # @return [Rley::PTree::ParseTree, Rley::SPPF::ParseForest] 
+      # @return [Rley::PTree::ParseTree, Rley::SPPF::ParseForest]
       #   The parse representation.
       def create(aBuilder = nil)
         a_walker = walker(parsing)
@@ -38,14 +38,14 @@ module Rley # This module is used as a namespace
           end
           raise e
         end
-        
+
         a_builder.done!
 
-        return a_builder.result
+        a_builder.result
       end
-      
+
       private
-      
+
       # Create a Parsing walker, that is, an object
       # that will iterate over the relevant nodes (= parsing entries)
       # of a GFGParsing
@@ -58,13 +58,11 @@ module Rley # This module is used as a namespace
 
       # By default, when a end vertex is re-visited don't jump
       # its corresponding start vertex.
-      def jump_to_start()
+      def jump_to_start
         false
       end
-      
     end # class
   end # module
 end # module
 
-# End of file 
-   
+# End of file

data/lib/rley/parse_rep/parse_tree_builder.rb

@@ -50,7 +50,7 @@ module Rley # This module is used as a namespace
       end
 
       # Notify the builder that the parse tree construction is complete.
-      def done!()
+      def done!
         result.done!
       end
 
@@ -92,7 +92,7 @@ module Rley # This module is used as a namespace
       private
 
       # Return the top of stack element.
-      def tos()
+      def tos
         @stack.last
       end
 
@@ -207,7 +207,7 @@ module Rley # This module is used as a namespace
       # @param anEntry [ParseEntry] The entry being visited
       def terminal_before_dot?(anEntry)
         prev_symbol = anEntry.prev_symbol
-        return prev_symbol && prev_symbol.terminal?
+        prev_symbol&.terminal?
       end
 
       # A terminal symbol was detected at left of dot.
@@ -260,7 +260,7 @@ module Rley # This module is used as a namespace
             non_terminal = anEntry.vertex.lhs
         end
 
-        return non_terminal
+        non_terminal
       end
     end # class
   end # module

data/lib/rley/parse_rep/parse_tree_factory.rb

@@ -1,27 +1,27 @@
-# frozen_string_literal: true
-
-require_relative 'parse_rep_creator'
-# require_relative 'parse_tree_builder' # TODO remove this line
-require_relative 'cst_builder'
-
-module Rley # This module is used as a namespace
-  module ParseRep # This module is used as a namespace
-    # Utility class that helps to create a ParseTree from
-    # a given Parsing object.
-    class ParseTreeFactory < ParseRepCreator
-      protected
-
-      # Create a Builder, that is, an object
-      # that will create piece by piece the forest
-      def builder(aParseResult, aBuilder = nil)
-        if aBuilder
-          aBuilder.new(aParseResult.tokens)
-        else
-          CSTBuilder.new(aParseResult.tokens)
-        end
-      end     
-    end # class
-  end # module
-end # module
-
-# End of file
+# frozen_string_literal: true
+
+require_relative 'parse_rep_creator'
+# require_relative 'parse_tree_builder' # TODO remove this line
+require_relative 'cst_builder'
+
+module Rley # This module is used as a namespace
+  module ParseRep # This module is used as a namespace
+    # Utility class that helps to create a ParseTree from
+    # a given Parsing object.
+    class ParseTreeFactory < ParseRepCreator
+      protected
+
+      # Create a Builder, that is, an object
+      # that will create piece by piece the forest
+      def builder(aParseResult, aBuilder = nil)
+        if aBuilder
+          aBuilder.new(aParseResult.tokens)
+        else
+          CSTBuilder.new(aParseResult.tokens)
+        end
+      end
+    end # class
+  end # module
+end # module
+
+# End of file

data/lib/rley/parse_tree_visitor.rb

@@ -37,7 +37,7 @@ module Rley # This module is used as a namespace
     end
 
     # The signal to begin the visit of the parse tree.
-    def start()
+    def start
       ptree.accept(self)
     end
 

data/lib/rley/parser/error_reason.rb

@@ -17,7 +17,7 @@ module Rley # Module used as a namespace
       end
 
       # @return [String] the result of invoking reason.to_s
-      def message()
+      def message
         return to_s
       end
 
@@ -27,11 +27,10 @@ module Rley # Module used as a namespace
       end
     end # class
 
-
     # This parse error occurs when no input for parsing was provided
     # while the grammar requires some non-empty input.
     class NoInput < ErrorReason
-      def initialize()
+      def initialize
         super(0)
       end
 
@@ -61,7 +60,7 @@ module Rley # Module used as a namespace
 
       protected
 
-      def position()
+      def position
         return last_token.position if last_token.respond_to?(:position)
 
         rank + 1
@@ -76,7 +75,7 @@ module Rley # Module used as a namespace
                    else
                      "'#{term_names[0]}'"
                    end
-        return explain
+        explain
       end
     end # class
 

data/lib/rley/parser/gfg_chart.rb

@@ -16,32 +16,30 @@ module Rley # This module is used as a namespace
 
       # @param aGFGraph [GFG::GrmFlowGraph] The GFG for the grammar in use.
       def initialize(aGFGraph)
-        @sets = [ ParseEntrySet.new ]
+        @sets = [ParseEntrySet.new]
         push_entry(aGFGraph.start_vertex, 0, 0, :start_rule)
       end
 
       # @return [Syntax::NonTerminal] the start symbol of the grammar.
-      def start_symbol()
-        return sets.first.entries[0].vertex.non_terminal
+      def start_symbol
+        sets.first.entries[0].vertex.non_terminal
       end
 
       # @param index [Integer]
       # @return [ParseEntrySet] Access the entry set at given position.
       def [](index)
-        return sets[index]
+        sets[index]
       end
 
       # Return the index value of the last non-empty entry set.
       # @return [Integer]
-      def last_index()
+      def last_index
         first_empty = sets.find_index(&:empty?)
-        index = if first_empty.nil?
-                  sets.size - 1
-                else
-                  first_empty.zero? ? 0 : first_empty - 1
-                end
-
-        return index
+        if first_empty.nil?
+          sets.size - 1
+        else
+          first_empty.zero? ? 0 : first_empty - 1
+        end
       end
 
       # Push a parse entry for the chart entry with given index
@@ -60,20 +58,18 @@ module Rley # This module is used as a namespace
 
           add_entry_set
         end
-        pushed = self[anIndex].push_entry(new_entry)
-
-        return pushed
+        self[anIndex].push_entry(new_entry)
       end
 
       # Retrieve the first parse entry added to this chart
       # @return [ParseEntry]
-      def initial_entry()
-        return sets[0].first
+      def initial_entry
+        sets[0].first
       end
 
       # Retrieve the entry that corresponds to a complete and successful parse
       # @return [ParseEntry]
-      def accepting_entry()
+      def accepting_entry
         # Success can be detected as follows:
         # The last chart entry set has at least one complete parse entry
         # for the start symbol with an origin == 0
@@ -95,7 +91,7 @@ module Rley # This module is used as a namespace
 
         success_entries.first
       end
-      
+
       # @return [Integer] The number of states.
       def count_states
         sets.size
@@ -103,6 +99,7 @@ module Rley # This module is used as a namespace
 
       # @return [Integer] The total number of entries.
       def count_entries
+        # rubocop: disable Lint/UselessAssignment
         sets.reduce(0) do |sub_result, a_set|
           sub_result += a_set.size
         end
@@ -114,6 +111,7 @@ module Rley # This module is used as a namespace
           sub_result += a_set.count_edges
         end
       end
+      # rubocop: enable Lint/UselessAssignment
 
       # @ return [String] A human-readable representation of the chart.
       def to_s
@@ -121,16 +119,16 @@ module Rley # This module is used as a namespace
         sets.each_with_index do |a_set, i|
           result << "State[#{i}]\n"
           a_set.entries.each do |item|
-            result << '  ' + item.to_s + "\n"
+            result << "  #{item}\n"
           end
         end
-        
+
         result
       end
 
       private
 
-      def add_entry_set()
+      def add_entry_set
          @sets << ParseEntrySet.new
       end
     end # class

data/lib/rley/parser/gfg_parsing.rb

@@ -179,50 +179,36 @@ module Rley # This module is used as a namespace
           end
         end
 
-        return true
+        true
       end
 
       # Return true if the parse was successful (= input tokens
       # followed the syntax specified by the grammar)
-      def success?()
+      def success?
         return false if @failure_reason
 
-        return chart.accepting_entry ? true : false
+        chart.accepting_entry ? true : false
       end
 
       # Return true if there are more than one complete state
       # for the same lhs and same origin in any state set.
-      def ambiguous?()
+      def ambiguous?
         found = chart.sets.find { |set| !set.ambiguities.empty? }
-        return !found.nil?
-      end
-
-      # Factory method. Builds a ParseForest from the parse result.
-      # @return [ParseForest]
-      def parse_forest()
-        msg = <<-END_MSG
- Method Rley::Parser::GFGParsing.parse_forest is deprecated, call
- Rley::Engine::to_pforest. It will be removed June 1st
- or version 0.6.1 (whichever is first)
-END_MSG
-        # warn(msg)
-        factory = ParseRep::ParseForestFactory.new(self)
-
-        return factory.create
+        !found.nil?
       end
 
       # Retrieve the very first parse entry added to the chart.
       # This entry corresponds to the start vertex of the GF graph
       # with origin equal to zero.
-      def initial_entry()
-        return chart.initial_entry
+      def initial_entry
+        chart.initial_entry
       end
 
       # Retrieve the accepting parse entry that represents
       # a complete, successful parse
       # After a successful parse, the last chart entry set
       # has an end parse entry that involves the start symbol
-      def accepting_entry()
+      def accepting_entry
         return chart.accepting_entry
       end
 
@@ -232,7 +218,7 @@ END_MSG
       end
 
       # A notification that the parsing reached an end
-      def done()
+      def done
         # Parse not successful and no reason identified
         # Assuming that parse failed because of a premature end
         premature_end unless success? || failure_reason
@@ -240,7 +226,7 @@ END_MSG
 
       # Clean and normalize the object.
       # Call this method when the parsing is complete.
-      def tidy_up!()
+      def tidy_up!
         antecedence.each_key do |entry|
           antecedence[entry].uniq!
         end
@@ -259,7 +245,7 @@ END_MSG
       end
 
       # @return [String] A human readable representation of itself.
-      def to_s()
+      def to_s
         result = +''
         result << "success? #{success?}\n"
         result << "chart:\n"
@@ -297,7 +283,6 @@ END_MSG
 
         antecedence[consequent] << antecedentEntry
 
-
 =begin
         # Invariant checks
         antecedents = antecedence[consequent]
@@ -335,7 +320,7 @@ END_MSG
         end
 =end
         consequent.add_antecedent(antecedentEntry)
-        return consequent
+        consequent
       end
 
       # Push a parse entry (vertex + origin) to the
@@ -350,15 +335,16 @@ END_MSG
       def forest_builder(anIndex)
         full_range = { low: 0, high: anIndex }
         start_production = chart.start_dotted_rule.production
-        return ParseForestBuilder.new(start_production, full_range)
+
+        ParseForestBuilder.new(start_production, full_range)
       end
 
       # Factory method. Creates and initializes a ParseEntryTracker instance.
-      def new_entry_tracker()
+      def new_entry_tracker
         instance = ParseEntryTracker.new(chart.last_index)
         instance.parse_entry = accepting_entry
 
-        return instance
+        instance
       end
     end # class
   end # module