Changeset 406 in dev for trunk/abdev/BasicCompiler_Common/Enum.h

Timestamp:

Mar 2, 2008, 4:36:33 AM (16 years ago)

Author:

dai_9181

Message:

Enumを大改修。Enumメンバ初期値にリテラル、定数、Enumメンバを指定できるようにした。また、エラー行数を正確に表示可能にした。

File:

• trunk/abdev/BasicCompiler_Common/Enum.h (modified) (1 diff)

trunk/abdev/BasicCompiler_Common/Enum.h

@@ -3 +3 @@
 #include <Namespace.h>
 
-class CEnumMember{
+class EnumMember
+{
+    std::string name;
+    std::string value;
+    int sourceIndex;
 public:
-    char *m_name;
-    int m_value;
-    CEnumMember(char *name,int value);
-    ~CEnumMember();
+    EnumMember( const std::string &name, const std::string &value, int sourceIndex )
+        : name( name )
+        , value( value )
+        , sourceIndex( sourceIndex )
+    {
+    }
+    const std::string &GetName() const
+    {
+        return name;
+    }
+    const std::string &GetValueStr() const
+    {
+        return value;
+    }
+    int GetSourceIndex() const
+    {
+        return sourceIndex;
+    }
 };
 
-class CEnumParent{
-    NamespaceScopes namespaceScopes;
-    string name;
+class EnumInfo
+    : public Symbol
+{
 
     BOOL bConst;
 
-    CEnumMember **ppobj_EnumMember;
-    int iEnumMemberNum;
+    std::vector<EnumMember> members;
 public:
 
-    CEnumParent( const NamespaceScopes &namespaceScopes, const char *buffer,int nowLine);
-    ~CEnumParent();
-
-    const NamespaceScopes &GetNamespaceScopes() const
+    EnumInfo( const NamespaceScopes &namespaceScopes, const std::string &name )
+        : Symbol( namespaceScopes, name )
     {
-        return namespaceScopes;
-    }
-    const string &GetName() const
-    {
-        return name;
     }
 
+    const std::vector<EnumMember> &GetMembers() const
+    {
+        return members;
+    }
+
+    void Collect( const char *buffer, int nowLine );
+
+    const EnumMember &GetEnumMember( const std::string &memberName ) const
+    {
+        BOOST_FOREACH( const EnumMember &member, members )
+        {
+            if( member.GetName() == memberName )
+            {
+                return member;
+            }
+        }
+        throw;
+    }
+};
+
+class EnumInfoCollection
+    : public std::vector<EnumInfo>
+{
 public:
-    static void InitEnum(void);
-    static void DestroyEnum(void);
+    const EnumInfo *Find( const Symbol &symbol ) const
+    {
+        const EnumInfoCollection &thisEnumInfoCollection = *this;
+        BOOST_FOREACH( const EnumInfo &enumInfo, thisEnumInfoCollection )
+        {
+            if( enumInfo.IsEqualSymbol( symbol ) )
+            {
+                return &enumInfo;
+            }
+        }
+        return NULL;
+    };
 
-    static char *GenerateSourceCode(void);
+    void InitEnum(void);
+    char *GenerateSourceCode(void);
 };
-extern CEnumParent **ppobj_EnumParent;
-extern int iEnumParentNum;