Changeset 78 in dev

Timestamp:

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

Author:

dai_9181

Message:

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

Files:

• BasicCompiler32/BasicCompiler.vcproj (modified) (7 diffs)
• BasicCompiler32/Compile_Func.cpp (modified) (1 diff)
• BasicCompiler32/Compile_ProcOp.cpp (modified) (1 diff)
• BasicCompiler32/MakePeHdr.cpp (modified) (6 diffs)
• BasicCompiler32/Opcode.h (modified) (1 diff)
• BasicCompiler64/BasicCompiler.vcproj (modified) (7 diffs)
• BasicCompiler64/Compile_Func.cpp (modified) (1 diff)
• BasicCompiler64/MakePeHdr.cpp (modified) (2 diffs)
• BasicCompiler64/Opcode.h (modified) (1 diff)
• BasicCompiler_Common/BasicCompiler.cpp (modified) (1 diff)
• BasicCompiler_Common/BasicCompiler.h (modified) (1 diff)
• BasicCompiler_Common/Class.h (modified) (1 diff)
• BasicCompiler_Common/Compile.cpp (modified) (1 diff)
• BasicCompiler_Common/DebugMiddleFile.cpp (modified) (4 diffs)
• BasicCompiler_Common/DebugSection.h (modified) (1 diff)
• BasicCompiler_Common/Intermediate_Step2.cpp (modified) (2 diffs)
• BasicCompiler_Common/MakeExe.cpp (modified) (2 diffs)
• BasicCompiler_Common/ParamImpl.cpp (modified) (3 diffs)
• BasicCompiler_Common/Parameter.h (modified) (2 diffs)
• BasicCompiler_Common/Procedure.cpp (modified) (12 diffs)
• BasicCompiler_Common/Procedure.h (modified) (1 diff)
• BasicCompiler_Common/Subroutine.cpp (modified) (3 diffs)
• BasicCompiler_Common/Type.cpp (modified) (3 diffs)
• BasicCompiler_Common/TypeDef.cpp (modified) (9 diffs)
• BasicCompiler_Common/TypeDef.h (modified) (1 diff)
• BasicCompiler_Common/VarList.cpp (modified) (7 diffs)
• BasicCompiler_Common/VariableOpe.cpp (modified) (5 diffs)
• BasicCompiler_Common/VariableOpe.h (modified) (1 diff)
• BasicCompiler_Common/WatchList.cpp (modified) (1 diff)
• BasicCompiler_Common/calculation.cpp (modified) (1 diff)
• BasicCompiler_Common/common.h (modified) (3 diffs)
• BasicCompiler_Common/include (added)
• BasicCompiler_Common/include/House.h (added)
• BasicCompiler_Common/src (added)
• BasicCompiler_Common/src/House.cpp (added)

BasicCompiler32/BasicCompiler.vcproj

@@ -48 +48 @@
                 Name="VCCLCompilerTool"
                 Optimization="0"
-                AdditionalIncludeDirectories="..\cpplibs\boost"
+                AdditionalIncludeDirectories="..\cpplibs\boost;..\BasicCompiler_Common\include"
                 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;JPN"
                 MinimalRebuild="true"
@@ -894 +894 @@
                         </FileConfiguration>
                     </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\TypeDef.cpp"
-                        >
-                        <FileConfiguration
-                            Name="Debug|Win32"
-                            >
-                            <Tool
-                                Name="VCCLCompilerTool"
-                                PreprocessorDefinitions=""
-                            />
-                        </FileConfiguration>
-                        <FileConfiguration
-                            Name="Release|Win32"
-                            >
-                            <Tool
-                                Name="VCCLCompilerTool"
-                                PreprocessorDefinitions=""
-                            />
-                        </FileConfiguration>
-                        <FileConfiguration
-                            Name="English_Rel|Win32"
-                            >
-                            <Tool
-                                Name="VCCLCompilerTool"
-                                PreprocessorDefinitions=""
-                            />
-                        </FileConfiguration>
-                    </File>
                 </Filter>
                 <Filter
@@ -1879 +1851 @@
                 >
                 <File
+                    RelativePath="..\BasicCompiler_Common\src\House.cpp"
+                    >
+                </File>
+                <File
                     RelativePath="..\BasicCompiler_Common\Procedure.cpp"
                     >
@@ -1885 +1861 @@
                     RelativePath="..\BasicCompiler_Common\Type.cpp"
                     >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\TypeDef.cpp"
+                    >
+                    <FileConfiguration
+                        Name="Debug|Win32"
+                        >
+                        <Tool
+                            Name="VCCLCompilerTool"
+                            PreprocessorDefinitions=""
+                        />
+                    </FileConfiguration>
+                    <FileConfiguration
+                        Name="Release|Win32"
+                        >
+                        <Tool
+                            Name="VCCLCompilerTool"
+                            PreprocessorDefinitions=""
+                        />
+                    </FileConfiguration>
+                    <FileConfiguration
+                        Name="English_Rel|Win32"
+                        >
+                        <Tool
+                            Name="VCCLCompilerTool"
+                            PreprocessorDefinitions=""
+                        />
+                    </FileConfiguration>
                 </File>
                 <File
@@ -1935 +1939 @@
                     >
                 </File>
-                <File
-                    RelativePath="..\BasicCompiler_Common\TypeDef.h"
-                    >
-                </File>
             </Filter>
             <Filter
@@ -1944 +1944 @@
                 >
                 <File
+                    RelativePath="..\BasicCompiler_Common\include\House.h"
+                    >
+                </File>
+                <File
                     RelativePath="..\BasicCompiler_Common\Parameter.h"
                     >
@@ -1953 +1957 @@
                 <File
                     RelativePath="..\BasicCompiler_Common\Type.h"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\TypeDef.h"
                     >
                 </File>

BasicCompiler32/Compile_Func.cpp

@@ -254 +254 @@
 
         //オーバーロードを解決
-        extern ProcPointer **ppProcPointer;
-        pUserProc=OverloadSolution(name,subs,ppProcPointer[ProcPtr_BaseIndex]->Params(), Type() );
+        pUserProc=OverloadSolution(name,subs,House::procPointers[ProcPtr_BaseIndex]->Params(), Type() );
 
         if(!pUserProc){

BasicCompiler32/Compile_ProcOp.cpp

@@ -203 +203 @@
         memcpy(OpBuffer+obp,Buffer_aullshr,31);
         obp+=31;
+    }
+    else{
+        SetError();
     }
 }

BasicCompiler32/MakePeHdr.cpp

@@ -17 +17 @@
     *pSub_System_InitStaticLocalVariables,
     *pSub_System_Call_Destructor_of_GlobalObject,
+    *pSub_System_End,
     *pSub_System_GetSp,
     *pSub_pow,
@@ -150 +151 @@
 
     //関数ポインタ情報を初期化
-    extern ProcPointer **ppProcPointer;
-    extern int ProcPtrInfoNum;
-    ppProcPointer=(ProcPointer **)HeapAlloc(hHeap,0,1);
-    ProcPtrInfoNum=0;
+    House::procPointers.clear();
 
     //クラス名を取得（詳細情報はGetAllClassInfoで取得）
@@ -161 +159 @@
     pobj_DBClass->InitNames();
 
+    //TypeDef情報を初期化
+    House::typeDefs.Init();
+
     //定数情報を取得
     GetConstInfo();
@@ -215 +216 @@
     }
 
+    if(pSub_System_End=GetSubHash("_System_End",1)){
+        pSub_System_End->Using();
+    }
+
     if(pSub_System_GetSp=GetSubHash("_System_GetSp",1)){
         pSub_System_GetSp->Using();
@@ -314 +319 @@
 #ifdef _DEBUG
     {
-        ofstream ofs("middle_code.txt");
+        ofstream ofs( ( (string)BasicSystemDir + "middle_code.txt" ).c_str() );
         ofs << basbuf << endl;
         ofs.close();
@@ -399 +404 @@
         ///////////////////////////////////////
 
-        //call _System_Call_Destructor_of_GlobalObject
-        extern UserProc *pSub_System_Call_Destructor_of_GlobalObject;
-        op_call(pSub_System_Call_Destructor_of_GlobalObject);
+        //call _System_End
+        extern UserProc *pSub_System_End;
+        op_call(pSub_System_End);
 
 

BasicCompiler32/Opcode.h

@@ -194 +194 @@
 
 //ParamImpl.cpp
-#define OVERLOAD_MIN_LEVEL 0
-#define OVERLOAD_MAX_LEVEL 3
-#define OVERLOAD_LEVEL0 0
-#define OVERLOAD_LEVEL1 1
-#define OVERLOAD_LEVEL2 2
-#define OVERLOAD_LEVEL3 3
 class ParamImpl{
     char *Parms[255];

BasicCompiler64/BasicCompiler.vcproj

@@ -48 +48 @@
                 Name="VCCLCompilerTool"
                 Optimization="0"
-                AdditionalIncludeDirectories="..\cpplibs\boost"
+                AdditionalIncludeDirectories="..\cpplibs\boost;..\BasicCompiler_Common\include"
                 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;JPN;_AMD64_;_WIN64"
                 MinimalRebuild="true"
@@ -464 +464 @@
                     >
                 </File>
-                <File
-                    RelativePath="..\BasicCompiler_Common\TypeDef.h"
-                    >
-                </File>
             </Filter>
             <Filter
@@ -473 +469 @@
                 >
                 <File
+                    RelativePath="..\BasicCompiler_Common\include\House.h"
+                    >
+                </File>
+                <File
                     RelativePath="..\BasicCompiler_Common\Parameter.h"
                     >
@@ -482 +482 @@
                 <File
                     RelativePath="..\BasicCompiler_Common\Type.h"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\TypeDef.h"
                     >
                 </File>
@@ -1351 +1355 @@
                         >
                     </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\TypeDef.cpp"
-                        >
-                    </File>
                 </Filter>
                 <Filter
@@ -1529 +1529 @@
                 >
                 <File
+                    RelativePath="..\BasicCompiler_Common\src\House.cpp"
+                    >
+                </File>
+                <File
                     RelativePath="..\BasicCompiler_Common\Procedure.cpp"
                     >
@@ -1534 +1538 @@
                 <File
                     RelativePath="..\BasicCompiler_Common\Type.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\TypeDef.cpp"
                     >
                 </File>

BasicCompiler64/Compile_Func.cpp

@@ -102 +102 @@
 
         //オーバーロードを解決
-        extern ProcPointer **ppProcPointer;
-        pUserProc=OverloadSolution(name,subs,ppProcPointer[ProcPtr_BaseIndex]->Params(), Type() );
+        pUserProc=OverloadSolution(name,subs,House::procPointers[ProcPtr_BaseIndex]->Params(), Type() );
 
         if(!pUserProc){

BasicCompiler64/MakePeHdr.cpp

@@ -136 +136 @@
 
     //関数ポインタ情報を初期化
-    extern ProcPointer **ppProcPointer;
-    extern int ProcPtrInfoNum;
-    ppProcPointer=(ProcPointer **)HeapAlloc(hHeap,0,1);
-    ProcPtrInfoNum=0;
+    House::procPointers.clear();
 
     //クラス名を取得（詳細情報はGetAllClassInfoで取得）
@@ -146 +143 @@
     pobj_DBClass=new CDBClass();
     pobj_DBClass->InitNames();
+
+    //TypeDef情報を初期化
+    House::typeDefs.Init();
 
     //定数情報を取得

BasicCompiler64/Opcode.h

@@ -327 +327 @@
 
 //ParamImpl.cpp
-#define OVERLOAD_MIN_LEVEL 0
-#define OVERLOAD_MAX_LEVEL 3
-#define OVERLOAD_LEVEL0 0
-#define OVERLOAD_LEVEL1 1
-#define OVERLOAD_LEVEL2 2
-#define OVERLOAD_LEVEL3 3
 class ParamImpl{
     char *Parms[255];

BasicCompiler_Common/BasicCompiler.cpp

@@ -540 +540 @@
     char temporary[1024],temp2[MAX_PATH];
 
+    //MessageBox(0,"starting compiler/debugger","ActiveBasic",MB_OK);
+
     //コモンコントロールを初期化
     InitCommonControls();

BasicCompiler_Common/BasicCompiler.h

@@ -29 +29 @@
 DllProc **ppDeclareHash;
 CONSTINFO **ppConstHash;
-ProcPointer **ppProcPointer;
-int ProcPtrInfoNum;
 
 ERRORINFO *pErrorInfo;

BasicCompiler_Common/Class.h

@@ +1 @@
+#pragma once
+
 #include <vector>
 #include "Type.h"

BasicCompiler_Common/Compile.cpp

@@ -154 +154 @@
 
             case ESC_TYPEDEF:
+                //既に収集済み
                 break;
 

BasicCompiler_Common/DebugMiddleFile.cpp

@@ -138 +138 @@
     // TypeDef情報
     //////////////////
-
-    extern CDBTypeDef *pobj_DBTypeDef;
-    *(long *)(buffer+i2)=pobj_DBTypeDef->iNum;
-    i2+=sizeof(long);
-    for(i3=0;i3<pobj_DBTypeDef->iNum;i3++){
-        lstrcpy(buffer+i2,pobj_DBTypeDef->ppobj_TypeDef[i3]->lpszName);
-        i2+=lstrlen(buffer+i2)+1;
-
-        lstrcpy(buffer+i2,pobj_DBTypeDef->ppobj_TypeDef[i3]->lpszBaseName);
+    *(long *)(buffer+i2)=House::typeDefs.size();
+    i2+=sizeof(long);
+    for(i3=0;i3<(int)House::typeDefs.size();i3++){
+        lstrcpy(buffer+i2,House::typeDefs[i3].GetNewName().c_str() );
+        i2+=lstrlen(buffer+i2)+1;
+
+        lstrcpy(buffer+i2,House::typeDefs[i3].GetBaseName().c_str() );
         i2+=lstrlen(buffer+i2)+1;
 
@@ -507 +505 @@
 
     //初期化
-    pobj_DBTypeDef=new CDBTypeDef;
+    House::typeDefs.clear();
 
     //個数を取得
@@ -516 +514 @@
         i2+=lstrlen(buffer+i2)+1;
 
-        pobj_DBTypeDef->add(temp5,buffer+i2);
-
-        i2+=lstrlen(buffer+i2)+1;
-    }
-
-    extern CDBTypeDef *pobj_DBTypeDef;
-    pobj_DBTypeDef=this->pobj_DBTypeDef;
+        House::typeDefs.push_back( TypeDef( temp5, buffer+i2 ) );
+
+        i2+=lstrlen(buffer+i2)+1;
+    }
 
     //定数を取得
@@ -954 +949 @@
     pobj_DBClass=this->pobj_DBClass;
 
-    // TypeDef情報
-    extern CDBTypeDef *pobj_DBTypeDef;
-    pobj_DBTypeDef=this->pobj_DBTypeDef;
-
     //定数を取得
     extern CONSTINFO **ppConstHash;

BasicCompiler_Common/DebugSection.h

@@ -34 +34 @@
     // クラス情報
     CDBClass *pobj_DBClass;
-
-    // TypeDef情報
-    CDBTypeDef *pobj_DBTypeDef;
 
     //定数を取得

BasicCompiler_Common/Intermediate_Step2.cpp

@@ -185 +185 @@
         temporary[i2]=buffer[i];
     }
-
-    //新しい型情報を追加
-    pobj_DBTypeDef->add(temporary,"Long");
 
     if(buffer[i]=='\0'){
@@ -379 +376 @@
             case ESC_TYPEDEF:
                 KillStringSpaces(Command+2);
-                AddTypeDefData(Command+2);
                 break;
             case ESC_DECLARE:

BasicCompiler_Common/MakeExe.cpp

@@ -147 +147 @@
     ppConstHash=(CONSTINFO **)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,MAX_HASH*sizeof(CONSTINFO *));
     */
-
-    //TypeDef情報を初期化
-    pobj_DBTypeDef=new CDBTypeDef();
 
     //コンパイルダイアログのプログレスバーを上げる
@@ -212 +209 @@
     HeapDefaultFree(pLineInfo);
 
-    //TypeDef情報を初期化
-    delete pobj_DBTypeDef;
-    pobj_DBTypeDef=0;
-
     //サブルーチン（ユーザー定義）情報のメモリ解放
     extern UserProc **ppSubHash;

BasicCompiler_Common/ParamImpl.cpp

@@ -6 +6 @@
 #include "../BasicCompiler32/opcode.h"
 #endif
+
+#define OVERLOAD_MIN_LEVEL 0
+#define OVERLOAD_MAX_LEVEL 4
+#define OVERLOAD_LEVEL0 0       // 型調整なし。厳密に等しい
+#define OVERLOAD_LEVEL1 1       // 型調整なし。整数型/実数型レベルでの同一性チェック
+#define OVERLOAD_LEVEL2 2       // 型調整あり。厳密に等しい
+#define OVERLOAD_LEVEL3 3       // 型調整あり。整数型/実数型レベルでの同一性チェック
+#define OVERLOAD_LEVEL4 4       // 型調整あり。数値型/クラス型レベルでの同一性チェック
 
 ParamImpl::ParamImpl(const char *buffer):
@@ -119 +127 @@
 
             NumOpe_GetType(Parms[i],
-                (level==OVERLOAD_LEVEL0)? nullParam : param,
+                (level==OVERLOAD_LEVEL0 || level == OVERLOAD_LEVEL1)? nullParam : param,
                 argType);
         }
@@ -127 +135 @@
 
         if(argType.GetBasicType()!=param.GetBasicType()){
-            if(level==OVERLOAD_LEVEL1 || level == OVERLOAD_LEVEL0){
+            if( level == OVERLOAD_LEVEL0 || level==OVERLOAD_LEVEL2 ){
                 return false;
             }
-            else if(level==OVERLOAD_LEVEL2){
+            else if( level == OVERLOAD_LEVEL1 || level==OVERLOAD_LEVEL3){
                 if(!(
-                    IsWholeNumberType(argType.GetBasicType())&&IsWholeNumberType(param.GetBasicType())||
-                    IsRealNumberType(argType.GetBasicType())&&IsRealNumberType(param.GetBasicType())
+                    argType.IsWhole()&&param.IsWhole()||
+                    argType.IsReal()&&param.IsReal()
                     )){
                         return false;
                 }
             }
-            else if(level==OVERLOAD_LEVEL3){
-                if(argType.GetBasicType()==DEF_OBJECT||param.GetBasicType()==DEF_OBJECT) return false;
+            else if(level==OVERLOAD_LEVEL4){
+                if(argType.IsObject()||param.IsObject()) return false;
             }
         }

BasicCompiler_Common/Parameter.h

@@ +1 @@
+#pragma once
+
 #include "Type.h"
-
-#ifndef _ACTIVEBASIC_COMPILER_PARAMETER_H
-#define _ACTIVEBASIC_COMPILER_PARAMETER_H
 
 class Parameter;
@@ -106 +105 @@
     }
 };
-
-#endif //_ACTIVEBASIC_COMPILER_PARAMETER_H

BasicCompiler_Common/Procedure.cpp

@@ -120 +120 @@
             Type::StringToType( temporary, type );
 
+            /*
+            TODO: 消す(TypeDef関連の変更)
             if(temporary[0]=='*'&&
                 temporary[1]==1&&
@@ -145 +147 @@
             else{
                 //TypeDefをする前のベース型を取得
-                GetOriginalTypeName(temporary);
-            }
+                GetOriginalTypeName_Old(temporary);
+            }*/
 
             if( type.IsNull() ){
@@ -158 +160 @@
         }
 
+        /*
+        TODO: 消す(TypeDef関連の変更)
         if( type.IsProcPtr() ){
             //関数ポインタの場合
             type.SetIndex( AddProcPtrInfo(temporary+3,temporary[2], nowLine) );
-        }
+        }*/
 
         Parameter *pParam = new Parameter( name, type, isRef, initValue );
@@ -274 +278 @@
                 Type::StringToType( temporary, type );
 
+                /*
+                TODO: 消す(TypeDef関連の変更)
                 if(temporary[0]=='*'&&
                     temporary[1]==1&&
@@ -299 +305 @@
                 else{
                     //TypeDefをする前のベース型を取得
-                    GetOriginalTypeName(temporary);
-                }
+                    GetOriginalTypeName_Old(temporary);
+                }*/
 
                 if( type.IsNull() ){
@@ -312 +318 @@
             }
 
+            /*
+            TODO: 消す(TypeDef関連の変更)
             if( type.IsProcPtr() ){
                 //関数ポインタの場合
                 type.SetIndex( AddProcPtrInfo(temporary+3,temporary[2], nowLine) );
-            }
+            }*/
 
             Parameter *pParam = new Parameter( name, type, isRef );
@@ -527 +535 @@
             Type::StringToType( temporary, type );
 
+            /*
+            TODO: 消す(TypeDef関連の変更)
             if(temporary[0]=='*'&&
                 temporary[1]==1&&
@@ -552 +562 @@
             else{
                 //TypeDefをする前のベース型を取得
-                GetOriginalTypeName(temporary);
-            }
+                GetOriginalTypeName_Old(temporary);
+            }*/
 
             if( type.IsNull() ){
@@ -565 +575 @@
         }
 
+        /*
+        TODO: 消す(TypeDef関連の変更)
         if( type.IsProcPtr() ){
             //関数ポインタの場合
             type.SetIndex( AddProcPtrInfo(temporary+3,temporary[2], nowLine ) );
-        }
+        }*/
 
         Parameter *pParam = new Parameter( name, type, isRef );
@@ -731 +743 @@
             Type::StringToType( temporary, type );
 
+            /*
+            TODO: 消す(TypeDef関連の変更)
             if(temporary[0]=='*'&&
                 temporary[1]==1&&
@@ -756 +770 @@
             else{
                 //TypeDefをする前のベース型を取得
-                GetOriginalTypeName(temporary);
-            }
+                GetOriginalTypeName_Old(temporary);
+            }*/
 
             if( type.IsNull() ){
@@ -769 +783 @@
         }
 
+        /*
+        TODO: 消す(TypeDef関連の変更)
         if( type.IsProcPtr() ){
             //関数ポインタの場合
             type.SetIndex( AddProcPtrInfo(temporary+3,temporary[2], nowLine ) );
-        }
+        }*/
 
         Parameter *pParam = new Parameter( name, type, isRef );

BasicCompiler_Common/Procedure.h

@@ +1 @@
+#pragma once
 
 class Procedure{

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();
+}

BasicCompiler_Common/Type.cpp

@@ -65 +65 @@
                 //関数ポインタ（*Function）
                 type.basicType = DEF_PTR_PROC;
+                type.index = AddProcPtrInfo( typeName, cp );
                 return true;
         }
 
-        string nextTypeName = typeName.substr( 1 );
+        const string &nextTypeName = typeName.substr( 1 );
 
         if( !StringToType( nextTypeName, type ) ){
@@ -88 +89 @@
     // TypeDefされた型
     ////////////////////
-    int i=pobj_DBTypeDef->check( typeName.c_str() );
+    int i=House::typeDefs.GetIndex( typeName.c_str() );
     if(i!=-1){
-        return StringToType( pobj_DBTypeDef->ppobj_TypeDef[i]->lpszBaseName, type );
+        type = House::typeDefs[i].GetBaseType();
+        return true;
     }
 
@@ -461 +463 @@
         }
         else{
-            extern ProcPointer **ppProcPointer;
-            if( ppProcPointer[index]->ReturnType().IsNull() ){
+            if( House::procPointers[index]->ReturnType().IsNull() ){
                 return "*Sub";
             }

BasicCompiler_Common/TypeDef.cpp

@@ -1 @@
-#include "../BasicCompiler_Common/common.h"
+#include "common.h"
 
 
-CDBTypeDef *pobj_DBTypeDef;
-
-
-CTypeDef::CTypeDef(const char *name,char *base){
-    lpszName=(char *)malloc(lstrlen(name)+1);
-    lstrcpy(lpszName,name);
-    lpszBaseName=(char *)malloc(lstrlen(base)+1);
-    lstrcpy(lpszBaseName,base);
+TypeDef::TypeDef( const string &newName, const string &baseName ):
+    newName( newName ),
+    baseName( baseName )
+{
+    if( !Type::StringToType( baseName, baseType ) ){
+        SetError(3, baseName, cp );
+        return;
+    }
 }
-CTypeDef::~CTypeDef(){
-    free(lpszName);
-    free(lpszBaseName);
+TypeDef::~TypeDef(){
 }
 
 
-CDBTypeDef::CDBTypeDef(){
-    ppobj_TypeDef=(CTypeDef **)malloc(1);
-    iNum=0;
+TypeDefCollection::TypeDefCollection(){
 }
-CDBTypeDef::~CDBTypeDef(){
-    init();
-    free(ppobj_TypeDef);
+TypeDefCollection::~TypeDefCollection(){
 }
-void CDBTypeDef::init(){
-    int i;
-    for(i=0;i<iNum;i++){
-        delete ppobj_TypeDef[i];
-    }
-    iNum=0;
-}
-void CDBTypeDef::add(const char *name,char *base){
-    ppobj_TypeDef=(CTypeDef **)realloc(ppobj_TypeDef,(iNum+1)*sizeof(CTypeDef *));
-    ppobj_TypeDef[iNum]=new CTypeDef(name,base);
-    iNum++;
+void TypeDefCollection::Add( const string &newName, const string &baseName ){
+    TypeDef typeDef( newName, baseName );
+    this->push_back( typeDef );
 
 
+    /*
+    TODO: 消す1
     ////////////////////////
     // 循環参照をチェック
@@ -43 +31 @@
 
     int i;
-    char temporary[1024];
-    lstrcpy(temporary,base);
+    string tempName = newName;
 
     while(1){
-        i=check(temporary);
+        i=GetIndex( tempName );
         if(i==-1) break;
 
-        if(lstrcmp(base,ppobj_TypeDef[i]->lpszBaseName)==0){
+        if( (*this)[i].baseName == newName ){
             //循環エラー
             extern int cp;
@@ -56 +43 @@
 
             //不明な型として、Long型を指定しておく
-            ppobj_TypeDef[i]->lpszBaseName=(char *)realloc(ppobj_TypeDef[i]->lpszBaseName,5);
-            lstrcpy(ppobj_TypeDef[i]->lpszBaseName,"Long");
+            (*this)[i].baseName = "Long";
 
             break;
         }
 
-        lstrcpy(temporary,ppobj_TypeDef[i]->lpszBaseName);
-    }
+        tempName = (*this)[i].baseName;
+    }*/
 }
-int CDBTypeDef::check(const char *name){
-    int i;
-    for(i=0;i<iNum;i++){
-        if(lstrcmp(ppobj_TypeDef[i]->lpszName,name)==0){
+int TypeDefCollection::GetIndex( const string &typeName ) const{
+    int max = (*this).size();
+    for( int i=0; i<max; i++ ){
+        if( (*this)[i].newName == typeName ){
             return i;
         }
@@ -75 +61 @@
 }
 
-
-
-void AddTypeDefData(char *Command){
-    extern int cp;
+void TypeDefCollection::Add( const string &expression, int nowLine ){
     int i;
-    char temporary[VN_SIZE],*pTemp;
+    char temporary[VN_SIZE];
 
     for(i=0;;i++){
-        if(Command[i]=='='||Command[i]=='\0'){
+        if(expression[i]=='='||expression[i]=='\0'){
             temporary[i]=0;
             break;
         }
-        temporary[i]=Command[i];
+        temporary[i]=expression[i];
     }
 
-    if(Command[i]!='='){
-        SetError(10,"TypeDef",cp);
+    if(expression[i]!='='){
+        SetError(10,"TypeDef",nowLine);
         return;
     }
 
-    pTemp=Command+i+1;
+    const char *pTemp=expression.c_str()+i+1;
 
     //識別文字のエラーチェック（新しい型）
@@ -102 +85 @@
         if(temporary[i]=='\0') break;
         if(!IsVariableChar(temporary[i])){
-            SetError(10,"TypeDef",cp);
+            SetError(10,"TypeDef",nowLine);
             return;
         }
@@ -111 +94 @@
         //関数ポインタ
         if(pTemp[3]!='('){
-            SetError(10,"TypeDef",cp);
+            SetError(10,"TypeDef",nowLine);
             return;
         }
@@ -121 +104 @@
             if(pTemp[i]=='\0') break;
             if(!IsVariableChar(pTemp[i])){
-                SetError(10,"TypeDef",cp);
+                SetError(10,"TypeDef",nowLine);
                 return;
             }
@@ -129 +112 @@
     //識別子が重複している場合はエラーにする
     if(lstrcmp(temporary,pTemp)==0){
-        SetError(1,NULL,cp);
+        SetError(1,NULL,nowLine);
         return;
     }
@@ -138 +121 @@
     // TypeDef情報を追加
     //////////////////////////
-    pobj_DBTypeDef->add(temporary,pTemp);
+
+    //エラー用
+    extern int cp;
+    cp = nowLine;
+
+    House::typeDefs.Add(temporary,pTemp);
 }
+
+void TypeDefCollection::Init(){
+    // 初期化
+    clear();
+
+    int i=-1;
+    while(1){
+        i++;
+
+        extern char *basbuf;
+        if( basbuf[i]==1 ){
+            char temporary[VN_SIZE];
+            if(basbuf[i+1]==ESC_TYPEDEF){
+                int i2 = 0;
+                for(i+=2;;i2++,i++){
+                    if(basbuf[i]=='\n'){
+                        temporary[i2]=0;
+                        break;
+                    }
+                    temporary[i2]=basbuf[i];
+                    if(basbuf[i]=='\0') break;
+                }
+                Add(temporary,i);
+
+                continue;
+            }
+            else if( basbuf[i+1] == ESC_CONST && basbuf[i+2] == 1 && basbuf[i+3] == ESC_ENUM ){
+                int i2 = 0;
+                for(i+=4;;i2++,i++){
+                    if(!IsVariableChar(basbuf[i])){
+                        temporary[i2]=0;
+                        break;
+                    }
+                    temporary[i2]=basbuf[i];
+                    if(basbuf[i]=='\0') break;
+                }
+                House::typeDefs.Add(temporary,"Long");
+            }
+        }
+
+        //次の行
+        for(;;i++){
+            if(IsCommandDelimitation(basbuf[i])) break;
+        }
+        if(basbuf[i]=='\0') break;
+    }
+}

BasicCompiler_Common/TypeDef.h

@@ +1 @@
+#pragma once
 
-class CTypeDef{
+#include <vector>
+#include <string>
+
+#include "../Type.h"
+
+using namespace std;
+
+class TypeDefCollection;
+
+class TypeDef{
+    friend TypeDefCollection;
+
+    string newName;
+    string baseName;
+    Type baseType;
 public:
-    char *lpszName;
-    char *lpszBaseName;
-    CTypeDef(const char *name,char *base);
-    ~CTypeDef();
+    TypeDef( const string &newName, const string &baseName );
+    ~TypeDef();
+
+    const string &GetNewName(){
+        return newName;
+    }
+    const string &GetBaseName(){
+        return baseName;
+    }
+    const Type &GetBaseType(){
+        return baseType;
+    }
 };
 
-class CDBTypeDef{
+class TypeDefCollection : public vector<TypeDef>
+{
 public:
-    CTypeDef **ppobj_TypeDef;
-    int iNum;
-    CDBTypeDef();
-    ~CDBTypeDef();
+    TypeDefCollection();
+    ~TypeDefCollection();
 
-    void init();
+    void Add( const string &newName, const string &baseName );
+    int GetIndex( const string &typeName ) const;
 
-    void add(const char *name,char *base);
-    int check(const char *name);
+private:
+    void Add( const string &expression, int nowLine );
+public:
+    void Init();
 };
-extern CDBTypeDef *pobj_DBTypeDef;
-
-
-void AddTypeDefData(char *Command);

BasicCompiler_Common/VarList.cpp

@@ -29 +29 @@
         }
 
-        sprintf(lptv->item.pszText,"%s %s(&H%X)",VarName,STRING_OBJECT,(DWORD64)offset);
+        sprintf(lptv->item.pszText,"%s %s(&H%X)",VarName,STRING_OBJECT,(ULONG_PTR)offset);
         lptv->item.iImage=1;
         lptv->item.iSelectedImage=1;
@@ -40 +40 @@
         i2=ReadProcessMemory(hDebugProcess,(void *)offset,&pData,sizeof(void *),&accessBytes);
 
-        sprintf(lptv->item.pszText,"%s %s(&H%X)",VarName,STRING_POINTEROFOBJECT,(DWORD64)pData);
+        sprintf(lptv->item.pszText,"%s %s(&H%X)",VarName,STRING_POINTEROFOBJECT,(ULONG_PTR)pData);
         lptv->item.iImage=4;
         lptv->item.iSelectedImage=4;
@@ -62 +62 @@
                     }
                 }
-                if(i2==-1) sprintf(lptv->item.pszText,"%s %d(&H%X)",VarName,(DWORD64)pData,(DWORD64)pData);
-                else sprintf(lptv->item.pszText,"%s %d(&H%X) \"%s\"",VarName,(DWORD64)pData,(DWORD64)pData,temporary);
+                if(i2==-1) sprintf(lptv->item.pszText,"%s %d(&H%X)",VarName,(ULONG_PTR)pData,(ULONG_PTR)pData);
+                else sprintf(lptv->item.pszText,"%s %d(&H%X) \"%s\"",VarName,(ULONG_PTR)pData,(ULONG_PTR)pData,temporary);
             }
             else sprintf(lptv->item.pszText,"%s %s",VarName,STRING_CANNOTACCESS);
@@ -361 +361 @@
     if(!pUserProc) return;
 
-    foreach( Variable *pVar, UserProc::CompilingUserProc().localVars ){
+    foreach( Variable *pVar, pUserProc->localVars ){
 
         //スコープ外の場合は無視
@@ -413 +413 @@
     //Thisポインタを取得
     LONG_PTR pThis;
-    const Variable *pVar = UserProc::CompilingUserProc().localVars.Find( "_System_LocalThis" );
+    const Variable *pVar = pUserProc->localVars.Find( "_System_LocalThis" );
     if( !pVar ){
         return;
@@ -428 +428 @@
                 pUserProc->GetParentClassPtr()->ppobj_Member[i]->name,
                 STRING_ARRAY,
-                (DWORD64)offset);
+                (ULONG_PTR)offset);
             tv.item.iImage=0;
             tv.item.iSelectedImage=0;
@@ -559 +559 @@
     for(i3=0;i3<(int)pobj_dti->iProcLevel+1;i3++){
         for(i2=0;i2<MaxLineInfoNum-1;i2++){
-            if((DWORD64)(pLineInfo[i2].TopObp+ImageBase+MemPos_CodeSection)<=pobj_dti->lplpObp[i3]&&
-                pobj_dti->lplpObp[i3]<=(DWORD64)(pLineInfo[i2+1].TopObp+ImageBase+MemPos_CodeSection)) break;
+            if((ULONG_PTR)(pLineInfo[i2].TopObp+ImageBase+MemPos_CodeSection)<=pobj_dti->lplpObp[i3]&&
+                pobj_dti->lplpObp[i3]<=(ULONG_PTR)(pLineInfo[i2+1].TopObp+ImageBase+MemPos_CodeSection)) break;
         }
         if(i2==MaxLineInfoNum) pobj_dti->lpdwCp[i3]=-1;

BasicCompiler_Common/VariableOpe.cpp

@@ -228 +228 @@
     ////////////////////
     int i;
-    i=pobj_DBTypeDef->check(TypeName);
+    i=House::typeDefs.GetIndex(TypeName);
     if(i!=-1){
-        return GetTypeFixed(pobj_DBTypeDef->ppobj_TypeDef[i]->lpszBaseName,lpNum);
+        *lpNum = House::typeDefs[i].GetBaseType().GetIndex();
+        return House::typeDefs[i].GetBaseType().GetBasicType();
     }
 
@@ -251 +252 @@
     return -1;
 }
-void GetOriginalTypeName(char *buffer){
+/*
+TODO: 消す(TypeDef関連の変更)
+void GetOriginalTypeName_Old(char *buffer){
     // TypeDefされた型に対して、オリジナルの型の名前に変更する
 
@@ -257 +260 @@
         if(buffer[1]==1&&(buffer[2]==ESC_FUNCTION||buffer[2]==ESC_SUB)) return;
 
-        GetOriginalTypeName(buffer+1);
+        GetOriginalTypeName_Old(buffer+1);
         return;
     }
 
     int i;
-    i=pobj_DBTypeDef->check(buffer);
+    i=House::typeDefs.GetIndex(buffer);
     if(i!=-1){
-        lstrcpy(buffer,pobj_DBTypeDef->ppobj_TypeDef[i]->lpszBaseName);
-        GetOriginalTypeName(buffer);
-    }
-}
+        lstrcpy(buffer,House::typeDefs[i].GetBaseName().c_str());
+        GetOriginalTypeName_Old(buffer);
+    }
+}*/
 BOOL GetTypeName(int type,LONG_PTR lpIndex,char *name){
     if(PTR_LEVEL(type)){
@@ -309 +312 @@
         if(lpIndex==-1) lstrcpy(name,"VoidPtr");
         else{
-            extern ProcPointer **ppProcPointer;
-            if( ppProcPointer[lpIndex]->ReturnType().IsNull() )
+            if( House::procPointers[lpIndex]->ReturnType().IsNull() )
                 lstrcpy(name,"*Sub");
             else lstrcpy(name,"*Function");
@@ -988 +990 @@
             temporary[i2]=buffer[i];
         }
+        if(temporary[0]=='*'&&
+            temporary[1]==1&&
+            (temporary[2]==ESC_FUNCTION||temporary[2]==ESC_SUB)){
+            if(buffer[i]!='('){
+                SetError(10,temporary,cp);
+                return false;
+            }
+            i3=GetStringInPare(temporary+3,buffer+i);
+            i+=i3;
+            i2+=i3;
+
+            if(temporary[2]==ESC_FUNCTION&&buffer[i]==1&&buffer[i+1]==ESC_AS){
+                temporary[i2++]=buffer[i++];
+                temporary[i2++]=buffer[i++];
+                for(;;i++,i2++){
+                    if(!IsVariableChar(buffer[i])){
+                        temporary[i2]=0;
+                        break;
+                    }
+                    temporary[i2]=buffer[i];
+                }
+            }
+        }
+
         if( !Type::StringToType( temporary, type ) ){
             SetError(3,temporary,cp);
             type.SetBasicType( DEF_LONG );
-        }
-
-        if( type.IsProcPtr() ){
-            if(temporary[0]=='*'&&
-                temporary[1]==1&&
-                (temporary[2]==ESC_FUNCTION||temporary[2]==ESC_SUB)){
-                if(buffer[i]!='('){
-                    SetError(10,temporary,cp);
-                    return false;
-                }
-                i3=GetStringInPare(temporary+3,buffer+i);
-                i+=i3;
-                i2+=i3;
-
-                if(temporary[2]==ESC_FUNCTION&&buffer[i]==1&&buffer[i+1]==ESC_AS){
-                    temporary[i2++]=buffer[i++];
-                    temporary[i2++]=buffer[i++];
-                    for(;;i++,i2++){
-                        if(!IsVariableChar(buffer[i])){
-                            temporary[i2]=0;
-                            break;
-                        }
-                        temporary[i2]=buffer[i];
-                    }
-                }
-            }
-            else{
-                //TypeDefをする前のベース型を取得
-                GetOriginalTypeName(temporary);
-            }
-
-            if(temporary[3]!='('){
-                SetError(10,temporary,cp);
-                return false;
-            }
-
-            //関数ポインタ
-            type.SetIndex( AddProcPtrInfo(temporary+3,temporary[2], cp) );
         }
 

BasicCompiler_Common/VariableOpe.h

@@ -14 +14 @@
 int GetPtrType(int type);
 int GetTypeFixed(const char *TypeName,LONG_PTR *lpNum);
+/*
+TODO: 消す(TypeDef関連の変更)
+void GetOriginalTypeName_Old(char *buffer);
 void GetOriginalTypeName(char *buffer);
+*/
 BOOL GetTypeName(int type,LONG_PTR lpIndex,char *name);
 bool FormatUseProcReturnObject( const char *term, char *procName, char *parameter, CClass::RefType &refType, char *member );

BasicCompiler_Common/WatchList.cpp

@@ -338 +338 @@
     // ローカル変数
     /////////////////
-    const Variable *pVar = UserProc::CompilingUserProc().localVars.Find( VarName );
-    if( pVar ){
-        //ポインタ変数の場合
-        if( pVar->IsPointer() ){
-            if( !pVar->IsArray() ){
-                lstrcpy(lpPtrOffset,array);
-                array[0]=0;
-            }
+    if( UserProc::IsLocalAreaCompiling() ){
+        const Variable *pVar = UserProc::CompilingUserProc().localVars.Find( VarName );
+
+        if( pVar ){
+            //ポインタ変数の場合
+            if( pVar->IsPointer() ){
+                if( !pVar->IsArray() ){
+                    lstrcpy(lpPtrOffset,array);
+                    array[0]=0;
+                }
+            }
+            else{
+                if(lpPtrOffset[0]) return 0;
+            }
+
+            pRelativeVar->offset = pVar->offset;
+            if( pVar->IsRef() ){
+                pRelativeVar->dwKind=VAR_REFLOCAL;
+            }
+            else{
+                pRelativeVar->dwKind=VAR_LOCAL;
+            }
+            resultType = *pVar;
+            isArray = pVar->IsArray();
+            pSubScripts = pVar->GetSubScriptsPtr();
+        }
+    }
+
+    if(pobj_CompilingClass){
+        ///////////////////////
+        // クラスメンバの参照
+        ///////////////////////
+
+        if(memicmp(variable,"This.",5)==0){
+            //Thisオブジェクトのメンバを参照するとき
+            SlideString(variable+5,-5);
+            lstrcpy(VarName,variable);
         }
         else{
-            if(lpPtrOffset[0]) return 0;
-        }
-
-        pRelativeVar->offset = pVar->offset;
-        if( pVar->IsRef() ){
-            pRelativeVar->dwKind=VAR_REFLOCAL;
-        }
-        else{
-            pRelativeVar->dwKind=VAR_LOCAL;
-        }
-        resultType = *pVar;
-        isArray = pVar->IsArray();
-        pSubScripts = pVar->GetSubScriptsPtr();
-    }
-    else{
-        if(pobj_CompilingClass){
-            ///////////////////////
-            // クラスメンバの参照
-            ///////////////////////
-
-            if(memicmp(variable,"This.",5)==0){
-                //Thisオブジェクトのメンバを参照するとき
-                SlideString(variable+5,-5);
-                lstrcpy(VarName,variable);
-            }
-            else{
-                //クラス内メンバを参照するとき（通常）
-
-                for(i=0;i<pobj_CompilingClass->iMemberNum;i++){
-                    if(lstrcmp(VarName,pobj_CompilingClass->ppobj_Member[i]->name)==0) break;
-                }
-                if(i==pobj_CompilingClass->iMemberNum) goto NonClassMember;
-            }
-
-            /////////////////////////////
-            // thisポインタを取得
-
-            extern HWND hDebugWnd;
-            i2=(int)SendDlgItemMessage(hDebugWnd,IDC_PROCCOMBO,CB_GETCURSEL,0,0);
-            i2=pobj_dti->iProcLevel-i2;
-
-            lpData=Debugging_GetThisPtrOffset(pobj_dti->lplpObp[i2]);
-            if(!lpData){
-                //式エラー
-                return 0;
-            }
-            lpData+=pobj_dti->lplpSpBase[i2];
-            if(!ReadProcessMemory(hDebugProcess,(void *)lpData,&pRelativeVar->offset,sizeof(LONG_PTR),&accessBytes)){
-                //メモリにアクセスできないとき
-                return -1;
-            }
-
-            pRelativeVar->dwKind=VAR_DIRECTMEM;
-
-            i3=Debugging_GetMember(*pobj_CompilingClass,variable,pRelativeVar,resultType,1);
-            if(i3==0){
-                //式エラー
-                return 0;
-            }
-            if(i3==-1){
-                //アクセスエラー
-                return -1;
-            }
-
-            return 1;
-        }
+            //クラス内メンバを参照するとき（通常）
+
+            for(i=0;i<pobj_CompilingClass->iMemberNum;i++){
+                if(lstrcmp(VarName,pobj_CompilingClass->ppobj_Member[i]->name)==0) break;
+            }
+            if(i==pobj_CompilingClass->iMemberNum) goto NonClassMember;
+        }
+
+        /////////////////////////////
+        // thisポインタを取得
+
+        extern HWND hDebugWnd;
+        i2=(int)SendDlgItemMessage(hDebugWnd,IDC_PROCCOMBO,CB_GETCURSEL,0,0);
+        i2=pobj_dti->iProcLevel-i2;
+
+        lpData=Debugging_GetThisPtrOffset(pobj_dti->lplpObp[i2]);
+        if(!lpData){
+            //式エラー
+            return 0;
+        }
+        lpData+=pobj_dti->lplpSpBase[i2];
+        if(!ReadProcessMemory(hDebugProcess,(void *)lpData,&pRelativeVar->offset,sizeof(LONG_PTR),&accessBytes)){
+            //メモリにアクセスできないとき
+            return -1;
+        }
+
+        pRelativeVar->dwKind=VAR_DIRECTMEM;
+
+        i3=Debugging_GetMember(*pobj_CompilingClass,variable,pRelativeVar,resultType,1);
+        if(i3==0){
+            //式エラー
+            return 0;
+        }
+        if(i3==-1){
+            //アクセスエラー
+            return -1;
+        }
+
+        return 1;
+    }
 
 NonClassMember:
 
+    {
         ///////////////////
         // グローバル変数

BasicCompiler_Common/calculation.cpp

@@ -502 +502 @@
 
                         Type tempType;
-                        StaticCalculation(true, Parms,BaseType,&i64data,tempType);
+                        StaticCalculation(enableerror, Parms,BaseType,&i64data,tempType);
                         type[pnum] = tempType.GetBasicType();
                         before_index[pnum] = tempType.GetIndex();

BasicCompiler_Common/common.h

@@ -35 +35 @@
 #include "../BasicCompiler_Common/BasicFixed.h"
 #include "../BasicCompiler_Common/NonVolatile.h"
-#include "../BasicCompiler_Common/TypeDef.h"
 #include "../BasicCompiler_Common/psapi.h"
 #include "../BasicCompiler_Common/BreakPoint.h"
@@ -162 +161 @@
 // プロシージャ管理用のクラス
 #include "Procedure.h"
+
+// コンパイラが必要とするデータハウス
+#include <House.h>
 
 
@@ -441 +443 @@
 void DeleteSubInfo(UserProc **ppSubHash,char **ppMacroNames,int MacroNum);
 void DeleteDeclareInfo(void);
-int AddProcPtrInfo( char *buffer, DWORD dwProcType, int nowLine );
+int AddProcPtrInfo( const string &typeExpression, int nowLine );
 void DeleteProcPtrInfo(void);