shithub: scc

Info  •  Files  •  Log  •  Branches

Unify string and function arrays in preprocessor()

It is cleaner and shorter.

--- a/cc1/cpp.c

+++ b/cc1/cpp.c

@@ -137,21 +137,17 @@

 {

 	char *q;

 	unsigned short n;

-	static char **bp, *cmds[] = {

-		"define",

-		"include",

-		"line",

-		"pragma",

-		"error",

-		NULL

+	static struct {

+		char *name;

+		char *(*fun)(char *);

+	} *bp, cmds[] =  {

+		"define", define,

+		"include", include,

+		"line", line,

+		"pragma", pragma,

+		"error", usererr,

+		NULL, NULL

 	};

-	static char *(*funs[])(char *) = {

-		define,

-		include,

-		line,

-		pragma,

-		usererr

-	};

 	while (isspace(*p))

 		++p;

@@ -164,10 +160,8 @@

 	n = q - p;

 	while (isspace(*q))

 		++q;

-	for (bp = cmds; *bp; ++bp) {

-		if (strncmp(*bp, p, n))

-			continue;

-		q = (*funs[bp - cmds])(q);

+	for (bp = cmds; bp->name && strncmp(bp->name, p, n); ++bp) {

+		q = (*bp->fun)(q);

 		while (isspace(*q++))

 			/* nothing */;

 		if (*q != '\0')