Changeset 424 in dev for trunk/abdev/BasicCompiler_Common/src/Enum.cpp

Timestamp:

Mar 10, 2008, 5:39:36 PM (16 years ago)

Author:

dai_9181

Message:

・ジェネリックな型をパラメータに持つメソッドのオーバーロード解決に対応した。
・型パラメータの制約クラス指定に対応した。

File:

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

trunk/abdev/BasicCompiler_Common/src/Enum.cpp

@@ -177 +177 @@
         sprintf(buffer+length,"Class Enum %s\n",enumInfo.GetName().c_str());
         length+=lstrlen(buffer+length);
-        lstrcpy(buffer+length,"\tInherits EnumBase\n");
+        sprintf(buffer+length,"\tInherits EnumBase<%s>\n",enumInfo.GetName().c_str());
         length+=lstrlen(buffer+length);
         sprintf(buffer+length,"\tSub %s(value As Long,lpszName As LPSTR)\n",enumInfo.GetName().c_str());
@@ -211 +211 @@
         }
 
-        sprintf(buffer+length,"\tFunction Operator or (enumBase As %s) As %s\n",enumInfo.GetName().c_str(),enumInfo.GetName().c_str());
-        length+=lstrlen(buffer+length);
-        sprintf(buffer+length,"\t\tReturn New %s(This.value or enumBase.value, \"custom\")\n",enumInfo.GetName().c_str());
-        length+=lstrlen(buffer+length);
-        lstrcpy(buffer+length,"\tEnd Function\n");
-        length+=lstrlen(buffer+length);
-
-        sprintf(buffer+length,"\tFunction Operator and (enumBase As %s) As %s\n",enumInfo.GetName().c_str(),enumInfo.GetName().c_str());
-        length+=lstrlen(buffer+length);
-        sprintf(buffer+length,"\t\tReturn New %s(This.value and enumBase.value, \"custom\")\n",enumInfo.GetName().c_str());
-        length+=lstrlen(buffer+length);
-        lstrcpy(buffer+length,"\tEnd Function\n");
-        length+=lstrlen(buffer+length);
-
-        /*
-        sprintf(buffer+length,"\tOverride Function ToString() As String\n",enumInfo.TypeName);
-        length+=lstrlen(buffer+length);
-        lstrcpy(buffer+length,"\t\tSelect Case value\n");
-        length+=lstrlen(buffer+length);
-        for(i2=0;i2<enumInfo.iEnumMemberNum;i2++){
-            CEnumMember *member;
-            member=enumInfo.ppobj_EnumMember[i2];
-
-            sprintf(buffer+length,"\t\t\tCase %d\n",member->m_value);
-            length+=lstrlen(buffer+length);
-            sprintf(buffer+length,"\t\t\t\tReturn \"%s\"\n",member->m_name);
-            length+=lstrlen(buffer+length);
-        }
-        lstrcpy(buffer+length,"\t\tEnd Select\n");
-        length+=lstrlen(buffer+length);
-        lstrcpy(buffer+length,"\tEnd Function\n");
-        length+=lstrlen(buffer+length);
-
-        
-        sprintf(buffer+length,"\tSub Operator= (ByRef value As %s)\n",enumInfo.TypeName);
-        length+=lstrlen(buffer+length);
-        lstrcpy(buffer+length,"\t\tThis.Copy(ByVal VarPtr(value))\n");
-        length+=lstrlen(buffer+length);
-        lstrcpy(buffer+length,"\tEnd Sub\n");
-        length+=lstrlen(buffer+length);
-
-        sprintf(buffer+length,"\tSub Operator= (ByRef value As String)\n",enumInfo.TypeName);
-        length+=lstrlen(buffer+length);
-        lstrcpy(buffer+length,"\t\tSelect Case value\n");
-        length+=lstrlen(buffer+length);
-        for(i2=0;i2<enumInfo.iEnumMemberNum;i2++){
-            CEnumMember *member;
-            member=enumInfo.ppobj_EnumMember[i2];
-
-            sprintf(buffer+length,"\t\t\tCase \"%s\"\n",member->m_name);
-            length+=lstrlen(buffer+length);
-            sprintf(buffer+length,"\t\t\t\tThis=%s.%s\n",enumInfo.TypeName,member->m_name);
-            length+=lstrlen(buffer+length);
-        }
-        lstrcpy(buffer+length,"\t\tEnd Select\n");
-        length+=lstrlen(buffer+length);
-        lstrcpy(buffer+length,"\tEnd Sub\n");
-        length+=lstrlen(buffer+length);
-
-        sprintf(buffer+length,"\tSub Operator= (value As Long)\n",enumInfo.TypeName);
-        length+=lstrlen(buffer+length);
-        lstrcpy(buffer+length,"\t\tm_Value=value\n");
-        length+=lstrlen(buffer+length);
-        lstrcpy(buffer+length,"\tEnd Sub\n");
-        length+=lstrlen(buffer+length);*/
-
         lstrcpy(buffer+length,"End Class\n");
         length+=lstrlen(buffer+length);