rdoc 4.0.1 → 4.1.0.preview.3

data/lib/rdoc/rdoc.rb

@@ -217,7 +217,7 @@ option)
       end unless @options.force_output
     else
       FileUtils.mkdir_p dir
-      FileUtils.touch output_flag_file dir
+      FileUtils.touch flag_file
     end
 
     last
@@ -289,6 +289,7 @@ option)
     file_list = []
 
     relative_files.each do |rel_file_name|
+      next if rel_file_name.end_with? 'created.rid'
       next if exclude_pattern && exclude_pattern =~ rel_file_name
       stat = File.stat rel_file_name rescue next
 
@@ -495,7 +496,7 @@ The internal error was:
     if @options.coverage_report then
       puts
 
-      puts @stats.report
+      puts @stats.report.accept RDoc::Markup::ToRdoc.new
     elsif file_info.empty? then
       $stderr.puts "\nNo newer files." unless @options.quiet
     else
@@ -508,7 +509,7 @@ The internal error was:
 
     if @stats and (@options.coverage_report or not @options.quiet) then
       puts
-      puts @stats.summary
+      puts @stats.summary.accept RDoc::Markup::ToRdoc.new
     end
 
     exit @stats.fully_documented? if @options.coverage_report

data/lib/rdoc/ri/driver.rb

@@ -197,7 +197,7 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
 
       opt.separator nil
 
-      opt.on("--[no-]pager", "-T",
+      opt.on("--[no-]pager",
              "Send output directly to stdout,",
              "rather than to a pager.") do |use_pager|
         options[:use_stdout] = !use_pager
@@ -205,6 +205,13 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
 
       opt.separator nil
 
+      opt.on("-T",
+             "Synonym for --no-pager") do
+        options[:use_stdout] = true
+      end
+
+      opt.separator nil
+
       opt.on("--width=WIDTH", "-w", OptionParser::DecimalInteger,
              "Set the width of the output.") do |width|
         options[:width] = width
@@ -459,38 +466,51 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
 
     extensions.each do |modules, store|
       if modules.length == 1 then
-        include = modules.first
-        name = include.name
-        path = store.friendly_path
-        out << RDoc::Markup::Paragraph.new("#{name} (from #{path})")
-
-        if include.comment then
-          out << RDoc::Markup::BlankLine.new
-          out << include.comment
-        end
+        add_extension_modules_single out, store, modules.first
       else
-        out << RDoc::Markup::Paragraph.new("(from #{store.friendly_path})")
+        add_extension_modules_multiple out, store, modules
+      end
+    end
+  end
 
-        wout, with = modules.partition { |incl| incl.comment.empty? }
+  ##
+  # Renders multiple included +modules+ from +store+ to +out+.
 
-        out << RDoc::Markup::BlankLine.new unless with.empty?
+  def add_extension_modules_multiple out, store, modules # :nodoc:
+    out << RDoc::Markup::Paragraph.new("(from #{store.friendly_path})")
 
-        with.each do |incl|
-          out << RDoc::Markup::Paragraph.new(incl.name)
-          out << RDoc::Markup::BlankLine.new
-          out << incl.comment
-        end
+    wout, with = modules.partition { |incl| incl.comment.empty? }
 
-        unless wout.empty? then
-          verb = RDoc::Markup::Verbatim.new
+    out << RDoc::Markup::BlankLine.new unless with.empty?
 
-          wout.each do |incl|
-            verb.push incl.name, "\n"
-          end
+    with.each do |incl|
+      out << RDoc::Markup::Paragraph.new(incl.name)
+      out << RDoc::Markup::BlankLine.new
+      out << incl.comment
+    end
 
-          out << verb
-        end
+    unless wout.empty? then
+      verb = RDoc::Markup::Verbatim.new
+
+      wout.each do |incl|
+        verb.push incl.name, "\n"
       end
+
+      out << verb
+    end
+  end
+
+  ##
+  # Adds a single extension module +include+ from +store+ to +out+
+
+  def add_extension_modules_single out, store, include # :nodoc:
+    name = include.name
+    path = store.friendly_path
+    out << RDoc::Markup::Paragraph.new("#{name} (from #{path})")
+
+    if include.comment then
+      out << RDoc::Markup::BlankLine.new
+      out << include.comment
     end
   end
 
@@ -596,68 +616,56 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
     add_extends  out, extends
 
     found.each do |store, klass|
-      comment = klass.comment
-      # TODO the store's cache should always return an empty Array
-      class_methods    = store.class_methods[klass.full_name]    || []
-      instance_methods = store.instance_methods[klass.full_name] || []
-      attributes       = store.attributes[klass.full_name]       || []
-
-      if comment.empty? and
-         instance_methods.empty? and class_methods.empty? then
-        also_in << store
-        next
-      end
-
-      add_from out, store
+      render_class out, store, klass, also_in
+    end
 
-      unless comment.empty? then
-        out << RDoc::Markup::Rule.new(1)
+    add_also_in out, also_in
 
-        if comment.merged? then
-          parts = comment.parts
-          parts = parts.zip [RDoc::Markup::BlankLine.new] * parts.length
-          parts.flatten!
-          parts.pop
+    out
+  end
 
-          out.concat parts
-        else
-          out << comment
-        end
-      end
+  ##
+  # Adds the class +comment+ to +out+.
 
-      if class_methods or instance_methods or not klass.constants.empty? then
-        out << RDoc::Markup::Rule.new(1)
-      end
+  def class_document_comment out, comment # :nodoc:
+    unless comment.empty? then
+      out << RDoc::Markup::Rule.new(1)
 
-      unless klass.constants.empty? then
-        out << RDoc::Markup::Heading.new(1, "Constants:")
-        out << RDoc::Markup::BlankLine.new
-        list = RDoc::Markup::List.new :NOTE
+      if comment.merged? then
+        parts = comment.parts
+        parts = parts.zip [RDoc::Markup::BlankLine.new] * parts.length
+        parts.flatten!
+        parts.pop
 
-        constants = klass.constants.sort_by { |constant| constant.name }
+        out.concat parts
+      else
+        out << comment
+      end
+    end
+  end
 
-        list.items.concat constants.map { |constant|
-          parts = constant.comment.parts if constant.comment
-          parts << RDoc::Markup::Paragraph.new('[not documented]') if
-            parts.empty?
+  ##
+  # Adds the constants from +klass+ to the Document +out+.
 
-          RDoc::Markup::ListItem.new(constant.name, *parts)
-        }
+  def class_document_constants out, klass # :nodoc:
+    return if klass.constants.empty?
 
-        out << list
-        out << RDoc::Markup::BlankLine.new
-      end
+    out << RDoc::Markup::Heading.new(1, "Constants:")
+    out << RDoc::Markup::BlankLine.new
+    list = RDoc::Markup::List.new :NOTE
 
-      add_method_list out, class_methods,    'Class methods'
-      add_method_list out, instance_methods, 'Instance methods'
-      add_method_list out, attributes,       'Attributes'
+    constants = klass.constants.sort_by { |constant| constant.name }
 
-      add_method_documentation out, klass if @show_all
-    end
+    list.items.concat constants.map { |constant|
+      parts = constant.comment.parts if constant.comment
+      parts << RDoc::Markup::Paragraph.new('[not documented]') if
+        parts.empty?
 
-    add_also_in out, also_in
+      RDoc::Markup::ListItem.new(constant.name, *parts)
+    }
 
-    out
+    out << list
+    out << RDoc::Markup::BlankLine.new
   end
 
   ##
@@ -709,16 +717,24 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
   # Completes +name+ based on the caches.  For Readline
 
   def complete name
-    klasses = classes.keys
     completions = []
 
     klass, selector, method = parse_name name
 
+    complete_klass  name, klass, selector, method, completions
+    complete_method name, klass, selector,         completions
+
+    completions.sort.uniq
+  end
+
+  def complete_klass name, klass, selector, method, completions # :nodoc:
+    klasses = classes.keys
+
     # may need to include Foo when given Foo::
     klass_name = method ? name : klass
 
     if name !~ /#|\./ then
-      completions = klasses.grep(/^#{Regexp.escape klass_name}[^:]*$/)
+      completions.replace klasses.grep(/^#{Regexp.escape klass_name}[^:]*$/)
       completions.concat klasses.grep(/^#{Regexp.escape name}[^:]*$/) if
         name =~ /::$/
 
@@ -728,7 +744,9 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
     elsif classes.key? klass_name then
       completions << klass_name
     end
+  end
 
+  def complete_method name, klass, selector, completions # :nodoc:
     if completions.include? klass and name =~ /#|\.|::/ then
       methods = list_methods_matching name
 
@@ -743,8 +761,6 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
 
       completions.concat methods
     end
-
-    completions.sort.uniq
   end
 
   ##
@@ -804,7 +820,7 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
     true
   rescue NotFoundError
     matches = list_methods_matching name if name =~ /::|#|\./
-    matches = classes.keys.grep(/^#{name}/) if matches.empty?
+    matches = classes.keys.grep(/^#{Regexp.escape name}/) if matches.empty?
 
     raise if matches.empty?
 
@@ -1183,6 +1199,12 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
     return unless method
 
     store.load_method klass, "#{type}#{method}"
+  rescue RDoc::Store::MissingFileError => e
+    comment = RDoc::Comment.new("missing documentation at #{e.file}").parse
+
+    method = RDoc::AnyMethod.new nil, name
+    method.comment = comment
+    method
   end
 
   ##
@@ -1228,30 +1250,7 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
 
     filtered.each do |store, methods|
       methods.each do |method|
-        out << RDoc::Markup::Paragraph.new("(from #{store.friendly_path})")
-
-        unless name =~ /^#{Regexp.escape method.parent_name}/ then
-          out << RDoc::Markup::Heading.new(3, "Implementation from #{method.parent_name}")
-        end
-
-        out << RDoc::Markup::Rule.new(1)
-
-        if method.arglists then
-          arglists = method.arglists.chomp.split "\n"
-          arglists = arglists.map { |line| line + "\n" }
-          out << RDoc::Markup::Verbatim.new(*arglists)
-          out << RDoc::Markup::Rule.new(1)
-        end
-
-        if method.respond_to?(:superclass_method) and method.superclass_method
-          out << RDoc::Markup::BlankLine.new
-          out << RDoc::Markup::Heading.new(4, "(Uses superclass method #{method.superclass_method})")
-          out << RDoc::Markup::Rule.new(1)
-        end
-
-        out << RDoc::Markup::BlankLine.new
-        out << method.comment
-        out << RDoc::Markup::BlankLine.new
+        render_method out, store, method, name
       end
     end
 
@@ -1345,6 +1344,78 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the
     [klass, type, meth]
   end
 
+  ##
+  # Renders the +klass+ from +store+ to +out+.  If the klass has no
+  # documentable items the class is added to +also_in+ instead.
+
+  def render_class out, store, klass, also_in # :nodoc:
+    comment = klass.comment
+    # TODO the store's cache should always return an empty Array
+    class_methods    = store.class_methods[klass.full_name]    || []
+    instance_methods = store.instance_methods[klass.full_name] || []
+    attributes       = store.attributes[klass.full_name]       || []
+
+    if comment.empty? and
+       instance_methods.empty? and class_methods.empty? then
+      also_in << store
+      return
+    end
+
+    add_from out, store
+
+    class_document_comment out, comment
+
+    if class_methods or instance_methods or not klass.constants.empty? then
+      out << RDoc::Markup::Rule.new(1)
+    end
+
+    class_document_constants out, klass
+
+    add_method_list out, class_methods,    'Class methods'
+    add_method_list out, instance_methods, 'Instance methods'
+    add_method_list out, attributes,       'Attributes'
+
+    add_method_documentation out, klass if @show_all
+  end
+
+  def render_method out, store, method, name # :nodoc:
+    out << RDoc::Markup::Paragraph.new("(from #{store.friendly_path})")
+
+    unless name =~ /^#{Regexp.escape method.parent_name}/ then
+      out << RDoc::Markup::Heading.new(3, "Implementation from #{method.parent_name}")
+    end
+
+    out << RDoc::Markup::Rule.new(1)
+
+    render_method_arguments out, method.arglists
+    render_method_superclass out, method
+    render_method_comment out, method
+  end
+
+  def render_method_arguments out, arglists # :nodoc:
+    return unless arglists
+
+    arglists = arglists.chomp.split "\n"
+    arglists = arglists.map { |line| line + "\n" }
+    out << RDoc::Markup::Verbatim.new(*arglists)
+    out << RDoc::Markup::Rule.new(1)
+  end
+
+  def render_method_comment out, method # :nodoc:
+    out << RDoc::Markup::BlankLine.new
+    out << method.comment
+    out << RDoc::Markup::BlankLine.new
+  end
+
+  def render_method_superclass out, method # :nodoc:
+    return unless
+      method.respond_to?(:superclass_method) and method.superclass_method
+
+    out << RDoc::Markup::BlankLine.new
+    out << RDoc::Markup::Heading.new(4, "(Uses superclass method #{method.superclass_method})")
+    out << RDoc::Markup::Rule.new(1)
+  end
+
   ##
   # Looks up and displays ri data according to the options given.
 

data/lib/rdoc/ri/paths.rb

@@ -162,9 +162,9 @@ module RDoc::RI::Paths
   ##
   # The location of ri data installed into the site dir.
   #
-  # Historically this was available for documentation installed by ruby
+  # Historically this was available for documentation installed by Ruby
   # libraries predating RubyGems.  It is unlikely to contain any content for
-  # modern ruby installations.
+  # modern Ruby installations.
 
   def self.site_dir
     File.join BASE, 'site'
@@ -173,11 +173,11 @@ module RDoc::RI::Paths
   ##
   # The location of the built-in ri data.
   #
-  # This data is built automatically when `make` is run when ruby is
-  # installed.  If you did not install ruby by hand you may need to install
+  # This data is built automatically when `make` is run when Ruby is
+  # installed.  If you did not install Ruby by hand you may need to install
   # the documentation yourself.  Please consult the documentation for your
-  # package manager or ruby installer for details.  You can also use the
-  # rdoc-data gem to install system ri data for common versions of ruby.
+  # package manager or Ruby installer for details.  You can also use the
+  # rdoc-data gem to install system ri data for common versions of Ruby.
 
   def self.system_dir
     File.join BASE, 'system'

data/lib/rdoc/ruby_lex.rb

@@ -42,8 +42,8 @@ class RDoc::RubyLex
   include RDoc::RubyToken
   include IRB
 
-  attr_reader :continue
-  attr_reader :lex_state
+  attr_accessor :continue
+  attr_accessor :lex_state
   attr_reader :reader
 
   class << self
@@ -107,7 +107,7 @@ class RDoc::RubyLex
     @here_header = false
     @indent = 0
     @indent_stack = []
-    @lex_state = EXPR_BEG
+    @lex_state = :EXPR_BEG
     @space_seen = false
 
     @continue = false
@@ -280,7 +280,7 @@ class RDoc::RubyLex
     @quoted = nil
     @indent = 0
     @indent_stack = []
-    @lex_state = EXPR_BEG
+    @lex_state = :EXPR_BEG
     @space_seen = false
     @here_header = false
 
@@ -450,11 +450,11 @@ class RDoc::RubyLex
     @OP.def_rule("\n") do |op, io|
       print "\\n\n" if RDoc::RubyLex.debug?
       case @lex_state
-      when EXPR_BEG, EXPR_FNAME, EXPR_DOT
+      when :EXPR_BEG, :EXPR_FNAME, :EXPR_DOT
         @continue = true
       else
         @continue = false
-        @lex_state = EXPR_BEG
+        @lex_state = :EXPR_BEG
         until (@indent_stack.empty? ||
                [TkLPAREN, TkLBRACK, TkLBRACE,
                  TkfLPAREN, TkfLBRACK, TkfLBRACE].include?(@indent_stack.last))
@@ -473,25 +473,25 @@ class RDoc::RubyLex
                   ">", ">=", ">>") do
       |op, io|
       case @lex_state
-      when EXPR_FNAME, EXPR_DOT
-        @lex_state = EXPR_ARG
+      when :EXPR_FNAME, :EXPR_DOT
+        @lex_state = :EXPR_ARG
       else
-        @lex_state = EXPR_BEG
+        @lex_state = :EXPR_BEG
       end
       Token(op)
     end
 
     @OP.def_rules("!", "!=", "!~") do
       |op, io|
-      @lex_state = EXPR_BEG
+      @lex_state = :EXPR_BEG
       Token(op)
     end
 
     @OP.def_rules("<<") do
       |op, io|
       tk = nil
-      if @lex_state != EXPR_END && @lex_state != EXPR_CLASS &&
-         (@lex_state != EXPR_ARG || @space_seen)
+      if @lex_state != :EXPR_END && @lex_state != :EXPR_CLASS &&
+         (@lex_state != :EXPR_ARG || @space_seen)
         c = peek(0)
         if /\S/ =~ c && (/["'`]/ =~ c || /\w/ =~ c || c == "-")
           tk = identify_here_document
@@ -500,10 +500,10 @@ class RDoc::RubyLex
       unless tk
         tk = Token(op)
         case @lex_state
-        when EXPR_FNAME, EXPR_DOT
-          @lex_state = EXPR_ARG
+        when :EXPR_FNAME, :EXPR_DOT
+          @lex_state = :EXPR_ARG
         else
-          @lex_state = EXPR_BEG
+          @lex_state = :EXPR_BEG
         end
       end
       tk
@@ -516,8 +516,8 @@ class RDoc::RubyLex
 
     @OP.def_rules("`") do
       |op, io|
-      if @lex_state == EXPR_FNAME
-        @lex_state = EXPR_END
+      if @lex_state == :EXPR_FNAME
+        @lex_state = :EXPR_END
         Token(op)
       else
         identify_string(op)
@@ -526,61 +526,61 @@ class RDoc::RubyLex
 
     @OP.def_rules('?') do
       |op, io|
-      if @lex_state == EXPR_END
-        @lex_state = EXPR_BEG
+      if @lex_state == :EXPR_END
+        @lex_state = :EXPR_BEG
         Token(TkQUESTION)
       else
         ch = getc
-        if @lex_state == EXPR_ARG && ch =~ /\s/
+        if @lex_state == :EXPR_ARG && ch =~ /\s/
           ungetc
-          @lex_state = EXPR_BEG;
+          @lex_state = :EXPR_BEG;
           Token(TkQUESTION)
         else
-          @lex_state = EXPR_END
-          Token(TkSTRING, ch)
+          @lex_state = :EXPR_END
+          Token(TkCHAR, "?#{ch}")
         end
       end
     end
 
     @OP.def_rules("&", "&&", "|", "||") do
       |op, io|
-      @lex_state = EXPR_BEG
+      @lex_state = :EXPR_BEG
       Token(op)
     end
 
     @OP.def_rules("+=", "-=", "*=", "**=",
                   "&=", "|=", "^=", "<<=", ">>=", "||=", "&&=") do
       |op, io|
-      @lex_state = EXPR_BEG
+      @lex_state = :EXPR_BEG
       op =~ /^(.*)=$/
       Token(TkOPASGN, $1)
     end
 
-    @OP.def_rule("+@", proc{|op, io| @lex_state == EXPR_FNAME}) do
+    @OP.def_rule("+@", proc{|op, io| @lex_state == :EXPR_FNAME}) do
       |op, io|
-      @lex_state = EXPR_ARG
+      @lex_state = :EXPR_ARG
       Token(op)
     end
 
-    @OP.def_rule("-@", proc{|op, io| @lex_state == EXPR_FNAME}) do
+    @OP.def_rule("-@", proc{|op, io| @lex_state == :EXPR_FNAME}) do
       |op, io|
-      @lex_state = EXPR_ARG
+      @lex_state = :EXPR_ARG
       Token(op)
     end
 
     @OP.def_rules("+", "-") do
       |op, io|
       catch(:RET) do
-        if @lex_state == EXPR_ARG
+        if @lex_state == :EXPR_ARG
           if @space_seen and peek(0) =~ /[0-9]/
             throw :RET, identify_number(op)
           else
-            @lex_state = EXPR_BEG
+            @lex_state = :EXPR_BEG
           end
-        elsif @lex_state != EXPR_END and peek(0) =~ /[0-9]/
+        elsif @lex_state != :EXPR_END and peek(0) =~ /[0-9]/
           throw :RET, identify_number(op)
         else
-          @lex_state = EXPR_BEG
+          @lex_state = :EXPR_BEG
         end
         Token(op)
       end
@@ -588,20 +588,20 @@ class RDoc::RubyLex
 
     @OP.def_rule(".") do
       |op, io|
-      @lex_state = EXPR_BEG
+      @lex_state = :EXPR_BEG
       if peek(0) =~ /[0-9]/
         ungetc
         identify_number
       else
         # for "obj.if" etc.
-        @lex_state = EXPR_DOT
+        @lex_state = :EXPR_DOT
         Token(TkDOT)
       end
     end
 
     @OP.def_rules("..", "...") do
       |op, io|
-      @lex_state = EXPR_BEG
+      @lex_state = :EXPR_BEG
       Token(op)
     end
 
@@ -611,7 +611,7 @@ class RDoc::RubyLex
   def lex_int2
     @OP.def_rules("]", "}", ")") do
       |op, io|
-      @lex_state = EXPR_END
+      @lex_state = :EXPR_END
       @indent -= 1
       @indent_stack.pop
       Token(op)
@@ -619,11 +619,11 @@ class RDoc::RubyLex
 
     @OP.def_rule(":") do
       |op, io|
-      if @lex_state == EXPR_END || peek(0) =~ /\s/
-        @lex_state = EXPR_BEG
+      if @lex_state == :EXPR_END || peek(0) =~ /\s/
+        @lex_state = :EXPR_BEG
         Token(TkCOLON)
       else
-        @lex_state = EXPR_FNAME;
+        @lex_state = :EXPR_FNAME;
         Token(TkSYMBEG)
       end
     end
@@ -631,51 +631,51 @@ class RDoc::RubyLex
     @OP.def_rule("::") do
       |op, io|
       #      p @lex_state.id2name, @space_seen
-      if @lex_state == EXPR_BEG or @lex_state == EXPR_ARG && @space_seen
-        @lex_state = EXPR_BEG
+      if @lex_state == :EXPR_BEG or @lex_state == :EXPR_ARG && @space_seen
+        @lex_state = :EXPR_BEG
         Token(TkCOLON3)
       else
-        @lex_state = EXPR_DOT
+        @lex_state = :EXPR_DOT
         Token(TkCOLON2)
       end
     end
 
     @OP.def_rule("/") do
       |op, io|
-      if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
+      if @lex_state == :EXPR_BEG || @lex_state == :EXPR_MID
         identify_string(op)
       elsif peek(0) == '='
         getc
-        @lex_state = EXPR_BEG
+        @lex_state = :EXPR_BEG
         Token(TkOPASGN, "/") #/)
-      elsif @lex_state == EXPR_ARG and @space_seen and peek(0) !~ /\s/
+      elsif @lex_state == :EXPR_ARG and @space_seen and peek(0) !~ /\s/
         identify_string(op)
       else
-        @lex_state = EXPR_BEG
+        @lex_state = :EXPR_BEG
         Token("/") #/)
       end
     end
 
     @OP.def_rules("^") do
       |op, io|
-      @lex_state = EXPR_BEG
+      @lex_state = :EXPR_BEG
       Token("^")
     end
 
     #       @OP.def_rules("^=") do
-    # 	@lex_state = EXPR_BEG
+    # 	@lex_state = :EXPR_BEG
     # 	Token(OP_ASGN, :^)
     #       end
 
     @OP.def_rules(",") do
       |op, io|
-      @lex_state = EXPR_BEG
+      @lex_state = :EXPR_BEG
       Token(op)
     end
 
     @OP.def_rules(";") do
       |op, io|
-      @lex_state = EXPR_BEG
+      @lex_state = :EXPR_BEG
       until (@indent_stack.empty? ||
              [TkLPAREN, TkLBRACK, TkLBRACE,
                TkfLPAREN, TkfLBRACK, TkfLBRACE].include?(@indent_stack.last))
@@ -686,56 +686,56 @@ class RDoc::RubyLex
 
     @OP.def_rule("~") do
       |op, io|
-      @lex_state = EXPR_BEG
+      @lex_state = :EXPR_BEG
       Token("~")
     end
 
-    @OP.def_rule("~@", proc{|op, io| @lex_state == EXPR_FNAME}) do
+    @OP.def_rule("~@", proc{|op, io| @lex_state == :EXPR_FNAME}) do
       |op, io|
-      @lex_state = EXPR_BEG
+      @lex_state = :EXPR_BEG
       Token("~")
     end
 
     @OP.def_rule("(") do
       |op, io|
       @indent += 1
-      if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
-        @lex_state = EXPR_BEG
+      if @lex_state == :EXPR_BEG || @lex_state == :EXPR_MID
+        @lex_state = :EXPR_BEG
         tk_c = TkfLPAREN
       else
-        @lex_state = EXPR_BEG
+        @lex_state = :EXPR_BEG
         tk_c = TkLPAREN
       end
       @indent_stack.push tk_c
       Token tk_c
     end
 
-    @OP.def_rule("[]", proc{|op, io| @lex_state == EXPR_FNAME}) do
+    @OP.def_rule("[]", proc{|op, io| @lex_state == :EXPR_FNAME}) do
       |op, io|
-      @lex_state = EXPR_ARG
+      @lex_state = :EXPR_ARG
       Token("[]")
     end
 
-    @OP.def_rule("[]=", proc{|op, io| @lex_state == EXPR_FNAME}) do
+    @OP.def_rule("[]=", proc{|op, io| @lex_state == :EXPR_FNAME}) do
       |op, io|
-      @lex_state = EXPR_ARG
+      @lex_state = :EXPR_ARG
       Token("[]=")
     end
 
     @OP.def_rule("[") do
       |op, io|
       @indent += 1
-      if @lex_state == EXPR_FNAME
+      if @lex_state == :EXPR_FNAME
         tk_c = TkfLBRACK
       else
-        if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
+        if @lex_state == :EXPR_BEG || @lex_state == :EXPR_MID
           tk_c = TkLBRACK
-        elsif @lex_state == EXPR_ARG && @space_seen
+        elsif @lex_state == :EXPR_ARG && @space_seen
           tk_c = TkLBRACK
         else
           tk_c = TkfLBRACK
         end
-        @lex_state = EXPR_BEG
+        @lex_state = :EXPR_BEG
       end
       @indent_stack.push tk_c
       Token(tk_c)
@@ -744,12 +744,12 @@ class RDoc::RubyLex
     @OP.def_rule("{") do
       |op, io|
       @indent += 1
-      if @lex_state != EXPR_END && @lex_state != EXPR_ARG
+      if @lex_state != :EXPR_END && @lex_state != :EXPR_ARG
         tk_c = TkLBRACE
       else
         tk_c = TkfLBRACE
       end
-      @lex_state = EXPR_BEG
+      @lex_state = :EXPR_BEG
       @indent_stack.push tk_c
       Token(tk_c)
     end
@@ -768,15 +768,15 @@ class RDoc::RubyLex
 
     @OP.def_rule('%') do
       |op, io|
-      if @lex_state == EXPR_BEG || @lex_state == EXPR_MID
+      if @lex_state == :EXPR_BEG || @lex_state == :EXPR_MID
         identify_quotation
       elsif peek(0) == '='
         getc
         Token(TkOPASGN, :%)
-      elsif @lex_state == EXPR_ARG and @space_seen and peek(0) !~ /\s/
+      elsif @lex_state == :EXPR_ARG and @space_seen and peek(0) !~ /\s/
         identify_quotation
       else
-        @lex_state = EXPR_BEG
+        @lex_state = :EXPR_BEG
         Token("%") #))
       end
     end
@@ -799,15 +799,15 @@ class RDoc::RubyLex
     #       @OP.def_rule("def", proc{|op, io| /\s/ =~ io.peek(0)}) do
     # 	|op, io|
     # 	@indent += 1
-    # 	@lex_state = EXPR_FNAME
-    # #	@lex_state = EXPR_END
+    # 	@lex_state = :EXPR_FNAME
+    # #	@lex_state = :EXPR_END
     # #	until @rests[0] == "\n" or @rests[0] == ";"
     # #	  rests.shift
     # #	end
     #       end
 
     @OP.def_rule("_") do
-      if peek_match?(/_END__/) and @lex_state == EXPR_BEG then
+      if peek_match?(/_END__/) and @lex_state == :EXPR_BEG then
         6.times { getc }
         Token(TkEND_OF_SCRIPT, '__END__')
       else
@@ -832,7 +832,7 @@ class RDoc::RubyLex
   end
 
   def identify_gvar
-    @lex_state = EXPR_END
+    @lex_state = :EXPR_END
 
     case ch = getc
     when /[~_*$?!@\/\\;,=:<>".]/   #"
@@ -888,32 +888,33 @@ class RDoc::RubyLex
     when /^\$/
       return Token(TkGVAR, token)
     when /^\@\@/
-      @lex_state = EXPR_END
+      @lex_state = :EXPR_END
       # p Token(TkCVAR, token)
       return Token(TkCVAR, token)
     when /^\@/
-      @lex_state = EXPR_END
+      @lex_state = :EXPR_END
       return Token(TkIVAR, token)
     end
 
-    if @lex_state != EXPR_DOT
+    if @lex_state != :EXPR_DOT
       print token, "\n" if RDoc::RubyLex.debug?
 
       token_c, *trans = TkReading2Token[token]
       if token_c
         # reserved word?
 
-        if (@lex_state != EXPR_BEG &&
-            @lex_state != EXPR_FNAME &&
+        if (@lex_state != :EXPR_BEG &&
+            @lex_state != :EXPR_FNAME &&
             trans[1])
           # modifiers
           token_c = TkSymbol2Token[trans[1]]
           @lex_state = trans[0]
         else
-          if @lex_state != EXPR_FNAME
+          if @lex_state != :EXPR_FNAME
             if ENINDENT_CLAUSE.include?(token)
+              valid = peek(0) != ':'
+
               # check for ``class = val'' etc.
-              valid = true
               case token
               when "class"
                 valid = false unless peek_match?(/^\s*(<<|\w|::)/)
@@ -925,7 +926,8 @@ class RDoc::RubyLex
                 valid = false if peek_match?(/^\s*([+-\/*]?=|\*|<|>|\&|\|)/)
               else
                 # no nothing
-              end
+              end if valid
+
               if valid
                 if token == "do"
                   if ![TkFOR, TkWHILE, TkUNTIL].include?(@indent_stack.last)
@@ -946,23 +948,23 @@ class RDoc::RubyLex
             end
             @lex_state = trans[0]
           else
-            @lex_state = EXPR_END
+            @lex_state = :EXPR_END
           end
         end
         return Token(token_c, token)
       end
     end
 
-    if @lex_state == EXPR_FNAME
-      @lex_state = EXPR_END
+    if @lex_state == :EXPR_FNAME
+      @lex_state = :EXPR_END
       if peek(0) == '='
         token.concat getc
       end
-    elsif @lex_state == EXPR_BEG || @lex_state == EXPR_DOT ||
-          @lex_state == EXPR_ARG
-      @lex_state = EXPR_ARG
+    elsif @lex_state == :EXPR_BEG || @lex_state == :EXPR_DOT ||
+          @lex_state == :EXPR_ARG
+      @lex_state = :EXPR_ARG
     else
-      @lex_state = EXPR_END
+      @lex_state = :EXPR_END
     end
 
     if token[0, 1] =~ /[A-Z]/
@@ -1043,7 +1045,7 @@ class RDoc::RubyLex
 
     token_class = output_heredoc ? RDoc::RubyLex::TkHEREDOC : Ltype2Token[lt]
     @ltype = ltback
-    @lex_state = EXPR_END
+    @lex_state = :EXPR_END
     Token(token_class, doc)
   end
 
@@ -1067,7 +1069,7 @@ class RDoc::RubyLex
   end
 
   def identify_number(op = "")
-    @lex_state = EXPR_END
+    @lex_state = :EXPR_END
 
     num = op
 
@@ -1229,8 +1231,8 @@ class RDoc::RubyLex
       end
 
       if @ltype == "/"
-        if peek(0) =~ /i|m|x|o|e|s|u|n/
-          getc
+        while peek(0) =~ /i|m|x|o|e|s|u|n/
+          str << getc
         end
       end
 
@@ -1242,7 +1244,7 @@ class RDoc::RubyLex
     ensure
       @ltype = nil
       @quoted = nil
-      @lex_state = EXPR_END
+      @lex_state = :EXPR_END
     end
   end
 
@@ -1285,18 +1287,19 @@ class RDoc::RubyLex
   def read_escape
     escape = ''
     ch = getc
-    escape << ch
 
     case ch
     when "\n", "\r", "\f"
+      escape << ch
     when "\\", "n", "t", "r", "f", "v", "a", "e", "b", "s" #"
+      escape << ch
     when /[0-7]/
       ungetc ch
       3.times do
         ch = getc
-        escape << ch
         case ch
         when /[0-7]/
+          escape << ch
         when nil
           break
         else
@@ -1306,11 +1309,13 @@ class RDoc::RubyLex
       end
 
     when "x"
+      escape << ch
+
       2.times do
         ch = getc
-        escape << ch
         case ch
         when /[0-9a-fA-F]/
+          escape << ch
         when nil
           break
         else
@@ -1320,26 +1325,44 @@ class RDoc::RubyLex
       end
 
     when "M"
-      ch = getc
       escape << ch
+
+      ch = getc
       if ch != '-'
         ungetc
       else
-        ch = getc
         escape << ch
+
+        ch = getc
         if ch == "\\" #"
+          ungetc
           escape << read_escape
+        else
+          escape << ch
         end
       end
 
     when "C", "c" #, "^"
-      if ch == "C" and (ch = getc) != "-"
-        escape << ch
-        ungetc
+      escape << ch
+
+      if ch == "C"
+        ch = getc
+
+        if ch == "-"
+          escape << ch
+          ch = getc
+          escape << ch
+
+          escape << read_escape if ch == "\\"
+        else
+          ungetc
+        end
       elsif (ch = getc) == "\\" #"
         escape << ch << read_escape
       end
     else
+      escape << ch
+
       # other characters
     end