Changeset 2761 for trunk/tools/database/StateUpd.cpp

Timestamp:

Feb 12, 2000, 12:54:25 AM (26 years ago)

Author:

bird

Message:

Preformance and corrections.

File:

• trunk/tools/database/StateUpd.cpp (modified) (12 diffs)

trunk/tools/database/StateUpd.cpp

@@ -1 @@
-/* $Id: StateUpd.cpp,v 1.8 2000-02-11 18:35:54 bird Exp $
+/* $Id: StateUpd.cpp,v 1.9 2000-02-11 23:54:24 bird Exp $
  *
  * StateUpd - Scans source files for API functions and imports data on them.
@@ -626 +626 @@
 
         /* 4.*/
-        ulRcTmp = dbUpdateFunction(&FnDesc, &szErrorDesc[0]);
+        ulRcTmp = dbUpdateFunction(&FnDesc, pOptions->lDllRefcode, &szErrorDesc[0]);
         if (ulRcTmp != 0)
         {
@@ -679 +679 @@
 
     /* 3. */
-    if (!dbFindFunction(pFnDesc->pszName, &FnFindBuf))
+    if (!dbFindFunction(pFnDesc->pszName, &FnFindBuf, pOptions->lDllRefcode))
     {
         fprintf(phSignal, "%s, %s: error occured while reading from database, %s\n",
@@ -701 +701 @@
 
         for (lFn = 0; lFn < FnFindBuf.cFns; lFn++)
-        {
-            if (FnFindBuf.alDllRefCode[lFn] == pOptions->lDllRefcode)
-                pFnDesc->alRefCode[pFnDesc->cRefCodes++] = FnFindBuf.alRefCode[lFn];
-        }
+            pFnDesc->alRefCode[pFnDesc->cRefCodes++] = FnFindBuf.alRefCode[lFn];
 
         if (pFnDesc->cRefCodes == 0)
@@ -741 +738 @@
      */
 
-    int     iFn, iP1, iP2, j;
+    int     iFn, iP1, iP2, j, c;
     char *  pszFn, *pszFnEnd, *pszP1, *pszP2;
     char *  psz, *pszEnd;
@@ -812 +809 @@
 
     /* 3. */
+    c = 1;
     iP2 = iP1;
     pszP2 = pszP1 + 1;
-    while (*pszP2 != ')')
+    while (c > 0)
+    {
+        if (*pszP2 == '(')
+            c++;
+        else if (*pszP2 == ')')
+            if (--c == 0)
+                break;
         if (*pszP2++ == '\0')
             if ((pszP2 = papszLines[++iP2]) == NULL)
                 break;
+    }
 
     iRet = iP2 + 1; //assumes: only one function on a single line!
@@ -832 +837 @@
         char *pszC;
         pszC = trim(psz+1);
+        c = 1;
         while (*pszC != '\0')
         {
             apszArgs[cArgs] = pszC;
-            while (*pszC != ',' && *pszC != ')' && *pszC != '\0')
+            while (*pszC != ',' && c > 0 && *pszC != '\0')
+            {
+                if (*pszC == '(')
+                    c++;
+                else if (*pszC == ')')
+                    if (--c == 0)
+                        break;
                 pszC++;
+            }
             *pszC = '\0';
             trim(apszArgs[cArgs++]);
@@ -877 +890 @@
         pFnDesc->pszReturnType = *pszEnd == '\0' ? NULL : pszEnd;
         pszEnd = strlen(pszEnd) + pszEnd + 1;
+        *pszEnd = '\0';
 
         /* function name */
-        *pszEnd = '\0';
         if (pFnDesc->pszReturnType != NULL
             && stristr(pFnDesc->pszReturnType, "cdecl") != NULL)
         {   /* cdecl function is prefixed with an '_' */
             strcpy(pszEnd, "_");
-            strncat(pszEnd+1, pszFn, pszFnEnd - pszFn+1);
+            strncat(pszEnd + 1, pszFn, pszFnEnd - pszFn+1);
         }
         else
             strncat(pszEnd, pszFn, pszFnEnd - pszFn+1);
-
         pFnDesc->pszName = pszEnd;
+        pszEnd = strlen(pszEnd) + pszEnd + 1;
+        *pszEnd = '\0';
+
 
         /* arguments */
@@ -895 +910 @@
         for (j = 0; j < cArgs; j++)
         {
-            pFnDesc->apszParamName[j] = findStartOfWord(apszArgs[j] + strlen(apszArgs[j]) - 1,
-                                                        apszArgs[j]);
-            pFnDesc->apszParamName[j][-1] = '\0';
-            pFnDesc->apszParamType[j] = trim(apszArgs[j]);
+            if ((psz = strchr(apszArgs[j], ')')) == NULL)
+            {
+                pFnDesc->apszParamName[j] = findStartOfWord(apszArgs[j] + strlen(apszArgs[j]) - 1,
+                                                            apszArgs[j]);
+                pFnDesc->apszParamName[j][-1] = '\0';
+                pFnDesc->apszParamType[j] = trim(apszArgs[j]);
+            }
+            else
+            {
+                char *pszP2 = psz;
+                psz = findStartOfWord(psz-1, apszArgs[j]);
+                strncat(pszEnd, psz, pszP2 - psz);
+
+                pFnDesc->apszParamName[j] = pszEnd;
+                memset(psz, ' ', pszP2 - psz);
+                pFnDesc->apszParamType[j] = trim(apszArgs[j]);
+
+                pszEnd = strlen(pszEnd) + pszEnd + 1;
+                *pszEnd = '\0';
+            }
         }
     }
@@ -1218 +1249 @@
 
                 while (pszFnName - cchFnName > papszLines[i] && pszFnName[cchFnName] == ' ')
-                    cchFnName--;
+                    cchFnName--, pszFnName--;
 
                 pszFnName = findStartOfWord(pszFnName, papszLines[i]);
@@ -1239 +1270 @@
                         if (psz != NULL && *psz != '*')
                         {
-                            char *pszB = pszP1; /*'{'*/
+                            char *pszB = pszP1 + 1; /*'{'*/
+                            int   c = 1;
 
                             /* 3. */
-                            while (*pszB != ')')
+                            while (c > 0)
+                            {
+                                if (*pszB == '(')
+                                    c++;
+                                else if (*pszB == ')')
+                                    if (--c == 0)
+                                        break;
                                 if (*pszB++ == '\0')
                                     if ((pszB = papszLines[++i]) == NULL)
                                         break;
+                            }
                             if (pszB != NULL)
                             {
@@ -1293 +1332 @@
                 if (pszP1 != NULL && *pszP1 == '(')
                 {
-                    char *pszB = pszP1; /*'{'*/
+                    char *pszB = pszP1 + 1; /*'{'*/
+                    int   c = 1;
 
                     /* 3. */
-                    while (*pszB != ')')
+                    while (c > 0)
+                    {
+                        if (*pszB == '(')
+                            c++;
+                        else if (*pszB == ')')
+                            if (--c == 0)
+                                break;
                         if (*pszB++ == '\0')
                             if ((pszB = papszLines[++i]) == NULL)
                                 break;
+                    }
                     if (pszB != NULL)
                     {