Changed almost all wchar_t to wstring. This makes the code cleaner and probably more stable.

Author: d00mas

examples/XML/XML.cpp

@@ -113,10 +113,9 @@ int main(int argc, char *argv[])
 
 void printTokens (vector <Token*> &t) {
   for (integer i = 0; i < t.size(); i++) {
-   wchar_t *pwe = t[i]->symbol;	
-    wprintf (t[i]->symbol);
+    wprintf (t[i]->symbol.c_str());
     wprintf (L":");
-    wprintf (t[i]->image);
+    wprintf (t[i]->image.c_str());
     wprintf (L"\n");
   }
 }

examples/logic/logic.cpp

@@ -27,7 +27,7 @@
 
 char *load_source (char *filename);
 void printTokens (vector <Token*> &t);
-
+   
 int main(int argc, char *argv[])
 {
   CGTFile    cgtFile;
@@ -107,11 +107,10 @@ int main(int argc, char *argv[])
 
 
 void printTokens (vector <Token*> &t) {
-  for (integer i = 0; i < t.size(); i++) {
-   wchar_t *pwe = t[i]->symbol;	
-    wprintf (t[i]->symbol);
+  for (integer i = 0; i < t.size(); i++) {	
+    wprintf (t[i]->symbol.c_str());
     wprintf (L":");
-    wprintf (t[i]->image);
+    wprintf (t[i]->image.c_str());
     wprintf (L"\n");
   }
 }

examples/logic/logic.ncb

@@ -102,10 +102,9 @@ int main(int argc, char *argv[])
 
 void printTokens (vector <Token*> &t) {
   for (integer i = 0; i < t.size(); i++) {
-   wchar_t *pwe = t[i]->symbol;	
-    wprintf (t[i]->symbol);
+    wprintf (t[i]->symbol.c_str());
     wprintf (L":");
-    wprintf (t[i]->image);
+    wprintf (t[i]->image.c_str());
     wprintf (L"\n");
   }
 }

examples/simple/simple.cpp

@@ -20,7 +20,6 @@
  #define _GP_CGTFILE_H
 
  #include <stdio.h>
- #include <wchar.h>
  #include <iostream> 
  #include <fstream>
  #include <vector>
@@ -33,11 +32,11 @@
 
  using namespace std;
 
- typedef union EntryStruct {
+ typedef struct EntryStruct {
    bool vBool;
-   integer vInteger;
-   byte vByte;
-   wchar_t *vString;
+   integer  vInteger;
+   byte     vByte;
+   wstring  vString;
  } EntryStruct ;
 
  #if defined (WIN32) && defined (_USRDLL)
@@ -71,9 +70,10 @@
  private:
 
    void readEntry (EntryStruct *entry);
-   wchar_t *readUnicodeString ();
+   wstring        readUnicodeString ();
+   
    // Header
-   wchar_t *header;
+   wstring  header;
 
    // Info
    GrammarInfo *gInfo;
@@ -82,7 +82,6 @@
 
    char *errorString;
 
-  // FILE *file;
    ifstream *theStream;
 
    // Character Table

include/CGTFile.h

@@ -18,14 +18,16 @@
  #ifndef _GP_CHARACTER_SET_TABLE_H
  #define _GP_CHARACTER_SET_TABLE_H
 
+ #include <vector>
+ #include <string>
  #include "wchar.h"
  #include "misc.h"
 
 
  class CharacterSetTable {
    public:
-   integer nbrEntries;
-   wchar_t **characters;
+   integer m_nbrEntries;
+   std::vector <std::wstring> characters;
 
    CharacterSetTable  (integer nbrEntries);
    ~CharacterSetTable ();

include/CharacterSetTable.h

@@ -18,17 +18,17 @@
 #ifndef GRAMMAR_INFO_H
 #define GRAMMAR_INFO_H
 
-#include <wchar.h>
+#include <string>
 
 
 
 class GrammarInfo {
 
 public:
-	wchar_t *name;
-	wchar_t *version;
-	wchar_t *author;
-	wchar_t *about;
+    std::wstring    name;
+    std::wstring    version;
+    std::wstring    author;
+    std::wstring    about;
 
 	GrammarInfo ();
 	~GrammarInfo ();

include/GrammarInfo.h

@@ -18,19 +18,19 @@
  #define SYMBOLTABLE_H
 
  #include "misc.h"
- #include <wchar.h>
+ #include <string>
 
  enum SymbolType {TERMINAL = 1, NON_TERMINAL = 0};
 
  typedef struct SymbolStruct {
-   wchar_t *name;
+   std::wstring    name;
    SymbolType kind;
  } SymbolStruct;
 
 
  class SymbolTable {
    public:
-   integer nbrEntries;
+   integer m_nbrEntries;
    SymbolStruct *symbols;
 
    SymbolTable (integer nbrEntries);

include/SymbolTable.h

@@ -16,7 +16,7 @@
  #ifndef TOKEN_H
  #define TOKEN_H
 
- #include <wchar.h>
+ #include <string>
  #include "misc.h"
 
 
@@ -29,8 +29,8 @@
    ~Token();
    Token *newInstance ();
 
-   wchar_t *symbol;
-   wchar_t *image;
+   std::wstring symbol;
+   std::wstring image;
    integer symbolIndex;
    integer line, col;
 

include/Token.h

@@ -27,8 +27,6 @@
 
    errorString = NULL;
 
-   header = NULL;
-
    ruleTable = NULL;
    symbolTable = NULL;
    stateTable = NULL;
@@ -44,7 +42,6 @@
 	 delete gInfo;
 
 	 delete [] errorString;
-     delete [] header;
 
      // Delete tables
      delete symbolTable;
@@ -343,40 +340,17 @@
  Reads a Unicode String
  */
 
- wchar_t *CGTFile::readUnicodeString () {
-   int i = 0;
+ wstring CGTFile::readUnicodeString () {
    wchar_t readChar;
-   wchar_t tmpString[512];
-   wchar_t *retString;
-   char   tmpChar1, tmpChar2;
-
-   //theStream->get (tmpChar1);
-   //theStream->get (tmpChar2);
-    theStream->read(&tmpChar1, 1);
-    theStream->read(&tmpChar2, 1);
-
-   while ((tmpChar1 != 0) || (tmpChar2 != 0)) {
-     readChar = (wchar_t) tmpChar2;
-     readChar <<= 8;
-     readChar |= tmpChar1;
-
-     tmpString[i] = readChar;
-
-     //theStream->get (tmpChar1);
-     //theStream->get (tmpChar2);
-    theStream->read(&tmpChar1,1);
-    theStream->read(&tmpChar2,1);
-
-     i++;
+   wstring str;
+   
+   theStream->read ((char*) &readChar, 2);
+   while (readChar != 0) {
+        str.append (1, readChar);
+        theStream->read ((char*)&readChar, 2);
    }
-   tmpString[i] = 0;
-
-   retString = new wchar_t [wcslen (tmpString) + 1];
-
-   wcscpy (retString, tmpString);
-   //wprintf(L"Header: %s", retString);
 
-   return retString;
+   return str;
  }
 
 
@@ -401,9 +375,9 @@
  void CGTFile::printInfo () {
     // Prints the info of this grammar
     wprintf (L"Grammar Information\n");
-    wprintf (L"Name: %s\n, ", gInfo->name);
-	wprintf (L"%s\n", gInfo->version);
-	wprintf (L"Author: %s\n", gInfo->author);
-	wprintf (L"About: %s\n", gInfo->about);
+    wprintf (L"Name: %s\n", gInfo->name.c_str());
+	wprintf (L"Version: %s\n", gInfo->version.c_str());
+	wprintf (L"Author: %s\n", gInfo->author.c_str());
+	wprintf (L"About: %s\n", gInfo->about.c_str());
  }
 

src/CGTFile.cpp

@@ -19,18 +19,11 @@
 
 
  CharacterSetTable::CharacterSetTable (integer nbrEntries) {
-   this->nbrEntries = nbrEntries;
-   characters = new wchar_t * [nbrEntries];
-   for (int i=0; i < nbrEntries; i++) {
-     characters[i] = NULL;
-   }
-
+    m_nbrEntries = nbrEntries;
+    characters.resize (nbrEntries);
  }
 
  CharacterSetTable::~CharacterSetTable () {
-    for (int i = 0; i < nbrEntries; i++) {
-        delete [] characters[i];
-    }
-	delete [] characters;
+    
  }
 

src/CharacterSetTable.cpp

@@ -60,7 +60,7 @@
    Token *t = NULL;
 
    wstring tmpImage;
-   wchar_t *tokenSymbol, *tokenImage;
+   wstring tokenSymbol, tokenImage;
    wchar_t currentChar;
    integer currentState = startState;
    int i=0, imgIndex = 0;
@@ -123,7 +123,7 @@
          integer index = stateTable->states[currentState].
          edges[e].characterSetIndex;
          // Check if the current character matchs one of the edge string
-         wchar_t *edgeString = characterSetTable->characters[index];
+         wstring edgeString = characterSetTable->characters[index];
          integer s = 0;
          while (edgeString[s] != 0) {
            if (currentChar == edgeString[s]) {
@@ -161,11 +161,11 @@
              case 1 :
              if (!commentBlock) {
               // tmpImage[imgIndex-1] = 0;
-               tokenSymbol = new wchar_t [wcslen(symbolTable->symbols[index2].name)+1];
-               tokenImage = new wchar_t [tmpImage.length()+1];
+               tokenSymbol = symbolTable->symbols[index2].name;
+               tokenImage = tmpImage;
 
-               wcscpy (tokenSymbol, symbolTable->symbols[index2].name);
-               wcscpy (tokenImage, tmpImage.c_str());
+             //  wcscpy (tokenSymbol, symbolTable->symbols[index2].name);
+             //  wcscpy (tokenImage, tmpImage.c_str());
 
                t = new Token();
                t->symbol = tokenSymbol;
@@ -229,13 +229,11 @@
 
    // Generate EOF token
    t = new Token ();
-   t->symbol = new wchar_t [wcslen(L"EOF")+1];
-   t->image = new wchar_t [wcslen (L"EOF")+1];
    t->line = currentLine;
    t->col = currentCol;
 
-   wcscpy (t->symbol, L"EOF");
-   wcscpy (t->image, L"EOF");
+   t->symbol = L"EOF";
+   t->image = L"EOF";
    tokens.push_back(t);
 
    return true;

src/DFA.cpp

@@ -18,17 +18,11 @@
 #include "GrammarInfo.h"
 
 GrammarInfo::GrammarInfo () {
-	name = NULL;
-	author = NULL;
-	version = NULL;
-	about = NULL;
+
 }
 
 
 GrammarInfo::~GrammarInfo () {
-	delete [] name;
-	delete [] author;
-	delete [] version;
-	delete [] about;
+
 }
 

src/GrammarInfo.cpp

@@ -151,7 +151,7 @@
          case ACTION_SHIFT:
          if (DEBUG) {
            wprintf (L"Shifting: ");
-           wprintf (tokens[tokenIndex]->symbol);
+           wprintf (tokens[tokenIndex]->symbol.c_str());
            wprintf ( L"\nGo to state:%d\n\n", target);
          }
 
@@ -213,7 +213,7 @@
          }
 
          if (DEBUG) {
-           wprintf (symbolTable->symbols[ruleTable->rules[target].ruleIndex].name);
+           wprintf (symbolTable->symbols[ruleTable->rules[target].ruleIndex].name.c_str());
            wprintf (L" = ");
          }
 
@@ -240,7 +240,7 @@
                if (!trim) {
                     symIndex = newNonTerminal->children[i]->symbolIndex;
                }
-             wprintf (symbolTable->symbols[symIndex].name);
+             wprintf (symbolTable->symbols[symIndex].name.c_str());
              wprintf (L" ");
            }
            wprintf (L"\n");
@@ -369,7 +369,7 @@
  }
 
  if (reduction->type == NON_TERMINAL) {
-    wprintf (symbolTable->symbols[reduction->symbolIndex].name);
+    wprintf (symbolTable->symbols[reduction->symbolIndex].name.c_str());
     wprintf (L"\n");
 
     for (i=0; i < ((NonTerminal*) reduction)->children.size(); i++) {