From: Andrew Gerrand <adg@golang.org>
Date: Thu, 5 Jan 2012 05:43:02 +0000 (+1100)
Subject: doc/progs: test defer programs
X-Git-Tag: weekly.2012-01-15~148
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=8f1cb093ff3af8efc426112231e99e887ebe8944;p=gostls13.git

doc/progs: test defer programs

R=golang-dev, iant
CC=golang-dev
https://golang.org/cl/5517044
---

diff --git a/doc/progs/defer.go b/doc/progs/defer.go
index f52278aef2..098cdf26b1 100644
--- a/doc/progs/defer.go
+++ b/doc/progs/defer.go
@@ -18,6 +18,7 @@ func a() {
 	i++
 	return
 }
+
 // STOP OMIT
 
 func b() {
@@ -25,12 +26,14 @@ func b() {
 		defer fmt.Print(i)
 	}
 }
+
 // STOP OMIT
 
 func c() (i int) {
 	defer func() { i++ }()
 	return 1
 }
+
 // STOP OMIT
 
 // Intial version.
@@ -50,4 +53,12 @@ func CopyFile(dstName, srcName string) (written int64, err error) {
 	src.Close()
 	return
 }
+
 // STOP OMIT
+
+func main() {
+	a()
+	b()
+	fmt.Println()
+	fmt.Println(c())
+}
diff --git a/doc/progs/run b/doc/progs/run
index 7ceec7466e..9cb6f8d79f 100755
--- a/doc/progs/run
+++ b/doc/progs/run
@@ -95,6 +95,8 @@ testit helloworld3 "" "hello, world can't open file; err=no such file or directo
 testit echo "hello, world" "hello, world"
 testit sum "" "6"
 testit strings "" ""
+testit defer "" "0 3210 2"
+testit defer2 "" "Calling g. Printing in g 0 Printing in g 1 Printing in g 2 Printing in g 3 Panicking! Defer in g 3 Defer in g 2 Defer in g 1 Defer in g 0 Recovered in f 4 Returned normally from f."
 
 alphabet=abcdefghijklmnopqrstuvwxyz
 rot13=nopqrstuvwxyzabcdefghijklm