Changeset 353 in dev for trunk/abdev/BasicCompiler_Common/ParamImpl.cpp

Timestamp:

Oct 21, 2007, 3:37:31 PM (16 years ago)

Author:

dai_9181

Message:

インターフェイス実装周りの仕様整備

File:

• trunk/abdev/BasicCompiler_Common/ParamImpl.cpp (modified) (5 diffs)

trunk/abdev/BasicCompiler_Common/ParamImpl.cpp

@@ -204 +204 @@
 
 const UserProc *ParamImpl::_OverloadSolution( const char *name, std::vector<const UserProc *> &subs, bool isEnabledReturnType ){
-    int sw=0;
-    const UserProc *pUserProc;
-    pUserProc=0;
+    const UserProc *pUserProc = NULL;
 
     for( int level=OVERLOAD_MIN_LEVEL; level<=OVERLOAD_MAX_LEVEL; level++ ){
@@ -213 +211 @@
 
             if(EvaluateOverloadScore( level, pTempUserProc->Params(), isEnabledReturnType?pTempUserProc->ReturnType():Type() )){
-                trace_for_overload( "レベル" << level <<   " ○適合..." << pTempUserProc->_paramStr );
-
-                if(sw){
+                trace_for_overload( "レベル" << level << " ○適合..." << pTempUserProc->_paramStr );
+
+                if( pUserProc ){
                     if( isEnabledReturnType ){
                         SetError(52,name,cp);
-
-                        return 0;
                     }
                     else{
@@ -229 +225 @@
                     }
                 }
-                sw=1;
 
                 pUserProc = pTempUserProc;
@@ -235 +230 @@
             else
             {
-                trace_for_overload( "レベル" << level <<   " ×不適合..." << pTempUserProc->_paramStr );
-            }
-        }
-
-        if( sw ) break;
-    }
-
-    if(!sw){
+                trace_for_overload( "レベル" << level << " ×不適合..." << pTempUserProc->_paramStr );
+            }
+        }
+
+        if( pUserProc ) break;
+    }
+
+    if( !pUserProc ){
         BOOST_FOREACH( const UserProc *pTempUserProc, subs ){
 
             //エラーチェック
             if(pTempUserProc->Params().size()==this->ParmsNum){
-                if(sw){
-                    sw=0;
-                    break;
-                }
-                sw=1;
+                if( pUserProc ){
+                    SetError(52,name,cp);
+                }
 
                 pUserProc=pTempUserProc;
@@ -258 +251 @@
     }
 
-    if(!sw){
-        SetError(52,name,cp);
-
-        return 0;
-    }
-
+    if( !pUserProc )
+    {
+        SetError();
+    }
 
     return pUserProc;