mirror of
https://github.com/golang/go
synced 2024-11-25 06:47:56 -07:00
- don't allow empty decl lists (e.g. const ())
R=r OCL=16698 CL=16698
This commit is contained in:
parent
44dffd92fc
commit
638233a7d6
@ -373,16 +373,10 @@ func (P *Parser) ParseResult() *AST.List {
|
||||
func (P *Parser) ParseFunctionType() *AST.FunctionType {
|
||||
P.Trace("FunctionType");
|
||||
|
||||
P.OpenScope();
|
||||
P.level--;
|
||||
|
||||
typ := new(AST.FunctionType);
|
||||
typ.pos = P.pos;
|
||||
typ.params = P.ParseParameters();
|
||||
typ.result = P.ParseResult();
|
||||
|
||||
P.level++;
|
||||
P.CloseScope();
|
||||
|
||||
P.Ecart();
|
||||
return typ;
|
||||
@ -1341,6 +1335,8 @@ func (P *Parser) ParseDecl(exported bool, keyword int) *AST.Declaration {
|
||||
P.Expect(keyword);
|
||||
if P.tok == Scanner.LPAREN {
|
||||
P.Next();
|
||||
decl.decls.Add(P.ParseSpec(exported, keyword));
|
||||
P.OptSemicolon(Scanner.RPAREN);
|
||||
for P.tok != Scanner.RPAREN {
|
||||
decl.decls.Add(P.ParseSpec(exported, keyword));
|
||||
P.OptSemicolon(Scanner.RPAREN);
|
||||
@ -1418,7 +1414,9 @@ func (P *Parser) ParseExportDecl() {
|
||||
}
|
||||
for P.tok == Scanner.IDENT {
|
||||
ident := P.ParseIdent();
|
||||
P.Optional(Scanner.COMMA); // TODO this seems wrong
|
||||
if P.tok == Scanner.COMMA {
|
||||
P.Next(); // TODO this seems wrong
|
||||
}
|
||||
}
|
||||
if has_paren {
|
||||
P.Expect(Scanner.RPAREN)
|
||||
|
Loading…
Reference in New Issue
Block a user