Re: dev86-0.16.8 cpp bugs

[Robert de Bath <robert$@mayday.cix.co.uk>]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 506 bytes --]

On Sun, 11 Aug 2002, Manuel Novoa III wrote:

> Hello Robert,
>
> Some bugs in 0.16.8's cpp I'm afraid.  Try the following.

Okay, looks like I wasn't correctly ignoring nested #elif's.
The patch attached should fix that.

The type change for the if_stack allows it to work with any #if nesting
unless you make a nesting error (It will fail to detect some).

-- 
Rob.                          (Robert de Bath <robert$ @ debath.co.uk>)
                                       <http://www.cix.co.uk/~mayday>


[-- Attachment #2: Type: TEXT/PLAIN, Size: 599 bytes --]

diff -Nurd linux86.old/cpp/cpp.c linux86/cpp/cpp.c
--- linux86.old/cpp/cpp.c	Sun Aug 11 07:33:57 2002
+++ linux86/cpp/cpp.c	Sun Aug 11 20:13:38 2002
@@ -83,7 +83,7 @@
 static int if_false = 0;
 static int if_has_else = 0;
 static int if_hidden = 0;
-static int if_stack = 0;
+static unsigned int if_stack = 0;
 
 struct arg_store {
    char * name;
@@ -905,6 +905,13 @@
 int type;
 {
    int ch = 0;
+   if(if_false && if_hidden)
+   {
+      if( type != 3 ) if_hidden++;
+      do_proc_tail();
+      return 0;
+   }
+
    if( type == 3 )
    {
       if( if_count == 0 )