Changeset 100 in dev for BasicCompiler_Common/Class.cpp

Timestamp:

Apr 24, 2007, 3:17:29 AM (17 years ago)

Author:

dai_9181

Message:

名前空間機能をグローバル関数に適用。

File:

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

BasicCompiler_Common/Class.cpp

@@ -118 +118 @@
 
 
-CMethod::CMethod(CMethod *pobj){
-    //コピーコンストラクタ
-    memset(this,0,sizeof(CMethod));
-
-    pUserProc=pobj->pUserProc;
-
-    bAbstract=pobj->bAbstract;
-
-    bVirtual=pobj->bVirtual;
-}
-CMethod::CMethod(){
-    memset(this,0,sizeof(CMethod));
+//コピーコンストラクタ
+CMethod::CMethod(CMethod *pMethod)
+    : pUserProc( pMethod->pUserProc )
+    , dwAccess( pMethod->dwAccess )
+    , bAbstract( pMethod->bAbstract )
+    , bVirtual( pMethod->bVirtual )
+    , isConst( pMethod->isConst )
+    , isStatic( pMethod->isStatic )
+{
+}
+
+CMethod::CMethod( UserProc *pUserProc, DWORD dwAccess, BOOL bAbstract, BOOL bVirtual, bool isConst, bool isStatic )
+    : pUserProc( pUserProc )
+    , dwAccess( dwAccess )
+    , bAbstract( bAbstract )
+    , bVirtual( bVirtual )
+    , isConst( isConst )
+    , isStatic( isStatic )
+    , pobj_InheritsClass( NULL )
+{
 }
 CMethod::~CMethod(){
@@ -330 +338 @@
 }
 void CClass::AddMethod( UserProc *pUserProc,DWORD dwAccess, bool isConst, BOOL bAbstract, BOOL bVirtual ){
-    CMethod *method = new CMethod();
-    method->pUserProc = pUserProc;
-    method->dwAccess = dwAccess;
-    method->isConst = isConst;
-    method->bAbstract = bAbstract;
-    method->bVirtual = bVirtual;
-    method->pobj_InheritsClass = 0;
+    CMethod *method = new CMethod( pUserProc, dwAccess, bAbstract, bVirtual, isConst, false );
 
     methods.push_back( method );
@@ -344 +346 @@
 }
 void CClass::AddStaticMethod(UserProc *pUserProc,DWORD dwAccess){
-    CMethod *method = new CMethod();
-    method->pUserProc=pUserProc;
-    method->dwAccess=dwAccess;
-    method->bAbstract=0;
-    method->bVirtual=0;
-    method->pobj_InheritsClass=0;
+    CMethod *method = new CMethod( pUserProc, dwAccess, FALSE, FALSE, false, true );
 
     staticMethods.push_back( method );
@@ -421 +418 @@
 }
 
-void CClass::EnumStaticMethod( const char *methodName, std::vector<UserProc *> &subs ) const
+void CClass::EnumStaticMethod( const char *methodName, vector<UserProc *> &subs ) const
 {
     foreach( CMethod *method, staticMethods ){
@@ -430 +427 @@
 }
 
-void CClass::EnumMethod( const char *methodName, std::vector<UserProc *> &subs ) const
+void CClass::EnumMethod( const char *methodName, vector<UserProc *> &subs ) const
 {
     //オブジェクトのメンバ関数の場合
@@ -441 +438 @@
 }
 
-void CClass::EnumMethod( const BYTE idOperatorCalc, std::vector<UserProc *> &subs ) const
+void CClass::EnumMethod( const BYTE idOperatorCalc, vector<UserProc *> &subs ) const
 {
     //オブジェクトのメンバ関数の場合
@@ -603 +600 @@
 
     UserProc **ppsi;
-    ppsi=(UserProc **)HeapAlloc(hHeap,0,vtbl_num*sizeof(UserProc *));
+    ppsi=(UserProc **)HeapAlloc(hHeap,0,vtbl_num*sizeof(GlobalProc *));
 
     //関数テーブルに値をセット
@@ -642 +639 @@
     int i;
     for(i=0;i<vtbl_num;i++){
-        UserProc *pUserProc;
-        pUserProc=(UserProc *)pVtbl[i];
+        GlobalProc *pUserProc;
+        pUserProc=(GlobalProc *)pVtbl[i];
         if(!pUserProc) continue;
         pVtbl[i]=pUserProc->beginOpAddress+ImageBase+MemPos_CodeSection;
@@ -803 +800 @@
         }
     }
-    return 0;
+    return NULL;
 }
 
@@ -932 +929 @@
 
     //関数ハッシュへ登録
-    UserProc *pUserProc;
-    pUserProc=AddSubData(buffer,nowLine,bVirtual,pobj_c, (bStatic!=0) );
+    GlobalProc *pUserProc;
+    pUserProc=AddSubData( NamespaceScopes(), buffer,nowLine,bVirtual,pobj_c, (bStatic!=0) );
     if(!pUserProc) return;