shithub: scc

Info  •  Files  •  Log  •  Branches

Use symbolic constants for namespaces and lookup values

We were using some ugly rules in namespace (positive, negative or zero),
and it was no clear when you were calling the function what was happening.
So this patch add symbolic names.

--- a/decl.c

+++ b/decl.c

@@ -8,6 +8,9 @@

 #include "syntax.h"

 #include "symbol.h"

+#define NOALLOC_NS    0

+#define ALLOCDUP_NS   1

+#define ALLOC_NS      2

 char parser_out_home;

 static struct symbol *cursym;

@@ -17,24 +20,24 @@

 static void declarator(struct ctype *tp, unsigned char ns);

 static struct symbol *

-namespace(register unsigned char ns, signed char alloc)

+namespace(register unsigned char ns, char alloc)

 {

 	register struct symbol *sym = yyval.sym;

 	unsigned char yyns = sym->ns;

-	if (!alloc) {

+	if (alloc == NOALLOC_NS) {

 		if (yyns == NS_ANY)

 			return NULL;

 		else if (yyns == ns)

 			return sym;

 		else                        /* don't create new symbol */

-			return lookup(yytext, -ns);

+			return lookup(yytext, NOINSERT(ns));

 	} else {

 		if (yyns == NS_ANY) {

 			sym->ns = ns;

 			return sym;

 		} else if (yyns == ns && sym->ctx == curctx) {

-			if (alloc < 0)

+			if (alloc == ALLOCDUP_NS)

 				return sym;

 			error("redeclaration of '%s'", yytext);

 		}

@@ -49,7 +52,7 @@

 		declarator(tp, ns);

 		expect(')');

 	} else if (yytoken == IDEN) {

-		cursym = namespace(ns, 1);

+		cursym = namespace(ns, ALLOC_NS);

 		next();

 	} else {

 		error("expected '(' or identifier before of '%s'", yytext);

@@ -88,7 +91,7 @@

 	struct symbol *sym = NULL;

 	if (yytoken == IDEN) {

-		sym = namespace(NS_STRUCT, -1);

+		sym = namespace(NS_STRUCT, ALLOCDUP_NS);

 		sym->ctype = tp;

 		next();

 	}

@@ -175,7 +178,7 @@

 			break;

 		expect(IDEN);

-		sym = namespace(NS_IDEN, 1);

+		sym = namespace(NS_IDEN, ALLOC_NS);

 		sym->ctype = tp;

 		if (accept('=')) {

 			expect(CONSTANT);

@@ -220,7 +223,7 @@

 				struct symbol *sym;

 				unsigned char tok = ahead();

-				sym = namespace(NS_TYPEDEF, 0);

+				sym = namespace(NS_TYPEDEF, NOALLOC_NS);

 				if (sym && tok != ';' && tok != ',') {

 					if (!tp)

 						tp = newctype();

--- a/symbol.h

+++ b/symbol.h

@@ -11,6 +11,8 @@

 #define CTX_FUNC  2

 #define CTX_ANY   0

+#define NOINSERT(x) (-x)

+

 enum {

 	NS_IDEN,

 	NS_KEYWORD,

-- 

⑨