Changeset 73 in dev for BasicCompiler_Common/Class.cpp

Timestamp:

Mar 16, 2007, 11:07:14 PM (17 years ago)

Author:

dai_9181

Message:

Parameterクラスを適用。32bit側は動くようになったので、64bitのほうを調整する。

File:

• BasicCompiler_Common/Class.cpp (modified) (15 diffs)

BasicCompiler_Common/Class.cpp

@@ -267 +267 @@
     staticMembers.push_back( member );
 }
-void CClass::AddMethod( SUBINFO *psi,DWORD dwAccess, bool isConst, BOOL bAbstract, BOOL bVirtual ){
+void CClass::AddMethod( SubInfo *psi,DWORD dwAccess, bool isConst, BOOL bAbstract, BOOL bVirtual ){
     CMethod *method = new CMethod();
     method->psi = psi;
@@ -278 +278 @@
     methods.push_back( method );
 }
-void CClass::AddStaticMethod(SUBINFO *psi,DWORD dwAccess){
+void CClass::AddStaticMethod(SubInfo *psi,DWORD dwAccess){
     CMethod *method = new CMethod();
     method->psi=psi;
@@ -322 +322 @@
     return 0;
 }
-CMethod *CClass::GetMethodInfo( SUBINFO *psi ){
+CMethod *CClass::GetMethodInfo( SubInfo *psi ){
     for( int i=(int)methods.size()-1; i>=0; i-- ){
         if( psi == methods[i]->psi ) return methods[i];
@@ -328 +328 @@
     return NULL;
 }
-CMethod *CClass::GetStaticMethodInfo( SUBINFO *psi ){
+CMethod *CClass::GetStaticMethodInfo( SubInfo *psi ){
     for( int i=(int)staticMethods.size()-1; i>=0; i-- ){
         if( psi == staticMethods[i]->psi ) return staticMethods[i];
@@ -347 +347 @@
 }
 
-void CClass::EnumStaticMethod( const char *methodName, std::vector<SUBINFO *> &subs ) const
+void CClass::EnumStaticMethod( const char *methodName, std::vector<SubInfo *> &subs ) const
 {
     foreach( CMethod *method, staticMethods ){
@@ -356 +356 @@
 }
 
-void CClass::EnumMethod( const char *methodName, std::vector<SUBINFO *> &subs ) const
+void CClass::EnumMethod( const char *methodName, std::vector<SubInfo *> &subs ) const
 {
     //オブジェクトのメンバ関数の場合
@@ -367 +367 @@
 }
 
-void CClass::EnumMethod( const BYTE idOperatorCalc, std::vector<SUBINFO *> &subs ) const
+void CClass::EnumMethod( const BYTE idOperatorCalc, std::vector<SubInfo *> &subs ) const
 {
     //オブジェクトのメンバ関数の場合
     //※オーバーライドされた関数を先にサーチする必要があるため、バックサーチを行う
     for( int i=(int)methods.size()-1; i>=0; i-- ){
-        SUBINFO *psi = methods[i]->psi;
+        SubInfo *psi = methods[i]->psi;
         char *temp = psi->name;
         if(temp[0]==1&&temp[1]==ESC_OPERATOR){
@@ -508 +508 @@
 
 
-int CClass::GetFuncNumInVtbl( const SUBINFO *psi ) const
+int CClass::GetFuncNumInVtbl( const SubInfo *psi ) const
 {
     int n = 0;
@@ -527 +527 @@
     //////////////////////////////////////
 
-    SUBINFO **ppsi;
-    ppsi=(SUBINFO **)HeapAlloc(hHeap,0,vtbl_num*sizeof(SUBINFO *));
+    SubInfo **ppsi;
+    ppsi=(SubInfo **)HeapAlloc(hHeap,0,vtbl_num*sizeof(SubInfo *));
 
     //関数テーブルに値をセット
@@ -565 +565 @@
     int i;
     for(i=0;i<vtbl_num;i++){
-        SUBINFO *psi;
-        psi=(SUBINFO *)pVtbl[i];
+        SubInfo *psi;
+        psi=(SubInfo *)pVtbl[i];
         if(!psi) continue;
         pVtbl[i]=psi->CompileAddress+ImageBase+MemPos_CodeSection;
@@ -835 +835 @@
 
     //関数ハッシュへ登録
-    SUBINFO *psi;
+    SubInfo *psi;
     psi=AddSubData(buffer,NowLine,bVirtual,pobj_c,bStatic);
     if(!psi) return;
@@ -849 +849 @@
 
         //標準コンストラクタ（引数なし）
-        if(psi->ParmNum==0) fConstructor=1;
+        if(psi->params.size()==0) fConstructor=1;
 
         //強制的にConst修飾子をつける
@@ -894 +894 @@
 
         if(lstrcmp(temporary,method->psi->name)==0){
-            if(CompareParameter(
-                method->psi->pParmInfo,method->psi->ParmNum,
-                psi->pParmInfo,psi->ParmNum
-                )==0){
+            if( Parameter::Equals( method->psi->params, psi->params ) ){
                 //関数名、パラメータ属性が合致したとき
                 SetError(15,psi->name,NowLine);
@@ -911 +908 @@
     foreach( CMethod *method, pobj_c->methods ){
         if(lstrcmp(temporary,method->psi->name)==0){
-            if(CompareParameter(
-                method->psi->pParmInfo,method->psi->ParmNum,
-                psi->pParmInfo,psi->ParmNum
-                )==0){
+            if( Parameter::Equals( method->psi->params, psi->params ) ){
 
                 if(method->psi->bVirtual){
@@ -1444 +1438 @@
 }
 
-void CDBClass::StartCompile( SUBINFO *psi ){
+void CDBClass::StartCompile( SubInfo *psi ){
     pCompilingClass = psi->pobj_ParentClass;
     if( pCompilingClass ){