Changeset 73 in dev

Timestamp:

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

Author:

dai_9181

Message:

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

Files:

• BasicCompiler32/BasicCompiler.vcproj (modified) (4 diffs)
• BasicCompiler32/CParameter.cpp (modified) (7 diffs)
• BasicCompiler32/Compile_CallProc.cpp (modified) (6 diffs)
• BasicCompiler32/Compile_Func.cpp (modified) (2 diffs)
• BasicCompiler32/Compile_Object.cpp (modified) (5 diffs)
• BasicCompiler32/Compile_ProcOp.cpp (modified) (10 diffs)
• BasicCompiler32/Compile_Set_Var.cpp (modified) (1 diff)
• BasicCompiler32/Compile_Statement.cpp (modified) (9 diffs)
• BasicCompiler32/Compile_Var.cpp (modified) (1 diff)
• BasicCompiler32/MakePeHdr.cpp (modified) (3 diffs)
• BasicCompiler32/NumOpe_Arithmetic.cpp (modified) (9 diffs)
• BasicCompiler32/Opcode.h (modified) (3 diffs)
• BasicCompiler32/OperatorProc.cpp (modified) (11 diffs)
• BasicCompiler32/VarList.cpp (modified) (3 diffs)
• BasicCompiler32/WatchList.cpp (modified) (1 diff)
• BasicCompiler32/op32_main.cpp (modified) (1 diff)
• BasicCompiler64/CParameter.cpp (modified) (2 diffs)
• BasicCompiler64/Compile_CallProc.cpp (modified) (7 diffs)
• BasicCompiler64/Compile_Func.cpp (modified) (2 diffs)
• BasicCompiler64/Compile_Object.cpp (modified) (4 diffs)
• BasicCompiler64/Compile_ProcOp.cpp (modified) (13 diffs)
• BasicCompiler64/Compile_Set_Var.cpp (modified) (1 diff)
• BasicCompiler64/Compile_Statement.cpp (modified) (10 diffs)
• BasicCompiler64/Compile_Var.cpp (modified) (1 diff)
• BasicCompiler64/MakePeHdr.cpp (modified) (3 diffs)
• BasicCompiler64/NumOpe_Arithmetic.cpp (modified) (1 diff)
• BasicCompiler64/Opcode.h (modified) (3 diffs)
• BasicCompiler64/OperatorProc.cpp (modified) (10 diffs)
• BasicCompiler64/WatchList.cpp (modified) (1 diff)
• BasicCompiler64/amd64_main.cpp (modified) (1 diff)
• BasicCompiler64/varlist.cpp (modified) (3 diffs)
• BasicCompiler_Common/BasicCompiler.h (modified) (1 diff)
• BasicCompiler_Common/Class.cpp (modified) (15 diffs)
• BasicCompiler_Common/Class.h (modified) (7 diffs)
• BasicCompiler_Common/Debug.cpp (modified) (3 diffs)
• BasicCompiler_Common/DebugMiddleFile.cpp (modified) (7 diffs)
• BasicCompiler_Common/DebugSection.h (modified) (1 diff)
• BasicCompiler_Common/LexicalScoping.cpp (modified) (1 diff)
• BasicCompiler_Common/MakeExe.cpp (modified) (2 diffs)
• BasicCompiler_Common/NumOpe_GetType.cpp (modified) (6 diffs)
• BasicCompiler_Common/Object.cpp (modified) (1 diff)
• BasicCompiler_Common/Overload.cpp (modified) (4 diffs)
• BasicCompiler_Common/PESchedule.cpp (modified) (3 diffs)
• BasicCompiler_Common/PESchedule.h (modified) (2 diffs)
• BasicCompiler_Common/ParamImpl.cpp (modified) (9 diffs)
• BasicCompiler_Common/Parameter.h (modified) (5 diffs)
• BasicCompiler_Common/Subroutine.cpp (modified) (36 diffs)
• BasicCompiler_Common/Type.cpp (modified) (1 diff)
• BasicCompiler_Common/Type.h (modified) (4 diffs)
• BasicCompiler_Common/Variable.cpp (modified) (3 diffs)
• BasicCompiler_Common/calculation.cpp (modified) (2 diffs)
• BasicCompiler_Common/common.h (modified) (8 diffs)
• BasicCompiler_Common/hash.cpp (modified) (4 diffs)
• ProjectEditor/DocumentAdvice.cpp (modified) (1 diff)

BasicCompiler32/BasicCompiler.vcproj

@@ -1114 +1114 @@
                         >
                     </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\Type.h"
-                        >
-                    </File>
                 </Filter>
                 <Filter
@@ -1278 +1274 @@
                     Name="Procedure"
                     >
-                    <File
-                        RelativePath="..\BasicCompiler_Common\Parameter.h"
-                        >
-                    </File>
                     <File
                         RelativePath="..\BasicCompiler_Common\ParamImpl.cpp"
@@ -1926 +1918 @@
                         />
                     </FileConfiguration>
+                </File>
+            </Filter>
+            <Filter
+                Name="CommonClasses"
+                >
+                <File
+                    RelativePath="..\BasicCompiler_Common\Procedure.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\Type.cpp"
+                    >
                 </File>
             </Filter>
@@ -1974 +1978 @@
                 <File
                     RelativePath="..\BasicCompiler_Common\TypeDef.h"
+                    >
+                </File>
+            </Filter>
+            <Filter
+                Name="CommonClasses"
+                >
+                <File
+                    RelativePath="..\BasicCompiler_Common\Parameter.h"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\Procedure.h"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\Type.h"
                     >
                 </File>

BasicCompiler32/CParameter.cpp

@@ -40 +40 @@
         BOOL bByVal;
         if(bEllipse){
-            DummyTypeInfo.type=NumOpe_GetType(Parms[i2],NULL,&DummyTypeInfo.u.lpIndex);
+            DummyTypeInfo.type=NumOpe_GetType_Old(Parms[i2],NULL,&DummyTypeInfo.u.lpIndex);
             bByVal=1;
         }
@@ -96 +96 @@
     return nCountOfTempObjects * PTR_SIZE;
 }
+int ParamImpl::NewTempParameters( const char *procName, const Parameters &params, int SecondParmNum ){
+    ///////////////////////////////////////////////////////
+    // 一時オブジェクトをあらかじめスタックに積んでおく
+    ///////////////////////////////////////////////////////
+
+    useTempObject = false;
+
+    //一時参照の数
+    nCountOfTempObjects = 0;
+
+    BOOL bEllipse;
+    if(params.size()){
+        if(params[params.size()-1]->GetBasicType()==DEF_ELLIPSE) bEllipse=1;
+        else bEllipse=0;
+    }
+    else bEllipse=0;
+
+    for(int i2=ParmsNum-1;i2>=0;i2--){
+        useTempParameters[i2] = false;
+
+        if(bEllipse&&i2<=(int)params.size()-2) bEllipse=0;
+
+        if(i2==0){
+            if( params[i2]->GetVarName() == "_System_LocalThis" ){
+                //オブジェクトメンバの第一パラメータのThisポインタ
+                continue;
+            }
+        }
+        if( i2==0||i2==1 ){
+            if( params[i2]->GetVarName() == procName ){
+                //オブジェクトメンバの第一または第二パラメータの戻り値用オブジェクト
+                continue;
+            }
+        }
+
+        TYPEINFO DummyTypeInfo;
+        BOOL bByVal;
+        if(bEllipse){
+            DummyTypeInfo.type=NumOpe_GetType_Old(Parms[i2],NULL,&DummyTypeInfo.u.lpIndex);
+            bByVal=1;
+        }
+        else{
+            DummyTypeInfo.type=params[i2]->GetBasicType();
+            DummyTypeInfo.u.lpIndex=params[i2]->GetIndex();
+            bByVal = ( params[i2]->IsRef() == false ) ? TRUE:FALSE;
+        }
+
+
+        if( !bByVal ){
+            //ポインタ参照
+            if(Parms[i2][0]==1&&Parms[i2][1]==ESC_BYVAL){
+                //ポインタ指定
+                continue;
+            }
+
+            LONG_PTR lpVarIndex;
+            if( GetVarType( Parms[i2], &lpVarIndex, FALSE ) == -1 ){
+                //変数ではないとき
+                int reg = REG_RAX;
+                int type = NumOpe( Parms[i2], DummyTypeInfo.type, DummyTypeInfo.u.lpIndex, &lpVarIndex );
+                //↑ここでスタックに積む
+
+                nCountOfTempObjects++;
+
+                if( type != DEF_STRUCT ){
+                    //一時参照を作成
+
+                    //push esp
+                    op_push( REG_ESP );
+
+                    nCountOfTempObjects++;
+                }
+
+                bool result = CheckDifferentType(
+                    DummyTypeInfo.type,
+                    DummyTypeInfo.u.lpIndex,
+                    type,
+                    lpVarIndex,
+                    procName,
+                    i2);
+
+                if( result ){
+                    useTempParameters[i2] = true;
+                    useTempObject = true;
+
+                    types[i2].type = type;
+                    types[i2].u.lpIndex = lpVarIndex;
+                }
+            }
+        }
+    }
+
+    return nCountOfTempObjects * PTR_SIZE;
+}
 
 void ParamImpl::DeleteTempParameters(){
@@ -111 +205 @@
 
                 //call free
-                extern SUBINFO *pSub_free;
+                extern SubInfo *pSub_free;
                 op_call(pSub_free);
             }
@@ -138 +232 @@
 
     //call calloc
-    extern SUBINFO *pSub_calloc;
+    extern SubInfo *pSub_calloc;
     op_call(pSub_calloc);
 
@@ -147 +241 @@
     TYPEINFO BaseType={DEF_STRUCT,(LONG_PTR)pobj_Class};
     TYPEINFO CalcType;
-    CalcType.type=NumOpe_GetType(Parameter,&BaseType,&CalcType.u.lpIndex);
+    CalcType.type=NumOpe_GetType_Old(Parameter,&BaseType,&CalcType.u.lpIndex);
 
     /*
@@ -267 +361 @@
         BOOL bByVal;
         if(bEllipse){
-            DummyTypeInfo.type=NumOpe_GetType(Parms[i2],NULL,&DummyTypeInfo.u.lpIndex);
+            DummyTypeInfo.type=NumOpe_GetType_Old(Parms[i2],NULL,&DummyTypeInfo.u.lpIndex);
             bByVal=1;
         }
@@ -436 +530 @@
     return ParmSize;
 }
+int ParamImpl::SetParameter( const char *procName, const Parameters &params, int SecondParmNum ){
+    ///////////////////////////////////////////////////////////
+    // パラメータをレジスタ及びスタックフレームにセット
+    ///////////////////////////////////////////////////////////
+    int i2,i3;
+
+    BOOL bEllipse;
+    if( params.size() ){
+        if(params[params.size()-1]->GetBasicType()==DEF_ELLIPSE) bEllipse=1;
+        else bEllipse=0;
+    }
+    else bEllipse=0;
+
+    BOOL bHas_System_LocalThis=0;
+    if(ParmsNum>=1){
+        if( params[0]->GetVarName() == "_System_LocalThis" ){
+            bHas_System_LocalThis=1;
+        }
+    }
+
+    //戻り値用の変数名を取得
+    const char *lpszVarNameToReturn = (procName[0]==1&&procName[1]==ESC_OPERATOR)?"_System_ReturnValue":procName;
+
+    //パラメータをレジスタとスタックに格納
+    int CalcType;
+    LONG_PTR lpCalcIndex;
+    BOOL bCalcUseHeap;
+    int ParmSize=0;
+    RELATIVE_VAR RelativeVar;
+    int nCountOfNowTempObjects = 0;
+    for(i2=ParmsNum-1;i2>=0;i2--){
+        if(bEllipse&&i2<=(int)params.size()-2) bEllipse=0;
+
+        if(i2==0){
+            if( params[i2]->GetVarName() == "_System_LocalThis" ){
+                //オブジェクトメンバの第一パラメータのThisポインタ
+                continue;
+            }
+        }
+        if(i2==0||i2==1){
+            if( params[i2]->GetVarName() == lpszVarNameToReturn ){
+                //オブジェクトメンバの第一または第二パラメータの戻り値用オブジェクト
+                continue;
+            }
+        }
+
+        TYPEINFO DummyTypeInfo;
+        BOOL bByVal;
+        if(bEllipse){
+            DummyTypeInfo.type=NumOpe_GetType_Old(Parms[i2],NULL,&DummyTypeInfo.u.lpIndex);
+            bByVal=1;
+        }
+        else{
+            DummyTypeInfo.type=params[i2]->GetBasicType();
+            DummyTypeInfo.u.lpIndex=params[i2]->GetIndex();
+            bByVal = (params[i2]->IsRef() == false ) ? TRUE:FALSE;
+        }
+
+        if(bByVal==1){
+            //値参照
+
+            if(Parms[i2][0]==1&&Parms[i2][1]==ESC_BYVAL){
+                char temp2[255];
+                sprintf(temp2,"%s関数の第%dパラメータ",procName,i2+1);
+                SetError(19,temp2,cp);
+                continue;
+            }
+
+            if(DummyTypeInfo.type==DEF_STRUCT){
+                SetStructParameter(DummyTypeInfo.u.pobj_Class,Parms[i2]);
+                goto next;
+            }
+
+
+            extern LONG_PTR ProcPtr_BaseIndex;
+            LONG_PTR back_ProcPtr_BaseIndex;
+            back_ProcPtr_BaseIndex=ProcPtr_BaseIndex;
+            if(DummyTypeInfo.type==DEF_PTR_PROC) ProcPtr_BaseIndex=DummyTypeInfo.u.lpIndex;
+            else ProcPtr_BaseIndex=-1;
+
+            CalcType=NumOpe(Parms[i2],DummyTypeInfo.type,DummyTypeInfo.u.lpIndex,&lpCalcIndex,&bCalcUseHeap);
+
+            ProcPtr_BaseIndex=back_ProcPtr_BaseIndex;
+
+            if(CalcType==-1) break;
+
+            if(CalcType==DEF_OBJECT){
+                if( DummyTypeInfo.type != DEF_OBJECT
+                    ||
+                    DummyTypeInfo.type == DEF_OBJECT &&
+                    !DummyTypeInfo.u.pobj_Class->IsEqualsOrSubClass( (CClass *)lpCalcIndex ) ){
+                        //キャスト演算子のオーバーロードに対応する
+                        CallCastOperatorProc(CalcType,lpCalcIndex,bCalcUseHeap,DummyTypeInfo.type,DummyTypeInfo.u.lpIndex);
+                }
+            }
+
+            if(!bEllipse){
+                //型チェック
+                if(bHas_System_LocalThis) i3=i2-1;
+                else i3=i2;
+                CheckDifferentType(
+                    DummyTypeInfo.type,
+                    DummyTypeInfo.u.lpIndex,
+                    CalcType,
+                    lpCalcIndex,
+                    procName,
+                    i3);
+            }
+
+            if(DummyTypeInfo.type==DEF_DOUBLE){
+                ChangeTypeToDouble(CalcType);
+                ParmSize+=sizeof(long)*2;
+            }
+            else if(DummyTypeInfo.type==DEF_SINGLE){
+                ChangeTypeToSingle(CalcType);
+                ParmSize+=sizeof(long);
+            }
+            else if(DummyTypeInfo.type==DEF_INT64||DummyTypeInfo.type==DEF_QWORD){
+                ChangeTypeToInt64(CalcType);
+                ParmSize+=sizeof(long)*2;
+            }
+            else if(DummyTypeInfo.type==DEF_LONG||DummyTypeInfo.type==DEF_DWORD||DummyTypeInfo.type==DEF_OBJECT||DummyTypeInfo.type==DEF_STRUCT||
+                (IsPtrType(DummyTypeInfo.type)/*&&DummyTypeInfo.type!=DEF_PTR_VOID&&DummyTypeInfo.type!=DEF_PTR_BYTE*/)){
+                ChangeTypeToLong(CalcType);
+                ParmSize+=sizeof(long);
+            }
+            else if(DummyTypeInfo.type==DEF_INTEGER||DummyTypeInfo.type==DEF_WORD || (isUnicode&&DummyTypeInfo.type==DEF_CHAR)){
+                ChangeTypeToInteger(CalcType);
+                ParmSize+=sizeof(long);
+            }
+            else if(DummyTypeInfo.type==DEF_SBYTE||DummyTypeInfo.type==DEF_BYTE||DummyTypeInfo.type==DEF_BOOLEAN || (isUnicode==false&&DummyTypeInfo.type==DEF_CHAR)){
+                ChangeTypeToByte(CalcType);
+                ParmSize+=sizeof(long);
+            }
+            else{
+                SetError(300,NULL,cp);
+            }
+        }
+        else{
+            //ポインタ参照
+            if(Parms[i2][0]==1&&Parms[i2][1]==ESC_BYVAL){
+                //ポインタ指定
+                i3=NumOpe(Parms[i2]+2,0,0,0);
+
+                ChangeTypeToLong(i3);
+            }
+            else{
+                if( useTempParameters[i2] ){
+                    //一時オブジェクトをコピー
+
+                    if( types[i2].type != DEF_STRUCT ){
+                        // 一時参照のための領域を考慮する
+                        nCountOfNowTempObjects++;
+                    }
+
+                    nCountOfNowTempObjects++;
+
+                    //mov eax, dword ptr[esp+offset]
+                    op_mov_RM(
+                        sizeof(long),
+                        REG_EAX,
+                        REG_ESP,
+                        ( ( ParmsNum - i2 - 1 ) + ( nCountOfTempObjects - nCountOfNowTempObjects ) ) * PTR_SIZE,
+                        MOD_BASE_DISP32 );
+
+                    //push eax
+                    op_push(REG_EAX);
+                }
+                else{
+                    //変数のアドレスを取得
+                    int VarType;
+                    LONG_PTR lpVarIndex;
+                    if(GetVarOffset(
+                        false,
+                        false,
+                        Parms[i2],
+                        &VarType,
+                        &RelativeVar,
+                        &lpVarIndex)){
+                            if(DummyTypeInfo.type!=DEF_ANY){
+                                //型チェックを行う
+                                if(DummyTypeInfo.type==VarType){
+                                    if(DummyTypeInfo.type==DEF_OBJECT){
+                                        if( !DummyTypeInfo.u.pobj_Class->IsEqualsOrSubClass( (CClass *)lpVarIndex ) ){
+                                            SetError(11,Parms[i2],cp);
+                                        }
+                                    }
+                                    else if(DummyTypeInfo.type==DEF_STRUCT){
+                                        if( !DummyTypeInfo.u.pobj_Class->IsEquals( (CClass *)lpVarIndex ) ){
+                                            SetError(11,Parms[i2],cp);
+                                        }
+                                    }
+                                }
+                                else if((VarType&FLAG_PTR)&&((int)(VarType^FLAG_PTR)==DummyTypeInfo.type)){
+                                    //仮引数がポインタ参照で、実引数が配列の先頭ポインタのとき
+                                }
+                                else{
+                                    SetError(11,Parms[i2],cp);
+                                }
+                            }
+
+                            //変数アドレスをレジスタにセット
+                            SetVarPtrToEax(&RelativeVar);
+
+                            //push eax
+                            op_push(REG_EAX);
+                    }
+                }
+            }
+
+            ParmSize+=PTR_SIZE;
+        }
+
+next:;
+    }
+
+    return ParmSize;
+}

BasicCompiler32/Compile_CallProc.cpp

@@ -8 +8 @@
 void Call_DebugSys_SaveContext(){
     //call _System_GetEip
-    extern SUBINFO *pSub_System_GetEip;
+    extern SubInfo *pSub_System_GetEip;
     op_call(pSub_System_GetEip);
 
@@ -18 +18 @@
 
     //call _DebugSys_SaveContext
-    extern SUBINFO *pSub_DebugSys_SaveContext;
+    extern SubInfo *pSub_DebugSys_SaveContext;
     op_call(pSub_DebugSys_SaveContext);
 }
@@ -94 +94 @@
 }
 
-void Opcode_CallProc(const char *Parameter,SUBINFO *psi,DWORD dwFlags,char *ObjectName,int RefType){
+void Opcode_CallProc(const char *Parameter,SubInfo *psi,DWORD dwFlags,char *ObjectName,int RefType){
     int i2;
 
@@ -230 +230 @@
 
     //エラーチェック
-    if( !pobj_parameter->ErrorCheck(psi->name,psi->pRealParmInfo,psi->RealParmNum,psi->SecondParmNum) ){
+    if( !pobj_parameter->ErrorCheck(psi->name,psi->realParams,psi->SecondParmNum) ){
         //パラメータにエラーがあるときは処理を終える
         return;
@@ -237 +237 @@
     if(psi->dwType==SUBTYPE_MACRO){
         //マクロ関数の場合は、パラメータ省略を考慮する
-        pobj_parameter->MacroParameterSupport(psi->pRealParmInfo);
+        pobj_parameter->MacroParameterSupport( psi->realParams );
     }
 
     //一時オブジェクトを生成
-    int tempSize = pobj_parameter->NewTempParameters( psi->name,psi->pRealParmInfo,psi->RealParmNum,psi->RealSecondParmNum );
+    int tempSize = pobj_parameter->NewTempParameters( psi->name,psi->realParams,psi->RealSecondParmNum );
 
     //レジスタ、スタックフレームにセット
     int ParmSize;
-    ParmSize=pobj_parameter->SetParameter(psi->name,psi->pRealParmInfo,psi->RealParmNum,psi->RealSecondParmNum);
+    ParmSize=pobj_parameter->SetParameter(psi->name,psi->realParams,psi->RealSecondParmNum);
 
     if(psi->ReturnType==DEF_STRUCT && psi->isReturnRef == false){
@@ -259 +259 @@
 
         //call calloc
-        extern SUBINFO *pSub_calloc;
+        extern SubInfo *pSub_calloc;
         op_call(pSub_calloc);
 

BasicCompiler32/Compile_Func.cpp

@@ -243 +243 @@
 void Opcode_Func_AddressOf(const char *name){
     extern int cp;
-    SUBINFO *psi;
+    SubInfo *psi;
 
     extern LONG_PTR ProcPtr_BaseIndex;
@@ -249 +249 @@
         //左辺の型にのっとり、オーバーロードを解決
 
-        std::vector<SUBINFO *> subs;
+        std::vector<SubInfo *> subs;
         GetOverloadSubHash( name, subs );
         if( subs.size() == 0 ){

BasicCompiler32/Compile_Object.cpp

@@ -31 +31 @@
     ////////////////////////
 
-    std::vector<SUBINFO *> subs;
+    std::vector<SubInfo *> subs;
     pobj_c->EnumMethod( pobj_c->name, subs );
 
-    SUBINFO *psi;
+    SubInfo *psi;
     if( subs.size() > 0 ){
         //オーバーロードを解決
@@ -133 +133 @@
 
         //call _System_GC_malloc_ForObject
-        extern SUBINFO *pSub_System_GC_malloc_ForObject;
+        extern SubInfo *pSub_System_GC_malloc_ForObject;
         op_call(pSub_System_GC_malloc_ForObject);
     }
@@ -140 +140 @@
 
         //call _System_GC_malloc_ForObjectPtr
-        extern SUBINFO *pSub_System_GC_malloc_ForObjectPtr;
+        extern SubInfo *pSub_System_GC_malloc_ForObjectPtr;
         op_call(pSub_System_GC_malloc_ForObjectPtr);
     }
@@ -208 +208 @@
     // コンストラクタの呼び出し
     ////////////////////////////
-
-    if( lstrcmp(classObj.name,"proc")==0){
-        int i=0;
-    }
 
     BOOL bSomeObjects;
@@ -380 +376 @@
     if( isSweeping ){
         //call _System_GC_free_for_SweepingDelete
-        extern SUBINFO *pSub_System_GC_free_for_SweepingDelete;
+        extern SubInfo *pSub_System_GC_free_for_SweepingDelete;
         op_call(pSub_System_GC_free_for_SweepingDelete);
     }
     else{
         //call free
-        extern SUBINFO *pSub_free;
+        extern SubInfo *pSub_free;
         op_call(pSub_free);
     }

BasicCompiler32/Compile_ProcOp.cpp

@@ -214 +214 @@
 }
 
-void CompileBufferInProcedure(SUBINFO *psi){
+void CompileBufferInProcedure(SubInfo *psi){
     extern char *basbuf;
     extern HANDLE hHeap;
-    extern SUBINFO **ppSubHash;
+    extern SubInfo **ppSubHash;
     extern BOOL bDebugCompile;
     int i3,i4,VarSize,LocalVarSchedule,EspOffsetSchedule,BufferSize,BaseOffset;
@@ -280 +280 @@
 
     //パラメータ用の変数データを考慮
-    for(i3=psi->RealParmNum-1;i3>=0;i3--){
+    for(i3=psi->realParams.size()-1;i3>=0;i3--){
+        Parameter &param = *psi->realParams[i3];
+
         //変数データを追加
         LocalVar=(VARIABLE *)HeapReAlloc(hHeap,0,LocalVar,(MaxLocalVarNum+1)*sizeof(VARIABLE));
 
-        lstrcpy(LocalVar[MaxLocalVarNum].name,psi->pRealParmInfo[i3].name);
+        lstrcpy( LocalVar[MaxLocalVarNum].name,param.GetVarName().c_str() );
 
         // TODO: パラメータのConst定義の指定が未完成
         LocalVar[MaxLocalVarNum].bConst=false;
 
-        LocalVar[MaxLocalVarNum].bArray=psi->pRealParmInfo[i3].bArray;
-        memcpy(LocalVar[MaxLocalVarNum].SubScripts,psi->pRealParmInfo[i3].SubScripts,MAX_ARRAYDIM*sizeof(int));
-
-        LocalVar[MaxLocalVarNum].type=psi->pRealParmInfo[i3].type;
+        LocalVar[MaxLocalVarNum].bArray=param.IsArray()?TRUE:FALSE;
+        memcpy(LocalVar[MaxLocalVarNum].SubScripts,param.GetSubScriptsPtr(),MAX_ARRAYDIM*sizeof(int));
+
+        LocalVar[MaxLocalVarNum].type=param.GetBasicType();
         if(LocalVar[MaxLocalVarNum].type==DEF_OBJECT
             ||LocalVar[MaxLocalVarNum].type==DEF_STRUCT){
@@ -299 +301 @@
         }
 
-        LocalVar[MaxLocalVarNum].u.index=psi->pRealParmInfo[i3].u.index;
-
-        if(psi->pRealParmInfo[i3].bByVal&&psi->pRealParmInfo[i3].type==DEF_STRUCT){
+        LocalVar[MaxLocalVarNum].u.index=param.GetIndex();
+
+        if( param.IsRef() == false && param.IsStruct() ){
             //構造体のByValパラメータ
             LocalVar[MaxLocalVarNum].fRef=REF_PARAMETER | OBJECT_PARAMETER;
@@ -307 +309 @@
         }
         else{
-            if(psi->pRealParmInfo[i3].bByVal&&psi->pRealParmInfo[i3].bArray==0){
+            if( param.IsRef() == false && param.IsArray() == false ){
                 LocalVar[MaxLocalVarNum].fRef=0;
                 VarSize=GetTypeSize(LocalVar[MaxLocalVarNum].type,LocalVar[MaxLocalVarNum].u.index);
@@ -344 +346 @@
 
     //コンパイル中の関数
-    extern SUBINFO *pCompilingSubInfo;
+    extern SubInfo *pCompilingSubInfo;
     pCompilingSubInfo=psi;
 
@@ -442 +444 @@
 
         //call _DebugSys_StartProc
-        extern SUBINFO *pSub_DebugSys_StartProc;
+        extern SubInfo *pSub_DebugSys_StartProc;
         op_call(pSub_DebugSys_StartProc);
     }
@@ -684 +686 @@
 
         //call _DebugSys_EndProc
-        extern SUBINFO *pSub_DebugSys_EndProc;
+        extern SubInfo *pSub_DebugSys_EndProc;
         op_call(pSub_DebugSys_EndProc);
     }
@@ -806 +808 @@
 
         //call _esp_error
-        extern SUBINFO *pSub_esp_error;
+        extern SubInfo *pSub_esp_error;
         op_call( pSub_esp_error );
 
@@ -840 +842 @@
 }
 void CompileLocal(){
-    extern SUBINFO **ppSubHash;
+    extern SubInfo **ppSubHash;
     int i2;
-    SUBINFO *psi;
+    SubInfo *psi;
 
     extern BOOL bDll;
@@ -856 +858 @@
     //_System_InitStaticLocalVariablesは一番最後にコンパイル
     //※一般関数内の静的変数オブジェクトをすべて収集しなければならない
-    extern SUBINFO *pSub_System_InitStaticLocalVariables;
+    extern SubInfo *pSub_System_InitStaticLocalVariables;
     pSub_System_InitStaticLocalVariables->bCompile=1;
 
     //_System_Call_Destructor_of_GlobalObjectは一番最後にコンパイル
-    extern SUBINFO *pSub_System_Call_Destructor_of_GlobalObject;
+    extern SubInfo *pSub_System_Call_Destructor_of_GlobalObject;
     pSub_System_Call_Destructor_of_GlobalObject->bCompile=1;
 

BasicCompiler32/Compile_Set_Var.cpp

@@ -71 +71 @@
 
                     //call free
-                    extern SUBINFO *pSub_free;
+                    extern SubInfo *pSub_free;
                     op_call(pSub_free);
                 }

BasicCompiler32/Compile_Statement.cpp

@@ -5 +5 @@
     int i,i2;
     char buffer[8192];
-    SUBINFO *psi;
+    SubInfo *psi;
 
     for(i=0;;i++){
@@ -44 +44 @@
 
         //GetSubHash内でエラー提示が行われた場合
-        if(psi==(SUBINFO *)-1) return;
+        if(psi==(SubInfo *)-1) return;
 
         if(psi==0){
@@ -54 +54 @@
 
             //GetSubHash内でエラー提示が行われた場合
-            if(psi==(SUBINFO *)-1) return;
+            if(psi==(SubInfo *)-1) return;
         }
 
@@ -1076 +1076 @@
                     pobj_c=(CClass *)lpIndex;
 
-                    std::vector<SUBINFO *> subs;
+                    std::vector<SubInfo *> subs;
                     pobj_c->EnumMethod( CALC_EQUAL, subs );
                     if( subs.size() == 0 ){
@@ -1093 +1093 @@
 
                     //オーバーロードを解決
-                    SUBINFO *psi;
+                    SubInfo *psi;
                     psi=OverloadSolution("==",subs,ppi,iParmNum,NULL);
                     HeapDefaultFree(ppi);
@@ -1330 +1330 @@
         //戻り値をセット
         if(Parameter[0]){
-            extern SUBINFO *pCompilingSubInfo;
+            extern SubInfo *pCompilingSubInfo;
             char *temp;
             if(pCompilingSubInfo->name[0]==1&&pCompilingSubInfo->name[1]==ESC_OPERATOR)
@@ -1460 +1460 @@
     OpcodeCalc(temp2);
 
-    SUBINFO *psi;
+    SubInfo *psi;
     if(bFile) psi=GetSubHash("INPUT_FromFile");
     else psi=GetSubHash("INPUT_FromPrompt");
@@ -1562 +1562 @@
     OpcodeCalc(temp2);
 
-    SUBINFO *psi;
+    SubInfo *psi;
     if(bFile) psi=GetSubHash("PRINTUSING_ToFile");
     else psi=GetSubHash("PRINTUSING_ToPrompt");
@@ -1666 +1666 @@
     if(sw) lstrcat(buffer,"+Ex\"\\r\\n\"");
 
-    SUBINFO *psi;
+    SubInfo *psi;
     if(bFile) psi=GetSubHash("PRINT_ToFile");
     else psi=GetSubHash("PRINT_ToPrompt");

BasicCompiler32/Compile_Var.cpp

@@ -520 +520 @@
 
     char temporary[VN_SIZE];
-    extern SUBINFO *pCompilingSubInfo;
+    extern SubInfo *pCompilingSubInfo;
     if(pCompilingSubInfo){
         GetNowStaticVarFullName(VarName,temporary);

BasicCompiler32/MakePeHdr.cpp

@@ -8 +8 @@
 // 特殊関数の構造体ポインタ
 ////////////////////////////
-SUBINFO
+SubInfo
     *pSub_System_StartupProgram,
     *pSub_DebugSys_StartProc,
@@ -391 +391 @@
 
         //call _System_Call_Destructor_of_GlobalObject
-        extern SUBINFO *pSub_System_Call_Destructor_of_GlobalObject;
+        extern SubInfo *pSub_System_Call_Destructor_of_GlobalObject;
         op_call(pSub_System_Call_Destructor_of_GlobalObject);
 
@@ -522 +522 @@
         ExportNamesLength=lstrlen(lpExportNames)+1;
 
-        extern SUBINFO **ppSubHash;
-        SUBINFO *psi,*psi2;
+        extern SubInfo **ppSubHash;
+        SubInfo *psi,*psi2;
         while(1){
             //辞書順にサーチ

BasicCompiler32/NumOpe_Arithmetic.cpp

@@ -270 +270 @@
 
             //call _allmul
-            extern SUBINFO *pSub_allmul;
+            extern SubInfo *pSub_allmul;
             op_call(pSub_allmul);
 
@@ -460 +460 @@
 
             //call _aullrem
-            extern SUBINFO *pSub_aullrem;
+            extern SubInfo *pSub_aullrem;
             op_call(pSub_aullrem);
         }
@@ -467 +467 @@
 
             //call _allrem
-            extern SUBINFO *pSub_allrem;
+            extern SubInfo *pSub_allrem;
             op_call(pSub_allrem);
         }
@@ -720 +720 @@
 
             //call _aulldiv
-            extern SUBINFO *pSub_aulldiv;
+            extern SubInfo *pSub_aulldiv;
             op_call(pSub_aulldiv);
         }
@@ -727 +727 @@
 
             //call _alldiv
-            extern SUBINFO *pSub_alldiv;
+            extern SubInfo *pSub_alldiv;
             op_call(pSub_alldiv);
         }
@@ -1000 +1000 @@
 
     //call pow
-    extern SUBINFO *pSub_pow;
+    extern SubInfo *pSub_pow;
     op_call(pSub_pow);
 
@@ -1156 +1156 @@
 
         //call _allshl
-        extern SUBINFO *pSub_allshl;
+        extern SubInfo *pSub_allshl;
         op_call(pSub_allshl);
 
@@ -1361 +1361 @@
 
             //call _aullshr
-            extern SUBINFO *pSub_aullshr;
+            extern SubInfo *pSub_aullshr;
             op_call(pSub_aullshr);
         }
@@ -1368 +1368 @@
 
             //call _allshr
-            extern SUBINFO *pSub_allshr;
+            extern SubInfo *pSub_allshr;
             op_call(pSub_allshr);
         }

BasicCompiler32/Opcode.h

@@ -214 +214 @@
     ParamImpl(const char *buffer);
     ParamImpl(const PARAMETER_INFO *pParamInfo, const int ParmNum);
+    ParamImpl::ParamImpl(const Parameters &params);
     ~ParamImpl();
     void SetReturnType(TYPEINFO *pTypeInfo);
 
 private:
-    BOOL _overload_check(PARAMETER_INFO *ppi,int pi_num,TYPEINFO *pReturnTypeInfo,int overload_level);
-    SUBINFO *OverloadSolutionWithReturnType( const char *name, std::vector<SUBINFO *> &subs );
+    BOOL _overload_check( Parameters &params,TYPEINFO *pReturnTypeInfo,int overload_level);
+    SubInfo *OverloadSolutionWithReturnType( const char *name, std::vector<SubInfo *> &subs );
 public:
-    SUBINFO *OverloadSolution( const char *name, std::vector<SUBINFO *> &subs );
+    SubInfo *OverloadSolution( const char *name, std::vector<SubInfo *> &subs );
 
     BOOL ErrorCheck(const char *FuncName,PARAMETER_INFO *ppi,int pi_num,int SecondParmNum);
+    bool ErrorCheck( const char *procName, const Parameters &params, int SecondParmNum );
     void MacroParameterSupport(PARAMETER_INFO *ppi);
+    void MacroParameterSupport( const Parameters &params );
     void SetStructParameter(CClass *pobj_Class,LPSTR Parameter);
     int SetParameter(const char *FuncName,PARAMETER_INFO *ppi,int pi_num,int SecondParmNum);
+    int SetParameter( const char *procName, const Parameters &params, int SecondParmNum );
 
     //一時オブジェクトパラメータの生成と破棄
     int NewTempParameters( const char *FuncName,PARAMETER_INFO *ppi,int pi_num,int SecondParmNum );
+    int NewTempParameters( const char *procName, const Parameters &params, int SecondParmNum );
     void DeleteTempParameters();
 };
@@ -237 +242 @@
 #define PROCFLAG_NEW    1
 int Opcode_CallProcPtr(char *variable,char *Parameter,PROCPTRINFO *pi,LONG_PTR *plpIndex);
-void Opcode_CallProc(const char *Parameter,SUBINFO *psi,DWORD dwFlags,char *ObjectName,int RefType);
+void Opcode_CallProc(const char *Parameter,SubInfo *psi,DWORD dwFlags,char *ObjectName,int RefType);
 int Opcode_CallDllProc(char *Parameter,DECLAREINFO *pdi,LONG_PTR *plpIndex);
 
@@ -339 +344 @@
 void fpu_cast_end();
 
-void op_call(SUBINFO *psi);
+void op_call(SubInfo *psi);

BasicCompiler32/OperatorProc.cpp

@@ -18 +18 @@
 
     //call free
-    extern SUBINFO *pSub_free;
+    extern SubInfo *pSub_free;
     op_call(pSub_free);
 }
@@ -27 +27 @@
     pobj_c=(CClass *)index_stack[sp-2];
 
-    std::vector<SUBINFO *> subs;
+    std::vector<SubInfo *> subs;
     pobj_c->EnumMethod( idCalc, subs );
     if( subs.size() == 0 ){
@@ -42 +42 @@
     BOOL bReturnTypeIsObject=1;
     TYPEINFO ReturnType={DEF_OBJECT,subs[0]->u.ReturnIndex};
-    foreach( SUBINFO *psi, subs ){
+    foreach( SubInfo *psi, subs ){
         if(psi->ReturnType!=DEF_OBJECT)
             bReturnTypeIsObject=0;
@@ -79 +79 @@
     if(idCalc==CALC_EQUAL) lstrcpy(temporary,"==");
     else GetCalcName(idCalc,temporary);
-    SUBINFO *psi;
+    SubInfo *psi;
     psi=OverloadSolution(temporary,subs,ppi,iParmNum,pBaseTypeInfo);
 
@@ -88 +88 @@
     else{
         //オーバーロードされていないが、パラメータ個数が一致しないとき
-        if(iParmNum!=psi->ParmNum){
+        if(iParmNum!=psi->params.size()){
             HeapDefaultFree(ppi);
             return -1;
@@ -96 +96 @@
     for(i=0;i<iParmNum;i++){
         CheckDifferentType(
-            psi->pParmInfo[i].type,
-            psi->pParmInfo[i].u.index,
+            psi->params[i]->GetBasicType(),
+            psi->params[i]->GetIndex(),
             ppi[i].type,
             ppi[i].u.index,
@@ -109 +109 @@
 
     if(bTwoTerm){
-        if(psi->pRealParmInfo[1].type==DEF_STRUCT&&psi->pRealParmInfo[1].bByVal){
+        if( psi->realParams[1]->IsStruct() &&psi->realParams[1]->IsRef() == false ){
             //一時オブジェクトはメソッド内で破棄される
             bUseHeap[sp-1]=0;
@@ -128 +128 @@
 
         //call calloc
-        extern SUBINFO *pSub_calloc;
+        extern SubInfo *pSub_calloc;
         op_call(pSub_calloc);
 
@@ -180 +180 @@
         }
 
-        if( !psi->pRealParmInfo[1].bByVal ){
+        if( psi->realParams[1]->IsRef() ){
             //一時参照を作成
 
@@ -203 +203 @@
 
     if(bTwoTerm){
-        if( !psi->pRealParmInfo[1].bByVal ){
+        if( psi->realParams[1]->IsRef() ){
             //一時参照を破棄
             op_pop( REG_NON );
@@ -273 +273 @@
 }
 void CallIndexerGetterProc(CClass *pobj_Class,char *ObjectName,char *Parameter,TYPEINFO &RetTypeInfo){
-    std::vector<SUBINFO *> subs;
+    std::vector<SubInfo *> subs;
     pobj_Class->EnumMethod( CALC_ARRAY_GET, subs );
     if( subs.size() == 0 ){

BasicCompiler32/VarList.cpp

@@ -348 +348 @@
     if(pobj_dti->lplpSpBase[i2]==0) return;
 
-    extern SUBINFO **ppSubHash;
-    SUBINFO *psi;
+    extern SubInfo **ppSubHash;
+    SubInfo *psi;
     for(i3=0,sw=0;i3<MAX_HASH;i3++){
         psi=ppSubHash[i3];
@@ -583 +583 @@
 
     //プロシージャ コンボボックス
-    extern SUBINFO **ppSubHash;
-    SUBINFO *psi;
+    extern SubInfo **ppSubHash;
+    SubInfo *psi;
     int sw;
     SendMessage(hProcCombo,CB_RESETCONTENT,0,0);
@@ -706 +706 @@
 
     if(pobj_dti->lplpSpBase[i2]){
-        extern SUBINFO **ppSubHash;
-        SUBINFO *psi;
+        extern SubInfo **ppSubHash;
+        SubInfo *psi;
         for(i3=0,sw=0;i3<MAX_HASH;i3++){
             psi=ppSubHash[i3];

BasicCompiler32/WatchList.cpp

@@ -308 +308 @@
 ULONG_PTR Debugging_GetThisPtrOffset(LONG_PTR obp_Rip){
     int i;
-    SUBINFO *psi;
+    SubInfo *psi;
 
     //ripからプロシージャを取得

BasicCompiler32/op32_main.cpp

@@ -974 +974 @@
 /////////////////////////////
 
-void op_call(SUBINFO *psi){
+void op_call(SubInfo *psi){
     OpBuffer[obp++]=(char)0xE8;
     pobj_SubAddrSchedule->add(psi,1);

BasicCompiler64/CParameter.cpp

@@ -112 +112 @@
 
                 //call free
-                extern SUBINFO *pSub_free;
+                extern SubInfo *pSub_free;
                 op_call(pSub_free);
             }
@@ -135 +135 @@
 
         //call calloc
-        extern SUBINFO *pSub_calloc;
+        extern SubInfo *pSub_calloc;
         op_call(pSub_calloc);
 

BasicCompiler64/Compile_CallProc.cpp

@@ -8 +8 @@
 void Call_DebugSys_SaveContext(){
     //call _System_GetEip
-    extern SUBINFO *pSub_System_GetEip;
+    extern SubInfo *pSub_System_GetEip;
     op_call(pSub_System_GetEip);
 
@@ -18 +18 @@
 
     //call _DebugSys_SaveContext
-    extern SUBINFO *pSub_DebugSys_SaveContext;
+    extern SubInfo *pSub_DebugSys_SaveContext;
     op_call(pSub_DebugSys_SaveContext);
 }
@@ -96 +96 @@
 }
 
-void Opcode_CallProc(const char *Parameter,SUBINFO *psi,DWORD dwFlags,char *ObjectName,int RefType){
+void Opcode_CallProc(const char *Parameter,SubInfo *psi,DWORD dwFlags,char *ObjectName,int RefType){
     int i2;
 
@@ -234 +234 @@
 
     //エラーチェック
-    if( !pobj_parameter->ErrorCheck(psi->name,psi->pRealParmInfo,psi->RealParmNum,psi->SecondParmNum) ){
+    if( !pobj_parameter->ErrorCheck(psi->name,psi->realParams,psi->SecondParmNum) ){
         //パラメータにエラーがあるときは処理を終える
         return;
@@ -241 +241 @@
     if(psi->dwType==SUBTYPE_MACRO){
         //マクロ関数の場合は、パラメータ省略を考慮する
-        pobj_parameter->MacroParameterSupport(psi->pRealParmInfo);
+        pobj_parameter->MacroParameterSupport(psi->realParams);
     }
 
@@ -248 +248 @@
 
     //一時オブジェクトを生成
-    pobj_parameter->NewTempParameters( psi->name,psi->pRealParmInfo,psi->RealParmNum,psi->RealSecondParmNum );
+    pobj_parameter->NewTempParameters( psi->name,psi->realParams,psi->RealSecondParmNum );
 
     //レジスタ、スタックフレームにセット
-    pobj_parameter->SetParameter(psi->name,psi->pRealParmInfo,psi->RealParmNum,psi->RealSecondParmNum);
+    pobj_parameter->SetParameter(psi->name,psi->realParams,psi->RealSecondParmNum);
 
     if(psi->ReturnType==DEF_STRUCT && psi->isReturnRef == false){
@@ -271 +271 @@
 
             //call calloc
-            extern SUBINFO *pSub_calloc;
+            extern SubInfo *pSub_calloc;
             op_call(pSub_calloc);
 

BasicCompiler64/Compile_Func.cpp

@@ -95 +95 @@
 void Opcode_Func_AddressOf( const char *name ){
     extern int cp;
-    SUBINFO *psi;
+    SubInfo *psi;
 
     extern LONG_PTR ProcPtr_BaseIndex;
@@ -101 +101 @@
         //左辺の型にのっとり、オーバーロードを解決
 
-        std::vector<SUBINFO *> subs;
+        std::vector<SubInfo *> subs;
         GetOverloadSubHash( name, subs );
         if( subs.size() == 0 ){

BasicCompiler64/Compile_Object.cpp

@@ -32 +32 @@
     ////////////////////////
 
-    std::vector<SUBINFO *> subs;
+    std::vector<SubInfo *> subs;
     pobj_c->EnumMethod( pobj_c->name, subs );
 
-    SUBINFO *psi;
+    SubInfo *psi;
     if( subs.size() > 0 ){
         //オーバーロードを解決
@@ -121 +121 @@
 
         //call _System_GC_malloc_ForObject
-        extern SUBINFO *pSub_System_GC_malloc_ForObject;
+        extern SubInfo *pSub_System_GC_malloc_ForObject;
         op_call(pSub_System_GC_malloc_ForObject);
     }
@@ -128 +128 @@
 
         //call _System_GC_malloc_ForObjectPtr
-        extern SUBINFO *pSub_System_GC_malloc_ForObjectPtr;
+        extern SubInfo *pSub_System_GC_malloc_ForObjectPtr;
         op_call(pSub_System_GC_malloc_ForObjectPtr);
     }
@@ -328 +328 @@
     if( isSweeping ){
         //call _System_GC_free_for_SweepingDelete
-        extern SUBINFO *pSub_System_GC_free_for_SweepingDelete;
+        extern SubInfo *pSub_System_GC_free_for_SweepingDelete;
         op_call(pSub_System_GC_free_for_SweepingDelete);
     }
     else{
         //call free
-        extern SUBINFO *pSub_free;
+        extern SubInfo *pSub_free;
         op_call(pSub_free);
     }

BasicCompiler64/Compile_ProcOp.cpp

@@ -204 +204 @@
     }
 }
-void CompileBufferInProcedure(SUBINFO *psi){
+void CompileBufferInProcedure(SubInfo *psi){
     extern char *basbuf;
     extern HANDLE hHeap;
-    extern SUBINFO **ppSubHash;
+    extern SubInfo **ppSubHash;
     extern BOOL bDebugCompile;
     int i3,i4,VarSize,BufferSize;
@@ -328 +328 @@
         LocalVar=(VARIABLE *)HeapReAlloc(hHeap,0,LocalVar,(MaxLocalVarNum+1)*sizeof(VARIABLE));
 
-        lstrcpy(LocalVar[MaxLocalVarNum].name,psi->pRealParmInfo[i3].name);
+        lstrcpy(LocalVar[MaxLocalVarNum].name,psi->realParams[i3].GetVarName.c_str());
 
         // TODO: パラメータのConst定義の指定が未完成
         LocalVar[MaxLocalVarNum].bConst=false;
 
-        LocalVar[MaxLocalVarNum].bArray=psi->pRealParmInfo[i3].bArray;
-        memcpy(LocalVar[MaxLocalVarNum].SubScripts,psi->pRealParmInfo[i3].SubScripts,MAX_ARRAYDIM*sizeof(int));
-
-        LocalVar[MaxLocalVarNum].type=psi->pRealParmInfo[i3].type;
+        LocalVar[MaxLocalVarNum].bArray=psi->realParams[i3].IsArray()?TRUE:FALSE;
+        memcpy(LocalVar[MaxLocalVarNum].SubScripts,psi->realParams[i3].GetSubScriptsPtr(),MAX_ARRAYDIM*sizeof(int));
+
+        LocalVar[MaxLocalVarNum].type=psi->realParams[i3].GetBasicType();
         if(LocalVar[MaxLocalVarNum].type==DEF_OBJECT
             ||LocalVar[MaxLocalVarNum].type==DEF_STRUCT){
@@ -343 +343 @@
         }
 
-        LocalVar[MaxLocalVarNum].u.index=psi->pRealParmInfo[i3].u.index;
-
-        if(psi->pRealParmInfo[i3].bByVal&&psi->pRealParmInfo[i3].type==DEF_STRUCT){
+        LocalVar[MaxLocalVarNum].u.index=psi->realParams[i3].GetIndex();
+
+        if(psi->realParams[i3].IsRef() == false&&psi->realParams[i3].IsStruct()){
             //構造体のByValパラメータ
             LocalVar[MaxLocalVarNum].fRef=REF_PARAMETER | OBJECT_PARAMETER;
@@ -351 +351 @@
         }
         else{
-            if(psi->pRealParmInfo[i3].bByVal&&psi->pRealParmInfo[i3].bArray==0){
+            if(psi->realParams[i3].IsRef() == false&&psi->realParams[i3].IsArray()){
                 LocalVar[MaxLocalVarNum].fRef=0;
                 VarSize=GetTypeSize(LocalVar[MaxLocalVarNum].type,LocalVar[MaxLocalVarNum].u.index);
@@ -383 +383 @@
 
     //コンパイル中の関数
-    extern SUBINFO *pCompilingSubInfo;
+    extern SubInfo *pCompilingSubInfo;
     pCompilingSubInfo=psi;
 
@@ -396 +396 @@
     for(i3=psi->RealParmNum-1;i3>=0;i3--){
         if(i3==3){
-            if(IsRealNumberType(psi->pRealParmInfo[i3].type)&&psi->pRealParmInfo[i3].bByVal){
+            if(psi->realParams[i3].IsReal()&&psi->realParams[i3].IsRef() == false){
                 //movsd qword ptr[rsp+0x20],xmm3
                 op_movsd_MR(REG_XMM3,REG_RSP,0x20,MOD_BASE_DISP32);
@@ -406 +406 @@
         }
         if(i3==2){
-            if(IsRealNumberType(psi->pRealParmInfo[i3].type)&&psi->pRealParmInfo[i3].bByVal){
+            if(psi->realParams[i3].IsReal()&&psi->realParams[i3].IsRef() == false){
                 //movsd qword ptr[rsp+0x18],xmm2
                 op_movsd_MR(REG_XMM2,REG_RSP,0x18,MOD_BASE_DISP32);
@@ -416 +416 @@
         }
         if(i3==1){
-            if(IsRealNumberType(psi->pRealParmInfo[i3].type)&&psi->pRealParmInfo[i3].bByVal){
+            if(psi->realParams[i3].IsReal()&&psi->realParams[i3].IsRef() == false){
                 //movsd qword ptr[rsp+0x10],xmm1
                 op_movsd_MR(REG_XMM1,REG_RSP,0x10,MOD_BASE_DISP32);
@@ -426 +426 @@
         }
         if(i3==0){
-            if(IsRealNumberType(psi->pRealParmInfo[i3].type)&&psi->pRealParmInfo[i3].bByVal){
+            if(psi->realParams[i3].IsReal()&&psi->realParams[i3].IsRef() == false){
                 //movsd qword ptr[rsp+0x8],xmm0
                 op_movsd_MR(REG_XMM0,REG_RSP,0x8,MOD_BASE_DISP32);
@@ -497 +497 @@
 
         //call _DebugSys_StartProc
-        extern SUBINFO *pSub_DebugSys_StartProc;
+        extern SubInfo *pSub_DebugSys_StartProc;
         op_call(pSub_DebugSys_StartProc);
     }
@@ -720 +720 @@
     if(bDebugCompile&&bDebugSupportProc==0){
         //call _DebugSys_EndProc
-        extern SUBINFO *pSub_DebugSys_EndProc;
+        extern SubInfo *pSub_DebugSys_EndProc;
         op_call(pSub_DebugSys_EndProc);
     }
@@ -819 +819 @@
 }
 void CompileLocal(){
-    extern SUBINFO **ppSubHash;
+    extern SubInfo **ppSubHash;
     int i2;
-    SUBINFO *psi;
+    SubInfo *psi;
 
     extern BOOL bDll;
@@ -835 +835 @@
     //_System_InitStaticLocalVariablesは一番最後にコンパイル
     //※一般関数内の静的変数オブジェクトをすべて収集しなければならない
-    extern SUBINFO *pSub_System_InitStaticLocalVariables;
+    extern SubInfo *pSub_System_InitStaticLocalVariables;
     pSub_System_InitStaticLocalVariables->bCompile=1;
 
     //_System_Call_Destructor_of_GlobalObjectは一番最後にコンパイル
-    extern SUBINFO *pSub_System_Call_Destructor_of_GlobalObject;
+    extern SubInfo *pSub_System_Call_Destructor_of_GlobalObject;
     pSub_System_Call_Destructor_of_GlobalObject->bCompile=1;
 

BasicCompiler64/Compile_Set_Var.cpp

@@ -107 +107 @@
 
                     //call free
-                    extern SUBINFO *pSub_free;
+                    extern SubInfo *pSub_free;
                     op_call(pSub_free);
                 }

BasicCompiler64/Compile_Statement.cpp

@@ -5 +5 @@
     int i,i2;
     char buffer[8192];
-    SUBINFO *psi;
+    SubInfo *psi;
 
     for(i=0;;i++){
@@ -44 +44 @@
 
         //GetSubHash内でエラー提示が行われた場合
-        if(psi==(SUBINFO *)-1) return;
+        if(psi==(SubInfo *)-1) return;
 
         if(psi==0){
@@ -54 +54 @@
 
             //GetSubHash内でエラー提示が行われた場合
-            if(psi==(SUBINFO *)-1) return;
+            if(psi==(SubInfo *)-1) return;
         }
 
@@ -722 +722 @@
                     pobj_c=(CClass *)lpIndex;
 
-                    std::vector<SUBINFO *> subs;
+                    std::vector<SubInfo *> subs;
                     pobj_c->EnumMethod( CALC_EQUAL, subs );
                     if( subs.size() == 0 ){
@@ -739 +739 @@
 
                     //オーバーロードを解決
-                    SUBINFO *psi;
+                    SubInfo *psi;
                     psi=OverloadSolution("==",subs,ppi,iParmNum,NULL);
                     HeapDefaultFree(ppi);
@@ -883 +883 @@
 
     //call _System_GetEip
-    extern SUBINFO *pSub_System_GetEip;
+    extern SubInfo *pSub_System_GetEip;
     op_call(pSub_System_GetEip);
 
@@ -945 +945 @@
         //戻り値をセット
         if(Parameter[0]){
-            extern SUBINFO *pCompilingSubInfo;
+            extern SubInfo *pCompilingSubInfo;
             char *temp;
             if(pCompilingSubInfo->name[0]==1&&pCompilingSubInfo->name[1]==ESC_OPERATOR)
@@ -1075 +1075 @@
     OpcodeCalc(temp2);
 
-    SUBINFO *psi;
+    SubInfo *psi;
     if(bFile) psi=GetSubHash("INPUT_FromFile");
     else psi=GetSubHash("INPUT_FromPrompt");
@@ -1177 +1177 @@
     OpcodeCalc(temp2);
 
-    SUBINFO *psi;
+    SubInfo *psi;
     if(bFile) psi=GetSubHash("PRINTUSING_ToFile");
     else psi=GetSubHash("PRINTUSING_ToPrompt");
@@ -1281 +1281 @@
     if(sw) lstrcat(buffer,"+Ex\"\\r\\n\"");
 
-    SUBINFO *psi;
+    SubInfo *psi;
     if(bFile) psi=GetSubHash("PRINT_ToFile");
     else psi=GetSubHash("PRINT_ToPrompt");

BasicCompiler64/Compile_Var.cpp

@@ -562 +562 @@
 
     char temporary[VN_SIZE];
-    extern SUBINFO *pCompilingSubInfo;
+    extern SubInfo *pCompilingSubInfo;
     if(pCompilingSubInfo){
         GetNowStaticVarFullName(VarName,temporary);

BasicCompiler64/MakePeHdr.cpp

@@ -6 +6 @@
 // 特殊関数の構造体ポインタ
 ////////////////////////////
-SUBINFO
+SubInfo
     *pSub_System_StartupProgram,
     *pSub_DebugSys_StartProc,
@@ -352 +352 @@
 
         //call _System_Call_Destructor_of_GlobalObject
-        extern SUBINFO *pSub_System_Call_Destructor_of_GlobalObject;
+        extern SubInfo *pSub_System_Call_Destructor_of_GlobalObject;
         op_call(pSub_System_Call_Destructor_of_GlobalObject);
 
@@ -500 +500 @@
         ExportNamesLength=lstrlen(lpExportNames)+1;
 
-        extern SUBINFO **ppSubHash;
-        SUBINFO *psi,*psi2;
+        extern SubInfo **ppSubHash;
+        SubInfo *psi,*psi2;
         while(1){
             //辞書順にサーチ

BasicCompiler64/NumOpe_Arithmetic.cpp

@@ -559 +559 @@
 
         //call pow
-        extern SUBINFO *pSub_pow;
+        extern SubInfo *pSub_pow;
         op_call(pSub_pow);
 

BasicCompiler64/Opcode.h

@@ -350 +350 @@
 
 private:
-    BOOL _overload_check(PARAMETER_INFO *ppi,int pi_num,TYPEINFO *pReturnTypeInfo,int overload_level);
-    SUBINFO *OverloadSolutionWithReturnType( const char *name, std::vector<SUBINFO *> &subs );
+    BOOL _overload_check( Parameters &params, TYPEINFO *pReturnTypeInfo,int overload_level);
+    SubInfo *OverloadSolutionWithReturnType( const char *name, std::vector<SubInfo *> &subs );
 public:
-    SUBINFO *OverloadSolution( const char *name, std::vector<SUBINFO *> &subs );
+    SubInfo *OverloadSolution( const char *name, std::vector<SubInfo *> &subs );
 
     BOOL ErrorCheck(const char *FuncName,PARAMETER_INFO *ppi,int pi_num,int SecondParmNum);
@@ -385 +385 @@
 #define PROCFLAG_NEW    1
 int Opcode_CallProcPtr(char *variable,char *Parameter,PROCPTRINFO *pi,LONG_PTR *plpIndex);
-void Opcode_CallProc(const char *Parameter,SUBINFO *psi,DWORD dwFlags,char *ObjectName,int RefType);
+void Opcode_CallProc(const char *Parameter,SubInfo *psi,DWORD dwFlags,char *ObjectName,int RefType);
 int Opcode_CallDllProc(char *Parameter,DECLAREINFO *pdi,LONG_PTR *plpIndex);
 
@@ -512 +512 @@
 void op_fld_ptr_esp(int type);
 void op_zero_reg(int reg);
-void op_call( SUBINFO *psi );
+void op_call( SubInfo *psi );
 void op_call( DECLAREINFO *pdi );

BasicCompiler64/OperatorProc.cpp

@@ -23 +23 @@
 
     //call free
-    extern SUBINFO *pSub_free;
+    extern SubInfo *pSub_free;
     op_call(pSub_free);
 }
@@ -32 +32 @@
     pobj_c=(CClass *)index_stack[sp-2];
 
-    std::vector<SUBINFO *> subs;
+    std::vector<SubInfo *> subs;
     pobj_c->EnumMethod( idCalc, subs );
     if( subs.size() == 0 ){
@@ -84 +84 @@
     if(idCalc==CALC_EQUAL) lstrcpy(temporary,"==");
     else GetCalcName(idCalc,temporary);
-    SUBINFO *psi;
+    SubInfo *psi;
     psi=OverloadSolution(temporary,subs,ppi,iParmNum,pBaseTypeInfo);
 
@@ -94 +94 @@
     else{
         //オーバーロードされていないが、パラメータ個数が一致しないとき
-        if(iParmNum!=psi->ParmNum){
+        if(iParmNum!=psi->params.size()){
             HeapDefaultFree(ppi);
             return -1;
@@ -102 +102 @@
     for(i=0;i<iParmNum;i++){
         CheckDifferentType(
-            psi->pParmInfo[i].type,
-            psi->pParmInfo[i].u.index,
+            psi->params[i]->GetBasicType(),
+            psi->params[i]->GetIndex(),
             ppi[i].type,
             ppi[i].u.index,
@@ -113 +113 @@
 
     if(bTwoTerm){
-        if(psi->pRealParmInfo[1].type==DEF_STRUCT&&psi->pRealParmInfo[1].bByVal){
+        if( psi->realParams[1]->IsStruct() && psi->realParams[1]->IsRef() == false ){
             //一時オブジェクトはメソッド内で破棄される
             bUseHeap[sp-1]=0;
@@ -137 +137 @@
 
             //call calloc
-            extern SUBINFO *pSub_calloc;
+            extern SubInfo *pSub_calloc;
             op_call(pSub_calloc);
 
@@ -154 +154 @@
         SetOneTermToReg_Whole64Calc(type[sp-1],&reg2);
         pobj_reg->UnlockReg();
-        if( !psi->pRealParmInfo[1].bByVal ){
+        if( !psi->realParams[1]->IsRef() == false ){
             //一時参照を作成
             pobj_sf->push( reg2 );
@@ -253 +253 @@
 
     if(bTwoTerm){
-        if( !psi->pRealParmInfo[1].bByVal ){
+        if( !psi->realParams[1]->IsRef() == false ){
             //一時参照を破棄
             pobj_sf->pop();
@@ -341 +341 @@
 void CallIndexerGetterProc(int reg,CClass *pobj_Class,char *ObjectName,char *Parameter,TYPEINFO &RetTypeInfo){
 
-    std::vector<SUBINFO *> subs;
+    std::vector<SubInfo *> subs;
     pobj_Class->EnumMethod( CALC_ARRAY_GET, subs );
     if( subs.size() == 0 ){

BasicCompiler64/WatchList.cpp

@@ -309 +309 @@
 ULONG_PTR Debugging_GetThisPtrOffset(LONG_PTR obp_Rip){
     int i;
-    SUBINFO *psi;
+    SubInfo *psi;
 
     //ripからプロシージャを取得

BasicCompiler64/amd64_main.cpp

@@ -1791 +1791 @@
 /////////////////////////////
 
-void op_call( SUBINFO *psi ){
+void op_call( SubInfo *psi ){
     OpBuffer[obp++] = (char)0xE8;
     pobj_SubAddrSchedule->add( psi, 1 );

BasicCompiler64/varlist.cpp

@@ -354 +354 @@
     if(pobj_dti->lplpSpBase[i2]==0) return;
 
-    extern SUBINFO **ppSubHash;
-    SUBINFO *psi;
+    extern SubInfo **ppSubHash;
+    SubInfo *psi;
     for(i3=0,sw=0;i3<MAX_HASH;i3++){
         psi=ppSubHash[i3];
@@ -586 +586 @@
 
     //プロシージャ コンボボックス
-    extern SUBINFO **ppSubHash;
-    SUBINFO *psi;
+    extern SubInfo **ppSubHash;
+    SubInfo *psi;
     int sw;
     SendMessage(hProcCombo,CB_RESETCONTENT,0,0);
@@ -709 +709 @@
 
     if(pobj_dti->lplpSpBase[i2]){
-        extern SUBINFO **ppSubHash;
-        SUBINFO *psi;
+        extern SubInfo **ppSubHash;
+        SubInfo *psi;
         for(i3=0,sw=0;i3<MAX_HASH;i3++){
             psi=ppSubHash[i3];

BasicCompiler_Common/BasicCompiler.h

@@ -24 +24 @@
 DWORD ImageBase;
 INCLUDEFILEINFO IncludeFileInfo;
-SUBINFO **ppSubHash;
+SubInfo **ppSubHash;
 int SubNum;
 char **ppMacroNames;

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 ){

BasicCompiler_Common/Class.h

@@ -2 +2 @@
 
 class CClass;
-struct SUBINFO;
+class SubInfo;
 
 //データ型
@@ -48 +48 @@
 class CMethod{
 public:
-    SUBINFO *psi;
+    SubInfo *psi;
     DWORD dwAccess;
     BOOL bAbstract;
@@ -116 +116 @@
     void AddMember( DWORD dwAccess, bool idConst, bool isRef, char *buffer );
     void AddStaticMember( DWORD dwAccess, bool isConst, bool isRef, char *buffer, int NowLine );
-    void AddMethod( SUBINFO *psi,DWORD dwAccess, bool isConst, BOOL bAbstract, BOOL bVirtual );
-    void AddStaticMethod(SUBINFO *psi,DWORD dwAccess);
+    void AddMethod( SubInfo *psi,DWORD dwAccess, bool isConst, BOOL bAbstract, BOOL bVirtual );
+    void AddStaticMethod(SubInfo *psi,DWORD dwAccess);
 
     //重複チェック
@@ -124 +124 @@
 
     //メソッド取得
-    CMethod *GetMethodInfo( SUBINFO *psi );
-    CMethod *GetStaticMethodInfo( SUBINFO *psi );
+    CMethod *GetMethodInfo( SubInfo *psi );
+    CMethod *GetStaticMethodInfo( SubInfo *psi );
 
     //メソッドの存在を確認
@@ -132 +132 @@
 
     //メソッドを列挙
-    void EnumStaticMethod( const char *methodName, std::vector<SUBINFO *> &subs ) const;
-    void EnumMethod( const char *methodName, std::vector<SUBINFO *> &subs ) const;
-    void EnumMethod( const BYTE idOperatorCalc, std::vector<SUBINFO *> &subs ) const;
+    void EnumStaticMethod( const char *methodName, std::vector<SubInfo *> &subs ) const;
+    void EnumMethod( const char *methodName, std::vector<SubInfo *> &subs ) const;
+    void EnumMethod( const BYTE idOperatorCalc, std::vector<SubInfo *> &subs ) const;
 
     //デフォルト コンストラクタ メソッドを取得
@@ -157 +157 @@
     long vtbl_offset;
 public:
-    int GetFuncNumInVtbl( const SUBINFO *psi ) const;
+    int GetFuncNumInVtbl( const SubInfo *psi ) const;
     LONG_PTR GetVtblGlobalOffset(void);
     void ActionVtblSchedule(LONG_PTR ImageBase, LONG_PTR MemPos_CodeSection);
@@ -245 +245 @@
 public:
     //コンパイル開始の通知を受け取るメソッド
-    void StartCompile( SUBINFO *psi );
+    void StartCompile( SubInfo *psi );
 
     //現在コンパイル中のメソッド情報を取得

BasicCompiler_Common/Debug.cpp

@@ -224 +224 @@
     SendDlgItemMessage(hMainDlg,IDC_DEBUGLIST,EM_REPLACESEL,0,(LPARAM)buffer);
 }
-SUBINFO *GetSubFromObp(ULONG_PTR pos){
-    extern SUBINFO **ppSubHash;
-    SUBINFO *psi;
+SubInfo *GetSubFromObp(ULONG_PTR pos){
+    extern SubInfo **ppSubHash;
+    SubInfo *psi;
     int i2;
 
@@ -447 +447 @@
     pobj_dti=new CDebugThreadInfo();
 
-    SUBINFO *psi;
+    SubInfo *psi;
 
     extern DWORD dwStepRun;
@@ -681 +681 @@
                         if(!bRet) MessageBox(hMainDlg,"プロセスメモリーの読み込みに失敗","error",MB_OK);
 
-                        extern SUBINFO *pSub_DebugSys_EndProc;
+                        extern SubInfo *pSub_DebugSys_EndProc;
                         if((BYTE)temporary[0]==0xE8&&
                             *((long *)(temporary+1))+5==(long)rva_to_real(pSub_DebugSys_EndProc->CompileAddress)-(long)EIP_RIP(Context)){

BasicCompiler_Common/DebugMiddleFile.cpp

@@ -213 +213 @@
 
     //プロシージャ情報
-    extern SUBINFO **ppSubHash;
+    extern SubInfo **ppSubHash;
     extern int SubNum;
-    SUBINFO *psi;
+    SubInfo *psi;
     *(long *)(buffer+i2)=SubNum;
     i2+=sizeof(long);
@@ -585 +585 @@
 
     //プロシージャ情報
-    SUBINFO *psi;
+    SubInfo *psi;
     SubNum=*(long *)(buffer+i2);
     i2+=sizeof(long);
-    ppSubHash=(SUBINFO **)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,MAX_HASH*sizeof(SUBINFO *));
+    ppSubHash=(SubInfo **)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,MAX_HASH*sizeof(SubInfo *));
     for(i3=0;i3<SubNum;i3++){
-        psi=(SUBINFO *)HeapAlloc(hHeap,0,sizeof(SUBINFO));
+        psi = new SubInfo();
         psi->pNextData=0;
 
@@ -618 +618 @@
         i2+=sizeof(long);
 
-        psi->ParmNum=0;
-        psi->pParmInfo=0;
-        psi->RealParmNum=0;
-        psi->pRealParmInfo=0;
         psi->bCompile=1;
 
@@ -677 +673 @@
         i4=hash_default(psi->name);
 
-        SUBINFO *psi2;
+        SubInfo *psi2;
         if(ppSubHash[i4]){
             psi2=ppSubHash[i4];
@@ -804 +800 @@
 
 
-    extern SUBINFO **ppSubHash;
+    extern SubInfo **ppSubHash;
     ppSubHash=this->ppSubHash;
     pSub_DebugSys_EndProc=GetSubHash("_DebugSys_EndProc");
@@ -973 +969 @@
     extern char **ppMacroNames;
     ppMacroNames=0;
-    extern SUBINFO **ppSubHash;
+    extern SubInfo **ppSubHash;
     extern int SubNum;
     ppSubHash=this->ppSubHash;
     SubNum=this->SubNum;
 
-    extern SUBINFO *pSub_DebugSys_EndProc;
+    extern SubInfo *pSub_DebugSys_EndProc;
     pSub_DebugSys_EndProc=this->pSub_DebugSys_EndProc;
 
@@ -998 +994 @@
 
     //ローカル変数に関する情報を解放
-    SUBINFO *psi;
+    SubInfo *psi;
     for(i2=0;i2<MAX_HASH;i2++){
         psi=ppSubHash[i2];

BasicCompiler_Common/DebugSection.h

@@ -49 +49 @@
 
     //プロシージャ
-    SUBINFO **ppSubHash;
+    SubInfo **ppSubHash;
     int SubNum;
 
-    SUBINFO *pSub_DebugSys_EndProc;
+    SubInfo *pSub_DebugSys_EndProc;
 
     //ネイティブコードバッファ

BasicCompiler_Common/LexicalScoping.cpp

@@ -226 +226 @@
 
             //call free
-            extern SUBINFO *pSub_free;
+            extern SubInfo *pSub_free;
             op_call(pSub_free);
 

BasicCompiler_Common/MakeExe.cpp

@@ -223 +223 @@
 
     //ローカル変数に関する情報を解放
-    extern SUBINFO **ppSubHash;
-    SUBINFO *psi;
+    extern SubInfo **ppSubHash;
+    SubInfo *psi;
     for(i2=0;i2<MAX_HASH;i2++){
         psi=ppSubHash[i2];
@@ -238 +238 @@
 
     //サブルーチン（ユーザー定義）情報のメモリ解放
-    extern SUBINFO **ppSubHash;
+    extern SubInfo **ppSubHash;
     extern char **ppMacroNames;
     extern int MacroNum;

BasicCompiler_Common/NumOpe_GetType.cpp

@@ -193 +193 @@
     pobj_c=(CClass *)index_stack[sp-2];
 
-    std::vector<SUBINFO *> subs;
+    std::vector<SubInfo *> subs;
     pobj_c->EnumMethod( idCalc, subs );
     if( subs.size() == 0 ){
@@ -230 +230 @@
     if(idCalc==CALC_EQUAL) lstrcpy(temporary,"==");
     else GetCalcName(idCalc,temporary);
-    SUBINFO *psi;
+    SubInfo *psi;
     psi=OverloadSolution(temporary,subs,ppi,iParmNum,pBaseTypeInfo);
 
@@ -240 +240 @@
     else{
         //オーバーロードされていないが、パラメータ個数が一致しないとき
-        if(iParmNum!=psi->ParmNum){
+        if(iParmNum!=psi->params.size()){
             HeapDefaultFree(ppi);
             return 0;
@@ -299 +299 @@
 }
 
-int NumOpe_GetType(char *Command,TYPEINFO *pBaseType,LONG_PTR *plpIndex){
+int NumOpe_GetType_Old( const char *Command,TYPEINFO *pBaseType,LONG_PTR *plpIndex){
     extern int cp;
     int i,i2,i3,i4;
@@ -454 +454 @@
 
                             //マクロ関数の場合
-                            i2=NumOpe_GetType(temp3,NULL,&index_stack[sp]);
+                            i2=NumOpe_GetType_Old(temp3,NULL,&index_stack[sp]);
 
                             if(!IS_LITERAL(index_stack[sp])){
@@ -740 +740 @@
     return RetType;
 }
+
+bool NumOpe_GetType( const char *expression, const Type &baseType, Type &resultType ){
+    TYPEINFO baseTypeInfo = {
+        baseType.GetBasicType(),
+        baseType.GetIndex()
+    };
+    LONG_PTR lpIndex;
+    int basicType = NumOpe_GetType_Old( expression,
+        baseType.IsNull() ? NULL:&baseTypeInfo,
+        &lpIndex );
+
+    resultType.SetBasicType( basicType );
+    resultType.SetIndex( lpIndex );
+
+    return ( basicType != -1 );
+}

BasicCompiler_Common/Object.cpp

@@ -19 +19 @@
     pobj_c=(CClass *)TypeInfo.u.lpIndex;
 
-    SUBINFO *psi;
+    SubInfo *psi;
     psi=GetMethodHash(ObjectName,pobj_c->name,Parameter);
     if(!psi){

BasicCompiler_Common/Overload.cpp

@@ -7 +7 @@
 #endif
 
-SUBINFO *OverloadSolutionWithStrParam(
+SubInfo *OverloadSolutionWithStrParam(
     const char *name,
-    std::vector<SUBINFO *> &subs,
+    std::vector<SubInfo *> &subs,
     const char *Parameter,
     const char *ObjectName,
@@ -37 +37 @@
 */
         //パラメータオブジェクトを生成
+        if(lstrcmp(Parameter,"\"test\"")==0){
+            int i=0;
+        }
         pobj_parameter=new ParamImpl(Parameter);
         if(pReturnTypeInfo) pobj_parameter->SetReturnType(pReturnTypeInfo);
 
 
-        SUBINFO *psi;
+        SubInfo *psi;
         psi=pobj_parameter->OverloadSolution(name,subs);
 
@@ -52 +55 @@
 }
 
-SUBINFO *OverloadSolution(
+SubInfo *OverloadSolution(
     const char *name,
-    std::vector<SUBINFO *> &subs,
+    std::vector<SubInfo *> &subs,
     const PARAMETER_INFO *ppi,
     const int ParmNum,
@@ -68 +71 @@
         if(pReturnTypeInfo) pobj_Parameter->SetReturnType(pReturnTypeInfo);
 
-        SUBINFO *psi;
+        SubInfo *psi;
         psi=pobj_Parameter->OverloadSolution(name,subs);
 

BasicCompiler_Common/PESchedule.cpp

@@ -220 +220 @@
 
 CSubAddrSchedule::CSubAddrSchedule(){
-    ppsi=(SUBINFO **)HeapAlloc(hHeap,0,1);
+    ppsi=(SubInfo **)HeapAlloc(hHeap,0,1);
     pbCall=(BOOL *)HeapAlloc(hHeap,0,1);
 }
@@ -228 +228 @@
 }
 
-void CSubAddrSchedule::add(SUBINFO *psi,BOOL bCall){
+void CSubAddrSchedule::add(SubInfo *psi,BOOL bCall){
     if(!psi) return;
 
-    ppsi=(SUBINFO **)HeapReAlloc(hHeap,0,ppsi,(num+1)*sizeof(SUBINFO *));
+    ppsi=(SubInfo **)HeapReAlloc(hHeap,0,ppsi,(num+1)*sizeof(SubInfo *));
     ppsi[num]=psi;
     pbCall=(BOOL *)HeapReAlloc(hHeap,0,pbCall,(num+1)*sizeof(BOOL));
@@ -282 +282 @@
 CTempSchedule *pobj_TempSchedule;
 
+

BasicCompiler_Common/PESchedule.h

@@ -79 +79 @@
 class CSubAddrSchedule:public CSchedule{
 public:
-    SUBINFO **ppsi;
+    SubInfo **ppsi;
     BOOL *pbCall;
 
@@ -85 +85 @@
     ~CSubAddrSchedule();
 
-    void add(SUBINFO *psi,BOOL bCall);
+    void add(SubInfo *psi,BOOL bCall);
 };
 extern CSubAddrSchedule *pobj_SubAddrSchedule;

BasicCompiler_Common/ParamImpl.cpp

@@ -73 +73 @@
     ReturnTypeInfo.u.lpIndex=-1;
 }
+ParamImpl::ParamImpl(const Parameters &params){
+    int count = 0;
+    foreach( Parameter *pParam, params ){
+        types[count].type = pParam->GetBasicType();
+        types[count].u.lpIndex = pParam->GetIndex();
+        count++;
+    }
+    this->ParmsNum=params.size();
+
+    ReturnTypeInfo.type=DEF_NON;
+    ReturnTypeInfo.u.lpIndex=-1;
+}
 ParamImpl::~ParamImpl(){
     int i2;
@@ -88 +100 @@
 }
 
-BOOL ParamImpl::_overload_check(PARAMETER_INFO *ppi,int pi_num,TYPEINFO *pReturnTypeInfo,int overload_level){
+BOOL ParamImpl::_overload_check( Parameters &params,TYPEINFO *pReturnTypeInfo,int overload_level){
     //パラメータを識別してオーバーロードを解決
 
     //パラメータの個数が不一致の場合
-    if(pi_num!=ParmsNum) return 0;
-
-    int i,type;
-    LONG_PTR lpIndex;
-    for(i=0;i<pi_num;i++){
+    int max = (int)params.size();
+    if(max!=ParmsNum) return 0;
+
+    Type argType;
+    for(int i=0;i<max;i++){
+        Parameter &param = *params[i];
+
         if(Parms[i]){
-            TYPEINFO BaseType={ppi[i].type,ppi[i].u.index};
-            type=NumOpe_GetType(Parms[i],
-                (overload_level==OVERLOAD_LEVEL0) ? NULL : &BaseType,
-                &lpIndex);
+            Type nullParam( DEF_NON );
+
+            NumOpe_GetType(Parms[i],
+                (overload_level==OVERLOAD_LEVEL0)? nullParam : param,
+                argType);
         }
         else{
-            type=types[i].type;
-            lpIndex=types[i].u.lpIndex;
-        }
-
-        if(type!=ppi[i].type){
+            argType.SetType( types[i].type, types[i].u.lpIndex );
+        }
+
+        if(argType.GetBasicType()!=param.GetBasicType()){
             if(overload_level==OVERLOAD_LEVEL1 || overload_level == OVERLOAD_LEVEL0){
                 return 0;
@@ -114 +128 @@
             else if(overload_level==OVERLOAD_LEVEL2){
                 if(!(
-                    IsWholeNumberType(type)&&IsWholeNumberType(ppi[i].type)||
-                    IsRealNumberType(type)&&IsRealNumberType(ppi[i].type)
+                    IsWholeNumberType(argType.GetBasicType())&&IsWholeNumberType(param.GetBasicType())||
+                    IsRealNumberType(argType.GetBasicType())&&IsRealNumberType(param.GetBasicType())
                     )) return 0;
             }
             else if(overload_level==OVERLOAD_LEVEL3){
-                if(type==DEF_OBJECT||ppi[i].type==DEF_OBJECT) return 0;
+                if(argType.GetBasicType()==DEF_OBJECT||param.GetBasicType()==DEF_OBJECT) return 0;
             }
         }
         else{
-            if(NATURAL_TYPE(type)==DEF_OBJECT || NATURAL_TYPE(type)==DEF_STRUCT){
-                if(lpIndex!=ppi[i].u.index) return 0;
+            if(NATURAL_TYPE(argType.GetBasicType())==DEF_OBJECT || NATURAL_TYPE(argType.GetBasicType())==DEF_STRUCT){
+                if(argType.GetIndex()!=param.GetIndex()) return 0;
             }
         }
@@ -143 +157 @@
 }
 
-SUBINFO *ParamImpl::OverloadSolutionWithReturnType( const char *name, std::vector<SUBINFO *> &subs ){
+SubInfo *ParamImpl::OverloadSolutionWithReturnType( const char *name, std::vector<SubInfo *> &subs ){
     int sw=0;
-    SUBINFO *psi;
+    SubInfo *psi;
     psi=0;
 
     for( int level=OVERLOAD_MIN_LEVEL; level<=OVERLOAD_MAX_LEVEL; level++ ){
-        foreach( SUBINFO *temp_psi, subs ){
+        foreach( SubInfo *temp_psi, subs ){
 
             TYPEINFO ReturnTypeInfo;
@@ -156 +170 @@
 
             //エラーチェック
-            if(_overload_check(temp_psi->pParmInfo,temp_psi->ParmNum,&ReturnTypeInfo,level)){
+            if(_overload_check(temp_psi->params,&ReturnTypeInfo,level)){
                 if(sw){
                     SetError(52,name,cp);
@@ -178 +192 @@
     return psi;
 }
-SUBINFO *ParamImpl::OverloadSolution( const char *name, std::vector<SUBINFO *> &subs ){
+SubInfo *ParamImpl::OverloadSolution( const char *name, std::vector<SubInfo *> &subs ){
     int sw=0;
-    SUBINFO *psi;
+    SubInfo *psi;
     psi=0;
 
     for( int level=OVERLOAD_MIN_LEVEL; level<=OVERLOAD_MAX_LEVEL; level++ ){
 
-        foreach( SUBINFO *temp_psi, subs ){
+        foreach( SubInfo *temp_psi, subs ){
 
             //エラーチェック
-            if(_overload_check(temp_psi->pParmInfo,temp_psi->ParmNum,NULL,level)){
+            if(_overload_check(temp_psi->params,NULL,level)){
                 if(sw){
                     return OverloadSolutionWithReturnType(name,subs);
@@ -202 +216 @@
 
     if(!sw){
-        SUBINFO *temp_psi;
+        SubInfo *temp_psi;
         foreach( temp_psi, subs ){
 
             //エラーチェック
-            if(temp_psi->ParmNum==this->ParmsNum){
+            if(temp_psi->params.size()==this->ParmsNum){
                 if(sw){
                     sw=0;
@@ -258 +272 @@
     return 1;
 }
+bool ParamImpl::ErrorCheck( const char *procName, const Parameters &params, int SecondParmNum ){
+    if(ParmsNum>(int)params.size()){
+        if(params[params.size()-1]->GetBasicType()!=DEF_ELLIPSE){
+            //パラメータが多すぎるとき
+            SetError(10,procName,cp);
+            return false;
+        }
+    }
+    else if(ParmsNum<(int)params.size()){
+        if(ParmsNum<SecondParmNum){
+            if(params[ParmsNum]->GetBasicType()==DEF_ELLIPSE){
+                return true;
+            }
+
+            //パラメータが少なすぎるとき
+            SetError(10,procName,cp);
+            return false;
+        }
+
+        //省略パラメータに "0" を指定する
+        for(;ParmsNum < (int)params.size();ParmsNum++){
+            extern HANDLE hHeap;
+            char temporary[64];
+            if(params[ParmsNum]->IsRef() == false) lstrcpy(temporary,"0");
+            else sprintf(temporary,"%c%c0",1,ESC_BYVAL);
+            Parms[ParmsNum]=(char *)HeapAlloc(hHeap,0,lstrlen(temporary)+1);
+            lstrcpy(Parms[ParmsNum],temporary);
+        }
+    }
+
+    return true;
+}
 
 void ParamImpl::MacroParameterSupport(PARAMETER_INFO *ppi){
-    int i;
-    for(i=0;i<ParmsNum;i++){
+    for(int i=0;i<ParmsNum;i++){
         if(Parms[i][0]=='\0'){
             extern HANDLE hHeap;
@@ -273 +318 @@
     }
 }
+void ParamImpl::MacroParameterSupport( const Parameters &params ){
+    for(int i=0;i<ParmsNum;i++){
+        if(Parms[i][0]=='\0'){
+            extern HANDLE hHeap;
+            char temporary[64];
+            if( params[i]->IsRef() == false ) lstrcpy(temporary,"0");
+            else sprintf(temporary,"%c%c0",1,ESC_BYVAL);
+            HeapDefaultFree(Parms[i]);
+            Parms[i]=(char *)HeapAlloc(hHeap,0,lstrlen(temporary)+1);
+            lstrcpy(Parms[i],temporary);
+        }
+    }
+}

BasicCompiler_Common/Parameter.h

@@ -5 +5 @@
 
 class Parameter;
-typedef vector<Parameter> Parameters;
+typedef vector<Parameter *> Parameters;
 
 class Parameter : public Type
@@ -16 +16 @@
 public:
     Parameter( const string &varName, const Type &type, bool isRef = false ):
-        Type( type )
+        Type( type ),
+        varName( varName ),
+        isRef( isRef ),
+        isArray( false )
     {
-        this->varName = varName;
-        this->isRef = isRef;
-        isArray = false;
+        subScripts[0] = -1;
+    }
+    Parameter( const Parameter &param ):
+        Type( param ),
+        varName( param.varName ),
+        isRef( param.isRef ),
+        isArray( false )
+    {
+        subScripts[0] = -1;
+        if( param.isArray ){
+            SetArray( param.subScripts );
+        }
     }
     ~Parameter(){}
@@ -27 +39 @@
         isArray = true;
         memcpy( this->subScripts, pSubScripts, sizeof(int) * MAX_ARRAYDIM );
+    }
+
+    const string &GetVarName() const
+    {
+        return varName;
     }
 
@@ -46 +63 @@
         else{
 
-            if( this->isRef && this->BasicType() == DEF_ANY &&
+            if( this->isRef && this->GetBasicType() == DEF_ANY &&
                 param.isRef == false && param.IsPointer()
                 ||
                 this->isRef == false && this->IsPointer() &&
-                param.isRef && param.BasicType() == DEF_ANY ){
+                param.isRef && param.GetBasicType() == DEF_ANY ){
                     /* ByRef var As Any
                             と
@@ -71 +88 @@
         int max = (int)paramsA.size();
         for( int i=0; i<max; i++ ){
-            if( !paramsA[i].Equals( paramsB[i] ) ){
+            if( !paramsA[i]->Equals( *paramsB[i] ) ){
                 return false;
             }

BasicCompiler_Common/Subroutine.cpp

@@ -8 +8 @@
 
 //コンパイル中の関数情報
-SUBINFO *pCompilingSubInfo;
+SubInfo *pCompilingSubInfo;
 
 int GetCallProcName(char *buffer,char *name){
@@ -114 +114 @@
         /////////////////////
 
-        SUBINFO *psi;
-        psi=(SUBINFO *)pInfo;
+        SubInfo *pSub;
+        pSub=(SubInfo *)pInfo;
 
         //GetSubHash内でエラー提示が行われた場合
-        if(psi==(SUBINFO *)-1) return -1;
+        if(pSub==(SubInfo *)-1) return -1;
 
 
@@ -131 +131 @@
         ////////////////////////
 
-        std::vector<SUBINFO *> subs;
+        std::vector<SubInfo *> subs;
         GetOverloadSubHash(name,subs);
         if(subs.size()){
             //オーバーロードを解決
-            psi=OverloadSolutionWithStrParam(name,subs,Parameter,ObjectName,NULL);
-
-            if(!psi) return 0;
-        }
-
-
-        Opcode_CallProc(Parameter,psi,0,ObjectName,RefType);
+            pSub=OverloadSolutionWithStrParam(name,subs,Parameter,ObjectName,NULL);
+
+            if(!pSub) return 0;
+        }
+
+
+        Opcode_CallProc(Parameter,pSub,0,ObjectName,RefType);
         if( plpRetIndex ){
-            *plpRetIndex = psi->u.ReturnIndex;
-        }
-        return psi->ReturnType;
+            *plpRetIndex = pSub->u.ReturnIndex;
+        }
+        return pSub->ReturnType;
     }
     else if(idProc==PROC_DLL){
@@ -197 +197 @@
 
     //オーバーロード用の関数リストを作成
-    std::vector<SUBINFO *> subs;
+    std::vector<SubInfo *> subs;
     GetOverloadSubHash(VarName,subs);
     if(subs.size()==0){
@@ -213 +213 @@
 
     //オーバーロードを解決
-    SUBINFO *psi;
-    psi=OverloadSolutionWithStrParam(VarName,subs,Parameter,ObjectName,NULL);
-
-    if(psi){
+    SubInfo *pSub;
+    pSub=OverloadSolutionWithStrParam(VarName,subs,Parameter,ObjectName,NULL);
+
+    if(pSub){
         //呼び出し
-        Opcode_CallProc(Parameter,psi,0,ObjectName,RefType);
+        Opcode_CallProc(Parameter,pSub,0,ObjectName,RefType);
 
         if( pRetTypeInfo ){
-            pRetTypeInfo->type = psi->ReturnType;
-            pRetTypeInfo->u.lpIndex = psi->u.ReturnIndex;
+            pRetTypeInfo->type = pSub->ReturnType;
+            pRetTypeInfo->u.lpIndex = pSub->u.ReturnIndex;
         }
     }
@@ -240 +240 @@
         /////////////////////
 
-        SUBINFO *psi;
-        psi=(SUBINFO *)pInfo;
+        SubInfo *pSub;
+        pSub=(SubInfo *)pInfo;
 
         //GetSubHash内でエラー提示が行われた場合
-        if(psi==(SUBINFO *)-1) return -1;
+        if(pSub==(SubInfo *)-1) return -1;
 
 
@@ -257 +257 @@
         ////////////////////////
 
-        std::vector<SUBINFO *> subs;
+        std::vector<SubInfo *> subs;
         GetOverloadSubHash(name,subs);
         if( subs.size() > 0 ){
             //オーバーロードを解決
-            psi=OverloadSolutionWithStrParam(name,subs,Parameter,ObjectName,NULL);
-
-            if(!psi) return 0;
-        }
-
-
-        ret_type=psi->ReturnType;
-        *plpRetIndex=psi->u.ReturnIndex;
+            pSub=OverloadSolutionWithStrParam(name,subs,Parameter,ObjectName,NULL);
+
+            if(!pSub) return 0;
+        }
+
+
+        ret_type=pSub->ReturnType;
+        *plpRetIndex=pSub->u.ReturnIndex;
     }
     else if(idProc==PROC_DLL){
@@ -318 +318 @@
 
     //オーバーロード用の関数リストを作成
-    std::vector<SUBINFO *> subs;
+    std::vector<SubInfo *> subs;
     GetOverloadSubHash(VarName,subs);
     if(subs.size()==0){
@@ -334 +334 @@
 
     //オーバーロードを解決
-    SUBINFO *psi;
-    psi=OverloadSolutionWithStrParam(VarName,subs,Parameter,ObjectName,NULL);
-
-    if(psi){
+    SubInfo *pSub;
+    pSub=OverloadSolutionWithStrParam(VarName,subs,Parameter,ObjectName,NULL);
+
+    if(pSub){
         if(pRetTypeInfo){
-            pRetTypeInfo->type=psi->ReturnType;
-            pRetTypeInfo->u.lpIndex=psi->u.ReturnIndex;
+            pRetTypeInfo->type=pSub->ReturnType;
+            pRetTypeInfo->u.lpIndex=pSub->u.ReturnIndex;
         }
     }
@@ -349 +349 @@
 //インデクサ（getter）の戻り値を取得
 bool GetReturnTypeOfIndexerGetterProc(CClass *pobj_Class,TYPEINFO &RetTypeInfo){
-    std::vector<SUBINFO *> subs;
+    std::vector<SubInfo *> subs;
     pobj_Class->EnumMethod( CALC_ARRAY_GET, subs );
     if( subs.size() == 0 ){
@@ -644 +644 @@
     return 0;
 }
-SUBINFO *AddSubData(char *buffer,int NowLine,BOOL bVirtual,CClass *pobj_c,BOOL bStatic){
+SubInfo *AddSubData(char *buffer,int NowLine,BOOL bVirtual,CClass *pobj_c,BOOL bStatic){
     int i,i2,i3,sw;
     DWORD dwType;
@@ -761 +761 @@
     SubNum++;
 
-    SUBINFO *psi;
-    psi=(SUBINFO *)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,sizeof(SUBINFO));
+    SubInfo *pSub = new SubInfo();
 
     //クラス名
-    psi->pobj_ParentClass=pobj_c;
+    pSub->pobj_ParentClass=pobj_c;
 
     //ID
     static int id_base=0;
-    psi->id=(id_base++);
+    pSub->id=(id_base++);
 
     //関数名
-    psi->name=(char *)HeapAlloc(hHeap,0,lstrlen(temporary)+1);
-    lstrcpy(psi->name,temporary);
+    pSub->name=(char *)HeapAlloc(hHeap,0,lstrlen(temporary)+1);
+    lstrcpy(pSub->name,temporary);
 
     //ソースコードの位置
-    psi->address=NowLine;
-
-    psi->bExport=bExport;
-    psi->bCdecl=bCdecl;
-    psi->bVirtual=bVirtual;
-    if(bExport) psi->bUse=1;
-    else psi->bUse=0;
-    psi->bCompile=0;
-    psi->bSystem=0;
-
-    psi->dwType=dwType;
-
-
-    if(psi->dwType==SUBTYPE_FUNCTION){
+    pSub->address=NowLine;
+
+    pSub->bExport=bExport;
+    pSub->bCdecl=bCdecl;
+    pSub->bVirtual=bVirtual;
+    if(bExport) pSub->bUse=1;
+    else pSub->bUse=0;
+    pSub->bCompile=0;
+    pSub->bSystem=0;
+
+    pSub->dwType=dwType;
+
+
+    if(pSub->dwType==SUBTYPE_FUNCTION){
         ///////////////////
         // 戻り値を取得
         ///////////////////
 
-        psi->isReturnRef = false;
+        pSub->isReturnRef = false;
 
         if(pobj_c){
-            if(lstrcmp(psi->name,pobj_c->name)==0||
-                psi->name[0]=='~'){
+            if(lstrcmp(pSub->name,pobj_c->name)==0||
+                pSub->name[0]=='~'){
                 //クラスのコンストラクタ、デストラクタがFunction定義の場合はエラーをだす
                 SetError(115,NULL,NowLine);
@@ -814 +813 @@
                 if( buffer[i2-2] == 1 && buffer[i2-1] == ESC_BYREF ){
                     //参照型
-                    psi->isReturnRef = true;
+                    pSub->isReturnRef = true;
                 }
 
@@ -827 +826 @@
                     temporary[i3]=buffer[i2];
                 }
-                psi->ReturnType=GetTypeFixed(temporary,&psi->u.ReturnIndex);
-                if(psi->ReturnType==DEF_NON) SetError(3,temporary,NowLine);
+                pSub->ReturnType=GetTypeFixed(temporary,&pSub->u.ReturnIndex);
+                if(pSub->ReturnType==DEF_NON) SetError(3,temporary,NowLine);
 
                 sw_as=1;
@@ -836 +835 @@
 
         if(!sw_as){
-            SetError(-104,psi->name,NowLine);
-
-            psi->ReturnType=DEF_DOUBLE;
+            SetError(-104,pSub->name,NowLine);
+
+            pSub->ReturnType=DEF_DOUBLE;
         }
     }
     else{
         //戻り値なしのSub定義
-        psi->ReturnType=DEF_NON;
-        psi->u.ReturnIndex=-1;
-    }
-
-
-
-    psi->pParmInfo=(PARAMETER_INFO *)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,sizeof(PARAMETER_INFO)*2);
-    psi->ParmNum=0;
+        pSub->ReturnType=DEF_NON;
+        pSub->u.ReturnIndex=-1;
+    }
 
     //パラメータ
@@ -860 +854 @@
     if(buffer[i]!=')'&&pobj_c){
         //クラスのメンバ関数の場合のみ、デストラクタにパラメータがある場合にエラーをだす
-        if(psi->name[0]=='~'){
+        if(pSub->name[0]=='~'){
             SetError(114,NULL,NowLine);
             i=JumpStringInPare(buffer,i);
@@ -868 +862 @@
         if(buffer[i]==')') break;
 
-        psi->pParmInfo=(PARAMETER_INFO *)HeapReAlloc(hHeap,0,psi->pParmInfo,(psi->ParmNum+1)*sizeof(PARAMETER_INFO));
-
-        //ByVal
+        //ByRef
+        bool isRef;
         if(buffer[i]==1&&buffer[i+1]==ESC_BYVAL){
-            psi->pParmInfo[psi->ParmNum].bByVal=1;
+            isRef = false;
             i+=2;
         }
         else if(buffer[i]==1&&buffer[i+1]==ESC_BYREF){
-            psi->pParmInfo[psi->ParmNum].bByVal=0;
+            isRef = true;
             i+=2;
         }
-        else psi->pParmInfo[psi->ParmNum].bByVal=1;
+        else isRef = false;
 
         //パラメータ名
+        bool isArray = false;
+        int subScripts[MAX_ARRAYDIM];
+        char name[VN_SIZE];
         sw=0;
         for(i2=0;;i++,i2++){
@@ -887 +883 @@
                 if(!sw) sw=1;
 
-                i3=GetStringInPare(temporary+i2,buffer+i);
+                i3=GetStringInPare(name+i2,buffer+i);
                 i2+=i3-1;
                 i+=i3-1;
@@ -895 +891 @@
                 if(!sw) sw=1;
 
-                i3=GetStringInBracket(temporary+i2,buffer+i);
+                i3=GetStringInBracket(name+i2,buffer+i);
                 i2+=i3-1;
                 i+=i3-1;
@@ -901 +897 @@
             }
             if(!IsVariableChar(buffer[i])){
-                temporary[i2]=0;
+                name[i2]=0;
                 break;
             }
-            temporary[i2]=buffer[i];
+            name[i2]=buffer[i];
         }
         if(sw){
             //配列パラメータ
-            if(psi->pParmInfo[psi->ParmNum].bByVal) SetError(29,NULL,NowLine);
-            psi->pParmInfo[psi->ParmNum].bArray=1;
-
-            if((temporary[i2-2]=='('&&temporary[i2-1]==')')||
-                (temporary[i2-2]=='['&&temporary[i2-1]==']')){
-                psi->pParmInfo[psi->ParmNum].SubScripts[0]=LONG_MAX;
-                psi->pParmInfo[psi->ParmNum].SubScripts[1]=-1;
-
-                temporary[i2-2]=0;
+            if( isRef == false ) SetError(29,NULL,NowLine);
+            isArray = true;
+
+            if((name[i2-2]=='('&&name[i2-1]==')')||
+                (name[i2-2]=='['&&name[i2-1]==']')){
+                subScripts[0]=LONG_MAX;
+                subScripts[1]=-1;
+
+                name[i2-2]=0;
             }
             else{
-                GetArrange(temporary,temp2,psi->pParmInfo[psi->ParmNum].SubScripts);
-                lstrcpy(temporary,temp2);
-            }
-
-            i2=lstrlen(temporary);
-        }
-        else{
-            psi->pParmInfo[psi->ParmNum].bArray=0;
-            psi->pParmInfo[psi->ParmNum].SubScripts[0]=-1;
-        }
-        psi->pParmInfo[psi->ParmNum].name=(char *)HeapAlloc(hHeap,0,i2+1);
-        lstrcpy(psi->pParmInfo[psi->ParmNum].name,temporary);
+                GetArrange(name,temp2,subScripts);
+                lstrcpy(name,temp2);
+            }
+
+            i2=lstrlen(name);
+        }
 
         //型
+        Type type( DEF_NON );
         if(buffer[i]==1&&buffer[i+1]==ESC_AS){
             i+=2;
@@ -955 +946 @@
             }
 
-            psi->pParmInfo[psi->ParmNum].type=
-                GetTypeFixed(temporary,&psi->pParmInfo[psi->ParmNum].u.index);
+            Type::StringToType( temporary, type );
 
             if(temporary[0]=='*'&&
@@ -963 +953 @@
                 if(buffer[i]!='('){
                     SetError(10,temporary,NowLine);
-                    return 0;
+                    break;
                 }
                 i3=GetStringInPare(temporary+i2,buffer+i);
@@ -986 +976 @@
             }
 
-            if(psi->pParmInfo[psi->ParmNum].type==-1){
+            if( type.IsNull() ){
                 SetError(3,temporary,NowLine);
-                psi->pParmInfo[psi->ParmNum].type=DEF_PTR_VOID;
-            }
-
-            /*未完成（構造体パラメータを値参照として渡してよいものか！？）
-            if(psi->pParmInfo[psi->ParmNum].type==DEF_OBJECT){
-                if(psi->pParmInfo[psi->ParmNum].bByVal) SetError(28,temporary,NowLine);
-            }*/
+                type.SetBasicType( DEF_PTR_VOID );
+            }
         }
         else{
-            psi->pParmInfo[psi->ParmNum].type=GetTypeFromSimpleName(temporary);
+            type.SetBasicType( GetTypeFromSimpleName(temporary) );
             SetError(-103,temporary,NowLine);
         }
 
-        if(psi->pParmInfo[psi->ParmNum].type==DEF_PTR_PROC){
+        if( type.IsProcPtr() ){
             //関数ポインタの場合
-            psi->pParmInfo[psi->ParmNum].u.index=AddProcPtrInfo(temporary+3,temporary[2]);
-        }
-
-        //パラメータの数を更新
-        psi->ParmNum++;
+            type.SetIndex( AddProcPtrInfo(temporary+3,temporary[2]) );
+        }
+
+        Parameter *pParam = new Parameter( name, type, isRef );
+        if( isArray ){
+            pParam->SetArray( subScripts );
+        }
+
+        //パラメータを追加
+        pSub->params.push_back( pParam );
 
         if(buffer[i]==','){
@@ -1016 +1006 @@
         else{
             SetError(1,NULL,NowLine);
-            return 0;
-        }
-    }
-    psi->SecondParmNum=psi->ParmNum;
+            break;
+        }
+    }
+    pSub->SecondParmNum = (int)pSub->params.size();
     i++;
     if(buffer[i]=='('){
@@ -1026 +1016 @@
             if(buffer[i]==')') break;
 
-            psi->pParmInfo=(PARAMETER_INFO *)HeapReAlloc(hHeap,0,psi->pParmInfo,(psi->ParmNum+1)*sizeof(PARAMETER_INFO));
-
-            //ByVal
+            //ByRef
+            bool isRef;
             if(buffer[i]==1&&buffer[i+1]==ESC_BYVAL){
-                psi->pParmInfo[psi->ParmNum].bByVal=1;
+                isRef = false;
                 i+=2;
             }
             else if(buffer[i]==1&&buffer[i+1]==ESC_BYREF){
-                psi->pParmInfo[psi->ParmNum].bByVal=0;
+                isRef = true;
                 i+=2;
             }
-            else psi->pParmInfo[psi->ParmNum].bByVal=1;
+            else isRef = false;
 
             //パラメータ名
+            bool isArray = false;
+            int subScripts[MAX_ARRAYDIM];
+            char name[VN_SIZE];
             sw=0;
             for(i2=0;;i++,i2++){
@@ -1045 +1037 @@
                     if(!sw) sw=1;
 
-                    i3=GetStringInPare(temporary+i2,buffer+i);
+                    i3=GetStringInPare(name+i2,buffer+i);
                     i2+=i3-1;
                     i+=i3-1;
@@ -1053 +1045 @@
                     if(!sw) sw=1;
 
-                    i3=GetStringInBracket(temporary+i2,buffer+i);
+                    i3=GetStringInBracket(name+i2,buffer+i);
                     i2+=i3-1;
                     i+=i3-1;
@@ -1059 +1051 @@
                 }
                 if(!IsVariableChar(buffer[i])){
-                    temporary[i2]=0;
+                    name[i2]=0;
                     break;
                 }
-                temporary[i2]=buffer[i];
+                name[i2]=buffer[i];
             }
             if(sw){
                 //配列パラメータ
-                if(psi->pParmInfo[psi->ParmNum].bByVal) SetError(29,NULL,NowLine);
-                psi->pParmInfo[psi->ParmNum].bArray=1;
-
-                if((temporary[i2-2]=='('&&temporary[i2-1]==')')||
-                    (temporary[i2-2]=='['&&temporary[i2-1]==']')){
-                    psi->pParmInfo[psi->ParmNum].SubScripts[0]=LONG_MAX;
-                    psi->pParmInfo[psi->ParmNum].SubScripts[1]=-1;
-
-                    temporary[i2-2]=0;
+                if( isRef == false ) SetError(29,NULL,NowLine);
+                isArray = true;
+
+                if((name[i2-2]=='('&&name[i2-1]==')')||
+                    (name[i2-2]=='['&&name[i2-1]==']')){
+                    subScripts[0]=LONG_MAX;
+                    subScripts[1]=-1;
+
+                    name[i2-2]=0;
                 }
                 else{
-                    GetArrange(temporary,temp2,psi->pParmInfo[psi->ParmNum].SubScripts);
-                    lstrcpy(temporary,temp2);
-                }
-
-                i2=lstrlen(temporary);
-            }
-            else{
-                psi->pParmInfo[psi->ParmNum].bArray=0;
-                psi->pParmInfo[psi->ParmNum].SubScripts[0]=-1;
-            }
-            psi->pParmInfo[psi->ParmNum].name=(char *)HeapAlloc(hHeap,0,i2+1);
-            lstrcpy(psi->pParmInfo[psi->ParmNum].name,temporary);
+                    GetArrange(name,temp2,subScripts);
+                    lstrcpy(name,temp2);
+                }
+
+                i2=lstrlen(name);
+            }
 
             //型
+            Type type( DEF_NON );
             if(buffer[i]==1&&buffer[i+1]==ESC_AS){
                 i+=2;
+
                 i2=0;
                 while(buffer[i]=='*'){
@@ -1101 +1089 @@
                 for(;;i++,i2++){
                     if(!IsVariableChar(buffer[i])){
+                        if(buffer[i]==1&&(buffer[i+1]==ESC_FUNCTION||buffer[i+1]==ESC_SUB)){
+                            temporary[i2++]=buffer[i++];
+                            temporary[i2]=buffer[i];
+                            continue;
+                        }
                         temporary[i2]=0;
                         break;
@@ -1106 +1099 @@
                     temporary[i2]=buffer[i];
                 }
-                psi->pParmInfo[psi->ParmNum].type=
-                    GetTypeFixed(temporary,&psi->pParmInfo[psi->ParmNum].u.index);
-                if(psi->pParmInfo[psi->ParmNum].type==-1) SetError(3,temporary,NowLine);
+
+                Type::StringToType( temporary, type );
+
+                if(temporary[0]=='*'&&
+                    temporary[1]==1&&
+                    (temporary[2]==ESC_FUNCTION||temporary[2]==ESC_SUB)){
+                    if(buffer[i]!='('){
+                        SetError(10,temporary,NowLine);
+                        break;
+                    }
+                    i3=GetStringInPare(temporary+i2,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( type.IsNull() ){
+                    SetError(3,temporary,NowLine);
+                    type.SetBasicType( DEF_PTR_VOID );
+                }
             }
             else{
-                psi->pParmInfo[psi->ParmNum].type=GetTypeFromSimpleName(temporary);
+                type.SetBasicType( GetTypeFromSimpleName(temporary) );
                 SetError(-103,temporary,NowLine);
             }
 
-            psi->ParmNum++;
+            if( type.IsProcPtr() ){
+                //関数ポインタの場合
+                type.SetIndex( AddProcPtrInfo(temporary+3,temporary[2]) );
+            }
+
+            Parameter *pParam = new Parameter( name, type, isRef );
+            if( isArray ){
+                pParam->SetArray( subScripts );
+            }
+
+            //パラメータを追加
+            pSub->params.push_back( pParam );
 
             if(buffer[i]==','){
@@ -1124 +1160 @@
             else{
                 SetError(1,NULL,NowLine);
-                return 0;
+                break;
             }
         }
@@ -1130 +1166 @@
     }
 
-    //リアルパラメータ領域を取得（_System_LocalThisを考慮して2つだけ多く確保する）
-    psi->pRealParmInfo=(PARAMETER_INFO *)HeapAlloc(hHeap,0,(psi->ParmNum+2)*sizeof(PARAMETER_INFO));
-    psi->RealParmNum=0;
+    //リアルパラメータ領域を取得（_System_LocalThisを考慮して2つだけ多く確保する場合がある）
 
     if(pobj_c&&bStatic==0){
-        i = psi->RealParmNum;
-
         //オブジェクトメンバの場合は、第一パラメータを_System_LocalThis引き渡し用として利用
-        psi->pRealParmInfo[i].name = "_System_LocalThis";
-        psi->pRealParmInfo[i].type=DEF_PTR_VOID;
-        psi->pRealParmInfo[i].u.index=-1;
-        psi->pRealParmInfo[i].bByVal=1;
-        psi->pRealParmInfo[i].bArray=0;
-        psi->pRealParmInfo[i].SubScripts[0]=-1;
-
-        psi->RealParmNum++;
-    }
-
-    if(psi->ReturnType==DEF_STRUCT){
-        i = psi->RealParmNum;
-
+        string name = "_System_LocalThis";
+        Type type( DEF_PTR_VOID );
+        pSub->realParams.push_back( new Parameter( name, type ) );
+    }
+
+    if(pSub->ReturnType==DEF_STRUCT){
         //構造体を戻り値として持つ場合
         //※第一パラメータ（Thisポインタありの場合は第二パラメータ）を戻り値用の参照宣言にする
 
-        if(psi->name[0]==1&&psi->name[1]==ESC_OPERATOR)
-            psi->pRealParmInfo[i].name="_System_ReturnValue";
-        else psi->pRealParmInfo[i].name=psi->name;
-        psi->pRealParmInfo[i].type=DEF_STRUCT;
-        psi->pRealParmInfo[i].u.index=psi->u.ReturnIndex;
-        psi->pRealParmInfo[i].bByVal=0;
-        psi->pRealParmInfo[i].bArray=0;
-        psi->pRealParmInfo[i].SubScripts[0]=-1;
-        
-        psi->RealParmNum++;
+        string name = pSub->name;
+        if(pSub->name[0]==1&&pSub->name[1]==ESC_OPERATOR){
+            name="_System_ReturnValue";
+        }
+        Type type( DEF_STRUCT, pSub->u.ReturnIndex );
+        pSub->realParams.push_back( new Parameter( name, type, true ) );
     }
 
     //パラメータをコピー
-    for( i = 0; i < psi->ParmNum; i++, psi->RealParmNum++ ){
-        psi->pRealParmInfo[psi->RealParmNum]=psi->pParmInfo[i];
+    foreach( Parameter *pParam, pSub->params ){
+        pSub->realParams.push_back( new Parameter( *pParam ) );
     }
 
@@ -1177 +1198 @@
 
     int key;
-    key=hash_default(psi->name);
-
-    extern SUBINFO **ppSubHash;
+    key=hash_default(pSub->name);
+
+    extern SubInfo **ppSubHash;
     if(ppSubHash[key]){
-        SUBINFO *psi2;
+        SubInfo *psi2;
         psi2=ppSubHash[key];
         while(1){
             if(pobj_c==psi2->pobj_ParentClass){
                 //重複エラーチェックを行う
-                if(lstrcmp(psi2->name,psi->name)==0){
-                    if(CompareParameter(psi2->pParmInfo,psi2->ParmNum,psi->pParmInfo,psi->ParmNum)==0){
-                        SetError(15,psi->name,NowLine);
+                if(lstrcmp(psi2->name,pSub->name)==0){
+                    if( Parameter::Equals( psi2->params, pSub->params ) ){
+                        SetError(15,pSub->name,NowLine);
                         return 0;
                     }
@@ -1197 +1218 @@
             psi2=psi2->pNextData;
         }
-        psi2->pNextData=psi;
+        psi2->pNextData=pSub;
     }
     else{
-        ppSubHash[key]=psi;
-    }
-
-    return psi;
+        ppSubHash[key]=pSub;
+    }
+
+    return pSub;
 }
 
@@ -1217 +1238 @@
 
     //サブルーチン（ユーザー定義）情報を初期化
-    extern SUBINFO **ppSubHash;
+    extern SubInfo **ppSubHash;
     extern int SubNum;
-    ppSubHash=(SUBINFO **)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,MAX_HASH*sizeof(SUBINFO *));
+    ppSubHash=(SubInfo **)HeapAlloc(hHeap,HEAP_ZERO_MEMORY,MAX_HASH*sizeof(SubInfo *));
     SubNum=0;
 
@@ -1313 +1334 @@
     AddSubData(temporary,0,0,0);
 }
-void Delete_si(SUBINFO *psi){
-    int i2;
-
-    for(i2=0;i2<psi->ParmNum;i2++){
-        HeapDefaultFree(psi->pParmInfo[i2].name);
-    }
-    HeapDefaultFree(psi->pRealParmInfo);
-    if(psi->pParmInfo) HeapDefaultFree(psi->pParmInfo);
-    psi->pRealParmInfo=0;
-    psi->pParmInfo=0;
-
-    if(psi->pNextData) Delete_si(psi->pNextData);
-
-    HeapDefaultFree(psi->name);
-    HeapDefaultFree(psi);
-}
-void DeleteSubInfo(SUBINFO **ppSubHash,char **ppMacroNames,int MacroNum){   //サブルーチン情報のメモリ解放
+void Delete_si(SubInfo *pSub){
+    foreach( Parameter *pParam, pSub->params ){
+        delete pParam;
+    }
+
+    foreach( Parameter *pParam, pSub->realParams ){
+        delete pParam;
+    }
+
+    if(pSub->pNextData) Delete_si(pSub->pNextData);
+
+    HeapDefaultFree(pSub->name);
+    delete pSub;
+}
+void DeleteSubInfo(SubInfo **ppSubHash,char **ppMacroNames,int MacroNum){   //サブルーチン情報のメモリ解放
     int i;
     for(i=0;i<MAX_HASH;i++){

BasicCompiler_Common/Type.cpp

@@ -108 +108 @@
     return false;
 }
+
+
+bool Type::Equals( const Type &type ) const
+{
+    if( basicType == type.basicType ){
+        if( NATURAL_TYPE( basicType ) == DEF_OBJECT
+            || NATURAL_TYPE( basicType ) == DEF_STRUCT ){
+
+                if( index == type.index ){
+                    return true;
+                }
+
+        }
+        else{
+            return true;
+        }
+    }
+    return false;
+}
+
+bool Type::IsNull() const{
+  if( basicType == DEF_NON ){
+      return true;
+  }
+  return false;
+}
+bool Type::IsPointer() const
+{
+    if(PTR_LEVEL( basicType )|| basicType == DEF_PTR_VOID || basicType == DEF_PTR_PROC
+        || ( basicType & FLAG_PTR ) ){
+            return true;
+    }
+
+    return false;
+}
+bool Type::IsSigned() const
+{
+    switch( basicType ){
+        case DEF_SBYTE:
+        case DEF_INTEGER:
+        case DEF_LONG:
+        case DEF_INT64:
+        case DEF_SINGLE:
+        case DEF_DOUBLE:
+            return true;
+        default:
+            break;
+    }
+    return false;
+}
+bool Type::IsNaturalWhole() const
+{
+    switch( basicType ){
+        case DEF_SBYTE:
+        case DEF_BYTE:
+        case DEF_INTEGER:
+        case DEF_WORD:
+        case DEF_LONG:
+        case DEF_DWORD:
+        case DEF_INT64:
+        case DEF_QWORD:
+            return true;
+        default:
+            break;
+    }
+    return false;
+}
+bool Type::IsWhole() const
+{
+    return (
+        IsNaturalWhole()
+        || IsPtrType( basicType )
+        || basicType == DEF_BOOLEAN
+        );
+}
+bool Type::IsReal() const
+{
+    switch( basicType ){
+        case DEF_SINGLE:
+        case DEF_DOUBLE:
+            return true;
+        default:
+            break;
+    }
+    return false;
+}
+bool Type::Is64() const
+{
+    switch( basicType ){
+        case DEF_QWORD:
+        case DEF_INT64:
+            return true;
+        default:
+            break;
+    }
+    return false;
+}
+bool Type::IsProcPtr() const
+{
+    if( basicType == DEF_PTR_PROC ){
+        return true;
+    }
+    return false;
+}
+bool Type::IsStruct() const
+{
+    if( basicType == DEF_STRUCT ){
+        return true;
+    }
+    return false;
+}

BasicCompiler_Common/Type.h

@@ -4 +4 @@
 
 class Type{
+    static const int basicTypeList[];
+    static const string basicTypeNameList[];
+
+
     int basicType;
     union{
@@ -10 +14 @@
     };
 
-    static const int basicTypeList[];
-    static const string basicTypeNameList[];
-
 public:
 
+    static bool StringToBasicType( const string &typeName, int &basicType );
+    static bool StringToType( const string &typeName, Type &type );
+
+    Type():
+      basicType( DEF_NON ),
+      index( -1 ){}
     Type( int basicType ):
       basicType( basicType ),
@@ -31 +38 @@
       index( type.index ){}
 
-    int BasicType() const
+    int GetBasicType() const
     {
+#ifdef _DEBUG
+        if( basicType<-10000 ){
+            DebugBreak();
+        }
+#endif
         return basicType;
     }
@@ -44 +56 @@
     }
 
+    void SetBasicType( int basicType ){
+        this->basicType = basicType;
+    }
+    void SetIndex( LONG_PTR index ){
+        this->index = index;
+    }
+    void SetNull(){
+        SetBasicType( DEF_NON );
+    }
+    void SetType( int basicType, LONG_PTR index ){
+        SetBasicType( basicType );
+        SetIndex( index );
+    }
+    void SetType( int basicType, CClass *pClass ){
+        SetBasicType( basicType );
+        this->pClass = pClass;
+    }
+
     void PtrLevelUp(){
         PTR_LEVEL_UP( basicType );
     }
 
-    bool Equals( const Type &type ) const
-    {
-        if( basicType == type.basicType ){
-            if( NATURAL_TYPE( basicType ) == DEF_OBJECT
-                || NATURAL_TYPE( basicType ) == DEF_STRUCT ){
+    bool Equals( const Type &type ) const;
 
-                    if( index == type.index ){
-                        return true;
-                    }
+    bool IsNull() const;
+    bool IsPointer() const;
+    bool IsSigned() const;
+    bool IsNaturalWhole() const;
+    bool IsWhole() const;
+    bool IsReal() const;
+    bool Is64() const;
+    bool IsProcPtr() const;
+    bool IsStruct() const;
 
-            }
-            else{
-                return true;
-            }
-        }
-        return false;
-    }
-
-    bool IsPointer() const
-    {
-        if(PTR_LEVEL( basicType )|| basicType == DEF_PTR_VOID || basicType == DEF_PTR_PROC
-            || ( basicType & FLAG_PTR ) ){
-                return true;
-        }
-
-        return false;
-    }
-
-
-
-    static bool StringToBasicType( const string &typeName, int &basicType );
-    static bool StringToType( const string &typeName, Type &type );
 };
 

BasicCompiler_Common/Variable.cpp

@@ -819 +819 @@
 
     char temporary[VN_SIZE];
-    extern SUBINFO *pCompilingSubInfo;
+    extern SubInfo *pCompilingSubInfo;
     if(pCompilingSubInfo){
         GetNowStaticVarFullName(VarName,temporary);
@@ -1100 +1100 @@
             //初期値の型を判別して自動的に型情報を付加する
             TYPEINFO BaseType = GetStringTypeInfo();
-            int result = NumOpe_GetType( InitBuf, &BaseType, &pTypeInfo->u.lpIndex );
+            int result = NumOpe_GetType_Old( InitBuf, &BaseType, &pTypeInfo->u.lpIndex );
 
             //エラーの場合
@@ -1130 +1130 @@
 
 BOOL GetNowStaticVarFullName(char *VarName,char *FullName){
-    extern SUBINFO *pCompilingSubInfo;
+    extern SubInfo *pCompilingSubInfo;
     if(!pCompilingSubInfo) return 0;
 

BasicCompiler_Common/calculation.cpp

@@ -1195 +1195 @@
     return 0;
 }
-BOOL IsStringSubsituation(CClass *pobj_c){
-    //String受け入れ可能な "=" 演算子をオーバーロードしているかどうかを調べる
-    BOOL bRet=0;
-
-    std::vector<SUBINFO *> subs;
-    pobj_c->EnumMethod( CALC_SUBSITUATION, subs );
-    if( subs.size() == 0 ){
-        bRet=0;
-        goto finish;
-    }
-
-    foreach( SUBINFO *psi, subs ){
-        if(psi->ParmNum==2){
-            TYPEINFO TypeInfo={psi->pParmInfo[1].type,psi->pParmInfo[1].u.index};
-            if(IsStringObjectType( TypeInfo )){
-                bRet=1;
-                goto finish;
-            }
-        }
-    }
-
-finish:
-    return bRet;
-}
 int IsStrCalculation(char *Command){
     int i,i2,i3,i4,type,PareNum;
@@ -1282 +1258 @@
 
                     //ユーザー定義関数
-                    SUBINFO *psi;
+                    SubInfo *psi;
                     psi=GetSubHash(temporary);
                     if(psi){

BasicCompiler_Common/common.h

@@ -155 +155 @@
 #include "Parameter.h"
 
+// プロシージャ管理用のクラス
+#include "Procedure.h"
+
 
 
@@ -229 +232 @@
 };
 
-#define SUBTYPE_SUB         1
-#define SUBTYPE_FUNCTION    2
-#define SUBTYPE_MACRO       3
-struct SUBINFO{
-    DWORD dwType;
-
-    //クラス情報
-    CClass *pobj_ParentClass;
-
-    long id;
-
-    char *name;
-    long address;
-
-    //パラメータ
-    PARAMETER_INFO *pParmInfo;
-    int ParmNum;
-    int SecondParmNum;
-    PARAMETER_INFO *pRealParmInfo;
-    int RealParmNum;
-    int RealSecondParmNum;
-
-    /*
-    //パラメータ
-    Parameters params;
-    int SecondParmNum;
-    Parameters realParams;
-    int RealSecondParmNum;*/
-
-    //戻り値
-    int ReturnType;
-    union{
-        LONG_PTR ReturnIndex;
-        CClass *Return_pobj_c;
-    }u;
-    bool isReturnRef;
-
-    DWORD CompileAddress;
-    DWORD EndOpAddr;
-    VARIABLE *pVar;
-    int VarNum;
-
-    BOOL bExport;
-    BOOL bCdecl;
-    BOOL bVirtual;
-    BOOL bUse;
-    BOOL bCompile;
-    BOOL bSystem;
-
-    SUBINFO *pNextData;
-};
 #define DECLARE_DYNAMIC 1
 #define DECLARE_STATIC  2
@@ -435 +387 @@
 CONSTINFO *GetConstHash(char *name);
 DECLAREINFO *GetDeclareHash(char *name);
-SUBINFO *GetSubHash(const char *name,BOOL bError=0);
-SUBINFO *GetMethodHash(char *ObjectName,char *MethodName,char *Parameter,BOOL bError=0);
-void GetOverloadSubHash( const char *lpszName, std::vector<SUBINFO *> &subs );
+SubInfo *GetSubHash(const char *name,BOOL bError=0);
+SubInfo *GetMethodHash(char *ObjectName,char *MethodName,char *Parameter,BOOL bError=0);
+void GetOverloadSubHash( const char *lpszName, std::vector<SubInfo *> &subs );
 
 //Object.cpp
@@ -444 +396 @@
 
 //Overload.sbp
-SUBINFO *OverloadSolutionWithStrParam(
+SubInfo *OverloadSolutionWithStrParam(
     const char *name,
-    std::vector<SUBINFO *> &subs,
+    std::vector<SubInfo *> &subs,
     const char *Parameter,
     const char *ObjectName,
     TYPEINFO *pReturnTypeInfo);
-SUBINFO *OverloadSolution(
+SubInfo *OverloadSolution(
     const char *name,
-    std::vector<SUBINFO *> &subs,
+    std::vector<SubInfo *> &subs,
     const PARAMETER_INFO *ppi,
     const int ParmNum,
@@ -464 +416 @@
 void Debugger_Pause(void);
 ULONG_PTR rva_to_real(DWORD p);
-SUBINFO *GetSubFromObp(ULONG_PTR pos);
+SubInfo *GetSubFromObp(ULONG_PTR pos);
 void ReadOpBuffer();
 void DebugProgram(void);
@@ -561 +513 @@
 DWORD GetConstValue(char *name,double *dbl,char *buffer,LONG_PTR *plpIndex);
 bool IsStringObjectType(const TYPEINFO &TypeInfo);
-BOOL IsStringSubsituation(CClass *pobj_c);
 int IsStrCalculation(char *Command);
 BYTE GetCalcId(const char *Command,int *pi);
@@ -567 +518 @@
                        char *values[255],long calc[255],long stack[255]);
 
-//NumOpe_GetType.cpp
+//NumOpe_GetType_Old.cpp
 int AutoBigCast(int BaseType,int CalcType);
 BOOL CheckCalcType(int idCalc,int *type,int sp);
-int NumOpe_GetType(char *Command,TYPEINFO *pBaseType,LONG_PTR *plpIndex);
+int NumOpe_GetType_Old( const char *Command, TYPEINFO *pBaseTypeInfo, LONG_PTR *plpIndex );
+bool NumOpe_GetType( const char *expression, const Type &baseType, Type &resultType );
 
 //Subroutine.cpp
@@ -583 +535 @@
 bool GetReturnTypeOfIndexerGetterProc(CClass *pobj_Class,TYPEINFO &RetTypeInfo);
 BOOL CompareParameter(PARAMETER_INFO *ppi1,int pi_num1,PARAMETER_INFO *ppi2,int pi_num2);
-SUBINFO *AddSubData(char *buffer,int NowLine,BOOL bVirtual,CClass *pobj_c,BOOL bStatic=0);
+SubInfo *AddSubData(char *buffer,int NowLine,BOOL bVirtual,CClass *pobj_c,BOOL bStatic=0);
 void GetSubInfo(void);
-void DeleteSubInfo(SUBINFO **ppSubHash,char **ppMacroNames,int MacroNum);
+void DeleteSubInfo(SubInfo **ppSubHash,char **ppMacroNames,int MacroNum);
 void DeleteDeclareInfo(void);
 int AddProcPtrInfo(char *buffer,DWORD dwProcType);

BasicCompiler_Common/hash.cpp

@@ -53 +53 @@
 }
 
-void GetOverloadSubHash( const char *lpszName, std::vector<SUBINFO *> &subs ){
-    extern SUBINFO *pSubInfo;
-    extern int SubInfoNum;
-    extern int cp;
-
+void GetOverloadSubHash( const char *lpszName, std::vector<SubInfo *> &subs ){
     char name[VN_SIZE];
 
@@ -127 +123 @@
 
         //格納位置を取得
-        extern SUBINFO **ppSubHash;
-        SUBINFO *psi;
+        extern SubInfo **ppSubHash;
+        SubInfo *psi;
         psi=ppSubHash[key];
         while(psi){
@@ -144 +140 @@
 
 //オーバーロードされていない関数を取得（昔のコンパイラソースコードとの互換性保持）
-SUBINFO *GetSubHash(const char *lpszName,BOOL bError){
-    std::vector<SUBINFO *> subs;
+SubInfo *GetSubHash(const char *lpszName,BOOL bError){
+    std::vector<SubInfo *> subs;
     GetOverloadSubHash(lpszName,subs);
 
@@ -158 +154 @@
     }
 
-    SUBINFO *psi;
+    SubInfo *psi;
     psi = subs[0];
 
     return psi;
 }
-SUBINFO *GetMethodHash(char *ObjectName,char *MethodName,char *Parameter,BOOL bError){
+SubInfo *GetMethodHash(char *ObjectName,char *MethodName,char *Parameter,BOOL bError){
     char temporary[VN_SIZE];
     sprintf(temporary,"%s.%s",ObjectName,MethodName);
 
-    std::vector<SUBINFO *> subs;
-    SUBINFO *psi;
+    std::vector<SubInfo *> subs;
+    SubInfo *psi;
     GetOverloadSubHash(temporary,subs);
 

ProjectEditor/DocumentAdvice.cpp

@@ -129 +129 @@
 
     for(i=0;;i++){
-        if(memcmp(buffer+i,"#include",8)==0&&(!IsVariableChar(buffer[i+8]))){
+        if( ( memcmp(buffer+i,"#include",8)==0 || memcmp(buffer+i,"#require",8)==0 )&&(!IsVariableChar(buffer[i+8]))){
             i2=i+8;
             while(buffer[i2]==' '||buffer[i2]=='\t') i2++;