Merge pull request #1310 from iij/pr-fix-regexp-escape

Avoid read_escape() in case of regexp

Merge pull request #1310 from iij/pr-fix-regexp-escape
Avoid read_escape() in case of regexp
9f154dd7 · Yukihiro "Matz" Matsumoto · b44309b4 · dfb4d555 · 9f154dd7
Commit 9f154dd7 authored Jun 29, 2013 by Yukihiro "Matz" Matsumoto
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 5 deletions

src/parse.y src/parse.y +7 -5

No files found.
--- a/src/parse.y
+++ b/src/parse.y
@@ -3620,12 +3620,14 @@ parse_string(parser_state *p)
 	  tokadd(p, '\n');
 	}
 	else {
-	  pushback(p, c);
-
-	  if(type & STR_FUNC_REGEXP)
+	  if (type & STR_FUNC_REGEXP) {
 	    tokadd(p, '\\');
-
-	  tokadd(p, read_escape(p));
+	    if (c != -1)
+	      tokadd(p, c);
+	  } else {
+	    pushback(p, c);
+	    tokadd(p, read_escape(p));
+	  }
 	  if (hinf)
 	    hinf->line_head = FALSE;
 	}