From 506cf9aaead4f5519f5549a918d285365b44e989 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Fri, 2 Dec 2011 19:34:41 +0000 Subject: libgo: Update to weekly.2011-11-01. From-SVN: r181938 --- libgo/go/path/filepath/match.go | 4 ++-- libgo/go/path/match.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'libgo/go/path') diff --git a/libgo/go/path/filepath/match.go b/libgo/go/path/filepath/match.go index 0ccc87e..15c84a7 100644 --- a/libgo/go/path/filepath/match.go +++ b/libgo/go/path/filepath/match.go @@ -136,7 +136,7 @@ func matchChunk(chunk, s string) (rest string, ok bool, err os.Error) { chunk = chunk[1:] break } - var lo, hi int + var lo, hi rune if lo, chunk, err = getEsc(chunk); err != nil { return } @@ -183,7 +183,7 @@ func matchChunk(chunk, s string) (rest string, ok bool, err os.Error) { } // getEsc gets a possibly-escaped character from chunk, for a character class. -func getEsc(chunk string) (r int, nchunk string, err os.Error) { +func getEsc(chunk string) (r rune, nchunk string, err os.Error) { if len(chunk) == 0 || chunk[0] == '-' || chunk[0] == ']' { err = ErrBadPattern return diff --git a/libgo/go/path/match.go b/libgo/go/path/match.go index efb8c5c..e9d0327 100644 --- a/libgo/go/path/match.go +++ b/libgo/go/path/match.go @@ -136,7 +136,7 @@ func matchChunk(chunk, s string) (rest string, ok bool, err os.Error) { chunk = chunk[1:] break } - var lo, hi int + var lo, hi rune if lo, chunk, err = getEsc(chunk); err != nil { return } @@ -183,7 +183,7 @@ func matchChunk(chunk, s string) (rest string, ok bool, err os.Error) { } // getEsc gets a possibly-escaped character from chunk, for a character class. -func getEsc(chunk string) (r int, nchunk string, err os.Error) { +func getEsc(chunk string) (r rune, nchunk string, err os.Error) { if len(chunk) == 0 || chunk[0] == '-' || chunk[0] == ']' { err = ErrBadPattern return -- cgit v1.1