rley 0.4.06 → 0.4.07

data/lib/rley/parser/gfg_parsing.rb

@@ -128,7 +128,6 @@ module Rley # This module is used as a namespace
         return true
       end
 
-
       # Return true if the parse was successful (= input tokens
       # followed the syntax specified by the grammar)
       def success?()
@@ -180,11 +179,9 @@ module Rley # This module is used as a namespace
 
       # A notification that the parsing reached an end
       def done
-        unless self.success? || self.failure_reason
-          # Parse not successful and no reason identified
-          # Assuming that parse failed because of a premature end
-          premature_end
-        end
+        # Parse not successful and no reason identified
+        # Assuming that parse failed because of a premature end      
+        premature_end unless success? || failure_reason
       end
 
       private
@@ -232,7 +229,6 @@ module Rley # This module is used as a namespace
         return ParseForestBuilder.new(start_production, full_range)
       end
 
-
       # Factory method. Creates and initializes a ParseEntryTracker instance.
       def new_entry_tracker()
         instance = ParseEntryTracker.new(chart.last_index)

data/lib/rley/parser/parse_entry.rb

@@ -66,7 +66,6 @@ module Rley # This module is used as a namespace
         return vertex.kind_of?(GFG::EndVertex)
       end
 
-
       # Return the symbol before the dot (if any)
       def prev_symbol()
         return vertex.prev_symbol

data/lib/rley/parser/parse_entry_set.rb

@@ -9,34 +9,34 @@ module Rley # This module is used as a namespace
     # - To know all the parse entries in the set
     class ParseEntrySet
       extend Forwardable
-      def_delegators :entries, :empty?, :size, :first, :last, :pop, :each   
+      def_delegators :entries, :empty?, :size, :first, :last, :pop, :each
 
       # The set of parse entries
       attr_reader :entries
 
       def initialize()
         @entries = []
-        @entries4term = Hash.new { |hash, key| hash[key] = [] } 
+        @entries4term = Hash.new { |hash, key| hash[key] = [] }
         @entries4n_term = Hash.new { |hash, key| hash[key] = [] }
       end
-      
+
       # Access the entry at given position
       def [](index)
         return entries[index]
-      end  
+      end
 
       # Returns a Hash with pairs of the form:
       #   terminal symbol => [ parse entry expecting the terminal ]
       def entries4term(aTerminal)
         return @entries4term.fetch(aTerminal, [])
       end
-      
+
       # Returns a Hash with pairs of the form:
       #   non terminal symbol => [ parse entry expecting the non-terminal ]
       def entries4n_term(aNonTerminal)
         return @entries4n_term.fetch(aNonTerminal, [])
       end
-      
+
       # Append the given entry (if it isn't yet in the set)
       # to the list of parse entries
       # @param anEntry [ParseEntry] the parse entry to push.
@@ -51,27 +51,26 @@ module Rley # This module is used as a namespace
           add_lookup4symbol(anEntry) if expecting
           result = anEntry
         end
-        
-        return result      
+
+        return result
       end
 
-      
       # Return an Array of Arrays of ambiguous parse entries.
       def ambiguities()
         complete_entries = entries.select(&:exit_entry?)
         return [] if complete_entries.size <= 1
-        
+
         # Group parse entries by lhs symbol and origin
         groupings = complete_entries.group_by do |entry|
           entry.vertex.dotted_rule.lhs.object_id.to_s
         end
-        
+
         # Retain the groups having more than one element.
         ambiguous_groups = []
         groupings.each_value do |a_group|
           ambiguous_groups << a_group if a_group.size > 1
         end
-        
+
         return ambiguous_groups
       end
 
@@ -79,16 +78,16 @@ module Rley # This module is used as a namespace
       # is on the left of a dot in a parse state of the parse set.
       def expected_terminals()
         return @entries4term.keys
-      end      
-      
+      end
+
       private
 
       def add_lookup4symbol(anEntry)
         symb = anEntry.next_symbol
         case symb
           when Syntax::Terminal
-            @entries4term[symb] << anEntry  
-            
+            @entries4term[symb] << anEntry
+
           when Syntax::NonTerminal
             @entries4n_term[symb] << anEntry
         end

data/lib/rley/parser/parse_forest_builder.rb

@@ -82,11 +82,6 @@ module Rley # This module is used as a namespace
           when :backtrack
             # Restore path
             @curr_path = entry2path_to_alt[anEntry].dup
-            # puts "Restore path [#{curr_path.map{|e|e.to_string(0)}.join(', ')}]"
-            antecedent_index = curr_parent.subnodes.size
-            # puts "Current parent #{curr_parent.to_string(0)}"
-            # puts "Antecedent index #{antecedent_index}"
-
 
           when :revisit
             # Retrieve the already existing node corresponding
@@ -102,7 +97,6 @@ module Rley # This module is used as a namespace
         end
       end
 
-
       def process_item_entry(anEvent, anEntry, anIndex)
         case anEvent
           when :visit
@@ -150,14 +144,9 @@ module Rley # This module is used as a namespace
           when :backtrack
             # Restore path
             @curr_path = entry2path_to_alt[anEntry].dup
-            # puts "Special restore path [#{curr_path.map{|e|e.to_string(0)}.join(', ')}]"
-            antecedent_index = curr_parent.subnodes.size
-            # puts "Current parent #{curr_parent.to_string(0)}"
-            # puts "Antecedent index #{antecedent_index}"
-
             create_alternative_node(anEntry)
 
-        when :revisit
+          when :revisit
             # Retrieve the grammar symbol before the dot (if any)
             prev_symbol = anEntry.prev_symbol
             case prev_symbol
@@ -181,7 +170,6 @@ module Rley # This module is used as a namespace
         return Rley::SPPF::ParseForest.new(aRootNode)
       end
 
-
       # Factory method. Build and return an SPPF non-terminal node.
       def create_non_terminal_node(anEntry, aRange, nonTSymb = nil)
         non_terminal = nonTSymb.nil? ? anEntry.vertex.non_terminal : nonTSymb
@@ -193,7 +181,6 @@ module Rley # This module is used as a namespace
         return new_node
       end
 
-
       # Add an alternative node to the forest
       def create_alternative_node(anEntry)
         vertex = anEntry.vertex
@@ -220,7 +207,6 @@ module Rley # This module is used as a namespace
         return candidate
       end
 
-
       def create_epsilon_node(anEntry, anIndex)
         new_node = SPPF::EpsilonNode.new(anIndex)
         candidate = add_node_to_forest(new_node)
@@ -232,19 +218,18 @@ module Rley # This module is used as a namespace
       # Add the given node if not yet present in parse forest
       def add_node_to_forest(aNode)
         key_node = aNode.key
-          if forest.include?(key_node)
-            new_node = forest.key2node[key_node]
-          else
-            new_node = aNode
-            forest.key2node[key_node] = new_node
-            # puts "FOREST ADD #{key_node}"
-          end
+        if forest.include?(key_node)
+          new_node = forest.key2node[key_node]
+        else
+          new_node = aNode
+          forest.key2node[key_node] = new_node
+          # puts "FOREST ADD #{key_node}"
+        end
         add_subnode(new_node, false)
 
         return new_node
       end
 
-
       # Add the given node as sub-node of current parent node
       # Optionally add the node to the current path
       def add_subnode(aNode, addToPath = true)

data/lib/rley/parser/parse_state.rb

@@ -40,7 +40,7 @@ module Rley # This module is used as a namespace
 
       # Does this parse state have the 'other' as successor?
       def precedes?(other)
-        return false if self == other
+        return false if other == self
 
         return false unless origin == other.origin
         other_production = other.dotted_rule.production

data/lib/rley/parser/parse_tree_builder.rb

@@ -77,7 +77,6 @@ module Rley # This module is used as a namespace
         end
       end
 
-
       def process_item_entry(anEvent, anEntry, anIndex)
         case anEvent
           when :visit
@@ -117,32 +116,8 @@ module Rley # This module is used as a namespace
                 curr_path.pop if curr_parent.kind_of?(SPPF::AlternativeNode)
             end
 
-          when :backtrack
-            # # Restore path
-            # @curr_path = entry2path_to_alt[anEntry].dup
-            # # puts "Special restore path [#{curr_path.map{|e|e.to_string(0)}.join(', ')}]"
-            # antecedent_index = curr_parent.subnodes.size
-            # # puts "Current parent #{curr_parent.to_string(0)}"
-            # # puts "Antecedent index #{antecedent_index}"
-
-            # create_alternative_node(anEntry)
-
-        when :revisit
-            # # Retrieve the grammar symbol before the dot (if any)
-            # prev_symbol = anEntry.prev_symbol
-            # case prev_symbol
-              # when Syntax::Terminal
-                # # Add node without changing current path
-                # create_token_node(anEntry, anIndex)
-
-              # when NilClass # Dot at the beginning of production
-                # if anEntry.vertex.dotted_item.production.empty?
-                  # # Empty rhs => create an epsilon node ...
-                  # # ... without changing current path
-                  # create_epsilon_node(anEntry, anIndex)
-                # end
-                # curr_path.pop if curr_parent.kind_of?(PTree::AlternativeNode)
-            # end
+          # when :backtrack
+          # when :revisit
         end
       end
 
@@ -151,7 +126,6 @@ module Rley # This module is used as a namespace
         return Rley::PTree::ParseTree.new(aRootNode)
       end
 
-
       # Factory method. Build and return an PTree non-terminal node.
       def create_non_terminal_node(anEntry, aRange, nonTSymb = nil)
         non_terminal = nonTSymb.nil? ? anEntry.vertex.non_terminal : nonTSymb
@@ -163,7 +137,6 @@ module Rley # This module is used as a namespace
         return new_node
       end
 
-
       # Add an alternative node to the tree
       def create_alternative_node(anEntry)
         vertex = anEntry.vertex
@@ -199,7 +172,6 @@ module Rley # This module is used as a namespace
         return new_node
       end
 
-
       # Add the given node as sub-node of current parent node
       # Optionally add the node to the current path
       def add_subnode(aNode, addToPath = true)

data/lib/rley/parser/parse_tree_factory.rb

@@ -54,4 +54,4 @@ module Rley # This module is used as a namespace
   end # module
 end # module
 
-# End of file
+# End of file

data/lib/rley/parser/parse_walker_factory.rb

@@ -25,7 +25,6 @@ module Rley # This module is used as a namespace
       :antecedent_index
     )
 
-
     # A factory that creates an enumerator
     #  that itself walks through a given parsing graph.
     # The walker yields visit events.
@@ -84,7 +83,6 @@ module Rley # This module is used as a namespace
         return context
       end
       
-      
       # Initialize the non-terminal to start entry mapping
       def init_nterm2start()
         h = Hash.new do |hsh, defval|
@@ -139,7 +137,6 @@ module Rley # This module is used as a namespace
         return nil unless aContext.curr_entry.dotted_entry?
       end
 
-
       # Given the current entry from context object
       # Go to the parse entry that is one of its antecedent
       # The context object is updated
@@ -168,7 +165,8 @@ module Rley # This module is used as a namespace
           aContext.return_stack << aContext.curr_entry
         elsif traversed_edge.kind_of?(GFG::CallEdge)
           # Pop top of stack
-          fail ScriptError, "Return stack empty!" if aContext.return_stack.empty?
+          err_msg = 'Return stack empty!'
+          raise ScriptError, err_msg if aContext.return_stack.empty?
           aContext.return_stack.pop
           # puts "Pop from return stack matching entry #{new_entry}"
         elsif traversed_edge.kind_of?(GFG::ScanEdge)
@@ -220,7 +218,6 @@ module Rley # This module is used as a namespace
         return bp
       end
 
-
       def use_backtrack_point(aContext)
         bp = aContext.backtrack_points.last
         bp.antecedent_index += 1
@@ -246,7 +243,7 @@ module Rley # This module is used as a namespace
       # Observation: calling parse entry is an parse entry linked
       # to a item vertex
       def select_calling_entry(aContext)
-        fail ScriptError, "Empty return stack" if aContext.return_stack.empty?
+        raise ScriptError, 'Empty return stack' if aContext.return_stack.empty?
         # Retrieve top of stack
         tos = aContext.return_stack.pop
         tos_dotted_item = tos.vertex.dotted_item

data/lib/rley/parser/state_set.rb

@@ -35,7 +35,6 @@ module Rley # This module is used as a namespace
         return states.select { |s| s.dotted_rule.next_symbol == aSymbol }
       end
 
-
       # The list of complete ParseState that have the given non-terminal
       # symbol as the lhs of their production.
       def states_rewriting(aNonTerm)

data/lib/rley/ptree/parse_tree.rb

@@ -20,7 +20,6 @@ module Rley # This module is used as a namespace
         @root = theRootNode
       end
 
-
       # Part of the 'visitee' role in the Visitor design pattern.
       #   A visitee is expected to accept the visit from a visitor object
       # @param aVisitor [ParseTreeVisitor] the visitor object

data/lib/rley/ptree/terminal_node.rb

@@ -8,7 +8,10 @@ module Rley # This module is used as a namespace
 
       # aPosition is the position of the token in the input stream.      
       def initialize(aToken, aPos)
-        range = aPos.kind_of?(Fixnum) ? { low: aPos, high: aPos + 1 } : aPos
+        (major, minor) =  
+        
+        # Use '1.class' trick to support both Integer and Fixnum classes
+        range = aPos.kind_of?(1.class) ? { low: aPos, high: aPos + 1 } : aPos
         super(aToken.terminal, range)
         @token = aToken
       end

data/lib/rley/rley_error.rb

@@ -7,4 +7,4 @@ module Rley # Module used as a namespace
   end # class
 end # module
 
-# End of file
+# End of file

data/lib/rley/sppf/composite_node.rb

@@ -13,7 +13,6 @@ module Rley # This module is used as a namespace
         @subnodes = []
       end
 
-
       def add_subnode(aSubnode)
         subnodes.unshift(aSubnode)
       end

data/lib/rley/sppf/parse_forest.rb

@@ -40,7 +40,6 @@ module Rley # This module is used as a namespace
         return @is_ambiguous
       end
 
-
       # Part of the 'visitee' role in the Visitor design pattern.
       #   A visitee is expected to accept the visit from a visitor object
       # @param aVisitor [ParseForestVisitor] the visitor object

data/lib/rley/syntax/grammar.rb

@@ -88,8 +88,6 @@ module Rley # This module is used as a namespace
         undefined.each { |n_term| n_term.undefined = true }
       end
 
-
-
       # Mark all non-terminals and production rules as
       # generative or not.
       # A production is generative when it can derive a string of terminals.
@@ -101,7 +99,7 @@ module Rley # This module is used as a namespace
         curr_marked = []
 
         # Iterate until no new rule can be marked.
-        begin
+        loop do
           prev_marked = curr_marked.dup
 
           rules.each do |a_rule|
@@ -123,7 +121,8 @@ module Rley # This module is used as a namespace
             curr_marked << a_rule
             could_mark_nterm_generative(a_rule)
           end
-        end until prev_marked.size == curr_marked.size
+          break if prev_marked.size == curr_marked.size
+        end 
 
         # The nonterminals that are not marked yet are non-generative
         non_terminals.each do |nterm|
@@ -151,14 +150,13 @@ module Rley # This module is used as a namespace
             nterm.generative = true
             all_false = false
             break
-          else
-            all_false = false if prod.generative?.nil?
+          elsif prod.generative?.nil?
+            all_false = false
           end
         end
         nterm.generative = false if all_false
       end
 
-
       # For each non-terminal determine whether it is nullable or not.
       # A nullable nonterminal is a nonterminal that can match an empty string.
       def compute_nullable()
@@ -189,7 +187,6 @@ module Rley # This module is used as a namespace
         end
       end
 
-
       # Return the set of nonterminals which have one of their
       # production rules empty
       def direct_nullable()
@@ -216,7 +213,6 @@ module Rley # This module is used as a namespace
       def rules_for(aNonTerm)
         rules.select { |a_rule| a_rule.lhs == aNonTerm }
       end
-
     end # class
   end # module
 end # module