yard 0.9.5 → 0.9.6

data/lib/yard/logging.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'logger'
 require 'thread'
 
@@ -47,6 +48,7 @@ module YARD
       self.formatter = method(:format_log)
       @progress_indicator = 0
       @mutex = Mutex.new
+      @progress_msg = nil
     end
 
     # Changes the debug level to DEBUG if $DEBUG is set
@@ -65,7 +67,7 @@ module YARD
     #   stream is not a TTY. Use +nil+ for no alternate logging.
     # @yield a block of arbitrary code to benchmark
     # @return [void]
-    def capture(msg, nontty_log = :debug, &block)
+    def capture(msg, nontty_log = :debug)
       progress(msg, nontty_log)
       yield
     ensure
@@ -118,7 +120,7 @@ module YARD
       print("#{msg}\n")
     end
 
-    alias_method :print_no_newline, :<<
+    alias print_no_newline <<
     private :print_no_newline
 
     # Displays an unformatted line to the logger output stream.
@@ -129,7 +131,7 @@ module YARD
       clear_line
       print_no_newline(msg)
     end
-    alias_method :<<, :print
+    alias << print
 
     # Prints the backtrace +exc+ to the logger as error data.
     #
@@ -161,8 +163,9 @@ module YARD
     # @param [Fixnum] new_level the logger level for the duration of the block.
     #   values can be found in Ruby's Logger class.
     # @yield the block with the logger temporarily set to +new_level+
-    def enter_level(new_level = level, &block)
-      old_level, self.level = level, new_level
+    def enter_level(new_level = level)
+      old_level = level
+      self.level = new_level
       yield
     ensure
       self.level = old_level
@@ -182,7 +185,7 @@ module YARD
     end
 
     # Log format (from Logger implementation). Used by Logger internally
-    def format_log(sev, time, prog, msg)
+    def format_log(sev, _time, _prog, msg)
       "[#{sev.downcase}]: #{msg}\n"
     end
   end

data/lib/yard/options.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module YARD
   # Generalized options class for passing around large amounts of options between objects.
   #
@@ -139,7 +140,7 @@ module YARD
     # @yieldparam [Symbol] key the option key
     # @yieldparam [Object] value the option value
     # @return [void]
-    def each(&block)
+    def each
       instance_variables.each do |ivar|
         name = ivar.to_s.sub(/^@/, '')
         yield(name.to_sym, send(name))
@@ -170,9 +171,9 @@ module YARD
       if meth.to_s =~ /^(.+)=$/
         log.debug "Attempting to set unregistered key #{$1} on #{self.class}"
         instance_variable_set("@#{$1}", args.first)
-      elsif args.size == 0
+      elsif args.empty?
         log.debug "Attempting to access unregistered key #{meth} on #{self.class}"
-        instance_variable_get("@#{meth}")
+        instance_variable_defined?("@#{meth}") ? instance_variable_get("@#{meth}") : nil
       else
         super
       end
@@ -187,7 +188,9 @@ module YARD
     def reset_defaults
       names_set = {}
       self.class.ancestors.each do |klass| # look at all ancestors
-        defaults = klass.instance_variable_get("@defaults")
+        defaults =
+          klass.instance_variable_defined?("@defaults") &&
+          klass.instance_variable_get("@defaults")
         next unless defaults
         defaults.each do |key, value|
           next if names_set[key]
@@ -209,8 +212,6 @@ module YARD
       val
     end
 
-    unless defined? tap() # only for 1.8.6
-      def tap(&block) yield(self); self end
-    end
+    def tap; yield(self); self end unless defined?(tap) # only for 1.8.6
   end
 end

data/lib/yard/parser/base.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module YARD
   module Parser
     # Represents the abstract base parser class that parses source code in
@@ -22,7 +23,7 @@ module YARD
       # storing the source contents and filename if they are required.
       # @param [String] source the source contents
       # @param [String] filename the name of the file if from disk
-      def initialize(source, filename)
+      def initialize(source, filename) # rubocop:disable Lint/UnusedMethodArgument
         raise NotImplementedError, "invalid parser implementation"
       end
 
@@ -53,4 +54,4 @@ module YARD
       end
     end
   end
-end
+end

data/lib/yard/parser/c/c_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module YARD
   module Parser
     module C
@@ -86,42 +87,43 @@ module YARD
           end
           statement.source = @content[start..@index]
           statement.block = stmts
-          statement.declaration = decl
+          statement.declaration = decl # rubocop:disable Lint/UselessSetterCall
         end
 
         def consume_body_statements
           stmts = []
           brace_level = 1
-          while true
+          loop do
             strip_non_statement_data
-            start, line = @index, @line
+            start = @index
+            line = @line
             consume_until(/[{};]/)
             brace_level += 1 if prevchar == '{'
             brace_level -= 1 if prevchar == '}'
 
             break if prevchar.empty? || (brace_level <= 0 && prevchar == '}')
-            end_chr = @index
-            end_chr -= 1 if prevchar == '}'
             src = @content[start...@index]
-            if src && src !~ /\A\s*\Z|\A\}\Z/
-              stmt = BodyStatement.new(src, @file, line)
-              attach_comment(stmt)
-              stmts << stmt
-            end
+            next unless src && src !~ /\A\s*\Z|\A\}\Z/
+
+            stmt = BodyStatement.new(src, @file, line)
+            attach_comment(stmt)
+            stmts << stmt
           end
           stmts
         end
 
         def strip_non_statement_data
           start = @index
-          begin
+          loop do
             start = @index
             case char
             when /\s/; consume_whitespace
             when '#';  consume_directive
             when '/';  consume_comment
             end
-          end until start == @index
+
+            break if start == @index
+          end
         end
 
         def consume_whitespace
@@ -133,7 +135,7 @@ module YARD
           line = @line
           type = nextchar == '*' ? :multi : :line
           advance(2)
-          comment = ""
+          comment = String.new("")
           advance_loop do
             comment << char
             if type == :multi
@@ -179,13 +181,12 @@ module YARD
             end
             @newline = false if chr !~ /\s/
 
-            if chr =~ end_char && (chr == '{' || chr == '(')
-              break
-            elsif chr =~ end_char && bracket_level <= 0 && brace_level <= 0
-              break
+            if chr =~ end_char
+              break if chr == '{' || chr == '('
+              break if bracket_level <= 0 && brace_level <= 0
             end
           end
-          return @content[start...@index]
+          @content[start...@index]
         end
 
         def attach_comment(statement)
@@ -209,8 +210,8 @@ module YARD
         def advance(num = 1) @index += num end
         def back(num = 1) @index -= num end
 
-        def advance_loop(&block)
-          while @index <= @content.size; yield end
+        def advance_loop
+          yield while @index <= @content.size
         end
 
         def nextline
@@ -223,7 +224,7 @@ module YARD
         def nextchar(num = 1) @content[@index + 1, num] end
 
         def struct
-          /struct\s[:alnum:]+\s\{/
+          /struct\s[a-zA-Z0-9]+\s\{/
         end
       end
     end

data/lib/yard/parser/c/comment_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module YARD
   module Parser
     module C
@@ -56,9 +57,11 @@ module YARD
             signature, types = *line.split(/ [-=]> /)
             types = parse_types(types)
             if signature.sub!(/\[?\s*(\{(?:\s*\|(.+?)\|)?.*\})\s*\]?\s*$/, '') && $1
-              blk, blkparams = $1, $2
+              blk = $1
+              blkparams = $2
             else
-              blk, blkparams = nil, nil
+              blk = nil
+              blkparams = nil
             end
             case signature
             when /^(\w+)\s*=\s+(\w+)/
@@ -85,7 +88,7 @@ module YARD
           if types =~ /true or false/
             ["Boolean"]
           else
-            (types||"").split(/,| or /).map do |t|
+            (types || "").split(/,| or /).map do |t|
               case t.strip.gsub(/^an?_/, '')
               when "class"; "Class"
               when "obj", "object", "anObject"; "Object"
@@ -121,9 +124,9 @@ module YARD
         end
 
         def remove_private_comments(comment)
-           comment = comment.gsub(/\/?\*--\n(.*?)\/?\*\+\+/m, '')
-           comment = comment.sub(/\/?\*--\n.*/m, '')
-           comment
+          comment = comment.gsub(%r{/?\*--\n(.*?)/?\*\+\+}m, '')
+          comment = comment.sub(%r{/?\*--\n.*}m, '')
+          comment
         end
       end
     end

data/lib/yard/parser/c/statement.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module YARD
   module Parser
     module C

data/lib/yard/parser/ruby/ast_node.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module YARD
   module Parser
     module Ruby
@@ -92,13 +93,13 @@ module YARD
 
         # List of all known keywords
         # @return [Hash]
-        KEYWORDS = { :class => true, :alias => true, :lambda => true, :do_block => true,
+        KEYWORDS = {:class => true, :alias => true, :lambda => true, :do_block => true,
           :def => true, :defs => true, :begin => true, :rescue => true, :rescue_mod => true,
           :if => true, :if_mod => true, :else => true, :elsif => true, :case => true,
           :when => true, :next => true, :break => true, :retry => true, :redo => true,
           :return => true, :throw => true, :catch => true, :until => true, :until_mod => true,
           :while => true, :while_mod => true, :yield => true, :yield0 => true, :zsuper => true,
-          :unless => true, :unless_mod => true, :for => true, :super => true, :return0 => true }
+          :unless => true, :unless_mod => true, :for => true, :super => true, :return0 => true}
 
         # @group Creating an AstNode
 
@@ -128,7 +129,7 @@ module YARD
               ReferenceNode
             elsif type.to_s =~ /_literal\Z/
               LiteralNode
-            elsif KEYWORDS.has_key?(type)
+            elsif KEYWORDS.key?(type)
               KeywordNode
             else
               AstNode
@@ -157,13 +158,14 @@ module YARD
           @fallback_line = opts[:listline]
           @fallback_source = opts[:listchar]
           @token = true if opts[:token]
+          @docstring = nil
         end
 
         # @return [Boolean] whether the node is equal to another by checking
         #   the list and type
         # @private
-        def ==(ast)
-          super && type == ast.type
+        def ==(other)
+          super && type == other.type
         end
 
         # @group Traversing a Node
@@ -207,7 +209,7 @@ module YARD
           nodes = [self]
           nodes.each.with_index do |node, index|
             yield node
-            nodes.insert index+1, *node.children
+            nodes.insert index + 1, *node.children
           end
         end
 
@@ -285,18 +287,16 @@ module YARD
 
         # @return [nil] pretty prints the node
         def pretty_print(q)
-          objs = self.dup + [:__last__]
+          objs = dup + [:__last__]
           objs.unshift(type) if type && type != :list
 
           options = []
-          if @docstring
-            options << ['docstring', docstring]
-          end
+          options << ['docstring', docstring] if @docstring
           if @source_range || @line_range
             options << ['line', line_range]
             options << ['source', source_range]
           end
-          objs.pop if options.size == 0
+          objs.pop if options.empty?
 
           q.group(3, 's(', ')') do
             q.seplist(objs, nil, :each) do |v|
@@ -341,8 +341,9 @@ module YARD
           if size == 0
             self.line_range = @fallback_line
             self.source_range = @fallback_source
-          elsif children.size > 0
-            f, l = children.first, children.last
+          elsif !children.empty?
+            f = children.first
+            l = children.last
             self.line_range = Range.new(f.line_range.first, l.line_range.last)
             self.source_range = Range.new(f.source_range.first, l.source_range.last)
           elsif @fallback_line || @fallback_source
@@ -410,7 +411,8 @@ module YARD
         end
 
         def double_splat_param
-          YARD.ruby2? ? self[-2] : nil
+          return nil unless YARD.ruby2?
+          self[-2] if self[-2].is_a?(AstNode) && self[-2].type == :ident
         end
 
         def block_param
@@ -443,6 +445,7 @@ module YARD
         end
 
         def block_param; parameters.last end
+
         def block
           last.type == :do_block || last.type == :brace_block ? last : nil
         end
@@ -489,9 +492,8 @@ module YARD
         def then_block; self[1] end
 
         def else_block
-          if self[2] && !cmod?
-            self[2].type == :elsif ? self[2] : self[2][0]
-          end
+          return unless self[2] && !cmod?
+          self[2].type == :elsif ? self[2] : self[2][0]
         end
 
         private
@@ -527,4 +529,4 @@ module YARD
       end
     end
   end
-end
+end

data/lib/yard/parser/ruby/legacy/ruby_lex.rb

@@ -99,14 +99,14 @@ module YARD
       class TkOPASGN < TkOp
         def initialize(line_no, char_no, op)
           super(line_no, char_no)
-          op = TkReading2Token[op] unless op.kind_of?(Symbol)
+          op = TkReading2Token[op] unless op.is_a?(Symbol)
           @op = op
         end
         attr :op
       end
 
       class TkUnknownChar < Token
-        def initialize(line_no, char_no, id)
+        def initialize(line_no, char_no, _id)
           super(line_no, char_no)
           @name = char_no > 255 ? '?' : char_no.chr
         end
@@ -123,11 +123,11 @@ module YARD
       end
 
       # @private
-      def Token(token, value = nil)
+      def Token(token, value = nil) # rubocop:disable Style/MethodName
         tk = nil
         case token
         when String, Symbol
-          source = token.kind_of?(String) ? TkReading2Token : TkSymbol2Token
+          source = token.is_a?(String) ? TkReading2Token : TkSymbol2Token
           if (tk = source[token]).nil?
             IRB.fail TkReading2TokenNoKey, token
           end
@@ -190,13 +190,11 @@ module YARD
         [:TklEND,       TkKW,  "END",      EXPR_END],
         [:Tk__LINE__,   TkKW,  "__LINE__", EXPR_END],
         [:Tk__FILE__,   TkKW,  "__FILE__", EXPR_END],
-
         [:TkIDENTIFIER, TkId],
         [:TkFID,        TkId],
         [:TkGVAR,       TkId],
         [:TkIVAR,       TkId],
         [:TkCONSTANT,   TkId],
-
         [:TkINTEGER,    TkVal],
         [:TkFLOAT,      TkVal],
         [:TkSYMBOL,     TkVal],
@@ -205,13 +203,11 @@ module YARD
         [:TkXSTRING,    TkVal],
         [:TkREGEXP,     TkVal],
         [:TkCOMMENT,    TkVal],
-
         [:TkDSTRING,    TkNode],
         [:TkDXSTRING,   TkNode],
         [:TkDREGEXP,    TkNode],
         [:TkNTH_REF,    TkId],
         [:TkBACK_REF,   TkId],
-
         [:TkUPLUS,      TkOp,   "+@"],
         [:TkUMINUS,     TkOp,   "-@"],
         [:TkPOW,        TkOp,   "**"],
@@ -233,17 +229,12 @@ module YARD
         [:TkRSHFT,      TkOp,   ">>"],
         [:TkCOLON2,     TkOp],
         [:TkCOLON3,     TkOp],
-        [:OPASGN,       TkOp],               # +=, -=  etc. #
+        [:OPASGN,       TkOp], # +=, -=  etc. #
         [:TkASSOC,      TkOp,   "=>"],
-        [:TkQUESTION,   TkOp,   "?"],  #?
-        [:TkCOLON,      TkOp,   ":"],        #:
-
-#        [:TkfLPAREN],         # func( #
-#        [:TkfLBRACK],         # func[ #
-#        [:TkfLBRACE],         # func{ #
+        [:TkQUESTION,   TkOp,   "?"], #?
+        [:TkCOLON,      TkOp,   ":"], #:
         [:TkSTAR],            # *arg
         [:TkAMPER],           # &arg #
-#        [:TkSYMBOL,     TkId],          # :SYMBOL
         [:TkSYMBEG,     TkId],
         [:TkGT,         TkOp,   ">"],
         [:TkLT,         TkOp,   "<"],
@@ -257,28 +248,23 @@ module YARD
         [:TkBITAND,     TkOp,   "&"],
         [:TkBITNOT,     TkOp,   "~"],
         [:TkNOTOP,      TkOp,   "!"],
-
         [:TkBACKQUOTE,  TkOp,   "`"],
-
         [:TkASSIGN,     Token,  "="],
         [:TkDOT,        Token,  "."],
-        [:TkLPAREN,     Token,  "("],  #(exp)
-        [:TkLBRACK,     Token,  "["],  #[arry]
-        [:TkLBRACE,     Token,  "{"],  #{hash}
+        [:TkLPAREN,     Token,  "("],  # (exp)
+        [:TkLBRACK,     Token,  "["],  # [arry]
+        [:TkLBRACE,     Token,  "{"],  # {hash}
         [:TkRPAREN,     Token,  ")"],
         [:TkRBRACK,     Token,  "]"],
         [:TkRBRACE,     Token,  "}"],
         [:TkCOMMA,      Token,  ","],
         [:TkSEMICOLON,  Token,  ";"],
-
-#        [:TkRD_COMMENT,     TkVal],
         [:TkSPACE,          TkWhitespace],
         [:TkNL,             TkWhitespace],
         [:TkEND_OF_SCRIPT,  TkWhitespace],
-
         [:TkBACKSLASH,  TkUnknownChar,  "\\"],
         [:TkAT,         TkUnknownChar,  "@"],
-        [:TkDOLLAR,     TkUnknownChar,  "\$"], #"
+        [:TkDOLLAR,     TkUnknownChar,  "\$"]
       ]
 
       # { reading => token_class }
@@ -287,13 +273,13 @@ module YARD
       TkSymbol2Token = {}
 
       # @private
-      def RubyToken.def_token(token_n, super_token = Token, reading = nil, *opts)
-        token_n = token_n.id2name unless token_n.kind_of?(String)
+      def self.def_token(token_n, super_token = Token, reading = nil, *opts)
+        token_n = token_n.id2name unless token_n.is_a?(String)
         if RubyToken.const_defined?(token_n)
           # IRB.fail AlreadyDefinedToken, token_n
         end
 
-        token_c =  Class.new super_token
+        token_c = Class.new super_token
         RubyToken.const_set token_n, token_c
         # token_c.inspect
 
@@ -320,13 +306,10 @@ module YARD
         def_token(*defs)
       end
 
-      NEWLINE_TOKEN = TkNL.new(0,0)
+      NEWLINE_TOKEN = TkNL.new(0, 0)
       NEWLINE_TOKEN.set_text("\n")
-
     end
 
-
-
     # Lexical analyzer for Ruby source
     # @private
     class RubyLex
@@ -359,19 +342,18 @@ module YARD
       #
       # @private
       class BufferedReader
-
         attr_reader :line_num
 
         def initialize(content)
           if /\t/ =~ content
             tab_width = 2
             content = content.split(/\n/).map do |line|
-              1 while line.gsub!(/\t+/) { ' ' * (tab_width*$&.length - $`.length % tab_width)}  && $~ #`
+              1 while line.gsub!(/\t+/) { ' ' * (tab_width * $&.length - $`.length % tab_width) } && $~ #`
               line
             end .join("\n")
           end
-          @content   = content
-          @content << "\n" unless @content[-1,1] == "\n"
+          @content = String.new(content)
+          @content << "\n" unless @content[-1, 1] == "\n"
           @size      = @content.size
           @offset    = 0
           @hwm       = 0
@@ -408,7 +390,7 @@ module YARD
           getc
         end
 
-        def ungetc(ch)
+        def ungetc(_ch)
           raise "unget past beginning of file" if @offset <= 0
           @offset -= 1
           if @content[@offset] == ?\n
@@ -437,7 +419,7 @@ module YARD
 
         def divert_read_from(reserve)
           @content[@offset, 0] = reserve
-          @size      = @content.size
+          @size = @content.size
         end
       end
 
@@ -457,7 +439,7 @@ module YARD
       attr_reader :continue
       attr_reader :lex_state
 
-      def RubyLex.debug?
+      def self.debug?
         false
       end
 
@@ -481,6 +463,8 @@ module YARD
         @skip_space = false
         @read_auto_clean_up = false
         @exception_on_syntax_error = true
+
+        @colonblock_seen = false
       end
 
       attr_accessor :skip_space
@@ -511,16 +495,15 @@ module YARD
       end
 
       def gets
-        c = getc or return
+        (c = getc) || return
         l = ""
         begin
           l.concat c unless c == "\r"
           break if c == "\n"
-        end while c = getc
+        end while c = getc # rubocop:disable Lint/Loop
         l
       end
 
-
       def ungetc(c = nil)
         @reader.ungetc(c)
       end
@@ -535,13 +518,13 @@ module YARD
 
       def lex
         catch(:eof) do
-          until (((tk = token).kind_of?(TkNL) || tk.kind_of?(TkEND_OF_SCRIPT)) &&
-             !@continue or
-             tk.nil?)
+          until ((tk = token).is_a?(TkNL) || tk.is_a?(TkEND_OF_SCRIPT)) &&
+                !@continue ||
+                tk.nil?
           end
           line = get_read
 
-          if line == "" and tk.kind_of?(TkEND_OF_SCRIPT) || tk.nil?
+          if line == "" && tk.is_a?(TkEND_OF_SCRIPT) || tk.nil?
             nil
           else
             line
@@ -555,12 +538,12 @@ module YARD
           begin
             begin
               tk = @OP.match(self)
-              @space_seen = tk.kind_of?(TkSPACE)
+              @space_seen = tk.is_a?(TkSPACE)
             rescue SyntaxError
               abort if @exception_on_syntax_error
               tk = TkError.new(line_no, char_no)
             end
-          end while @skip_space and tk.kind_of?(TkSPACE)
+          end while @skip_space && tk.is_a?(TkSPACE)
           if @read_auto_clean_up
             get_read
           end
@@ -573,11 +556,10 @@ module YARD
 
       ENINDENT_CLAUSE = [
         "case", "class", "def", "do", "for", "if",
-        "module", "unless", "until", "while", "begin" #, "when"
-      ]
+        "module", "unless", "until", "while", "begin"
+      ] #, "when"
       ACCEPTS_COLON = ["if", "for", "unless", "until", "while"]
-      DEINDENT_CLAUSE = ["end" #, "when"
-      ]
+      DEINDENT_CLAUSE = ["end"] #, "when"
 
       PERCENT_LTYPE = {
         "q" => "\'",
@@ -607,16 +589,16 @@ module YARD
       DLtype2Token = {
         "\"" => TkDSTRING,
         "\`" => TkDXSTRING,
-        "/" => TkDREGEXP,
+        "/" => TkDREGEXP
       }
 
       def lex_init()
         @OP = SLex.new
-        @OP.def_rules("\0", "\004", "\032") do |chars, io|
+        @OP.def_rules("\0", "\004", "\032") do |chars, _io|
           Token(TkEND_OF_SCRIPT).set_text(chars)
         end
 
-        @OP.def_rules(" ", "\t", "\f", "\r", "\13") do |chars, io|
+        @OP.def_rules(" ", "\t", "\f", "\r", "\13") do |chars, _io|
           @space_seen = TRUE
           while (ch = getc) =~ /[ \t\f\r\13]/
             chars << ch
@@ -625,19 +607,16 @@ module YARD
           Token(TkSPACE).set_text(chars)
         end
 
-        @OP.def_rule("#") do
-          |op, io|
+        @OP.def_rule("#") do |_op, _io|
           identify_comment
         end
 
-        @OP.def_rule("=begin", proc{@prev_char_no == 0 && peek(0) =~ /\s/}) do
-          |op, io|
-          str = op
+        @OP.def_rule("=begin", proc { @prev_char_no == 0 && peek(0) =~ /\s/ }) do |op, _io|
+          str = String.new(op)
           @ltype = "="
 
-
           begin
-            line = ""
+            line = String.new
             begin
               ch = getc
               line << ch
@@ -676,17 +655,17 @@ module YARD
           "=", "==", "===",
           "=~", "<=>",
           "<", "<=",
-          ">", ">=", ">>") do |op, io|
+          ">", ">=", ">>") do |op, _io|
           @lex_state = EXPR_BEG
           Token(op).set_text(op)
         end
 
-        @OP.def_rules("<<") do |op, io|
+        @OP.def_rules("<<") do |op, _io|
           tk = nil
           if @lex_state != EXPR_END && @lex_state != EXPR_CLASS &&
              (@lex_state != EXPR_ARG || @space_seen)
             c = peek(0)
-            tk = identify_here_document if /[-\w_\"\'\`]/ =~ c
+            tk = identify_here_document if /[-\w\"\'\`]/ =~ c
           end
           if !tk
             @lex_state = EXPR_BEG
@@ -695,11 +674,11 @@ module YARD
           tk
         end
 
-        @OP.def_rules("'", '"') do |op, io|
+        @OP.def_rules("'", '"') do |op, _io|
           identify_string(op)
         end
 
-        @OP.def_rules("`") do |op, io|
+        @OP.def_rules("`") do |op, _io|
           if @lex_state == EXPR_FNAME
             Token(op).set_text(op)
           else
@@ -707,7 +686,7 @@ module YARD
           end
         end
 
-        @OP.def_rules('?') do |op, io|
+        @OP.def_rules('?') do |op, _io|
           if @lex_state == EXPR_END
             @lex_state = EXPR_BEG
             Token(TkQUESTION).set_text(op)
@@ -718,9 +697,9 @@ module YARD
               @lex_state = EXPR_BEG
               Token(TkQUESTION).set_text(op)
             else
-              str = op
+              str = String.new(op)
               str << ch
-              if (ch == '\\') #'
+              if ch == '\\' #'
                 str << read_escape
               end
               @lex_state = EXPR_END
@@ -729,35 +708,35 @@ module YARD
           end
         end
 
-        @OP.def_rules("&", "&&", "|", "||") do |op, io|
+        @OP.def_rules("&", "&&", "|", "||") do |op, _io|
           @lex_state = EXPR_BEG
           Token(op).set_text(op)
         end
 
         @OP.def_rules("+=", "-=", "*=", "**=",
-          "&=", "|=", "^=", "<<=", ">>=", "||=", "&&=") do |op, io|
+          "&=", "|=", "^=", "<<=", ">>=", "||=", "&&=") do |op, _io|
           @lex_state = EXPR_BEG
           op =~ /^(.*)=$/
           Token(TkOPASGN, $1).set_text(op)
         end
 
-        @OP.def_rule("+@", proc{@lex_state == EXPR_FNAME}) do |op, io|
+        @OP.def_rule("+@", proc { @lex_state == EXPR_FNAME }) do |op, _io|
           Token(TkUPLUS).set_text(op)
         end
 
-        @OP.def_rule("-@", proc{@lex_state == EXPR_FNAME}) do |op, io|
+        @OP.def_rule("-@", proc { @lex_state == EXPR_FNAME }) do |op, _io|
           Token(TkUMINUS).set_text(op)
         end
 
-        @OP.def_rules("+", "-") do |op, io|
+        @OP.def_rules("+", "-") do |op, _io|
           catch(:RET) do
             if @lex_state == EXPR_ARG
-              if @space_seen and peek(0) =~ /[0-9]/
+              if @space_seen && peek(0) =~ /[0-9]/
                 throw :RET, identify_number(op)
               else
                 @lex_state = EXPR_BEG
               end
-            elsif @lex_state != EXPR_END and peek(0) =~ /[0-9]/
+            elsif @lex_state != EXPR_END && peek(0) =~ /[0-9]/
               throw :RET, identify_number(op)
             else
               @lex_state = EXPR_BEG
@@ -778,7 +757,7 @@ module YARD
           end
         end
 
-        @OP.def_rules("..", "...") do |op, io|
+        @OP.def_rules("..", "...") do |op, _io|
           @lex_state = EXPR_BEG
           Token(op).set_text(op)
         end
@@ -787,8 +766,7 @@ module YARD
       end
 
       def lex_int2
-        @OP.def_rules("]", "}", ")") do
-          |op, io|
+        @OP.def_rules("]", "}", ")") do |op, _io|
           @lex_state = EXPR_END
           @indent -= 1
           Token(op).set_text(op)
@@ -807,7 +785,7 @@ module YARD
 
         @OP.def_rule("::") do
           # p @lex_state.id2name, @space_seen
-          if @lex_state == EXPR_BEG or @lex_state == EXPR_ARG && @space_seen
+          if @lex_state == EXPR_BEG || @lex_state == EXPR_ARG && @space_seen
             @lex_state = EXPR_BEG
             tk = Token(TkCOLON3)
           else
@@ -817,14 +795,14 @@ module YARD
           tk.set_text("::")
         end
 
-        @OP.def_rule("/") do |op, io|
+        @OP.def_rule("/") do |op, _io|
           if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
             identify_string(op)
           elsif peek(0) == '='
             getc
             @lex_state = EXPR_BEG
             Token(TkOPASGN, :/).set_text("/=") #")
-          elsif @lex_state == EXPR_ARG and @space_seen and peek(0) !~ /\s/
+          elsif @lex_state == EXPR_ARG && @space_seen && peek(0) !~ /\s/
             identify_string(op)
           else
             @lex_state = EXPR_BEG
@@ -842,7 +820,7 @@ module YARD
         #   Token(TkOPASGN, :^)
         # end
 
-        @OP.def_rules(",", ";") do |op, io|
+        @OP.def_rules(",", ";") do |op, _io|
           @colonblock_seen = false
           @lex_state = EXPR_BEG
           Token(op).set_text(op)
@@ -853,28 +831,28 @@ module YARD
           Token("~").set_text("~")
         end
 
-        @OP.def_rule("~@", proc{@lex_state = EXPR_FNAME}) do
+        @OP.def_rule("~@", proc { @lex_state = EXPR_FNAME }) do
           @lex_state = EXPR_BEG
           Token("~").set_text("~@")
         end
 
         @OP.def_rule("(") do
           @indent += 1
-          # if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
-          #  @lex_state = EXPR_BEG
-          #  tk = Token(TkfLPAREN)
-          # else
+            # if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
+            #  @lex_state = EXPR_BEG
+            #  tk = Token(TkfLPAREN)
+            # else
             @lex_state = EXPR_BEG
             tk = Token(TkLPAREN)
           # end
           tk.set_text("(")
         end
 
-        @OP.def_rule("[]", proc{@lex_state == EXPR_FNAME}) do
+        @OP.def_rule("[]", proc { @lex_state == EXPR_FNAME }) do
           Token("[]").set_text("[]")
         end
 
-        @OP.def_rule("[]=", proc{@lex_state == EXPR_FNAME}) do
+        @OP.def_rule("[]=", proc { @lex_state == EXPR_FNAME }) do
           Token("[]=").set_text("[]=")
         end
 
@@ -907,25 +885,24 @@ module YARD
           t.set_text("{")
         end
 
-        @OP.def_rule('\\') do   #'
+        @OP.def_rule('\\') do #'
           if getc == "\n"
             @space_seen = true
             @continue = true
             Token(TkSPACE).set_text("\\\n")
           else
             ungetc
-            Token("\\").set_text("\\")  #"
+            Token("\\").set_text("\\") #"
           end
         end
 
-        @OP.def_rule('%') do
-          |op, io|
+        @OP.def_rule('%') do |_op, _io|
           if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
             identify_quotation('%')
           elsif peek(0) == '='
             getc
             Token(TkOPASGN, "%").set_text("%=")
-          elsif @lex_state == EXPR_ARG and @space_seen and peek(0) !~ /\s/
+          elsif @lex_state == EXPR_ARG && @space_seen && peek(0) !~ /\s/
             identify_quotation('%')
           else
             @lex_state = EXPR_BEG
@@ -933,12 +910,12 @@ module YARD
           end
         end
 
-        @OP.def_rule('$') do  #'
+        @OP.def_rule('$') do #'
           identify_gvar
         end
 
         @OP.def_rule('@') do
-          if peek(0) =~ /[@\w_]/
+          if peek(0) =~ /[@\w]/
             ungetc
             identify_identifier
           else
@@ -956,7 +933,7 @@ module YARD
         # # end
         # end
 
-        @OP.def_rule("__END__", proc{@prev_char_no == 0 && peek(0) =~ /[\r\n]/}) do
+        @OP.def_rule("__END__", proc { @prev_char_no == 0 && peek(0) =~ /[\r\n]/ }) do
           throw :eof
         end
 
@@ -964,7 +941,7 @@ module YARD
           printf "MATCH: start %s: %s\n", op, io.inspect if RubyLex.debug?
           if peek(0) =~ /[0-9]/
             t = identify_number("")
-          elsif peek(0) =~ /[\w_]/
+          elsif peek(0) =~ /[\w]/
             t = identify_identifier
           end
           printf "MATCH: end %s: %s\n", op, io.inspect if RubyLex.debug?
@@ -976,10 +953,10 @@ module YARD
 
       def identify_gvar
         @lex_state = EXPR_END
-        str = "$"
+        str = String.new("$")
 
         tk = case ch = getc
-             when /[~_*$?!@\/\\;,=:<>".]/   #"
+             when %r{[~_*$?!@/\\;,=:<>".]}
                str << ch
                Token(TkGVAR, str)
 
@@ -1020,7 +997,7 @@ module YARD
         end
         ungetc
 
-        if ch == "!" or ch == "?"
+        if ch == "!" || ch == "?"
           token.concat getc
         end
         # fix token
@@ -1042,9 +1019,9 @@ module YARD
           if token_c
             # reserved word?
 
-            if (@lex_state != EXPR_BEG &&
-                @lex_state != EXPR_FNAME &&
-                trans[1])
+            if @lex_state != EXPR_BEG &&
+               @lex_state != EXPR_FNAME &&
+               trans[1]
               # modifiers
               token_c = TkSymbol2Token[trans[1]]
               @lex_state = trans[0]
@@ -1097,7 +1074,7 @@ module YARD
           ch = getc
           indent = true
         end
-        if /['"`]/ =~ ch            # '
+        if /['"`]/ =~ ch # '
           lt = ch
           quoted = ""
           while (c = getc) && c != lt
@@ -1113,11 +1090,11 @@ module YARD
         end
 
         ltback, @ltype = @ltype, lt
-        reserve = ""
+        reserve = String.new
 
         while ch = getc
           reserve << ch
-          if ch == "\\"    #"
+          if ch == "\\" #"
             ch = getc
             reserve << ch
           elsif ch == "\n"
@@ -1125,7 +1102,7 @@ module YARD
           end
         end
 
-        str = ""
+        str = String.new
         while (l = gets)
           l.chomp!
           l.strip! if indent
@@ -1162,7 +1139,7 @@ module YARD
       def identify_number(start)
         str = start.dup
 
-        if start == "+" or start == "-" or start == ""
+        if start == "+" || start == "-" || start == ""
           start = getc
           str << start
         end
@@ -1221,14 +1198,14 @@ module YARD
         Token(type).set_text(str)
       end
 
-      def identify_string(ltype, quoted = ltype, opener=nil, initial_char = nil)
+      def identify_string(ltype, quoted = ltype, opener = nil, initial_char = nil)
         @ltype = ltype
         @quoted = quoted
         subtype = nil
 
-        str = ""
+        str = String.new
         str << initial_char if initial_char
-        str << (opener||quoted)
+        str << (opener || quoted)
 
         nest = 0
         begin
@@ -1242,7 +1219,7 @@ module YARD
               end
             elsif opener == ch
               nest += 1
-            elsif @ltype != "'" && @ltype != "]" and ch == "#"
+            elsif @ltype != "'" && @ltype != "]" && ch == "#"
               ch = getc
               if ch == "{"
                 subtype = true
@@ -1272,12 +1249,12 @@ module YARD
       end
 
       def skip_inner_expression
-        res = ""
+        res = String.new
         nest = 0
         while (ch = getc)
           res << ch
           if ch == '}'
-            break if nest.zero?
+            break if nest == 0
             nest -= 1
           elsif ch == '{'
             nest += 1
@@ -1288,7 +1265,7 @@ module YARD
 
       def identify_comment
         @ltype = "#"
-        comment = "#"
+        comment = String.new("#")
         while ch = getc
           if ch == "\\"
             ch = getc
@@ -1306,11 +1283,11 @@ module YARD
           end
           comment << ch
         end
-        return Token(TkCOMMENT).set_text(comment)
+        Token(TkCOMMENT).set_text(comment)
       end
 
       def read_escape
-        res = ""
+        res = String.new
         case ch = getc
         when /[0-7]/
           ungetc ch
@@ -1324,7 +1301,7 @@ module YARD
             break
           end
           res << ch
-        end
+          end
 
         when "x"
           res << ch
@@ -1356,7 +1333,7 @@ module YARD
 
         when "C", "c" #, "^"
           res << ch
-          if ch == "C" and (ch = getc) != "-"
+          if ch == "C" && (ch = getc) != "-"
             ungetc
           else
             res << ch