Changeset 75 in dev for BasicCompiler_Common/Overload.cpp

Timestamp:

Mar 20, 2007, 4:36:16 AM (17 years ago)

Author:

dai_9181

Message:

TYPEINFO→Typeへのリファクタリングを実施。64bitはほぼ完了。32bitが全般的に未完成。

File:

• BasicCompiler_Common/Overload.cpp (modified) (5 diffs)

BasicCompiler_Common/Overload.cpp

@@ -7 +7 @@
 #endif
 
-SubInfo *OverloadSolutionWithStrParam(
+UserProc *OverloadSolutionWithStrParam(
     const char *name,
-    std::vector<SubInfo *> &subs,
+    std::vector<UserProc *> &subs,
     const char *Parameter,
-    const char *ObjectName,
-    TYPEINFO *pReturnTypeInfo){
+    const char *ObjectName){
 
         // オーバーロードの解決
@@ -31 +30 @@
         //メソッドの場合は静的かどうかを調べる
         bool isStatic = false;
-        CClass *pClass = subs[0]->pobj_ParentClass;
+        CClass *pClass = subs[0]->GetParentClassPtr();
         if( pClass ){
             isStatic = pClass->IsExistStaticMethod( MethodName );
@@ -37 +36 @@
 */
         //パラメータオブジェクトを生成
-        if(lstrcmp(Parameter,"\"test\"")==0){
-            int i=0;
-        }
         pobj_parameter=new ParamImpl(Parameter);
-        if(pReturnTypeInfo) pobj_parameter->SetReturnType(pReturnTypeInfo);
 
 
-        SubInfo *psi;
-        psi=pobj_parameter->OverloadSolution(name,subs);
+        UserProc *pUserProc;
+        pUserProc=pobj_parameter->OverloadSolution(name,subs);
 
 
@@ -52 +47 @@
         pobj_parameter=0;
 
-        return psi;
+        return pUserProc;
 }
-
-SubInfo *OverloadSolution(
+UserProc *OverloadSolution(
     const char *name,
-    std::vector<SubInfo *> &subs,
-    const PARAMETER_INFO *ppi,
-    const int ParmNum,
-    TYPEINFO *pReturnTypeInfo){
+    std::vector<UserProc *> &subs,
+    const Parameters &params,
+    const Type &returnType ){
 
         // オーバーロードの解決
@@ -68 +61 @@
 
 
-        ParamImpl *pobj_Parameter=new ParamImpl(ppi,ParmNum);
-        if(pReturnTypeInfo) pobj_Parameter->SetReturnType(pReturnTypeInfo);
+        ParamImpl *pobj_Parameter=new ParamImpl( params );
+        if( !returnType.IsNull() ){
+            pobj_Parameter->SetReturnType( returnType );
+        }
 
-        SubInfo *psi;
-        psi=pobj_Parameter->OverloadSolution(name,subs);
+        UserProc *pUserProc;
+        pUserProc=pobj_Parameter->OverloadSolution(name,subs);
 
         delete pobj_Parameter;
 
-        return psi;
+        return pUserProc;
 }