Changeset 8 in dev

Timestamp:

Dec 7, 2006, 3:10:05 AM (18 years ago)

Author:

dai_9181

Message:

Constステートメントで定数変数を宣言できるように改良。

Location:

BasicCompiler32

Files:

• Compile_Var.cpp (modified) (6 diffs)
• NumOpe.cpp (modified) (3 diffs)
• Opcode.h (modified) (1 diff)

BasicCompiler32/Compile_Var.cpp

@@ -853 +853 @@
     int CalcType;
     LONG_PTR lpCalcIndex;
-    CalcType=StaticCalculation(true, InitBuf,type,&i64data,&lpCalcIndex);
+    CalcType=StaticCalculation(false, InitBuf,type,&i64data,&lpCalcIndex);
+    if(!CalcType){
+        //動的データだった場合
+        return 0;
+    }
     if(IsRealNumberType(CalcType)){
         memcpy(&dbl,&i64data,sizeof(double));
@@ -995 +999 @@
     extern HANDLE hHeap;
     int i2,i3,VarSize;
+    char VarName[VN_SIZE];
+
+
+    if(dwFlag & DIMFLAG_CONST){
+        //////////////////////////////////
+        // 定数変数の場合を考慮
+        //////////////////////////////////
+        for(i2=0;;i2++){
+            if(Parameter[i2] == '=' ||
+                Parameter[i2] == 1 && Parameter[i2] == ESC_AS ||
+                Parameter[i2] =='('){
+                    VarName[i2] = 0;
+                    break;
+            }
+            VarName[i2] = Parameter[i2];
+        }
+
+        //定数と２重定義されていないる場合は抜け出す
+        if(CDBConst::obj.GetType(VarName)){
+            return;
+        }
+
+        //定数マクロとして定義されている場合は抜け出す
+        if(GetConstHash(VarName)){
+            return;
+        }
+    }
+
 
     //構文を解析
-    char VarName[VN_SIZE];
     int SubScripts[MAX_ARRAYDIM];
     TYPEINFO TypeInfo;
@@ -1005 +1036 @@
         return;
 
+
+    //定数と２重定義されていないかを調べる
+    if(CDBConst::obj.GetType(VarName)){
+        SetError(15,VarName,cp);
+        return;
+    }
+
+    //定数マクロとして定義されている場合
+    if(GetConstHash(VarName)){
+        SetError(15,VarName,cp);
+        return;
+    }
+
+
     //タイプサイズを取得
     int TypeSize;
     TypeSize=GetTypeSize(TypeInfo.type,TypeInfo.u.lpIndex);
-
-    //定数と２重定義されていないかを調べる
-    if(GetConstHash(VarName)){
-        SetError(15,VarName,cp);
-        return;
-    }
 
     if(dwFlag&DIMFLAG_STATIC){
@@ -1071 +1110 @@
             if(VarSize%4) VarSize+=4-(VarSize%4);
 
+            VARIABLE *pVar = &LocalVar[MaxLocalVarNum];
+
+            MaxLocalVarNum++;
+
             //変数データを追加
-            lstrcpy(LocalVar[MaxLocalVarNum].name,VarName);
-            LocalVar[MaxLocalVarNum].fRef=0;
-            if(SubScripts[0]==-1) LocalVar[MaxLocalVarNum].bArray=0;
-            else LocalVar[MaxLocalVarNum].bArray=1;
-            LocalVar[MaxLocalVarNum].type=TypeInfo.type;
-            LocalVar[MaxLocalVarNum].u.index=TypeInfo.u.lpIndex;
+            lstrcpy(pVar->name,VarName);
+            pVar->fRef=0;
+            if(dwFlag & DIMFLAG_CONST) pVar->bConst = 1;
+            else pVar->bConst = 0;
+            if(SubScripts[0]==-1) pVar->bArray=0;
+            else pVar->bArray=1;
+            pVar->type=TypeInfo.type;
+            pVar->u.index=TypeInfo.u.lpIndex;
             AllLocalVarSize+=VarSize;
-            LocalVar[MaxLocalVarNum].offset=AllLocalVarSize;
+            pVar->offset=AllLocalVarSize;
 
             //レキシカルスコープ
-            LocalVar[MaxLocalVarNum].ScopeLevel=obj_LexScopes.GetNowLevel();
-            LocalVar[MaxLocalVarNum].ScopeStartAddress=obj_LexScopes.GetStartAddress();
-            LocalVar[MaxLocalVarNum].bLiving=TRUE;
+            pVar->ScopeLevel=obj_LexScopes.GetNowLevel();
+            pVar->ScopeStartAddress=obj_LexScopes.GetStartAddress();
+            pVar->bLiving=TRUE;
 
             if(InitBuf[0]){
-                InitLocalVar(-LocalVar[MaxLocalVarNum].offset,
-                    LocalVar[MaxLocalVarNum].type,
-                    LocalVar[MaxLocalVarNum].u.index,
-                    LocalVar[MaxLocalVarNum].SubScripts,
+                int result = InitLocalVar(-pVar->offset,
+                    pVar->type,
+                    pVar->u.index,
+                    pVar->SubScripts,
                     InitBuf);
+
+                if(!result){
+                    //動的な式だった場合は代入演算を行う
+                    char temporary[8192];
+                    sprintf(temporary,"%s=%s",VarName,InitBuf);
+                    OpcodeCalc(temporary);
+                }
             }
             else{
@@ -1106 +1158 @@
                 //add eax,offset
                 OpBuffer[obp++]=(char)0x05;
-                *((long *)(OpBuffer+obp))=-LocalVar[MaxLocalVarNum].offset;
+                *((long *)(OpBuffer+obp))=-pVar->offset;
                 AddLocalVarAddrSchedule();
                 obp+=sizeof(long);
@@ -1122 +1174 @@
                 obp+=sizeof(long);
             }
-
-            MaxLocalVarNum++;
         }
 

BasicCompiler32/NumOpe.cpp

@@ -438 +438 @@
                     //////////////
 
-                    i3=GetConstValue(term,&dbl,temporary,&index_stack[sp]);
-                    if(i3!=-1){
+                    i3 = CDBConst::obj.GetType(term);
+                    if(i3){
                         type[sp]=i3;
                         if(IsRealNumberType(i3)){
                             //実数
+                            double dbl = CDBConst::obj.GetDoubleData(term);
                             memcpy(&i64data,&dbl,sizeof(double));
                             goto Literal;
@@ -448 +449 @@
                         else if(IsWholeNumberType(i3)){
                             //整数
-                            i64data=(_int64)dbl;
+                            i64data = CDBConst::obj.GetWholeData(term);
                             goto Literal;
                         }
-                        else if(Is64Type(i3)){
-                            //64ビット整数値
-                            memcpy(&i64data,&dbl,sizeof(_int64));
-                            goto Literal;
-                        }
-                        else if(i3==DEF_STRING){
+                        /*else if(i3==DEF_STRING){
                             //リテラル文字列
 
@@ -464 +460 @@
                             memcpy(term,temporary,i3);
                             goto StrLiteral;
-                        }
+                        }*/
                         else{
                             SetError(300,NULL,cp);

BasicCompiler32/Opcode.h

@@ -174 +174 @@
 BOOL GetVarOffset(BOOL bError,char *NameBuffer,int *pType,RELATIVE_VAR *pRelativeVar,LONG_PTR *plpIndex,int *pss=0);
 BOOL SetInitGlobalData(int offset,int type,LONG_PTR lpIndex,int *SubScripts,char *InitBuf);
-#define DIMFLAG_INITDEBUGVAR 1
-#define DIMFLAG_NONCALL_CONSTRACTOR 2
-#define DIMFLAG_STATIC 4
+#define DIMFLAG_INITDEBUGVAR            1
+#define DIMFLAG_NONCALL_CONSTRACTOR     2
+#define DIMFLAG_STATIC                  4
+#define DIMFLAG_CONST                   8
 void OpcodeDim(char *Parameter,DWORD dwFlag);
 void SetVarPtrToEax(RELATIVE_VAR *pRelativeVar);