Changeset 76 in dev for BasicCompiler32

Timestamp:

Mar 21, 2007, 9:26:56 PM (18 years ago)

Author:

dai_9181

Message:

TYPEINFO→Typeへのリファクタリングを実施。32bitが未完成。

Location:

BasicCompiler32

Files:

• BasicCompiler.vcproj (modified) (5 diffs)
• CParameter.cpp (modified) (13 diffs)
• Compile_CallProc.cpp (modified) (17 diffs)
• Compile_Func.cpp (modified) (14 diffs)
• Compile_ProcOp.cpp (modified) (17 diffs)
• Compile_Statement.cpp (modified) (37 diffs)
• Compile_Var.cpp (modified) (3 diffs)
• MakePeHdr.cpp (modified) (5 diffs)
• NumOpe.cpp (modified) (38 diffs)
• Opcode.h (modified) (6 diffs)
• OperatorProc.cpp (modified) (12 diffs)
• VarList.cpp (deleted)
• WatchList.cpp (deleted)

BasicCompiler32/BasicCompiler.vcproj

@@ -600 +600 @@
                 </File>
                 <File
+                    RelativePath="..\BasicCompiler_Common\OldStatement.cpp"
+                    >
+                </File>
+                <File
                     RelativePath="..\BasicCompiler_Common\Overload.cpp"
                     >
@@ -1046 +1050 @@
                         >
                     </File>
+                    <File
+                        RelativePath="..\BasicCompiler_Common\VarList.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\BasicCompiler_Common\WatchList.cpp"
+                        >
+                        <FileConfiguration
+                            Name="Debug|Win32"
+                            >
+                            <Tool
+                                Name="VCCLCompilerTool"
+                                ObjectFile="$(IntDir)\$(InputName)1.obj"
+                                XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+                            />
+                        </FileConfiguration>
+                        <FileConfiguration
+                            Name="Release|Win32"
+                            >
+                            <Tool
+                                Name="VCCLCompilerTool"
+                                ObjectFile="$(IntDir)\$(InputName)1.obj"
+                                XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+                            />
+                        </FileConfiguration>
+                        <FileConfiguration
+                            Name="English_Rel|Win32"
+                            >
+                            <Tool
+                                Name="VCCLCompilerTool"
+                                ObjectFile="$(IntDir)\$(InputName)1.obj"
+                                XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+                            />
+                        </FileConfiguration>
+                    </File>
                 </Filter>
                 <Filter
@@ -1227 +1266 @@
                     >
                     <File
-                        RelativePath="..\BasicCompiler_Common\Variable.cpp"
-                        >
-                        <FileConfiguration
-                            Name="Debug|Win32"
-                            >
-                            <Tool
-                                Name="VCCLCompilerTool"
-                                PreprocessorDefinitions=""
-                            />
-                        </FileConfiguration>
-                        <FileConfiguration
-                            Name="Release|Win32"
-                            >
-                            <Tool
-                                Name="VCCLCompilerTool"
-                                PreprocessorDefinitions=""
-                            />
-                        </FileConfiguration>
-                        <FileConfiguration
-                            Name="English_Rel|Win32"
-                            >
-                            <Tool
-                                Name="VCCLCompilerTool"
-                                PreprocessorDefinitions=""
-                            />
-                        </FileConfiguration>
-                    </File>
-                    <File
-                        RelativePath="..\BasicCompiler_Common\Variable.h"
+                        RelativePath="..\BasicCompiler_Common\VariableOpe.cpp"
+                        >
+                    </File>
+                    <File
+                        RelativePath="..\BasicCompiler_Common\VariableOpe.h"
                         >
                     </File>
@@ -1861 +1876 @@
             </Filter>
             <Filter
-                Name="Debug"
-                >
-                <File
-                    RelativePath="VarList.cpp"
-                    >
-                    <FileConfiguration
-                        Name="Debug|Win32"
-                        >
-                        <Tool
-                            Name="VCCLCompilerTool"
-                            PreprocessorDefinitions=""
-                        />
-                    </FileConfiguration>
-                    <FileConfiguration
-                        Name="Release|Win32"
-                        >
-                        <Tool
-                            Name="VCCLCompilerTool"
-                            PreprocessorDefinitions=""
-                        />
-                    </FileConfiguration>
-                    <FileConfiguration
-                        Name="English_Rel|Win32"
-                        >
-                        <Tool
-                            Name="VCCLCompilerTool"
-                            PreprocessorDefinitions=""
-                        />
-                    </FileConfiguration>
-                </File>
-                <File
-                    RelativePath="WatchList.cpp"
-                    >
-                    <FileConfiguration
-                        Name="Debug|Win32"
-                        >
-                        <Tool
-                            Name="VCCLCompilerTool"
-                            PreprocessorDefinitions=""
-                        />
-                    </FileConfiguration>
-                    <FileConfiguration
-                        Name="Release|Win32"
-                        >
-                        <Tool
-                            Name="VCCLCompilerTool"
-                            PreprocessorDefinitions=""
-                        />
-                    </FileConfiguration>
-                    <FileConfiguration
-                        Name="English_Rel|Win32"
-                        >
-                        <Tool
-                            Name="VCCLCompilerTool"
-                            PreprocessorDefinitions=""
-                        />
-                    </FileConfiguration>
-                </File>
-            </Filter>
-            <Filter
                 Name="CommonClasses"
                 >
@@ -1929 +1884 @@
                 <File
                     RelativePath="..\BasicCompiler_Common\Type.cpp"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\Variable.cpp"
                     >
                 </File>

BasicCompiler32/CParameter.cpp

@@ -39 +39 @@
         }
 
-        Type DummyTypeInfo;
+        Type dummyType;
         BOOL bByVal;
         if(bEllipse){
-            DummyTypeInfo.type=NumOpe_GetType_Old(Parms[i2],NULL,&DummyTypeInfo.u.lpIndex);
+            NumOpe_GetType( Parms[i2], Type(), dummyType );
             bByVal=1;
         }
         else{
-            DummyTypeInfo.type=params[i2]->GetBasicType();
-            DummyTypeInfo.u.lpIndex=params[i2]->GetIndex();
+            dummyType = *params[i2];
             bByVal = ( params[i2]->IsRef() == false ) ? TRUE:FALSE;
         }
@@ -59 +58 @@
             }
 
-            LONG_PTR lpVarIndex;
-            if( GetVarType( Parms[i2], &lpVarIndex, FALSE ) == -1 ){
+            if( !GetVarType( Parms[i2], Type(), FALSE ) ){
                 //変数ではないとき
-                int reg = REG_RAX;
-                int type = NumOpe( Parms[i2], DummyTypeInfo.type, DummyTypeInfo.u.lpIndex, &lpVarIndex );
+                Type calcType;
+                NumOpe( Parms[i2], dummyType, calcType );
                 //↑ここでスタックに積む
 
                 nCountOfTempObjects++;
 
-                if( type != DEF_STRUCT ){
+                if( !calcType.IsStruct() ){
                     //一時参照を作成
 
@@ -78 +76 @@
 
                 bool result = CheckDifferentType(
-                    DummyTypeInfo.type,
-                    DummyTypeInfo.u.lpIndex,
-                    type,
-                    lpVarIndex,
+                    dummyType,
+                    calcType,
                     procName.c_str(),
                     i2);
@@ -89 +85 @@
                     useTempObject = true;
 
-                    types[i2].type = type;
-                    types[i2].u.lpIndex = lpVarIndex;
+                    types[i2] = calcType;
                 }
             }
@@ -107 +102 @@
     for(int i2=ParmsNum-1;i2>=0;i2--){
         if( useTempParameters[i2] ){
-            if( types[i2].type == DEF_STRUCT ){
+            if( types[i2].IsStruct() ){
                 // 構造体の一時メモリ
 
@@ -117 +112 @@
             }
             else{
-                if( Is64Type( types[i2].type ) ){
+                if( types[i2].Is64() ){
                     //pop ... 参照を消す
                     //pop ... 上位32ビット
@@ -133 +128 @@
 }
 
-void ParamImpl::SetStructParameter(CClass *pobj_Class,LPSTR Parameter){
-    int object_size = pobj_Class->GetSize();
+void ParamImpl::SetStructParameter( const Type &baseType, const char *expression ){
+    int object_size = baseType.GetClass().GetSize();
 
     //push object_size
@@ -143 +138 @@
     op_call(pSub_calloc);
 
+    //push eax（ここでプッシュされた値が実際にパラメータとして引き渡される）
+    op_push(REG_EAX);
+
     //push eax
     op_push(REG_EAX);
 
-
-    Type BaseType={DEF_STRUCT,(LONG_PTR)pobj_Class};
-    Type CalcType;
-    CalcType.type=NumOpe_GetType_Old(Parameter,&BaseType,&CalcType.u.lpIndex);
-
-    /*
-    TODO: 消す
-    if( pobj_Class->GetCopyConstructorMethod()
-        && CalcType.type==DEF_OBJECT&&CalcType.u.pobj_Class==pobj_Class){
-        ////////////////////////////////////
-        // コピーコンストラクタを呼び出す
-        ////////////////////////////////////
-
-        //push eax
-        op_push(REG_EAX);
-
-        BOOL bUseHeap;
-        CalcType.type=NumOpe(Parameter,DEF_OBJECT,(LONG_PTR)pobj_Class,&CalcType.u.lpIndex,&bUseHeap);
-
-        //pop ecx
-        op_pop(REG_ECX);
-
-        //pop eax
-        op_pop(REG_EAX);
-
-        if(bUseHeap){
-            //※解放用に退避
-            //mov esi,ecx
-            op_mov_RR(REG_ESI,REG_ECX);
-        }
-
-        //push ecx
-        op_push(REG_ECX);
-
-        //push eax
-        op_push(REG_EAX);
-
-        //call constructor
-        op_call(pobj_Class->GetCopyConstructorMethod()->pUserProc);
-
-
-        if(bUseHeap){
-            FreeTempObject(REG_ESI,pobj_Class);
-        }
-    }
-    else{*/
-
-
-        //push eax
-        op_push(REG_EAX);
-
-/*
-            TODO: 消す
-            if( pobj_Class->GetConstructorMethod() ){
-                ////////////////////////////////
-                // コンストラクタを呼び出す
-                ////////////////////////////////
-
-                //push this
-                op_push(REG_EAX);
-
-                //call constructor
-                op_call(pobj_Class->GetConstructorMethod()->pUserProc);
-            }
-*/
-
-            BOOL bUseHeap;
-            CalcType.type=NumOpe(Parameter,DEF_STRUCT,(LONG_PTR)pobj_Class,&CalcType.u.lpIndex,&bUseHeap);
-
-
-
-        SetStructVariable((LONG_PTR)pobj_Class,CalcType.type,CalcType.u.lpIndex,bUseHeap);
-    //}
+    Type calcType;
+    BOOL bUseHeap;
+    NumOpe( expression,
+        baseType,
+        calcType,
+        &bUseHeap );
+
+    // ※スタックにある二つのデータ（コピー先、コピー元）の値を必要とする
+    SetStructVariable( baseType, calcType, bUseHeap );
 }
 
@@ -247 +181 @@
 
     //パラメータをレジスタとスタックに格納
-    int CalcType;
-    LONG_PTR lpCalcIndex;
-    BOOL bCalcUseHeap;
     int ParmSize=0;
     RELATIVE_VAR RelativeVar;
@@ -269 +200 @@
         }
 
-        Type DummyTypeInfo;
+        Type dummyType;
         BOOL bByVal;
         if(bEllipse){
-            DummyTypeInfo.type=NumOpe_GetType_Old(Parms[i2],NULL,&DummyTypeInfo.u.lpIndex);
+            NumOpe_GetType( Parms[i2], Type(), dummyType );
             bByVal=1;
         }
         else{
-            DummyTypeInfo.type=params[i2]->GetBasicType();
-            DummyTypeInfo.u.lpIndex=params[i2]->GetIndex();
-            bByVal = (params[i2]->IsRef() == false ) ? TRUE:FALSE;
+            dummyType = *params[i2];
+            bByVal = ( params[i2]->IsRef() == false ) ? TRUE:FALSE;
         }
 
@@ -291 +221 @@
             }
 
-            if(DummyTypeInfo.type==DEF_STRUCT){
-                SetStructParameter(DummyTypeInfo.u.pobj_Class,Parms[i2]);
+            if( dummyType.IsStruct() ){
+                SetStructParameter( dummyType, 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);
+            LONG_PTR back_ProcPtr_BaseIndex = ProcPtr_BaseIndex;
+            if( dummyType.IsProcPtr() ){
+                ProcPtr_BaseIndex = dummyType.GetIndex();
+            }
+            else{
+                ProcPtr_BaseIndex=-1;
+            }
+
+            BOOL bCalcUseHeap;
+            Type calcType;
+            if( !NumOpe( Parms[i2], dummyType, calcType, &bCalcUseHeap ) ){
+                break;
+            }
 
             ProcPtr_BaseIndex=back_ProcPtr_BaseIndex;
 
-            if(CalcType==-1) break;
-
-            if(CalcType==DEF_OBJECT){
-                if( DummyTypeInfo.type != DEF_OBJECT
+            if( calcType.IsObject() ){
+                if( !dummyType.IsObject()
                     ||
-                    DummyTypeInfo.type == DEF_OBJECT &&
-                    !DummyTypeInfo.u.pobj_Class->IsEqualsOrSubClass( (CClass *)lpCalcIndex ) ){
+                    dummyType.IsObject() &&
+                    !dummyType.GetClass().IsEqualsOrSubClass( &calcType.GetClass() ) ){
                         //キャスト演算子のオーバーロードに対応する
-                        CallCastOperatorProc(CalcType,lpCalcIndex,bCalcUseHeap,DummyTypeInfo.type,DummyTypeInfo.u.lpIndex);
+                        CallCastOperatorProc( calcType, bCalcUseHeap,dummyType );
                 }
             }
 
             if(!bEllipse){
+                //型チェック
+                // TODO: _System_ReturnValueが考慮されていない？
+                if(bHas_System_LocalThis) i3=i2-1;
+                else i3=i2;
+                CheckDifferentType(
+                    dummyType,
+                    calcType,
+                    procName.c_str(),
+                    i3);
+            }
+
+            if( dummyType.IsDouble() ){
+                ChangeTypeToDouble( calcType.GetBasicType() );
+                ParmSize+=sizeof(long)*2;
+            }
+            else if( dummyType.IsSingle() ){
+                ChangeTypeToSingle( calcType.GetBasicType() );
+                ParmSize+=sizeof(long);
+            }
+            else if( dummyType.Is64() ){
+                ChangeTypeToInt64( calcType.GetBasicType() );
+                ParmSize+=sizeof(long)*2;
+            }
+            else if( dummyType.IsLong() || dummyType.IsDWord()
+                || dummyType.IsPointer()
+                || dummyType.IsObject() || dummyType.IsStruct() ){
+                    ChangeTypeToLong( calcType.GetBasicType() );
+                    ParmSize+=sizeof(long);
+            }
+            else if( dummyType.IsInteger() || dummyType.IsWord() ){
+                ChangeTypeToInteger( calcType.GetBasicType() );
+                ParmSize+=sizeof(long);
+            }
+            else if( dummyType.IsSByte() || dummyType.IsByte() || dummyType.IsBoolean() ){
+                ChangeTypeToByte( calcType.GetBasicType() );
+                ParmSize+=sizeof(long);
+            }
+            else{
+                SetError(300,NULL,cp);
+            }
+        }
+        else{
+            //ポインタ参照
+            if(Parms[i2][0]==1&&Parms[i2][1]==ESC_BYVAL){
+                //ポインタ指定
+
+                Type calcType;
+                if( !NumOpe( Parms[i2]+2, dummyType, calcType) ){
+                    break;
+                }
+
+                ChangeTypeToLong( calcType.GetBasicType() );
+
+                dummyType.PtrLevelUp();
+
                 //型チェック
                 if(bHas_System_LocalThis) i3=i2-1;
                 else i3=i2;
                 CheckDifferentType(
-                    DummyTypeInfo.type,
-                    DummyTypeInfo.u.lpIndex,
-                    CalcType,
-                    lpCalcIndex,
+                    dummyType,
+                    calcType,
                     procName.c_str(),
                     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{
@@ -373 +322 @@
                     //一時オブジェクトをコピー
 
-                    if( types[i2].type != DEF_STRUCT ){
+                    if( !types[i2].IsStruct() ){
                         // 一時参照のための領域を考慮する
                         nCountOfNowTempObjects++;
@@ -393 +342 @@
                 else{
                     //変数のアドレスを取得
-                    int VarType;
-                    LONG_PTR lpVarIndex;
+                    Type varType;
                     if(GetVarOffset(
                         false,
                         false,
                         Parms[i2],
-                        &VarType,
                         &RelativeVar,
-                        &lpVarIndex)){
-                            if(DummyTypeInfo.type!=DEF_ANY){
+                        varType)){
+                            if( !dummyType.IsAny() ){
                                 //型チェックを行う
-                                if(DummyTypeInfo.type==VarType){
-                                    if(DummyTypeInfo.type==DEF_OBJECT){
-                                        if( !DummyTypeInfo.u.pobj_Class->IsEqualsOrSubClass( (CClass *)lpVarIndex ) ){
+                                if( dummyType.GetBasicType() == varType.GetBasicType() ){
+                                    if( dummyType.IsObject() ){
+                                        if( !dummyType.GetClass().IsEqualsOrSubClass( &varType.GetClass() ) ){
                                             SetError(11,Parms[i2],cp);
                                         }
                                     }
-                                    else if(DummyTypeInfo.type==DEF_STRUCT){
-                                        if( !DummyTypeInfo.u.pobj_Class->IsEquals( (CClass *)lpVarIndex ) ){
+                                    else if( dummyType.IsStruct() ){
+                                        if( !dummyType.GetClass().IsEquals( &varType.GetClass() ) ){
                                             SetError(11,Parms[i2],cp);
                                         }
                                     }
                                 }
-                                else if((VarType&FLAG_PTR)&&((int)(VarType^FLAG_PTR)==DummyTypeInfo.type)){
+                                else if( (varType.GetBasicType()&FLAG_PTR)
+                                    &&((varType.GetBasicType()^FLAG_PTR)==dummyType.GetBasicType())){
                                     //仮引数がポインタ参照で、実引数が配列の先頭ポインタのとき
                                 }

BasicCompiler32/Compile_CallProc.cpp

@@ -32 +32 @@
 
 
-int Opcode_CallProcPtr(char *variable,char *Parameter,ProcPointer *pProcPointer,LONG_PTR *plpIndex){
-    extern HANDLE hHeap;
-    int i;
-
+bool Opcode_CallProcPtr( const char *variable, const char *lpszParms,ProcPointer *pProcPointer){
 
     extern BOOL bDebugCompile;
@@ -49 +46 @@
     //パラメータオブジェクトを生成
     ParamImpl *pobj_parameter=0;
-    pobj_parameter=new ParamImpl(Parameter);
+    pobj_parameter=new ParamImpl(lpszParms);
 
     //エラーチェック
     if( !pobj_parameter->ErrorCheck(variable,pProcPointer->Params() ) ){
         //パラメータにエラーがあるときは処理を終える
-        return pProcPointer->ReturnType().GetBasicType();
+        return false;
     }
 
@@ -69 +66 @@
     ////////////////////////
     RELATIVE_VAR RelativeVar;
-    LONG_PTR lp;
-    GetVarOffsetReadOnly(variable,&i,&RelativeVar,&lp);
+    GetVarOffsetReadOnly(variable,&RelativeVar,Type());
     SetVarPtrToEax(&RelativeVar);
 
@@ -89 +85 @@
     delete pobj_parameter;
 
-    if(plpIndex) *plpIndex=pProcPointer->ReturnType().GetIndex();
-
-    return pProcPointer->ReturnType().GetBasicType();
+    return true;
 }
 
-void Opcode_CallProc(const char *Parameter,UserProc *pUserProc,DWORD dwFlags,char *ObjectName,int RefType){
+bool Opcode_CallProc(const char *Parameter,UserProc *pUserProc,DWORD dwFlags,const char *ObjectName,int RefType){
     int i2;
 
@@ -100 +94 @@
         if( lstrcmpi( pUserProc->GetName().c_str(), "Print" ) == 0 ){
             Opcode_Print(Parameter,0);
-            return;
+            return true;
         }
         if( lstrcmpi( pUserProc->GetName().c_str(), "Input" ) == 0 ){
             Opcode_Input(Parameter);
-            return;
+            return true;
         }
         if( lstrcmpi( pUserProc->GetName().c_str(), "Write" ) == 0 ){
             Opcode_Print(Parameter,1);
-            return;
+            return true;
         }
     }
@@ -115 +109 @@
 
     bool isStatic = false;
-    CClass *pobj_c = NULL;
+    const CClass *pobj_c = NULL;
     CMethod *pMethod = NULL;
     if( pUserProc->GetParentClassPtr() ){
@@ -126 +120 @@
             else{
                 //"->"によってオブジェクトを指定する通常のメンバ関数呼び出し
-                int type = GetVarType(ObjectName,(LONG_PTR *)&pobj_c,0);
-                if(!(NATURAL_TYPE(type)==DEF_OBJECT)){
+                Type varType;
+                GetVarType( ObjectName, varType, false );
+                pobj_c = &varType.GetClass();
+                if( NATURAL_TYPE( varType.GetBasicType() ) != DEF_OBJECT ){
                     pobj_c=pobj_DBClass->check(ObjectName);
                     if( pobj_c ){
@@ -160 +156 @@
             if( !pMethod ){
                 SetError(300,NULL,cp);
-                return;
+                return false;
             }
 
@@ -179 +175 @@
                 if(dwAccess==ACCESS_NON){
                     SetError(109,pUserProc->GetName(),cp);
-                    return;
+                    return false;
                 }
             }
@@ -186 +182 @@
                     dwAccess==ACCESS_NON){
                     SetError(109,pUserProc->GetName(),cp);
-                    return;
+                    return false;
                 }
                 if(dwAccess==ACCESS_PROTECTED){
                     SetError(110,pUserProc->GetName(),cp);
-                    return;
+                    return false;
                 }
             }
@@ -198 +194 @@
             if(dwAccess==ACCESS_NON){
                 SetError(109,pUserProc->GetName(),cp);
-                return;
-            }
-        }
-    }
-
+                return false;
+            }
+        }
+    }
 
 
@@ -220 +215 @@
 
 
-
     ////////////////////////
     // パラメータをセット
@@ -232 +226 @@
     if( !pobj_parameter->ErrorCheck(pUserProc->GetName(),pUserProc->RealParams(),pUserProc->GetSecondParmNum() ) ){
         //パラメータにエラーがあるときは処理を終える
-        return;
+        return false;
     }
 
@@ -278 +272 @@
                 if( pMethod->isConst ){
                     //Constアクセスが可能なメソッドの場合
-                    if( !GetVarOffsetReadOnly( ObjectName, &i2, &RelativeVar, 0 ) ) return;
+                    if( !GetVarOffsetReadOnly( ObjectName, &RelativeVar, Type() ) ){
+                        return false;
+                    }
                 }
                 else{
                     //Constアクセスが不可能なメソッドの場合
-                    if( !GetVarOffsetReadWrite( ObjectName, &i2, &RelativeVar, 0 ) ) return;
+                    if( !GetVarOffsetReadWrite( ObjectName, &RelativeVar, Type() ) ){
+                        return false;
+                    }
                 }
 
@@ -351 +349 @@
     //パラメータオブジェクトを破棄
     delete pobj_parameter;
+
+    return true;
 }
 
-int Opcode_CallDllProc(char *Parameter,DllProc *pDllProc,LONG_PTR *plpIndex){
-    char *temporary;
-
-    temporary=(char *)HeapAlloc(hHeap,0,lstrlen(Parameter)+1);
+bool Opcode_CallDllProc( const char *lpszParms, DllProc *pDllProc ){
 
     extern BOOL bDebugCompile;
@@ -371 +368 @@
     //パラメータオブジェクトを生成
     ParamImpl *pobj_parameter=0;
-    pobj_parameter=new ParamImpl(Parameter);
+    pobj_parameter=new ParamImpl(lpszParms);
 
     //エラーチェック
     if( !pobj_parameter->ErrorCheck( pDllProc->GetName(), pDllProc->Params() ) ){
         //パラメータにエラーがあるときは処理を終える
-        return pDllProc->ReturnType().GetBasicType();
+        return false;
     }
 
@@ -406 +403 @@
     delete pobj_parameter;
 
-    if(plpIndex) *plpIndex=pDllProc->ReturnType().GetIndex();
-
-    HeapDefaultFree(temporary);
-
-    return pDllProc->ReturnType().GetBasicType();
+    return true;
 }

BasicCompiler32/Compile_Func.cpp

@@ -44 +44 @@
 }
 
-void Opcode_Func_Fix(const char *Parameter){
-    int i;
-
-    i=NumOpe(Parameter,0,0,0);
-
-    if(i==DEF_DOUBLE){
+void Opcode_Func_Fix(const char *lpszParms){
+    Type resultType;
+    if( !NumOpe( lpszParms, Type(), resultType ) ){
+        return;
+    }
+
+    if( resultType.IsDouble() ){
         //fld qword ptr[esp]
         op_fld_ptr_esp(DEF_DOUBLE);
@@ -96 +97 @@
         op_add_esp(4);
     }
-    else if(i==DEF_SINGLE){
+    else if( resultType.IsSingle() ){
         //fld dword ptr[esp]
         op_fld_ptr_esp(DEF_SINGLE);
@@ -146 +147 @@
         op_add_esp(4);
     }
-    else if(Is64Type(i)){
+    else if( resultType.Is64() ){
         //pop eax
         op_pop(REG_EAX);
@@ -162 +163 @@
 
 void Opcode_Func_CUDbl(const char *Parameter){
-    int i;
-
-    i=NumOpe(Parameter,0,0,0);
-    ChangeTypeToLong(i);
+    Type resultType;
+    if( !NumOpe(Parameter,Type(),resultType) ){
+        return;
+    }
+    ChangeTypeToLong(resultType.GetBasicType());
 
     //pop eax
@@ -186 +188 @@
 }
 void Opcode_Func_Len(const char *Parameter){
-    int type,TypeSize;
-    LONG_PTR lpIndex;
     BOOL bArrayHead;
-
-    type=GetVarType(Parameter,&lpIndex,0);
 
     const char *tempParm=Parameter;
     char temporary[VN_SIZE];
     char temp2[32];
-    if(type==-1){
+    Type type;
+    if( !GetVarType(Parameter,type,0) ){
         sprintf(temporary,"_System_DummyStr2=%s",Parameter);
         OpcodeCalc(temporary);
@@ -203 +202 @@
 
         extern CClass *pobj_StringClass;
-        type=DEF_OBJECT;
-        lpIndex=(LONG_PTR)pobj_StringClass;
-    }
-
-    Type TypeInfo={type,lpIndex};
-    if(IsStringObjectType(TypeInfo)){
+        type.SetType( DEF_OBJECT, pobj_StringClass );
+    }
+
+    if( type.IsStringObject() ){
         //Stringオブジェクトの場合
-        char temporary[VN_SIZE];
         sprintf(temporary,"%s.Length",tempParm);
 
-        NumOpe(temporary,0,0,NULL,NULL);
+        int reg=REG_RAX;
+        NumOpe(temporary,Type(),Type());
 
         //pop eax
@@ -223 +220 @@
     int SubScripts[MAX_ARRAYDIM];
     RELATIVE_VAR RelativeVar;
-    if(!GetVarOffsetReadOnly(tempParm,&type,&RelativeVar,&lpIndex,SubScripts)) return;
-
-    if(type&FLAG_PTR){
-        type&=~FLAG_PTR;
+    if(!GetVarOffsetReadOnly(tempParm,&RelativeVar,type,SubScripts)) return;
+
+    if(type.GetBasicType()&FLAG_PTR){
+        type.SetBasicType( type.GetBasicType() & ( ~FLAG_PTR ) );
 
         bArrayHead=1;
@@ -232 +229 @@
     else bArrayHead=0;
 
-    TypeSize=GetTypeSize(type,lpIndex);
-
-    if(bArrayHead) TypeSize*=JumpSubScripts(SubScripts);
+    int typeSize = type.GetSize();
+
+    if(bArrayHead) typeSize*=JumpSubScripts(SubScripts);
 
     //mov eax,TypeSize
     OpBuffer[obp++]=(char)0xB8;
-    *((long *)(OpBuffer+obp))=TypeSize;
+    *((long *)(OpBuffer+obp))=typeSize;
     obp+=sizeof(long);
 }
-void Opcode_Func_AddressOf(const char *name){
+void Opcode_Func_AddressOf( const char *name ){
     extern int cp;
     UserProc *pUserProc;
@@ -257 +254 @@
 
         //オーバーロードを解決
-        extern ProcPointer **ppProcPtrInfo;
-        pUserProc=OverloadSolution(name,subs,ppProcPtrInfo[ProcPtr_BaseIndex]->Params(), Type() );
+        extern ProcPointer **ppProcPointer;
+        pUserProc=OverloadSolution(name,subs,ppProcPointer[ProcPtr_BaseIndex]->Params(), Type() );
 
         if(!pUserProc){
@@ -289 +286 @@
             else{
                 RELATIVE_VAR RelativeVar;
-                int type;
-                if(!GetVarOffsetReadOnly(ObjectName,&type,&RelativeVar,(LONG_PTR *)&pobj_c)) return;
+                Type type;
+                if(!GetVarOffsetReadOnly(ObjectName,&RelativeVar,type)) return;
                 SetVarPtrToEax(&RelativeVar);
 
@@ -297 +294 @@
 
                 //参照タイプが整合しているかをチェック
-                if(type!=RefType) SetError(104,ObjectName,cp);
-
-                if(type==DEF_PTR_OBJECT){
+                if(type.GetBasicType()!=RefType) SetError(104,ObjectName,cp);
+
+                if(type.IsObjectPtr()){
                     //mov ecx,dword ptr[ecx]
                     op_mov_RM(sizeof(long),REG_ECX,REG_ECX,0,MOD_BASE);
@@ -360 +357 @@
     op_mov_RV( REG_EAX, size );
 }
-void Opcode_Func_VarPtr( const char *Parameter, Type &ReturnTypeInfo ){
+void Opcode_Func_VarPtr( const char *Parameter, Type &resultType, bool isCallOn ){
+    if( isCallOn == false ){
+        // 戻り値の型を取得するだけ
+
+        //変数のアドレスを取得
+        if(!GetVarType( Parameter, resultType, true )) return;
+
+        resultType.PtrLevelUp();
+
+        return;
+    }
+
     RELATIVE_VAR RelativeVar;
 
     //変数のアドレスを取得
-    if(!GetVarOffsetReadOnly( Parameter, &ReturnTypeInfo.type, &RelativeVar, &ReturnTypeInfo.u.lpIndex )) return;
-
-    int beforeType = ReturnTypeInfo.type;
-
-    PTR_LEVEL_UP( ReturnTypeInfo.type );
+    if(!GetVarOffsetReadOnly( Parameter, &RelativeVar, resultType )) return;
+
+    int beforeType = resultType.GetBasicType();
+
+    resultType.PtrLevelUp();
 
     SetVarPtrToEax(&RelativeVar);
@@ -380 +388 @@
 }
 void Opcode_Func_GetPtrData(const char *Parameter,const int type){
-    int i2;
-
-    i2=NumOpe(Parameter,0,0,0);
-    ChangeTypeToLong(i2);
+    Type tempType;
+    if( !NumOpe(Parameter,Type(),tempType) ){
+        return;
+    }
+    if(!tempType.IsWhole()){
+        SetError(11,Parameter,cp);
+        return;
+    }
+    ChangeTypeToLong(tempType.GetBasicType());
 
     if(type==DEF_DOUBLE){
@@ -438 +451 @@
 }
 
-void Opcode_CallFunc( const char *Parameter, const int FuncNum, Type &ReturnTypeInfo ){
+bool Opcode_CallFunc( const char *Parameter, const int FuncNum, Type &resultType, bool isCallOn ){
     switch(FuncNum){
         case FUNC_FIX:
-            Opcode_Func_Fix(Parameter);
-            ReturnTypeInfo.type = DEF_LONG;
+            if( isCallOn ) Opcode_Func_Fix(Parameter);
+            resultType.SetBasicType( DEF_LONG );
             break;
         case FUNC_CUDBL:
-            Opcode_Func_CUDbl(Parameter);
-            ReturnTypeInfo.type = DEF_DOUBLE;
+            if( isCallOn ) Opcode_Func_CUDbl(Parameter);
+            resultType.SetBasicType( DEF_DOUBLE );
             break;
         case FUNC_LEN:
-            Opcode_Func_Len(Parameter);
-            ReturnTypeInfo.type = DEF_LONG;
+            if( isCallOn ) Opcode_Func_Len(Parameter);
+            resultType.SetBasicType( DEF_LONG );
             break;
         case FUNC_ADDRESSOF:
-            Opcode_Func_AddressOf(Parameter);
-            ReturnTypeInfo.type = DEF_PTR_VOID;
+            if( isCallOn ) Opcode_Func_AddressOf(Parameter);
+            resultType.SetBasicType( DEF_PTR_VOID );
             break;
         case FUNC_SIZEOF:
-            Opcode_Func_SizeOf(Parameter);
-            ReturnTypeInfo.type = DEF_LONG;
+            if( isCallOn ) Opcode_Func_SizeOf(Parameter);
+            resultType.SetBasicType( DEF_LONG );
             break;
         case FUNC_VARPTR:
-            Opcode_Func_VarPtr( Parameter, ReturnTypeInfo );
+            Opcode_Func_VarPtr( Parameter, resultType, isCallOn );
             break;
 
         case FUNC_GETDOUBLE:
-            Opcode_Func_GetPtrData(Parameter,DEF_DOUBLE);
-            ReturnTypeInfo.type = DEF_DOUBLE;
+            if( isCallOn ) Opcode_Func_GetPtrData(Parameter,DEF_DOUBLE);
+            resultType.SetBasicType( DEF_DOUBLE );
             break;
         case FUNC_GETSINGLE:
-            Opcode_Func_GetPtrData(Parameter,DEF_SINGLE);
-            ReturnTypeInfo.type = DEF_SINGLE;
+            if( isCallOn ) Opcode_Func_GetPtrData(Parameter,DEF_SINGLE);
+            resultType.SetBasicType( DEF_SINGLE );
             break;
         case FUNC_GETQWORD:
-            Opcode_Func_GetPtrData(Parameter,DEF_QWORD);
-            ReturnTypeInfo.type = DEF_QWORD;
+            if( isCallOn ) Opcode_Func_GetPtrData(Parameter,DEF_QWORD);
+            resultType.SetBasicType( DEF_QWORD );
             break;
         case FUNC_GETDWORD:
-            Opcode_Func_GetPtrData(Parameter,DEF_DWORD);
-            ReturnTypeInfo.type = DEF_DWORD;
+            if( isCallOn ) Opcode_Func_GetPtrData(Parameter,DEF_DWORD);
+            resultType.SetBasicType( DEF_DWORD );
             break;
         case FUNC_GETWORD:
-            Opcode_Func_GetPtrData(Parameter,DEF_WORD);
-            ReturnTypeInfo.type = DEF_WORD;
+            if( isCallOn ) Opcode_Func_GetPtrData(Parameter,DEF_WORD);
+            resultType.SetBasicType( DEF_WORD );
             break;
         case FUNC_GETBYTE:
-            Opcode_Func_GetPtrData(Parameter,DEF_BYTE);
-            ReturnTypeInfo.type = DEF_BYTE;
-            break;
-    }
-}
+            if( isCallOn ) Opcode_Func_GetPtrData(Parameter,DEF_BYTE);
+            resultType.SetBasicType( DEF_BYTE );
+            break;
+        default:
+            return false;
+    }
+    return true;
+}

BasicCompiler32/Compile_ProcOp.cpp

@@ -26 +26 @@
         }
 
-        extern BOOL bCompilingGlobal;
-        BOOL bBackCompilingGlobal;
-        bBackCompilingGlobal=bCompilingGlobal;
-        bCompilingGlobal=1;
+        UserProc *pBackUserProc;
+        pBackUserProc = &UserProc::CompilingUserProc();
+        UserProc::CompileStartForGlobalArea();
 
         int BackCp;
@@ -49 +48 @@
         GetGlobalDataForDll();
 
-        bCompilingGlobal=bBackCompilingGlobal;
+        UserProc::CompileStartForUserProc( pBackUserProc );
         cp=BackCp;
 
@@ -58 +57 @@
         //静的ローカルオブジェクトのコンストラクタ呼び出し
 
-        extern int MaxGlobalVarNum;
-        extern VARIABLE *GlobalVar;
-        int i;
-        for(i=0;i<MaxGlobalVarNum;i++){
-            if(_memicmp(GlobalVar[i].name,"Static%",7)==0){
+        foreach( Variable *pVar, globalVars ){
+            if(memicmp(pVar->GetName().c_str(),"Static%",7)==0){
                 //コンストラクタ呼び出し
-                if(GlobalVar[i].type==DEF_OBJECT){
+                if( pVar->IsObject() ){
 
                     //エラー用
-                    cp=GlobalVar[i].source_code_address;
-
-                    Type TypeInfo;
-                    TypeInfo.type=GlobalVar[i].type;
-                    TypeInfo.u.lpIndex=GlobalVar[i].u.index;
+                    cp=pVar->source_code_address;
+
                     CallConstructor(
-                        GlobalVar[i].name,
-                        GlobalVar[i].SubScripts,
-                        TypeInfo,
-                        GlobalVar[i].ConstractParameter);
+                        pVar->GetName().c_str(),
+                        pVar->GetSubScriptsPtr(),
+                        *pVar,
+                        pVar->paramStrForConstructor.c_str());
                 }
             }
@@ -86 +79 @@
     else if(lstrcmp(name,"_System_Call_Destructor_of_GlobalObject")==0){
 
-        extern BOOL bCompilingGlobal;
-        BOOL bBackCompilingGlobal;
-        bBackCompilingGlobal=bCompilingGlobal;
-        bCompilingGlobal=1;
+        UserProc *pBackUserProc;
+        pBackUserProc = &UserProc::CompilingUserProc();
+        UserProc::CompileStartForGlobalArea();
 
         obj_LexScopes.CallDestructorsOfScopeEnd();
 
-        bCompilingGlobal=bBackCompilingGlobal;
+        UserProc::CompileStartForUserProc( pBackUserProc );
 
 
@@ -219 +211 @@
     extern UserProc **ppSubHash;
     extern BOOL bDebugCompile;
-    int i3,i4,VarSize,LocalVarSchedule,EspOffsetSchedule,BufferSize,BaseOffset;
+    int i3,i4,LocalVarSchedule,EspOffsetSchedule,BaseOffset;
     char temporary[VN_SIZE];
 
-    BufferSize=128;
-
     if( pUserProc->IsUsing() == false || pUserProc->IsCompiled() ) return;
+
+    if( pUserProc->localVars.size() ){
+        SetError();
+        return;
+    }
 
     pUserProc->CompleteCompile();
@@ -235 +230 @@
     if(memcmp(pUserProc->GetName().c_str(),"_DebugSys_",10)==0){
         if(!bDebugCompile){
-            pUserProc->pVar=(VARIABLE *)HeapAlloc(hHeap,0,1);
-            pUserProc->VarNum=0;
             return;
         }
@@ -246 +239 @@
 
     if(pUserProc->IsSystem()){
-        extern int MaxLocalVarNum;
         extern int AllLocalVarSize;
-        MaxLocalVarNum=0;
         AllLocalVarSize=0;
 
@@ -254 +245 @@
 
         pUserProc->endOpAddress=obp;
-        pUserProc->pVar=(VARIABLE *)HeapAlloc(hHeap,0,1);
-        pUserProc->VarNum=0;
         return;
     }
@@ -266 +255 @@
 
     //ローカル変数に関する情報
-    extern VARIABLE *LocalVar;
-    extern int MaxLocalVarNum;
     extern int AllLocalVarSize;
-    LocalVar=(VARIABLE *)HeapAlloc(hHeap,0,1);
-    MaxLocalVarNum=0;
     AllLocalVarSize=0;
 
@@ -283 +268 @@
         Parameter &param = *pUserProc->RealParams()[i3];
 
-        //変数データを追加
-        LocalVar=(VARIABLE *)HeapReAlloc(hHeap,0,LocalVar,(MaxLocalVarNum+1)*sizeof(VARIABLE));
-
-        lstrcpy( LocalVar[MaxLocalVarNum].name,param.GetVarName().c_str() );
-
-        // TODO: パラメータのConst定義の指定が未完成
-        LocalVar[MaxLocalVarNum].bConst=false;
-
-        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){
-                if(pUserProc->IsExport())
-                    SetError(24,NULL,cp);
-        }
-
-        LocalVar[MaxLocalVarNum].u.index=param.GetIndex();
-
+        Variable *pVar = new Variable( param.GetVarName(), param, false, param.IsRef() );
+
+        if( param.IsArray() ){
+            pVar->SetArray( param.GetSubScriptsPtr() );
+        }
+
+        int varSize;
         if( param.IsRef() == false && param.IsStruct() ){
             //構造体のByValパラメータ
-            LocalVar[MaxLocalVarNum].fRef=REF_PARAMETER | OBJECT_PARAMETER;
-            VarSize=PTR_SIZE;
+            pVar->ThisIsParameter();
+            varSize=PTR_SIZE;
         }
         else{
-            if( param.IsRef() == false && param.IsArray() == false ){
-                LocalVar[MaxLocalVarNum].fRef=0;
-                VarSize=GetTypeSize(LocalVar[MaxLocalVarNum].type,LocalVar[MaxLocalVarNum].u.index);
-                if(VarSize%PTR_SIZE) VarSize+=PTR_SIZE-(VarSize%PTR_SIZE);
+            if( param.IsArray() == false ){
+                varSize = pVar->GetMemorySize();
             }
             else{
-                LocalVar[MaxLocalVarNum].fRef=REF_PARAMETER;
-                VarSize=PTR_SIZE;
-            }
-        }
-        AllLocalVarSize+=VarSize;
-        LocalVar[MaxLocalVarNum].offset=AllLocalVarSize;
+                varSize=PTR_SIZE;
+            }
+        }
+        AllLocalVarSize+=varSize;
+        pVar->offset=AllLocalVarSize;
 
         //レキシカルスコープ情報
-        LocalVar[MaxLocalVarNum].ScopeLevel=obj_LexScopes.GetNowLevel();
-        LocalVar[MaxLocalVarNum].ScopeStartAddress=obj_LexScopes.GetStartAddress();
-        LocalVar[MaxLocalVarNum].bLiving=TRUE;
-
-        MaxLocalVarNum++;
+        pVar->ScopeLevel=obj_LexScopes.GetNowLevel();
+        pVar->ScopeStartAddress=obj_LexScopes.GetStartAddress();
+        pVar->bLiving=TRUE;
+
+        pUserProc->localVars.push_back( pVar );
     }
 
@@ -346 +315 @@
 
     //コンパイル中の関数
-    extern UserProc *pCompilingUserProc;
-    pCompilingUserProc=pUserProc;
+    UserProc::CompileStartForUserProc( pUserProc );
 
 
@@ -507 +475 @@
             }
 
-
             //実体クラスを持つメンバのコンストラクタ（引数有りを除く）を呼び出す
             for(i3=0;i3<pobj_CompilingClass->iMemberNum;i3++){
                 CMember *pMember = pobj_CompilingClass->ppobj_Member[i3];
-                if(pMember->TypeInfo.type==DEF_OBJECT){
+                if(pMember->IsObject()){
                     // オブジェクトメンバを発見したとき
 
@@ -517 +484 @@
                         pMember->name,
                         1, ESC_NEW,
-                        pMember->TypeInfo.u.pobj_Class->name );
+                        pMember->GetClass().name );
                     OpcodeCalc( temporary );
                 }
             }
-
 
             //仮想関数テーブルを初期化
@@ -686 +652 @@
         //戻り値をeax、edxに設定
         RELATIVE_VAR RelativeVar;
-        LONG_PTR lpIndex;
 
         const char *temp = pUserProc->GetName().c_str();
@@ -692 +657 @@
             temp="_System_ReturnValue";
         }
-        GetVarOffsetReadWrite(temp,&i3,&RelativeVar,&lpIndex);
+        GetVarOffsetReadWrite(temp,&RelativeVar,Type());
 
         i3=pUserProc->ReturnType().GetBasicType();
@@ -773 +738 @@
     }
     HeapDefaultFree(pLocalVarAddrSchedule);
-    for(i3=0;i3<MaxLocalVarNum;i3++){
-        LocalVar[i3].offset=AllLocalVarSize-LocalVar[i3].offset;//後にデバッグで利用する
+    foreach( Variable *pVar, pUserProc->localVars ){
+        //後にデバッグで利用する
+        pVar->offset = AllLocalVarSize - pVar->offset;
     }
 
@@ -828 +794 @@
     }
 
+
     pUserProc->endOpAddress=obp;
-    pUserProc->pVar=LocalVar;
-    pUserProc->VarNum=MaxLocalVarNum;
 
 

BasicCompiler32/Compile_Statement.cpp

@@ -71 +71 @@
     }
 
-
     int idProc;
-    void *pInfo;
-    idProc=GetProc(buffer,&pInfo);
+    void *pProc;
+    idProc=GetProc(buffer,(void **)&pProc);
 
     int i4;
@@ -92 +91 @@
         ////////////////
 
-        LONG_PTR lp;
-        i2=CallProc(idProc,pInfo,buffer,temp2,&lp);
+        Type resultType;
+        CallProc(idProc,pProc,buffer,temp2,resultType);
 
 
@@ -100 +99 @@
         /////////////////////
 
-        if(i2==DEF_DOUBLE||i2==DEF_SINGLE){
+        if( resultType.IsReal() ){
             //fstp st(0)
             OpBuffer[obp++]=(char)0xDD;
             OpBuffer[obp++]=(char)0xD8;
         }
-        if(i2==DEF_STRUCT){
+        else if( resultType.IsStruct() ){
             //mov ebx,eax
             op_mov_RR(REG_EBX,REG_EAX);
 
-            FreeTempObject(REG_EBX,(CClass *)lp);
+            FreeTempObject(REG_EBX,&resultType.GetClass());
         }
         return;
@@ -122 +121 @@
 
 void OpcodeIf(char *Parameter){
-    int i,i2,i3,i4,type;
+    int i,i2,i3,i4;
+    Type tempType;
 
     for(i=0;;i++){
@@ -135 +135 @@
     }
 
-    type=NumOpe(Parameter,0,0,0);
-
-    if(type==-1){
+    if( !NumOpe(Parameter,Type(),tempType) ){
         //NumOpe内でエラー
         i3=-1;  //ダミー
     }
-    else if(type==DEF_DOUBLE){
+    else if( tempType.IsDouble() ){
         //fld qword ptr[esp]
         op_fld_ptr_esp(DEF_DOUBLE);
@@ -175 +173 @@
         i3=obp;
     }
-    else if(type==DEF_SINGLE){
+    else if( tempType.IsSingle() ){
         //fld dword ptr[esp]
         op_fld_ptr_esp(DEF_SINGLE);
@@ -209 +207 @@
         i3=obp;
     }
-    else if(type==DEF_INT64||type==DEF_QWORD){
+    else if( tempType.Is64() ){
         //64ビット型
 
@@ -383 +381 @@
 void OpcodeWhile(char *Parameter){
     extern HANDLE hHeap;
-    int i2,i3,type;
+    int i2,i3 = 0;
 
     //Continueアドレスのバックアップとセット
@@ -392 +390 @@
 
     if(!Parameter[0]) SetError(10,"While",cp);
-    type=NumOpe(Parameter,0,0,0);
 
     int je_schedule;
-    if(type==DEF_DOUBLE){
+    Type tempType;
+    if( !NumOpe(Parameter,Type(),tempType) ){
+        //ダミー
+        i3=-1;
+    }
+    else if( tempType.IsDouble() ){
         //fld qword ptr[esp]
         op_fld_ptr_esp(DEF_DOUBLE);
@@ -429 +431 @@
         je_schedule=obp;
     }
-    else if(type==DEF_SINGLE){
+    else if( tempType.IsSingle() ){
         //fld dword ptr[esp]
         op_fld_ptr_esp(DEF_SINGLE);
@@ -463 +465 @@
         je_schedule=obp;
     }
-    else if(type==DEF_INT64||type==DEF_QWORD){
+    else if( tempType.Is64() ){
         //64ビット型
 
@@ -533 +535 @@
 
     obj_LexScopes.CallDestructorsOfScopeEnd();
+
+    if( i3 == -1 ){
+        return;
+    }
 
     //jmp ...
@@ -605 +611 @@
     //増加か減少かを区別する
     sprintf(temporary,"(%s)>=0",StepNum);
-    NumOpe(temporary,0,0,0);
+    NumOpe(temporary,Type(),Type());
 
     //pop eax
@@ -623 +629 @@
     //判定（カウンタ増加の場合）
     sprintf(temporary,"%s<=(%s)",variable,JudgeNum);
-    NumOpe(temporary,0,0,0);
+    NumOpe(temporary,Type(),Type());
 
     //pop eax
@@ -637 +643 @@
     //判定（カウンタ減少の場合）
     sprintf(temporary,"%s>=(%s)",variable,JudgeNum);
-    NumOpe(temporary,0,0,0);
+    NumOpe(temporary,Type(),Type());
 
     //pop eax
@@ -687 +693 @@
 void OpcodeDo(char *Parameter){
     extern HANDLE hHeap;
-    int i,i2,i3,i4,type;
+    int i,i2,i3,i4;
 
     if(Parameter[0]) SetError(10,"Do",cp);
@@ -724 +730 @@
             }
 
-            type=NumOpe(temporary,0,0,0);
-
-            if(type==DEF_DOUBLE){
+            Type tempType;
+            NumOpe(temporary,Type(),tempType);
+
+            if( tempType.IsDouble() ){
                 //fld qword ptr[esp]
                 op_fld_ptr_esp(DEF_DOUBLE);
@@ -767 +774 @@
                 }
             }
-            else if(type==DEF_SINGLE){
+            else if( tempType.IsSingle() ){
                 //fld dword ptr[esp]
                 op_fld_ptr_esp(DEF_SINGLE);
@@ -808 +815 @@
                 }
             }
-            else if(type==DEF_INT64||type==DEF_QWORD){
+            else if( tempType.Is64() ){
                 //64ビット型
 
@@ -933 +940 @@
     extern HANDLE hHeap;
 
-    extern BOOL bCompilingGlobal;
-    if(bCompilingGlobal){
+    if( UserProc::IsGlobalAreaCompiling() ){
         SetError(12,"Exit Sub/Function",cp);
         return;
@@ -963 +969 @@
 
 int CaseTypeSize;
-void OpcodeSelect(const char *lpszParams){
+void OpcodeSelect(const char *lpszParms){
     extern DWORD *pCaseSchedule;
     extern int CaseScheduleNum;
@@ -970 +976 @@
     extern HANDLE hHeap;
     extern char *basbuf;
-    int i,i2,i3,sw,type1,type2,NowCaseCp;
+    int i,i2,i3,sw,NowCaseCp;
     char temporary[VN_SIZE];
 
@@ -986 +992 @@
     NowCaseSchedule=0;
 
-    LONG_PTR lpIndex;
-    type1=NumOpe(lpszParams,0,0,&lpIndex);
-    if(type1==DEF_INTEGER||
-        type1==DEF_WORD||
-        type1==DEF_SBYTE||
-        type1==DEF_BYTE||
-        type1==DEF_BOOLEAN||
-        type1==DEF_CHAR) CaseTypeSize=sizeof(long);
-    else{
-        CaseTypeSize=GetTypeSize(type1,lpIndex);
-        if(type1==DEF_OBJECT) CaseTypeSize=PTR_SIZE;
+    Type type1;
+    if( !NumOpe(lpszParms,Type(), type1 ) ){
+        return;
+    }
+
+    CaseTypeSize = type1.GetSize();
+    if( CaseTypeSize < sizeof(long) ){
+        CaseTypeSize=sizeof(long);
     }
 
@@ -1067 +1070 @@
                 cp=NowCaseCp;
 
-                LONG_PTR lpIndex2;
-                type2=NumOpe(temporary,type1,lpIndex,&lpIndex2);
+                Type type2;
+                if( !NumOpe(temporary,type1,type2) ){
+                    return;
+                }
 
                 cp=i2;
 
-                if(type1==DEF_OBJECT){
-                    CClass *pobj_c;
-                    pobj_c=(CClass *)lpIndex;
-
+                if(type1.IsObject()){
                     std::vector<UserProc *> subs;
-                    pobj_c->EnumMethod( CALC_EQUAL, subs );
+                    type1.GetClass().EnumMethod( CALC_EQUAL, subs );
                     if( subs.size() == 0 ){
                         return;
@@ -1083 +1085 @@
 
                     Parameters params;
-                    params.push_back( new Parameter( "", Type( type2, lpIndex2 ) ) );
+                    params.push_back( new Parameter( "", Type( type2 ) ) );
 
                     //オーバーロードを解決
@@ -1121 +1123 @@
                     obp+=sizeof(long);
                 }
-                else if(type1==DEF_DOUBLE){
-                    ChangeTypeToDouble(type2);
+                else if(type1.IsDouble()){
+                    ChangeTypeToDouble(type2.GetBasicType());
 
                     //fld qword ptr[esp]
@@ -1152 +1154 @@
                     obp+=sizeof(long);
                 }
-                else if(type1==DEF_SINGLE){
-                    ChangeTypeToSingle(type2);
+                else if(type1.IsSingle()){
+                    ChangeTypeToSingle(type2.GetBasicType());
 
                     //fld dword ptr[esp]
@@ -1314 +1316 @@
 }
 void OpcodeReturn(char *Parameter){
-    extern BOOL bCompilingGlobal;
-    if(bCompilingGlobal){
+    if( UserProc::IsGlobalAreaCompiling() ){
         //Gosub～Returnとして扱う
 
@@ -1324 +1325 @@
         //戻り値をセット
         if(Parameter[0]){
-            extern UserProc *pCompilingUserProc;
+            UserProc &proc = UserProc::CompilingUserProc();
+
             const char *temp = "_System_ReturnValue";
-            if(pCompilingUserProc->GetName()[0]==1&&pCompilingUserProc->GetName()[1]==ESC_OPERATOR)
+            if(proc.GetName()[0]==1&&proc.GetName()[1]==ESC_OPERATOR)
             {
             }
-            else temp=pCompilingUserProc->GetName().c_str();
+            else{
+                temp=proc.GetName().c_str();
+            }
 
             char temporary[VN_SIZE];
@@ -1341 +1345 @@
 }
 
-void Opcode_Input(const char *Parameter){
-    extern int cp;
-    int i2,i3,i4,i5,type;
-    BOOL bFile;
-    char temporary[VN_SIZE],temp2[VN_SIZE],buffer[VN_SIZE];
-
-    if(Parameter[0]=='#'){
-        bFile=1;
-        for(i2=0,i3=1;;i2++,i3++){
-            buffer[i2]=Parameter[i3];
-            if(Parameter[i3]==','||Parameter[i3]=='\0') break;
-        }
-        buffer[i2+1]=0;
-        i2=i3+1;
-    }
-    else{
-        bFile=0;
-        i2=0;
-        buffer[0]=0;
-
-        //表示用文字列パラメータをセット
-        if(Parameter[0]=='\"'){
-            buffer[0]='\"';
-            for(i2=1;;i2++){
-                if(Parameter[i2]=='\"'){
-                    buffer[i2]=0;
-                    break;
-                }
-                buffer[i2]=Parameter[i2];
-            }
-            if(Parameter[i2+1]==';') lstrcpy(buffer+i2,"? \"");
-            else if(Parameter[i2+1]==',') lstrcpy(buffer+i2,"\"");
-            else SetError(10,"Input",cp);
-            i2+=2;
-        }
-        else if((Parameter[0]=='e'||Parameter[0]=='E')&&
-            (Parameter[1]=='x'||Parameter[1]=='X')&&
-            Parameter[2]=='\"'){
-            memcpy(buffer,Parameter,3);
-            for(i2=3;;i2++){
-                if(Parameter[i2]=='\"'){
-                    buffer[i2]=0;
-                    break;
-                }
-                buffer[i2]=Parameter[i2];
-            }
-            if(Parameter[i2+1]==';') lstrcpy(buffer+i2,"? \"");
-            else if(Parameter[i2+1]==',') lstrcpy(buffer+i2,"\"");
-            else SetError(10,"Input",cp);
-            i2+=2;
-        }
-        else{
-            lstrcpy(buffer,"\"? \"");
-            i2=0;
-        }
-    }
-
-    //変数ポインタ、変数のタイプをセット
-    i4=0;
-    while(1){
-        for(i3=0;;i2++,i3++){
-            if(Parameter[i2]=='('){
-                i5=GetStringInPare(temporary+i3,Parameter+i2);
-                i2+=i5-1;
-                i3+=i5-1;
-            }
-            if(Parameter[i2]=='['){
-                i5=GetStringInBracket(temporary+i3,Parameter+i2);
-                i2+=i5-1;
-                i3+=i5-1;
-            }
-            if(Parameter[i2]==','){
-                temporary[i3]=0;
-                i2++;
-                break;
-            }
-            temporary[i3]=Parameter[i2];
-            if(Parameter[i2]=='\0') break;
-        }
-        if(temporary[0]=='\0'){
-            SetError(10,"Input",cp);
-            return;
-        }
-
-        LONG_PTR lpIndex;
-        type = GetVarType(temporary,&lpIndex,1);
-
-        sprintf(temp2,"_System_InputDataPtr[%d]=VarPtr(%s)",i4,temporary);
-        OpcodeCalc(temp2);
-
-        if(type==DEF_LONG) type=DEF_DWORD;
-        else if(type==DEF_INTEGER) type=DEF_WORD;
-        else if(type==DEF_OBJECT){
-            CClass *pobj_Class=(CClass *)lpIndex;
-            if(lstrcmp(pobj_Class->name,"String")==0) type=DEF_STRING;
-        }
-        sprintf(temp2,"_System_InputDataType[%d]=%d",i4,type);
-        OpcodeCalc(temp2);
-
-        i4++;
-        if(Parameter[i2]=='\0') break;
-    }
-    sprintf(temp2,"_System_InputDataPtr[%d]=0",i4);
-    OpcodeCalc(temp2);
-
-    UserProc *pUserProc;
-    if(bFile) pUserProc=GetSubHash("INPUT_FromFile");
-    else pUserProc=GetSubHash("INPUT_FromPrompt");
-    if(!pUserProc){
-        SetError(3,"Input",cp);
-        return;
-    }
-    Opcode_CallProc(buffer,pUserProc,0,"",0);
-}
-void Opcode_PrintUsing(const char *Parameter,char *buffer,BOOL bFile){
-    extern int cp;
-    int i2,i3,i4,i5;
-    char temporary[VN_SIZE],temp2[8192];
-    BOOL bReturnLine;
-
-    char parms[8192];
-    lstrcpy( parms, Parameter );
-
-    i2=lstrlen(parms);
-    if(parms[i2-1]==';'){
-        bReturnLine=0;
-        parms[i2-1]=0;
-    }
-    else bReturnLine=1;
-
-    i3=lstrlen(buffer);
-    for(i2=0;;i2++,i3++){
-        if(parms[i2]==';'){
-            buffer[i3]=0;
-            break;
-        }
-        buffer[i3]=parms[i2];
-        if(parms[i2]=='\0') break;
-    }
-    if(parms[i2]==';') i2++;
-
-    if(bReturnLine) lstrcat(buffer,"+Ex\"\\r\\n\"");
-
-    //データポインタ、データのタイプをセット
-    i4=0;
-    while(1){
-        for(i3=0;;i2++,i3++){
-            if(parms[i2]=='\"'){
-                temporary[i3]=parms[i2];
-                for(i2++,i3++;;i2++,i3++){
-                    temporary[i3]=parms[i2];
-                    if(parms[i2]=='\"') break;
-                }
-                continue;
-            }
-            if(parms[i2]=='('){
-                i5=GetStringInPare(temporary+i3,parms+i2);
-                i2+=i5-1;
-                i3+=i5-1;
-                continue;
-            }
-            if(parms[i2]=='['){
-                i5=GetStringInBracket(temporary+i3,parms+i2);
-                i2+=i5-1;
-                i3+=i5-1;
-                continue;
-            }
-            if(parms[i2]==','){
-                temporary[i3]=0;
-                i2++;
-                break;
-            }
-            temporary[i3]=parms[i2];
-            if(parms[i2]=='\0') break;
-        }
-        if(temporary[0]=='\0'){
-            SetError(10,"Print",cp);
-            return;
-        }
-
-        int iResult;
-        iResult=IsStrCalculation(temporary);
-
-        if(iResult==1){
-            //文字列
-            sprintf(temp2,"_System_UsingStrData[%d]=%s",i4,temporary);
-            OpcodeCalc(temp2);
-
-            sprintf(temp2,"_System_UsingDataType[%d]=%d",i4,DEF_STRING);
-            OpcodeCalc(temp2);
-        }
-        else if(iResult==0){
-            //数値
-            sprintf(temp2,"_System_UsingDblData[%d]=%s",i4,temporary);
-            OpcodeCalc(temp2);
-
-            sprintf(temp2,"_System_UsingDataType[%d]=%d",i4,DEF_DOUBLE);
-            OpcodeCalc(temp2);
-        }
-        //else if(iResult==-1) エラー
-
-        i4++;
-        if(parms[i2]=='\0') break;
-    }
-    sprintf(temp2,"_System_UsingDataType[%d]=-1",i4);
-    OpcodeCalc(temp2);
-
-    UserProc *pUserProc;
-    if(bFile) pUserProc=GetSubHash("PRINTUSING_ToFile");
-    else pUserProc=GetSubHash("PRINTUSING_ToPrompt");
-    if(!pUserProc){
-        SetError(3,"Print",cp);
-        return;
-    }
-    Opcode_CallProc(buffer,pUserProc,0,"",0);
-}
-void Opcode_Print(const char *Parameter,BOOL bWrite){
-    int i2,i3,i4,sw;
-    char temporary[VN_SIZE],buffer[VN_SIZE];
-    BOOL bFile;
-
-    if(Parameter[0]=='#'){
-        bFile=1;
-        for(i2=0,i3=1;;i2++,i3++){
-            buffer[i2]=Parameter[i3];
-            if(Parameter[i3]==','||Parameter[i3]=='\0') break;
-        }
-        buffer[i2+1]=0;
-        if(Parameter[i3]==',') i3++;
-        i2=i3;
-    }
-    else{
-        bFile=0;
-        i2=0;
-        buffer[0]=0;
-    }
-    if(Parameter[i2]==1&&Parameter[i2+1]==ESC_USING){
-        Opcode_PrintUsing(Parameter+i2+2,buffer,bFile);
-        return;
-    }
-
-    lstrcat(buffer,"_System_DummyStr+");
-
-    sw=1;
-    while(1){
-        for(i3=0;;i2++,i3++){
-            if(Parameter[i2]=='\"'){
-                temporary[i3]=Parameter[i2];
-                for(i2++,i3++;;i2++,i3++){
-                    temporary[i3]=Parameter[i2];
-                    if(Parameter[i2]=='\"') break;
-                }
-                continue;
-            }
-            if(Parameter[i2]=='('){
-                i4=GetStringInPare(temporary+i3,Parameter+i2);
-                i2+=i4-1;
-                i3+=i4-1;
-                continue;
-            }
-            if(Parameter[i2]=='['){
-                i4=GetStringInBracket(temporary+i3,Parameter+i2);
-                i2+=i4-1;
-                i3+=i4-1;
-                continue;
-            }
-            if(Parameter[i2]==','||Parameter[i2]==';'){
-                temporary[i3]=0;
-                break;
-            }
-            temporary[i3]=Parameter[i2];
-            if(Parameter[i2]=='\0') break;
-        }
-
-        if(temporary[0]=='\0') lstrcat(buffer,"\"\"");
-        else{
-            int iResult;
-            iResult=IsStrCalculation(temporary);
-            if(iResult==-1){
-                //エラー
-                lstrcat(buffer,"\"\"");
-            }
-            else if(iResult){
-                //文字列
-                lstrcat(buffer,temporary);
-            }
-            else{
-                //数値
-                sprintf(buffer+lstrlen(buffer),"Str$(%s)",temporary);
-            }
-        }
-
-        if(Parameter[i2]==','){
-            if(bWrite) lstrcat(buffer,"+\",\"+");
-            else lstrcat(buffer,"+\"\t\"+");
-        }
-        else if(Parameter[i2]==';'){
-            if(Parameter[i2+1]=='\0'){
-                sw=0;
-                break;
-            }
-            if(bWrite) lstrcat(buffer,"+\",\"+");
-            else lstrcat(buffer,"+\" \"+");
-        }
-        else if(Parameter[i2]=='\0') break;
-
-        i2++;
-    }
-
-    if(sw) lstrcat(buffer,"+Ex\"\\r\\n\"");
-
-    UserProc *pUserProc;
-    if(bFile) pUserProc=GetSubHash("PRINT_ToFile");
-    else pUserProc=GetSubHash("PRINT_ToPrompt");
-    if(!pUserProc){
-        SetError(3,"Print",cp);
-        return;
-    }
-    Opcode_CallProc(buffer,pUserProc,0,"",0);
-}
-
-
-
 
 ////////////
 // ポインタ
 
-void OpcodeCallPtr(char *Parameter){
-    extern HANDLE hHeap;
-    int i,i2,i3,num,types[255];
-    BOOL bCdecl;
-    char szFuncPtr[VN_SIZE],temporary[VN_SIZE],*Parms[255];
-
-    //関数ポインタを取得
-    i=GetOneParameter(Parameter,0,szFuncPtr);
-
-    if(lstrcmpi(szFuncPtr,"cdecl")==0){
-        //cdeclが指定された場合は、第2パラメータを関数ポインタとして扱う
-        bCdecl=1;
-
-        i=GetOneParameter(Parameter,i,szFuncPtr);
-    }
-    else bCdecl=0;
-
-    if(Parameter[0]=='\0'){
-        SetError(10,"CallPtr",cp);
-    }
-
-    num=0;
-    while(Parameter[i]){
-        i=GetOneParameter(Parameter,i,temporary);
-
-        types[num]=DEF_LONG;
-
-        for(i2=0;;i2++){
-            if(temporary[i2]=='\0') break;
-            if(temporary[i2]==1&&temporary[i2+1]==ESC_AS){
-                LONG_PTR lp;
-                types[num]=GetTypeFixed(temporary+i2+2,&lp);
-
-                if(types[num]==DEF_OBJECT){
-                    SetError(11,temporary+i2+2,cp);
-                }
-
-                temporary[i2]=0;
-                break;
-            }
-        }
-
-        Parms[num]=(char *)HeapAlloc(hHeap,0,lstrlen(temporary)+1);
-        lstrcpy(Parms[num],temporary);
-
-        num++;
-    }
-
-    int ParmSize=0;
-
-    for(i=num-1;i>=0;i--){
-        //スタックへプッシュ
-        i3=NumOpe(Parms[i],0,0,0);
-
-        switch(types[i]){
-            case DEF_INT64:
-            case DEF_QWORD:
-                ChangeTypeToInt64(i3);
-                break;
-            case DEF_SINGLE:
-                ChangeTypeToSingle(i3);
-                break;
-            case DEF_DOUBLE:
-                ChangeTypeToDouble(i3);
-                break;
-
-            default:
-                ChangeTypeToLong(i3);
-                break;
-        }
-
-        ParmSize+=GetTypeSize(types[i],0);
-
-        HeapDefaultFree(Parms[i]);
-    }
-
-    i3=NumOpe(szFuncPtr,0,0,0);
-    ChangeTypeToLong(i3);
-
-    //pop eax
-    op_pop(REG_EAX);
-
-    //call eax
-    OpBuffer[obp++]=(char)0xFF;
-    OpBuffer[obp++]=(char)0xD0;
-
-    if(bCdecl){
-        //スタックを戻す
-
-        //add esp,ParmSize
-        op_add_esp(ParmSize);
-    }
-}
-
 void OpcodeSetPtrData(char *Parameter,int type){
-    int i,i2;
+    int i;
     char temporary[VN_SIZE];
 
@@ -1784 +1371 @@
     }
 
-    i2=NumOpe(temporary,0,0,0);
-    ChangeTypeToLong(i2);
+    Type resultType;
+    if( !NumOpe(temporary,Type(),resultType) ){
+        return;
+    }
+    if(!resultType.IsWhole()){
+        SetError(11,Parameter,cp);
+        return;
+    }
+
+    ChangeTypeToLong( resultType.GetBasicType() );
 
     //第２パラメータを取得
@@ -1794 +1389 @@
     }
 
-    i2=NumOpe(temporary,0,0,0);
+    if( !NumOpe(temporary,Type(),resultType) ){
+        return;
+    }
+
     if(type==DEF_DOUBLE){
-        ChangeTypeToDouble_ToFpuReg(i2);
+        ChangeTypeToDouble_ToFpuReg( resultType.GetBasicType() );
 
         //pop eax
@@ -1806 +1404 @@
     }
     else if(type==DEF_SINGLE){
-        ChangeTypeToSingle(i2);
+        ChangeTypeToSingle( resultType.GetBasicType() );
 
         //pop ebx
@@ -1819 +1417 @@
     }
     else if(type==DEF_QWORD){
-        ChangeTypeToInt64(i2);
+        ChangeTypeToInt64( resultType.GetBasicType() );
 
         //pop ecx
@@ -1840 +1438 @@
     }
     else if(type==DEF_DWORD){
-        ChangeTypeToLong(i2);
+        ChangeTypeToLong( resultType.GetBasicType() );
 
         //pop ebx
@@ -1853 +1451 @@
     }
     else if(type==DEF_WORD){
-        ChangeTypeToLong(i2);
+        ChangeTypeToLong( resultType.GetBasicType() );
 
         //pop ebx
@@ -1867 +1465 @@
     }
     else if(type==DEF_BYTE){
-        ChangeTypeToLong(i2);
+        ChangeTypeToLong( resultType.GetBasicType() );
 
         //pop ebx

BasicCompiler32/Compile_Var.cpp

@@ -3 +3 @@
 
 //変数
-VARIABLE *GlobalVar;
-int MaxGlobalVarNum;
+Variables globalVars;
 int AllGlobalVarSize;
 int AllInitGlobalVarSize;
-VARIABLE *LocalVar;
-int MaxLocalVarNum;
+
 int AllLocalVarSize;
+
 
 void SetRelativeOffset( Type &resultType, RELATIVE_VAR *pRelativeVar,const char *lpPtrOffset){
@@ -351 +350 @@
     //自身のオブジェクトのThisポインタをregにコピー
 
-    extern VARIABLE *LocalVar;
     RELATIVE_VAR RelativeVar;
     RelativeVar.dwKind=VAR_LOCAL;
@@ -466 +464 @@
         }
 
-        if(_memicmp(variable,"This.",5)==0){
+        if(memicmp(variable,"This.",5)==0){
             //Thisオブジェクトのメンバを参照するとき
             SlideString(variable+5,-5);

BasicCompiler32/MakePeHdr.cpp

@@ -150 +150 @@
 
     //関数ポインタ情報を初期化
-    extern ProcPointer **ppProcPtrInfo;
+    extern ProcPointer **ppProcPointer;
     extern int ProcPtrInfoNum;
-    ppProcPtrInfo=(ProcPointer **)HeapAlloc(hHeap,0,1);
+    ppProcPointer=(ProcPointer **)HeapAlloc(hHeap,0,1);
     ProcPtrInfoNum=0;
 
@@ -309 +309 @@
 
 
+    /////////////////////////////////////////////////////////////////
+    // デバッグコンパイル用のログを生成する
+    /////////////////////////////////////////////////////////////////
+#ifdef _DEBUG
+    {
+        ofstream ofs("middle_code.txt");
+        ofs << basbuf << endl;
+        ofs.close();
+    }
+#endif
+
 
     //////////////////////
@@ -315 +326 @@
 
     cp=-1;
-    extern BOOL bCompilingGlobal;
-    bCompilingGlobal=1;
-    pobj_CompilingClass=0;
+    UserProc::CompileStartForGlobalArea();
 
     if(!bDll){
@@ -434 +443 @@
     // ローカル実行領域
     /////////////////////
-
-    bCompilingGlobal=0;
 
     //プロシージャをコンパイル開始
@@ -736 +743 @@
     //グローバル変数情報を扱う構造体も初期バッファの有無による配置を行う
     //（デバッグ情報で利用される）
-    extern int MaxGlobalVarNum;
-    extern VARIABLE *GlobalVar;
     extern int AllInitGlobalVarSize;
-    for(i=0;i<MaxGlobalVarNum;i++){
-        if(GlobalVar[i].offset&0x80000000){
-            GlobalVar[i].offset=(GlobalVar[i].offset&0x7FFFFFFF)+AllInitGlobalVarSize;
+    foreach( Variable *pVar, globalVars ){
+        if(pVar->offset&0x80000000){
+            pVar->offset=(pVar->offset&0x7FFFFFFF)+AllInitGlobalVarSize;
         }
     }

BasicCompiler32/NumOpe.cpp

@@ -67 +67 @@
 }
 
-void NewStringObject(LPSTR lpszText){
+void NewStringObject( const char *str ){
     ///////////////////////////////////////////////////////
     // lpszTextを元にStringオブジェクトを生成し、
@@ -73 +73 @@
     ///////////////////////////////////////////////////////
 
-    char *parameter = (char *)malloc( lstrlen( lpszText ) + 32 );
-    sprintf( parameter, "\"%s\"%c%c*Char", lpszText, 1, ESC_AS );
+    char *parameter = (char *)malloc( lstrlen( str ) + 32 );
+    sprintf( parameter, "\"%s\"%c%c*Char", str, 1, ESC_AS );
     SetStringQuotes( parameter );
 
     extern CClass *pobj_StringClass;
-    Type baseTypeInfo = { DEF_OBJECT, (LONG_PTR)pobj_StringClass };
-    Operator_New( *pobj_StringClass, "", parameter, baseTypeInfo );
+    Operator_New( *pobj_StringClass, "", parameter, Type( DEF_OBJECT, *pobj_StringClass ) );
 
     free( parameter );
@@ -85 +84 @@
 
 
-int NumOpe(const char *Command,int BaseType,LONG_PTR lpBaseIndex,LONG_PTR *plpIndex,BOOL *pbUseHeap){
-    extern HANDLE hHeap;
+bool NumOpe( const char *expression,
+            const Type &baseType,
+            Type &resultType,
+            BOOL *pbUseHeap ){
+
     int i,i2,i3,i4;
-    char temporary[8192],temp2[1024],temp3[1024];
-
-    if(Command[0]=='\0'){
+    char temporary[1024],temp2[1024],temp3[1024];
+
+    if(expression[0]=='\0'){
         SetError(1,NULL,cp);
-        return -1;
-    }
-
-    if(Command[0]==1&& Command[1]==ESC_NEW ){
+        return false;
+    }
+
+    if(expression[0]==1&& expression[1]==ESC_NEW ){
         //New演算子（オブジェクト生成）
-        Type baseTypeInfo = { BaseType, lpBaseIndex };
-        int resultType = Operator_New(Command+2,plpIndex, baseTypeInfo );
-
-        return resultType;
+
+        if( !Operator_New( expression+2, baseType, resultType ) ){
+            return false;
+        }
+
+        return true;
     }
 
@@ -112 +116 @@
     long stack[255];
     int pnum;
-    if(!GetNumOpeElements(Command,&pnum,values,calc,stack)){
+    if(!GetNumOpeElements(expression,&pnum,values,calc,stack)){
         for(i=0;i<pnum;i++){
             if(values[i]) HeapDefaultFree(values[i]);
         }
-        return 0;
+        return false;
     }
 
@@ -146 +150 @@
     double dbl;
     int sp;
-    int type[255];
+    int type_stack[255];
     LONG_PTR index_stack[255];
     BOOL bUseHeap[255];
@@ -155 +159 @@
 
         if(idCalc){
-            if(type[sp-2]==DEF_OBJECT){
+            if(type_stack[sp-2]==DEF_OBJECT){
                 //オーバーロードされたオペレータを呼び出す
-                Type BaseTypeInfo={BaseType,lpBaseIndex};
-                i2=CallOperatorProc(idCalc,&BaseTypeInfo,type,index_stack,bUseHeap,sp);
+                i2=CallOperatorProc(idCalc,baseType,type_stack,index_stack,bUseHeap,sp);
                 if(i2==0){
                     if(idCalc==CALC_EQUAL) lstrcpy(temp2,"==");
@@ -171 +174 @@
             }
 
-            if(!CheckCalcType(idCalc,type,sp)) goto error;
+            if(!CheckCalcType(idCalc,type_stack,sp)) goto error;
         }
 
@@ -192 +195 @@
 StrLiteral:
 
-                    if(BaseType==DEF_OBJECT){
-                        CClass *pobj_Class;
-                        pobj_Class=(CClass *)lpBaseIndex;
-                        Type BaseTypeInfo = {BaseType,lpBaseIndex};
-                        if(IsStringObjectType(BaseTypeInfo)){
-                            //要求タイプがオブジェクトであり、Stringの受け入れが可能な場合
+                    if( baseType.IsObject() ){
+                        if( baseType.IsStringObject() ){
+                            //要求タイプがStringのとき
 
                             //String型オブジェクトを生成
@@ -203 +203 @@
 
                             extern CClass *pobj_StringClass;
-                            type[sp]=DEF_OBJECT;
+                            type_stack[sp]=DEF_OBJECT;
                             index_stack[sp]=(LONG_PTR)pobj_StringClass;
                             bLiteralCalculation=0;
@@ -213 +213 @@
 
 
-                    type[sp]=typeOfPtrChar;
-                    index_stack[sp]=LITERAL_STRING;
+                    type_stack[sp]=typeOfPtrChar;
                     bLiteralCalculation=0;
 
@@ -252 +251 @@
                         i4=GetStringInPare_RemovePare(temp2,term+i2+1);
 
-                        int idProc;
                         void *pInfo;
-                        idProc=GetProc(temporary,&pInfo);
-
+                        int idProc=GetProc(temporary,(void **)&pInfo);
+
+                        Type resultType;
                         if(idProc){
                             //閉じカッコ")"に続く文字がNULLでないとき
@@ -272 +271 @@
                             ////////////////
 
-                            i2=CallProc(idProc,pInfo,temporary,temp2,&index_stack[sp]);
-                            if(i2==-1){
+                            CallProc(idProc,pInfo,temporary,temp2,resultType);
+                            if(resultType.IsNull()){
                                 //戻り値が存在しないとき
                                 for(i2=2;;i2++){
@@ -292 +291 @@
 
                             //大きな型への暗黙の変換
-                            type[sp]=AutoBigCast(BaseType,i2);
+                            type_stack[sp]=AutoBigCast(baseType.GetBasicType(),resultType.GetBasicType());
+                            index_stack[sp] = resultType.GetIndex();
                             bLiteralCalculation=0;
 
                             //スタックへプッシュ
-                            PushReturnValue(i2);
-
-                            if(Is64Type(type[sp])&&IsWholeNumberType(i2)&&GetTypeSize(i2,-1)<=sizeof(long)){
-                                //必要に応じて64ビット拡張
-                                ExtendStackTo64(i2);
+                            PushReturnValue( resultType.GetBasicType() );
+
+                            if( Is64Type(type_stack[sp])
+                                && resultType.IsWhole()
+                                && resultType.GetBasicSize() <= sizeof(long) ){
+                                    //必要に応じて64ビット拡張
+                                    ExtendStackTo64( resultType.GetBasicType() );
                             }
 
-                            if(i2==DEF_STRUCT){
+                            if( resultType.IsStruct() ){
                                 //構造体が戻ったときはヒープ領域にインスタンスが格納されている
                                 //※後にfreeする必要あり
@@ -321 +323 @@
 
                             //マクロ関数の場合
-                            type[sp]=NumOpe(temp3,0,0,&index_stack[sp]);
-
-                            if(!IS_LITERAL(index_stack[sp])){
+                            NumOpe(temp3,Type(),resultType);
+
+                            if(!IS_LITERAL(resultType.GetIndex())){
                                 //リテラル値ではなかったとき
                                 bLiteralCalculation=0;
                             }
 
+                            type_stack[sp] = resultType.GetBasicType();
+                            index_stack[sp] = resultType.GetIndex();
+
                             sp++;
                             break;
@@ -335 +340 @@
 
 
-
+                    //インデクサ（getアクセサ）
                     char variable[VN_SIZE],array_element[VN_SIZE];
-                    CClass *pobj_c;
                     GetArrayElement(term,variable,array_element);
                     if(array_element[0]){
-                        i2=GetVarType(variable,(LONG_PTR *)&pobj_c,0);
-                        if(i2==DEF_OBJECT){
-                            Type RetTypeInfo;
-                            CallIndexerGetterProc(pobj_c,variable,array_element,RetTypeInfo);
-                            type[sp]=RetTypeInfo.type;
-                            index_stack[sp]=RetTypeInfo.u.lpIndex;
+                        Type resultType;
+                        GetVarType(variable,resultType,0);
+                        if( resultType.IsObject() ){
+                            CallIndexerGetterProc(&resultType.GetClass(),variable,array_element,resultType);
+                            type_stack[sp]=resultType.GetBasicType();
+                            index_stack[sp]=resultType.GetIndex();
                             bLiteralCalculation=0;
 
@@ -359 +363 @@
                     // Nothing
                     if( lstrcmp( term, "Nothing" ) == 0 ){
-                        type[sp] = DEF_OBJECT;
-                        if( BaseType == DEF_OBJECT ){
-                            index_stack[sp] = lpBaseIndex;
+                        type_stack[sp] = DEF_OBJECT;
+                        if( baseType.IsObject() ){
+                            index_stack[sp] = baseType.GetIndex();
                         }
                         else{
@@ -377 +381 @@
 
 
+                    if( (string)term=="value"){
+                        int test=0;
+                    }
+
 
                     RELATIVE_VAR RelativeVar;
+                    Type varType;
                     if(GetVarOffset(
                         false,  //エラー表示あり
                         false,  //読み込み専用
-                        term,&i2,&RelativeVar,&index_stack[sp])){
+                        term,
+                        &RelativeVar,varType)){
                         //////////
                         // 変数
@@ -388 +398 @@
 
                         //大きな型への暗黙の変換
-                        type[sp]=AutoBigCast(BaseType,i2);
+                        type_stack[sp]=AutoBigCast(baseType.GetBasicType(),varType.GetBasicType());
+                        index_stack[sp] = varType.GetIndex();
                         bLiteralCalculation=0;
 
-                        if(i2&FLAG_PTR){
+                        if(varType.GetBasicType()&FLAG_PTR){
                             //配列ポインタ
-                            type[sp]=GetPtrType(i2^FLAG_PTR,index_stack[sp]);
+                            type_stack[sp]=GetPtrType(varType.GetBasicType()^FLAG_PTR);
 
                             SetVarPtrToEax(&RelativeVar);
@@ -400 +411 @@
                             op_push(REG_EAX);
                         }
-                        else if(i2==DEF_DOUBLE||
-                            i2==DEF_INT64||
-                            i2==DEF_QWORD){
+                        else if( varType.IsStruct() ){
+                            //構造体ポインタをeaxへ格納（構造体は値型）
+                            SetVarPtrToEax(&RelativeVar);
+
+                            //push eax
+                            op_push(REG_EAX);
+                        }
+                        else if( varType.GetBasicSize() == sizeof(_int64) ){
                             //64ビット型
                             PushDoubleVariable(&RelativeVar);
                         }
-                        else if(i2==DEF_LONG||i2==DEF_DWORD||i2==DEF_SINGLE||
-                            IsPtrType(i2) || i2==DEF_OBJECT){
+                        else if( varType.GetBasicSize() == sizeof(long) ){
                             //32ビット型
                             PushLongVariable(&RelativeVar);
                         }
-                        else if(i2==DEF_INTEGER || (isUnicode&&i2==DEF_CHAR)){
+                        else if( varType.IsInteger() ){
                             PushIntegerVariable(&RelativeVar);
                         }
-                        else if(i2==DEF_WORD){
+                        else if( varType.IsWord() ){
                             PushWordVariable(&RelativeVar);
                         }
-                        else if(i2==DEF_SBYTE || (isUnicode==false&&i2==DEF_CHAR)){
+                        else if( varType.IsSByte() ){
                             PushCharVariable(&RelativeVar);
                         }
-                        else if(i2==DEF_BYTE||i2==DEF_BOOLEAN){
+                        else if( varType.IsByte() || varType.IsBoolean() ){
                             PushByteVariable(&RelativeVar);
                         }
-                        else if(i2==DEF_STRUCT){
-                            //構造体ポインタをeaxへ格納（構造体は値型）
-                            SetVarPtrToEax(&RelativeVar);
-
-                            //push eax
-                            op_push(REG_EAX);
-                        }
                         else SetError(11,term,cp);
 
-                        if(Is64Type(type[sp])&&IsWholeNumberType(i2)&&GetTypeSize(i2,-1)<=sizeof(long)){
+                        if( Is64Type(type_stack[sp])
+                            && varType.IsWhole()
+                            && varType.GetBasicSize()<=sizeof(long)){
                             //必要に応じて64ビット拡張
-                            ExtendStackTo64(i2);
+                                ExtendStackTo64( varType.GetBasicType() );
                         }
 
@@ -448 +458 @@
                     i3 = CDBConst::obj.GetType(term);
                     if(i3){
-                        type[sp]=i3;
+                        type_stack[sp]=i3;
                         if(IsRealNumberType(i3)){
                             //実数
@@ -483 +493 @@
                     i3=GetTypeFixed(term,&lp);
                     if(i3!=-1){
-                        type[sp]=i3|FLAG_CAST;
+                        type_stack[sp]=i3|FLAG_CAST;
                         index_stack[sp]=lp;
                         sp++;
@@ -500 +510 @@
 
                     if(GetSubHash(VarName,0)){
-                        Type RetTypeInfo;
-                        CallPropertyMethod(term,NULL,&RetTypeInfo);
+                        Type resultType;
+                        CallPropertyMethod(term,NULL,resultType);
 
                         //大きな型への暗黙の変換
-                        type[sp]=AutoBigCast(BaseType,RetTypeInfo.type);
-
-                        index_stack[sp]=RetTypeInfo.u.lpIndex;
+                        type_stack[sp]=AutoBigCast(baseType.GetBasicType(),resultType.GetBasicType());
+                        index_stack[sp]=resultType.GetIndex();
                         bLiteralCalculation=0;
 
                         //スタックへプッシュ
-                        PushReturnValue(RetTypeInfo.type);
-
-                        if(type[sp]==DEF_STRUCT){
+                        PushReturnValue( resultType.GetBasicType() );
+
+                        if(type_stack[sp]==DEF_STRUCT){
                             //構造体が戻ったときはヒープ領域にインスタンスが格納されている
                             //※後にfreeする必要あり
@@ -527 +536 @@
                     bError=1;
                     SetError(3,term,cp);
-                    type[sp]=DEF_DOUBLE;
+                    type_stack[sp]=DEF_DOUBLE;
                 }
                 else{
                     //リテラル値
-                    type[sp]=GetLiteralValue(term,&i64data,BaseType);
+                    type_stack[sp]=GetLiteralValue(term,&i64data,baseType.GetBasicType());
 Literal:
-                    if(type[sp]==DEF_INT64||
-                        type[sp]==DEF_QWORD||
-                        type[sp]==DEF_DOUBLE){
+                    if(type_stack[sp]==DEF_INT64||
+                        type_stack[sp]==DEF_QWORD||
+                        type_stack[sp]==DEF_DOUBLE){
                         //64ビット（符号有り整数/実数）
 
@@ -544 +553 @@
                         op_push_V(*(long *)(&i64data));
                     }
-                    else if(type[sp]==DEF_SINGLE){
+                    else if(type_stack[sp]==DEF_SINGLE){
                         //single実数
 
@@ -566 +575 @@
 
                     //リテラル値の種類
-                    if(Is64Type(type[sp])==0&&IsRealNumberType(type[sp])==0){
+                    if(Is64Type(type_stack[sp])==0&&IsRealNumberType(type_stack[sp])==0){
                         //整数（符号有り/無し）
 
@@ -579 +588 @@
                 //value[sp-2] xor= value[sp-1]
                 //xor演算
-                if(!Calc_Xor(type,index_stack,&sp)) goto error;
+                if(!Calc_Xor(type_stack,index_stack,&sp)) goto error;
                 break;
             case CALC_OR:
                 //value[sp-2] or= value[sp-1]
                 //or演算
-                if(!Calc_Or(type,index_stack,&sp)) goto error;
+                if(!Calc_Or(type_stack,index_stack,&sp)) goto error;
                 break;
             case CALC_AND:
                 //value[sp-2] and= value[sp-1]
                 //and演算
-                if(!Calc_And(type,index_stack,&sp)) goto error;
+                if(!Calc_And(type_stack,index_stack,&sp)) goto error;
                 break;
             case CALC_NOT:
                 //value[sp-1]=Not value[sp-1]
                 //NOT演算子
-                if(!Calc_Not(type,sp)) goto error;
+                if(!Calc_Not(type_stack,sp)) goto error;
                 break;
 
@@ -600 +609 @@
             case CALC_PE:
                 //value[sp-2]<=value[sp-1]
-                if(!Calc_Relation_PE(type,index_stack,&sp)) goto error;
+                if(!Calc_Relation_PE(type_stack,index_stack,&sp)) goto error;
                 break;
             case CALC_QE:
                 //value[sp-2]>=value[sp-1]
-                if(!Calc_Relation_QE(type,index_stack,&sp)) goto error;
+                if(!Calc_Relation_QE(type_stack,index_stack,&sp)) goto error;
                 break;
             case CALC_P:
                 //value[sp-2]<value[sp-1]
-                if(!Calc_Relation_P(type,index_stack,&sp)) goto error;
+                if(!Calc_Relation_P(type_stack,index_stack,&sp)) goto error;
                 break;
             case CALC_Q:
                 //value[sp-2]>value[sp-1]
-                if(!Calc_Relation_Q(type,index_stack,&sp)) goto error;
+                if(!Calc_Relation_Q(type_stack,index_stack,&sp)) goto error;
                 break;
             case CALC_NOTEQUAL:
                 //value[sp-2]<>value[sp-1]
-                if(!Calc_Relation_NotEqual(type,&sp)) goto error;
+                if(!Calc_Relation_NotEqual(type_stack,&sp)) goto error;
                 break;
             case CALC_EQUAL:
                 //value[sp-2]=value[sp-1]
-                if(!Calc_Relation_Equal(type,&sp)) goto error;
+                if(!Calc_Relation_Equal(type_stack,&sp)) goto error;
                 break;
 
@@ -626 +635 @@
             case CALC_SHL:
                 //value[sp-2]=value[sp-2]<<value[sp-1]
-                if(!Calc_SHL(type,&sp)) goto error;
+                if(!Calc_SHL(type_stack,&sp)) goto error;
                 break;
             case CALC_SHR:
                 //value[sp-2]=value[sp-2]>>value[sp-1]
-                if(!Calc_SHR(type,&sp)) goto error;
+                if(!Calc_SHR(type_stack,&sp)) goto error;
                 break;
 
@@ -637 +646 @@
             case CALC_SUBTRACTION:
             case CALC_PRODUCT:
-                if(!CalcTwoTerm_Arithmetic(idCalc,type,index_stack,&sp)) goto error;
+                if(!CalcTwoTerm_Arithmetic(idCalc,type_stack,index_stack,&sp)) goto error;
                 break;
 
@@ -643 +652 @@
                 //value[sp-2]%=value[sp-1]
                 //剰余演算
-                if(!Calc_Mod(type,&sp)) goto error;
+                if(!Calc_Mod(type_stack,&sp)) goto error;
                 break;
             case CALC_QUOTIENT:
                 //value[sp-2]/=value[sp-1];
                 //除算
-                if(!Calc_Divide(type,&sp,BaseType)) goto error;
+                if(!Calc_Divide(type_stack,&sp,baseType.GetBasicType())) goto error;
                 break;
             case CALC_INTQUOTIENT:
                 //value[sp-2]/=value[sp-1]
                 //整数除算
-                if(!Calc_IntDivide(type,index_stack,&sp)) goto error;
+                if(!Calc_IntDivide(type_stack,index_stack,&sp)) goto error;
                 break;
             case CALC_MINUSMARK:
                 //value[sp-1]=-value[sp-1]
                 //符号反転
-                if(!Calc_MinusMark(type,sp)) goto error;
+                if(!Calc_MinusMark(type_stack,sp)) goto error;
                 index_stack[sp-1]=-1;
                 break;
             case CALC_POWER:
                 //べき乗演算（浮動小数点演算のみ）
-                if(!Calc_Power(type,&sp)) goto error;
+                if(!Calc_Power(type_stack,&sp)) goto error;
                 break;
             case CALC_AS:
                 //キャスト
-                if(!Calc_Cast(type,index_stack,&sp)) goto error;
+                if(!Calc_Cast(type_stack,index_stack,&sp)) goto error;
                 break;
 
             case CALC_BYVAL:
                 //ポインタ型→参照型
-                if( PTR_LEVEL( type[sp-1] ) <= 0 ){
+                if( PTR_LEVEL( type_stack[sp-1] ) <= 0 ){
                     //ポインタ型ではないとき
                     SetError( 3, NULL, cp );
@@ -678 +687 @@
                 }
 
-                type[sp-1] = PTR_LEVEL_DOWN( type[sp-1] );
+                type_stack[sp-1] = PTR_LEVEL_DOWN( type_stack[sp-1] );
 
                 break;
@@ -697 +706 @@
     if(bLiteralCalculation){
         //右辺値が数値の定数式の場合
-        LONG_PTR lpClassIndex;
-        i2=StaticCalculation(true, Command,BaseType,&i64data,&lpClassIndex);
+        Type resultType;
+        StaticCalculation(true, expression,baseType.GetBasicType(),&i64data,resultType);
 
         obp=BeforeObp;
@@ -705 +714 @@
         pobj_Reloc->copy(pobj_BackReloc);
 
-        if(i2==DEF_INT64||
-            i2==DEF_QWORD||
-            i2==DEF_DOUBLE){
+        if( resultType.GetBasicSize() == sizeof(_int64) ){
             //64ビット（符号有り整数/実数）
 
@@ -716 +723 @@
             op_push_V(*(long *)(&i64data));
         }
-        else if(i2==DEF_SINGLE){
+        else if( resultType.IsSingle() ){
             //single実数
 
@@ -733 +740 @@
             i3=(long)i64data;
 
-            if(i2==DEF_SBYTE||i2==DEF_BYTE||i2==DEF_BOOLEAN || (isUnicode==false&&i2==DEF_CHAR)) i3=i3&0x000000FF;
-            if(i2==DEF_INTEGER||i2==DEF_WORD || (isUnicode&&i2==DEF_CHAR)) i3=i3&0x0000FFFF;
+            if(resultType.GetBasicSize()==sizeof(char)) i3=i3&0x000000FF;
+            if(resultType.GetBasicSize()==sizeof(short)) i3=i3&0x0000FFFF;
 
             //push term
@@ -740 +747 @@
         }
 
-        type[0]=i2;
-        index_stack[0]=lpClassIndex;
+        type_stack[0]=resultType.GetBasicType();
+        index_stack[0]=resultType.GetIndex();
     }
     else{
@@ -748 +755 @@
     }
 
-    if(plpIndex) *plpIndex=index_stack[0];
     if(pbUseHeap) *pbUseHeap=bUseHeap[0];
 
-    int RetType;
-    RetType=type[0];
+    resultType.SetType( type_stack[0], index_stack[0] );
+
+    bool isSuccessful = true;
     goto finish;
 
 
 error:
-    RetType=-1;
+    isSuccessful = false;
     goto finish;
 
@@ -770 +777 @@
     delete pobj_BackReloc;
 
-    return RetType;
+    return isSuccessful;
 }

BasicCompiler32/Opcode.h

@@ -202 +202 @@
 class ParamImpl{
     char *Parms[255];
-    Type types[255];
+    vector<Type> types;
     int ParmsNum;
 
-    Type ReturnTypeInfo;
+    Type returnType;
 
     //一時オブジェクト管理用
@@ -219 +219 @@
 
 private:
-    BOOL _overload_check( const Parameters &params,Type *pReturnTypeInfo,int overload_level);
+    bool _overload_check( int level, const Parameters &targetParms, const Type &targetResultType );
     UserProc *OverloadSolutionWithReturnType( const char *name, std::vector<UserProc *> &subs );
 public:
@@ -226 +226 @@
     bool ErrorCheck( const string &procName, const Parameters &params, int SecondParmNum = -1 );
     void MacroParameterSupport( const Parameters &params );
-    void SetStructParameter(CClass *pobj_Class,LPSTR Parameter);
+    void SetStructParameter( const Type &baseType, const char *expression );
     int SetParameter( const string &procName, const Parameters &params, int SecondParmNum = -1 );
 
@@ -237 +237 @@
 void AddLocalVarAddrSchedule();
 #define PROCFLAG_NEW    1
-int Opcode_CallProcPtr(char *variable,char *Parameter,ProcPointer *pProcPointer,LONG_PTR *plpIndex);
-void Opcode_CallProc(const char *Parameter,UserProc *pUserProc,DWORD dwFlags,char *ObjectName,int RefType);
-int Opcode_CallDllProc(char *Parameter,DllProc *pDllProc,LONG_PTR *plpIndex);
+bool Opcode_CallProcPtr( const char *variable, const char *lpszParms,ProcPointer *pProcPointer);
+bool Opcode_CallProc(const char *Parameter,UserProc *pUserProc,DWORD dwFlags,const char *ObjectName,int RefType);
+bool Opcode_CallDllProc( const char *lpszParms, DllProc *pDllProc );
 
 //Compile_ProcOp.cpp
@@ -247 +247 @@
 int GetFunctionType(int FuncNum);
 int GetFunctionFromName(char *FuncName);
-void Opcode_CallFunc( const char *Parameter, const int FuncNum, Type &ReturnTypeInfo );
+bool Opcode_CallFunc( const char *Parameter, const int FuncNum, Type &resultType, bool isCallOn = true );
 
 //OperatorProc.cpp
-void FreeTempObject(int reg,CClass *pobj_c);
-int CallOperatorProc(int idCalc,Type *pBaseTypeInfo,int *type,LONG_PTR *index_stack,BOOL *bUseHeap,int &sp);
+void FreeTempObject(int reg,const CClass *pobj_c);
+int CallOperatorProc(int idCalc, const Type &baseType, int *type_stack,LONG_PTR *index_stack,BOOL *bUseHeap,int &sp);
 void CallCastOperatorProc(Type &calcType,BOOL bCalcUseHeap,const Type &toType);
-void CallIndexerGetterProc(CClass *pobj_Class,char *ObjectName,char *Parameter,Type &RetTypeInfo);
+void CallIndexerGetterProc(const CClass *pobj_Class,char *ObjectName,char *Parameter,Type &resultType);
 
 //Compile_Statement.cpp
@@ -264 +264 @@
 void OpcodeContinue(void);
 void OpcodeExitSub(void);
-void OpcodeSelect(const char *Parameter);
+void OpcodeSelect(const char *lpszParms);
 void OpcodeCase(char *Parameter);
 void OpcodeGosub(char *Parameter);
 void OpcodeReturn(char *Parameter);
-void Opcode_Input(const char *Parameter);
-void Opcode_Print(const char *Parameter,BOOL bWrite);
-void OpcodeCallPtr(char *Parameter);
 void OpcodeSetPtrData(char *Parameter,int type);
 

BasicCompiler32/OperatorProc.cpp

@@ -2 +2 @@
 #include "Opcode.h"
 
-void FreeTempObject(int reg,CClass *pobj_c){
+void FreeTempObject(int reg,const CClass *pobj_c){
     if(!IsSafeReg(reg)) SetError(300,NULL,cp);
 
@@ -22 +22 @@
 }
 
-int CallOperatorProc(int idCalc,Type *pBaseTypeInfo,int *type,LONG_PTR *index_stack,BOOL *bUseHeap,int &sp){
+int CallOperatorProc(int idCalc, const Type &baseType, int *type_stack,LONG_PTR *index_stack,BOOL *bUseHeap,int &sp){
     //オーバーロードされたオペレータ関数を呼び出す
     CClass *pobj_c;
@@ -39 +39 @@
 
 
-    int i;
-    BOOL bReturnTypeIsObject=1;
-    Type ReturnType={DEF_OBJECT,subs[0]->ReturnType().GetIndex()};
-    foreach( UserProc *pUserProc, subs ){
-        if(pUserProc->ReturnType().IsObject())
-            bReturnTypeIsObject=0;
-    }
-
-    if(bReturnTypeIsObject==0){
-        if(pBaseTypeInfo){
-            if(pBaseTypeInfo->type==DEF_OBJECT){
-                ReturnType.u.lpIndex=pBaseTypeInfo->u.lpIndex;
-            }
-        }
-    }
-
-
-
     /////////////////////////////////////////////
     // オーバーロード解決用のパラメータを設定
@@ -64 +46 @@
 
     if(bTwoTerm){
-        params.push_back( new Parameter( "", Type( type[sp-1], index_stack[sp-1] ) ) );
+        params.push_back( new Parameter( "", Type( type_stack[sp-1], index_stack[sp-1] ) ) );
     }
 
@@ -71 +53 @@
     if(idCalc==CALC_EQUAL) lstrcpy(temporary,"==");
     else GetCalcName(idCalc,temporary);
-    Type returnType;
-    if( pBaseTypeInfo ){
-        returnType.SetBasicType( pBaseTypeInfo->type );
-        returnType.SetIndex( pBaseTypeInfo->u.lpIndex );
-    }
-    UserProc *pUserProc = OverloadSolution( temporary, subs, params, returnType );
+    UserProc *pUserProc = OverloadSolution( temporary, subs, params, baseType );
 
     if(!pUserProc){
@@ -94 +71 @@
     }
 
-    for(i=0;i<(int)params.size();i++){
+    for(int i=0;i<(int)params.size();i++){
         CheckDifferentType(
             pUserProc->Params()[i]->GetBasicType(),
@@ -108 +85 @@
     }
 
-    int right_side_size = GetTypeSize(type[sp-1],index_stack[sp-1]);
+    int right_side_size = GetTypeSize(type_stack[sp-1],index_stack[sp-1]);
 
     if(bTwoTerm){
@@ -224 +201 @@
 
     sp--;
-    type[sp-1]=pUserProc->ReturnType().GetBasicType();
+    type_stack[sp-1]=pUserProc->ReturnType().GetBasicType();
     index_stack[sp-1]=pUserProc->ReturnType().GetIndex();
 
@@ -237 +214 @@
 }
 
-void CallCastOperatorProc(int &CalcType,LONG_PTR &lpCalcIndex,BOOL bCalcUseHeap,int ToType,LONG_PTR lpToIndex){
-    int type[10];
+void CallCastOperatorProc(Type &calcType,BOOL bCalcUseHeap,const Type &toType){
+    int type_stack[10];
     LONG_PTR index_stack[10];
     BOOL array_bUseHeap[10];
@@ -249 +226 @@
 
     //左辺
-    type[0]=CalcType;
-    index_stack[0]=lpCalcIndex;
+    type_stack[0]=calcType.GetBasicType();
+    index_stack[0]=calcType.GetIndex();
     array_bUseHeap[0]=0;
-    type[1]=ToType;
-    index_stack[1]=lpToIndex;
+    type_stack[1]=toType.GetBasicType();
+    index_stack[1]=toType.GetIndex();
     array_bUseHeap[1]=0;
 
-    Type BaseTypeInfo={ToType,lpToIndex};
-
-    int iRet;
-    iRet=CallOperatorProc(CALC_AS,&BaseTypeInfo,type,index_stack,array_bUseHeap,sp);
+    int iRet = CallOperatorProc(CALC_AS,toType,type_stack,index_stack,array_bUseHeap,sp);
+
     if(iRet==1){
         //成功したとき
-        CalcType=type[0];
-        lpCalcIndex=index_stack[0];
+        calcType.SetType( type_stack[0], index_stack[0] );
         return;
     }
@@ -274 +248 @@
     SetError(-1,"キャスト演算子がオーバーロードされていません。",cp);
 }
-void CallIndexerGetterProc(CClass *pobj_Class,char *ObjectName,char *Parameter,Type &RetTypeInfo){
+void CallIndexerGetterProc(const CClass *pobj_Class,char *ObjectName,char *Parameter,Type &resultType){
     std::vector<UserProc *> subs;
     pobj_Class->EnumMethod( CALC_ARRAY_GET, subs );
@@ -282 +256 @@
 
     Opcode_CallProc(Parameter,subs[0],0,ObjectName,DEF_OBJECT);
-    RetTypeInfo.type = subs[0]->ReturnType().GetBasicType();
-    RetTypeInfo.u.lpIndex = subs[0]->ReturnType().GetIndex();
-}
+    resultType = subs[0]->ReturnType();
+}