Changeset 1036 in kBuild for trunk/src

Timestamp:

Jun 4, 2007 5:20:29 PM (18 years ago)

Author:

bird

Message:

Ignore closing curly braces (extern "C" { ... }). Updated VCC statement.

File:

• trunk/src/kObjCache/kObjCache.c (modified) (5 diffs)

trunk/src/kObjCache/kObjCache.c

@@ -952 +952 @@
              * Pinpoint the difference exactly and the try find the start
              * of that line. Then skip forward until we find something to
-             * work on that isn't spaces or #line statements. Since we 
-             * might be skipping a few new empty headers, it is possible
-             * that we will omit this header from the dependencies when
-             * using VCC. But I think that's a reasonable trade off for 
-             * a simple algorithm.
+             * work on that isn't spaces, #line statements or closing curly 
+             * braces. 
+             *
+             * The closing curly braces are ignored because they are frequently 
+             * found at the end of header files (__END_DECLS) and the worst 
+             * thing that may happen if it isn't one of these braces we're 
+             * ignoring is that the final line in a function block is a little 
+             * bit off in the debug info. 
+             *
+             * Since we might be skipping a few new empty headers, it is 
+             * possible that we will omit this header from the dependencies 
+             * when using VCC. This might not be a problem, since it seems
+             * we'll have to use the precompiler output to generate the deps
+             * anyway.
              */
             const char *psz;
@@ -962 +971 @@
             const char *pszFile1 = NULL;
             unsigned    iLine1 = 0;
+            unsigned    cCurlyBraces1 = 0;
             const char *pszMismatch2;
             const char *pszFile2 = NULL;
             unsigned    iLine2 = 0;
+            unsigned    cCurlyBraces2 = 0;
 
             /* locate the difference. */
@@ -1007 +1018 @@
                             psz1 = pszEnd1;
                     }
+                    else if (*psz == '}')
+                    {
+                        do psz++;
+                        while (isspace(*psz) && *psz != '\n');
+                        if (*psz == '\n')
+                            iLine1++;
+                        else if (psz != pszEnd1)
+                            break;
+                        cCurlyBraces1++;
+                        psz1 = psz;
+                    }
                     else if (psz == pszEnd1)
                         psz1 = psz;
@@ -1038 +1060 @@
                             psz2 = pszEnd2;
                     }
+                    else if (*psz == '}')
+                    {
+                        do psz++;
+                        while (isspace(*psz) && *psz != '\n');
+                        if (*psz == '\n')
+                            iLine2++;
+                        else if (psz != pszEnd2)
+                            break;
+                        cCurlyBraces2++;
+                        psz2 = psz;
+                    }
                     else if (psz == pszEnd2)
                         psz2 = psz;
@@ -1044 +1077 @@
                 }
             }
+
+            /* Match the number of ignored closing curly braces. */
+            if (cCurlyBraces1 != cCurlyBraces2)
+                return 0;
 
             /* Reaching the end of any of them means the return statement can decide. */