From ece237c27e3c0287303e1fed95c4c5756604242b Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 22 Jul 2004 03:50:33 +0000
Subject: * lib/irb/ruby-lex.rb (RubyLex::identify_string): %s string do not  
 process expression interpolation.  [ruby-talk:106691]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@6684 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/debug.rb        | 4 ++--
 lib/irb/ruby-lex.rb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/debug.rb b/lib/debug.rb
index 0a105abab..1b12188a7 100644
--- a/lib/debug.rb
+++ b/lib/debug.rb
@@ -189,10 +189,10 @@ class Context
 
   def debug_variable_info(input, binding)
     case input
-    when /^\s*g(?:lobal)?$/
+    when /^\s*g(?:lobal)?\s*$/
       var_list(global_variables, binding)
 
-    when /^\s*l(?:ocal)?$/
+    when /^\s*l(?:ocal)?\s*$/
       var_list(eval("local_variables", binding), binding)
 
     when /^\s*i(?:nstance)?\s+/
diff --git a/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb
index 6b445a32b..5a1ede7e3 100644
--- a/lib/irb/ruby-lex.rb
+++ b/lib/irb/ruby-lex.rb
@@ -973,7 +973,7 @@ class RubyLex
       while ch = getc
 	if @quoted == ch and nest == 0
 	  break
-	elsif @ltype != "'" && @ltype != "]" and ch == "#"
+	elsif @ltype != "'" && @ltype != "]" && @ltype != ":" and ch == "#"
 	  subtype = true
 	elsif ch == '\\' #'
 	  read_escape
-- 
cgit