bug-global
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] treat "#undef" as a macro definition.


From: Hideki IWAMOTO
Subject: [PATCH] treat "#undef" as a macro definition.
Date: Sat, 01 Mar 2003 04:06:58 +0900

? gctags/.deps
? gctags/Makefile
? gctags/Makefile.in
? gctags/const.h
? gctags/gctags
? gctags/gctags.1
? htags/Makefile
? htags/Makefile.in
? htags/const.pl
? htags/htags
? htags/htags.1
Index: gctags/C.c
===================================================================
RCS file: /cvsroot/global/global/gctags/C.c,v
retrieving revision 1.21
diff -u -r1.21 C.c
--- gctags/C.c  24 Feb 2003 05:03:48 -0000      1.21
+++ gctags/C.c  28 Feb 2003 18:28:52 -0000
@@ -217,6 +217,7 @@
                 * #xxx
                 */
                case CP_DEFINE:
+               case CP_UNDEF:
                        startmacro = 1;
                        savelevel = level;
                        if ((c = nexttoken(interested, reserved)) != SYMBOL) {
@@ -256,7 +257,6 @@
                case CP_ELIF:
                case CP_ELSE:
                case CP_ENDIF:
-               case CP_UNDEF:
                        condition_macro(cc);
                        while ((c = nexttoken(interested, reserved)) != EOF && 
c != '\n') {
                                if (!strcmp(token, "defined"))
@@ -329,7 +329,6 @@
                                                case CP_ELIF:
                                                case CP_ELSE:
                                                case CP_ENDIF:
-                                               case CP_UNDEF:
                                                        condition_macro(c);
                                                        continue;
                                                default:
@@ -390,7 +389,6 @@
                                        case CP_ELIF:
                                        case CP_ELSE:
                                        case CP_ENDIF:
-                                       case CP_UNDEF:
                                                condition_macro(c);
                                                continue;
                                        default:
@@ -465,7 +463,6 @@
                case CP_ELIF:
                case CP_ELSE:
                case CP_ENDIF:
-               case CP_UNDEF:
                        condition_macro(c);
                        continue;
                default:
@@ -497,7 +494,6 @@
                case CP_ELIF:
                case CP_ELSE:
                case CP_ENDIF:
-               case CP_UNDEF:
                        condition_macro(c);
                        continue;
                default:
Index: gctags/Cpp.c
===================================================================
RCS file: /cvsroot/global/global/gctags/Cpp.c,v
retrieving revision 1.19
diff -u -r1.19 Cpp.c
--- gctags/Cpp.c        24 Feb 2003 05:03:48 -0000      1.19
+++ gctags/Cpp.c        28 Feb 2003 18:28:52 -0000
@@ -219,6 +219,7 @@
                 * #xxx
                 */
                case CP_DEFINE:
+               case CP_UNDEF:
                        startmacro = 1;
                        savelevel = level;
                        if ((c = nexttoken(interested, reserved)) != SYMBOL) {
@@ -258,7 +259,6 @@
                case CP_ELIF:
                case CP_ELSE:
                case CP_ENDIF:
-               case CP_UNDEF:
                        condition_macro(cc);
                        while ((c = nexttoken(interested, reserved)) != EOF && 
c != '\n') {
                                if (!strcmp(token, "defined"))
@@ -375,7 +375,6 @@
                                                case CP_ELIF:
                                                case CP_ELSE:
                                                case CP_ENDIF:
-                                               case CP_UNDEF:
                                                        condition_macro(c);
                                                        continue;
                                                default:
@@ -436,7 +435,6 @@
                                        case CP_ELIF:
                                        case CP_ELSE:
                                        case CP_ENDIF:
-                                       case CP_UNDEF:
                                                condition_macro(c);
                                                continue;
                                        default:
@@ -511,7 +509,6 @@
                case CP_ELIF:
                case CP_ELSE:
                case CP_ENDIF:
-               case CP_UNDEF:
                        condition_macro(c);
                        continue;
                default:
@@ -547,7 +544,6 @@
                case CP_ELIF:
                case CP_ELSE:
                case CP_ENDIF:
-               case CP_UNDEF:
                        condition_macro(c);
                        continue;
                default:
Index: htags/htags.in
===================================================================
RCS file: /cvsroot/global/global/htags/htags.in,v
retrieving revision 1.95
diff -u -r1.95 htags.in
--- htags/htags.in      24 Feb 2003 13:37:07 -0000      1.95
+++ htags/htags.in      28 Feb 2003 18:28:54 -0000
@@ -2398,7 +2398,7 @@
                                $PATHLIST{$filename} = $fnumber = $fcount++;
                        }
                        if ($db eq 'GTAGS') {
-                               $type = ($image =~ /^#[ \t]*define/) ? 'M' : 
'D';
+                               $type = ($image =~ /^#[ \t]*(define|undef)/) ? 
'M' : 'D';
                        } elsif ($db eq 'GRTAGS') {
                                $type = 'R';
                        } else {

----
Hideki IWAMOTO  address@hidden




reply via email to

[Prev in Thread] Current Thread [Next in Thread]