libgo: Update to Go 1.1.1.

From-SVN: r200974

6 files changed, 104 insertions, 8 deletions

diff --git a/libgo/go/go/doc/testdata/a.0.golden b/libgo/go/go/doc/testdata/a.0.golden
index 24db02d348f..cd98f4e0ebe 100644
--- a/libgo/go/go/doc/testdata/a.0.golden
+++ b/libgo/go/go/doc/testdata/a.0.golden
@@ -8,6 +8,25 @@ FILENAMES
 	testdata/a0.go
 	testdata/a1.go
 
+BUGS .Bugs is now deprecated, please use .Notes instead
+	// bug0
+	// bug1
+
 BUGS
-	// bug0 
-	// bug1 
+	// bug0 (uid: uid)
+	// bug1 (uid: uid)
+
+NOTES
+	// 1 of 4 - this is the first line of note 1 - note 1 continues on ... (uid: foo)
+	// 2 of 4 (uid: foo)
+	// 3 of 4 (uid: bar)
+	// 4 of 4 - this is the last line of note 4 (uid: bar)
+	// This note which contains a (parenthesized) subphrase must ... (uid: bam)
+	// The ':' after the marker and uid is optional. (uid: xxx)
+
+SECBUGS
+	// sec hole 0 need to fix asap (uid: uid)
+
+TODOS
+	// todo0 (uid: uid)
+	// todo1 (uid: uid)
diff --git a/libgo/go/go/doc/testdata/a.1.golden b/libgo/go/go/doc/testdata/a.1.golden
index 24db02d348f..cd98f4e0ebe 100644
--- a/libgo/go/go/doc/testdata/a.1.golden
+++ b/libgo/go/go/doc/testdata/a.1.golden
@@ -8,6 +8,25 @@ FILENAMES
 	testdata/a0.go
 	testdata/a1.go
 
+BUGS .Bugs is now deprecated, please use .Notes instead
+	// bug0
+	// bug1
+
 BUGS
-	// bug0 
-	// bug1 
+	// bug0 (uid: uid)
+	// bug1 (uid: uid)
+
+NOTES
+	// 1 of 4 - this is the first line of note 1 - note 1 continues on ... (uid: foo)
+	// 2 of 4 (uid: foo)
+	// 3 of 4 (uid: bar)
+	// 4 of 4 - this is the last line of note 4 (uid: bar)
+	// This note which contains a (parenthesized) subphrase must ... (uid: bam)
+	// The ':' after the marker and uid is optional. (uid: xxx)
+
+SECBUGS
+	// sec hole 0 need to fix asap (uid: uid)
+
+TODOS
+	// todo0 (uid: uid)
+	// todo1 (uid: uid)
diff --git a/libgo/go/go/doc/testdata/a.2.golden b/libgo/go/go/doc/testdata/a.2.golden
index 24db02d348f..cd98f4e0ebe 100644
--- a/libgo/go/go/doc/testdata/a.2.golden
+++ b/libgo/go/go/doc/testdata/a.2.golden
@@ -8,6 +8,25 @@ FILENAMES
 	testdata/a0.go
 	testdata/a1.go
 
+BUGS .Bugs is now deprecated, please use .Notes instead
+	// bug0
+	// bug1
+
 BUGS
-	// bug0 
-	// bug1 
+	// bug0 (uid: uid)
+	// bug1 (uid: uid)
+
+NOTES
+	// 1 of 4 - this is the first line of note 1 - note 1 continues on ... (uid: foo)
+	// 2 of 4 (uid: foo)
+	// 3 of 4 (uid: bar)
+	// 4 of 4 - this is the last line of note 4 (uid: bar)
+	// This note which contains a (parenthesized) subphrase must ... (uid: bam)
+	// The ':' after the marker and uid is optional. (uid: xxx)
+
+SECBUGS
+	// sec hole 0 need to fix asap (uid: uid)
+
+TODOS
+	// todo0 (uid: uid)
+	// todo1 (uid: uid)
diff --git a/libgo/go/go/doc/testdata/a0.go b/libgo/go/go/doc/testdata/a0.go
index dc552989ec2..2420c8a483a 100644
--- a/libgo/go/go/doc/testdata/a0.go
+++ b/libgo/go/go/doc/testdata/a0.go
@@ -6,3 +6,35 @@
 package a
 
 //BUG(uid): bug0
+
+//TODO(uid): todo0
+
+// A note with some spaces after it, should be ignored (watch out for
+// emacs modes that remove trailing whitespace).
+//NOTE(uid):
+
+// SECBUG(uid): sec hole 0
+// need to fix asap
+
+// Multiple notes may be in the same comment group and should be
+// recognized individually. Notes may start in the middle of a
+// comment group as long as they start at the beginning of an
+// individual comment.
+//
+// NOTE(foo): 1 of 4 - this is the first line of note 1
+// - note 1 continues on this 2nd line
+// - note 1 continues on this 3rd line
+// NOTE(foo): 2 of 4
+// NOTE(bar): 3 of 4
+/* NOTE(bar): 4 of 4 */
+// - this is the last line of note 4
+//
+//
+
+// NOTE(bam): This note which contains a (parenthesized) subphrase
+//            must appear in its entirety.
+
+// NOTE(xxx) The ':' after the marker and uid is optional.
+
+// NOTE(): NO uid - should not show up.
+// NOTE()  NO uid - should not show up.
diff --git a/libgo/go/go/doc/testdata/a1.go b/libgo/go/go/doc/testdata/a1.go
index 098776c1b0e..9fad1e09bc4 100644
--- a/libgo/go/go/doc/testdata/a1.go
+++ b/libgo/go/go/doc/testdata/a1.go
@@ -6,3 +6,7 @@
 package a
 
 //BUG(uid): bug1
+
+//TODO(uid): todo1
+
+//TODO(): ignored
diff --git a/libgo/go/go/doc/testdata/template.txt b/libgo/go/go/doc/testdata/template.txt
index 32e331cdd10..26482f7c246 100644
--- a/libgo/go/go/doc/testdata/template.txt
+++ b/libgo/go/go/doc/testdata/template.txt
@@ -60,6 +60,9 @@ TYPES
 {{end}}{{end}}{{end}}{{/*
 
 */}}{{with .Bugs}}
-BUGS
+BUGS .Bugs is now deprecated, please use .Notes instead
 {{range .}}	{{synopsis .}}
-{{end}}{{end}}
\ No newline at end of file
+{{end}}{{end}}{{with .Notes}}{{range $marker, $content := .}}
+{{$marker}}S
+{{range $content}}	{{synopsis .Body}} (uid: {{.UID}})
+{{end}}{{end}}{{end}}
\ No newline at end of file