Changeset 138 in dev

Timestamp:

Jun 12, 2007, 1:57:26 AM (17 years ago)

Author:

dai_9181

Message:

Member::initializeExpressionのリファクタリング

Files:

• BasicCompiler32/Compile_Var.cpp (modified) (3 diffs)
• BasicCompiler32/Opcode.h (modified) (1 diff)
• BasicCompiler64/Compile_Var.cpp (modified) (3 diffs)
• BasicCompiler64/Opcode.h (modified) (1 diff)
• BasicCompiler_Common/VariableOpe.cpp (modified) (1 diff)
• BasicCompiler_Common/VariableOpe.h (modified) (1 diff)
• BasicCompiler_Common/include/Member.h (modified) (2 diffs)
• BasicCompiler_Common/src/Member.cpp (modified) (4 diffs)

BasicCompiler32/Compile_Var.cpp

@@ -714 +714 @@
 }
 
-bool SetInitGlobalData(int offset,const Type &type,const int *SubScripts,char *InitBuf){
+bool SetInitGlobalData(int offset,const Type &type,const int *SubScripts,const char *lpszInitBuf){
     extern BYTE *initGlobalBuf;
     int i,i2,i3;
     char temporary[VN_SIZE];
+    char InitBuf[VN_SIZE];
+    lstrcpy( InitBuf, lpszInitBuf );
 
     if(InitBuf[0]=='['){
@@ -851 +853 @@
     return true;
 }
-bool InitLocalVar(int offset,const Type &type,const int *SubScripts,char *InitBuf){
+bool InitLocalVar(int offset,const Type &type,const int *SubScripts,const char *lpszInitBuf){
     int i,i2,i3;
     char temporary[VN_SIZE];
+    char InitBuf[VN_SIZE];
+    lstrcpy( InitBuf, lpszInitBuf );
 
     if(InitBuf[0]=='['){
@@ -1061 +1065 @@
 }
 
-void dim( char *VarName,int *SubScripts,Type &type,char *InitBuf,char *ConstractParameter,DWORD dwFlags){
+void dim( char *VarName,int *SubScripts,Type &type,const char *InitBuf,const char *ConstractParameter,DWORD dwFlags){
     if( UserProc::IsGlobalAreaCompiling() ){
         /////////////////////////

BasicCompiler32/Opcode.h

@@ -202 +202 @@
 void SetThisPtrToReg(int reg);
 bool GetVarOffset(bool isErrorEnabled,bool isWriteAccess,const char *NameBuffer,RELATIVE_VAR *pRelativeVar,Type &resultType,int *pss = 0);
-bool SetInitGlobalData(int offset,const Type &type,const int *SubScripts,char *InitBuf);
+bool SetInitGlobalData(int offset,const Type &type,const int *SubScripts,const char *InitBuf);
 #define DIMFLAG_INITDEBUGVAR            1
 #define DIMFLAG_NONCALL_CONSTRACTOR     2
 #define DIMFLAG_STATIC                  4
 #define DIMFLAG_CONST                   8
-void dim( char *VarName,int *SubScripts,Type &type,char *InitBuf,char *ConstractParameter,DWORD dwFlags);
+void dim( char *VarName,int *SubScripts,Type &type, const char *InitBuf,const char *ConstractParameter,DWORD dwFlags);
 void SetVarPtrToEax(RELATIVE_VAR *pRelativeVar);
 void SetVarPtrToReg(int reg,RELATIVE_VAR *pRelativeVar);

BasicCompiler64/Compile_Var.cpp

@@ -736 +736 @@
 }
 
-bool SetInitGlobalData(int offset,const Type &type,const int *SubScripts,char *InitBuf){
+bool SetInitGlobalData(int offset,const Type &type,const int *SubScripts,const char *lpszInitBuf){
     extern BYTE *initGlobalBuf;
     int i,i2,i3;
     char temporary[VN_SIZE];
+    char InitBuf[VN_SIZE];
+    lstrcpy( InitBuf, lpszInitBuf );
 
     if(InitBuf[0]=='['){
@@ -873 +875 @@
     return true;
 }
-bool InitLocalVar(int offset,const Type &type,const int *SubScripts,char *InitBuf){
+bool InitLocalVar(int offset,const Type &type,const int *SubScripts,const char *lpszInitBuf){
     int i,i2,i3;
     char temporary[VN_SIZE];
+    char InitBuf[VN_SIZE];
+    lstrcpy( InitBuf, lpszInitBuf );
 
     if(InitBuf[0]=='['){
@@ -1047 +1051 @@
 }
 
-void dim( char *VarName,int *SubScripts,Type &type,char *InitBuf,char *ConstractParameter,DWORD dwFlags){
+void dim( char *VarName,int *SubScripts,Type &type,const char *InitBuf,const char *ConstractParameter,DWORD dwFlags){
     if( UserProc::IsGlobalAreaCompiling() ){
         /////////////////////////

BasicCompiler64/Opcode.h

@@ -324 +324 @@
 void SetThisPtrToReg(int reg);
 bool GetVarOffset(bool isErrorEnabled,bool isWriteAccess,const char *NameBuffer,RELATIVE_VAR *pRelativeVar,Type &resultType,int *pss = NULL);
-bool SetInitGlobalData(int offset,const Type &type,const int *SubScripts,char *InitBuf);
+bool SetInitGlobalData(int offset,const Type &type,const int *SubScripts,const char *InitBuf);
 #define DIMFLAG_INITDEBUGVAR            0x01
 #define DIMFLAG_NONCALL_CONSTRACTOR     0x02
 #define DIMFLAG_STATIC                  0x04
 #define DIMFLAG_CONST                   0x08
-void dim( char *VarName,int *SubScripts,Type &type,char *InitBuf,char *ConstractParameter,DWORD dwFlags);
+void dim( char *VarName,int *SubScripts,Type &type, const char *InitBuf,const char *ConstractParameter,DWORD dwFlags);
 void SetVarPtrToReg(int reg,RELATIVE_VAR *pRelativeVar);
 bool Compile_AddGlobalRootsForGc();

BasicCompiler_Common/VariableOpe.cpp

@@ -1034 +1034 @@
 
 
-void AddGlobalVariable( const char *name,int *SubScripts, const Type &type,char *InitBuf,char *ConstractParameter,DWORD dwFlag){
+void AddGlobalVariable( const char *name,int *SubScripts, const Type &type,const char *InitBuf,const char *ConstractParameter,DWORD dwFlag){
     /////////////////////////
     // グローバル変数を追加

BasicCompiler_Common/VariableOpe.h

@@ -32 +32 @@
                         char *ConstractParameter );
 BOOL GetNowStaticVarFullName(char *VarName,char *FullName);
-void AddGlobalVariable( const char *name,int *SubScripts, const Type &type,char *InitBuf,char *ConstractParameter,DWORD dwFlag);
+void AddGlobalVariable( const char *name,int *SubScripts, const Type &type,const char *InitBuf,const char *ConstractParameter,DWORD dwFlag);
 void dim(char *Parameter,DWORD dwFlags);
 void OpcodeDim(char *Parameter,DWORD dwFlags);

BasicCompiler_Common/include/Member.h

@@ -15 +15 @@
     Type type;
     bool isConst;
+
+    string initializeExpression;
+    string constructParameter;
 public:
     int SubScripts[MAX_ARRAYDIM];
-
-    char *InitBuf;
-    char *ConstractParameter;
 
     int source_code_address;
@@ -42 +42 @@
     }
 
+    const string &GetInitializeExpression() const
+    {
+        return initializeExpression;
+    }
+    const string &GetConstructParameter() const
+    {
+        return constructParameter;
+    }
+
     CMember( Prototype::Accessibility accessibility, const string &name, const Type &type, bool isConst )
         : MemberPrototype( accessibility )

BasicCompiler_Common/src/Member.cpp

@@ -14 +14 @@
     //構文を解析
     char VarName[VN_SIZE];
-    char init_buf[VN_SIZE];
-    char constract_parameter[VN_SIZE];
-    GetDimentionFormat(buffer,VarName,SubScripts,type,init_buf,constract_parameter);
+    char initBuffer[VN_SIZE];
+    char lpszConstructParameter[VN_SIZE];
+    GetDimentionFormat(buffer,VarName,SubScripts,type,initBuffer,lpszConstructParameter);
 
     //重複チェック
@@ -30 +30 @@
 
     //初期データ
-    InitBuf=(char *)HeapAlloc(hHeap,0,lstrlen(init_buf)+1);
-    lstrcpy(InitBuf,init_buf);
+    initializeExpression = initBuffer;
 
     //コンストラクタ用のパラメータ
-    ConstractParameter=(char *)HeapAlloc(hHeap,0,lstrlen(constract_parameter)+1);
-    lstrcpy(ConstractParameter,constract_parameter);
+    constructParameter = lpszConstructParameter;
 
     //ソースコードの位置
@@ -53 +51 @@
 }
 CMember::~CMember(){
-    if(InitBuf) HeapDefaultFree(InitBuf);
-    if(ConstractParameter) HeapDefaultFree(ConstractParameter);
 }
 
@@ -80 +76 @@
                 member->SubScripts,
                 member->GetType(),
-                member->InitBuf,
-                member->ConstractParameter,
+                member->GetInitializeExpression().c_str(),
+                member->GetConstructParameter().c_str(),
                 0);