Changeset 561 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/src/Class.cpp

Timestamp:

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

Author:

dai_9181

Message:

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

File:

• trunk/ab5.0/abdev/BasicCompiler_Common/src/Class.cpp (modified) (13 diffs)

trunk/ab5.0/abdev/BasicCompiler_Common/src/Class.cpp

@@ -185 +185 @@
 }
 
-CMember *CClass::CreateMember( Prototype::Accessibility accessibility, bool isConst, bool isRef, char *buffer, int nowLine )
-{
-    extern int cp;
-
-    //構文を解析
-    char VarName[VN_SIZE];
-    char initBuffer[VN_SIZE];
-    char lpszConstructParameter[VN_SIZE];
-    Subscripts subscripts;
-    Type type;
-    GetDimentionFormat(buffer,VarName,subscripts,type,initBuffer,lpszConstructParameter);
-
-    //重複チェック
-    if(this->DupliCheckAll(VarName)){
-        compiler.errorMessenger.Output(15,VarName,cp);
-    }
-
-    CMember *pMember = new CMember( accessibility, VarName, type, isConst, subscripts, initBuffer, lpszConstructParameter );
-    pMember->source_code_address = nowLine;
-    return pMember;
-}
-void CClass::AddMember( Prototype::Accessibility accessibility, bool isConst, bool isRef, char *buffer, int nowLine ){
-    dynamicMembers.push_back(
-        CreateMember( accessibility, isConst, isRef, buffer, nowLine )
-    );
-}
-void CClass::AddStaticMember( Prototype::Accessibility accessibility, bool isConst, bool isRef, char *buffer, int nowLine ){
-    staticMembers.push_back(
-        CreateMember( accessibility, isConst, isRef, buffer, nowLine )
-    );
+void CClass::AddDynamicMember( Member *pMember )
+{
+    dynamicMembers.push_back( pMember );
+}
+void CClass::AddStaticMember( Member *pMember )
+{
+    staticMembers.push_back( pMember );
 }
 
@@ -247 +224 @@
 
     // 動的メンバ
-    BOOST_FOREACH( CMember *pMember, dynamicMembers )
+    BOOST_FOREACH( Member *pMember, dynamicMembers )
     {
         if( GetName() == pMember->GetName() )
@@ -256 +233 @@
 
     // 静的メンバ
-    BOOST_FOREACH( CMember *pMember, staticMembers ){
+    BOOST_FOREACH( Member *pMember, staticMembers ){
         if( GetName() == pMember->GetName() ){
             return true;
@@ -265 +242 @@
 }
 
-const CMember *CClass::FindDynamicMember( const char *memberName ) const
+const Member *CClass::FindDynamicMember( const char *memberName ) const
 {
     if( this->HasSuperClass() )
     {
         // 基底クラスで検索
-        const CMember *result = this->GetSuperClass().FindDynamicMember( memberName );
+        const Member *result = this->GetSuperClass().FindDynamicMember( memberName );
         if( result )
         {
@@ -277 +254 @@
     }
 
-    BOOST_FOREACH( CMember *pMember, GetDynamicMembers() )
+    BOOST_FOREACH( Member *pMember, GetDynamicMembers() )
     {
         if( pMember->GetName() == memberName )
@@ -373 +350 @@
     }
 
-    BOOST_FOREACH( CMember *pMember, dynamicMembers )
+    BOOST_FOREACH( Member *pMember, dynamicMembers )
     {
         // メンバサイズ
@@ -479 +456 @@
     }
 
-    BOOST_FOREACH( CMember *pMember, dynamicMembers )
+    BOOST_FOREACH( Member *pMember, dynamicMembers )
     {
         // メンバサイズ
@@ -580 +557 @@
     }
 
-    BOOST_FOREACH( CMember *pMember, dynamicMembers )
+    BOOST_FOREACH( Member *pMember, dynamicMembers )
     {
         int tempAlignment = pMember->GetType().GetSize();
@@ -761 +738 @@
 
         int i=0;
-        BOOST_FOREACH( CMember *member, objClass.GetStaticMembers() )
+        BOOST_FOREACH( Member *member, objClass.GetStaticMembers() )
         {
             if( pEnumInfo )
@@ -1017 +994 @@
     std::string result;
 
-    BOOST_FOREACH( const CMember *pMember, dynamicMembers )
+    BOOST_FOREACH( const Member *pMember, dynamicMembers )
     {
         if( result.size() )
@@ -1033 +1010 @@
     std::string result;
 
-    BOOST_FOREACH( const CMember *pMember, dynamicMembers )
+    BOOST_FOREACH( const Member *pMember, dynamicMembers )
     {
         if( result.size() )
@@ -1049 +1026 @@
     std::string result;
 
-    BOOST_FOREACH( const CMember *pMember, dynamicMembers )
+    BOOST_FOREACH( const Member *pMember, dynamicMembers )
     {
         if( result.size() )
@@ -1070 +1047 @@
 {
     const CClass &thisClass = *this;
-    BOOST_FOREACH( const CMember *pMember, thisClass.GetDynamicMembers() )
+    BOOST_FOREACH( const Member *pMember, thisClass.GetDynamicMembers() )
     {
         if( pMember->GetType().IsObject() || pMember->GetType().IsPointer() )