rley 0.5.02 → 0.5.03

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 638178eefcf2e673a801018aeee17ff0ef7ed16b
-  data.tar.gz: 894a767a871ba958b61047369e989783ae5fe88d
+  metadata.gz: bf5a9c73feeebf98f1714d89796bc073b406734e
+  data.tar.gz: 33aad5b8b337bb617bda98c55adfd94d9ebfba03
 SHA512:
-  metadata.gz: 23571e5b06645c427ee3ac06e662d93a3aca87d64d1cb7b57ea133ee14fd9f6a0ac0d4bebde44dd8d70cefcbb8e4614d3e49752c76e4545ed8e0923c2cbdb1dc
-  data.tar.gz: 47bdc2e63a242463221143098758c0cfc2ff65b64789c9b46ca6e5073d5dc9a8b07317b29a6edac79056cea7c3c41d334d9a5ad7b697780e4ba17258624a7526
+  metadata.gz: b1bb0f88617f3ce5c6b7f964c7849e70a016d7889a9568a3d2ba310d4f42f094cc76167f9ca64cb7cae7f71ca00af672f791afb4ba3460199e383dfbeece78c2
+  data.tar.gz: db471ad23ae2a0bdf4f1408ed8371635cfe808808b5daa4454fa3b1189cc107a4ac99514e50f805cdfb58e1ff3ff61cfba8840a5dbeadad9f5766118e7424075

data/.rubocop.yml

@@ -54,6 +54,10 @@ EndOfLine:
 IndentationWidth :
   Enabled: false
   
+# Disable this because it produces false negatives
+Naming/HeredocDelimiterNaming:
+  Enabled: false
+  
 # Enabled after end of support of Rubies < 2.3
 Layout/IndentHeredoc:
   Enabled: false

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 0.5.03 / 2017-10-09
+* [CHANGE] Refactoring code style to please Rubocop 0.50.0
+* [CHANGE] File `.rubocop.yml`: Disabling heredoc cop because it produces false negatives
+* [FIX] File `examples/general/calc_iter1/calc_ast_builder.rb`. Method CalcASTBuilder#new_leaf_node used old signature. Fixed
+
 ### 0.5.02 / 2017-10-08
 * [NEW] Addedsupport for ASTs (Abstract Syntax Tree)
 * [CHANGE] File `examples/data_formats/JSON/JSON_demo.rb` Added New command-line switches for details use --help option

data/examples/data_formats/JSON/json_ast_builder.rb

@@ -9,12 +9,12 @@ require_relative 'json_ast_nodes'
 # nodes) and using a step by step approach.
 class JSONASTBuilder < Rley::Parser::ParseTreeBuilder 
   Terminal2NodeClass = {
-  'false' => JSONBooleanNode,
-  'true' => JSONBooleanNode,
-  'null' => JSONNullNode,
-  'string' => JSONStringNode,
-  'number' => JSONNumberNode,
-  }
+                         'false' => JSONBooleanNode,
+                         'true' => JSONBooleanNode,
+                         'null' => JSONNullNode,
+                         'string' => JSONStringNode,
+                         'number' => JSONNumberNode
+                       }.freeze
 
   protected
   
@@ -39,12 +39,11 @@ class JSONASTBuilder < Rley::Parser::ParseTreeBuilder
   # @param terminal [Terminal] Terminal symbol associated with the token
   # @param aTokenPosition [Integer] Position of token in the input stream
   # @param aToken [Token] The input token
-  def new_leaf_node(terminal, aTokenPosition, aToken)
+  def new_leaf_node(_production, terminal, aTokenPosition, aToken)
     klass = Terminal2NodeClass.fetch(terminal.name, JSONTerminalNode)
     return klass.new(aToken, aTokenPosition)
   end
 
-
   # Method to override.
   # Factory method for creating a parent node object.
   # @param aProduction [Production] Production rule
@@ -93,60 +92,60 @@ class JSONASTBuilder < Rley::Parser::ParseTreeBuilder
   end
   
   # rule 'object' => %w[begin-object member-list end-object]
-  def reduce_object_0(aProduction, aRange, theTokens, theChildren)
+  def reduce_object_0(aProduction, _range, _tokens, theChildren)
     second_child = theChildren[1]
     second_child.symbol = aProduction.lhs
     return second_child
   end
 
   # rule 'object' => %w[begin-object end-object]
-  def reduce_object_1(aRange, theTokens, theChildren)
+  def reduce_object_1(aProduction, _range, _tokens, _children)
     return JSONObjectNode.new(aProduction.lhs)
   end
 
   # rule 'member-list' => %w[member-list value-separator member]
-  def reduce_member_list_0(aRange, theTokens, theChildren)
+  def reduce_member_list_0(_range, _tokens, theChildren)
     node = theChildren[0]
     node.members << theChildren.last
     return node
   end
 
   # rule 'member-list' => 'member'
-  def reduce_member_list_1(aProduction, aRange, theTokens, theChildren)
+  def reduce_member_list_1(aProduction, _range, _tokens, theChildren)
     node = JSONObjectNode.new(aProduction.lhs)
     node.members << theChildren[0]
     return node
   end
 
   # rule 'member' => %w[string name-separator value]
-  def reduce_member_0(aProduction, aRange, theTokens, theChildren)
+  def reduce_member_0(aProduction, _range, _tokens, theChildren)
     return JSONPair.new(theChildren[0], theChildren[2], aProduction.lhs)
   end
 
   # rule 'object' => %w[begin-object member-list end-object]
-  def reduce_array_0(aProduction, aRange, theTokens, theChildren)
+  def reduce_array_0(aProduction, _range, _tokens, theChildren)
     second_child = theChildren[1]
     second_child.symbol = aProduction.lhs
     return second_child  
   end
 
-
   # rule 'array' => %w[begin-array end-array]
-  def reduce_array_1(aRange, theTokens, theChildren)
+  def reduce_array_1(_range, _tokens, _children)
     return JSONArrayNode.new
   end
 
   # rule 'array-items' => %w[array-items value-separator value]
-  def reduce_array_items_0(aRange, theTokens, theChildren)
+  def reduce_array_items_0(_range, _tokens, theChildren)
     node = theChildren[0]
     node.children << theChildren[2]
     return node
   end
   
   #   rule 'array-items' => %w[value]
-  def reduce_array_items_1(aProduction, aRange, theTokens, theChildren)
+  def reduce_array_items_1(aProduction, _range, _tokens, theChildren)
     node = JSONArrayNode.new(aProduction.lhs)
     node.children << theChildren[0]
     return node
   end
-end # class
+end # class
+# End of file

data/examples/data_formats/JSON/json_ast_nodes.rb

@@ -15,18 +15,18 @@ JSONTerminalNode = Struct.new(:token, :value, :position) do
   end
 
   def symbol()
-    self.token.terminal
+    token.terminal
   end
 
   def to_ruby()
-    return value
+    value
   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
 
 
@@ -45,7 +45,7 @@ end
 class JSONStringNode < JSONTerminalNode
 end
 
-class JSONNumberNode  < JSONTerminalNode
+class JSONNumberNode < JSONTerminalNode
   def init_value(aLiteral)
     case aLiteral
       when /^[+-]?\d+$/
@@ -63,7 +63,7 @@ class JSONCompositeNode
 
   def initialize(aSymbol)
     @symbol = aSymbol
-    @children = []    
+    @children = []
   end
 
   # Part of the 'visitee' role in Visitor design pattern.
@@ -71,9 +71,8 @@ class JSONCompositeNode
   def accept(aVisitor)
     aVisitor.visit_nonterminal(self)
   end
-  
-  alias subnodes children
 
+  alias subnodes children
 end # class
 
 
@@ -108,7 +107,7 @@ class JSONPair
   def children()
     return [name, value]
   end
-  
+
   alias subnodes children
 
   # Part of the 'visitee' role in Visitor design pattern.
@@ -116,7 +115,6 @@ class JSONPair
   def accept(aVisitor)
     aVisitor.visit_nonterminal(self)
   end
-
 end # class
 
 class JSONObjectNode < JSONCompositeNode
@@ -137,5 +135,4 @@ class JSONObjectNode < JSONCompositeNode
 
   alias members children
 end # class
-
-
+# End of file

data/examples/data_formats/JSON/json_demo.rb

@@ -43,7 +43,7 @@ case cli_options[:format]
     raise StandardError, msg if tree_rep == :cst
 end
 
-tree_builder = (tree_rep == :ast)? JSONASTBuilder : nil
+tree_builder = tree_rep == :ast ? JSONASTBuilder : nil
 
 # Generate a parse tree from the parse result
 ptree = result.parse_tree(tree_builder)

data/examples/general/calc_iter1/calc_ast_builder.rb

@@ -10,7 +10,7 @@ require_relative 'calc_ast_nodes'
 class CalcASTBuilder < Rley::Parser::ParseTreeBuilder
   Terminal2NodeClass = {
     'NUMBER' => CalcNumberNode
-  }
+  }.freeze
 
   protected
 
@@ -39,18 +39,17 @@ class CalcASTBuilder < Rley::Parser::ParseTreeBuilder
   # @param aTerminal [Terminal] Terminal symbol associated with the token
   # @param aTokenPosition [Integer] Position of token in the input stream
   # @param aToken [Token] The input token
-  def new_leaf_node(aProduction, aTerminal, aTokenPosition, aToken)
+  def new_leaf_node(_production, aTerminal, aTokenPosition, aToken)
     klass = Terminal2NodeClass.fetch(aTerminal.name, CalcTerminalNode)
-    if klass
-      node = klass.new(aToken, aTokenPosition)
-    else
-      node = PTree::TerminalNode.new(aToken, aTokenPosition)
-    end
-    
+    node = if klass
+             klass.new(aToken, aTokenPosition)
+           else
+             PTree::TerminalNode.new(aToken, aTokenPosition)
+           end
+
     return node
   end
 
-
   # Method to override.
   # Factory method for creating a parent node object.
   # @param aProduction [Production] Production rule
@@ -83,15 +82,15 @@ class CalcASTBuilder < Rley::Parser::ParseTreeBuilder
 
       when 'add_operator[0]' # rule 'add_operator' => 'PLUS'
         reduce_add_operator_0(aProduction, aRange, theTokens, theChildren)
-        
+
       when 'add_operator[1]' # rule 'add_operator' => 'MINUS'
-        reduce_add_operator_1(aProduction, aRange, theTokens, theChildren)        
+        reduce_add_operator_1(aProduction, aRange, theTokens, theChildren)
 
       when 'mul_operator[0]' # rule 'mul_operator' => 'STAR'
          reduce_mul_operator_0(aProduction, aRange, theTokens, theChildren)
-         
+
       when 'mul_operator[1]' # rule 'mul_operator' =>  'DIVIDE'
-         reduce_mul_operator_1(aProduction, aRange, theTokens, theChildren)         
+         reduce_mul_operator_1(aProduction, aRange, theTokens, theChildren)
 
       else
         raise StandardError, "Don't know production #{aProduction.name}"
@@ -99,44 +98,42 @@ class CalcASTBuilder < Rley::Parser::ParseTreeBuilder
 
     return node
   end
-  
+
   def reduce_binary_operator(theChildren)
     operator_node = theChildren[1]
     operator_node.children << theChildren[0]
     operator_node.children << theChildren[2]
-    return operator_node  
+    return operator_node
   end
 
   # rule 'simple_expression' => %w[simple_expression add_operator term]
-  def reduce_simple_expression_1(aProduction, aRange, theTokens, theChildren)
+  def reduce_simple_expression_1(_production, _range, _tokens, theChildren)
     reduce_binary_operator(theChildren)
   end
 
-
   # rule 'term' => %w[term mul_operator factor]
-  def reduce_term_1(aProduction, aRange, theTokens, theChildren)
+  def reduce_term_1(_production, _range, _tokens, theChildren)
     reduce_binary_operator(theChildren)
   end
-  
+
   # rule 'add_operator' => 'PLUS'
-  def reduce_add_operator_0(aProduction, aRange, theTokens, theChildren)
+  def reduce_add_operator_0(_production, _range, _tokens, theChildren)
     return CalcAddNode.new(theChildren[0].symbol)
   end
-  
+
   # rule 'add_operator' => 'MINUS'
-  def reduce_add_operator_1(aProduction, aRange, theTokens, theChildren)
+  def reduce_add_operator_1(_production, _range, _tokens, theChildren)
     return CalcSubtractNode.new(theChildren[0].symbol)
   end
-  
+
   # rule 'mul_operator' => 'STAR'
-  def reduce_mul_operator_0(aProduction, aRange, theTokens, theChildren)
+  def reduce_mul_operator_0(_production, _range, _tokens, theChildren)
     return CalcMultiplyNode.new(theChildren[0].symbol)
   end
-  
+
   # rule 'mul_operator' => 'DIVIDE'
-  def reduce_mul_operator_1(aProduction, aRange, theTokens, theChildren)
+  def reduce_mul_operator_1(_production, _range, _tokens, theChildren)
     return CalcDivideNode.new(theChildren[0].symbol)
-  end  
-  
-
-end # class
+  end
+end # class
+# End of file

data/examples/general/calc_iter1/calc_ast_nodes.rb

@@ -15,7 +15,7 @@ CalcTerminalNode = Struct.new(:token, :value, :position) do
   end
 
   def symbol()
-    self.token.terminal
+    token.terminal
   end
 
   def interpret()
@@ -29,7 +29,7 @@ CalcTerminalNode = Struct.new(:token, :value, :position) do
   end  
 end
 
-class CalcNumberNode  < CalcTerminalNode
+class CalcNumberNode < CalcTerminalNode
   def init_value(aLiteral)
     case aLiteral
       when /^[+-]?\d+$/
@@ -57,7 +57,6 @@ class CalcCompositeNode
   end
   
   alias subnodes children
-
 end # class
 
 class CalcUnaryOpNode < CalcCompositeNode
@@ -89,7 +88,7 @@ class CalcBinaryOpNode < CalcCompositeNode
   
   protected
   
-  def get_operands()
+  def retrieve_operands()
     operands = []
     children.each do |child|
       oper = child.respond_to?(:interpret) ? child.interpret : child
@@ -98,14 +97,12 @@ class CalcBinaryOpNode < CalcCompositeNode
 
     return operands
   end
-
 end # class
 
 class CalcAddNode < CalcBinaryOpNode
-
   # TODO
   def interpret()
-    operands = get_operands
+    operands = retrieve_operands
 
     sum = operands[0] + operands[1]
     return sum
@@ -114,10 +111,9 @@ end # class
 
 
 class CalcSubtractNode < CalcBinaryOpNode
-
   # TODO
   def interpret()
-    operands = get_operands
+    operands = retrieve_operands
 
     substraction = operands[0] - operands[1]
     return substraction
@@ -125,27 +121,22 @@ class CalcSubtractNode < CalcBinaryOpNode
 end # class
 
 class CalcMultiplyNode < CalcBinaryOpNode
-
   # TODO
   def interpret()
-    operands = get_operands
+    operands = retrieve_operands
     multiplication = operands[0] * operands[1]
     return multiplication
   end
 end # class
 
 class CalcDivideNode < CalcBinaryOpNode
-
   # TODO
   def interpret()
-    operands = get_operands
+    operands = retrieve_operands
     numerator = operands[0].to_f
     denominator = operands[1]
     division =  numerator / denominator
     return division    
   end
 end # class
-
-
-
-
+# End of file

data/examples/general/calc_iter1/calc_lexer.rb

@@ -51,13 +51,13 @@ class CalcLexer
       # Single character token
       token = build_token(@@lexeme2name[curr_ch], scanner.getch)
       
-    elsif lexeme = scanner.scan(/\*\*/)
+    elsif (lexeme = scanner.scan(/\*\*/))
       token = build_token(@@lexeme2name[lexeme], lexeme)
-    elsif lexeme = scanner.scan(/\*/)
+    elsif (lexeme = scanner.scan(/\*/))
       token = build_token(@@lexeme2name[lexeme], lexeme)
-    elsif lexeme = scanner.scan(/-?[0-9]+(\.[0-9]+)?([eE][-+]?[0-9])?/)
+    elsif (lexeme = scanner.scan(/-?[0-9]+(\.[0-9]+)?([eE][-+]?[0-9])?/))
       token = build_token('NUMBER', lexeme)
-    elsif lexeme = scanner.scan(/-/)
+    elsif (lexeme = scanner.scan(/-/))
       token = build_token(@@lexeme2name[curr_ch], lexeme)
     else # Unknown token
       erroneous = curr_ch.nil? ? '' : curr_ch
@@ -77,5 +77,4 @@ class CalcLexer
   def skip_whitespaces()
     scanner.scan(/[ \t\f\n\r]+/)
   end
-
 end # class