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

Timestamp:

May 5, 2008, 1:09:21 PM (16 years ago)

Author:

dai_9181

Message:

・AddMember→AddDynamicMethod
・CMember→Member
・CreateMemberメソッドをCClassクラスからLexicalAnalyzerクラスへ移動した。

Location:

trunk/ab5.0/abdev/BasicCompiler_Common/include

Files:

• Class.h (modified) (4 diffs)
• LexicalAnalyzer.h (modified) (1 diff)
• Member.h (modified) (5 diffs)

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

@@ -145 +145 @@
     {
         // 動的メンバ
-        BOOST_FOREACH( CMember *member, dynamicMembers )
+        BOOST_FOREACH( Member *member, dynamicMembers )
         {
             delete member;
@@ -151 +151 @@
 
         // 静的メンバ
-        BOOST_FOREACH( CMember *member, staticMembers )
+        BOOST_FOREACH( Member *member, staticMembers )
         {
             delete member;
@@ -320 +320 @@
 
     //メンバ、メソッドの追加
-    CMember *CreateMember( Prototype::Accessibility accessibility, bool isConst, bool isRef, char *buffer, int nowLine );
-    void AddMember( Prototype::Accessibility accessibility, bool idConst, bool isRef, char *buffer, int nowLine );
-    void AddStaticMember( Prototype::Accessibility accessibility, bool isConst, bool isRef, char *buffer, int nowLine );
+    void AddDynamicMember( Member *pMember );
+    void AddStaticMember( Member *pMember );
 
     //重複チェック
@@ -345 +344 @@
     }
     
-    const CMember *FindDynamicMember( const char *memberName ) const;
+    const Member *FindDynamicMember( const char *memberName ) const;
     bool HasDynamicMember( const char *memberName ) const
     {

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

@@ -44 +44 @@
 
     // クラスを収集する
+    static Member *CreateMember( const CClass &_class, Prototype::Accessibility accessibility, bool isConst, bool isRef, char *buffer, int nowLine );
     static void AddMethod(CClass *pobj_c, UserProc *pUserProc, Prototype::Accessibility accessibility, BOOL bStatic, bool isConst, bool isAbstract,
         bool isVirtual, bool isOverride, const char *interfaceName, bool isAutoGeneration, int nowLine);

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

@@ -3 +3 @@
 class CClass;
 
-class CMember : public MemberPrototype
+class Member : public MemberPrototype
 {
     std::string name;
@@ -19 +19 @@
     template<class Archive> void serialize(Archive& ar, const unsigned int version)
     {
-        trace_for_serialize( "serializing - CMember" );
+        trace_for_serialize( "serializing - Member" );
 
         ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( MemberPrototype );
@@ -71 +71 @@
     }
 
-    CMember( Prototype::Accessibility accessibility, const std::string &name, const Type &newType, bool isConst, const Subscripts &subscripts, const std::string &initializeExpression, const std::string &constructParameter )
+    Member( Prototype::Accessibility accessibility, const std::string &name, const Type &newType, bool isConst, const Subscripts &subscripts, const std::string &initializeExpression, const std::string &constructParameter )
         : MemberPrototype( accessibility )
         , name( name )
@@ -81 +81 @@
     {
     }
-    CMember::CMember(CMember &member)
+    Member::Member(Member &member)
         : MemberPrototype( member.GetAccessibility() )
         , name( member.GetName() )
@@ -91 +91 @@
         source_code_address=member.source_code_address;
     }
-    CMember()
+    Member()
     {
     }
-    ~CMember()
+    ~Member()
     {
     }
 };
-typedef std::vector<CMember *> Members;
+typedef std::vector<Member *> Members;