Changeset 62 in dev for BasicCompiler_Common

Timestamp:

Feb 22, 2007, 3:57:56 AM (18 years ago)

Author:

dai_9181

Message:

グローバル変数に対してByRefを指定できるようにした

Location:

BasicCompiler_Common

Files:

• Class.cpp (modified) (1 diff)
• Variable.cpp (modified) (4 diffs)
• Variable.h (modified) (1 diff)

BasicCompiler_Common/Class.cpp

@@ -127 +127 @@
             sprintf(temporary,"%s.%s",pobj_c->name,member->name);
             AddGlobalVariable(
+                false,
                 temporary,
                 member->SubScripts,

BasicCompiler_Common/Variable.cpp

@@ -1137 +1137 @@
 
 
-void AddGlobalVariable(char *name,int *SubScripts,TYPEINFO *pTypeInfo,int TypeSize,char *InitBuf,char *ConstractParameter,DWORD dwFlag){
+void AddGlobalVariable(bool isRef, char *name,int *SubScripts,TYPEINFO *pTypeInfo,int TypeSize,char *InitBuf,char *ConstractParameter,DWORD dwFlag){
     /////////////////////////
     // グローバル変数を追加
@@ -1159 +1159 @@
 
     GlobalVar=(VARIABLE *)HeapReAlloc(hHeap,0,GlobalVar,(MaxGlobalVarNum+1)*sizeof(VARIABLE));
+    VARIABLE *pVar = &GlobalVar[MaxGlobalVarNum];
+    MaxGlobalVarNum++;
+
+    if( isRef ){
+        //参照型
+        pVar->fRef = REF_VARIABLE;
+        TypeSize = PTR_SIZE;
+    }
+    else pVar->fRef=0;
 
     for(i2=1,i3=0;i3<255;i3++){
         //配列要素数
-        GlobalVar[MaxGlobalVarNum].SubScripts[i3]=SubScripts[i3];
+        pVar->SubScripts[i3]=SubScripts[i3];
 
         if(SubScripts[i3]==-1) break;
@@ -1170 +1179 @@
     if(VarSize%PTR_SIZE) VarSize+=PTR_SIZE-(VarSize%PTR_SIZE);
 
-    //新しいオブジェクトポインタを取得
-    VARIABLE *pVar = &GlobalVar[MaxGlobalVarNum];
-
-    //グローバル変数の個数を増加
-    MaxGlobalVarNum++;
-
     lstrcpy(pVar->name,name);
-    pVar->fRef = 0;
     if(dwFlag & DIMFLAG_CONST) pVar->bConst = true;
     else pVar->bConst = false;
@@ -1218 +1220 @@
             //単発式が初期値のオブジェクトの場合
             //初期値をコピーコンストラクタに渡す
+
+            if( isRef ){
+                SetRefVariable( name, InitBuf );
+            }
         }
         else{

BasicCompiler_Common/Variable.h

@@ -28 +28 @@
 BOOL GetDimentionFormat(const char *buffer, const bool isRef, char *VarName,int *SubScripts,TYPEINFO *pTypeInfo,char *InitBuf,char *ConstractParameter);
 BOOL GetNowStaticVarFullName(char *VarName,char *FullName);
-void AddGlobalVariable(char *name,int *SubScripts,TYPEINFO *pTypeInfo,int TypeSize,char *InitBuf,char *ConstractParameter,DWORD dwFlag);
+void AddGlobalVariable(bool isRef, char *name,int *SubScripts,TYPEINFO *pTypeInfo,int TypeSize,char *InitBuf,char *ConstractParameter,DWORD dwFlag);