Changeset 375 in dev for trunk/abdev/BasicCompiler_Common

Timestamp:

Nov 29, 2007, 9:08:55 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler_Common

Files:

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

trunk/abdev/BasicCompiler_Common/include/Class.h

@@ -395 +395 @@
 
     // インターフェイス実装
-    bool Implements( const CClass &interfaceClass, int nowLine );
+    bool Implements( const CClass &interfaceClass, const Jenga::Common::Strings &typeParameters, int nowLine );
     bool Implements( const char *interfaceNames, int nowLine );
 

trunk/abdev/BasicCompiler_Common/src/Class.cpp

@@ -355 +355 @@
 }
 
-bool CClass::Implements( const CClass &interfaceClass, int nowLine )
+bool CClass::Implements( const CClass &interfaceClass, const Jenga::Common::Strings &typeParameters, int nowLine )
 {
     if( !interfaceClass.IsInterface() && !interfaceClass.IsComInterface() )
@@ -430 +430 @@
     BOOST_FOREACH( const std::string &paramStr, paramStrs )
     {
+        char className[VN_SIZE];
+        Jenga::Common::Strings typeParameters;
+        SplitGenericClassInstance( paramStr.c_str(), className, typeParameters );
+
         //継承元クラスを取得
-        const CClass *pInterfaceClass = compiler.GetObjectModule().meta.GetClasses().Find( paramStr.c_str() );
+        const CClass *pInterfaceClass = compiler.GetObjectModule().meta.GetClasses().Find( className );
         if( !pInterfaceClass ){
             SetError(106,paramStr.c_str(),nowLine);
@@ -438 +442 @@
 
         // インターフェイスを継承する
-        Implements( *pInterfaceClass, nowLine );
+        Implements( *pInterfaceClass, typeParameters, nowLine );
     }