srl_ruby 0.3.5 → 0.4.0

data/lib/regex/abstract_method.rb

@@ -13,7 +13,7 @@ module AbstractMethod
   #
   # def some_method() abstract_method
   # end
-  def abstract_method()
+  def abstract_method
     # Determine the short class name of self
     className = self.class.name.split(/::/).last
 

data/lib/regex/alternation.rb

@@ -15,7 +15,7 @@ module Regex # This module is used as a namespace
 
     # Conversion method re-definition.
     # Purpose: Return the String representation of the concatented expressions.
-    def text_repr()
+    def text_repr
       result_children = children.map(&:to_str)
       result = '(?:' + result_children.join('|') + ')'
 

data/lib/regex/anchor.rb

@@ -29,15 +29,15 @@ module Regex # This module is used as a namespace
 
     # Conversion method re-definition.
     # Purpose: Return the String representation of the expression.
-    def to_str()
-      return AnchorToSymbol.rassoc(kind).first
+    def to_str
+      AnchorToSymbol.rassoc(kind).first
     end
 
     private
 
     # Return the symbolic value corresponding to the given lexeme.
     def valid_kind(aKind)
-      return AnchorToSymbol[aKind]
+      AnchorToSymbol[aKind]
     end
   end # class
 end # module

data/lib/regex/atomic_expression.rb

@@ -13,12 +13,12 @@ module Regex # This module is used as a namespace
     end
 
     # Notification that the parse tree construction is complete.
-    def done!()
+    def done!
       # Do nothing
     end
 
     # Notification that all quantifiers are lazy
-    def lazy!()
+    def lazy!
       # Do nothing
     end
   end # class

data/lib/regex/capturing_group.rb

@@ -29,13 +29,13 @@ module Regex # This module is used as a namespace
     end
 
     # Return true iff the capturing group has a name
-    def named?()
-      return id.kind_of?(String)
+    def named?
+      id.kind_of?(String)
     end
 
     # Conversion method re-definition.
     # Purpose: Return the String representation of the captured expression.
-    def to_str()
+    def to_str
       prefix = named? ? "?<#{id}>" : ''
       atomic = no_backtrack ? '?>' : ''
       if child.is_a?(Regex::NonCapturingGroup)

data/lib/regex/char_class.rb

@@ -21,12 +21,12 @@ module Regex # This module is used as a namespace
 
     # Conversion method re-definition.
     # Purpose: Return the String representation of the character class.
-    def text_repr()
-      result_children = children.inject('') do |subResult, aChild|
-        if aChild.kind_of?(Regex::Character) && Metachars.include?(aChild.codepoint)
-          subResult << '\\' # Escape meta-character...
+    def text_repr
+      result_children = children.inject('') do |sub_result, child|
+        if child.kind_of?(Regex::Character) && Metachars.include?(child.codepoint)
+          sub_result << '\\' # Escape meta-character...
         end
-        subResult << aChild.to_str
+        sub_result << child.to_str
       end
       result = '[' + (negated ? '^' : '') + result_children + ']'
 

data/lib/regex/char_range.rb

@@ -18,20 +18,20 @@ module Regex # This module is used as a namespace
     end
 
     # Return the lower bound of the range.
-    def lower()
-      return children.first
+    def lower
+      children.first
     end
 
     # Return the upper bound of the range.
-    def upper()
-      return children.last
+    def upper
+      children.last
     end
 
     protected
 
     # Conversion method re-definition.
     # Purpose: Return the String representation of the concatented expressions.
-    def text_repr()
+    def text_repr
       result = lower.to_str + '-' + upper.to_str
 
       return result

data/lib/regex/char_shorthand.rb

@@ -31,8 +31,8 @@ module Regex # This module is used as a namespace
 
     # Conversion method re-definition.
     # Purpose: Return the String representation of the expression.
-    def text_repr()
-      return "\\#{shortname}"
+    def text_repr
+      "\\#{shortname}"
     end
 
     private

data/lib/regex/character.rb

@@ -80,14 +80,14 @@ module Regex # This module is used as a namespace
     # RegAn::Character::codepoint2char(0x3a3) # Returns: Σ (
     # The Unicode GREEK CAPITAL LETTER SIGMA)
     def self.codepoint2char(aCodepoint)
-      return [aCodepoint].pack('U') # Remark: chr() fails with codepoints > 256
+      [aCodepoint].pack('U') # Remark: chr() fails with codepoints > 256
     end
 
     # Convertion method that returns the codepoint for the given single character.
     # Example:
     # RegAn::Character::char2codepoint('Σ') # Returns: 0x3a3
     def self.char2codepoint(aChar)
-      return aChar.ord
+      aChar.ord
     end
 
     # Convertion method that returns the codepoint for the given escape
@@ -109,7 +109,7 @@ module Regex # This module is used as a namespace
     end
 
     # Return the character as a String object
-    def char()
+    def char
       self.class.codepoint2char(@codepoint)
     end
 
@@ -142,8 +142,8 @@ module Regex # This module is used as a namespace
     end
 
     # Return a plain English description of the character
-    def explain()
-      return "the character '#{to_str}'"
+    def explain
+      "the character '#{to_str}'"
     end
 
     protected
@@ -153,7 +153,7 @@ module Regex # This module is used as a namespace
     # If the Character was initially from a text (the lexeme), then the lexeme
     # is returned back.
     # Otherwise the character corresponding to the codepoint is returned.
-    def text_repr()
+    def text_repr
       return char if lexeme.nil?
       return lexeme.dup
     end

data/lib/regex/compound_expression.rb

@@ -8,7 +8,7 @@ module Regex # This module is used as a namespace
   class CompoundExpression < Expression
     # Redefined method. Return false since it may have one or more children.
     def atomic?
-      return false
+      false
     end
 
 =begin
@@ -48,7 +48,7 @@ module Regex # This module is used as a namespace
     protected
 
     # Abstract method. Return the text representation of the child (if any)
-    def all_child_text()
+    def all_child_text
       abstract_method
     end
   end # class

data/lib/regex/concatenation.rb

@@ -16,9 +16,9 @@ module Regex # This module is used as a namespace
 
     # Conversion method re-definition.
     # Purpose: Return the String representation of the concatented expressions.
-    def text_repr()
-      outcome = children.inject('') do |result, aChild|
-        result << aChild.to_str
+    def text_repr
+      outcome = children.inject('') do |result, child|
+        result << child.to_str
       end
 
       return outcome

data/lib/regex/expression.rb

@@ -14,7 +14,7 @@ module Regex # This module is used as a namespace
     # Abstract method. Return true iff the expression is atomic
     # (= doesn't not have any child).
     # @return [Boolean]
-    def atomic?()
+    def atomic?
       abstract_method
     end
 
@@ -30,7 +30,7 @@ module Regex # This module is used as a namespace
 
     # Template method.
     # @return [String] text representation of the expression.
-    def to_str()
+    def to_str
       result = ''
       result << prefix
       result << text_repr
@@ -41,11 +41,11 @@ module Regex # This module is used as a namespace
 
     protected
 
-    def prefix()
+    def prefix
       begin_anchor ? begin_anchor.to_str : ''
     end
 
-    def suffix()
+    def suffix
       end_anchor ? end_anchor.to_str : ''
     end
   end # class

data/lib/regex/lookaround.rb

@@ -37,7 +37,7 @@ module Regex # This module is used as a namespace
 
     # Conversion method re-definition.
     # Purpose: Return the String representation of the captured expression.
-    def to_str()
+    def to_str
       dir_syntax = (dir == :ahead) ? '' : '<'
       kind_syntax = (kind == :positive) ? '=' : '!'
       result = '(?' + dir_syntax + kind_syntax + child.to_str + ')'

data/lib/regex/match_option.rb

@@ -20,7 +20,7 @@ module Regex # This module is used as a namespace
     # Combine all options/flags into one integer value that
     # is compliant as second argument of with Regexp#new method.
     # return [Integer]
-    def combine_opts()
+    def combine_opts
       result = 0
       flags.each { |f| result |= f }
 
@@ -45,7 +45,7 @@ module Regex # This module is used as a namespace
 
     # Conversion method re-definition.
     # Purpose: Return the String representation of the concatented expressions.
-    def text_repr()
+    def text_repr
       all_child_text
     end
   end # class

data/lib/regex/monadic_expression.rb

@@ -17,19 +17,19 @@ module Regex # This module is used as a namespace
     end
 
     # Notification that the parse tree construction is complete.
-    def done!()
+    def done!
       child.done!
     end
 
     # Notification that all quantifiers are lazy
-    def lazy!()
+    def lazy!
       child.lazy!
     end
 
     protected
 
     # Return the text representation of the child (if any)
-    def all_child_text()
+    def all_child_text
       result = child.nil? ? '' : child.to_str
 
       return result

data/lib/regex/multiplicity.rb

@@ -26,7 +26,7 @@ module Regex # This module is used as a namespace
     end
 
     # @return [String] String representation of the multiplicity.
-    def to_str()
+    def to_str
       case upper_bound
         when :more
           case lower_bound

data/lib/regex/non_capturing_group.rb

@@ -19,7 +19,7 @@ module Regex # This module is used as a namespace
 
     # Conversion method re-definition.
     # Purpose: Return the String representation of the captured expression.
-    def text_repr()
+    def text_repr
       result = '(?:' + all_child_text + ')'
       return result
     end

data/lib/regex/polyadic_expression.rb

@@ -26,7 +26,7 @@ module Regex # This module is used as a namespace
     end
 
     # Notification that the parse tree construction is complete.
-    def done!()
+    def done!
       children.each(&:done!)
       children.each_with_index do |child, index|
         break if index == children.size - 1
@@ -40,13 +40,13 @@ module Regex # This module is used as a namespace
     end
 
     # Apply the 'lazy' option to the child elements
-    def lazy!()
+    def lazy!
       children.each(&:lazy!)
     end
 
     # Build a depth-first in-order children visitor.
     # The visitor is implemented as an Enumerator.
-    def df_visitor()
+    def df_visitor
       root = children # The visit will start from the children of this object
 
       visitor = Enumerator.new do |result| # result is a Yielder

data/lib/regex/repetition.rb

@@ -18,7 +18,7 @@ module Regex # This module is used as a namespace
     end
 
     # Apply the `lazy` flag.
-    def lazy!()
+    def lazy!
       multiplicity.policy = :lazy
       super
     end
@@ -27,7 +27,7 @@ module Regex # This module is used as a namespace
 
     # Conversion method re-definition.
     # @return [String] String representation of the concatented expressions.
-    def text_repr()
+    def text_repr
       result = all_child_text + multiplicity.to_str
       return result
     end

data/lib/regex/wildcard.rb

@@ -6,7 +6,7 @@ module Regex # This module is used as a namespace
   # A wildcard matches any character (except for the newline).
   class Wildcard < AtomicExpression
     # Constructor
-    def initialize()
+    def initialize
       super
     end
 
@@ -14,8 +14,8 @@ module Regex # This module is used as a namespace
 
     # Conversion method re-definition.
     # Purpose: Return the String representation of the expression.
-    def text_repr()
-      return '.'
+    def text_repr
+      '.'
     end
   end # class
 end # module

data/lib/srl_ruby/ast_builder.rb

@@ -22,18 +22,18 @@ module SrlRuby
     end
 
     # Notification that the parse tree construction is complete.
-    def done!()
+    def done!
       apply_options
       super
     end
 
     protected
 
-    def terminal2node()
+    def terminal2node
       Terminal2NodeClass
     end
 
-    def apply_options()
+    def apply_options
       tree_root = result.root
       regexp_opts = []
       options.each do |opt|
@@ -100,16 +100,16 @@ module SrlRuby
       Regex::CharShorthand.new(shortName)
     end
 
-    def wildcard()
+    def wildcard
       Regex::Wildcard.new
     end
 
     def repetition(expressionToRepeat, aMultiplicity)
-      return Regex::Repetition.new(expressionToRepeat, aMultiplicity)
+      Regex::Repetition.new(expressionToRepeat, aMultiplicity)
     end
 
     def begin_anchor
-      return Regex::Anchor.new('^')
+      Regex::Anchor.new('^')
     end
 
     # rule('expression' => %w[pattern flags]).as 'flagged_expr'
@@ -120,7 +120,7 @@ module SrlRuby
 
     # rule('pattern' => %w[pattern separator sub_pattern]).as 'pattern_sequence'
     def reduce_pattern_sequence(_production, _range, _tokens, theChildren)
-      return Regex::Concatenation.new(theChildren[0], theChildren[2])
+      Regex::Concatenation.new(theChildren[0], theChildren[2])
     end
 
     # rule('pattern' => 'sub_pattern').as 'basic_pattern'
@@ -145,27 +145,27 @@ module SrlRuby
 
     # rule('single_flag' => %w[CASE INSENSITIVE]).as 'case_insensitive'
     def reduce_case_insensitive(_production, _range, _tokens, _children)
-      return Regexp::IGNORECASE
+      Regexp::IGNORECASE
     end
 
     # rule('single_flag' => %w[MULTI LINE]).as 'multi_line'
     def reduce_multi_line(_production, _range, _tokens, _children)
-      return Regexp::MULTILINE
+      Regexp::MULTILINE
     end
 
     # rule('single_flag' => %w[ALL LAZY]).as 'all_lazy'
     def reduce_all_lazy(_production, _range, _tokens, _children)
-      return :ALL_LAZY
+      :ALL_LAZY
     end
 
     # rule 'quantifiable' => %w[begin_anchor anchorable end_anchor]
     def reduce_pinned_quantifiable(_production, _range, _tokens, theChildren)
-      return Regex::Concatenation.new(*theChildren)
+      Regex::Concatenation.new(*theChildren)
     end
 
     # rule 'quantifiable' => %w[begin_anchor anchorable]
     def reduce_begin_anchor_quantifiable(_production, _range, _tokens, theChildren)
-      return Regex::Concatenation.new(*theChildren)
+      Regex::Concatenation.new(*theChildren)
     end
 
     # rule 'quantifiable' => %w[anchorable end_anchor]
@@ -185,27 +185,27 @@ module SrlRuby
 
     # rule('end_anchor' => %w[separator MUST END]).as 'end_anchor'
     def reduce_end_anchor(_production, _range, _tokens, _children)
-      return Regex::Anchor.new('$')
+      Regex::Anchor.new('$')
     end
 
     # rule('assertion' => %w[IF FOLLOWED BY assertable]).as 'if_followed'
     def reduce_if_followed(_production, _range, _tokens, theChildren)
-      return Regex::Lookaround.new(theChildren.last, :ahead, :positive)
+      Regex::Lookaround.new(theChildren.last, :ahead, :positive)
     end
 
     # rule('assertion' => %w[IF NOT FOLLOWED BY assertable]).as 'if_not_followed'
     def reduce_if_not_followed(_production, _range, _tokens, theChildren)
-      return Regex::Lookaround.new(theChildren.last, :ahead, :negative)
+      Regex::Lookaround.new(theChildren.last, :ahead, :negative)
     end
 
     # rule('assertion' => %w[IF ALREADY HAD assertable]).as 'if_had'
     def reduce_if_had(_production, _range, _tokens, theChildren)
-      return Regex::Lookaround.new(theChildren.last, :behind, :positive)
+      Regex::Lookaround.new(theChildren.last, :behind, :positive)
     end
 
     # rule('assertion' => %w[IF NOT ALREADY HAD assertable]).as 'if_not_had'
     def reduce_if_not_had(_production, _range, _tokens, theChildren)
-      return Regex::Lookaround.new(theChildren.last, :behind, :negative)
+      Regex::Lookaround.new(theChildren.last, :behind, :negative)
     end
 
     # rule('assertable' => %w[term quantifier]).as 'quantified_assertable'
@@ -384,17 +384,17 @@ module SrlRuby
 
     # rule('alternatives' => 'quantifiable').as 'simple_alternative'
     def reduce_simple_alternative(_production, _range, _tokens, theChildren)
-      return [theChildren.last]
+      [theChildren.last]
     end
 
     # rule('grouping' => %w[LPAREN pattern RPAREN]).as 'grouping_parenthenses'
     def reduce_grouping_parenthenses(_production, _range, _tokens, theChildren)
-      return Regex::NonCapturingGroup.new(theChildren[1])
+      Regex::NonCapturingGroup.new(theChildren[1])
     end
 
     # rule('capturing_group' => %w[CAPTURE assertable]).as 'capture'
     def reduce_capture(_production, _range, _tokens, theChildren)
-      return Regex::CapturingGroup.new(theChildren[1])
+      Regex::CapturingGroup.new(theChildren[1])
     end
 
     # If the rightmost (sub)expression is a repetition, then make it lazy
@@ -491,12 +491,12 @@ module SrlRuby
 
     # rule('times_suffix' => 'TIMES').as 'times_keyword'
     def reduce_times_keyword(_production, _range, _tokens, _children)
-      return nil
+      nil
     end
 
     # rule('times_suffix' => []).as 'times_dropped'
     def reduce_times_dropped(_production, _range, _tokens, _children)
-      return nil
+      nil
     end
   end # class
 end # module

data/lib/srl_ruby/srl_token.rb

@@ -3,7 +3,7 @@ require 'rley' # Load the Rley gem
 
 module SrlRuby
   Position = Struct.new(:line, :column) do
-    def to_s()
+    def to_s
       "line #{line}, column #{column}"
     end
   end

data/lib/srl_ruby/tokenizer.rb

@@ -96,7 +96,7 @@ module SrlRuby
       @line_start = 0
     end
 
-    def tokens()
+    def tokens
       tok_sequence = []
       until @scanner.eos?
         token = _next_token
@@ -108,7 +108,7 @@ module SrlRuby
 
     private
 
-    def _next_token()
+    def _next_token
       skip_whitespaces
       curr_ch = scanner.peek(1)
       return nil if curr_ch.nil? || curr_ch.empty?
@@ -118,9 +118,9 @@ module SrlRuby
       if '(),'.include? curr_ch
         # Delimiters, separators => single character token
         token = build_token(@@lexeme2name[curr_ch], scanner.getch)
-      elsif (lexeme = scanner.scan(/[0-9]{2,}((?=\s|,)|$)/))
+      elsif (lexeme = scanner.scan(/[0-9]{2,}((?=\s|,|\))|$)/))
         token = build_token('INTEGER', lexeme) # An integer has 2..* digits
-      elsif (lexeme = scanner.scan(/[0-9]((?=\s|,)|$)/))
+      elsif (lexeme = scanner.scan(/[0-9]((?=\s|,|\))|$)/))
       token = build_token('DIGIT_LIT', lexeme)
       elsif (lexeme = scanner.scan(/"(?:\\"|[^"])*"/)) # Double quotes literal?
         unquoted = lexeme.gsub(/(^")|("$)/, '')
@@ -128,7 +128,7 @@ module SrlRuby
       elsif (lexeme = scanner.scan(/'(?:\\'|[^'])*'/)) # Single quotes literal?
         unquoted = lexeme.gsub(/(^')|('$)/, '')
         token = build_token('STRING_LIT', unquoted)
-      elsif (lexeme = scanner.scan(/[a-zA-Z]((?=\s|,)|$)/))
+      elsif (lexeme = scanner.scan(/[a-zA-Z]((?=\s|,|\))|$)/))
         token = build_token('LETTER_LIT', lexeme)
       elsif (lexeme = scanner.scan(/[a-zA-Z_][a-zA-Z0-9_]+/))
         keyw = @@keywords[lexeme.upcase]
@@ -159,7 +159,7 @@ module SrlRuby
       return token
     end
 
-    def skip_whitespaces()
+    def skip_whitespaces
       pre_pos = scanner.pos
 
       loop do
@@ -186,7 +186,7 @@ module SrlRuby
       # @column += triplet[2].size + tab_count * (tab_size - 1) - 1
     end
 
-    def tab_size()
+    def tab_size
       2
     end
   end # class

data/lib/srl_ruby/version.rb

@@ -1,3 +1,3 @@
 module SrlRuby
-  VERSION = '0.3.5'.freeze
+  VERSION = '0.4.0'.freeze
 end

data/spec/acceptance/srl_test_suite_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe SrlRuby do
   end
 
   def load_file(aFilename)
-    return Acceptance::RuleFileParser.load_file(rule_path + aFilename)
+    Acceptance::RuleFileParser.load_file(rule_path + aFilename)
   end
 
   def test_rule_file(aRuleFileRepr)

data/spec/acceptance/support/rule_file_ast_builder.rb

@@ -20,13 +20,13 @@ module Acceptance
 
     attr_reader :options
 
-    def done!()
+    def done!
       # Do nothing!
     end
 
     protected
 
-    def terminal2node()
+    def terminal2node
       Terminal2NodeClass
     end
 
@@ -49,17 +49,17 @@ module Acceptance
 
     # rule('srl_heading' => %w[SRL: SRL_SOURCE]).as 'srl_source'
     def reduce_srl_source(_production, _range, _tokens, theChildren)
-      return theChildren.last
+      theChildren.last
     end
 
     # rule('srl_tests' => %w[srl_tests single_test]).as 'test_list'
     def reduce_test_list(_production, _range, _tokens, theChildren)
-      return theChildren[0] << theChildren[1]
+      theChildren[0] << theChildren[1]
     end
 
     # rule('srl_tests' => 'single_test').as 'one_test'
     def reduce_one_test(_production, _range, _tokens, theChildren)
-      return [theChildren.last]
+      [theChildren.last]
     end
 
     # rule('match_test' => %w[MATCH: STRING_LIT]).as 'match_string'
@@ -80,18 +80,18 @@ module Acceptance
 
     # rule('capture_heading' => %w[CAPTURE FOR STRING_LIT COLON]).as 'capture_string'
     def reduce_capture_string(_production, _range, _tokens, theChildren)
-      return theChildren[2]
+      theChildren[2]
     end
 
     # rule('capture_expectations' => %w[capture_expectations
     #   single_expectation]).as 'assertion_list'
     def reduce_assertion_list(_production, _range, _tokens, theChildren)
-      return theChildren[0] << theChildren[1]
+      theChildren[0] << theChildren[1]
     end
 
     # rule('capture_expectations' => 'single_expectation').as 'one_expectation'
     def reduce_one_expectation(_production, _range, _tokens, theChildren)
-      return [theChildren.last]
+      [theChildren.last]
     end
 
     # rule('single_expectation' => %w[DASH INTEGER COLON capture_variable