shithub: scc

Info  •  Files  •  Log  •  Branches

[cc1] Fix #elif clauses

The implmentation of elif was evaluating the if part always, even
when due to the else part it was disabled, and it was generating
that the current state of the preprocessor was corrupted.

--- a/cc1/cpp.c

+++ b/cc1/cpp.c

@@ -657,8 +657,9 @@

 		return;

 	}

-	status = (ifstatus[cppctx-1] ^= 1);

-	cppoff += (status) ? -1 : 1;

+	status = ifstatus[cppctx-1];

+	ifstatus[cppctx-1] = !status;

+	cppoff += (status) ? 1 : -1;

 }

 static void

@@ -672,8 +673,10 @@

 elif(void)

 {

 	elseclause();

-	--cppctx;

-	cppif();

+	if (ifstatus[cppctx-1]) {

+		--cppctx;

+		cppif();

+	}

 }

 static void