From c7868668121470b56f173a596b750e8a27fe9e18 Mon Sep 17 00:00:00 2001 From: matz Date: Mon, 20 Aug 2001 04:29:58 +0000 Subject: * range.c (range_step): 'iter' here should be an array. * marshal.c (w_object): should retrieve __member__ data from non-singleton class. * variable.c (rb_cvar_get): class variable override check added. * variable.c (rb_cvar_set): ditto * variable.c (rb_cvar_declare): ditto. * parse.y (parse_regx): handle backslash escaping of delimiter here. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1703 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- parse.y | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'parse.y') diff --git a/parse.y b/parse.y index bebfc3a5ac..c9337bce3a 100644 --- a/parse.y +++ b/parse.y @@ -2327,7 +2327,8 @@ read_escape() } static int -tokadd_escape() +tokadd_escape(term) + int term; { int c; @@ -2388,7 +2389,7 @@ tokadd_escape() tokadd('\\'); tokadd('c'); escaped: if ((c = nextc()) == '\\') { - return tokadd_escape(); + return tokadd_escape(term); } else if (c == -1) goto eof; tokadd(c); @@ -2400,7 +2401,8 @@ tokadd_escape() return -1; default: - tokadd('\\'); + if (c == '/' && c != term) + tokadd('\\'); tokadd(c); } return 0; @@ -2431,7 +2433,7 @@ parse_regx(term, paren) continue; case '\\': - if (tokadd_escape() < 0) + if (tokadd_escape(term) < 0) return 0; continue; -- cgit v1.2.3