assorted cleanup

R=r, iant
CC=go-dev
http://go/go-review/1025024

7 files changed, 14 insertions, 41 deletions

diff --git a/src/cmd/gc/print.c b/src/cmd/gc/print.c
index 2960f2a11..14dd57fa1 100644
--- a/src/cmd/gc/print.c
+++ b/src/cmd/gc/print.c
@@ -293,7 +293,7 @@ exprfmt(Fmt *f, Node *n, int prec)
 	case OCONVIFACE:
 	case OARRAYBYTESTR:
 	case ORUNESTR:
-		if(n->type->sym == S)
+		if(n->type == T || n->type->sym == S)
 			fmtprint(f, "(%T)(", n->type);
 		else
 			fmtprint(f, "%T(", n->type);
diff --git a/src/pkg/bufio/bufio.go b/src/pkg/bufio/bufio.go
index e66d72a35..c529f7d94 100644
--- a/src/pkg/bufio/bufio.go
+++ b/src/pkg/bufio/bufio.go
@@ -15,12 +15,6 @@ import (
 )
 
 
-// TODO:
-//	- maybe define an interface
-//	- Reader: ReadRune, UnreadRune ?
-//		could make ReadRune generic if we dropped UnreadRune
-//	- buffered output
-
 const (
 	defaultBufSize = 4096;
 )
diff --git a/src/pkg/compress/flate/inflate.go b/src/pkg/compress/flate/inflate.go
index 2fe494f7b..a39166d96 100644
--- a/src/pkg/compress/flate/inflate.go
+++ b/src/pkg/compress/flate/inflate.go
@@ -197,7 +197,6 @@ type Reader interface {
 }
 
 // Inflate state.
-// TODO(rsc): Expose this or not?
 type inflater struct {
 	// Input/output sources.
 	r	Reader;
diff --git a/src/pkg/crypto/hmac/hmac_test.go b/src/pkg/crypto/hmac/hmac_test.go
index 82ed3ab82..6df648413 100644
--- a/src/pkg/crypto/hmac/hmac_test.go
+++ b/src/pkg/crypto/hmac/hmac_test.go
@@ -4,8 +4,6 @@
 
 package hmac
 
-// TODO(rsc): better test
-
 import (
 	"hash";
 	"fmt";
diff --git a/src/pkg/go/doc/comment.go b/src/pkg/go/doc/comment.go
index 75eb7064b..3d04c349c 100644
--- a/src/pkg/go/doc/comment.go
+++ b/src/pkg/go/doc/comment.go
@@ -133,7 +133,7 @@ func commentEscape(w io.Writer, s []byte) {
 	last := 0;
 	for i := 0; i < len(s)-1; i++ {
 		if s[i] == s[i+1] && (s[i] == '`' || s[i] == '\'') {
-			template.HtmlEscape(w, s[last:i]);
+			template.HTMLEscape(w, s[last:i]);
 			last = i+2;
 			switch s[i] {
 			case '`':
@@ -144,7 +144,7 @@ func commentEscape(w io.Writer, s []byte) {
 			i++;	// loop will add one more
 		}
 	}
-	template.HtmlEscape(w, s[last:len(s)]);
+	template.HTMLEscape(w, s[last:len(s)]);
 }
 
 
@@ -211,10 +211,9 @@ func unindent(block [][]byte) {
 //
 // TODO(rsc): I'd like to pass in an array of variable names []string
 // and then italicize those strings when they appear as words.
-func ToHtml(w io.Writer, s []byte) {
+func ToHTML(w io.Writer, s []byte) {
 	inpara := false;
 
-	/* TODO(rsc): 6g cant generate code for these
 	close := func() {
 		if inpara {
 			w.Write(html_endp);
@@ -227,7 +226,6 @@ func ToHtml(w io.Writer, s []byte) {
 			inpara = true;
 		}
 	};
-	*/
 
 	lines := split(s);
 	unindent(lines);
@@ -235,19 +233,13 @@ func ToHtml(w io.Writer, s []byte) {
 		line := lines[i];
 		if isBlank(line) {
 			// close paragraph
-			if inpara {
-				w.Write(html_endp);
-				inpara = false;
-			}
+			close();
 			i++;
 			continue;
 		}
 		if indentLen(line) > 0 {
 			// close paragraph
-			if inpara {
-				w.Write(html_endp);
-				inpara = false;
-			}
+			close();
 
 			// count indented or blank lines
 			j := i+1;
@@ -268,21 +260,15 @@ func ToHtml(w io.Writer, s []byte) {
 			// just html escaping
 			w.Write(html_pre);
 			for _, line := range block {
-				template.HtmlEscape(w, line);
+				template.HTMLEscape(w, line);
 			}
 			w.Write(html_endpre);
 			continue;
 		}
 		// open paragraph
-		if !inpara {
-			w.Write(html_p);
-			inpara = true;
-		}
+		open();
 		commentEscape(w, lines[i]);
 		i++;
 	}
-	if inpara {
-		w.Write(html_endp);
-		inpara = false;
-	}
+	close();
 }
diff --git a/src/pkg/go/parser/interface.go b/src/pkg/go/parser/interface.go
index 714add433..3c9be7532 100644
--- a/src/pkg/go/parser/interface.go
+++ b/src/pkg/go/parser/interface.go
@@ -63,8 +63,7 @@ func ParseExpr(filename string, src interface{}) (ast.Expr, os.Error) {
 
 	var p parser;
 	p.init(filename, data, 0);
-	x := p.parseExpr();	// TODO 6g bug - function call order in expr lists
-	return x, p.GetError(scanner.Sorted);
+	return p.parseExpr(), p.GetError(scanner.Sorted);
 }
 
 
@@ -81,8 +80,7 @@ func ParseStmtList(filename string, src interface{}) ([]ast.Stmt, os.Error) {
 
 	var p parser;
 	p.init(filename, data, 0);
-	list := p.parseStmtList();	// TODO 6g bug - function call order in expr lists
-	return list, p.GetError(scanner.Sorted);
+	return p.parseStmtList(), p.GetError(scanner.Sorted);
 }
 
 
@@ -99,8 +97,7 @@ func ParseDeclList(filename string, src interface{}) ([]ast.Decl, os.Error) {
 
 	var p parser;
 	p.init(filename, data, 0);
-	list := p.parseDeclList();	// TODO 6g bug - function call order in expr lists
-	return list, p.GetError(scanner.Sorted);
+	return p.parseDeclList(), p.GetError(scanner.Sorted);
 }
 
 
@@ -130,8 +127,7 @@ func ParseFile(filename string, src interface{}, mode uint) (*ast.File, os.Error
 
 	var p parser;
 	p.init(filename, data, mode);
-	prog := p.parseFile();	// TODO 6g bug - function call order in expr lists
-	return prog, p.GetError(scanner.NoMultiples);
+	return p.parseFile(), p.GetError(scanner.NoMultiples);
 }
 
 
diff --git a/src/pkg/os/os_test.go b/src/pkg/os/os_test.go
index 4601c45b9..832ce6083 100644
--- a/src/pkg/os/os_test.go
+++ b/src/pkg/os/os_test.go
@@ -511,7 +511,7 @@ func TestTime(t *testing.T) {
 	// A common failure mode on Darwin is to get 0, 0,
 	// because it returns the time in registers instead of
 	// filling in the structure passed to the system call.
-	// TODO(rsc): Too bad the compiler doesn't know that
+	// Too bad the compiler doesn't know that
 	// 365.24*86400 is an integer.
 	sec, nsec, err := Time();
 	if sec < (2009-1970)*36524*864 {