From 4eaf05c847bd32d246968b68c8d6c88381ce5c01 Mon Sep 17 00:00:00 2001
From: drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 8 Dec 2012 21:19:22 +0000
Subject: * lib/rdoc/markdown/entities.rb:  Added documentation.

* lib/rdoc/parser/ruby.rb:  Updated style

* lib/rdoc/ruby_lex.rb:  Parse characters up to \u{FFFFF}
* test/rdoc/test_rdoc_ruby_lex.rb:  Test for above.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38277 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/rdoc/markdown/entities.rb |  3 +++
 lib/rdoc/parser/ruby.rb       | 10 +++++-----
 lib/rdoc/ruby_lex.rb          |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/rdoc/markdown/entities.rb b/lib/rdoc/markdown/entities.rb
index 2b45f20d37..0661abab78 100644
--- a/lib/rdoc/markdown/entities.rb
+++ b/lib/rdoc/markdown/entities.rb
@@ -1,3 +1,6 @@
+##
+# HTML entity name map for RDoc::Markdown
+
 RDoc::Markdown::HTML_ENTITIES = {
   "AElig" => [0x000C6],
   "AMP" => [0x00026],
diff --git a/lib/rdoc/parser/ruby.rb b/lib/rdoc/parser/ruby.rb
index 31e31b5ce9..d42b70b516 100644
--- a/lib/rdoc/parser/ruby.rb
+++ b/lib/rdoc/parser/ruby.rb
@@ -1300,16 +1300,16 @@ class RDoc::Parser::Ruby < RDoc::Parser
   #
   # and add this as the block_params for the method
 
-  def parse_method_parameters(method)
+  def parse_method_parameters method
     res = parse_method_or_yield_parameters method
 
     res = "(#{res})" unless res =~ /\A\(/
     method.params = res unless method.params
 
-    if method.block_params.nil? then
-      skip_tkspace false
-      read_documentation_modifiers method, RDoc::METHOD_MODIFIERS
-    end
+    return if  method.block_params
+
+    skip_tkspace false
+    read_documentation_modifiers method, RDoc::METHOD_MODIFIERS
   end
 
   ##
diff --git a/lib/rdoc/ruby_lex.rb b/lib/rdoc/ruby_lex.rb
index 845569b0bc..313e69ea47 100644
--- a/lib/rdoc/ruby_lex.rb
+++ b/lib/rdoc/ruby_lex.rb
@@ -857,7 +857,7 @@ class RDoc::RubyLex
   end
 
   IDENT_RE = if defined? Encoding then
-               /[\w\u0080-\uFFFF]/u
+               eval '/[\w\u{0080}-\u{FFFFF}]/u' # 1.8 can't parse \u{}
              else
                /[\w\x80-\xFF]/
              end
-- 
cgit v1.2.3