Changeset 376 in dev for trunk/abdev/BasicCompiler_Common/include/Class.h

Timestamp:

Nov 30, 2007, 8:31:42 PM (16 years ago)

Author:

dai_9181

Message:

 

File:

• trunk/abdev/BasicCompiler_Common/include/Class.h (modified) (5 diffs)

trunk/abdev/BasicCompiler_Common/include/Class.h

@@ -77 +77 @@
     mutable LONG_PTR vtblOffset;
 
+    // 型パラメータ（実パラメータ）
+    Types actualTypeParameters;
+
     // XMLシリアライズ用
 private:
@@ -87 +90 @@
         ar & boost::serialization::make_nvp("pInterfaceClass", const_cast<CClass *&>(pInterfaceClass) );
         ar & BOOST_SERIALIZATION_NVP( vtblOffset );
-    }
-
-public:
-    Interface( const CClass *pInterfaceClass );
+        ar & BOOST_SERIALIZATION_NVP( actualTypeParameters );
+    }
+
+public:
+    Interface( const CClass *pInterfaceClass, const Types &actualTypeParameters );
     Interface( const Interface &objInterface )
         : DynamicMethodsPrototype( objInterface )
@@ -111 +115 @@
     {
         this->vtblOffset = vtblOffset;
+    }
+
+    const Types &GetActualTypeParameters() const
+    {
+        return actualTypeParameters;
     }
 };
@@ -395 +404 @@
 
     // インターフェイス実装
-    bool Implements( const CClass &interfaceClass, const Jenga::Common::Strings &typeParameters, int nowLine );
+    bool Implements( const CClass &interfaceClass, const Types &actualTypeParameters, int nowLine );
     bool Implements( const char *interfaceNames, int nowLine );
 
@@ -582 +591 @@
 public:
     virtual void GetClass_recur(const char *lpszInheritsClass);
+    void LookaheadClass( const char *className );
+    bool LoopRefCheck( const CClass &objClass );
     virtual void GetAllClassInfo();
     virtual void Compile_System_InitializeUserTypes();