cmd/7a: labels are local to functions

Replay of https://codereview.appspot.com/159670043/ Fixes golang#44
minux · Jan 12, 2015 · c244086 · c244086
1 parent 3e6bf43
commit c244086
Show file tree

Hide file tree

Showing 4 changed files with 738 additions and 755 deletions.
diff --git a/src/cmd/7a/a.h b/src/cmd/7a/a.h
@@ -107,6 +107,7 @@ void	newio(void);
 void	newfile(char*, int);
 Sym*	slookup(char*);
 Sym*	lookup(void);
+Sym*	labellookup(Sym*);
 void	settext(LSym*);
 void	syminit(Sym*);
 int32	yylex(void);

diff --git a/src/cmd/7a/a.y b/src/cmd/7a/a.y
@@ -41,15 +41,11 @@ prog:
 |	prog line
 
 line:
-	LLAB ':'
-	{
-		if($1->value != pc)
-			yyerror("redeclaration of %s", $1->name);
-		$1->value = pc;
-	}
-	line
 |	LNAME ':'
 	{
+		$1 = labellookup($1);
+		if($1->type == LLAB && $1->value != pc)
+			yyerror("redeclaration of %s", $1->labelname);
 		$1->type = LLAB;
 		$1->value = pc;
 	}
@@ -435,15 +431,10 @@ rel:
 	}
 |	LNAME offset
 	{
+		$1 = labellookup($1);
 		$$ = nullgen;
-		if(pass == 2)
-			yyerror("undefined label: %s", $1->name);
-		$$.type = D_BRANCH;
-		$$.offset = $2;
-	}
-|	LLAB offset
-	{
-		$$ = nullgen;
+		if(pass == 2 && $1->type != LLAB)
+			yyerror("undefined label: %s", $1->labelname);
 		$$.type = D_BRANCH;
 		$$.offset = $1->value + $2;
 	}