From 9c63abc9a1d127f95162756467284cf76b47aff8 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Wed, 7 Dec 2011 01:11:29 +0000
Subject: libgo: Update to weekly 2011-11-09.

From-SVN: r182073
---
 libgo/go/regexp/exec_test.go                    |   4 ++--
 libgo/go/regexp/regexp.go                       |   2 +-
 libgo/go/regexp/syntax/parse.go                 |   2 +-
 libgo/go/regexp/testdata/re2-exhaustive.txt.bz2 | Bin 0 -> 394016 bytes
 4 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 libgo/go/regexp/testdata/re2-exhaustive.txt.bz2

(limited to 'libgo/go/regexp')

diff --git a/libgo/go/regexp/exec_test.go b/libgo/go/regexp/exec_test.go
index 499d1a5..d981f54 100644
--- a/libgo/go/regexp/exec_test.go
+++ b/libgo/go/regexp/exec_test.go
@@ -9,15 +9,15 @@ import (
 	"compress/bzip2"
 	"fmt"
 	"io"
+	"math/rand"
 	old "old/regexp"
 	"os"
 	"path/filepath"
-	"rand"
 	"regexp/syntax"
 	"strconv"
 	"strings"
 	"testing"
-	"utf8"
+	"unicode/utf8"
 )
 
 // TestRE2 tests this package's regexp API against test cases
diff --git a/libgo/go/regexp/regexp.go b/libgo/go/regexp/regexp.go
index 9e9fb85..b906076 100644
--- a/libgo/go/regexp/regexp.go
+++ b/libgo/go/regexp/regexp.go
@@ -60,7 +60,7 @@ import (
 	"strconv"
 	"strings"
 	"sync"
-	"utf8"
+	"unicode/utf8"
 )
 
 var debug = false
diff --git a/libgo/go/regexp/syntax/parse.go b/libgo/go/regexp/syntax/parse.go
index ba5c0a1..2ad682f 100644
--- a/libgo/go/regexp/syntax/parse.go
+++ b/libgo/go/regexp/syntax/parse.go
@@ -8,7 +8,7 @@ import (
 	"sort"
 	"strings"
 	"unicode"
-	"utf8"
+	"unicode/utf8"
 )
 
 // An Error describes a failure to parse a regular expression
diff --git a/libgo/go/regexp/testdata/re2-exhaustive.txt.bz2 b/libgo/go/regexp/testdata/re2-exhaustive.txt.bz2
new file mode 100644
index 0000000..a357f28
Binary files /dev/null and b/libgo/go/regexp/testdata/re2-exhaustive.txt.bz2 differ
-- 
cgit v1.1