summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/rdoc/parsers/parse_rb.rb8
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 4f35b76f97..2c902538a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Nov 22 22:33:02 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/parsers/parse_rb.rb (RDoc::parse_require): Don't use names
+ of variables or constants when oarsing 'require'
+
Sat Nov 20 23:57:33 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/README (et al): Add a new directive, :section:, and
diff --git a/lib/rdoc/parsers/parse_rb.rb b/lib/rdoc/parsers/parse_rb.rb
index 8f1206409a..1a61c4bf1e 100644
--- a/lib/rdoc/parsers/parse_rb.rb
+++ b/lib/rdoc/parsers/parse_rb.rb
@@ -2389,12 +2389,12 @@ module RDoc
case tk
when TkSTRING
name = tk.text
- when TkCONSTANT, TkIDENTIFIER, TkIVAR, TkGVAR
- name = tk.name
+# when TkCONSTANT, TkIDENTIFIER, TkIVAR, TkGVAR
+# name = tk.name
when TkDSTRING
warn "Skipping require of dynamic string: #{tk.text}"
- else
- warn "'require' used as variable"
+ # else
+ # warn "'require' used as variable"
end
if name
context.add_require(Require.new(name, comment))