diff options
author | dave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-12-29 23:38:09 +0000 |
---|---|---|
committer | dave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-12-29 23:38:09 +0000 |
commit | 1da4596b0f968900723517ea007c47db84310478 (patch) | |
tree | 66f3c10112ec4bfb91fddfcbbe5805870061ffd6 | |
parent | db93a78e634d2328b1ab9be876e6c8cf28a45fe3 (diff) | |
download | ruby-1da4596b0f968900723517ea007c47db84310478.tar.gz |
Fix parse problem with complex yields
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | lib/rdoc/parsers/parse_rb.rb | 6 |
2 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,11 @@ +Tue Dec 30 08:32:32 2003 Dave Thomas <dave@pragprog.com> + + * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_method): + Handle undoing nsting of yield parameters correctly for: + + def each_entry(&b) Dir.foreach(@path) {|f| yield P.new(f) } end + + Tue Dec 30 07:30:00 2003 Gavin Sinclair <gsinclair@soyabean.com.au> * lib/pathname.rb: Added documentation. diff --git a/lib/rdoc/parsers/parse_rb.rb b/lib/rdoc/parsers/parse_rb.rb index 08d906c00d..380025ef8d 100644 --- a/lib/rdoc/parsers/parse_rb.rb +++ b/lib/rdoc/parsers/parse_rb.rb @@ -1987,11 +1987,13 @@ module RDoc nest = 0 loop do - puts("Param: #{tk}, #{@scanner.continue} " + - "#{@scanner.lex_state} #{nest}") if $DEBUG + puts("Param: #{tk.inspect}, #{@scanner.continue} " + + "#{@scanner.lex_state} #{nest}") if $DEBUG case tk when TkSEMICOLON break + when TkRBRACE + break when TkLPAREN, TkfLPAREN nest += 1 when end_token |