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 | 99b56d216595b45dee1dbc19e2dbe9c437322ef8 (patch) | |
tree | ef2cfcc76f47342503e44e881ae7cb0ab5beb3ac | |
parent | fe708e5bd7314c25ecb06596065e1bc4c9d6739e (diff) | |
download | ruby-99b56d216595b45dee1dbc19e2dbe9c437322ef8.tar.gz |
Handle class vars in code listings
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@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 /^\$/ |