error about & at top level until it is safe

R=ken OCL=17241 CL=17241

error about & at top level until it is safe
R=ken OCL=17241 CL=17241
7cd173a4 · Russ Cox · 1bf38484 · 7cd173a4 · 7cd173a4
Commit 7cd173a4 authored Oct 16, 2008 by Russ Cox
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

go.h src/cmd/gc/go.h +2 -0

go.y src/cmd/gc/go.y +4 -0

No files found.
--- a/src/cmd/gc/go.h
+++ b/src/cmd/gc/go.h
@@ -468,6 +468,8 @@ EXTERN	int32	thunk;

 EXTERN	int	exporting;

+EXTERN	int	func;
+
 /*
 *	y.tab.c
 */

--- a/src/cmd/gc/go.y
+++ b/src/cmd/gc/go.y
@@ -754,6 +754,8 @@ uexpr:
 	}
 |	'&' uexpr
 	{
+		if($2->op == OCONV && !func)
+			yyerror("& of composite literal at top level");
 		$$ = nod(OADDR, $2, N);
 	}
 |	'+' uexpr
@@ -1179,11 +1181,13 @@ xfndcl:
 	{
 		maxarg = 0;
 		stksize = 0;
+		func++;
 	} fndcl fnbody
 	{
 		$$ = $3;
 		$$->nbody = $4;
 		funcbody($$);
+		func--;
 	}

 fndcl: