From a0ec9f61d1cff2df36c254fb78bfdaa14b0292a9 Mon Sep 17 00:00:00 2001 From: akr Date: Tue, 26 Feb 2008 06:44:53 +0000 Subject: * parse.y (tokadd_escape): refactored. [ruby-core:15657] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@15608 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ parse.y | 10 ++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6608f9182a..9c16ea6fc9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Feb 26 15:43:42 2008 Tanaka Akira + + * parse.y (tokadd_escape): refactored. [ruby-core:15657] + Mon Feb 25 17:30:29 2008 Technorama Ltd. * ext/openssl/digest.c ext/openssl/lib/openssl/digest.rb: diff --git a/parse.y b/parse.y index 453d77683a..bde4c1d095 100644 --- a/parse.y +++ b/parse.y @@ -2890,8 +2890,7 @@ read_escape() } static int -tokadd_escape(term) - int term; +tokadd_escape() { int c; @@ -2956,7 +2955,7 @@ tokadd_escape(term) tokadd('\\'); tokadd('c'); escaped: if ((c = nextc()) == '\\') { - return tokadd_escape(term); + return tokadd_escape(); } else if (c == -1) goto eof; tokadd(c); @@ -2968,8 +2967,7 @@ tokadd_escape(term) return -1; default: - if (c != '\\' || c != term) - tokadd('\\'); + tokadd('\\'); tokadd(c); } return 0; @@ -3089,7 +3087,7 @@ tokadd_string(func, term, paren, nest) default: if (func & STR_FUNC_REGEXP) { pushback(c); - if (tokadd_escape(term) < 0) + if (tokadd_escape() < 0) return -1; continue; } -- cgit v1.2.3