Changeset 723 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer_Class.cpp

Timestamp:

Aug 15, 2008, 11:31:19 PM (16 years ago)

Author:

dai

Message:

#186への対応。ジェネリックインターフェイスのInheritsに対応。

File:

• trunk/ab5.0/abdev/BasicCompiler_Common/src/LexicalAnalyzer_Class.cpp (modified) (3 diffs)

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

@@ -834 +834 @@
                 }
 
-                if(lstrcmpi(temporary,pobj_c->GetName().c_str())==0){
-                    compiler.errorMessenger.Output(105,temporary,i);
+                // ジェネリクス構文を分解
+                char className[VN_SIZE];
+                Jenga::Common::Strings typeParameterStrings;
+                SplitGenericClassInstance( temporary, className, typeParameterStrings );
+
+                // 型パラメータ文字列から型データを取得
+                Types actualTypeParameters;
+                BOOST_FOREACH( const std::string &typeParameterStr, typeParameterStrings )
+                {
+                    Type type;
+                    compiler.StringToType( typeParameterStr, type );
+                    actualTypeParameters.push_back( type );
+                }
+
+                if(lstrcmpi(className,pobj_c->GetName().c_str())==0){
+                    compiler.errorMessenger.Output(105,className,i);
                     goto Interface_InheritsError;
                 }
@@ -841 +855 @@
                 //継承元クラスを取得
                 const CClass *pInheritsClass = compiler.GetObjectModule().meta.FindClassSupportedTypeDef(
-                    LexicalAnalyzer::FullNameToSymbol( temporary )
+                    LexicalAnalyzer::FullNameToSymbol( className )
                 );
                 if( !pInheritsClass ){
-                    compiler.errorMessenger.Output(106,temporary,i);
+                    compiler.errorMessenger.Output(106,className,i);
                     goto Interface_InheritsError;
                 }
@@ -856 +870 @@
 
                 //継承させる
-                if( !pobj_c->InheritsClass( *pInheritsClass, Types(), i ) ){
+                if( !pobj_c->InheritsClass( *pInheritsClass, actualTypeParameters, i ) ){
                     goto Interface_InheritsError;
                 }