From: Ken Thompson <ken@golang.org>
Date: Thu, 2 Oct 2008 22:37:15 +0000 (-0700)
Subject: names now println/panicln
X-Git-Tag: weekly.2009-11-06~3055
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=53a22770a79e30d4e1275f2f724b731c929688ed;p=gostls13.git

names now println/panicln
bug fix in named-return

R=r
OCL=16377
CL=16377
---

diff --git a/src/cmd/6g/gen.c b/src/cmd/6g/gen.c
index 6623c517f7..3c1c92947a 100644
--- a/src/cmd/6g/gen.c
+++ b/src/cmd/6g/gen.c
@@ -21,6 +21,7 @@ compile(Node *fn)
 	Prog *ptxt;
 	int32 lno;
 	Type *t;
+	Iter save;
 
 if(newproc == N) {
 	newproc = nod(ONAME, N, N);
@@ -59,12 +60,12 @@ if(throwreturn == N) {
 
 	if(curfn->type->outnamed) {
 		// add clearing of the output parameters
-		t = structfirst(&pl, getoutarg(curfn->type));
+		t = structfirst(&save, getoutarg(curfn->type));
 		while(t != T) {
 			if(t->nname != N && t->nname->sym->name[0] != '_') {
 				curfn->nbody = list(nod(OAS, t->nname, N), curfn->nbody);
 			}
-			t = structnext(&pl);
+			t = structnext(&save);
 		}
 	}
 
diff --git a/src/cmd/gc/lex.c b/src/cmd/gc/lex.c
index 707b61aa15..ee19ab8ae8 100644
--- a/src/cmd/gc/lex.c
+++ b/src/cmd/gc/lex.c
@@ -998,9 +998,9 @@ static	struct
 	"nil",		LNIL,		Txxx,
 	"package",	LPACKAGE,	Txxx,
 	"panic",	LPANIC,		Txxx,
-	"panicn",	LPANICN,	Txxx,
+	"panicln",	LPANICN,	Txxx,
 	"print",	LPRINT,		Txxx,
-	"printn",	LPRINTN,	Txxx,
+	"println",	LPRINTN,	Txxx,
 	"range",	LRANGE,		Txxx,
 	"return",	LRETURN,	Txxx,
 	"select",	LSELECT,	Txxx,