Changeset 378 in dev for trunk

Timestamp:

Dec 16, 2007, 11:44:29 PM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler_Common

Files:

• BasicCompiler.cpp (modified) (1 diff)
• include/Class.h (modified) (1 diff)
• include/Type.h (modified) (1 diff)
• src/Class.cpp (modified) (3 diffs)
• src/Class_Collect.cpp (modified) (1 diff)
• src/Type.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler_Common/BasicCompiler.cpp

@@ -91 +91 @@
 }
 void ts(const char *msg){
-    MessageBox(0,msg,"TestMessage",0);
+    MessageBox(0,FormatEscapeSequenceStringToDefaultString(msg).c_str(),"TestMessage",0);
 }
 void ts(const char *msg,const char *title){
-    MessageBox(0,msg,title,0);
+    MessageBox(0,FormatEscapeSequenceStringToDefaultString(msg).c_str(),title,0);
 }
 

trunk/abdev/BasicCompiler_Common/include/Class.h

@@ -121 +121 @@
         return actualTypeParameters;
     }
+
+    std::string GetFullNameWithActualGenericTypeParameters() const;
 };
 typedef std::vector<Interface *> Interfaces;

trunk/abdev/BasicCompiler_Common/include/Type.h

@@ -233 +233 @@
     bool HasActualGenericType() const;
 
+    //型名を取得
+    std::string ToString() const;
+
 
 private:

trunk/abdev/BasicCompiler_Common/src/Class.cpp

@@ -50 +50 @@
 }
 
+std::string Interface::GetFullNameWithActualGenericTypeParameters() const
+{
+    std::string interfaceName = this->GetClass().GetFullName();
+    if( actualTypeParameters.size() )
+    {
+        std::string actualGenericTypesName;
+        BOOST_FOREACH( const Type &typeParameter, actualTypeParameters )
+        {
+            if( actualGenericTypesName.size() )
+            {
+                actualGenericTypesName += ",";
+            }
+            actualGenericTypesName += typeParameter.ToString();
+        }
+
+        interfaceName += "<" + actualGenericTypesName + ">";
+    }
+    return interfaceName;
+}
 
 bool CClass::IsClass() const
@@ -344 +363 @@
             1, ESC_OPERATOR,
             1, ESC_AS,
-            interfaceClass.GetName().c_str()
+            pDestInterface->GetFullNameWithActualGenericTypeParameters().c_str()
         );
 
@@ -539 +558 @@
             }
 
+            if( !pInterface->GetClass().IsReady() ){
+                // インターフェイスが未解析のとき
+                compiler.GetObjectModule().meta.GetClasses().LookaheadClass( pInterface->GetClass().GetName().c_str() );
+            }
+
             CMethod *pMethodForOverride = pInterface->GetDynamicMethods().FindForOverride( pUserProc );
             if( pMethodForOverride )

trunk/abdev/BasicCompiler_Common/src/Class_Collect.cpp

@@ -326 +326 @@
             SplitGenericClassInstance( temporary, className, typeParameters );
 
-            CClass *pobj_c = const_cast<CClass *>( this->Find(namespaceScopes, temporary) );
+            CClass *pobj_c = const_cast<CClass *>( this->Find(namespaceScopes, className) );
             if(!pobj_c) continue;
 

trunk/abdev/BasicCompiler_Common/src/Type.cpp

@@ -477 +477 @@
 {
     return ( actualGenericTypes.size() > 0 );
+}
+
+std::string Type::ToString() const
+{
+    const char *basicTypeName = BasicTypeToCharPtr( *this );
+    if( basicTypeName )
+    {
+        return basicTypeName;
+    }
+
+    if( IsTypeParameter() )
+    {
+        return GetFormalTypeName();
+    }
+
+    std::string typeName = GetClass().GetFullName();
+    if( HasActualGenericType() )
+    {
+        std::string actualGenericTypesName;
+        BOOST_FOREACH( const GenericType &actualGenericType, actualGenericTypes )
+        {
+            if( actualGenericTypesName.size() )
+            {
+                actualGenericTypesName += ",";
+            }
+            actualGenericTypesName += actualGenericType.GetName();
+        }
+
+        typeName += "<" + actualGenericTypesName + ">";
+    }
+    return typeName;
 }