Changeset 103 in dev for BasicCompiler_Common/Const.h

Timestamp:

May 2, 2007, 4:08:58 AM (17 years ago)

Author:

dai_9181

Message:

名前空間機能をグローバル変数、定数と列挙型に適用。
一部、クラスの静的メンバと名前空間の相性が悪いコードが潜んでいるため、要改修

File:

• BasicCompiler_Common/Const.h (modified) (4 diffs)

BasicCompiler_Common/Const.h

@@ -2 +2 @@
 
 //定数の基底クラス
-class CConstBase{
-    char *Name;
+class ConstBase{
+    const string name;
+    const NamespaceScopes namespaceScopes;
 
 public:
 
-    CConstBase(char *Name);
-    ~CConstBase();
+    ConstBase( const NamespaceScopes &namespaceScopes, const string &name )
+        : namespaceScopes( namespaceScopes )
+        , name( name )
+    {
+    }
+    ~ConstBase()
+    {
+    }
 
-    char *GetName();
+    const string &GetName() const
+    {
+        return name;
+    }
+
+    bool IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const;
+    bool IsEqualSymbol( const string &name ) const;
 };
 
 //定数
-class CConst:public CConstBase{
-    int Type;
+class CConst:public ConstBase{
+    Type type;
     _int64 i64data;
 
@@ -21 +34 @@
     CConst *pNext;
 
-    CConst(char *Name, int Type, _int64 i64data);
-    CConst(char *Name, int value);
+    CConst( const NamespaceScopes &namespaceScopes, const string &name, const Type &type, _int64 i64data);
+    CConst( const NamespaceScopes &namespaceScopes, const string &name, int value);
     ~CConst();
 
-    int GetType();
+    Type GetType();
     _int64 GetWholeData();
     double GetDoubleData();
@@ -31 +44 @@
 
 //定数マクロ
-class CConstMacro:public CConstBase{
+class CConstMacro:public ConstBase{
     int ParmNum;
     char **ppParm;
 public:
 
-    CConstMacro(char *Name, char *Expression);
+    CConstMacro( const NamespaceScopes &namespaceScopes, const string &name, char *Expression);
     ~CConstMacro();
 };
@@ -57 +70 @@
     void Init();
 
-    void Add(char *buffer);
+    void Add( const NamespaceScopes &namespaceScopes, char *buffer);
 private:
-    void AddConst(char *Name, CConst *newconst);
+    void AddConst( const string &name, CConst *newconst);
 public:
-    void AddConst(char *Name, char *Expression);
-    void AddConst(char *Name, int value);
+    void AddConst( const NamespaceScopes &namespaceScopes, const string &name, char *Expression);
+    void AddConst( const NamespaceScopes &namespaceScopes, const string &name, int value);
 
 private:
-    CConst *GetObjectPtr(char *Name);
+    CConst *GetObjectPtr( const string &name );
 public:
 
-    int GetType(char *Name);
+    int GetBasicType(char *Name);
     _int64 GetWholeData(char *Name);
     double GetDoubleData(char *Name);
+    bool IsStringPtr(char *Name);