Changeset 296 in dev for trunk/abdev/BasicCompiler_Common/src/Class.cpp

Timestamp:

Aug 23, 2007, 3:20:12 AM (17 years ago)

Author:

dai_9181

Message:

 

File:

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

trunk/abdev/BasicCompiler_Common/src/Class.cpp

@@ -1259 +1259 @@
 
             //クラス名を取得
-            GetIdentifierToken( temporary, basbuf, i );
-
-            CClass *pobj_c =  const_cast<CClass *>( this->Find(namespaceScopes, temporary) );
+            GetCommandToken( temporary, basbuf, i );
+
+            char className[VN_SIZE];
+            std::vector<std::string> typeParameters;
+            SplitGenericClassInstance( temporary, className, typeParameters );
+
+            CClass *pobj_c =  const_cast<CClass *>( this->Find(namespaceScopes, className) );
             if(!pobj_c) continue;
 
@@ -1281 +1285 @@
             /////////////////////////////////////////////////////////
             // ☆★☆ ジェネリクスサポート ☆★☆
-            if( basbuf[i] == '<' )
+            BOOST_FOREACH( const std::string &typeParameter, typeParameters )
             {
-                // 型パラメータを取得
-                i++;
-                GetIdentifierToken( temporary, basbuf, i );
-
-                pobj_c->AddFormalGenericType( GenericType( temporary, Type(DEF_OBJECT,*GetObjectClassPtr()) ) );
-
-                if( basbuf[i] == '>' )
-                {
-                    i++;
-                }
-                else
-                {
-                    SetError();
-                }
+                pobj_c->AddFormalGenericType( GenericType( typeParameter, Type(DEF_OBJECT,*GetObjectClassPtr()) ) );
             }
             /////////////////////////////////////////////////////////
@@ -1330 +1321 @@
                     isInherits = true;
 
-                    for(i+=3,i2=0;;i++,i2++){
-                        if(IsCommandDelimitation(basbuf[i])){
-                            temporary[i2]=0;
-                            break;
-                        }
-                        temporary[i2]=basbuf[i];
-                    }
+                    i += 3;
+                    GetCommandToken( temporary, basbuf, i );
 
                     if(lstrcmpi(temporary,pobj_c->GetName().c_str())==0){