ruby-changes:3148
From: ko1@a...
Date: 25 Dec 2007 09:13:32 +0900
Subject: [ruby-changes:3148] drbrain - Ruby:r14640 (trunk): Enable RDoc debugging only with $DEBUG_RDOC
drbrain 2007-12-25 09:13:12 +0900 (Tue, 25 Dec 2007)
New Revision: 14640
Modified files:
trunk/ChangeLog
trunk/lib/rdoc/code_objects.rb
trunk/lib/rdoc/markup/simple_markup/inline.rb
trunk/lib/rdoc/options.rb
trunk/lib/rdoc/parsers/parse_rb.rb
Log:
Enable RDoc debugging only with $DEBUG_RDOC
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/rdoc/parsers/parse_rb.rb?r1=14640&r2=14639
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14640&r2=14639
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/rdoc/code_objects.rb?r1=14640&r2=14639
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/rdoc/options.rb?r1=14640&r2=14639
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/rdoc/markup/simple_markup/inline.rb?r1=14640&r2=14639
Index: ChangeLog
===================================================================
--- ChangeLog (revision 14639)
+++ ChangeLog (revision 14640)
@@ -1,13 +1,17 @@
+Tue Dec 25 09:12:13 2007 Eric Hodel <drbrain@s...>
+
+ * lib/rdoc/: Enable RDoc debugging only with $DEBUG_RDOC.
+
Tue Dec 25 08:37:43 2007 James Edward Gray II <jeg2@r...>
- * lib/csv.rb, test/csv/test_csv.rb: Removed in preparation for FasterCSV
- code import.
+ * lib/csv.rb, test/csv/test_csv.rb: Removed in preparation for
+ FasterCSV code import.
Tue Dec 25 08:27:43 2007 Eric Hodel <drbrain@s...>
- * lib/rubygems.rb: Fix test failures.
+ * lib/rubygems.rb: Fix test failures.
- * test/rubygems/test_gem.rb: Fix test failure.
+ * test/rubygems/test_gem.rb: Fix test failure.
Tue Dec 25 06:23:40 2007 Koichi Sasada <ko1@a...>
Index: lib/rdoc/markup/simple_markup/inline.rb
===================================================================
--- lib/rdoc/markup/simple_markup/inline.rb (revision 14639)
+++ lib/rdoc/markup/simple_markup/inline.rb (revision 14640)
@@ -246,17 +246,17 @@
def flow(str)
@str = str
- puts("Before flow, str='#{@str.dump}'") if $DEBUG
+ puts("Before flow, str='#{@str.dump}'") if $DEBUG_RDOC
mask_protected_sequences
@attrs = AttrSpan.new(@str.length)
- puts("After protecting, str='#{@str.dump}'") if $DEBUG
+ puts("After protecting, str='#{@str.dump}'") if $DEBUG_RDOC
convert_attrs(@str, @attrs)
convert_html(@str, @attrs)
convert_specials(str, @attrs)
unmask_protected_sequences
- puts("After flow, str='#{@str.dump}'") if $DEBUG
+ puts("After flow, str='#{@str.dump}'") if $DEBUG_RDOC
return split_into_flow
end
@@ -284,7 +284,7 @@
def split_into_flow
- display_attributes if $DEBUG
+ display_attributes if $DEBUG_RDOC
res = []
current_attr = 0
Index: lib/rdoc/parsers/parse_rb.rb
===================================================================
--- lib/rdoc/parsers/parse_rb.rb (revision 14639)
+++ lib/rdoc/parsers/parse_rb.rb (revision 14640)
@@ -23,7 +23,7 @@
require "rdoc/parsers/parserfactory"
-$TOKEN_DEBUG = $DEBUG
+$TOKEN_DEBUG = $DEBUG_RDOC
# Definitions of all tokens involved in the lexical analysis
@@ -544,7 +544,7 @@
get_read
end
# throw :eof unless tk
- p tk if $DEBUG
+ p tk if $DEBUG_RDOC
tk
end
@@ -1666,21 +1666,21 @@
when TkUNTIL, TkWHILE
nest += 1
puts "FOUND #{tk.class} in #{container.name}, nest = #{nest}, " +
- "line #{tk.line_no}" if $DEBUG
+ "line #{tk.line_no}" if $DEBUG_RDOC
skip_optional_do_after_expression
# 'for' is trickier
when TkFOR
nest += 1
puts "FOUND #{tk.class} in #{container.name}, nest = #{nest}, " +
- "line #{tk.line_no}" if $DEBUG
+ "line #{tk.line_no}" if $DEBUG_RDOC
skip_for_variable
skip_optional_do_after_expression
when TkCASE, TkDO, TkIF, TkUNLESS, TkBEGIN
nest += 1
puts "Found #{tk.class} in #{container.name}, nest = #{nest}, " +
- "line #{tk.line_no}" if $DEBUG
+ "line #{tk.line_no}" if $DEBUG_RDOC
when TkIDENTIFIER
if nest == 1 and current_method.nil?
@@ -1710,8 +1710,8 @@
when TkEND
nest -= 1
- puts "Found 'end' in #{container.name}, nest = #{nest}, line #{tk.line_no}" if $DEBUG
- puts "Method = #{current_method.name}" if $DEBUG and current_method
+ puts "Found 'end' in #{container.name}, nest = #{nest}, line #{tk.line_no}" if $DEBUG_RDOC
+ puts "Method = #{current_method.name}" if $DEBUG_RDOC and current_method
if nest == 0
read_documentation_modifiers(container, CLASS_MODIFIERS)
container.ongoing_visibility = save_visibility
@@ -1846,7 +1846,7 @@
loop do
puts("Param: #{tk}, #{@scanner.continue} " +
- "#{@scanner.lex_state} #{nest}") if $DEBUG
+ "#{@scanner.lex_state} #{nest}") if $DEBUG_RDOC
case tk
when TkSEMICOLON
@@ -2042,7 +2042,7 @@
loop do
puts("Param: #{tk.inspect}, #{@scanner.continue} " +
- "#{@scanner.lex_state} #{nest}") if $DEBUG
+ "#{@scanner.lex_state} #{nest}") if $DEBUG_RDOC
case tk
when TkSEMICOLON
break
@@ -2098,7 +2098,7 @@
loop do
puts("\nWhile: #{tk}, #{@scanner.continue} " +
- "#{@scanner.lex_state} #{nest}") if $DEBUG
+ "#{@scanner.lex_state} #{nest}") if $DEBUG_RDOC
case tk
when TkSEMICOLON
break
@@ -2169,7 +2169,7 @@
loop do
puts("Call param: #{tk}, #{@scanner.continue} " +
- "#{@scanner.lex_state} #{nest}") if $DEBUG
+ "#{@scanner.lex_state} #{nest}") if $DEBUG_RDOC
case tk
when TkSEMICOLON
break
@@ -2251,7 +2251,7 @@
def read_directive(allowed)
tk = get_tk
- puts "directive: #{tk.inspect}" if $DEBUG
+ puts "directive: #{tk.inspect}" if $DEBUG_RDOC
result = nil
if tk.kind_of?(TkCOMMENT)
if tk.text =~ /\s*:?(\w+):\s*(.*)/
@@ -2560,7 +2560,7 @@
break
when TkCOMMA
else
- warn("unexpected token: '#{tk2.inspect}'") if $DEBUG
+ warn("unexpected token: '#{tk2.inspect}'") if $DEBUG_RDOC
break
end
end
@@ -2598,7 +2598,7 @@
when TkSTRING
eval @read[-1]
else
- warn("Expected symbol or string, got #{tk.inspect}") if $DEBUG
+ warn("Expected symbol or string, got #{tk.inspect}") if $DEBUG_RDOC
nil
end
end
Index: lib/rdoc/code_objects.rb
===================================================================
--- lib/rdoc/code_objects.rb (revision 14639)
+++ lib/rdoc/code_objects.rb (revision 14640)
@@ -236,7 +236,7 @@
end
def add_method(a_method)
- puts "Adding #@visibility method #{a_method.name} to #@name" if $DEBUG
+ puts "Adding #@visibility method #{a_method.name} to #@name" if $DEBUG_RDOC
a_method.visibility = @visibility
add_to(@method_list, a_method)
end
@@ -280,10 +280,10 @@
def add_class_or_module(collection, class_type, name, superclass=nil)
cls = collection[name]
if cls
- puts "Reusing class/module #{name}" if $DEBUG
+ puts "Reusing class/module #{name}" if $DEBUG_RDOC
else
cls = class_type.new(name, superclass)
- puts "Adding class/module #{name} to #@name" if $DEBUG
+ puts "Adding class/module #{name} to #@name" if $DEBUG_RDOC
# collection[name] = cls if @document_self && !@done_documenting
collection[name] = cls if !@done_documenting
cls.parent = self
@@ -497,7 +497,7 @@
def add_class_or_module(collection, class_type, name, superclass)
cls = collection[name]
if cls
- puts "Reusing class/module #{name}" if $DEBUG
+ puts "Reusing class/module #{name}" if $DEBUG_RDOC
else
if class_type == NormalModule
all = @@all_modules
@@ -509,7 +509,7 @@
cls = class_type.new(name, superclass)
all[name] = cls unless @done_documenting
end
- puts "Adding class/module #{name} to #@name" if $DEBUG
+ puts "Adding class/module #{name} to #@name" if $DEBUG_RDOC
collection[name] = cls unless @done_documenting
cls.parent = self
end
Index: lib/rdoc/options.rb
===================================================================
--- lib/rdoc/options.rb (revision 14639)
+++ lib/rdoc/options.rb (revision 14640)
@@ -386,7 +386,7 @@
case opt
when "--all" then @show_all = true
when "--charset" then @charset = arg
- when "--debug" then $DEBUG = true
+ when "--debug" then $DEBUG_RDOC = true
when "--exclude" then @exclude << Regexp.new(arg)
when "--inline-source" then @inline_source = true
when "--line-numbers" then @include_line_numbers = true
--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml