- do not accept forward-declarations for structs and interfaces anymore

R=r
DELTA=49  (0 added, 14 deleted, 35 changed)
OCL=33272
CL=33272

src/pkg/go/parser/parser.go

@@ -457,12 +457,7 @@ func (p *parser) parseStructType() *ast.StructType {
 	}
 
 	pos := p.expect(token.STRUCT);
-	var lbrace, rbrace token.Position;
-	var fields []*ast.Field;
-	if p.tok == token.LBRACE {
-		lbrace = p.pos;
-		p.next();
-
+	lbrace := p.expect(token.LBRACE);
 	list := vector.New(0);
 	for p.tok != token.RBRACE && p.tok != token.EOF {
 		f := p.parseFieldDecl();
@@ -475,16 +470,14 @@ func (p *parser) parseStructType() *ast.StructType {
 			break;
 		}
 	}
-
-		rbrace = p.expect(token.RBRACE);
+	rbrace := p.expect(token.RBRACE);
 	p.optSemi = true;
 
 	// convert vector
-		fields = make([]*ast.Field, list.Len());
+	fields := make([]*ast.Field, list.Len());
 	for i := list.Len() - 1; i >= 0; i-- {
 		fields[i] = list.At(i).(*ast.Field);
 	}
-	}
 
 	return &ast.StructType{pos, lbrace, fields, rbrace};
 }
@@ -677,12 +670,7 @@ func (p *parser) parseInterfaceType() *ast.InterfaceType {
 	}
 
 	pos := p.expect(token.INTERFACE);
-	var lbrace, rbrace token.Position;
-	var methods []*ast.Field;
-	if p.tok == token.LBRACE {
-		lbrace = p.pos;
-		p.next();
-
+	lbrace := p.expect(token.LBRACE);
 	list := vector.New(0);
 	for p.tok == token.IDENT {
 		list.Push(p.parseMethodSpec());
@@ -690,16 +678,14 @@ func (p *parser) parseInterfaceType() *ast.InterfaceType {
 			p.expect(token.SEMICOLON);
 		}
 	}
-
-		rbrace = p.expect(token.RBRACE);
+	rbrace := p.expect(token.RBRACE);
 	p.optSemi = true;
 
 	// convert vector
-		methods = make([]*ast.Field, list.Len());
+	methods := make([]*ast.Field, list.Len());
 	for i := list.Len() - 1; i >= 0; i-- {
 		methods[i] = list.At(i).(*ast.Field);
 	}
-	}
 
 	return &ast.InterfaceType{pos, lbrace, methods, rbrace};
 }