Changeset 306 in dev for trunk/abdev

Timestamp:

Aug 28, 2007, 3:45:06 AM (17 years ago)

Author:

dai_9181

Message:

Protectedメソッドを派生クラス内のメソッドでSuperと指定するとエラーになるバグを修正。
クラスメソッド内でImportsされた名前空間内の情報が扱えないバグを修正

Location:

trunk/abdev

Files:

• BasicCompiler32/Compile_CallProc.cpp (modified) (1 diff)
• BasicCompiler_Common/include/option.h (modified) (1 diff)
• BasicCompiler_Common/src/Procedure.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler32/Compile_CallProc.cpp

@@ -190 +190 @@
                     return false;
                 }
-                if( pMethod->IsProtected() ){
+                if( !pMethod->GetUserProc().GetParentClass().IsEqualsOrSubClass( pobj_c ) && pMethod->IsProtected() ){
                     SetError(110,pUserProc->GetName(),cp);
                     return false;

trunk/abdev/BasicCompiler_Common/include/option.h

@@ -14 +14 @@
 // バージョン付加文字列
 #ifdef _AMD64_
-#define VER_INFO        "(x64) (rev.306)"
+#define VER_INFO        "(x64) (rev.315)"
 #else
-#define VER_INFO        "(rev.306)"
+#define VER_INFO        "(rev.315)"
 #endif
 

trunk/abdev/BasicCompiler_Common/src/Procedure.cpp

@@ -34 +34 @@
 const NamespaceScopesCollection &UserProc::GetImportedNamespaces() const
 {
+    if( pParentClass )
+    {
+        return pParentClass->GetImportedNamespaces();
+    }
     return importedNamespaces;
 }