diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -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 | ||||
| -rw-r--r-- | version.h | 2 |
5 files changed, 11 insertions, 5 deletions
@@ -1,3 +1,11 @@ +Sun Oct 11 10:27:09 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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. + Sun Oct 11 09:04:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * include/ruby/ruby.h (RB_GC_GUARD_PTR): workaround for gcc 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 @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 385 +#define RUBY_PATCHLEVEL 386 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 |