rley 0.7.07 → 0.7.08

data/examples/data_formats/JSON/cli_options.rb

@@ -55,7 +55,7 @@ END_TEXT
 
       rep_help = <<-END_TEXT
 Set the parse tree representation (default: cst)
-        cst         Concrete Syntax Tree. The out-of-the-box parse tree 
+        cst         Concrete Syntax Tree. The out-of-the-box parse tree
                     representation.
         ast         Abstract Syntaxt Tree. A customized parse tree for JSON.
                     It is a more compact and practical representation.

data/examples/data_formats/JSON/json_ast_builder.rb

@@ -9,7 +9,7 @@ require_relative 'json_ast_nodes'
 # The Builder pattern creates a complex object
 # (say, a parse tree) from simpler objects (terminal and non-terminal
 # nodes) and using a step by step approach.
-class JSONASTBuilder < Rley::ParseRep::ASTBaseBuilder 
+class JSONASTBuilder < Rley::ParseRep::ASTBaseBuilder
   Terminal2NodeClass = {
     'false' => JSONBooleanNode,
     'true' => JSONBooleanNode,
@@ -19,21 +19,23 @@ class JSONASTBuilder < Rley::ParseRep::ASTBaseBuilder
   }.freeze
 
   protected
-  
-  def terminal2node()
+
+  def terminal2node
     Terminal2NodeClass
   end
-  
+
   # Default class for representing terminal nodes.
   # @return [Class]
-  def terminalnode_class()
+  def terminalnode_class
     JSONTerminalNode
   end
-  
+
+  # rubocop: disable Naming/VariableNumber
+
   def reduce_JSON_text_0(_aProd, aRange, theTokens, theChildren)
     return_first_child(aRange, theTokens, theChildren)
   end
-  
+
   # rule 'object' => %w[begin-object member-list end-object]
   def reduce_object_0(aProduction, _range, _tokens, theChildren)
     second_child = theChildren[1]
@@ -69,7 +71,7 @@ class JSONASTBuilder < Rley::ParseRep::ASTBaseBuilder
   def reduce_array_0(aProduction, _range, _tokens, theChildren)
     second_child = theChildren[1]
     second_child.symbol = aProduction.lhs
-    return second_child  
+    return second_child
   end
 
   # rule 'array' => %w[begin-array end-array]
@@ -83,12 +85,13 @@ class JSONASTBuilder < Rley::ParseRep::ASTBaseBuilder
     node.children << theChildren[2]
     return node
   end
-  
+
   #   rule 'array-items' => %w[value]
   def reduce_array_items_1(aProduction, _range, _tokens, theChildren)
     node = JSONArrayNode.new(aProduction.lhs)
     node.children << theChildren[0]
     return node
   end
+  # rubocop: enable Naming/VariableNumber
 end # class
 # End of file

data/examples/data_formats/JSON/json_ast_nodes.rb

@@ -16,11 +16,11 @@ JSONTerminalNode = Struct.new(:token, :value, :position) do
     self.value = aLiteral.dup
   end
 
-  def symbol()
+  def symbol
     token.terminal
   end
 
-  def to_ruby()
+  def to_ruby
     value
   end
 
@@ -29,9 +29,9 @@ JSONTerminalNode = Struct.new(:token, :value, :position) do
   def accept(aVisitor)
     aVisitor.visit_terminal(self)
   end
-  
+
   def done!
-    # Do nothing  
+    # Do nothing
   end
 end
 
@@ -77,23 +77,18 @@ class JSONCompositeNode
   def accept(aVisitor)
     aVisitor.visit_nonterminal(self)
   end
-  
+
   def done!
-    # Do nothing  
+    # Do nothing
   end
 
   alias subnodes children
 end # class
 
-
 class JSONArrayNode < JSONCompositeNode
-  def initialize(aSymbol)
-    super(aSymbol)
-  end
-
   # Convert this tree node in a simpler Ruby representation.
   # Basically a JSON object corresponds to a Ruhy Hash
-  def to_ruby()
+  def to_ruby
     rep = []
     children.each do |child|
       rep << child.to_ruby
@@ -114,7 +109,7 @@ class JSONPair
     @symbol = aSymbol
   end
 
-  def children()
+  def children
     return [name, value]
   end
 
@@ -125,27 +120,23 @@ class JSONPair
   def accept(aVisitor)
     aVisitor.visit_nonterminal(self)
   end
-  
+
   def done!
     # Do nothing
   end
-  
+
   def to_ruby
     rep = {}
     rep[name.to_ruby] = value.to_ruby
 
-    return rep    
+    return rep
   end
 end # class
 
 class JSONObjectNode < JSONCompositeNode
-  def initialize(aSymbol)
-    super(aSymbol)
-  end
-
   # Convert this tree node in a simpler Ruby representation.
   # Basically a JSON object corresponds to a Ruby Hash
-  def to_ruby()
+  def to_ruby
     rep = {}
     members.each do |pair|
       rep[pair.name.to_ruby] = pair.value.to_ruby

data/examples/data_formats/JSON/json_grammar.rb

@@ -18,11 +18,11 @@ builder = Rley::Syntax::GrammarBuilder.new do
   rule 'JSON_text' => 'value'
   rule 'value' => 'false'
   rule 'value' => 'null'
-  rule 'value' => 'true'   
+  rule 'value' => 'true'
   rule 'value' => 'object'
   rule 'value' => 'array'
   rule 'value' => 'number'
-  rule 'value' => 'string'  
+  rule 'value' => 'string'
   rule 'object' => %w[begin-object member-list end-object]
   rule 'object' => %w[begin-object end-object]
   # Next rule is an example of a left recursive rule

data/examples/data_formats/JSON/json_lexer.rb

@@ -28,19 +28,19 @@ class JSONLexer
     @line_start = 0
   end
 
-  def tokens()
+  def tokens
     tok_sequence = []
     until @scanner.eos?
       token = _next_token
       tok_sequence << token unless token.nil?
     end
 
-    return tok_sequence
+    tok_sequence
   end
 
   private
 
-  def _next_token()
+  def _next_token
     token = nil
     skip_whitespaces
     curr_ch = scanner.getch # curr_ch is at start of token or eof reached...
@@ -58,7 +58,7 @@ class JSONLexer
           keyw = scanner.scan(/false|true|null/)
           if keyw.nil?
             invalid_keyw = scanner.scan(/\w+/)
-            raise ScanError.new("Invalid keyword: #{invalid_keyw}")
+            raise ScanError, "Invalid keyword: #{invalid_keyw}"
           else
             token = build_token(keyw, keyw)
           end
@@ -68,7 +68,7 @@ class JSONLexer
           value = scanner.scan(/([^"\\]|\\.)*/)
           end_delimiter = scanner.getch
           err_msg = 'No closing quotes (") found'
-          raise ScanError.new(err_msg) if end_delimiter.nil?
+          raise ScanError, err_msg if end_delimiter.nil?
 
           token = build_token(value, 'string')
 
@@ -81,12 +81,12 @@ class JSONLexer
           erroneous = curr_ch.nil? ? '' : curr_ch
           sequel = scanner.scan(/.{1,20}/)
           erroneous += sequel unless sequel.nil?
-          raise ScanError.new("Unknown token #{erroneous}")
+          raise ScanError, "Unknown token #{erroneous}"
       end # case
       break unless token.nil? && (curr_ch = scanner.getch)
     end
 
-    return token
+    token
   end
 
   def build_token(lexeme, token)
@@ -94,7 +94,7 @@ class JSONLexer
     Rley::Lexical::Token.new(lexeme, token, pos)
   end
 
-  def skip_whitespaces()
+  def skip_whitespaces
     matched = scanner.scan(/[ \t\f\n\r]+/)
     return if matched.nil?
 

data/examples/data_formats/JSON/json_minifier.rb

@@ -35,7 +35,7 @@ class JSONMinifier
     lexeme = aTerm.token.lexeme
     literal = if aTerm.symbol.name == 'string'
                 # String values are delimited by double quotes
-                '"' + lexeme + '"'
+                "\"#{lexeme}\""
               else
                 lexeme
               end

data/examples/general/calc_iter1/calc_ast_builder.rb

@@ -15,8 +15,8 @@ class CalcASTBuilder < Rley::ParseRep::ASTBaseBuilder
   }.freeze
 
   protected
-  
-  def terminal2node()
+
+  def terminal2node
     Terminal2NodeClass
   end
 
@@ -26,7 +26,9 @@ class CalcASTBuilder < Rley::ParseRep::ASTBaseBuilder
     operator_node.children << theChildren[2]
     return operator_node
   end
-  
+
+  # rubocop: disable Naming/VariableNumber
+
   # rule 'expression' => 'simple_expression'
   def reduce_expression_0(_production, aRange, theTokens, theChildren)
     return_first_child(aRange, theTokens, theChildren)
@@ -35,32 +37,32 @@ class CalcASTBuilder < Rley::ParseRep::ASTBaseBuilder
   # rule 'simple_expression' => 'term'
   def reduce_simple_expression_0(_production, aRange, theTokens, theChildren)
     return_first_child(aRange, theTokens, theChildren)
-  end          
+  end
 
   # rule 'simple_expression' => %w[simple_expression add_operator term]
   def reduce_simple_expression_1(_production, _range, _tokens, theChildren)
     reduce_binary_operator(theChildren)
   end
-  
-  # rule 'term' => 'factor' 
+
+  # rule 'term' => 'factor'
   def reduce_term_0(_production, aRange, theTokens, theChildren)
     return_first_child(aRange, theTokens, theChildren)
-  end  
+  end
 
   # rule 'term' => %w[term mul_operator factor]
   def reduce_term_1(_production, _range, _tokens, theChildren)
     reduce_binary_operator(theChildren)
   end
-  
+
   # rule 'factor' => 'NUMBER'
   def reduce_factor_0(_aProd, aRange, theTokens, theChildren)
     return_first_child(aRange, theTokens, theChildren)
   end
-  
+
   # # rule 'factor' => %w[LPAREN expression RPAREN]
   def reduce_factor_1(_aProd, aRange, theTokens, theChildren)
     return_second_child(aRange, theTokens, theChildren)
-  end   
+  end
 
   # rule 'add_operator' => 'PLUS'
   def reduce_add_operator_0(_production, _range, _tokens, theChildren)
@@ -81,5 +83,6 @@ class CalcASTBuilder < Rley::ParseRep::ASTBaseBuilder
   def reduce_mul_operator_1(_production, _range, _tokens, theChildren)
     return CalcDivideNode.new(theChildren[0].symbol)
   end
+  # rubocop: enable Naming/VariableNumber
 end # class
 # End of file

data/examples/general/calc_iter1/calc_ast_nodes.rb

@@ -3,7 +3,6 @@
 # Classes that implement nodes of Abstract Syntax Trees (AST) representing
 # calculator parse results.
 
-
 CalcTerminalNode = Struct.new(:token, :value, :position) do
   def initialize(aToken, aPosition)
     self.token = aToken
@@ -16,23 +15,23 @@ CalcTerminalNode = Struct.new(:token, :value, :position) do
     self.value = aLiteral.dup
   end
 
-  def symbol()
+  def symbol
     token.terminal
   end
 
-  def interpret()
-    return value
+  def interpret
+    value
   end
-  
-  def done!()
+
+  def done!
     # Do nothing
   end
-  
+
   # Part of the 'visitee' role in Visitor design pattern.
   # @param aVisitor[ParseTreeVisitor] the visitor
   def accept(aVisitor)
     aVisitor.visit_terminal(self)
-  end  
+  end
 end
 
 class CalcNumberNode < CalcTerminalNode
@@ -53,30 +52,26 @@ class CalcCompositeNode
 
   def initialize(aSymbol)
     @symbol = aSymbol
-    @children = []    
+    @children = []
   end
-  
-  def done!()
+
+  def done!
     # Do nothing
-  end  
+  end
 
   # Part of the 'visitee' role in Visitor design pattern.
   # @param aVisitor[ParseTreeVisitor] the visitor
   def accept(aVisitor)
     aVisitor.visit_nonterminal(self)
   end
-  
+
   alias subnodes children
 end # class
 
 class CalcUnaryOpNode < CalcCompositeNode
-  def initialize(aSymbol)
-    super(aSymbol)
-  end
-
   # Convert this tree node in a simpler Ruby representation.
   # Basically a Calc object corresponds to a Ruhy Hash
-  def to_ruby()
+  def to_ruby
     rep = {}
     members.each do |pair|
       rep[pair.name.to_ruby] = pair.value.to_ruby
@@ -92,13 +87,9 @@ class CalcNegateNode < CalcUnaryOpNode
 end # class
 
 class CalcBinaryOpNode < CalcCompositeNode
-  def initialize(aSymbol)
-    super(aSymbol)
-  end
-  
   protected
-  
-  def retrieve_operands()
+
+  def retrieve_operands
     operands = []
     children.each do |child|
       oper = child.respond_to?(:interpret) ? child.interpret : child
@@ -111,42 +102,37 @@ end # class
 
 class CalcAddNode < CalcBinaryOpNode
   # TODO
-  def interpret()
+  def interpret
     operands = retrieve_operands
 
-    sum = operands[0] + operands[1]
-    return sum
+    operands[0] + operands[1]
   end
 end # class
 
-
 class CalcSubtractNode < CalcBinaryOpNode
   # TODO
-  def interpret()
+  def interpret
     operands = retrieve_operands
 
-    substraction = operands[0] - operands[1]
-    return substraction
+    operands[0] - operands[1]
   end
 end # class
 
 class CalcMultiplyNode < CalcBinaryOpNode
   # TODO
-  def interpret()
+  def interpret
     operands = retrieve_operands
-    multiplication = operands[0] * operands[1]
-    return multiplication
+    operands[0] * operands[1]
   end
 end # class
 
 class CalcDivideNode < CalcBinaryOpNode
   # TODO
-  def interpret()
+  def interpret
     operands = retrieve_operands
     numerator = operands[0].to_f
     denominator = operands[1]
-    division =  numerator / denominator
-    return division    
+    numerator / denominator
   end
 end # class
 # End of file