Changeset 728 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/include

Timestamp:

Aug 21, 2008, 11:02:07 PM (16 years ago)

Author:

dai

Message:

#200への対応。ジェネリックインターフェイスを実装したジェネリッククラスのテンプレート展開に対応。

File:

• trunk/ab5.0/abdev/BasicCompiler_Common/include/LexicalAnalyzer.h (modified) (2 diffs)

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

@@ -35 +35 @@
     static Member *CreateMember( const CClass &_class, Prototype::Accessibility accessibility, bool isConst, bool isRef, char *buffer, int nowLine );
     static void AddMethod(CClass *pobj_c, UserProc *pUserProc, Prototype::Accessibility accessibility, BOOL bStatic, bool isConst, bool isAbstract,
-        bool isVirtual, bool isOverride, const char *interfaceName, bool isAutoGeneration, int nowLine);
+        bool isVirtual, bool isOverride, bool isEnableOverrideCheck, const char *interfaceName, bool isAutoGeneration, int nowLine);
     static bool Inherits( CClass &_class, const char *inheritNames, int nowLine );
-    static void Implements( CClass &_class, Interface *pInterface, std::vector<DynamicMethod::OverrideResult> &overrideResults );
+    static void Implements( CClass &_class, Interface *pInterface );
     static bool Implements( CClass &_class, const char *interfaceNames, int nowLine );
     static void LookaheadClass( const std::string &className, Classes &classes );
@@ -44 +44 @@
 
     // テンプレート展開
+    static Type LexicalAnalyzer::TemplateExpand_ResolveType( const Type &baseType, const Types &actualTypes );
     static void TemplateExpand_ResolveMethod( const CMethod *pBaseMethod, const Types &actualTypes, CClass *pNewClass );
     static const CClass *TemplateExpand( CClass &_class, const Types &actualTypes );