From f31065a8707a5807d01c855ba867131a104d2a5d Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Mon, 26 Apr 2010 10:00:18 -0700 Subject: regexp: allow escaping of any punctuation More in line with other regexp packages and egrep; accommodates overzealous escapers. R=r CC=golang-dev http://codereview.appspot.com/1008041 --- src/pkg/regexp/regexp.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/pkg/regexp/regexp.go') diff --git a/src/pkg/regexp/regexp.go b/src/pkg/regexp/regexp.go index f8d03d743..cdd5cacdd 100644 --- a/src/pkg/regexp/regexp.go +++ b/src/pkg/regexp/regexp.go @@ -298,8 +298,8 @@ func special(c int) bool { return false } -func specialcclass(c int) bool { - for _, r := range `\-[]` { +func ispunct(c int) bool { + for _, r := range "!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~" { if c == r { return true } @@ -344,7 +344,7 @@ func (p *parser) charClass() instr { p.error(ErrExtraneousBackslash) case c == 'n': c = '\n' - case specialcclass(c): + case ispunct(c): // c is as delivered default: p.error(ErrBadBackslash) @@ -439,7 +439,7 @@ func (p *parser) term() (start, end instr) { p.error(ErrExtraneousBackslash) case c == 'n': c = '\n' - case special(c): + case ispunct(c): // c is as delivered default: p.error(ErrBadBackslash) -- cgit v1.2.3