shithub: scc

Info  •  Files  •  Log  •  Branches

Fix namespace in struct/union declarations

struct/union can be nested, so it is very important to preserve
the previous namespace.

--- a/cc1/decl.c

+++ b/cc1/decl.c

@@ -422,8 +422,10 @@

 	tp = sym->type;

 	namespace = tp->ns;

-	if (!accept('{'))

-		goto restore_name;

+	if (!accept('{')) {

+		namespace = ns;

+		return tp;

+	}

 	if (tp->defined)

 		error("redefinition of struct/union '%s'", sym->name);

@@ -434,12 +436,13 @@

 		error("too levels of nested structure or union definitions");

 	++nested;

-	while (!accept('}'))

+	while (yytoken != '}') {

 		fieldlist(tp);

+	}

 	--nested;

-restore_name:

 	namespace = ns;

+	expect('}');

 	return tp;

 }