Changeset 137 in dev for BasicCompiler_Common/src

Timestamp:

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

Author:

dai_9181

Message:

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

Location:

BasicCompiler_Common/src

Files:

• Member.cpp (modified) (5 diffs)
• Method.cpp (modified) (1 diff)

BasicCompiler_Common/src/Member.cpp

@@ -7 +7 @@
 #include <Member.h>
 
-CMember::CMember( CClass *pobj_c, DWORD access, bool isConst, bool isRef, char *buffer, int nowLine ){
+CMember::CMember( CClass *pobj_c, Prototype::Accessibility accessibility, bool isConst, bool isRef, char *buffer, int nowLine )
+    : MemberPrototype( accessibility )
+{
     extern int cp;
 
@@ -14 +16 @@
     char init_buf[VN_SIZE];
     char constract_parameter[VN_SIZE];
-    GetDimentionFormat(buffer,VarName,SubScripts,*this,init_buf,constract_parameter);
+    GetDimentionFormat(buffer,VarName,SubScripts,type,init_buf,constract_parameter);
 
     //重複チェック
@@ -23 +25 @@
     //メンバ名
     name = VarName;
-
-    //アクセス権
-    dwAccess=access;
 
     //定数扱いかどうか
@@ -41 +40 @@
     source_code_address=nowLine;
 }
-CMember::CMember(CMember &member):
-    Type( member )
+CMember::CMember(CMember &member)
+    : MemberPrototype( member.GetAccessibility() )
+    , name( member.GetName() )
+    , type( member.GetType() )
+    , isConst( member.IsConst() )
 {
-
-    //name
-    name = member.name;
-
-    //定数扱いかどうか
-    isConst = member.isConst;
-
     //SubScripts
     memcpy(SubScripts,member.SubScripts,MAX_ARRAYDIM*sizeof(int));
@@ -84 +79 @@
                 temporary,
                 member->SubScripts,
-                *member,
+                member->GetType(),
                 member->InitBuf,
                 member->ConstractParameter,

BasicCompiler_Common/src/Method.cpp

@@ -14 +14 @@
 }
 
-void Methods::Add( UserProc *pUserProc,DWORD dwAccess, bool isConst, bool isAbstract, bool isVirtual ){
-    CMethod *pMethod = new DynamicMethod( pUserProc, dwAccess, isAbstract, isVirtual, isConst );
+void Methods::Add( UserProc *pUserProc,Prototype::Accessibility accessibility, bool isConst, bool isAbstract, bool isVirtual ){
+    CMethod *pMethod = new DynamicMethod( pUserProc, accessibility, isAbstract, isVirtual, isConst );
     this->push_back( pMethod );
     pUserProc->SetMethod( pMethod );
 }
-void Methods::AddStatic(UserProc *pUserProc,DWORD dwAccess){
-    CMethod *pMethod = new StaticMethod( pUserProc, dwAccess );
+void Methods::AddStatic(UserProc *pUserProc, Prototype::Accessibility accessibility ){
+    CMethod *pMethod = new StaticMethod( pUserProc, accessibility );
     this->push_back( pMethod );
     pUserProc->SetMethod( pMethod );