Changeset 305 in dev for trunk/abdev/BasicCompiler_Common/src

Timestamp:

Aug 26, 2007, 3:57:23 AM (17 years ago)

Author:

dai_9181

Message:

非仮想関数のオーバーライドをエラー扱いにした

Location:

trunk/abdev/BasicCompiler_Common/src

Files:

• Class.cpp (modified) (1 diff)
• Source.cpp (modified) (2 diffs)

trunk/abdev/BasicCompiler_Common/src/Class.cpp

@@ -514 +514 @@
     BOOST_FOREACH( CMethod *pMethod, pobj_c->GetMethods() ){
         if( pMethod->GetUserProc().GetName() == temporary ){
-            if( pMethod->GetUserProc().Params().Equals( pUserProc->Params() ) ){
-
-                if(pMethod->IsVirtual()){
-                    //メンバ関数を上書き
-                    pMethod->SetUserProcPtr( pUserProc );
-                    pMethod->Override();
-
-                    if( !isOverride ){
-                        SetError(127,NULL,nowLine);
-                    }
-                    if(pMethod->GetAccessibility() != accessibility ){
-                        SetError(128,NULL,nowLine);
-                    }
-
-                    pUserProc->SetMethod( pMethod );
-                    return;
-                }
+            if( pMethod->GetUserProc().Params().Equals( pUserProc->Params() ) )
+            {
+                //メンバ関数を上書き
+                pMethod->SetUserProcPtr( pUserProc );
+                pMethod->Override();
+
+                if( !pMethod->IsVirtual() )
+                {
+                    // オーバーライドミス
+                    SetError(136,NULL,cp);
+                }
+                if( !isOverride )
+                {
+                    SetError(127,NULL,nowLine);
+                }
+                if(pMethod->GetAccessibility() != accessibility )
+                {
+                    SetError(128,NULL,nowLine);
+                }
+
+                pUserProc->SetMethod( pMethod );
+                return;
             }
         }

trunk/abdev/BasicCompiler_Common/src/Source.cpp

@@ -4 +4 @@
 
 #include <jenga/include/common/Directory.h>
+#include <jenga/include/common/Path.h>
 
 #include <jenga/include/smoothie/Smoothie.h>
@@ -616 +617 @@
             else continue;
 
-            if(i){
+            if( i == 0 && Jenga::Common::Path(temporary).GetFileName() == "basic" )
+            {
+            }
+            else
+            {
                 //ディレクティブが消えるため、一行減ってしまうのを防ぐ（basic.sbpを除く）
                 Text::SlideString(buffer+i2,1);