Changeset 206 in dev for trunk/abdev/BasicCompiler_Common/VariableOpe.cpp

Timestamp:

Jul 12, 2007, 2:58:26 AM (17 years ago)

Author:

dai_9181

Message:

コード全体のリファクタリングを実施

File:

• trunk/abdev/BasicCompiler_Common/VariableOpe.cpp (modified) (54 diffs)

trunk/abdev/BasicCompiler_Common/VariableOpe.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include <jenga/include/smoothie/Smoothie.h>
 #include <jenga/include/smoothie/LexicalAnalysis.h>
@@ -4 +6 @@
 #include <Compiler.h>
 #include <LexicalScopingImpl.h>
-#include <VariableImpl.h>
+#include <Variable.h>
 #include <NamespaceSupporter.h>
 
@@ -247 +249 @@
 
 
-void GetArrange(char *variable,char *variAnswer,int *SubScripts){
+void GetArrange(char *variable,char *variAnswer, Subscripts &subscripts ){
     extern int cp;
-    int i,i2,i3,i4;
+    int i,i2,i4;
     double dbl;
     _int64 i64data;
@@ -261 +263 @@
 
             variAnswer[i]=0;
-            for(i++,i2=0,i3=0;;i++,i2++){
+            for(i++,i2=0;;i++,i2++){
                 if(variable[i]==','){
                     temporary[i2]=0;
@@ -274 +276 @@
                     }
 
-                    if(i64data<0){
+                    if(i64data<0)
+                    {
                         //error
-                        SubScripts[i3]=0;
+                        subscripts.push_back( 0 );
                     }
-                    else SubScripts[i3]=(int)i64data;
-                    i3++;
+                    else
+                    {
+                        subscripts.push_back( (int)i64data );
+                    }
                     i2=-1;
                     continue;
@@ -299 +304 @@
                     temporary[i2]=0;
                     if(i2==0){
-                        SubScripts[i3]=-2;
+                        subscripts.push_back( -2 );
                         break;
                     }
@@ -314 +319 @@
                     if(i64data<0){
                         //error
-                        SubScripts[i3]=0;
+                        subscripts.push_back( 0 );
                     }
-                    else SubScripts[i3]=(int)i64data;
-                    SubScripts[i3+1]=-1;
+                    else
+                    {
+                        subscripts.push_back( (int)i64data );
+                    }
                     break;
                 }
@@ -330 +337 @@
         variAnswer[i]=variable[i];
         if(variable[i]=='\0'){
-            SubScripts[0]=-1;
             break;
         }
@@ -337 +343 @@
 
 
-BOOL GetVarFormatString(char *buffer,char *array,char *array2,char *NestMember,CClass::RefType &refType){
+BOOL GetVarFormatString(char *buffer,char *array,char *array2,char *NestMember,ReferenceKind &refType){
     extern int cp;
     int i,i2,i3;
@@ -403 +409 @@
         if(buffer[i]=='.'){
             lstrcpy(NestMember,buffer+i+1);
-            refType = CClass::Dot;
+            refType = RefDot;
             buffer[i]=0;
             break;
@@ -409 +415 @@
         if(buffer[i]==1&&buffer[i+1]==ESC_PSMEM){
             lstrcpy(NestMember,buffer+i+2);
-            refType = CClass::Pointer;
+            refType = RefPointer;
             buffer[i]=0;
             break;
@@ -459 +465 @@
 }
 
-int JumpSubScripts(const int *ss){
+int JumpSubScripts( const Subscripts &subscripts ){
     //DIMで定義された並んだ配列の数だけアドレスを進める
-    int i,i2;
-    for(i=0,i2=1;i<255;i++){
-        if(ss[i]==-1) break;
-        i2*=ss[i]+1;
+    int i, i2;
+    for( i=0,i2=1; i<(int)subscripts.size(); i++ ){
+        i2 *= subscripts[i] + 1;
     }
     return i2;
@@ -478 +483 @@
     char lpPtrOffset[VN_SIZE];      //第2次配列
     char NestMember[VN_SIZE];   //入れ子メンバ
-    CClass::RefType refType = CClass::Non;
+    ReferenceKind refType = RefNon;
     lstrcpy(VarName,lpszMember);
     if(!GetVarFormatString(VarName,array,lpPtrOffset,NestMember,refType)) return false;
@@ -496 +501 @@
 
     //アクセシビリティをチェック
-    if( &objClass == Smoothie::Temp::pCompilingClass ){
+    if( &objClass == compiler.pCompilingClass ){
         //同一クラスオブジェクトの場合はプライベートアクセスを容認する
         if( pMember->IsNoneAccess() ){
@@ -519 +524 @@
     //ポインタ変数の場合
     if( resultType.IsPointer() ){
-        if(pMember->SubScripts[0]==-1){
+        if( pMember->GetSubscripts().size() == 0 ){
             lstrcpy(lpPtrOffset,array);
             array[0]=0;
@@ -531 +536 @@
     }
 
-    if( refType != CClass::Non ){
+    if( refType != RefNon ){
         //入れ子構造の場合
 
@@ -541 +546 @@
     }
 
-    if(array[0]==0&&pMember->SubScripts[0]!=-1){
+    if( array[0] == 0 && pMember->GetSubscripts().size() > 0 ){
         resultType.SetBasicType( resultType.GetBasicType() | FLAG_PTR );
         return true;
@@ -573 +578 @@
 
     // 先頭オブジェクトまたはクラス名と入れ子メンバに分割
-    CClass::RefType refType;
+    ReferenceKind refType;
     char member[VN_SIZE],array[VN_SIZE],lpPtrOffset[VN_SIZE];
     GetVarFormatString(simpleName,array,lpPtrOffset,member,refType);
@@ -587 +592 @@
 
     const Variable *pVar = NULL;
-    const int *pSubScripts;
 
     if( UserProc::IsLocalAreaCompiling() ){
@@ -594 +598 @@
         /////////////////
 
-        pVar = UserProc::CompilingUserProc().localVars.BackSearch( Symbol( VarName ) );
+        pVar = UserProc::CompilingUserProc().GetLocalVars().BackSearch( Symbol( VarName ) );
         if( pVar ){
             goto ok;
@@ -600 +604 @@
     }
 
-    if(Smoothie::Temp::pCompilingClass){
+    if(compiler.pCompilingClass){
         ///////////////////////
         // クラスメンバの参照
@@ -607 +611 @@
         if(lstrcmpi(variable,"This")==0){
             //Thisオブジェクト
-            resultType.SetType( DEF_OBJECT, Smoothie::Temp::pCompilingClass );
+            resultType.SetType( DEF_OBJECT, compiler.pCompilingClass );
             return true;
         }
@@ -620 +624 @@
 
             bool isFound = false;
-            BOOST_FOREACH( CMember *pMember, Smoothie::Temp::pCompilingClass->GetDynamicMembers() ){
+            BOOST_FOREACH( CMember *pMember, compiler.pCompilingClass->GetDynamicMembers() ){
                 if( pMember->GetName() == VarName ){
                     isFound = true;
@@ -629 +633 @@
         }
 
-        return GetMemberType(*Smoothie::Temp::pCompilingClass,variable,resultType,1,isErrorEnabled);
+        return GetMemberType(*compiler.pCompilingClass,variable,resultType,1,isErrorEnabled);
     }
 
@@ -643 +647 @@
         GetNowStaticVarFullName(VarName,temporary);
 
-        pVar = globalVars.Find( Symbol( temporary ) );
+        pVar = compiler.GetMeta().GetGlobalVars().Find( Symbol( temporary ) );
         if( pVar ){
             goto ok;
@@ -659 +663 @@
         char tempArray[VN_SIZE];
         {
-            CClass::RefType refType;
+            ReferenceKind refType;
             GetVarFormatString(temporary,tempArray,lpPtrOffset,tempMember,refType);
         }
@@ -672 +676 @@
         sprintf(temp2,"%s.%s",VarName,temporary);
 
-        pVar = globalVars.Find( Symbol( temp2 ) );
+        pVar = compiler.GetMeta().GetGlobalVars().Find( Symbol( temp2 ) );
         if( pVar ){
             lstrcpy(member,tempMember);
@@ -680 +684 @@
     }
 
-    if(Smoothie::Temp::pCompilingClass){
+    if(compiler.pCompilingClass){
         //自身のクラスから静的メンバを参照する場合
         char temp2[VN_SIZE];
-        sprintf(temp2,"%s.%s",Smoothie::Temp::pCompilingClass->GetName().c_str(),VarName);
-
-        pVar = globalVars.Find( Symbol( temp2 ) );
+        sprintf(temp2,"%s.%s",compiler.pCompilingClass->GetName().c_str(),VarName);
+
+        pVar = compiler.GetMeta().GetGlobalVars().Find( Symbol( temp2 ) );
         if( pVar ){
             goto ok;
@@ -696 +700 @@
     ////////////////////
 
-    pVar = globalVars.BackSearch( Symbol( VarName ) );
+    pVar = compiler.GetMeta().GetGlobalVars().BackSearch( Symbol( VarName ) );
     if( pVar ){
         goto ok;
@@ -708 +712 @@
 
     //ポインタ変数の場合
-    if( pVar->IsPointer() ){
+    if( pVar->GetType().IsPointer() ){
         if( !pVar->IsArray() ){
             lstrcpy(lpPtrOffset,array);
@@ -721 +725 @@
     }
 
-    resultType = (*pVar);
-    pSubScripts=pVar->GetSubScriptsPtr();
-
+    resultType = pVar->GetType();
 
     if(member[0]){
@@ -732 +734 @@
     }
 
-    if(array[0]==0&&pSubScripts[0]!=-1){
+    if( array[0] == 0 && pVar->GetSubscripts().size() > 0 ){
         //配列の先頭ポインタを示す場合
         resultType.SetBasicType( resultType.GetBasicType() | FLAG_PTR );
@@ -751 +753 @@
 }
 
-bool GetVarOffsetReadOnly(const char *NameBuffer,RELATIVE_VAR *pRelativeVar,Type &resultType,int *pss ){
+bool GetVarOffsetReadOnly(const char *NameBuffer,RELATIVE_VAR *pRelativeVar,Type &resultType, Subscripts *pResultSubscripts ){
     //読み取り専用で変数へアクセス
     return GetVarOffset(
@@ -759 +761 @@
         pRelativeVar,
         resultType,
-        pss);
-}
-bool GetVarOffsetReadWrite(const char *NameBuffer,RELATIVE_VAR *pRelativeVar,Type &resultType,int *pss ){
+        pResultSubscripts
+    );
+}
+bool GetVarOffsetReadWrite(const char *NameBuffer,RELATIVE_VAR *pRelativeVar,Type &resultType, Subscripts *pResultSubscripts ){
     //読み書き両用で変数へアクセス
     return GetVarOffset(
@@ -769 +772 @@
         pRelativeVar,
         resultType,
-        pss);
+        pResultSubscripts
+    );
 }
 
@@ -776 +780 @@
 bool GetDimentionFormat( const char *buffer,
                         char *VarName,
-                        int *SubScripts,
+                        Subscripts &subscripts,
                         Type &type,
                         char *InitBuf,
@@ -924 +928 @@
     }
 
-    GetArrange(variable,VarName,SubScripts);
+    GetArrange(variable,VarName,subscripts);
     return true;
 }
@@ -934 +938 @@
     }
 
-    UserProc &proc = UserProc::CompilingUserProc();
+    const UserProc &proc = UserProc::CompilingUserProc();
 
     //Static識別
@@ -940 +944 @@
 
     //クラス名
-    if(Smoothie::Temp::pCompilingClass){
-        lstrcat(FullName,Smoothie::Temp::pCompilingClass->GetName().c_str());
+    if(compiler.pCompilingClass){
+        lstrcat(FullName,compiler.pCompilingClass->GetName().c_str());
         lstrcat(FullName,"%");
     }
@@ -951 +955 @@
     //ID
     char temp[255];
-    sprintf(temp,"%x",proc.id);
+    sprintf(temp,"%x",proc.GetId());
     lstrcat(FullName,temp);
     lstrcat(FullName,"%");
@@ -962 +966 @@
 
 
-void AddGlobalVariable( const char *name,int *SubScripts, const Type &type,const char *InitBuf,const char *ConstractParameter,DWORD dwFlag){
+void AddGlobalVariable( const char *name, const Subscripts &subscripts, const Type &type,const char *InitBuf,const char *ConstractParameter,DWORD dwFlag){
     /////////////////////////
     // グローバル変数を追加
@@ -969 +973 @@
     extern int AllGlobalVarSize;
 
-    if( globalVars.DuplicateCheck( Symbol( name ) ) ){
+    if( compiler.GetMeta().GetGlobalVars().DuplicateCheck( Symbol( name ) ) ){
         //２重定義のエラー
         SetError(15,name,cp);
@@ -977 +981 @@
     bool isConst = ( dwFlag & DIMFLAG_CONST ) ? true:false;
 
-    Variable *pVar = new VariableImpl( compiler.GetNamespaceSupporter().GetLivingNamespaceScopes(), name, type, isConst );
-
-    if( SubScripts[0] != -1 ){
+    Variable *pVar = new Variable( compiler.GetNamespaceSupporter().GetLivingNamespaceScopes(), name, type, isConst, false, ConstractParameter );
+
+    if( subscripts.size() > 0 ){
         //配列あり
-        pVar->SetArray( SubScripts );
-    }
-
-    //コンストラクタ用パラメータ
-    pVar->paramStrForConstructor = ConstractParameter;
+        pVar->SetArray( subscripts );
+    }
 
     //レキシカルスコープ
-    pVar->ScopeLevel=GetLexicalScopes().GetNowLevel();
-    pVar->ScopeStartAddress=GetLexicalScopes().GetStartAddress();
+    pVar->SetScopeLevel( GetLexicalScopes().GetNowLevel() );
+    pVar->SetScopeStartAddress( GetLexicalScopes().GetStartAddress() );
     pVar->bLiving=TRUE;
 
@@ -996 +997 @@
 
     // 変数を追加
-    globalVars.push_back( pVar );
+    compiler.GetMeta().GetGlobalVars().push_back( pVar );
 
     //アラインメントを考慮
     int alignment = 0;
-    if( pVar->IsStruct() ){
-        alignment = pVar->GetClass().iAlign;
+    if( pVar->GetType().IsStruct() ){
+        alignment = pVar->GetType().GetClass().iAlign;
     }
 
@@ -1013 +1014 @@
         }
 
-        pVar->offset=AllInitGlobalVarSize;
+        pVar->SetOffsetAddress( AllInitGlobalVarSize );
         AllInitGlobalVarSize += pVar->GetMemorySize();
     }
@@ -1025 +1026 @@
         }
 
-        pVar->offset=AllGlobalVarSize | 0x80000000;
+        pVar->SetOffsetAddress( AllGlobalVarSize | 0x80000000 );
         AllGlobalVarSize += pVar->GetMemorySize();
     }
@@ -1031 +1032 @@
     if(InitBuf[0]){
         int result = 0;
-        if( !pVar->IsObject() ){
+        if( !pVar->GetType().IsObject() ){
             //初期バッファにデータをセット
             extern BYTE *initGlobalBuf;
@@ -1039 +1040 @@
                 AllInitGlobalVarSize);
 
-            result = SetInitGlobalData(pVar->offset,
-                *pVar,
-                pVar->GetSubScriptsPtr(),
+            result = SetInitGlobalData(pVar->GetOffsetAddress(),
+                pVar->GetType(),
+                pVar->GetSubscripts(),
                 InitBuf);
         }
@@ -1070 +1071 @@
         const CMethod *method = type.GetClass().GetDestructorMethod();
         if( method ){
-            method->pUserProc->Using();
+            method->GetUserProc().Using();
         }
     }
@@ -1104 +1105 @@
 
         //定数と２重定義されていないる場合は抜け出す
-        if(CDBConst::obj.GetBasicType(VarName)){
+        if(compiler.GetMeta().GetGlobalConsts().GetBasicType(VarName)){
             return;
         }
 
         //定数マクロとして定義されている場合は抜け出す
-        if(GetConstHash(VarName)){
+        if( compiler.GetMeta().GetGlobalConstMacros().IsExist( VarName ) )
+        {
             return;
         }
@@ -1115 +1117 @@
 
     //構文を解析
-    int SubScripts[MAX_ARRAYDIM];
     Type type;
     char InitBuf[8192];
     char ConstractParameter[VN_SIZE];
-    if(!GetDimentionFormat(Parameter, VarName,SubScripts,type,InitBuf,ConstractParameter))
+    Subscripts subscripts;
+    if(!GetDimentionFormat(Parameter, VarName,subscripts,type,InitBuf,ConstractParameter))
         return;
 
 
     //定数と２重定義されていないかを調べる
-    if(CDBConst::obj.GetBasicType(VarName)){
+    if(compiler.GetMeta().GetGlobalConsts().GetBasicType(VarName)){
         SetError(15,VarName,cp);
         return;
@@ -1130 +1132 @@
 
     //定数マクロとして定義されている場合
-    if(GetConstHash(VarName)){
+    if( compiler.GetMeta().GetGlobalConstMacros().IsExist( VarName ) ){
         SetError(15,VarName,cp);
         return;
@@ -1165 +1167 @@
         GetNowStaticVarFullName(VarName,temporary);
 
-        dim( temporary,SubScripts,type,InitBuf,ConstractParameter,dwFlags );
+        dim( temporary,subscripts,type,InitBuf,ConstractParameter,dwFlags );
 
         /*
@@ -1173 +1175 @@
     }
     else{
-        dim( VarName,SubScripts,type,InitBuf,ConstractParameter,dwFlags );
+        dim( VarName,subscripts,type,InitBuf,ConstractParameter,dwFlags );
     }
 }