Changeset 301 in dev for trunk/abdev/BasicCompiler32

Timestamp:

Aug 23, 2007, 10:58:43 PM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev/BasicCompiler32

Files:

• CParameter.cpp (modified) (2 diffs)
• Compile_CallProc.cpp (modified) (1 diff)
• Compile_Func.cpp (modified) (1 diff)
• Compile_Var.cpp (modified) (1 diff)
• NumOpe.cpp (modified) (1 diff)
• Opcode.h (modified) (1 diff)

trunk/abdev/BasicCompiler32/CParameter.cpp

@@ -159 +159 @@
 }
 
-int ParamImpl::SetParameter( const string &procName, const Parameters &params, int SecondParmNum ){
+int ParamImpl::SetParameter( const string &procName, const Parameters &params, int SecondParmNum, const UserProc *pUserProc ){
     if( SecondParmNum == -1 ) SecondParmNum = (int)params.size();
 
@@ -215 +215 @@
 
             // 型パラメータを解決
-            ResolveFormalGenericTypeParameter( dummyType, leftType );
+            ResolveFormalGenericTypeParameter( dummyType, leftType, pUserProc );
         }
 

trunk/abdev/BasicCompiler32/Compile_CallProc.cpp

@@ -244 +244 @@
 
     //レジスタ、スタックフレームにセット
-    int ParmSize = pobj_parameter->SetParameter(pUserProc->GetName(),pUserProc->RealParams(),pUserProc->GetRealSecondParmNum() );
+    int ParmSize = pobj_parameter->SetParameter(pUserProc->GetName(),pUserProc->RealParams(),pUserProc->GetRealSecondParmNum(), pUserProc );
 
     if(pUserProc->ReturnType().IsStruct() ){

trunk/abdev/BasicCompiler32/Compile_Func.cpp

@@ -357 +357 @@
 
     SetVarPtrToEax(&RelativeVar);
-
-    // TODO: 取り除く（この動きはObjPtrに託す）
-    /*
-    if( beforeType == DEF_OBJECT && lstrcmpi( Parameter, "This" ) != 0 ){
-        //参照をオブジェクトポインタに変更
-
-        //mov eax,dword ptr[eax]
-        compiler.codeGenerator.op_mov_RM( sizeof(long), REG_EAX, REG_EAX, 0, MOD_BASE );
-
-        SetError(-120,NULL,cp);
-    }*/
 }
 void Opcode_Func_ObjPtr( const char *Parameter, Type &resultType, bool isCallOn ){

trunk/abdev/BasicCompiler32/Compile_Var.cpp

@@ -726 +726 @@
         }
 
+        Type classType( resultType );
+
         if(!_member_offset(
             isErrorEnabled,
             isWriteAccess,
-            resultType,
+            classType,
             member,pRelativeVar,resultType,0)) return false;
 

trunk/abdev/BasicCompiler32/NumOpe.cpp

@@ -233 +233 @@
 bool TermOpe( const char *term, const Type &baseType, Type &resultType, bool &isLiteral, BOOL *pbUseHeap, bool isWantObject, bool *pIsClassName, bool isProcedureCallOnly ){
     char parameter[VN_SIZE];
-
-    if( (string)term=="a[1]")
-    {
-        int test=0;
-    }
 
     // Withを解決

trunk/abdev/BasicCompiler32/Opcode.h

@@ -203 +203 @@
     void MacroParameterSupport( const Parameters &params );
     void SetStructParameter( const Type &baseType, const char *expression );
-    int SetParameter( const string &procName, const Parameters &params, int SecondParmNum = -1 );
+    int SetParameter( const string &procName, const Parameters &params, int SecondParmNum = -1, const UserProc *pUserProc = NULL );
 
     //一時オブジェクトパラメータの生成と破棄