Changeset 326 in dev for trunk

Timestamp:

Sep 25, 2007, 12:26:53 PM (17 years ago)

Author:

dai_9181

Message:

メソッドの重複チェックで戻り値も判定するよにうにした

Location:

trunk/abdev

Files:

• BasicCompiler32/Compile_Statement.cpp (modified) (1 diff)
• BasicCompiler64/Compile_Statement.cpp (modified) (1 diff)
• BasicCompiler_Common/include/Procedure.h (modified) (1 diff)
• BasicCompiler_Common/src/Class.cpp (modified) (2 diffs)

trunk/abdev/BasicCompiler32/Compile_Statement.cpp

@@ -140 +140 @@
 
     const PertialSchedule *pIfPertialSchedule = NULL;
-    if( !NumOpe(Parameter,Type(),tempType) ){
+    if( !NumOpe(Parameter,Type(DEF_BOOLEAN),tempType) ){
         //NumOpe内でエラー
     }

trunk/abdev/BasicCompiler64/Compile_Statement.cpp

@@ -128 +128 @@
     int reg=REG_RAX;
     Type resultType;
-    if( !NumOpe(&reg,buffer,Type(),resultType) ){
+    if( !NumOpe(&reg,buffer,Type(DEF_BOOLEAN),resultType) ){
         return;
     }

trunk/abdev/BasicCompiler_Common/include/Procedure.h

@@ -210 +210 @@
     virtual bool IsDuplication( const UserProc *pUserProc ) const
     {
-        if( this->GetParentClassPtr() == pUserProc->GetParentClassPtr()
-            && pUserProc->IsEqualSymbol( *this )
-            && this->Params().Equals( pUserProc->Params() ) )
+        if( this->GetParentClassPtr() == pUserProc->GetParentClassPtr() // 親クラスが等しい
+            && pUserProc->IsEqualSymbol( *this )                        // 名前空間及び名前が等しい
+            && this->Params().Equals( pUserProc->Params() )             // パラメータが等しい
+            && this->returnType.Equals( pUserProc->returnType ) )       // 戻り値が等しい
         {
             return true;

trunk/abdev/BasicCompiler_Common/src/Class.cpp

@@ -500 +500 @@
 
         if( pMethod->GetUserProc().GetName() == temporary ){
-            if( pMethod->GetUserProc().Params().Equals( pUserProc->Params() ) ){
-                //関数名、パラメータ属性が合致したとき
+            if( pMethod->GetUserProc().Params().Equals( pUserProc->Params() )
+                && pMethod->GetUserProc().ReturnType().Equals( pUserProc->ReturnType() ) )
+            {
+                //関数名、パラメータ、戻り値が合致したとき
                 SetError(15,pUserProc->GetName().c_str(),nowLine);
                 return;
@@ -514 +516 @@
     BOOST_FOREACH( CMethod *pMethod, pobj_c->GetMethods() ){
         if( pMethod->GetUserProc().GetName() == temporary ){
-            if( pMethod->GetUserProc().Params().Equals( pUserProc->Params() ) )
+            if( pMethod->GetUserProc().Params().Equals( pUserProc->Params() )
+                && pMethod->GetUserProc().ReturnType().Equals( pUserProc->ReturnType() ) )
             {
                 //メンバ関数を上書き