Hi Matsui-san, all,

I have been playing with the new -K option and like it, thanks!

I have added some extra output with a quick/hacky patch to allow tracking the pre-processors usage of macros and where they are undefined.

This allows post processing to debug macros lifetimes and impact etc.

Specifically I have a quick script that now shows the dependences between the files from the pre-processors point of view.

I added to the -K option the following additional output:

/*u[MACRO_NAME] file:line*/   - indicating macro used in if style statement
/*r[MACRO_NAME] file:line*/   - indicating macro undefined

The file:line pair is not really needed, the chosen letters are not so great, the patch may well not cover all the cases, I am quite certain it break a few things and the code is not that nice... But hopefully the feature is useful and a patch is always better nothing I think.

Let me know what you think

Samuel

ps here is the patch.

Index: src/directive.c

--- src/directive.c    (revision 91)
+++ src/directive.c    (working copy)
@@ -434,6 +434,13 @@
             return  FALSE;      /* Next token is not an identifier  */
         }
         found = (look_id( identifier) != NULL); /* Look in table    */
+
+        if (found && (mcpp_debug & MACRO_CALL)){
+            DEFBUF *defp =look_id( identifier); /* Look in table    */
+            if(defp){
+               mcpp_fprintf( DBG, "/*u%s %s:%i*/",defp->name, defp->fname, defp->mline);
+            }
+        }
     }
     if (found == (hash == L_ifdef)) {
         compiling = TRUE;
@@ -1428,6 +1435,11 @@
     if (standard && dp->push)
         return  FALSE;                  /* 'Pushed' macro           */
     *prevp = dp->link;          /* Link the previous and the next   */
+
+    if (mcpp_debug & MACRO_CALL){
+        mcpp_fprintf( DBG, "/*r%s %s:%i*/",dp->name, dp->fname, dp->mline);
+    }
+
     free( dp);                          /* Delete the definition    */
     if (standard)
         num_of_macro--;
Index: src/expand.c
===================================================================
--- src/expand.c    (revision 91)
+++ src/expand.c    (working copy)
@@ -670,6 +670,10 @@
         dump_unget( "replace entry");
     }

+    if(in_if && (mcpp_debug & MACRO_CALL)){
+         mcpp_fprintf( DBG, "/*u%s %s:%i*/",defp->name, defp->fname, defp->mline);
+    }
+
     enable_trace_macro = trace_macro && defp->nargs != DEF_PRAGMA;
     if (enable_trace_macro) {
         int     num;
Index: src/internal.H
===================================================================
--- src/internal.H    (revision 91)
+++ src/internal.H    (working copy)
@@ -386,6 +386,7 @@
extern IFINFO   ifstack[];          /* Information of #if nesting   */
extern char     work_buf[];
         /* Temporary buffer for directive line and macro expansion  */
+extern int      in_if;             /* flag to say if we need extera debug in -K mode  */

/* main.c   */
extern void     un_predefine( int clearall);
Index: src/eval.c
===================================================================
--- src/eval.c    (revision 91)
+++ src/eval.c    (working copy)
@@ -269,6 +269,7 @@
     skip = 0;
}
#endif
+int in_if=0;

expr_t  eval_if( void)
/*
@@ -291,17 +292,21 @@
     VAL_SIGN *      valp = value;   /* -> Value and signedness      */
     OPTAB *         opp = opstack;  /* -> Operator stack            */
     int             op;             /* Current operator             */
+    expr_t          ret = 0L;

     opp->op = OP_END;               /* Mark bottom of stack         */
     opp->prec = opdope[ OP_END];    /* And its precedence           */
     skip = skip_cur = opp->skip = 0;        /* Not skipping now     */

+    in_if=1;
+
     while (1) {
         if (mcpp_debug & EXPRESSION)
             mcpp_fprintf( DBG
                     , "In eval loop skip = %d, binop = %d, line is: %s¥n"
                     , opp->skip, binop, infile->bptr);
         skip = opp->skip;
+
         op = eval_lex();
         skip = 0;                   /* Reset to be ready to return  */
         switch (op) {
@@ -314,7 +319,7 @@
                 op = OP_PLU;                /* Unary plus           */
             break;
         case OP_FAIL:
-            return  0L;                     /* Token error          */
+            goto out;
         }
         if (mcpp_debug & EXPRESSION)
             mcpp_fprintf( DBG
@@ -324,11 +329,11 @@
             if (binop != 0) {               /* Binop is needed      */
                 cerror( "Misplaced constant ¥"%s¥""         /* _E_  */
                         , work_buf, 0L, NULL);
-                return  0L;
+                goto out;
             } else if (& value[ NEXP * 2] <= valp) {
                 cerror( "More than %.0s%ld constants stacked at %s" /* _E_  */
                         , NULL, (long) (NEXP * 2 - 1), work_buf);
-                return  0L;
+                goto out;
             } else {
                 if (mcpp_debug & EXPRESSION) {
                     dump_val( "pushing ", &ev);
@@ -349,7 +354,7 @@
             else
                 cerror( "Operator ¥"%s¥" in incorrect context"      /* _E_  */
                         , opname[ op], 0L, NULL);
-            return  0L;
+            goto out;
         }
         binop = (prec & 2) >> 1;            /* Binop should follow? */

@@ -382,7 +387,7 @@
                     cerror(
             "More than %.0s%ld operators and parens stacked at %s"  /* _E_  */
                             , NULL, (long) (NEXP * 3 - 1), opname[ op]);
-                    return  0L;
+                    goto out;
                 }
                 opp->op = op;
                 opp->prec = prec;
@@ -427,15 +432,17 @@
             case OP_END:                    /* Stack end marker     */
                 if (op == OP_RPA) {         /* No corresponding (   */
                     cerror( "Excessive ¥")¥"", NULL, 0L, NULL);     /* _E_  */
-                    return  0L;
+                    goto out;
                 }
-                if (op == OP_EOE)
-                    return  valp[-1].val;   /* Finished ok.         */
+                if (op == OP_EOE){
+                    ret = valp[-1].val;     /* Finished ok.         */
+                    goto out;
+                }
                 break;
             case OP_LPA:                    /* ( on stack           */
                 if (op != OP_RPA) {         /* Matches ) on input?  */
                     cerror( "Missing ¥")¥"", NULL, 0L, NULL);       /* _E_  */
-                    return  0L;
+                    goto out;
                 }
                 opp--;                      /* Unstack it           */
                 parens--;                   /* Count down nest level*/
@@ -448,7 +455,7 @@
                     cerror(
                     "Misplaced ¥":¥", previous operator is ¥"%s¥""  /* _E_  */
                             , opname[opp->op], 0L, NULL);
-                    return  0L;
+                    goto out;
                 }
                 /* Evaluate op1.            Fall through            */
             default:                        /* Others:              */
@@ -463,8 +470,9 @@
                 else
                     skip = skip_cur;
                 valp = eval_eval( valp, op1);
-                if (valp->sign == VAL_ERROR)
-                    return  0L;     /* Out of range or divide by 0  */
+                if (valp->sign == VAL_ERROR){
+                    goto out;
+                }
                 valp++;
                 skip = 0;
                 if (mcpp_debug & EXPRESSION) {
@@ -479,7 +487,10 @@

     }

-    return  0L;                             /* Never reach here     */
+out:
+    mcpp_fprintf( DBG, "¥n"); /* so the next #line is at the start */
+    in_if=0;
+    return  ret;
}

static int  eval_lex( void)
@@ -520,6 +531,13 @@
             if (scan_token( c, (workp = work_buf, &workp), work_end) == NAM) {
                 if (warn)
                     ev.val = (look_id( identifier) != NULL);
+
+                if (mcpp_debug & MACRO_CALL){
+                    DEFBUF *    defp =look_id( identifier); /* Look in table    */
+                    if(defp){
+                        mcpp_fprintf( DBG, "/*u%s %s:%i*/",defp->name, defp->fname, defp->mline);
+                    }
+                }
                 if (c1 != '(' || skip_ws() == ')')  /* Balanced ?   */
                     return  VAL;            /* Parsed ok            */
             }