diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-11 01:27:11 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-11 01:27:11 +0000 |
| commit | df19c50717636a94c0ada2262e1b82c5fd03ae93 (patch) | |
| tree | 1729485c52a04fb48f5db9dbae52a2de040e9e2d | |
| parent | b4eaeccf410febb531677cf8df5eb615c7f666d1 (diff) | |
| download | ruby-df19c50717636a94c0ada2262e1b82c5fd03ae93.tar.gz ruby-df19c50717636a94c0ada2262e1b82c5fd03ae93.tar.xz ruby-df19c50717636a94c0ada2262e1b82c5fd03ae93.zip | |
* 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.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@25297 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | lib/irb/context.rb | 2 | ||||
| -rw-r--r-- | lib/irb/ruby-lex.rb | 2 |
3 files changed, 9 insertions, 3 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 10:04:35 2009 NARUSE, Yui <naruse@ruby-lang.org> * regparse.c (fetch_token_in_cc): warn when \p is not diff --git a/lib/irb/context.rb b/lib/irb/context.rb index d7822d6f2..497d7bf63 100644 --- a/lib/irb/context.rb +++ b/lib/irb/context.rb @@ -165,8 +165,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/ruby-lex.rb b/lib/irb/ruby-lex.rb index b49337c1c..5a6c2894f 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 |