From df19c50717636a94c0ada2262e1b82c5fd03ae93 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 11 Oct 2009 01:27:11 +0000
Subject: * 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
---
 lib/irb/context.rb  | 2 --
 lib/irb/ruby-lex.rb | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'lib')

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
-- 
cgit