rley 0.7.07 → 0.7.08

data/lib/rley/gfg/item_vertex.rb

@@ -40,33 +40,33 @@ module Rley # This module is used as a namespace
       # The label of this vertex.
       # It is the same as the label of the corresponding dotted item.
       # @return [String] Label for this vertex
-      def label()
-        return dotted_item.to_s
+      def label
+        dotted_item.to_s
       end
 
       # Returns true if the dotted item has a dot at the end of the production.
       # @return [Boolean]
-      def complete?()
-        return dotted_item.reduce_item?
+      def complete?
+        dotted_item.reduce_item?
       end
 
       # Return the symbol before the dot.
       # @return [Syntax::GrmSymbol, NilClass] Previous symbol otherwise nil.
-      def prev_symbol()
-        return dotted_item.prev_symbol
+      def prev_symbol
+        dotted_item.prev_symbol
       end
 
       # Return the symbol after the dot.
       # @return [Syntax::GrmSymbol, NilClass] Next grammar symbol otherwise nil.
-      def next_symbol()
-        return dotted_item.next_symbol
+      def next_symbol
+        @next_symbol ||= dotted_item.next_symbol
       end
 
       # Return the non-terminal symbol at the left-hand side of the production
       # @return [Syntax::GrmSymbol]
       #   The non-terminal symbol at left side of production.
-      def lhs()
-        return dotted_item.lhs
+      def lhs
+        dotted_item.lhs
       end
     end # class
   end # module

data/lib/rley/gfg/non_terminal_vertex.rb

@@ -5,7 +5,7 @@ require_relative 'vertex'
 module Rley # This module is used as a namespace
   module GFG # This module is used as a namespace
     # Abstract class.
-    # Represents a specialized vertex in a grammar flow graph 
+    # Represents a specialized vertex in a grammar flow graph
     # that is associated to a given non-terminal symbol and
     # that may have in-degree or out-degree > 1
     # Responsibilities (in addition to inherited ones):
@@ -14,20 +14,20 @@ module Rley # This module is used as a namespace
       # The non-terminal symbol associated to the vertex
       # @return [Syntax::NonTerminal]
       attr_reader :non_terminal
-      
+
       # Constructor to specialize in subclasses.
       # @param aNonTerminal [Syntax::NonTerminal]
       def initialize(aNonTerminal)
         super()
         @non_terminal = aNonTerminal
       end
-      
+
       protected
 
       # Validation method for adding an outgoing edge to the vertex.
       # A start vertex may accept an indegree and outdegree greater than one
       def check_add_edge(anEdge)
-        return anEdge
+        anEdge
       end
     end # class
   end # module

data/lib/rley/gfg/scan_edge.rb

@@ -17,7 +17,7 @@ module Rley # This module is used as a namespace
         @terminal = aTerminal
       end
 
-      def to_s()
+      def to_s
         " -#{terminal}-> #{successor.label}"
       end
     end # class

data/lib/rley/gfg/shortcut_edge.rb

@@ -12,12 +12,12 @@ module Rley # This module is used as a namespace
       attr_reader :nonterminal
 
       def initialize(thePredecessor, theSuccessor)
-        @successor = theSuccessor
+        super(nil, theSuccessor)
         @nonterminal = thePredecessor.next_symbol
         thePredecessor.shortcut = self
       end
 
-      def to_s()
+      def to_s
         " -#{nonterminal}-> #{successor.label}"
       end
     end # class

data/lib/rley/gfg/start_vertex.rb

@@ -5,19 +5,15 @@ require_relative 'non_terminal_vertex'
 module Rley # This module is used as a namespace
   module GFG # This module is used as a namespace
     # TODO: change definition.
-    # Represents a specialized vertex in a grammar flow graph 
+    # Represents a specialized vertex in a grammar flow graph
     # that is associated to a given non-terminal symbol.
     # Responsibilities (in addition to inherited ones):
     # - Know its related non-terminal symbol
     class StartVertex < NonTerminalVertex
-      def initialize(aNonTerminal)
-        super(aNonTerminal)
-      end
-
       # @return [String]
-      def label()
-        return ".#{non_terminal}"
-      end       
+      def label
+        ".#{non_terminal}"
+      end
     end # class
   end # module
 end # module

data/lib/rley/gfg/vertex.rb

@@ -10,60 +10,65 @@ module Rley # This module is used as a namespace
       # The edges linking the successor vertices to this one.
       # @return [Array<Edge>] The edge(s) linking this vertex to successor(s)
       attr_reader :edges
-      
+
+      # Return the object id in string format
+      # @return [String]
+      attr_reader :oid_str
+
       # Constructor to extend in subclasses.
-      def initialize()
+      def initialize
         @edges = []
+        @oid_str = object_id.to_s
       end
-      
-      # Add an graph edge to this vertex.
-      # @param anEdge [Edge] the edge to be added.
-      def add_edge(anEdge)
-        arrow = check_add_edge(anEdge)
-        edges << arrow
-      end
-      
-      # Determine if the vertex corresponds to an dotted item that has 
+
+      # Determine if the vertex corresponds to an dotted item that has
       # its dot at the end of a production (i.e. is a reduced item).
       # @return [Boolean] true iff vertex corresponds to reduced item.
-      def complete?()
-        return false # Default implementation
+      def complete?
+        false # Default implementation
       end
-      
-      # Returns a string containing a human-readable representation of the 
+
+      # Returns a string containing a human-readable representation of the
       # vertex.
       # @return [String]
-      def inspect()
+      def inspect
         result = +'#<'
         result << selfie
         edges.each { |e| result << e.inspect }
         result << specific_inspect
         result << '>'
-        
-        return result
+
+        result
       end
-      
-      # Returns a string containing a human-readable representation of the 
+
+      # Returns a string containing a human-readable representation of the
       # vertex without the edges.
-      # @return [String]      
-      def selfie()
+      # @return [String]
+      def selfie
         result = +"#{self.class.name}:#{object_id}"
         result << %( label="#{label}")
-        return result
+        result
       end
-      
+
       # Retrieve the grammar symbol before the dot.
       # @return [GrmSymbol, NilClass] The symbol or otherwise nil.
-      def prev_symbol()
-        return nil # Default implementation
-      end      
-      
+      def prev_symbol
+        nil # Default implementation
+      end
+
       # Retrieve the grammar symbol after the dot.
-      # @return [GrmSymbol, NilClass] The symbol or otherwise nil. 
-      def next_symbol()
-        return nil # Default implementation
+      # @return [GrmSymbol, NilClass] The symbol or otherwise nil.
+      def next_symbol
+        nil # Default implementation
+      end
+
+      # Add an graph edge to this vertex.
+      # @param anEdge [Edge] the edge to be added.
+      def add_edge(anEdge)
+        arrow = check_add_edge(anEdge)
+        edges << arrow
       end
-      
+
       protected
 
       # Validation method for adding an outgoing edge to the vertex.
@@ -71,14 +76,13 @@ module Rley # This module is used as a namespace
       # unless this method is overridden in subclasses
       def check_add_edge(anEdge)
         raise StandardError, 'At most one edge accepted' unless edges.empty?
-        
-        return anEdge
+
+        anEdge
+      end
+
+      def specific_inspect
+        ''
       end
-      
-      def specific_inspect()
-        return ''
-      end      
-      
     end # class
   end # module
 end # module

data/lib/rley/lexical/token_range.rb

@@ -2,13 +2,13 @@
 
 module Rley # This module is used as a namespace
   module Lexical # This module is used as a namespace
-    # A token range (also called an extent) represents an interval 
+    # A token range (also called an extent) represents an interval
     # of token positions that is matched by a given grammar symbol.
     # For instance consider the expression E: 3 + 11,
     # let's assume that the integer literal '3' is the fifth input token and
     # that the '+' and '11' tokens are respectively at position 6 and 7;
     # then the token range associated with E is [5, 7]
-    # While the parse tree/forest is being constructed the boundaries of the 
+    # While the parse tree/forest is being constructed the boundaries of the
     # token range can be temporarily undefined (= set to nil)
     class TokenRange
       # The index of the lower bound of token range
@@ -47,8 +47,8 @@ module Rley # This module is used as a namespace
       end
 
       # true when both bounds aren't nil.
-      def bounded?()
-        return !(low.nil? || high.nil?)
+      def bounded?
+        !(low.nil? || high.nil?)
       end
 
       # Conditional assign
@@ -73,8 +73,8 @@ module Rley # This module is used as a namespace
       def to_string(_indentation)
         low_text = low.nil? ? '?' : low.to_s
         high_text = high.nil? ? '?' : high.to_s
-        
-        return "[#{low_text}, #{high_text}]"
+
+        "[#{low_text}, #{high_text}]"
       end
 
       private

data/lib/rley/parse_forest_visitor.rb

@@ -15,8 +15,8 @@ module Rley # This module is used as a namespace
         @signatures = subnodes.map { |_| prime_enumerator.next }
       end
 
-      def signature_exist?()
-        @signatures.nil? ? false : true
+      def signature_exist?
+        !@signatures.nil?
       end
     end # class
   end # module
@@ -69,7 +69,7 @@ module Rley # This module is used as a namespace
     end
 
     # The signal to begin the visit of the parse forest.
-    def start()
+    def start
       pforest.accept(self)
     end
 
@@ -169,7 +169,7 @@ module Rley # This module is used as a namespace
     def broadcast(msg, *args)
       subscribers.each do |subscr|
         next unless subscr.respond_to?(msg) || subscr.respond_to?(:accept_all)
-        
+
         subscr.send(msg, *args)
       end
     end
@@ -190,7 +190,7 @@ module Rley # This module is used as a namespace
 
     def pop_node
       return if legs.empty?
-      
+
       legs.pop
     end
   end # class

data/lib/rley/parse_rep/ast_base_builder.rb

@@ -20,14 +20,14 @@ module Rley # This module is used as a namespace
       #   Returned hash contains pairs of the form:
       #   terminal name => Class implementing the terminal tokens
       #   terminal name => Hash with pairs: production name => Class
-      def terminal2node()
+      def terminal2node
         raise NotImplementedError
       end
 
       # Method to override in subclass.
       # Default class for representing terminal nodes.
       # @return [Class]
-      def terminalnode_class()
+      def terminalnode_class
         PTree::TerminalNode
       end
 
@@ -37,7 +37,7 @@ module Rley # This module is used as a namespace
       # @param aProductionName [String]
       # @return [String]
       def method_name(aProductionName)
-        return 'reduce_' + aProductionName
+        "reduce_#{aProductionName}"
       end
 
       # Utility method.
@@ -46,7 +46,7 @@ module Rley # This module is used as a namespace
       # @param _tokens [Array<Lexical::Token>]
       # @param theChildren [Array<Object>]
       def return_first_child(_range, _tokens, theChildren)
-        return theChildren[0]
+        theChildren[0]
       end
 
       # Utility method.
@@ -55,7 +55,7 @@ module Rley # This module is used as a namespace
       # @param _tokens [Array<Lexical::Token>]
       # @param theChildren [Array<Object>]
       def return_second_child(_range, _tokens, theChildren)
-        return theChildren[1]
+        theChildren[1]
       end
 
       # Utility method.
@@ -64,7 +64,7 @@ module Rley # This module is used as a namespace
       # @param _tokens [Array<Lexical::Token>]
       # @param theChildren [Array<Object>]
       def return_last_child(_range, _tokens, theChildren)
-        return theChildren[-1]
+        theChildren[-1]
       end
 
       # Simply return an epsilon symbol
@@ -72,7 +72,7 @@ module Rley # This module is used as a namespace
       # @param _tokens [Array<Lexical::Token>]
       # @param _children [Array<Object>]
       def return_epsilon(_range, _tokens, _children)
-        return nil
+        nil
       end
 
       protected
@@ -81,7 +81,7 @@ module Rley # This module is used as a namespace
       # Create a parse tree object with given
       # node as root node.
       def create_tree(aRootNode)
-        return Rley::PTree::ParseTree.new(aRootNode)
+        Rley::PTree::ParseTree.new(aRootNode)
       end
 
       # Factory method for creating a node object for the given
@@ -96,9 +96,7 @@ module Rley # This module is used as a namespace
           # Lexical ambiguity...
           klass = klass.fetch(aProduction.name)
         end
-        node = klass.new(aToken, aTokenPosition)
-
-        return node
+        klass.new(aToken, aTokenPosition)
       end
 
       # Method to override.

data/lib/rley/parse_rep/cst_builder.rb

@@ -16,13 +16,13 @@ module Rley # This module is used as a namespace
     # nodes) and using a step by step approach.
     class CSTBuilder < ParseTreeBuilder
       protected
-      
+
       # Method to override
       # Create a parse tree object with given
       # node as root node.
       def create_tree(aRootNode)
         return Rley::PTree::ParseTree.new(aRootNode)
-      end      
+      end
 
       # Method to override
       # Factory method for creating a node object for the given
@@ -42,10 +42,9 @@ module Rley # This module is used as a namespace
       # @param theChildren [Array] Children nodes (one per rhs symbol)
       def new_parent_node(aProduction, aRange, _tokens, theChildren)
         node = Rley::PTree::NonTerminalNode.new(aProduction.lhs, aRange)
-        if theChildren
-          theChildren.reverse_each { |child| node.add_subnode(child) }
-        end
-        return node
+        theChildren&.reverse_each { |child| node.add_subnode(child) }
+
+        node
       end
     end # class
   end # module

data/lib/rley/parse_rep/parse_forest_builder.rb

@@ -44,7 +44,7 @@ module Rley # This module is used as a namespace
       end
 
       # Notify the builder that the construction is over
-      def done!()
+      def done!
         result.done!
       end
 
@@ -64,7 +64,7 @@ module Rley # This module is used as a namespace
       end
 
       # Return the current_parent node
-      def curr_parent()
+      def curr_parent
         curr_path.last
       end
 
@@ -110,18 +110,18 @@ module Rley # This module is used as a namespace
       def process_item_entry(anEvent, anEntry, anIndex)
         case anEvent
           when :visit
-            if anEntry.exit_entry?
+            if anEntry.exit_entry? && last_visitee.end_entry? &&
+               last_visitee.antecedents.size > 1
               # Previous entry was an end entry (X. pattern)
               # Does the previous entry have multiple antecedent?
-              if last_visitee.end_entry? && last_visitee.antecedents.size > 1
-                # Store current path for later backtracking
-                # puts "Store backtrack context #{last_visitee}"
-                # puts "path [#{curr_path.map{|e|e.to_string(0)}.join(', ')}]"
-                entry2path_to_alt[last_visitee] = curr_path.dup
-                curr_parent.refinement = :or
-
-                create_alternative_node(anEntry)
-              end
+
+              # Store current path for later backtracking
+              # puts "Store backtrack context #{last_visitee}"
+              # puts "path [#{curr_path.map{|e|e.to_string(0)}.join(', ')}]"
+              entry2path_to_alt[last_visitee] = curr_path.dup
+              curr_parent.refinement = :or
+
+              create_alternative_node(anEntry)
             end
 
             # Does this entry have multiple antecedent?
@@ -179,7 +179,7 @@ module Rley # This module is used as a namespace
 
       # Create an empty parse forest
       def create_forest(aRootNode)
-        return Rley::SPPF::ParseForest.new(aRootNode)
+        Rley::SPPF::ParseForest.new(aRootNode)
       end
 
       # Factory method. Build and return an SPPF non-terminal node.
@@ -190,7 +190,7 @@ module Rley # This module is used as a namespace
         add_subnode(new_node)
         # puts "FOREST ADD #{curr_parent.key if curr_parent}/#{new_node.key}"
 
-        return new_node
+        new_node
       end
 
       # Add an alternative node to the forest
@@ -202,7 +202,7 @@ module Rley # This module is used as a namespace
         result.is_ambiguous = true
         # puts "FOREST ADD #{alternative.key}"
 
-        return alternative
+        alternative
       end
 
       # create a token node,
@@ -216,7 +216,7 @@ module Rley # This module is used as a namespace
         candidate = add_node_to_forest(new_node)
         entry2node[anEntry] = candidate
 
-        return candidate
+        candidate
       end
 
       def create_epsilon_node(anEntry, anIndex)
@@ -224,7 +224,7 @@ module Rley # This module is used as a namespace
         candidate = add_node_to_forest(new_node)
         entry2node[anEntry] = candidate
 
-        return candidate
+        candidate
       end
 
       # Add the given node if not yet present in parse forest
@@ -239,17 +239,19 @@ module Rley # This module is used as a namespace
         end
         add_subnode(new_node, false)
 
-        return new_node
+        new_node
       end
 
       # Add the given node as sub-node of current parent node
       # Optionally add the node to the current path
+      # rubocop: disable Style/OptionalBooleanParameter
       def add_subnode(aNode, addToPath = true)
         raise StandardError, 'node is nil' if aNode.nil?
 
         curr_parent.add_subnode(aNode) unless curr_path.empty?
         curr_path << aNode if addToPath
       end
+      # rubocop: enable Style/OptionalBooleanParameter
     end # class
   end # module
 end # module