1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't call private fail anymore.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14290 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
drbrain 2007-12-18 06:20:24 +00:00
parent 346e9e78f0
commit cbc4bb6b92
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Tue Dec 18 15:19:55 2007 Eric Hodel <drbrain@segment7.net>
* lib/rdoc/parsers/parse_rb.rb: Don't call private fail anymore.
Tue Dec 18 15:17:26 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Dec 18 15:17:26 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (encs, ext/ripper/ripper.c): pass MAKEFLAGS. * common.mk (encs, ext/ripper/ripper.c): pass MAKEFLAGS.

8
lib/rdoc/parsers/parse_rb.rb
View File

@ -115,7 +115,7 @@ module RubyToken
when String, Symbol when String, Symbol
source = token.kind_of?(String) ? TkReading2Token : TkSymbol2Token source = token.kind_of?(String) ? TkReading2Token : TkSymbol2Token
if (tk = source[token]).nil? if (tk = source[token]).nil?
IRB.fail TkReading2TokenNoKey, token fail TkReading2TokenNoKey, token
end end
tk = Token(tk[0], value) tk = Token(tk[0], value)
else else
@ -270,7 +270,7 @@ module RubyToken
def RubyToken.def_token(token_n, super_token = Token, reading = nil, *opts) def RubyToken.def_token(token_n, super_token = Token, reading = nil, *opts)
token_n = token_n.id2name unless token_n.kind_of?(String) token_n = token_n.id2name unless token_n.kind_of?(String)
if RubyToken.const_defined?(token_n) if RubyToken.const_defined?(token_n)
IRB.fail AlreadyDefinedToken, token_n fail AlreadyDefinedToken, token_n
end end
token_c = Class.new super_token token_c = Class.new super_token
@ -279,7 +279,7 @@ module RubyToken
if reading if reading
if TkReading2Token[reading] if TkReading2Token[reading]
IRB.fail TkReading2TokenDuplicateError, token_n, reading fail TkReading2TokenDuplicateError, token_n, reading
end end
if opts.empty? if opts.empty?
TkReading2Token[reading] = [token_c] TkReading2Token[reading] = [token_c]
@ -1127,7 +1127,7 @@ class RubyLex
elsif ch =~ /\W/ elsif ch =~ /\W/
lt = "\"" lt = "\""
else else
RubyLex.fail SyntaxError, "unknown type of %string ('#{ch}')" fail SyntaxError, "unknown type of %string ('#{ch}')"
end end
# if ch !~ /\W/ # if ch !~ /\W/
# ungetc # ungetc