Changeset 11 in dev for BasicCompiler_Common

Timestamp:

Dec 8, 2006, 3:25:27 AM (17 years ago)

Author:

dai_9181

Message:

Const変数の書き込み規制を有効化（グローバル/ローカル変数のみ）
定数オブジェクトと定数メンバは未実装。

Location:

BasicCompiler_Common

Files:

• NumOpe_GetType.cpp (modified) (1 diff)
• Variable.cpp (modified) (4 diffs)
• calculation.cpp (modified) (1 diff)
• common.h (modified) (3 diffs)
• error.cpp (modified) (1 diff)
• gc.cpp (modified) (3 diffs)

BasicCompiler_Common/NumOpe_GetType.cpp

@@ -301 +301 @@
     BOOL bLiteralCalculation=1;
 
-    double dbl;
     int sp;
     int type[255];

BasicCompiler_Common/Variable.cpp

@@ -815 +815 @@
 }
 
+BOOL GetVarOffsetReadOnly(char *NameBuffer,int *pType,RELATIVE_VAR *pRelativeVar,LONG_PTR *plpIndex,int *pss){
+    //読み取り専用で変数へアクセス
+    return GetVarOffset(
+        true,       //エラー表示有効
+        false,      //書き込みアクセスは無し
+        NameBuffer,
+        pType,
+        pRelativeVar,
+        plpIndex,
+        pss);
+}
+BOOL GetVarOffsetReadWrite(char *NameBuffer,int *pType,RELATIVE_VAR *pRelativeVar,LONG_PTR *plpIndex,int *pss){
+    //読み書き両用で変数へアクセス
+    return GetVarOffset(
+        true,       //エラー表示有効
+        true,       //書き込みアクセス
+        NameBuffer,
+        pType,
+        pRelativeVar,
+        plpIndex,
+        pss);
+}
+
 
 
@@ -1017 +1040 @@
 
     lstrcpy(pVar->name,name);
-    if(dwFlag & DIMFLAG_CONST) pVar->bConst = 1;
-    else pVar->bConst = 0;
+    if(dwFlag & DIMFLAG_CONST) pVar->bConst = true;
+    else pVar->bConst = false;
     if(SubScripts[0]==-1) pVar->bArray=0;
     else pVar->bArray=1;
@@ -1054 +1077 @@
         AllInitGlobalVarSize);
     if(InitBuf[0]){
+        //初期代入時のみ、書き込みアクセスを許可する
+        bool bConstBack = pVar->bConst;
+        pVar->bConst = false;
+
         int result = SetInitGlobalData(pVar->offset,
             pVar->type,
@@ -1066 +1093 @@
             OpcodeCalc(temporary);
         }
+
+        pVar->bConst = bConstBack;
     }
 

BasicCompiler_Common/calculation.cpp

@@ -1299 +1299 @@
 
                 //変数
-                RELATIVE_VAR RelativeVar;
                 CClass *pobj_Class;
-                if(!GetVarOffset(1,Command+i2,&type,&RelativeVar,(LONG_PTR *)&pobj_Class)){
+                type = GetVarType(Command+i2,(LONG_PTR *)&pobj_Class,1);
+                if(type==-1 || type ==0){
                     //エラー
                     return -1;

BasicCompiler_Common/common.h

@@ -166 +166 @@
 
     //定数変数かどうか
-    BOOL bConst;
+    bool bConst;
 
     BOOL bArray;
@@ -386 +386 @@
 #include "../BasicCompiler_Common/DebugSection.h"
 #include "../BasicCompiler_Common/LexicalScoping.h"
+#include "../BasicCompiler_Common/Variable.h"
 
 
@@ -413 +414 @@
 SUBINFO **GetOverloadObjectSubHash(char *name,CClass *pobj_c, int *pNum);
 SUBINFO **GetOverloadSubHash(char *name,int *pNum);
-
-//Variable.cpp
-BOOL IsVariableTopChar(char c);
-BOOL IsVariableChar(char c);
-BOOL IsPtrType(int type);
-BOOL IsSignedType(int type);
-BOOL IsNaturalWholeNumberType(int type);
-BOOL IsWholeNumberType(int type);
-BOOL IsRealNumberType(int type);
-BOOL Is64Type(int type);
-int GetSignedType(int type);
-int GetUnsignedType(int type);
-int GetTypeSize(int type,LONG_PTR lpIndex);
-int GetPtrType(int type,LONG_PTR lpIndex);
-int GetTypeFixed(char *TypeName,LONG_PTR *lpNum);
-void GetOriginalTypeName(char *buffer);
-BOOL GetTypeName(int type,LONG_PTR lpIndex,char *name);
-BOOL GetVarFormatString(char *buffer,char *array,char *array2,char *NestMember,int *pRefType);
-void GetArrayElement(char *buffer,char *variable,char *array_element);
-BOOL CheckVarNameError(char *name,int NowLine);
-int JumpSubScripts(int *ss);
-void GetArrange(char *variable,char *variAnswer,int *SubScripts);
-int GetTypeFromSimpleName(char *variable);
-int GetVarType(char *NameBuffer,LONG_PTR *plpIndex,BOOL bError);
-BOOL GetDimentionFormat(char *buffer,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);
 
 //Object.cpp

BasicCompiler_Common/error.cpp

@@ -142 +142 @@
     if(num==59) sprintf(msg,"マニフェスト ファイル \"%s\" の読み込みに失敗。",KeyWord);
     if(num==60) lstrcpy(msg,"Staticステートメントはグローバル領域では使用できません。");
+    if(num==61) sprintf(msg,"\"%s\" Const定義の変数には書き込めません。",KeyWord);
 
 

BasicCompiler_Common/gc.cpp

@@ -24 +24 @@
     OpcodeDim(temporary,0);
 
-    GetVarOffset(1,"_System_gc_GlobalRoot_StartPtr",&type,&RelativeVar,&lpIndex);
+    GetVarOffsetReadWrite("_System_gc_GlobalRoot_StartPtr",&type,&RelativeVar,&lpIndex);
 
     //mov rax,ptr
@@ -44 +44 @@
     OpcodeDim(temporary,0);
 
-    GetVarOffset(1,"_System_gc_GlobalRoot_Size",&type,&RelativeVar,&lpIndex);
+    GetVarOffsetReadWrite("_System_gc_GlobalRoot_Size",&type,&RelativeVar,&lpIndex);
 
     //mov rax,ptr
@@ -65 +65 @@
     OpcodeDim(temporary,0);
 
-    GetVarOffset(1,"_System_gc_StackRoot_StartPtr",&type,&RelativeVar,&lpIndex);
+    GetVarOffsetReadWrite("_System_gc_StackRoot_StartPtr",&type,&RelativeVar,&lpIndex);
 
     //mov rax,rsp