Changeset 297 in dev for trunk/abdev

Timestamp:

Aug 23, 2007, 3:49:54 AM (17 years ago)

Author:

dai_9181

Message:

 

File:

• trunk/abdev/BasicCompiler_Common/src/Class.cpp (modified) (2 diffs)

trunk/abdev/BasicCompiler_Common/src/Class.cpp

@@ -188 +188 @@
         }
 
+        char className[VN_SIZE];
+        std::vector<std::string> typeParameters;
+        SplitGenericClassInstance( temporary, className, typeParameters );
+
         //継承元クラスを取得
-        const CClass *pInheritsClass = compiler.GetObjectModule().meta.GetClasses().Find(temporary);
+        const CClass *pInheritsClass = compiler.GetObjectModule().meta.GetClasses().Find(className);
         if( !pInheritsClass ){
-            SmoothieException::Throw(106,temporary,nowLine);
+            SmoothieException::Throw(106,className,nowLine);
             return false;
         }
@@ -236 +240 @@
         }
 
+        char className[VN_SIZE];
+        std::vector<std::string> typeParameters;
+        SplitGenericClassInstance( temporary, className, typeParameters );
+
         //継承元クラスを取得
-        const CClass *pInheritsClass = compiler.GetObjectModule().meta.GetClasses().Find(temporary);
+        const CClass *pInheritsClass = compiler.GetObjectModule().meta.GetClasses().Find(className);
         if( !pInheritsClass ){
-            SmoothieException::Throw(106,temporary,nowLine);
+            SmoothieException::Throw(106,className,nowLine);
             return false;
         }