Changeset 137 in dev for BasicCompiler_Common/include/Method.h

Timestamp:

Jun 8, 2007, 3:11:47 AM (17 years ago)

Author:

dai_9181

Message:

アクセシビリティ周りをリファクタリングした。

File:

• BasicCompiler_Common/include/Method.h (modified) (6 diffs)

BasicCompiler_Common/include/Method.h

@@ -4 +4 @@
 #include <vector>
 
+#include "../Class.h"
 #include <windows.h>
 
@@ -12 +13 @@
 void SetError();
 
-class CMethod
+class CMethod : public MemberPrototype
 {
 public:
     UserProc *pUserProc;
-    DWORD dwAccess;
 
-    CMethod( UserProc *pUserProc, DWORD dwAccess )
-        : pUserProc( pUserProc )
-        , dwAccess( dwAccess )
+    CMethod( UserProc *pUserProc, Prototype::Accessibility accessibility )
+        : MemberPrototype( accessibility )
+        , pUserProc( pUserProc )
     {
     }
@@ -41 +41 @@
 
 public:
-    DynamicMethod( UserProc *pUserProc, DWORD dwAccess, bool isAbstract, bool isVirtual, bool isConst, const CClass *pInheritsClass = NULL )
-        : CMethod( pUserProc, dwAccess )
+    DynamicMethod( UserProc *pUserProc, Prototype::Accessibility accessibility, bool isAbstract, bool isVirtual, bool isConst, const CClass *pInheritsClass = NULL )
+        : CMethod( pUserProc, accessibility )
         , isAbstract( isAbstract )
         , isVirtual( isVirtual )
@@ -50 +50 @@
     }
     DynamicMethod( const CMethod &method )
-        : CMethod( method.pUserProc, method.dwAccess )
+        : CMethod( method.pUserProc, method.GetAccessibility() )
         , isAbstract( method.IsAbstract() )
         , isVirtual( method.IsVirtual() )
@@ -90 +90 @@
 {
 public:
-    StaticMethod( UserProc *pUserProc, DWORD dwAccess )
-        : CMethod( pUserProc, dwAccess )
+    StaticMethod( UserProc *pUserProc, Prototype::Accessibility accessibility )
+        : CMethod( pUserProc, accessibility )
     {
     }
@@ -116 +116 @@
 
     //メンバ、メソッドの追加
-    void Add( UserProc *pUserProc,DWORD dwAccess, bool isConst, bool isAbstract, bool isVirtual );
-    void AddStatic(UserProc *pUserProc,DWORD dwAccess);
+    void Add( UserProc *pUserProc, Prototype::Accessibility accessibility, bool isConst, bool isAbstract, bool isVirtual );
+    void AddStatic(UserProc *pUserProc,Prototype::Accessibility accessibility);
 
     const CMethod *GetMethodPtr( UserProc *pUserProc ) const;