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

Timestamp:

Feb 24, 2002, 3:47:28 AM (24 years ago)

Author:

bird

Message:

New kFile* classes; now in sync with os2tools.

File:

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

trunk/tools/common/kFileDef.cpp

@@ -1 @@
-/*
+/* $Id: kFileDef.cpp,v 1.8 2002-02-24 02:47:25 bird Exp $
+ *
  * kFileDef - Definition files.
  *
- * Copyright (c) 1999 knut st. osmundsen
+ * Copyright (c) 1999-2001 knut st. osmundsen
  *
  */
@@ -21 +22 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#include <os2.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <assert.h>
-
+
+#include "kTypes.h"
+#include "kError.h"
 #include "kFile.h"
 #include "kFileFormatBase.h"
-#include "kInterfaces.h"
+#include "kFileInterfaces.h"
 #include "kFileDef.h"
+
 
 /*******************************************************************************
@@ -43 +45 @@
 *   Internal Functions                                                         *
 *******************************************************************************/
-static char *dupeString(const char *psz, BOOL fSkipFirstWord = FALSE);
+static char *dupeString(const char *psz, KBOOL fSkipFirstWord = FALSE);
 static char *trim(char *psz);
 static char *ltrim(const char *psz);
@@ -57 +59 @@
  * @param   fSkipFirstWord  Skips the first word before duplicating the string.
  */
-static char *dupeString(const char *psz, BOOL fSkipFirstWord/* = FALSE*/)
+static char *dupeString(const char *psz, KBOOL fSkipFirstWord/* = FALSE*/)
 {
     char *pszDupe;
@@ -117 +119 @@
 
 
-kFileDef::kFileDef(kFile *pFile) throw(int)
-    :pszType(NULL), pszModName(NULL), pszBase(NULL), pszCode(NULL), pszData(NULL), pszDescription(NULL),
+kFileDef::kFileDef(kFile *pFile) :
+    kFileFormatBase(pFile),
+    pszType(NULL), pszModName(NULL), pszBase(NULL), pszCode(NULL), pszData(NULL), pszDescription(NULL),
     pszExeType(NULL), pszHeapSize(NULL), pszOld(NULL), pszProtmode(NULL), pszStackSize(NULL),
     pszStub(NULL), pSegments(NULL), pImports(NULL), pExports(NULL),
@@ -125 +128 @@
     chAppType(kFileDef::unknown)
 {
-    /* determin file size */
-
-    if (pFile->start())
-    {
-        try
-        {
-            this->read(pFile);
-        }
-        catch (int err)
-        {
-            throw (err);
-        }
-    }
-    else
-        throw (0x001);
-}
+    pFile->setThrowOnErrors();
+    pFile->start();
+    read(pFile);
+        }
 
 
@@ -191 +182 @@
  * @remark  throws errorcode on error (TODO: errorhandling)
  */
-void kFileDef::read(kFile *pFile) throw (int)
+void kFileDef::read(kFile *pFile)
 {
     char *pszTmp;
@@ -201 +192 @@
     while (psz != NULL)
     {
-        BOOL fNext = TRUE;
+        KBOOL   fNext = TRUE;
 
         /* if-switch */
         if (StringCase(psz, "LIBRARY"))
         {
-            if (pszType != NULL) throw (0x101);
+            if (pszType != NULL) throw (kError(kError::DEF_MULIPLE_MODULE_STATEMENT));
             pszType = dupeString(psz);
             fLibrary = TRUE;
             if (!setModuleName())
-                throw (0x107);
+                throw (kError(kError::DEF_BAD_LIBRARY_STATEMENT));
             fInitInstance = stristr(pszType, "INITINSTANCE") != NULL;
             fInitGlobal   = stristr(pszType, "INITGLOBAL")   != NULL || !fInitInstance;
@@ -218 +209 @@
         else if (StringCase(psz, "NAME"))
         {
-            if (pszType != NULL) throw (0x101);
+            if (pszType != NULL) throw (kError(kError::DEF_MULIPLE_MODULE_STATEMENT));
             pszType = dupeString(psz);
             fProgram = TRUE;
@@ -233 +224 @@
         else if (StringCase(psz, "PHYSICAL DEVICE")) //gap is fixed to one space, this may be fixed in readln.
         {
-            if (pszType != NULL) throw (0x101);
+            if (pszType != NULL) throw (kError(kError::DEF_MULIPLE_MODULE_STATEMENT));
             pszType = dupeString(psz);
             fPhysicalDevice = TRUE;
@@ -240 +231 @@
         else if (StringCase(psz, "VIRTUAL DEVICE")) //gap is fixed to one space, this may be fixed in readln.
         {
-            if (pszType != NULL) throw (0x101);
+            if (pszType != NULL) throw (kError(kError::DEF_MULIPLE_MODULE_STATEMENT));
             pszType = dupeString(psz);
             fVirtualDevice = TRUE;
@@ -301 +292 @@
                 {
                     (**ppi).ulOrdinal = strtol(psz, &pszTmp, 0);
-                    if (psz ==pszTmp) throw(0x102);
+                    if (psz ==pszTmp) throw (kError(kError::DEF_BAD_IMPORT));
                 }
                 else
@@ -355 +346 @@
                         psz = pszTmp + 1;
                         (**ppe).ulOrdinal = strtol(psz, &pszTmp, 0);
-                        if (pszTmp == psz) throw (0x103);
+                        if (pszTmp == psz) throw (kError(kError::DEF_BAD_EXPORT));
                         psz = trim(pszTmp);
 
@@ -380 +371 @@
                     {   /* 2 */
                         (**ppe).cParam = strtol(psz, &pszTmp, 0);
-                        if (pszTmp == psz) throw (0x104);
+                        if (pszTmp == psz) throw (kError(kError::DEF_BAD_EXPORT));
                     }
                 }
@@ -391 +382 @@
         }
         else
-            throw(0x105);
+            throw (kError(kError::DEF_UNKOWN_VERB));
 
         /* next ? */
@@ -400 +391 @@
     /* sanity check */
     if (pszType == NULL)
-        throw ((int)0x106);
+        throw (kError(kError::DEF_NO_MODULE_STATEMENT));
 }
 
@@ -412 +403 @@
  * @remark    tabs are expanded. string is trimmed. comments removed.
  */
-char *kFileDef::readln(kFile *pFile, char *pszBuffer, int cbBuffer) throw (int)
+char *kFileDef::readln(kFile *pFile, char *pszBuffer, int cbBuffer)
 {
     int i;
@@ -420 +411 @@
     {
         /* read line */
-        if (!pFile->readln(pszBuffer, cbBuffer))
+        if (pFile->readln(pszBuffer, cbBuffer))
         {
             if (!pFile->isEOF())
-                throw (0x201);
-            return FALSE;
+                throw (kError(pFile->getLastError()));
+            return NULL;
         }
 
@@ -472 +463 @@
  * @remark    TODO - we are going to check WORDS.
  */
-BOOL kFileDef::isKeyword(const char *psz)
+KBOOL kFileDef::isKeyword(const char *psz)
 {
     return  psz != NULL
@@ -503 +494 @@
  * @remark    Assumes that pszBuffer is large enough.
  */
-BOOL  kFileDef::setModuleName(void)
+KBOOL  kFileDef::setModuleName(void)
 {
     char *pszEnd;
     char *pszStart;
 
-    assert(pszType);
+    kASSERT(pszType);
 
     /* skip the first word */
@@ -534 +525 @@
  * @param   cchBuffer   Size of the buffer (defaults to 260 chars).
  */
-BOOL  kFileDef::moduleGetName(char *pszBuffer, int cchSize/* = 260*/)
+KBOOL  kFileDef::moduleGetName(char *pszBuffer, int cchSize/* = 260*/)
 {
     int cch;
@@ -554 +545 @@
  * @param     pExport  Pointer to export structure.
  */
-BOOL  kFileDef::exportFindFirst(kExportEntry *pExport)
+KBOOL kFileDef::exportFindFirst(kExportEntry *pExport)
 {
     if (pExports != NULL && pExport != NULL)
@@ -581 +572 @@
  * @param     pExport  Pointer to export structure.
  */
-BOOL  kFileDef::exportFindNext(kExportEntry *pExport)
+KBOOL kFileDef::exportFindNext(kExportEntry *pExport)
 {
     if (pExport != NULL && pExport->pv != NULL)
@@ -624 +615 @@
  * @remark  stub
  */
-BOOL kFileDef::exportLookup(unsigned long ulOrdinal, kExportEntry *pExport)
-{
-    assert(!"not implemented.");
+KBOOL kFileDef::exportLookup(unsigned long ulOrdinal, kExportEntry *pExport)
+{
+    kASSERT(!"not implemented.");
     ulOrdinal = ulOrdinal;
     pExport = pExport;
@@ -639 +630 @@
  * @remark  stub
  */
-BOOL kFileDef::exportLookup(const char *  pszName, kExportEntry *pExport)
-{
-    assert(!"not implemented.");
+KBOOL kFileDef::exportLookup(const char *  pszName, kExportEntry *pExport)
+{
+    kASSERT(!"not implemented.");
     pszName = pszName;
     pExport = pExport;
@@ -658 +649 @@
  * @remark
  */
-BOOL  kFileDef::makeWatcomLinkFileAddtion(kFile *pFile) throw(int)
+KBOOL kFileDef::makeWatcomLinkFileAddtion(kFile *pOut)
 {
     PDEFSEGMENT pSeg;
     PDEFIMPORT  pImp;
     PDEFEXPORT  pExp;
-    pFile->setThrowOnErrors();
+    pOut->setThrowOnErrors();
 
     /*
      * Write a little remark first to tell that converted stuff starts here.
      */
-    pFile->printf("#\n# Directives generated from .DEF-file.\n#\n");
+    pOut->printf("#\n# Directives generated from .DEF-file.\n#\n");
 
     /* Format - Module type */
-    pFile->printf("FORMAT OS2 LX %s %s %s\n",
+    pOut->printf("FORMAT OS2 LX %s %s %s\n",
                   fLibrary                               ? "DLL" :
                     (fProgram ? (chAppType == pm         ? "PM"
@@ -684 +675 @@
     /* Module name */
     if (pszModName)
-        pFile->printf("OPTION MODNAME=%s\n", pszModName);
+        pOut->printf("OPTION MODNAME=%s\n", pszModName);
 
     /* Description */
     if (pszDescription)
-        pFile->printf("OPTION DESCRIPTION '%s'\n", pszDescription);
+        pOut->printf("OPTION DESCRIPTION '%s'\n", pszDescription);
 
     /* Base */
     if (pszBase)
-        pFile->printf("OPTION OFFSET=%s\n", pszBase);
+        pOut->printf("OPTION OFFSET=%s\n", pszBase);
 
     /* Stub */
     if (pszStub)
-        pFile->printf("OPTION STUB='%s'\n", pszStub);
+        pOut->printf("OPTION STUB='%s'\n", pszStub);
 
     /* Old */
     if (pszOld)
-        pFile->printf("OPTION OLDLIBRARY=%s\n", pszOld);
+        pOut->printf("OPTION OLDLIBRARY=%s\n", pszOld);
 
     /* Protected mode */
     if (pszProtmode)
-        pFile->printf("OPTION PROTMODE\n", pszProtmode);
+        pOut->printf("OPTION PROTMODE\n", pszProtmode);
 
     /* Stacksize */
     if (pszStackSize)
-        pFile->printf("OPTION STACK=%s\n", pszStackSize);
+        pOut->printf("OPTION STACK=%s\n", pszStackSize);
 
     /* HeapSize */
     if (pszHeapSize)
-        pFile->printf("OPTION HEAPSIZE=%s\n", pszHeapSize);
+        pOut->printf("OPTION HEAPSIZE=%s\n", pszHeapSize);
 
     /* Code  -  not supported */
@@ -724 +715 @@
     while (pSeg != NULL)
     {
-        pFile->printf("SEGMENT %s\n", pSeg->psz);
+        pOut->printf("SEGMENT %s\n", pSeg->psz);
         pSeg = pSeg->pNext;
     }
@@ -735 +726 @@
     {
         if (pImp->pszName == NULL)
-            pFile->printf("IMPORT '%s' '%s'.%d\n", pImp->pszIntName, pImp->pszDll, pImp->ulOrdinal);
+            pOut->printf("IMPORT '%s' '%s'.%d\n", pImp->pszIntName, pImp->pszDll, pImp->ulOrdinal);
         else
-            pFile->printf("IMPORT '%s' '%s'.'%s'\n", pImp->pszIntName, pImp->pszDll, pImp->pszName);
+            pOut->printf("IMPORT '%s' '%s'.'%s'\n", pImp->pszIntName, pImp->pszDll, pImp->pszName);
         pImp = pImp->pNext;
     }
@@ -747 +738 @@
     while (pExp != NULL)
     {
-        pFile->printf("EXPORT '%s'", pExp->pszName);
+        pOut->printf("EXPORT '%s'", pExp->pszName);
         if (pExp->ulOrdinal != ~0UL)
-            pFile->printf(".%d", pExp->ulOrdinal);
+            pOut->printf(".%d", pExp->ulOrdinal);
         if (pExp->pszIntName)
-            pFile->printf("='%s'", pExp->pszIntName);
+            pOut->printf("='%s'", pExp->pszIntName);
         if (pExp->fResident)
-            pFile->printf(" RESIDENT");
+            pOut->printf(" RESIDENT");
         if (pExp->cParam != ~0UL)
-            pFile->printf(" %d", pExp->cParam * 2); /* .DEFs this is number of words. Watcom should have bytes. */
-        pFile->printf("\n");
+            pOut->printf(" %d", pExp->cParam * 2); /* .DEFs this is number of words. Watcom should have bytes. */
+        pOut->printf("\n");
         pExp = pExp->pNext;
     }