Imported Upstream version 2011.02.15

1 files changed, 9 insertions, 12 deletions

diff --git a/doc/codelab/wiki/srcextract.go b/doc/codelab/wiki/srcextract.go
index cab092f58..67294784e 100644
--- a/doc/codelab/wiki/srcextract.go
+++ b/doc/codelab/wiki/srcextract.go
@@ -9,6 +9,7 @@ import (
 	"go/token"
 	"log"
 	"os"
+	"template"
 )
 
 var (
@@ -31,15 +32,6 @@ func main() {
 	if err != nil {
 		log.Fatal(err)
 	}
-	// create printer
-	p := &printer.Config{
-		Mode:     0,
-		Tabwidth: 8,
-		Styler:   nil,
-	}
-	if *html {
-		p.Mode = printer.GenHTML
-	}
 	// create filter
 	filter := func(name string) bool {
 		return name == *getName
@@ -48,8 +40,9 @@ func main() {
 	if !ast.FilterFile(file, filter) {
 		os.Exit(1)
 	}
-	b := new(bytes.Buffer)
-	p.Fprint(b, fs, file)
+	// print the AST
+	var b bytes.Buffer
+	printer.Fprint(&b, fs, file)
 	// drop package declaration
 	if !*showPkg {
 		for {
@@ -71,5 +64,9 @@ func main() {
 		}
 	}
 	// output
-	b.WriteTo(os.Stdout)
+	if *html {
+		template.HTMLEscape(os.Stdout, b.Bytes())
+	} else {
+		b.WriteTo(os.Stdout)
+	}
 }