From: Brian Ketelsen Date: Tue, 11 Dec 2012 17:02:14 +0000 (-0500) Subject: regexp/syntax: export ErrUnexpectedParen X-Git-Tag: go1.1rc2~1671 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=1b46e4cd9ac75db790e75ee801a6e805b6f4ec20;p=gostls13.git regexp/syntax: export ErrUnexpectedParen Fixes #3712 R=golang-dev, dave, rsc CC=golang-dev https://golang.org/cl/6902069 --- diff --git a/src/pkg/regexp/syntax/parse.go b/src/pkg/regexp/syntax/parse.go index 999bc995b6..30e0e8b7fe 100644 --- a/src/pkg/regexp/syntax/parse.go +++ b/src/pkg/regexp/syntax/parse.go @@ -42,11 +42,9 @@ const ( ErrMissingParen ErrorCode = "missing closing )" ErrMissingRepeatArgument ErrorCode = "missing argument to repetition operator" ErrTrailingBackslash ErrorCode = "trailing backslash at end of expression" + ErrUnexpectedParen ErrorCode = "unexpected )" ) -// TODO: Export for Go 1.1. -const errUnexpectedParen ErrorCode = "unexpected )" - func (e ErrorCode) String() string { return string(e) } @@ -1167,13 +1165,13 @@ func (p *parser) parseRightParen() error { n := len(p.stack) if n < 2 { - return &Error{errUnexpectedParen, p.wholeRegexp} + return &Error{ErrUnexpectedParen, p.wholeRegexp} } re1 := p.stack[n-1] re2 := p.stack[n-2] p.stack = p.stack[:n-2] if re2.Op != opLeftParen { - return &Error{errUnexpectedParen, p.wholeRegexp} + return &Error{ErrUnexpectedParen, p.wholeRegexp} } // Restore flags at time of paren. p.flags = re2.Flags