aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--lib/irb/ruby-lex.rb4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 43e4a9ebe5..e5876a9975 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Apr 18 02:13:59 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * lib/irb/ruby-lex.rb (identify_identifier): add '_' to the regexp.
+
Sat Apr 17 23:21:15 2010 NARUSE, Yui <naruse@ruby-lang.org>
* configure.in: use AC_TRY_LINK instead of AC_TRY_COMPILE.
diff --git a/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb
index 846c5f24bb..76e3ebac44 100644
--- a/lib/irb/ruby-lex.rb
+++ b/lib/irb/ruby-lex.rb
@@ -727,7 +727,7 @@ class RubyLex
printf "MATCH: start %s: %s\n", op, io.inspect if RubyLex.debug?
if peek(0) =~ /[0-9]/
t = identify_number
- elsif peek(0) =~ /[^\x00-\/:-@\[-`{-\x7F]/
+ elsif peek(0) =~ /[^\x00-\/:-@\[-^`{-\x7F]/
t = identify_identifier
end
printf "MATCH: end %s: %s\n", op, io.inspect if RubyLex.debug?
@@ -770,7 +770,7 @@ class RubyLex
end
end
- while (ch = getc) =~ /[^\x00-\/:-@\[-`{-\x7F]/
+ while (ch = getc) =~ /[^\x00-\/:-@\[-^`{-\x7F]/
print ":", ch, ":" if RubyLex.debug?
token.concat ch
end