Changeset 379 in dev for trunk

Timestamp:

Dec 17, 2007, 2:41:25 AM (16 years ago)

Author:

dai_9181

Message:

ジェネリクスインターフェイスをサポートした

Location:

trunk/abdev/BasicCompiler_Common

Files:

• calculation.cpp (modified) (2 diffs)
• include/Class.h (modified) (1 diff)
• src/Class.cpp (modified) (1 diff)
• src/Class_Collect.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler_Common/calculation.cpp

@@ -1375 +1375 @@
             temporary[i2]=0;
 
-            if((stack[sp-1]%100)==CALC_AS&&Command[i]=='*'){
-                for(i3=0;i3<i2;i3++){
-                    if(temporary[i2]!='*') break;
-                }
-                if(i3==i2){
-                    //"*"をポインタ指定文字として認識する
-                    temporary[i2]=Command[i];
-                    continue;
+            if( sp > 0 && (stack[sp-1]%100) == CALC_AS )
+            {
+                if( Command[i] == '*' )
+                {
+                    for(i3=0;i3<i2;i3++){
+                        if(temporary[i2]!='*') break;
+                    }
+                    if(i3==i2){
+                        //"*"をポインタ指定文字として認識する
+                        temporary[i2]=Command[i];
+                        continue;
+                    }
+                }
+                else if( Command[i] == '<' )
+                {
+                    Type type;
+                    if( compiler.StringToType( temporary, type ) )
+                    {
+                        if( type.HasMember() && type.GetClass().IsGeneric() )
+                        {
+                            char temp2[1024];
+                            int i5 = 1;
+                            for( i3=i, i4=0; ; i3++, i4++ )
+                            {
+                                if( Command[i3] == '<' )
+                                {
+                                    i5++;
+                                }
+                                if( Command[i3] == '>' )
+                                {
+                                    i5--;
+                                    if( i5 == 0 )
+                                    {
+                                        temp2[i4] = 0;
+                                        break;
+                                    }
+                                }
+                                temp2[i4] = Command[i3];
+                                if( Command[i3] == '\0' )
+                                {
+                                    break;
+                                }
+                            }
+                            if( Command[i] )
+                            {
+                                i = i3;
+                                i2 += i4;
+                                lstrcat( temporary, temp2 );
+                            }
+
+                            if( Command[i] == '\0' )
+                            {
+                                goto FinishLoop;
+                            }
+                        }
+                    }
                 }
             }
@@ -1445 +1493 @@
         temporary[i2]=Command[i];
         if(Command[i]=='\0'){
+FinishLoop:
             calc[*pnum]=0;
 

trunk/abdev/BasicCompiler_Common/include/Class.h

@@ -315 +315 @@
         return false;
     }
+    bool IsGeneric() const
+    {
+        return ( this->formalGenericTypes.size() != 0 );
+    }
 
     // 継承元クラス

trunk/abdev/BasicCompiler_Common/src/Class.cpp

@@ -545 +545 @@
     else
     {
-        ts(buffer);
         // インターフェイス メソッドのオーバーライド
         BOOST_FOREACH( ::Interface *pInterface, pobj_c->GetInterfaces() )

trunk/abdev/BasicCompiler_Common/src/Class_Collect.cpp

@@ -328 +328 @@
             CClass *pobj_c = const_cast<CClass *>( this->Find(namespaceScopes, className) );
             if(!pobj_c) continue;
+
+            compiler.pCompilingClass = pobj_c;
 
             if(lpszInheritsClass){