From: Luuk van Dijk <lvd@golang.org>
Date: Wed, 18 Jan 2012 08:52:16 +0000 (+0100)
Subject: gc: handle printing of string/arrayrune conversions
X-Git-Tag: weekly.2012-01-20~64
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=18ee75ec88593d96796089038b93ed66596ae4d9;p=gostls13.git

gc: handle printing of string/arrayrune conversions

Fixes #2714.

R=rsc
CC=golang-dev
https://golang.org/cl/5540066
---

diff --git a/src/cmd/gc/fmt.c b/src/cmd/gc/fmt.c
index 09e73c7b92..15466844be 100644
--- a/src/cmd/gc/fmt.c
+++ b/src/cmd/gc/fmt.c
@@ -943,6 +943,7 @@ static int opprec[] = {
 	[OAPPEND] = 8,
 	[OARRAYBYTESTR] = 8,
 	[OARRAYLIT] = 8,
+	[OARRAYRUNESTR] = 8,
 	[OCALLFUNC] = 8,
 	[OCALLINTER] = 8,
 	[OCALLMETH] = 8,
@@ -969,6 +970,8 @@ static int opprec[] = {
 	[OPRINT] = 8,
 	[ORECV] = 8,
 	[ORUNESTR] = 8,
+	[OSTRARRAYBYTE] = 8,
+	[OSTRARRAYRUNE] = 8,
 	[OSTRUCTLIT] = 8,
 	[OTARRAY] = 8,
 	[OTCHAN] = 8,
@@ -1214,7 +1217,9 @@ exprfmt(Fmt *f, Node *n, int prec)
 	case OCONVIFACE:
 	case OCONVNOP:
 	case OARRAYBYTESTR:
+	case OARRAYRUNESTR:
 	case OSTRARRAYBYTE:
+	case OSTRARRAYRUNE:
 	case ORUNESTR:
 		if(n->type == T || n->type->sym == S)
 			return fmtprint(f, "(%T)(%N)", n->type, n->left);
@@ -1372,7 +1377,8 @@ nodedump(Fmt *fp, Node *n)
 			indent(fp);
 		}
 	}
-		fmtprint(fp, "[%p]", n);
+
+//	fmtprint(fp, "[%p]", n);
 
 	switch(n->op) {
 	default: