Changeset 567 in dev for trunk/ab5.0

Timestamp:

May 6, 2008, 3:35:08 PM (16 years ago)

Author:

dai_9181

Message:

・GetStringClassPtr、GetObjectClassPtr、GetInterfaceInfoClassPtrクラスからエラー出力を排除した。
・GetStaticDefiningStringAsMemberTypeInfoNamesメソッドの実装位置をCClassクラスからProcedureGeneratorクラスに移動した。

Location:

trunk/ab5.0/abdev

Files:

• BasicCompiler_Common/include/Class.h (modified) (1 diff)
• BasicCompiler_Common/include/ProcedureGenerator.h (modified) (1 diff)
• BasicCompiler_Common/src/Class.cpp (modified) (4 diffs)
• BasicCompiler_Common/src/ProcedureGenerator.cpp (modified) (2 diffs)
• ab_common/ab_common.vcproj (modified) (1 diff)

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

@@ -475 +475 @@
     // 動的型データ用のメンバデータを取得
     std::string GetStaticDefiningStringAsMemberNames() const;
-    std::string GetStaticDefiningStringAsMemberTypeInfoNames() const;
     std::string GetStaticDefiningStringAsMemberOffsets() const;
     void GetReferenceOffsetsInitializeBuffer( std::string &referenceOffsetsBuffer, int &numOfReference, int baseOffset = 0 ) const;

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

@@ -9 +9 @@
     static void Generate_InitStaticMember( const Classes &classes );
     static void Generate_System_InitializeUserTypes( const Classes &classes );
+    static std::string GetStaticDefiningStringAsMemberTypeInfoNames( const CClass &_class );
     static void Generate_System_InitializeUserTypesForBaseType( const Classes &classes );
 };

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

@@ -698 +698 @@
 const CClass *Classes::GetStringClassPtr() const
 {
-    if( !pStringClass ){
+    if( !pStringClass )
+    {
         // キャッシュしておく
         pStringClass = this->FindEx( NamespaceScopes( "System" ), "String" );
-
-        if( !pStringClass )
-        {
-            compiler.errorMessenger.Output(400, "System.String", cp);
-            static CClass dummy;
-            return &dummy;
-        }
-        return pStringClass;
     }
     return pStringClass;
@@ -714 +707 @@
 const CClass *Classes::GetObjectClassPtr() const
 {
-    if( !pObjectClass ){
+    if( !pObjectClass )
+    {
         // キャッシュしておく
         pObjectClass = this->FindEx( NamespaceScopes( "System" ), "Object" );
-
-        if( !pObjectClass )
-        {
-            compiler.errorMessenger.Output(400, "System.Object", cp);
-            static CClass dummy;
-            return &dummy;
-        }
-        return pObjectClass;
     }
     return pObjectClass;
@@ -730 +716 @@
 const CClass *Classes::GetInterfaceInfoClassPtr() const
 {
-    if( !pInterfaceInfo ){
+    if( !pInterfaceInfo )
+    {
         // キャッシュしておく
         pInterfaceInfo = this->FindEx( "ActiveBasic.Core.InterfaceInfo" );
-
-        if( !pInterfaceInfo )
-        {
-            compiler.errorMessenger.Output(400, "ActiveBasic.Core.InterfaceInfo", cp);
-            static CClass dummy;
-            return &dummy;
-        }
-        return pInterfaceInfo;
     }
     return pInterfaceInfo;
@@ -757 +736 @@
 
         result += "\"" + pMember->GetName() + "\"";
-    }
-
-    return result;
-}
-std::string CClass::GetStaticDefiningStringAsMemberTypeInfoNames() const
-{
-    std::string result;
-
-    BOOST_FOREACH( const Member *pMember, dynamicMembers )
-    {
-        if( result.size() )
-        {
-            result += ",";
-        }
-
-        result += "\"" + compiler.TypeToString( pMember->GetType() ) + "\"";
     }
 

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

@@ -118 +118 @@
 }
 
+std::string ProcedureGenerator::GetStaticDefiningStringAsMemberTypeInfoNames( const CClass &_class )
+{
+    std::string result;
+
+    BOOST_FOREACH( const Member *pMember, _class.GetDynamicMembers() )
+    {
+        if( result.size() )
+        {
+            result += ",";
+        }
+
+        result += "\"" + compiler.TypeToString( pMember->GetType() ) + "\"";
+    }
+
+    return result;
+}
+
 void ProcedureGenerator::Generate_System_InitializeUserTypesForBaseType( const Classes &classes )
 {
@@ -187 +204 @@
                     "tempType.SetMembers([%s],[%s],[%s],%d)",
                     objClass.GetStaticDefiningStringAsMemberNames().c_str(),
-                    objClass.GetStaticDefiningStringAsMemberTypeInfoNames().c_str(),
+                    GetStaticDefiningStringAsMemberTypeInfoNames( objClass ).c_str(),
                     objClass.GetStaticDefiningStringAsMemberOffsets().c_str(),
                     objClass.GetDynamicMembers().size()

trunk/ab5.0/abdev/ab_common/ab_common.vcproj

@@ -351 +351 @@
                 >
                 <File
+                    RelativePath=".\include\Lexical\CompilerErrorException.h"
+                    >
+                </File>
+                <File
                     RelativePath=".\include\Lexical\Namespace.h"
                     >