diff options
| author | dave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-02-23 21:41:14 +0000 |
|---|---|---|
| committer | dave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-02-23 21:41:14 +0000 |
| commit | 810854455daf79ee979497fb7a9c5e8efb396f3e (patch) | |
| tree | 8282da8c9857cf19f80cbf3e00b1925bb510af44 | |
| parent | a928cfed87c27f180ce9f76ffb8448282d629fc4 (diff) | |
Handle class vars in code listings
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5818 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/rdoc/parsers/parse_rb.rb | 6 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Tue Feb 24 06:40:14 2004 Dave Thomas <dave@pragprog.com> + + * lib/rdoc/parsers/parse_rb.rb (RubyLex::identify_identifier): Handle + class variables in code listings + Tue Feb 24 06:32:27 2004 Dave Thomas <dave@pragprog.com> * lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::do_aliases): Handle diff --git a/lib/rdoc/parsers/parse_rb.rb b/lib/rdoc/parsers/parse_rb.rb index fd57ee2e4b..e3af27d3f7 100644 --- a/lib/rdoc/parsers/parse_rb.rb +++ b/lib/rdoc/parsers/parse_rb.rb @@ -917,7 +917,7 @@ class RubyLex end @OP.def_rule('@') do - if peek(0) =~ /[\w_]/ + if peek(0) =~ /[@\w_]/ ungetc identify_identifier else @@ -992,6 +992,8 @@ class RubyLex def identify_identifier token = "" token.concat getc if peek(0) =~ /[$@]/ + token.concat getc if peek(0) == "@" + while (ch = getc) =~ /\w|_/ print ":", ch, ":" if RubyLex.debug? token.concat ch @@ -1003,7 +1005,7 @@ class RubyLex end # fix token -# puts "identifier - #{token}, state = #@lex_state" + # $stderr.puts "identifier - #{token}, state = #@lex_state" case token when /^\$/ |