diff options
| author | Russ Cox <rsc@golang.org> | 2009-05-11 14:10:34 -0700 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2009-05-11 14:10:34 -0700 |
| commit | 87545816058bcaa088750e5b4a1512612254f847 (patch) | |
| tree | 979d1eb0ea7a8087a22d52e9e01b689950238d7f /src/lib/regexp/regexp.go | |
| parent | 5044afd9d31effe5591342bfdb1c7414b969e7ca (diff) | |
| download | golang-87545816058bcaa088750e5b4a1512612254f847.tar.gz | |
change utf8.FullRuneInString and utf8.DecodeRuneInString
to use single string argument instead of string, index.
R=r
DELTA=136 (9 added, 7 deleted, 120 changed)
OCL=28642
CL=28644
Diffstat (limited to 'src/lib/regexp/regexp.go')
| -rw-r--r-- | src/lib/regexp/regexp.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/regexp/regexp.go b/src/lib/regexp/regexp.go index 8cbd38035..b79800dd9 100644 --- a/src/lib/regexp/regexp.go +++ b/src/lib/regexp/regexp.go @@ -263,7 +263,7 @@ func (p *parser) nextc() int { if p.pos >= len(p.re.expr) { p.ch = endOfFile } else { - c, w := utf8.DecodeRuneInString(p.re.expr, p.pos); + c, w := utf8.DecodeRuneInString(p.re.expr[p.pos:len(p.re.expr)]); p.ch = c; p.pos += w; } @@ -653,7 +653,7 @@ func (re *Regexp) doExecute(str string, pos int) []int { charwidth := 1; c := endOfFile; if pos < len(str) { - c, charwidth = utf8.DecodeRuneInString(str, pos); + c, charwidth = utf8.DecodeRuneInString(str[pos:len(str)]); } for i := 0; i < len(s[in]); i++ { st := s[in][i]; |