rley 0.8.14 → 0.9.01

data/lib/rley/parse_rep/parse_forest_builder.rb

@@ -148,7 +148,7 @@ module Rley # This module is used as a namespace
                   # ... without changing current path
                   create_epsilon_node(anEntry, anIndex)
                 end
-                curr_path.pop if curr_parent.kind_of?(SPPF::AlternativeNode)
+                curr_path.pop if curr_parent.is_a?(SPPF::AlternativeNode)
             end
 
           when :backtrack
@@ -172,7 +172,7 @@ module Rley # This module is used as a namespace
                   # ... without changing current path
                   create_epsilon_node(anEntry, anIndex)
                 end
-                curr_path.pop if curr_parent.kind_of?(SPPF::AlternativeNode)
+                curr_path.pop if curr_parent.is_a?(SPPF::AlternativeNode)
             end
         end
       end
@@ -221,6 +221,8 @@ module Rley # This module is used as a namespace
 
       def create_epsilon_node(anEntry, anIndex)
         new_node = SPPF::EpsilonNode.new(anIndex)
+
+        # @type var candidate : SPPF::EpsilonNode
         candidate = add_node_to_forest(new_node)
         entry2node[anEntry] = candidate
 

data/lib/rley/parse_rep/parse_tree_builder.rb

@@ -19,6 +19,7 @@ module Rley # This module is used as a namespace
       # @param aSymbol [Syntax::Symbol] A symbol from grammar.
       def initialize(aRange, aSymbol)
         super
+        # @type self:CSTRawNode
         self.range = aRange
         self.symbol = aSymbol
         self.children = nil
@@ -77,7 +78,7 @@ module Rley # This module is used as a namespace
 
       protected
 
-      # Return the stack
+      # Return the stack of CSTRawNode
       attr_reader(:stack)
 
       # Overriding method.
@@ -180,6 +181,7 @@ module Rley # This module is used as a namespace
         # For debugging purposes
         raise StandardError if previous_tos.symbol != non_terminal
 
+        # @type var previous_tos : CSTRawNode
         new_node = new_parent_node(rule, previous_tos.range,
                                    tokens, previous_tos.children)
         if stack.empty?
@@ -207,7 +209,9 @@ 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
-        prev_symbol&.terminal?
+
+        # @type var prev_symbol : Syntax::GrmSymbol
+        prev_symbol.terminal?
       end
 
       # A terminal symbol was detected at left of dot.
@@ -262,6 +266,14 @@ module Rley # This module is used as a namespace
 
         non_terminal
       end
+
+      def new_leaf_node(_aProduction, _aTerminal, _aTokenPosition, _aToken)
+        raise NotImplementedError
+      end
+
+      def new_parent_node(_aProduction, _aRange, _theTokens, _theChildren)
+        raise NotImplementedError
+      end
     end # class
   end # module
 end # module

data/lib/rley/parse_rep/parse_tree_factory.rb

@@ -15,7 +15,7 @@ module Rley # This module is used as a namespace
       # that will create piece by piece the forest
       def builder(aParseResult, aBuilder = nil)
         if aBuilder
-          aBuilder.new(aParseResult.tokens)
+          aBuilder.new(aParseResult.tokens) # steep:ignore UnexpectedPositionalArgument
         else
           CSTBuilder.new(aParseResult.tokens)
         end

data/lib/rley/parser/error_reason.rb

@@ -7,11 +7,11 @@ module Rley # Module used as a namespace
     # detected by Rley.
     class ErrorReason
       # @!attribute [r] rank
-      #   @return [Fixnum] The rank number of the offending input token
+      #   @return [Integer] The rank number of the offending input token
       attr_reader(:rank)
 
       # Constructor
-      # @param aRank [Fixnum] The sequence number of the offending input token.
+      # @param aRank [Integer] The sequence number of the offending input token.
       def initialize(aRank)
         @rank = aRank
       end

data/lib/rley/parser/gfg_chart.rb

@@ -98,7 +98,7 @@ module Rley # This module is used as a namespace
         new_entry = ParseEntry.new(aVertex, anOrigin)
         result = self[anIndex].push_entry(new_entry)
 
-        if aVertex.kind_of?(GFG::ItemVertex) && aVertex.dotted_item.constraint
+        if aVertex.is_a?(GFG::ItemVertex) && aVertex.dotted_item.constraint
           ct = aVertex.dotted_item.constraint
 
           case ct
@@ -198,8 +198,8 @@ module Rley # This module is used as a namespace
       private
 
       def add_entry_set
-         @sets << ParseEntrySet.new
          @constraints << []
+         @sets << ParseEntrySet.new
       end
 
       def update_match_closest(aConstraint, anIndex)

data/lib/rley/parser/gfg_earley_parser.rb

@@ -32,7 +32,7 @@ module Rley # This module is used as a namespace
 
         aTokenSequence.each_with_index do |token, i|
           parse_for_token(result, i)
-          if token.terminal.kind_of?(String)
+          if token.terminal.is_a?(String)
             symb = grammar.name2symbol[token.terminal]
             token.instance_variable_set(:@terminal, symb)
           end
@@ -51,7 +51,7 @@ module Rley # This module is used as a namespace
         result.chart[index].each do |entry|
           # Is entry of the form? [A => alpha . B beta, k]...
           next_symbol = entry.next_symbol
-          if next_symbol.kind_of?(Syntax::NonTerminal)
+          if next_symbol.is_a?(Syntax::NonTerminal)
             # ...apply the Call rule
             call_rule(result, entry, index)
           end

data/lib/rley/parser/gfg_parsing.rb

@@ -338,7 +338,7 @@ module Rley # This module is used as a namespace
         full_range = { low: 0, high: anIndex }
         start_production = chart.start_dotted_rule.production
 
-        ParseForestBuilder.new(start_production, full_range)
+        ParseRep::ParseForestBuilder.new(start_production, full_range)
       end
 
       # Factory method. Creates and initializes a ParseEntryTracker instance.

data/lib/rley/parser/parse_entry.rb

@@ -62,13 +62,13 @@ module Rley # This module is used as a namespace
 
       # Returns true iff the vertex is a start vertex (i.e. of the form: .X)
       def start_entry?
-        vertex.kind_of?(GFG::StartVertex)
+        vertex.is_a?(GFG::StartVertex)
       end
 
       # Returns true iff the vertex is at the start of rhs
       # (i.e. of the form: X => .Y
       def entry_entry?
-        return false unless vertex.kind_of?(GFG::ItemVertex)
+        return false unless vertex.is_a?(GFG::ItemVertex)
 
         vertex.dotted_item.at_start?
       end
@@ -76,7 +76,7 @@ module Rley # This module is used as a namespace
       # Returns true iff the vertex corresponds to a dotted item
       # X => Y
       def dotted_entry?
-        vertex.kind_of?(GFG::ItemVertex)
+        vertex.is_a?(GFG::ItemVertex)
       end
 
       # Returns true iff the vertex is at end of rhs (i.e. of the form: X => Y.)
@@ -86,7 +86,7 @@ module Rley # This module is used as a namespace
 
       # Returns true iff the vertex is an end vertex (i.e. of the form: X.)
       def end_entry?
-        vertex.kind_of?(GFG::EndVertex)
+        vertex.is_a?(GFG::EndVertex)
       end
 
       # Return the symbol before the dot (if any)

data/lib/rley/parser/parse_entry_set.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'forwardable' # For the Delegation pattern
-require 'set'
 
 require_relative '../syntax/terminal'
 require_relative '../syntax/non_terminal'
@@ -63,6 +62,7 @@ module Rley # This module is used as a namespace
       # @return [ParseEntry] the passed parse entry if it pushes it
       def push_entry(anEntry)
         entry_key = anEntry.hash
+        # @type var result : ParseEntry | false
         result = membership.fetch(entry_key, false)
         unless result
           @entries << anEntry
@@ -72,6 +72,7 @@ module Rley # This module is used as a namespace
           result = anEntry
         end
 
+        # @type var result : ParseEntry
         result
       end
 
@@ -112,9 +113,10 @@ module Rley # This module is used as a namespace
 
       def add_lookup4symbol(anEntry)
         symb = anEntry.next_symbol
-        if symb.kind_of?(Syntax::Terminal)
+        if symb.is_a?(Syntax::Terminal)
           @entries4term[symb] << anEntry
         else
+          # @type var symb : Syntax::NonTerminal
           @entries4n_term[symb] << anEntry
         end
       end

data/lib/rley/parser/parse_entry_tracker.rb

@@ -21,31 +21,34 @@ module Rley # This module is used as a namespace
 
       # Write accessor. Sets the value of the entry set index
       def entry_set_index=(anIndex)
-        @entry_set_index = anIndex
         @processed_entries = {}
+        @entry_set_index = anIndex
       end
 
       # Write accessor. Set the given parse entry as the current one.
       def parse_entry=(aParseEntry)
         raise StandardError, 'Nil parse entry' if aParseEntry.nil?
 
-        @parse_entry = aParseEntry
+        # @type var parse_entry : Rley::Parser::ParseEntry
         processed_entries[parse_entry] = true
+        @parse_entry = aParseEntry
       end
 
       # Take the first provided entry that wasn't processed yet.
-      def select_entry(theEntrys)
-        a_entry = theEntrys.find { |st| !processed_entries.include?(st) }
-        self.parse_entry = a_entry
+      def select_entry(entries)
+        a_entry = entries.find { |st| !processed_entries.include?(st) }
+        self.parse_entry = a_entry # steep:ignore
       end
 
       # The dotted item for the current parse entry.
+      # @return [Rley::Base::DottedItem, nil]
       def curr_dotted_item
-        parse_entry.dotted_rule
+        parse_entry&.vertex.dotted_item # steep:ignore
       end
 
+      # @return [Syntax::GrmSymbol, nil] Return the symbol before the dot
       def symbol_on_left
-        curr_dotted_item.prev_symbol
+        curr_dotted_item&.prev_symbol
       end
 
       # Notification that one begins with the previous entry set

data/lib/rley/parser/parse_walker_factory.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'set'
 require_relative '../gfg/call_edge'
 require_relative '../gfg/scan_edge'
 require_relative '../gfg/epsilon_edge'
@@ -119,8 +118,9 @@ module Rley # This module is used as a namespace
       # rubocop: disable Lint/DuplicateBranch
       def visit_entry(anEntry, aContext)
         index = aContext.entry_set_index
-        aContext.nterm2start[[anEntry, index]] if anEntry.start_entry?
+        aContext.nterm2start[[anEntry, index]] if anEntry.start_entry? # steep:ignore
 
+        # @type var event : [Symbol, ParseEntry, Integer]
         if aContext.visitees.include?(anEntry) # Already visited?...
           case anEntry.vertex
             when GFG::EndVertex
@@ -156,8 +156,8 @@ module Rley # This module is used as a namespace
       end
       # rubocop: enable Lint/DuplicateBranch
 
-      def detect_scan_edge(_ctx)
-        nil unless aContext.curr_entry.dotted_entry?
+      def detect_scan_edge(ctx)
+        nil unless ctx.curr_entry.dotted_entry?
       end
 
       # Given the current entry from context object
@@ -179,22 +179,22 @@ module Rley # This module is used as a namespace
         new_entry = aContext.curr_entry.antecedents.first
         events = [new_entry]
         traversed_edge = new_entry.vertex.edges.first
-        if new_entry.vertex.kind_of?(GFG::EndVertex)
+        if new_entry.vertex.is_a?(GFG::EndVertex)
           # Return edge encountered
           # Push current entry onto stack
           # puts "Push on return stack #{aContext.curr_entry}"
           aContext.return_stack << aContext.curr_entry
-        elsif traversed_edge.kind_of?(GFG::CallEdge)
+        elsif traversed_edge.is_a?(GFG::CallEdge)
           # Pop top of stack
           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)
+        elsif traversed_edge.is_a?(GFG::ScanEdge)
           # Scan edge encountered, decrease sigma set index
           aContext.entry_set_index -= 1
-        elsif traversed_edge.kind_of?(GFG::EpsilonEdge)
+        elsif traversed_edge.is_a?(GFG::EpsilonEdge)
           # Do nothing
         else
           raise NotImplementedError, "edge is a #{traversed_edge.class}"
@@ -270,6 +270,7 @@ module Rley # This module is used as a namespace
         raise ScriptError, 'Empty return stack' if aContext.return_stack.empty?
 
         # Retrieve top of stack
+        # @type var tos : Rley::Parser::ParseEntry
         tos = aContext.return_stack.pop
         tos_dotted_item = tos.vertex.dotted_item
 

data/lib/rley/ptree/parse_tree_node.rb

@@ -37,6 +37,12 @@ module Rley # This module is used as a namespace
       def to_s
         "#{symbol.name}#{range.to_string(0)}"
       end
+
+      # Part of the 'visitee' role in Visitor design pattern.
+      # @param aVisitor[ParseTreeVisitor] the visitor
+      def accept(aVisitor)
+        raise NotImplementedError
+      end
     end # class
   end # module
 end # module

data/lib/rley/ptree/terminal_node.rb

@@ -14,7 +14,7 @@ module Rley # This module is used as a namespace
         # (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
+        range = aPos.is_a?(1.class) ? { low: aPos, high: aPos + 1 } : aPos
         super(aToken.terminal, range)
         @token = aToken
       end

data/lib/rley/rgn/ast_builder.rb

@@ -29,7 +29,7 @@ module Rley
       protected
 
       def terminal2node
-        Terminal2NodeClass
+        Terminal2NodeClass # steep:ignore UnknownConstant
       end
 
       # Method override
@@ -166,7 +166,7 @@ module Rley
       # rule('key_value' => 'KEY value')
       def reduce_raw_pair(_production, _range, _tokens, theChildren)
         key = theChildren[0].token.lexeme
-        value = if theChildren[1].kind_of?(Rley::PTree::TerminalNode)
+        value = if theChildren[1].is_a?(Rley::PTree::TerminalNode)
                   theChildren[1].token.lexeme
                 else
                   theChildren[1]

data/lib/rley/rgn/ast_node.rb

@@ -22,7 +22,7 @@ module Rley
       def annotation_to_text
         map_arr = []
         @annotation.each_pair do |key, val|
-          literal = val.kind_of?(String) ? "'#{val}'" : val
+          literal = val.is_a?(String) ? "'#{val}'" : val
           map_arr << "#{key}: #{literal}"
         end
 
@@ -34,6 +34,16 @@ module Rley
         # Default: do nothing ...
       end
 
+      # @nodoc
+      def name
+        raise NotImplementedError
+      end
+
+      # @nodoc
+      def to_text
+        raise NotImplementedError
+      end
+
       # Abstract method (must be overriden in subclasses).
       # Part of the 'visitee' role in Visitor design pattern.
       # @param _visitor [ASTVisitor] the visitor

data/lib/rley/rgn/ast_visitor.rb

@@ -75,7 +75,7 @@ module Rley
 
       # Visit event. The visitor is about to visit the subnodes of a non
       # terminal node.
-      # @param aParentNode [Ast::LocCompoundExpr] the parent node.
+      # @param aParentNode [CompositeNode] the parent node.
       def traverse_subnodes(aParentNode)
         subnodes = aParentNode.subnodes
         broadcast(:before_subnodes, aParentNode, subnodes)
@@ -88,7 +88,7 @@ module Rley
 
       # Visit event. The visitor is about to visit one given subnode of a non
       # terminal node.
-      # @param aParentNode [Ast::LocCompoundExpr] the parent node.
+      # @param aParentNode [CompositeNode] the parent node.
       # @param index [integer] index of child subnode
       def traverse_given_subnode(aParentNode, index)
         subnode = aParentNode.subnodes[index]

data/lib/rley/rgn/composite_node.rb

@@ -10,7 +10,7 @@ module Rley
       # @return [Array<ASTNode>]
       attr_reader :subnodes
 
-      # @return [Hash]
+      # @return [Array<Syntax::MatchClosest>]
       attr_accessor :constraints
 
       # @param children [Array<ASTNode>] sequence of children nodes

data/lib/rley/rgn/grammar_builder.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'set'
-
 require_relative 'parser'
 require_relative 'ast_visitor'
 require_relative '../syntax/match_closest'
@@ -9,7 +7,7 @@ require_relative '../syntax/match_closest'
 module Rley # This module is used as a namespace
   # Namespace for classes that define RGN (Rley Grammar Notation)
   module RGN # This module is used as a namespace
-    # Structure used by Rley to generate implicdit production rules.
+    # Structure used by Rley to generate implicit production rules.
     RawRule = Struct.new(:lhs, :rhs, :tag, :simple, :constraints)
 
     # Builder GoF pattern. Builder builds a complex object
@@ -67,10 +65,10 @@ module Rley # This module is used as a namespace
       # Add the given marker symbol to the grammar of the language
       # @param aMarkerSymbol [String] A marker symbol
       # @return [void]
-      def add_marker(aMarkerSymbol)
-        new_symb = build_symbol(Syntax::Marker, aMarkerSymbol)
-        symbols[new_symb.name] = new_symb
-      end
+      # def add_marker(aMarkerSymbol)
+      #   new_symb = build_symbol(Syntax::Marker, aMarkerSymbol)
+      #   symbols[new_symb.name] = new_symb
+      # end
 
       # Add a production rule in the grammar given one
       # key-value pair of the form: String => String.
@@ -87,7 +85,7 @@ module Rley # This module is used as a namespace
       def add_production(aProductionRepr)
         aProductionRepr.each_pair do |(lhs_name, rhs_repr)|
           lhs = get_grm_symbol(lhs_name)
-          rhs = rhs_repr.kind_of?(Array) && rhs_repr.empty? ? '' : rhs_repr.strip
+          rhs = rhs_repr.is_a?(Array) && rhs_repr.empty? ? '' : rhs_repr.strip
           constraints = []
           if rhs.empty?
             rhs_members = []
@@ -98,7 +96,7 @@ module Rley # This module is used as a namespace
             visitor.subscribe(self)
             visitor.start
             root_node = ast.root
-            constraints = root_node.constraints unless root_node.kind_of?(SymbolNode)
+            constraints = root_node.constraints unless root_node.is_a?(SymbolNode)
 
             rhs_members = visitor2rhs.delete(visitor)
           end
@@ -122,12 +120,12 @@ module Rley # This module is used as a namespace
 
           # Check that each terminal appears at least in a rhs of a production
           all_terminals = symbols.values.select do |a_symb|
-            a_symb.kind_of?(Syntax::Terminal)
+            a_symb.is_a?(Syntax::Terminal)
           end
           in_use = Set.new
           productions.each do |prod|
             prod.rhs.members.each do |symb|
-              in_use << symb if symb.kind_of?(Syntax::Terminal)
+              in_use << symb if symb.is_a?(Syntax::Terminal)
             end
           end
 
@@ -295,7 +293,7 @@ module Rley # This module is used as a namespace
         aProductionRepr.each_pair do |(lhs_name, rhs_repr)|
           lhs = get_grm_symbol(lhs_name)
 
-          if rhs_repr.kind_of?(String)
+          if rhs_repr.is_a?(String)
             rhs = rhs_repr.strip.scan(/\S+/)
           else
             rhs = rhs_repr
@@ -340,7 +338,7 @@ module Rley # This module is used as a namespace
       # @param aSymbolArg [GrmSymbol-like or String]
       # @return [Array] list of grammar symbols
       def build_symbol(aClass, aSymbolArg)
-        if aSymbolArg.kind_of?(Syntax::GrmSymbol)
+        if aSymbolArg.is_a?(Syntax::GrmSymbol)
           aSymbolArg
         else
           aClass.new(aSymbolArg)
@@ -387,7 +385,7 @@ module Rley # This module is used as a namespace
       end
 
       def node_base_name(aNode)
-        if aNode.kind_of?(SymbolNode)
+        if aNode.is_a?(SymbolNode)
           aNode.name
         else
           sequence_name(aNode)

data/lib/rley/rgn/parser.rb

@@ -37,7 +37,7 @@ module Rley
 
       # Parse the given RGN snippet into a parse tree.
       # @param source [String] Snippet to parse
-      # @return [Rley::ParseTree] A parse tree equivalent to the RGN input.
+      # @return [Rley::PTree::ParseTree] A parse tree equivalent to the RGN input.
       def parse(source)
         lexer = Tokenizer.new(source)
         result = engine.parse(lexer.tokens)
@@ -49,7 +49,7 @@ module Rley
           raise SyntaxError, line1 + line2
         end
 
-        return engine.convert(result) # engine.to_ptree(result)
+        engine.convert(result) # engine.to_ptree(result)
       end
     end # class
   end # module

data/lib/rley/rgn/tokenizer.rb

@@ -41,7 +41,7 @@ module Rley
         '?' => 'QUESTION_MARK',
         '*' => 'STAR',
         '..' => 'ELLIPSIS'
-      }
+      }.freeze
 
       # Here are all the implemented Rley notation keywords
       @@keywords = %w[

data/lib/rley/rley_error.rb

@@ -1,12 +1,8 @@
 # frozen_string_literal: true
 
-# File: rley_error.rb
-
 module Rley # Module used as a namespace
   # @abstract
   # Base class for any exception explicitly raised by Rley code.
   class RleyError < StandardError
   end # class
 end # module
-
-# End of file

data/lib/rley/sppf/composite_node.rb

@@ -34,6 +34,12 @@ module Rley # This module is used as a namespace
       def key
         @key ||= to_string(0)
       end
+
+      # Part of the 'visitee' role in Visitor design pattern.
+      # @param aVisitor[ParseTreeVisitor] the visitor
+      def accept(aVisitor)
+        raise NotImplementedError
+      end
     end # class
   end # module
 end # module

data/lib/rley/sppf/parse_forest.rb

@@ -51,13 +51,13 @@ module Rley # This module is used as a namespace
       # parse trees. That enumerator will generate a parse tree when
       # called with `next` method.
       # @return [Enumerator]
-      def to_ptree_enum
-        # How to implement?
-        # One visits the forest => beware of dependency
-        # At each visited item create a corresponding  tree node.
-        # At end of visit & stack not empty
-        # Re-generate another ptree
-      end
+      # def to_ptree_enum
+      #   # How to implement?
+      #   # One visits the forest => beware of dependency
+      #   # At each visited item create a corresponding  tree node.
+      #   # At end of visit & stack not empty
+      #   # Re-generate another ptree
+      # end
 
       # Part of the 'visitee' role in the Visitor design pattern.
       #   A visitee is expected to accept the visit from a visitor object

data/lib/rley/sppf/sppf_node.rb

@@ -20,9 +20,23 @@ module Rley # This module is used as a namespace
       # Return the origin, that is, the index of the
       # first token matched by this node.
       # @return [Integer]
-      def origin
+      def origin # steep:ignore MethodBodyTypeMismatch
         range.low
       end
+
+      # Emit a (formatted) string representation of the node.
+      # Mainly used for diagnosis/debugging purposes.
+      # @param indentation [Integer]
+      # @return [String]
+      def to_string(indentation)
+        raise NotImplementedError
+      end
+
+      # Part of the 'visitee' role in Visitor design pattern.
+      # @param aVisitor[ParseForestVisitor] the visitor
+      def accept(aVisitor)
+        raise NotImplementedError
+      end
     end # class
   end # module
 end # module

data/lib/rley/syntax/base_grammar_builder.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'set'
 require_relative 'terminal'
 require_relative 'non_terminal'
 require_relative 'production'
@@ -54,14 +53,6 @@ module Rley # This module is used as a namespace
         symbols.merge!(new_symbs)
       end
 
-      # Add the given marker symbol to the grammar of the language
-      # @param aMarkerSymbol [Syntax::Marker] A mazker symbol
-      # @return [void]
-      def add_marker(aMarkerSymbol)
-        new_symb = build_symbol(Marker, aMarkerSymbol)
-        symbols[aMarkerSymbol.name] = new_symb
-      end
-
       # Add a production rule in the grammar given one
       # key-value pair of the form: String => Array.
       #   Where the key is the name of the non-terminal appearing in the
@@ -107,12 +98,12 @@ module Rley # This module is used as a namespace
 
           # Check that each terminal appears at least in a rhs of a production
           all_terminals = symbols.values.select do |a_symb|
-            a_symb.kind_of?(Terminal)
+            a_symb.is_a?(Terminal)
           end
           in_use = Set.new
           productions.each do |prod|
             prod.rhs.members.each do |symb|
-              in_use << symb if symb.kind_of?(Syntax::Terminal)
+              in_use << symb if symb.is_a?(Syntax::Terminal)
             end
           end
 
@@ -169,7 +160,7 @@ module Rley # This module is used as a namespace
       # @param aSymbolArg [GrmSymbol-like or String]
       # @return [Array] list of grammar symbols
       def build_symbol(aClass, aSymbolArg)
-        if aSymbolArg.kind_of?(GrmSymbol)
+        if aSymbolArg.is_a?(GrmSymbol)
           aSymbolArg
         else
           aClass.new(aSymbolArg)