Changeset 417 in dev for trunk/abdev/BasicCompiler_Common

Timestamp:

Mar 7, 2008, 5:32:29 AM (17 years ago)

Author:

dai_9181

Message:

[416]のコミットによって発生した64bit版での不具合を修正。

Location:

trunk/abdev/BasicCompiler_Common

Files:

• include/Class.h (modified) (1 diff)
• src/Class.cpp (modified) (3 diffs)
• src/DataTable.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler_Common/include/Class.h

@@ -565 +565 @@
     std::string GetStaticDefiningStringAsMemberTypeInfoNames() const;
     std::string GetStaticDefiningStringAsMemberOffsets() const;
+    void GetReferenceOffsetsInitializeBuffer( std::string &referenceOffsetsBuffer, int &numOfReference, int baseOffset = 0 ) const;
 
 

trunk/abdev/BasicCompiler_Common/src/Class.cpp

@@ -1292 +1292 @@
             // 未使用のクラスは無視する
             continue;
-        }   
-
-        char referenceOffsetsBuffer[1024] = "";
+        }
+
+        std::string referenceOffsetsBuffer;
         int numOfReference = 0;
-        BOOST_FOREACH( CMember *pMember, objClass.GetDynamicMembers() ){
-            if( pMember->GetType().IsObject() || pMember->GetType().IsPointer() ){
-                if( referenceOffsetsBuffer[0] ){
-                    lstrcat( referenceOffsetsBuffer, "," );
-                }
-
-                sprintf( referenceOffsetsBuffer + lstrlen( referenceOffsetsBuffer ),
-                    "%d",
-                    objClass.GetMemberOffset( pMember->GetName().c_str() ) );
-
-                numOfReference++;
-            }
-        }
+        objClass.GetReferenceOffsetsInitializeBuffer( referenceOffsetsBuffer, numOfReference );
 
         sprintf( temporary
@@ -1317 +1305 @@
             , objClass.GetName().c_str()                            // クラス名
             , objClass.GetFullName().c_str()                        // フルネーム
-            , referenceOffsetsBuffer                                // 参照メンバオフセット配列
+            , referenceOffsetsBuffer.c_str()                        // 参照メンバオフセット配列
             , numOfReference                                        // 参照メンバの個数
             );
@@ -1577 +1565 @@
     return result;
 }
+
+void CClass::GetReferenceOffsetsInitializeBuffer( std::string &referenceOffsetsBuffer, int &numOfReference, int baseOffset ) const
+{
+    const CClass &thisClass = *this;
+    BOOST_FOREACH( const CMember *pMember, thisClass.GetDynamicMembers() )
+    {
+        if( pMember->GetType().IsObject() || pMember->GetType().IsPointer() )
+        {
+            if( referenceOffsetsBuffer.size() )
+            {
+                referenceOffsetsBuffer += ",";
+            }
+
+            char temp[255];
+            sprintf( temp, "%d", baseOffset + thisClass.GetMemberOffset( pMember->GetName().c_str() ) );
+            referenceOffsetsBuffer += temp;
+
+            numOfReference++;
+        }
+        if( pMember->GetType().IsStruct() && !pMember->GetType().IsPointer() )
+        {
+            // 構造体の実体をメンバに持つとき
+            int baseOffset = thisClass.GetMemberOffset( pMember->GetName().c_str() );
+
+            // 構造体メンバでGCによるチェックが必要な参照位置を追加
+            pMember->GetType().GetClass().GetReferenceOffsetsInitializeBuffer( referenceOffsetsBuffer, numOfReference, baseOffset );
+        }
+    }
+}

trunk/abdev/BasicCompiler_Common/src/DataTable.cpp

@@ -293 +293 @@
     BOOST_FOREACH( const std::string &paramStr, parameters )
     {
+        if( paramStr.size() == 0 )
+        {
+            throw;
+        }
         if( paramStr[0] == '\"' )
         {