diff options
| author | dave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-05-26 05:02:55 +0000 |
|---|---|---|
| committer | dave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-05-26 05:02:55 +0000 |
| commit | 129313378fbefab34fe4d8cf8d47df9f5fc714bc (patch) | |
| tree | b90a436eec983648368141bc1e9cac397c215d54 /lib/rdoc/parsers | |
| parent | 13ebee7a9e4c38d7f89b0cbed9036b2692ff3c42 (diff) | |
Allow "do" after "for". Fix up css for standalone code window
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6407 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rdoc/parsers')
| -rw-r--r-- | lib/rdoc/parsers/parse_rb.rb | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/lib/rdoc/parsers/parse_rb.rb b/lib/rdoc/parsers/parse_rb.rb index 8a23b6881f..bd2414826c 100644 --- a/lib/rdoc/parsers/parse_rb.rb +++ b/lib/rdoc/parsers/parse_rb.rb @@ -1675,7 +1675,15 @@ module RDoc "line #{tk.line_no}" if $DEBUG skip_optional_do_after_expression - when TkCASE, TkDO, TkIF, TkUNLESS, TkBEGIN, TkFOR + # 'for' is trickier + when TkFOR + nest += 1 + puts "FOUND #{tk.class} in #{container.name}, nest = #{nest}, " + + "line #{tk.line_no}" if $DEBUG + 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 @@ -2046,6 +2054,15 @@ module RDoc res end + # skip the var [in] part of a 'for' statement + def skip_for_variable + skip_tkspace(false) + tk = get_tk + skip_tkspace(false) + tk = get_tk + unget_tk(tk) unless tk.kind_of?(TkIN) + end + # while, until, and for have an optional def skip_optional_do_after_expression skip_tkspace(false) |