Changeset 350 in dev for trunk/abdev/BasicCompiler64

Timestamp:

Oct 14, 2007, 9:41:03 PM (17 years ago)

Author:

dai_9181

Message:

インターフェイスを実装

Location:

trunk/abdev/BasicCompiler64

Files:

• BasicCompiler.vcproj (modified) (1 diff)
• Compile_CallProc.cpp (modified) (1 diff)
• Compile_Interface.cpp (deleted)
• Compile_ProcOp.cpp (modified) (1 diff)
• Compile_Var.cpp (modified) (1 diff)
• NumOpe.cpp (modified) (4 diffs)
• Opcode.h (modified) (1 diff)
• OperatorProc.cpp (modified) (3 diffs)

trunk/abdev/BasicCompiler64/BasicCompiler.vcproj

@@ -795 +795 @@
                     >
                     <File
-                        RelativePath=".\Compile_Interface.cpp"
-                        >
-                        <FileConfiguration
-                            Name="Debug|Win32"
-                            >
-                            <Tool
-                                Name="VCCLCompilerTool"
-                                UsePrecompiledHeader="2"
-                            />
-                        </FileConfiguration>
-                        <FileConfiguration
-                            Name="Release|Win32"
-                            >
-                            <Tool
-                                Name="VCCLCompilerTool"
-                                UsePrecompiledHeader="2"
-                            />
-                        </FileConfiguration>
-                    </File>
-                    <File
                         RelativePath=".\Compile_Object.cpp"
                         >

trunk/abdev/BasicCompiler64/Compile_CallProc.cpp

@@ -164 +164 @@
         /////////////////////////////////
         pMethod = NULL;
-        if( ! isStatic ) pMethod = pobj_c->GetDynamicMethodOfInterfaceMethod( pUserProc );
+        if( ! isStatic ) pMethod = pobj_c->GetDynamicMethodOrInterfaceMethod( pUserProc );
         if( ! pMethod ){
             //動的メソッドが取得できなかったときは静的メソッドを当たる

trunk/abdev/BasicCompiler64/Compile_ProcOp.cpp

@@ -179 +179 @@
         UserProc::CompileStartForUserProc( pBackUserProc );
         cp=BackCp;
+    }
+    else if( userProc.HasParentClass()
+        && userProc.IsCastOperator()
+        && userProc.ReturnType().IsInterface() )
+    {
+        // インターフェイス型にキャストするためのメソッド
+
+        int vtblMasterListIndex = userProc.GetParentClass().GetVtblMasterListIndex( &userProc.ReturnType().GetClass() );
+
+        char temporary[1024];
+        sprintf( temporary,
+            "Return New %s(ObjPtr( This ),Get_LONG_PTR( (Get_LONG_PTR( ObjPtr(This) ) + SizeOf(LONG_PTR)*%d) As VoidPtr ) As VoidPtr )",
+            userProc.ReturnType().GetClass().GetName().c_str(),
+            vtblMasterListIndex
+        );
+        MakeMiddleCode( temporary );
+
+        ChangeOpcode( temporary );
     }
     else{

trunk/abdev/BasicCompiler64/Compile_Var.cpp

@@ -1226 +1226 @@
     }
 
-    //コンストラクタ呼び出し
-    if( type.IsObject() &&(dwFlags&DIMFLAG_NONCALL_CONSTRACTOR)==0&&InitBuf[0]=='\0'){
+    //New呼び出し
+    if( type.IsObject()
+        && !type.IsInterface()
+        &&(dwFlags&DIMFLAG_NONCALL_CONSTRACTOR)==0
+        &&InitBuf[0]=='\0')
+    {
         char objectSize[255];
         if( subscripts.size() == 0 ){

trunk/abdev/BasicCompiler64/NumOpe.cpp

@@ -233 +233 @@
     GetVarFormatString(methodName,parameter,lpPtrOffset,dummy,refType);
 
-    objClass.EnumDynamicMethodsOfInterfaceMethods( methodName, userProcs );
+    objClass.EnumDynamicMethodsOrInterfaceMethods( methodName, userProcs );
     if(userProcs.size()){
         //オーバーロードを解決
@@ -751 +751 @@
 
 
+    if( strstr(expression,"xxxxx"))
+    {
+        int test=0;
+    }
 
     ////////////////////////////////
@@ -789 +793 @@
                         // ダウンキャストを許可する
                 }
-                else if( idCalc == CALC_AS
-                    && type_stack[sp-1] == ( DEF_OBJECT | FLAG_CAST ) && ((CClass *)index_stack[sp-1])->IsInterface()
-                    ){
-                        // インターフェイスへのキャスト
-                        // TODO: 実装
-                        CastToInterface( pobj_reg->GetLockingReg(), REG_R15, *(CClass *)index_stack[sp-2], *(CClass *)index_stack[sp-1] );
-                }
                 else{
                     //オーバーロードされたオペレータを呼び出す
@@ -853 +850 @@
                     || term[0] == '\"' )
                 {
-                    if( baseType.IsObject() || baseType.IsNull() )
+                    if( !baseType.IsPointer() )
                     {
                         //要求タイプがオブジェクト、または未定のとき

trunk/abdev/BasicCompiler64/Opcode.h

@@ -245 +245 @@
 void SetReg_WholeVariable( const Type &type, RELATIVE_VAR *pRelativeVar,int reg);
 
-//Compile_Interface.cpp
-bool CastToInterface( int reg, int vtblReg, const CClass &baseClass, const CClass &interfaceClass );
-
 //Compile_Object.cpp
 void Operator_New( const CClass &classObj, const char *objectSizeStr, const char *parameter,const Type &baseTypeInfo );

trunk/abdev/BasicCompiler64/OperatorProc.cpp

@@ -33 +33 @@
 }
 
-int CallOperatorProc(BYTE idCalc, const Type &baseType, int *type_stack,LONG_PTR *index_stack,BOOL *bUseHeap,int &sp){
+int CallOperatorProc(BYTE idCalc, const Type &baseType, int *type_stack,LONG_PTR *index_stack,BOOL *bUseHeap,int &sp)
+{
+    Type leftType( type_stack[sp-2], index_stack[sp-2] );
+    Type rightType( type_stack[sp-1] & (~FLAG_CAST), index_stack[sp-1] );
+
     //オーバーロードされたオペレータ関数を呼び出す
-    CClass *pobj_c;
-    pobj_c=(CClass *)index_stack[sp-2];
+    const CClass *pobj_c = &leftType.GetClass();
 
     std::vector<const UserProc *> subs;
@@ -56 +59 @@
     Parameters params;
 
-    if(bTwoTerm){
-        params.push_back( new Parameter( "", Type( type_stack[sp-1], index_stack[sp-1] ) ) );
+    if(bTwoTerm)
+    {
+        params.push_back( new Parameter( "", rightType ) );
     }
 
@@ -94 +98 @@
     }
 
-    int right_side_size = Type(type_stack[sp-1],index_stack[sp-1]).GetSize();
+    int right_side_size = rightType.GetSize();
 
     if(bTwoTerm){