Changeset 547 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/include

Timestamp:

May 4, 2008, 10:07:31 PM (16 years ago)

Author:

dai_9181

Message:

Enum収集をLexicalAnalyzerクラスに実装しなおした。

Location:

trunk/ab5.0/abdev/BasicCompiler_Common/include

Files:

• Enum.h (modified) (3 diffs)
• LexicalAnalyzer.h (modified) (1 diff)

trunk/ab5.0/abdev/BasicCompiler_Common/include/Enum.h

@@ -46 +46 @@
     }
 
-    void Collect( const char *buffer, int nowLine );
-
     const EnumMember &GetEnumMember( const std::string &memberName ) const
     {
@@ -58 +56 @@
         }
         throw;
+    }
+
+    std::vector<EnumMember> &GetEnumMembers()
+    {
+        return members;
     }
 };
@@ -77 +80 @@
         return NULL;
     };
-
-    void InitEnum(void);
-    char *GenerateSourceCode(void);
 };

trunk/ab5.0/abdev/BasicCompiler_Common/include/LexicalAnalyzer.h

@@ -26 +26 @@
     static Symbol FullNameToSymbol( const char *fullName );
     static Symbol FullNameToSymbol( const std::string &fullName );
+
+    // 列挙型を収集
+    static void CollectEnumMembers( EnumInfo &enumInfo, const char *buffer, int nowLine );
+    static void CollectEnums( const char *source, EnumInfoCollection &enums );
+    static std::string GenerateEnumsSourceCode( const EnumInfoCollection &enums );
 
     // クラスの名前情報を収集する