Changeset 449 in dev for trunk/ab5.0/abdev/BasicCompiler_Common

Timestamp:

Mar 22, 2008, 1:56:31 AM (17 years ago)

Author:

dai_9181

Message:

・デリゲートの共変戻り値、反変引数に対応した。
・core.libで定義されたデリゲートがアプリケーションプロジェクトで利用できないバグを修正。

Location:

trunk/ab5.0/abdev/BasicCompiler_Common

Files:

• include/Delegate.h (modified) (2 diffs)
• src/Delegate.cpp (modified) (2 diffs)

trunk/ab5.0/abdev/BasicCompiler_Common/include/Delegate.h

@@ -11 +11 @@
 {
     friend Delegates;
+
+    // importされている名前空間
+    NamespaceScopesCollection importedNamespaces;
 
     std::string paramStr;
@@ -26 +29 @@
 
         ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Procedure );
+        ar & BOOST_SERIALIZATION_NVP( importedNamespaces );
         ar & BOOST_SERIALIZATION_NVP( dynamicParams );
     }
 
 public:
-    Delegate( const NamespaceScopes &namespaceScopes, const std::string &name, Procedure::Kind procKind, const char *paramStr, const std::string &returnTypeName, int sourceIndex )
+    Delegate( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const std::string &name, Procedure::Kind procKind, const char *paramStr, const std::string &returnTypeName, int sourceIndex )
         : Procedure( namespaceScopes, name, procKind, false )
+        , importedNamespaces( importedNamespaces )
         , paramStr( paramStr )
         , returnTypeName( returnTypeName )

trunk/ab5.0/abdev/BasicCompiler_Common/src/Delegate.cpp

@@ -5 +5 @@
 void Delegate::RefleshParameterAndReturnType()
 {
+    compiler.GetNamespaceSupporter().SetImportedNamespaces( this->importedNamespaces );
+    compiler.GetNamespaceSupporter().SetLivingNamespaceScopes( this->GetNamespaceScopes() );
+
     // パラメータを解析
     params.Analyze( paramStr.c_str(), sourceIndex );
@@ -151 +154 @@
             }
 
-            this->Put( new Delegate( namespaceScopes, name, procKind, paramStr, returnTypeName, nowLine ) );
+            this->Put( new Delegate( namespaceScopes, importedNamespaces, name, procKind, paramStr, returnTypeName, nowLine ) );
         }
     }