Changeset 296 in dev

Timestamp:

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

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler_Common

Files:

• Compile.cpp (modified) (2 diffs)
• common.h (modified) (1 diff)
• src/Class.cpp (modified) (3 diffs)

trunk/abdev/BasicCompiler_Common/Compile.cpp

@@ -31 +31 @@
 // トークンを取得
 ///////////////////////////////////////////////////
-void GetIdentifierToken( char *token, const char *source, int &pos ){
+void GetIdentifierToken( char *token, const char *source, int &pos )
+{
     for( int i=0; ; i++, pos++ ){
         if( ! IsVariableChar( source[pos] ) ){
@@ -39 +40 @@
         token[i] = source[pos];
     }
+}
+void GetCommandToken( char *token, const char *source, int &pos )
+{
+    for( int i=0; ; i++, pos++ ){
+        if( IsCommandDelimitation( source[pos] ) ){
+            token[i] = 0;
+            break;
+        }
+        token[i] = source[pos];
+    }
+}
+
+
+///////////////////////////////////////////////////
+// ジェネリクスのクラス型記述を分析
+///////////////////////////////////////////////////
+void SplitGenericClassInstance( const char *fullName, char *className, std::vector<std::string> &typeParameters )
+{
+    int i = 0;
+    typeParameters.clear();
+
+    //クラス名を取得
+    GetIdentifierToken( className, fullName, i );
+
+
+    /////////////////////////////////////////////////////////
+    // ☆★☆ ジェネリクスサポート ☆★☆
+    if( fullName[i] == '<' )
+    {
+        while( true )
+        {
+            i++;
+
+            // 型パラメータを取得
+            char temporary[VN_SIZE];
+            GetIdentifierToken( temporary, fullName, i );
+            if( temporary[0] == '\0' )
+            {
+                extern int cp;
+                SetError(1,NULL,cp);
+            }
+
+            typeParameters.push_back( temporary );
+
+            if( fullName[i] == ',' )
+            {
+                continue;
+            }
+            else if( fullName[i] == '>' )
+            {
+                break;
+            }
+            else
+            {
+                extern int cp;
+                SetError(1,NULL,cp);
+            }
+        }
+    }
+    /////////////////////////////////////////////////////////
 }
 

trunk/abdev/BasicCompiler_Common/common.h

@@ -374 +374 @@
 //Compile.cpp
 void GetIdentifierToken( char *token, const char *source, int &pos );
+void GetCommandToken( char *token, const char *source, int &pos );
+void SplitGenericClassInstance( const char *fullName, char *className, std::vector<std::string> &typeParameters );
 int JumpStatement(const char *source, int &pos);
 void DebugVariable(void);

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){