Changeset 374 in dev for trunk

Timestamp:

Nov 26, 2007, 10:47:04 PM (16 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev

Files:

• BasicCompiler32/Compile_Statement.cpp (modified) (2 diffs)
• BasicCompiler_Common/src/Class.cpp (modified) (2 diffs)

trunk/abdev/BasicCompiler32/Compile_Statement.cpp

@@ -614 +614 @@
     //第２パラメータを取得（in～）
     i=GetOneParameter(Parameter,i,collectionVar);
-    
+
     if( !GetVarType( variable, resultType, false ) )
     {
         Type collectionType;
-        if( !NumOpe_GetType( Parameter, Type(), collectionType ) )
+        if( !NumOpe_GetType( collectionVar, Type(), collectionType ) )
         {
             isError = true;
@@ -625 +625 @@
 
         // 未定義の場合は自動的に定義する
-        sprintf(temporary,"%s%c%c%s", variable, 1, ESC_AS, collectionType.GetActualGenericType(0).GetClass().GetFullName() );
+        sprintf(temporary,"%s%c%c%s", variable, 1, ESC_AS, collectionType.GetActualGenericType(0).GetClass().GetFullName().c_str() );
+        MessageBox(0,temporary,"test",0);
         OpcodeDim(temporary,DIMFLAG_INITDEBUGVAR);
     }

trunk/abdev/BasicCompiler_Common/src/Class.cpp

@@ -1356 +1356 @@
 
             //インターフェイス名を取得
-            GetIdentifierToken( temporary, basbuf, i );
+            GetCommandToken( temporary, basbuf, i );
+
+            char className[VN_SIZE];
+            Jenga::Common::Strings typeParameters;
+            SplitGenericClassInstance( temporary, className, typeParameters );
 
             CClass *pobj_c = const_cast<CClass *>( this->Find(namespaceScopes, temporary) );
@@ -1372 +1376 @@
                 continue;
             }
+
+            /////////////////////////////////////////////////////////
+            // ☆★☆ ジェネリクスサポート ☆★☆
+            BOOST_FOREACH( const std::string &typeParameter, typeParameters )
+            {
+                pobj_c->AddFormalGenericType( GenericType( typeParameter, Type(DEF_OBJECT,*GetObjectClassPtr()) ) );
+            }
+            /////////////////////////////////////////////////////////
 
             pobj_c->Readed();