summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-05-13 17:22:08 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-05-13 17:22:08 +0000
commit73667560792c0dc7bdbcd96b4ba56c65ba558506 (patch)
tree525f65e847a44be0fc424888bd36c4fa17661f38
parent6d53b692ab91c8817736cdec78b388e6e4990806 (diff)
escape `/'.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@689 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--.cvsignore1
-rw-r--r--ChangeLog10
-rw-r--r--lib/irb/ruby-lex.rb2
3 files changed, 9 insertions, 4 deletions
diff --git a/.cvsignore b/.cvsignore
index c1bdd084b3..be335897bb 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -10,6 +10,7 @@ config.status
Makefile
ppack
archive
+extmk.rb
*.orig
*.rej
*.bak
diff --git a/ChangeLog b/ChangeLog
index e7e16d4d07..ddfc48de12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
+Sun May 14 02:02:48 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
+
+ * lib/irb/ruby-lex.rb: '/' should be escaped in charcter class.
+
Sun May 14 00:54:43 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
- * configure.in, ...: suport mingw32.
+ * configure.in, ...: support mingw32.
* defines.h: ditto. undef EXTERN for tcl/tk on cygwin.
@@ -3433,7 +3437,7 @@ Wed Jan 20 03:39:48 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
* parse.y (yycompile): rb_in_compile renamed to ruby_in_compile.
- * ruby.c (load_file): define DATA iff __END__ appeared in script.
+ * ruby.c (load_file): define DATA if __END__ appeared in script.
Tue Jan 19 14:57:51 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
@@ -3570,7 +3574,7 @@ Thu Dec 24 00:17:00 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
* eval.c (rb_load): top self should be set properly.
- * variable.c (classname): check __classpath__ iff it is defined.
+ * variable.c (classname): check __classpath__ if it is defined.
* variable.c (classname): invalid warning at -v with static linked
ruby interpreter.
diff --git a/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb
index e66ba8879e..a788b779b4 100644
--- a/lib/irb/ruby-lex.rb
+++ b/lib/irb/ruby-lex.rb
@@ -659,7 +659,7 @@ class RubyLex
@lex_state = EXPR_END
case ch = getc
- when /[~_*$?!@/\\;,=:<>".]/ #"
+ when /[~_*$?!@\/\\;,=:<>".]/ #"
Token(TkGVAR, "$" + ch)
when "-"
Token(TkGVAR, "$-" + getc)