shithub: scc

Info  •  Files  •  Log  •  Branches

Unify errors in fielddcl

--- a/decl.c

+++ b/decl.c

@@ -312,17 +312,17 @@

 {

 	struct ctype *tp;

 	struct symbol *sym;

+	char *err;

 	switch (yytoken) {

 	case SCLASS:

-		error("storage class '%s' in struct/union field", yytext);

+		goto bad_storage;

 	case IDEN: case TYPE: case TQUALIFIER:

 		tp = specifier(NULL);

-		break;

 	case ';':

 		break;

 	default:

-		error("declaration expected");

+		goto dcl_expected;

 	}

 	if (yytoken != ';') {

@@ -333,6 +333,14 @@

 	}

 	expect(';');

+	return;

+

+bad_storage:

+	err = "storage class '%s' in struct/union field";

+	goto error;

+dcl_expected:

+	err = "declaration expected";

+error:	error(err, yytext);

 }

 static struct ctype *

-- 

⑨