Changeset 100 in dev for BasicCompiler_Common/DebugMiddleFile.cpp

Timestamp:

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

Author:

dai_9181

Message:

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

File:

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

BasicCompiler_Common/DebugMiddleFile.cpp

@@ -205 +205 @@
 
     //プロシージャ情報
-    extern UserProc **ppSubHash;
+    extern GlobalProc **ppSubHash;
     extern int SubNum;
-    UserProc *pUserProc;
+    GlobalProc *pUserProc;
     *(long *)(buffer+i2)=SubNum;
     i2+=sizeof(long);
@@ -574 +574 @@
 
     //プロシージャ情報
-    UserProc *pUserProc;
+    GlobalProc *pUserProc;
     SubNum=*(long *)(buffer+i2);
     i2+=sizeof(long);
-    ppSubHash=(UserProc **)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,MAX_HASH*sizeof(UserProc *));
+    ppSubHash=(GlobalProc **)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,MAX_HASH*sizeof(GlobalProc *));
     for(int i6=0;i6<SubNum;i6++){
         char szParentClassName[VN_SIZE];
@@ -596 +596 @@
 
         // オブジェクトを生成
-        pUserProc = new UserProc( name, UserProc::Function, false, false, false );
+        // TODO: 名前空間が未完成
+        pUserProc = new GlobalProc( NamespaceScopes(), name, Procedure::Function, false, false, false );
         pUserProc->pNextData=0;
         pUserProc->id=id;
@@ -664 +665 @@
         i4=hash_default(pUserProc->GetName().c_str());
 
-        UserProc *psi2;
+        GlobalProc *psi2;
         if(ppSubHash[i4]){
             psi2=ppSubHash[i4];
@@ -730 +731 @@
         i2+=sizeof(long);
         for( i4=0; i4<nMethod; i4++ ){
-            CMethod *method = new CMethod();
-
-            method->dwAccess=*(long *)(buffer+i2);
+
+            DWORD dwAccess=*(long *)(buffer+i2);
             i2+=sizeof(long);
 
@@ -739 +739 @@
             i2+=lstrlen(buffer+i2)+1;
 
-            if(szInherits[0])
-                method->pobj_InheritsClass=pobj_DBClass->check(szInherits);
-            else method->pobj_InheritsClass=0;
+            CClass *pobj_InheritsClass = NULL;
+            if(szInherits[0]){
+                pobj_InheritsClass=pobj_DBClass->check(szInherits);
+            }
 
             lstrcpy(temp2,buffer+i2);
@@ -747 +748 @@
 
             CClass *pobj_temp_c;
-            pobj_temp_c=method->pobj_InheritsClass;
+            pobj_temp_c=pobj_InheritsClass;
             if(pobj_temp_c==0) pobj_temp_c=pobj_c;
             i5=hash_default(temp2);
@@ -755 +756 @@
                 pUserProc=pUserProc->pNextData;
             }
-            method->pUserProc=pUserProc;
+
+            CMethod *method = new CMethod( pUserProc, dwAccess, 0,0,false, false);
+            method->pobj_InheritsClass = pobj_InheritsClass;
 
             pobj_c->methods.push_back( method );
@@ -795 +798 @@
 
 
-    extern UserProc **ppSubHash;
+    extern GlobalProc **ppSubHash;
     ppSubHash=this->ppSubHash;
     pSub_DebugSys_EndProc=GetSubHash("_DebugSys_EndProc");
@@ -951 +954 @@
     extern char **ppMacroNames;
     ppMacroNames=0;
-    extern UserProc **ppSubHash;
+    extern GlobalProc **ppSubHash;
     extern int SubNum;
     ppSubHash=this->ppSubHash;