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

Timestamp:

Aug 2, 2000, 4:18:05 AM (25 years ago)

Author:

bird

Message:

Added line numbers for function and designnote.
Corrected reading of SDS function headers.

File:

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

trunk/tools/database/StateUpd.cpp

@@ -1 @@
-/* $Id: StateUpd.cpp,v 1.27 2000-07-29 14:12:46 bird Exp $
+/* $Id: StateUpd.cpp,v 1.28 2000-08-02 02:18:03 bird Exp $
  *
  * StateUpd - Scans source files for API functions and imports data on them.
@@ -825 +825 @@
 static unsigned long processDesignNote(char **papszLines, int i, int &iRet, const char *pszFilename, POPTIONS pOptions)
 {
-    unsigned long   ulRc;
+    unsigned long   ulRc = 0;
     char            szBuffer[0x10000];
     char *          psz;
 
     /*
-     *  Find and parse the @designnote tag/keyword.
-     *      syntax:     @designnote [seqnbr] <title>
+     *  Find and parse the @design tag/keyword.
+     *      syntax:     @design [seqnbr] <title>
      *                  <text>
      *
      */
-    psz = stristr(papszLines[i], "@designnote ");
-    if (psz != NULL)
+    psz = stristr(papszLines[i], "@design");
+    if (psz != NULL && (psz[7] == '\0' || psz[7] == ' '))
     {
         signed long     lSeqNbr;
@@ -854 +854 @@
 
         /* Update database */
-        if (!dbAddDesignNote(pOptions->lDllRefcode, pOptions->lFileRefcode, psz, &szBuffer[0], lSeqNbr, pOptions->lSeqFile++))
+        if (!dbAddDesignNote(pOptions->lDllRefcode, pOptions->lFileRefcode, psz, &szBuffer[0], lSeqNbr, pOptions->lSeqFile++, i + 1))
         {
             ulRc = 0x00010000;
@@ -867 +867 @@
     else
     {
-        fprintf(phSignal, "%s(%d): internal error @designnote \n", pszFilename, i);
+        fprintf(phSignal, "%s(%d): internal error @design\n", pszFilename, i);
         ulRc = 0x00010000;
     }
@@ -897 +897 @@
     FnDesc.lStatus = 99;
     FnDesc.lFile = pOptions->lFileRefcode;
+    FnDesc.lLine = i + 1;
 
     /* precondition: isFunction is true.
@@ -1521 +1522 @@
 
         /* status */
-        pFnDesc->pszReturnDesc  = SDSCopyTextUntilNextTag(pszB, FALSE, iStatus, iEnd, papszLines);
+        pFnDesc->pszStatus      = SDSCopyTextUntilNextTag(pszB, FALSE, iStatus, iEnd, papszLines);
         pszB += strlen(pszB) + 1;
 
@@ -1546 +1547 @@
         /* time */
         i = findStrLine("@time", iStart, iEnd, papszLines);
-        pFnDesc->pszReturnDesc  = SDSCopyTextUntilNextTag(pszB, TRUE, i, iEnd, papszLines);
+        pFnDesc->pszTime        = SDSCopyTextUntilNextTag(pszB, TRUE, i, iEnd, papszLines);
         pszB += strlen(pszB) + 1;
 
         /* equiv */
         i = findStrLine("@equiv", iStart, iEnd, papszLines);
-        pFnDesc->pszReturnDesc  = SDSCopyTextUntilNextTag(pszB, TRUE, i, iEnd, papszLines);
+        pFnDesc->pszEquiv       = SDSCopyTextUntilNextTag(pszB, TRUE, i, iEnd, papszLines);
         pszB += strlen(pszB) + 1;
 
@@ -1561 +1562 @@
          * parameters, new @param for each parameter!
          */
+        i = iStart - 1;
         do
         {
@@ -1566 +1568 @@
 
             /* find first */
-            i = findStrLine("@param", iStart, iEnd, papszLines);
+            i = findStrLine("@param", i + 1, iEnd, papszLines);
             if (i >= iEnd)
                 break;
@@ -1597 +1599 @@
                 }
             }
-        } while (i > iEnd);
+        } while (i < iEnd);
     }
 
@@ -1605 +1607 @@
     if (pFnDesc->pszStatus != NULL && *pFnDesc->pszStatus != '\0')
     {
-        if (strstr(pFnDesc->pszStatus, "STUB") != NULL || *pFnDesc->pszStatus == '1')
+        if (stristr(pFnDesc->pszStatus, "STUB") != NULL || *pFnDesc->pszStatus == '1')
             pFnDesc->lStatus = 1; /* STUB */
         else if (stristr(pFnDesc->pszStatus, "Partially") != NULL || *pFnDesc->pszStatus == '2' || *pFnDesc->pszStatus == '3')
@@ -2100 +2102 @@
         return FALSE;
 
-    // look for /**@designnote "
+    // look for /**@design
     while (*psz == ' ')
         psz++;
@@ -2108 +2110 @@
         while (*psz == '*' || *psz == ' ')
             psz++;
-        return strnicmp(psz, "@designnote ", 12) == 0;
+        return strnicmp(psz, "@design", 7) == 0 && (psz[7] == '\0' || psz[7] == ' ');
     }
     pOptions = pOptions;