summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-06-22 16:47:31 +0000
committerdave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-06-22 16:47:31 +0000
commit417f9ec4aa93958452059b84f33dbee8423139c6 (patch)
tree2b831351a44eecd5607e01430b5e19e3802fe8bf
parent8aa7a962381e9dc1baa4ef5f16e0c3bb18174d0a (diff)
Fixed parsing of %r{} when generating source popup
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/rdoc/parsers/parse_rb.rb1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e3c52fe7af..8915fcdcad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun 23 01:45:27 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/parsers/parse_rb.rb (RubyLex::identify_quotation):
+ Fix problem with the 'r' being dropped from %r{xxx}
+
Wed Jun 23 00:10:17 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* ext/win32ole/win32ole.c (ole_hresult2msg): remove trailing
diff --git a/lib/rdoc/parsers/parse_rb.rb b/lib/rdoc/parsers/parse_rb.rb
index bd2414826c..70236af343 100644
--- a/lib/rdoc/parsers/parse_rb.rb
+++ b/lib/rdoc/parsers/parse_rb.rb
@@ -1123,6 +1123,7 @@ class RubyLex
def identify_quotation(initial_char)
ch = getc
if lt = PERCENT_LTYPE[ch]
+ initial_char += ch
ch = getc
elsif ch =~ /\W/
lt = "\""