diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-24 03:43:27 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-24 03:43:27 +0000 |
commit | ea39ef731298fafbcedb2d0b9d56a815312207af (patch) | |
tree | 9acdb897667613ac6100067ff8a41e9d7963f0b2 | |
parent | 2da14728063aa8adfb03fbfc0dfd2e7aef8f8bcb (diff) |
merge revision(s) 44878,44879: [Backport #9483]
* ext/ripper/lib/ripper/lexer.rb: [DOC] use lower case version of core
classes when referring to return value, since we aren't directly
talking about the class. Patch by Jonathan Jackson [Bug #9483]
* lib/open-uri.rb: [DOC] use lower case version of core classes, same
as commit r44878, based on patch by Jonathan Jackson [Bug #9483]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@45158 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | ext/ripper/lib/ripper/lexer.rb | 10 | ||||
-rw-r--r-- | lib/open-uri.rb | 5 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 22 insertions, 6 deletions
@@ -1,3 +1,14 @@ +Mon Feb 24 12:42:01 2014 Zachary Scott <e@zzak.io> + + * lib/open-uri.rb: [DOC] use lower case version of core classes, same + as commit r44878, based on patch by Jonathan Jackson [Bug #9483] + +Mon Feb 24 12:42:01 2014 Zachary Scott <e@zzak.io> + + * ext/ripper/lib/ripper/lexer.rb: [DOC] use lower case version of core + classes when referring to return value, since we aren't directly + talking about the class. Patch by Jonathan Jackson [Bug #9483] + Mon Feb 24 12:39:11 2014 Zachary Scott <e@zzak.io> * ext/openssl/ossl_pkey_dh.c: Fixed typo by Sandor Szuecs [Bug #9243] diff --git a/ext/ripper/lib/ripper/lexer.rb b/ext/ripper/lib/ripper/lexer.rb index 5bbee39e06..ac4dcafd65 100644 --- a/ext/ripper/lib/ripper/lexer.rb +++ b/ext/ripper/lib/ripper/lexer.rb @@ -12,13 +12,17 @@ require 'ripper/core' class Ripper - # Tokenizes Ruby program and returns an Array of String. + # Tokenizes the Ruby program and returns an array of strings. + # + # p Ripper.tokenize("def m(a) nil end") + # # => ["def", " ", "m", "(", "a", ")", " ", "nil", " ", "end"] + # def Ripper.tokenize(src, filename = '-', lineno = 1) Lexer.new(src, filename, lineno).tokenize end - # Tokenizes Ruby program and returns an Array of Array, - # which is formatted like [[lineno, column], type, token]. + # Tokenizes the Ruby program and returns an array of an array, + # which is formatted like <code>[[lineno, column], type, token]</code>. # # require 'ripper' # require 'pp' diff --git a/lib/open-uri.rb b/lib/open-uri.rb index 3241c3b27a..f0cfec94e4 100644 --- a/lib/open-uri.rb +++ b/lib/open-uri.rb @@ -508,8 +508,9 @@ module OpenURI end end - # returns a list of encodings in Content-Encoding field - # as an Array of String. + # Returns a list of encodings in Content-Encoding field as an array of + # strings. + # # The encodings are downcased for canonicalization. def content_encoding v = @meta['content-encoding'] @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 544 +#define RUBY_PATCHLEVEL 545 #define RUBY_RELEASE_DATE "2014-02-24" #define RUBY_RELEASE_YEAR 2014 |