Changeset 7 in dev

Timestamp:

Dec 7, 2006, 3:09:44 AM (18 years ago)

Author:

dai_9181

Message:

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

Location:

BasicCompiler_Common

Files:

• Compile.cpp (modified) (1 diff)
• Const.cpp (modified) (5 diffs)
• Const.h (modified) (3 diffs)
• Intermediate_Step2.cpp (modified) (3 diffs)
• NumOpe_GetType.cpp (modified) (1 diff)
• Variable.cpp (modified) (2 diffs)
• calculation.cpp (modified) (5 diffs)
• common.h (modified) (2 diffs)

BasicCompiler_Common/Compile.cpp

@@ -111 +111 @@
         switch(Command[1]){
             case ESC_CONST:
+                OpcodeDim(Command+2, DIMFLAG_CONST);
+                break;
+
             case ESC_TYPEDEF:
                 break;

BasicCompiler_Common/Const.cpp

@@ -1 +1 @@
 #include "common.h"
-
+#include OPCODE_H_PATH  //opcode.h
+
+
+//シングルトンオブジェクト
+CDBConst CDBConst::obj;
 
 
@@ -12 +16 @@
 }
 
-
-
-CConst::CConst(char *Name, char *Expression):CConstBase(Name)
+char *CConstBase::GetName(){
+    return Name;
+}
+
+
+
+CConst::CConst(char *Name, int Type, _int64 i64data):CConstBase(Name)
 {
-    LONG_PTR lpIndex;
-    Type = StaticCalculation(false, Expression, 0, &i64data, &lpIndex);
+    this->Type = Type;
+    this->i64data = i64data;
+
+    //連結リストを初期化
+    pNext = 0;
+}
+CConst::CConst(char *Name, int value):CConstBase(Name)
+{
+    Type = DEF_LONG;
+    i64data = value;
+
+    //連結リストを初期化
+    pNext = 0;
 }
 CConst::~CConst(){
-}
+    //連結先のオブジェクトを破棄
+    if(pNext){
+        delete pNext;
+        pNext = 0;
+    }
+}
+
+int CConst::GetType(){
+    return Type;
+}
+_int64 CConst::GetWholeData(){
+    return i64data;
+}
+double CConst::GetDoubleData(){
+    double dbl;
+    memcpy(&dbl,&i64data,sizeof(_int64));
+    return dbl;
+}
+
+
 
 CConstMacro::CConstMacro(char *Name, char *Expression):CConstBase(Name)
@@ -30 +68 @@
 
 
+
+
 CDBConst::CDBConst(){
-    //定数管理領域を初期化
-    ppobj_Const = (CConst **)malloc(1);
-    NumOfConst = 0;
-
-    //定数マクロ管理領域を初期化
-    ppobj_Macro = (CConstMacro **)malloc(1);
-    NumOfMacro = 0;
+    memset(this,0,sizeof(CDBConst));
+
+    ppHash = (CConst **)calloc(MAX_HASH*sizeof(CConst *),1);
+    Init();
 }
 CDBConst::~CDBConst(){
+    Free();
+
+    free(ppHash);
+}
+
+//解放
+void CDBConst::Free(){
     int i;
-    for(i=0; i<NumOfConst; i++){
-        delete ppobj_Const[i];
-    }
-    free(ppobj_Const);
-    ppobj_Const = 0;
-
-    for(i=0; i<NumOfMacro; i++){
-        delete ppobj_Macro[i];
-    }
-    free(ppobj_Macro);
-    ppobj_Macro = 0;
-}
-
+    for(i=0; i<MAX_HASH; i++){
+        if(ppHash[i]){
+            delete ppHash[i];
+            ppHash[i] = 0;
+        }
+    }
+}
+
+//初期化
+void CDBConst::Init(){
+    Free();
+}
+
+void AddConstData(char *Command);
 void CDBConst::Add(char *buffer){
     int i;
@@ -71 +116 @@
     }
 
+    //重複チェック
+    if(GetType(Name)){
+        SetError(15,Name,cp);
+        return;
+    }
+
     if(buffer[i] == '('){
         //定数マクロ
 
         //未完成
+        AddConstData(buffer);
     }
     else{
@@ -84 +136 @@
 }
 
+void CDBConst::AddConst(char *Name, CConst *newconst){
+    int key = hash_default(Name);
+
+    //ハッシュリストに追加
+    if(ppHash[key]){
+        CConst *pConst = ppHash[key];
+        while(pConst->pNext){
+            pConst = pConst->pNext;
+        }
+
+        pConst->pNext = newconst;
+    }
+    else{
+        ppHash[key] = newconst;
+    }
+}
 void CDBConst::AddConst(char *Name, char *Expression){
-    CConst *newconst = new CConst(Name, Expression);
-
-    //管理クラスへ追加
-    ppobj_Const = (CConst **)realloc( ppobj_Const, (NumOfConst + 1) * sizeof(CConst) );
-    ppobj_Const[NumOfConst] = newconst;
-    NumOfConst++;
-}
+    LONG_PTR lpIndex;
+    _int64 i64data;
+    int Type = StaticCalculation(false, Expression, 0, &i64data, &lpIndex);
+
+    if(Type){
+        //リテラル値の場合
+        //登録を行う
+
+        CConst *newconst = new CConst(Name, Type, i64data);
+
+        AddConst(Name, newconst);
+    }
+    else{
+        //変数の場合
+        //何もしない（実行領域コンパイル時にdim宣言として扱う）
+    }
+}
+void CDBConst::AddConst(char *Name, int value){
+    CConst *newconst = new CConst(Name, value);
+
+    AddConst(Name, newconst);
+}
+
+CConst *CDBConst::GetObjectPtr(char *Name){
+    //ハッシュ値を取得
+    int key;
+    key=hash_default(Name);
+
+    //格納位置を取得
+    CConst *pConst;
+    pConst=ppHash[key];
+    while(pConst){
+        if(lstrcmp(pConst->GetName(),Name)==0) break;
+
+        pConst=pConst->pNext;
+    }
+
+    return pConst;
+}
+
+
+int CDBConst::GetType(char *Name){
+    CConst *pConst = GetObjectPtr(Name);
+
+    if(!pConst) return 0;
+
+    return pConst->GetType();
+}
+_int64 CDBConst::GetWholeData(char *Name){
+    CConst *pConst = GetObjectPtr(Name);
+
+    if(!pConst) return 0;
+
+    return pConst->GetWholeData();
+}
+double CDBConst::GetDoubleData(char *Name){
+    CConst *pConst = GetObjectPtr(Name);
+
+    if(!pConst) return 0;
+
+    return pConst->GetDoubleData();
+}

BasicCompiler_Common/Const.h

@@ -9 +9 @@
     CConstBase(char *Name);
     ~CConstBase();
+
+    char *GetName();
 };
 
@@ -15 +17 @@
     int Type;
     _int64 i64data;
+
 public:
+    CConst *pNext;
 
-    CConst(char *Name, char *Expression);
+    CConst(char *Name, int Type, _int64 i64data);
+    CConst(char *Name, int value);
     ~CConst();
+
+    int GetType();
+    _int64 GetWholeData();
+    double GetDoubleData();
 };
 
@@ -33 +42 @@
 //定数管理クラス
 class CDBConst{
-    CConst **ppobj_Const;
-    int NumOfConst;
+    CConst **ppHash;
 
     CConstMacro **ppobj_Macro;
     int NumOfMacro;
+
+    //シングルトンクラスなので、プライベートに置く
+    CDBConst();
+    ~CDBConst();
+    void _free();
+    void Free();
+
 public:
 
-    CDBConst();
-    ~CDBConst();
+    void Init();
 
     void Add(char *buffer);
+private:
+    void AddConst(char *Name, CConst *newconst);
+public:
+    void AddConst(char *Name, char *Expression);
+    void AddConst(char *Name, int value);
 
-    void AddConst(char *Name, char *Expression);
+private:
+    CConst *GetObjectPtr(char *Name);
+public:
+
+    int GetType(char *Name);
+    _int64 GetWholeData(char *Name);
+    double GetDoubleData(char *Name);
+
+
+    //シングルトンオブジェクト
+    static CDBConst obj;
 };

BasicCompiler_Common/Intermediate_Step2.cpp

@@ -44 +44 @@
             return;
         }
-        if(Command[i]=='='||Command[i]=='('){
+        if(Command[i]=='='){
+            //定数定義は新しいクラスモジュール（CDBConst）へ移行
+            return;
+        }
+        if(Command[i]=='('){
             temporary[i]=0;
             break;
@@ -230 +234 @@
 
         //定数を追加
-        CONSTINFO *pci;
-        pci=GetNewConstHash(temporary);
-        pci->name=(char *)HeapAlloc(hHeap,0,lstrlen(temporary)+1);
-        lstrcpy(pci->name,temporary);
-        pci->type=DEF_LONG;
-        pci->lpIndex=-1;
-        pci->DblValue=(double)NextValue;
-        pci->StrValue=0;
+        CDBConst::obj.AddConst(temporary, NextValue);
     }
 }
@@ -282 +279 @@
                 temporary[i2]=basbuf[i];
             }
-            AddConstData(temporary);
+            CDBConst::obj.Add(temporary);
             if(basbuf[i]=='\0') break;
         }

BasicCompiler_Common/NumOpe_GetType.cpp

@@ -434 +434 @@
                     //////////////
 
-                    i3=GetConstValue(values[i],&dbl,temporary,&index_stack[sp]);
-                    if(i3!=-1){
+                    i3 = CDBConst::obj.GetType(values[i]);
+                    if(i3){
                         type[sp]=i3;
                         if(IsRealNumberType(i3)){

BasicCompiler_Common/Variable.cpp

@@ -1010 +1010 @@
     if(VarSize%PTR_SIZE) VarSize+=PTR_SIZE-(VarSize%PTR_SIZE);
 
-    lstrcpy(GlobalVar[MaxGlobalVarNum].name,name);
-    if(SubScripts[0]==-1) GlobalVar[MaxGlobalVarNum].bArray=0;
-    else GlobalVar[MaxGlobalVarNum].bArray=1;
-    GlobalVar[MaxGlobalVarNum].type=pTypeInfo->type;
-    GlobalVar[MaxGlobalVarNum].u.index=pTypeInfo->u.lpIndex;
+    //新しいオブジェクトポインタを取得
+    VARIABLE *pVar = &GlobalVar[MaxGlobalVarNum];
+
+    //グローバル変数の個数を増加
+    MaxGlobalVarNum++;
+
+    lstrcpy(pVar->name,name);
+    if(dwFlag & DIMFLAG_CONST) pVar->bConst = 1;
+    else pVar->bConst = 0;
+    if(SubScripts[0]==-1) pVar->bArray=0;
+    else pVar->bArray=1;
+    pVar->type=pTypeInfo->type;
+    pVar->u.index=pTypeInfo->u.lpIndex;
 
     //コンストラクタ用パラメータ
-    GlobalVar[MaxGlobalVarNum].ConstractParameter=(char *)HeapAlloc(hHeap,0,lstrlen(ConstractParameter)+1);
-    lstrcpy(GlobalVar[MaxGlobalVarNum].ConstractParameter,ConstractParameter);
+    pVar->ConstractParameter=(char *)HeapAlloc(hHeap,0,lstrlen(ConstractParameter)+1);
+    lstrcpy(pVar->ConstractParameter,ConstractParameter);
 
     if(InitBuf[0]||dwFlag==DIMFLAG_INITDEBUGVAR){
         //初期バッファがあるとき
-        GlobalVar[MaxGlobalVarNum].offset=AllInitGlobalVarSize;
+        pVar->offset=AllInitGlobalVarSize;
         AllInitGlobalVarSize+=VarSize;
     }
     else{
         //初期バッファがないとき
-        GlobalVar[MaxGlobalVarNum].offset=AllGlobalVarSize | 0x80000000;
+        pVar->offset=AllGlobalVarSize | 0x80000000;
         AllGlobalVarSize+=VarSize;
     }
 
     //レキシカルスコープ
-    GlobalVar[MaxGlobalVarNum].ScopeLevel=obj_LexScopes.GetNowLevel();
-    GlobalVar[MaxGlobalVarNum].ScopeStartAddress=obj_LexScopes.GetStartAddress();
-    GlobalVar[MaxGlobalVarNum].bLiving=TRUE;
+    pVar->ScopeLevel=obj_LexScopes.GetNowLevel();
+    pVar->ScopeStartAddress=obj_LexScopes.GetStartAddress();
+    pVar->bLiving=TRUE;
+
+    //エラー用
+    pVar->source_code_address=cp;
 
     //初期バッファにデータをセット
@@ -1042 +1053 @@
         initGlobalBuf,
         AllInitGlobalVarSize);
-    if(InitBuf[0])
-        SetInitGlobalData(GlobalVar[MaxGlobalVarNum].offset,
-            GlobalVar[MaxGlobalVarNum].type,
-            GlobalVar[MaxGlobalVarNum].u.index,
-            GlobalVar[MaxGlobalVarNum].SubScripts,
+    if(InitBuf[0]){
+        int result = SetInitGlobalData(pVar->offset,
+            pVar->type,
+            pVar->u.index,
+            pVar->SubScripts,
             InitBuf);
 
-
-    //エラー用
-    GlobalVar[MaxGlobalVarNum].source_code_address=cp;
-
-
-    MaxGlobalVarNum++;
+        if(!result){
+            //動的な式だった場合は代入演算を行う
+            char temporary[8192];
+            sprintf(temporary,"%s=%s",name,InitBuf);
+            OpcodeCalc(temporary);
+        }
+    }
+
 
 

BasicCompiler_Common/calculation.cpp

@@ -627 +627 @@
                         //定数
                         /////////
-                        double dbl;
                         StrPtr[pnum]=0;
-                        type[pnum]=GetConstValue(Parms,&dbl,temporary,&before_index[pnum]);
-                        if(type[pnum]!=-1){
+                        type[pnum] = CDBConst::obj.GetType(Parms);
+                        if(type[pnum]){
                             if(IsRealNumberType(type[pnum])){
                                 //実数型
-                                nums[pnum]=dbl;
-                            }
-                            else if(Is64Type(type[pnum])){
-                                //64ビット整数
-                                memcpy(&i64nums[pnum],&dbl,sizeof(_int64));
+                                nums[pnum] = CDBConst::obj.GetDoubleData(Parms);
                             }
                             else if(IsWholeNumberType(type[pnum])){
                                 //整数
-                                i64nums[pnum]=(_int64)dbl;
+                                i64nums[pnum] = CDBConst::obj.GetWholeData(Parms);
                             }
-                            else if(type[pnum]==DEF_STRING){
+/*                          else if(type[pnum]==DEF_STRING){
                                 //リテラル文字列
 
@@ -652 +647 @@
                                 memcpy(Parms,temporary,(int)nums[pnum]);
                                 goto StrLiteral;
-                            }
+                            }*/
                             else{
                                 //エラー
@@ -671 +666 @@
                             if(bDebuggingWatchList) return -1;
                             //エラー
-                            if(enableerror) SetError(33,NULL,cp);
+                            if(enableerror) SetError(3,Parms,cp);
                             return 0;
                         }
@@ -1204 +1199 @@
 int IsStrCalculation(char *Command){
     int i,i2,i3,i4,type,PareNum;
-    double dbl;
     char temporary[VN_SIZE],temp2[8192];
 
@@ -1300 +1294 @@
 
                 //定数
-                i3=GetConstValue(Command+i2,&dbl,temporary,0);
+                i3 = CDBConst::obj.GetType(Command+i2);
                 if(i3==DEF_STRING) return 1;    //文字列
-                if(i3!=-1) return 0;            //数値
+                if(i3) return 0;            //数値
 
                 //変数

BasicCompiler_Common/common.h

@@ -15 +15 @@
 #include "../BasicCompiler64/CommandValue.h"
 #include "../BasicCompiler64/FunctionValue.h"
+#define OPCODE_H_PATH "../BasicCompiler64/opcode.h"
 #else
 #include "../BasicCompiler32/resource.h"
 #include "../BasicCompiler32/CommandValue.h"
 #include "../BasicCompiler32/FunctionValue.h"
+#define OPCODE_H_PATH "../BasicCompiler32/opcode.h"
 #endif
 
@@ -162 +164 @@
 
     DWORD fRef;
+
+    //定数変数かどうか
+    BOOL bConst;
 
     BOOL bArray;