Changeset 78 in dev for BasicCompiler_Common/Subroutine.cpp

Timestamp:

Mar 25, 2007, 2:47:49 AM (17 years ago)

Author:

dai_9181

Message:

CTypeDef → TypeDef
Houseクラスを追加。
オーバーロードレベルの種類を追加（レベル1に挿入）

File:

• BasicCompiler_Common/Subroutine.cpp (modified) (3 diffs)

BasicCompiler_Common/Subroutine.cpp

@@ -180 +180 @@
         GetVarType(fullCallName,type,false);
 
-        extern ProcPointer **ppProcPointer;
-        ProcPointer *pProcPtr = ppProcPointer[type.GetIndex()];
+        ProcPointer *pProcPtr = House::procPointers[type.GetIndex()];
         resultType = pProcPtr->ReturnType();
 
@@ -768 +767 @@
 ///////////////////////
 
-int AddProcPtrInfo( char *buffer, DWORD dwProcType, int nowLine ){
+int AddProcPtrInfo( const string &typeExpression, int nowLine ){
+    DWORD dwProcType = (DWORD)typeExpression[2];
+    const string &paramStr = typeExpression.substr( 3 );
 
     Procedure::Kind kind = Procedure::Sub;
@@ -778 +779 @@
 
     //buffer[0]は'('となっている
-    pProcPointer->SetParamsAndReturnType( buffer, nowLine );
-
-    extern ProcPointer **ppProcPointer;
-    extern int ProcPtrInfoNum;
-    ppProcPointer=(ProcPointer **)HeapReAlloc(hHeap,0,ppProcPointer,(ProcPtrInfoNum+1)*sizeof(ProcPointer *));
-    ppProcPointer[ProcPtrInfoNum] = pProcPointer;
-    ProcPtrInfoNum++;
-
-    return ProcPtrInfoNum-1;
+    pProcPointer->SetParamsAndReturnType( paramStr.c_str(), nowLine );
+
+    House::procPointers.push_back( pProcPointer );
+
+    return House::procPointers.size()-1;
 }
 void DeleteProcPtrInfo(void){
-    extern ProcPointer **ppProcPointer;
-    extern int ProcPtrInfoNum;
-
-    for(int i=0;i<ProcPtrInfoNum;i++){
-        delete ppProcPointer[i];
-    }
-
-    HeapDefaultFree(ppProcPointer);
-}
+    BOOST_FOREACH( ProcPointer *pProcPointer, House::procPointers ){
+        delete pProcPointer;
+    }
+
+    House::procPointers.clear();
+}