Changeset 9162 for trunk/tools/common/kFileDef.cpp

Timestamp:

Aug 29, 2002, 9:55:43 AM (23 years ago)

Author:

bird

Message:

Parse segments so we can spit out more correct watcom directives.

File:

• trunk/tools/common/kFileDef.cpp (modified) (4 diffs)

trunk/tools/common/kFileDef.cpp

@@ -1 @@
-/* $Id: kFileDef.cpp,v 1.11 2002-08-25 23:24:57 bird Exp $
+/* $Id: kFileDef.cpp,v 1.12 2002-08-29 07:55:43 bird Exp $
  *
  * kFileDef - Definition files.
@@ -187 +187 @@
     char *psz;
     char  szBuffer[256];
+    char  ch;
 
     /* readloop */
@@ -263 +264 @@
                 *pps = new DEFSEGMENT; memset(*pps, 0, sizeof(**pps));
                 (**pps).psz = dupeString(psz);
+
+                printf("debug: parsing: %s\n", psz);
+                /* seg name */
+                (**pps).pszName = ltrim((**pps).psz);
+                ch = *(**pps).pszName;
+                if (ch == '\'' || ch == '\"')
+                    pszTmp = strchr(++(**pps).pszName, ch);
+                else
+                    pszTmp = strpbrk((**pps).pszName, " \t");
+                if (pszTmp)
+                {
+                    *pszTmp = '\0';
+
+                    /* class ? */
+                    pszTmp = ltrim(pszTmp + 1);
+                    if (!strnicmp(pszTmp, "CLASS", 5))
+                    {
+                        (**pps).pszClass = ltrim(pszTmp + 5);
+                        ch = *(**pps).pszClass;
+                        if (ch == '\'' || ch == '\"')
+                            pszTmp = strchr(++(**pps).pszClass, ch);
+                        else
+                            pszTmp = strpbrk((**pps).pszClass, " \t");
+                        if (pszTmp)
+                        {
+                            *pszTmp++ = '\0';
+                        }
+                    }
+                    if (pszTmp)
+                    {
+                        /* attribs */
+                        (**pps).pszAttr = trim(pszTmp);
+                        if (!*(**pps).pszAttr)
+                            (**pps).pszAttr = NULL;
+                    }
+                }
+
+                printf("debug: pszName=%s\n", (**pps).pszName);
+                printf("debug: pszClass=%s\n", (**pps).pszClass);
+                printf("debug: pszAttr=%s\n", (**pps).pszAttr);
+                /* next */
                 pps = &(**pps).pNext;
             }
@@ -765 +807 @@
     while (pSeg != NULL)
     {
-        pOut->printf("SEGMENT %s\n", pSeg->psz);
+        if (pSeg->pszName)
+            pOut->printf("SEGMENT %s %s\n", pSeg->pszName, pSeg->pszAttr ? pSeg->pszAttr : "");
+        if (pSeg->pszClass)
+            pOut->printf("SEGMENT CLASS %s %s\n", pSeg->pszClass, pSeg->pszAttr ? pSeg->pszAttr : "");
         pSeg = pSeg->pNext;
     }