summaryrefslogtreecommitdiff
path: root/starmath/inc/parse.hxx
diff options
context:
space:
mode:
authorJoseph Powers <jpowers27@cox.net>2010-12-12 06:59:49 -0800
committerJoseph Powers <jpowers27@cox.net>2010-12-12 06:59:49 -0800
commit941320e732b8fdceb8512991814a73ed65b3f14d (patch)
treeed346985fa4f0a8ab64b2bd5e18bfab688c565d6 /starmath/inc/parse.hxx
parentb343ca0dfbae0731ac0ce89d14bc9c8fc667825d (diff)
remove DECLARE_LIST(SmErrDescList, SmErrorDesc *)
Diffstat (limited to 'starmath/inc/parse.hxx')
-rw-r--r--starmath/inc/parse.hxx25
1 files changed, 13 insertions, 12 deletions
diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx
index 8e85f4dfc32d..f369e858ebbb 100644
--- a/starmath/inc/parse.hxx
+++ b/starmath/inc/parse.hxx
@@ -36,6 +36,8 @@
#include "types.hxx"
+#include <vector>
+
class SmNode;
class SmDocShell;
@@ -159,7 +161,7 @@ struct SmErrorDesc
};
DECLARE_STACK(SmNodeStack, SmNode *)
-DECLARE_LIST(SmErrDescList, SmErrorDesc *)
+typedef ::std::vector< SmErrorDesc* > SmErrDescList;
/**************************************************************************/
@@ -260,19 +262,18 @@ public:
const String & GetText() const { return BufferString; };
- SmConvert GetConversion() const { return eConversion; }
- void SetConversion(SmConvert eConv) { eConversion = eConv; }
-
- bool IsImportSymbolNames() const { return bImportSymNames; }
- void SetImportSymbolNames(bool bVal) { bImportSymNames = bVal; }
- bool IsExportSymbolNames() const { return bExportSymNames; }
- void SetExportSymbolNames(bool bVal) { bExportSymNames = bVal; }
+ SmConvert GetConversion() const { return eConversion; }
+ void SetConversion(SmConvert eConv) { eConversion = eConv; }
- USHORT AddError(SmParseError Type, SmNode *pNode);
+ bool IsImportSymbolNames() const { return bImportSymNames; }
+ void SetImportSymbolNames(bool bVal) { bImportSymNames = bVal; }
+ bool IsExportSymbolNames() const { return bExportSymNames; }
+ void SetExportSymbolNames(bool bVal) { bExportSymNames = bVal; }
- const SmErrorDesc * NextError();
- const SmErrorDesc * PrevError();
- const SmErrorDesc * GetError(USHORT i = 0xFFFF);
+ size_t AddError(SmParseError Type, SmNode *pNode);
+ const SmErrorDesc* NextError();
+ const SmErrorDesc* PrevError();
+ const SmErrorDesc* GetError(size_t i = size_t(-1) );
static const SmTokenTableEntry* GetTokenTableEntry( const String &rName );
};