diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-01-30 12:46:10 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-01-30 12:46:10 +0000 |
commit | 25d896eaead4ab0e88e7265c8bab20e2d2ead055 (patch) | |
tree | 51473dbc81f07e5462edc846c0aee798ac209f36 /lib | |
parent | f73a2e8e2a787bfa777dea7342e6d433d8df52ac (diff) |
merges r25297 from trunk into ruby_1_9_1.
and another fix for [ruby-core:26047].
--
* lib/irb/context.rb (IRB::Context#irb_name): removed duplicated
attr_reader. [ruby-core:26047]
* lib/irb/ruby-lex.rb (RubyLex#lex_int2): removed duplicated
character class range.
--
* lib/irb/extend-command.rb (IRB::def_extend_command): [ruby-core:26047]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@26480 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/irb/context.rb | 2 | ||||
-rw-r--r-- | lib/irb/extend-command.rb | 2 | ||||
-rw-r--r-- | lib/irb/ruby-lex.rb | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/lib/irb/context.rb b/lib/irb/context.rb index e2ab05a341..4459d78005 100644 --- a/lib/irb/context.rb +++ b/lib/irb/context.rb @@ -163,8 +163,6 @@ module IRB @workspace.evaluate self, "_ = IRB.CurrentContext.last_value" end - attr_reader :irb_name - def prompt_mode=(mode) @prompt_mode = mode pconf = IRB.conf[:PROMPT][mode] diff --git a/lib/irb/extend-command.rb b/lib/irb/extend-command.rb index 862857466a..1f347c2d0d 100644 --- a/lib/irb/extend-command.rb +++ b/lib/irb/extend-command.rb @@ -131,7 +131,7 @@ module IRB args << "*opts" arity = -arity - 1 end - args.unshift *(1..arity).map {|i| "arg" + i.to_s } + args.unshift(*(1..arity).map {|i| "arg" + i.to_s }) args << "&block" args = args.join(", ") eval <<-"EOS2", binding, __FILE__, __LINE__+1 diff --git a/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb index aee36f95c3..676c26e584 100644 --- a/lib/irb/ruby-lex.rb +++ b/lib/irb/ruby-lex.rb @@ -705,7 +705,7 @@ class RubyLex @OP.def_rule('@') do |op, io| - if peek(0) =~ /[\w_@]/ + if peek(0) =~ /[\w@]/ ungetc identify_identifier else |