Discard comments in yylex() so that -C works even with comments in

#if directives.  Supposes to fix Jira#PCC-126 by Iain Hibbert.

1 files changed, 18 insertions, 2 deletions

diff --git a/token.c b/token.c
index 190478d..05557f2 100644
--- a/token.c
+++ b/token.c
@@ -109,7 +109,7 @@ static char spechr[256] = {
 	0,	0,	0,	0,	0,	0,	0,	0,
 
 	0,	C_2,	C_SPEC,	0,	0,	0,	C_2,	C_SPEC,
-	0,	0,	0,	C_2,	0,	C_2,	0,	C_SPEC,
+	0,	0,	0,	C_2,	0,	C_2,	0,	C_SPEC|C_2,
 	C_I,	C_I,	C_I,	C_I,	C_I,	C_I,	C_I,	C_I,
 	C_I,	C_I,	0,	0,	C_2,	C_2,	C_2,	C_SPEC,
 
@@ -399,8 +399,10 @@ chlit:
 			int c, wrn;
 			extern int readmac;
 
-			if (Cflag && !flslvl && readmac)
+			if (Cflag && !flslvl && readmac) {
+				unch(ch);
 				return CMNT;
+			}
 
 			wrn = 0;
 		more:	while ((c = inch()) && c != '*') {
@@ -538,6 +540,20 @@ yylex()
 			badop("");
 		break;
 
+	case '/':
+		if (Cflag == 0 || c2 != '*')
+			break;
+		/* Found comment that need to be skipped */
+		for (;;) {
+			ch = inpch();
+		c1:	if (ch != '*')
+				continue;
+			if ((ch = inpch()) == '/')
+				break;
+			goto c1;
+		}
+		return yylex();
+
 	case NUMBER:
 		if (yytext[0] == '\'') {
 			yylval.node.op = NUMBER;