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

Timestamp:

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

Author:

dai_9181

Message:

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

File:

• trunk/abdev/BasicCompiler_Common/calculation.cpp (modified) (8 diffs)

trunk/abdev/BasicCompiler_Common/calculation.cpp

@@ +1 @@
+#include "stdafx.h"
+
 #include <jenga/include/smoothie/LexicalAnalysis.h>
 
@@ -498 +500 @@
                         //定数関数
 
-                        if(!GetConstCalcBuffer(temporary,temp2,Parms)){
+                        ConstMacro *pConstMacro = compiler.GetMeta().GetGlobalConstMacros().Find( temporary );
+                        if( !pConstMacro )
+                        {
+                            if(enableerror) SetError(3,temporary,cp);
+                            return false;
+                        }
+                        if( !pConstMacro->GetCalcBuffer( temp2, Parms ) )
+                        {
                             if(enableerror) SetError(3,temporary,cp);
                             return false;
@@ -554 +563 @@
 
                             RELATIVE_VAR RelativeVar;
-                            int ss[MAX_ARRAYDIM];
                             void *offset;
                             DWORD dwData;
@@ -563 +571 @@
 
                             Type tempType;
-                            i3=Debugging_GetVarOffset(Parms,&RelativeVar,tempType,ss);
+                            i3=Debugging_GetVarOffset(Parms,&RelativeVar,tempType);
                             if(i3==0){
                                 //式エラー
@@ -657 +665 @@
                         /////////
                         StrPtr[pnum]=0;
-                        type[pnum] = CDBConst::obj.GetBasicType(Parms);
+                        type[pnum] = compiler.GetMeta().GetGlobalConsts().GetBasicType(Parms);
                         if(type[pnum]){
                             if(IsRealNumberType(type[pnum])){
                                 //実数型
-                                nums[pnum] = CDBConst::obj.GetDoubleData(Parms);
+                                nums[pnum] = compiler.GetMeta().GetGlobalConsts().GetDoubleData(Parms);
                             }
                             else if(IsWholeNumberType(type[pnum])){
                                 //整数
-                                i64nums[pnum] = CDBConst::obj.GetWholeData(Parms);
+                                i64nums[pnum] = compiler.GetMeta().GetGlobalConsts().GetWholeData(Parms);
                             }
 /*                          else if(type[pnum]==DEF_STRING){
@@ -1108 +1116 @@
 #pragma optimize("", on)
 
-BOOL GetConstCalcBuffer(const char *name,const char *Parameter,char *pCalcBuffer){
-    extern HANDLE hHeap;
-    int i2,i3,i4,num;
-    char temporary[VN_SIZE];
-    char *pParms[MAX_PARMS];
-
-    CONSTINFO *pci;
-    pci=GetConstHash(name);
-    if(!pci) return 0;
-
-    num=0;
-    i2=0;
-    while(1){
-        i2=GetOneParameter(Parameter,i2,temporary);
-
-        pParms[num]=(char *)HeapAlloc(hHeap,0,lstrlen(temporary)+1);
-        lstrcpy(pParms[num],temporary);
-
-        num++;
-        if(Parameter[i2]=='\0') break;
-    }
-    if(num!=pci->ParmNum){
-        extern int cp;
-        for(i2=0;i2<num;i2++) HeapDefaultFree(pParms[i2]);
-        SetError(10,name,cp);
-        lstrcpy(pCalcBuffer,"0");
-        return 1;
-    }
-
-    i2=0;
-    i4=0;
-    while(1){
-
-        //数式内の項を取得
-        for(i3=0;;i2++,i3++){
-            if(!IsVariableChar(pci->StrValue[i2])){
-                temporary[i3]=0;
-                break;
-            }
-            temporary[i3]=pci->StrValue[i2];
-        }
-
-        //パラメータと照合する
-        for(i3=0;i3<pci->ParmNum;i3++){
-            if(lstrcmp(pci->ppParm[i3],temporary)==0) break;
-        }
-
-        if(i3==pci->ParmNum){
-            //パラメータでないとき
-            lstrcpy(pCalcBuffer+i4,temporary);
-            i4+=lstrlen(temporary);
-        }
-        else{
-            //パラメータのとき
-            lstrcpy(pCalcBuffer+i4,pParms[i3]);
-            i4+=lstrlen(pParms[i3]);
-        }
-
-        //演算子をコピー
-        for(;;i2++,i4++){
-            if(pci->StrValue[i2]==1){
-                pCalcBuffer[i4++]=pci->StrValue[i2++];
-                pCalcBuffer[i4]=pci->StrValue[i2];
-                continue;
-            }
-            if(IsVariableTopChar(pci->StrValue[i2])) break;
-            pCalcBuffer[i4]=pci->StrValue[i2];
-            if(pci->StrValue[i2]=='\0') break;
-        }
-
-        if(pci->StrValue[i2]=='\0') break;
-    }
-
-    for(i2=0;i2<num;i2++) HeapDefaultFree(pParms[i2]);
-
-    return 1;
-}
-DWORD GetConstValue(char *name,double *pDbl,char *buffer,LONG_PTR *plpIndex){
-    CONSTINFO *pci;
-    pci=GetConstHash(name);
-    if(pci){
-        //定数が見つかったとき
-
-        if(pci->StrValue){
-            //文字列定数
-
-            //バイト数
-            *pDbl=pci->DblValue;
-
-            //データ
-            memcpy(buffer,pci->StrValue,(int)pci->DblValue);
-
-            if(plpIndex) *plpIndex=pci->lpIndex;
-
-            return DEF_STRING;
-        }
-        else{
-            if(pci->type==DEF_INT64){
-                memcpy(pDbl,&pci->i64Value,sizeof(_int64));
-                return DEF_INT64;
-            }
-
-            if(plpIndex) *plpIndex=pci->lpIndex;
-
-            *pDbl=pci->DblValue;
-            return pci->type;
-        }
-    }
-
-    if(plpIndex) *plpIndex=-1;
-
-    return -1;
-}
 int IsStrCalculation(char *Command){
     int i,i2,i3,i4,PareNum;
@@ -1283 +1178 @@
 
                     //ユーザー定義関数
-                    UserProc *pUserProc;
-                    pUserProc=GetSubHash(temporary);
+                    const UserProc *pUserProc = GetSubHash(temporary);
                     if(pUserProc){
                         if( pUserProc->ReturnType().IsStringClass() ){
@@ -1300 +1194 @@
 
                     //定数
-                    CONSTINFO *pci;
-                    pci=GetConstHash(temporary);
-                    if(pci){
-
-                        if(pci->ParmNum){
-                            //マクロ関数の場合
-                            GetStringInPare_RemovePare(temporary,Command+i2+i3+1);
-                            GetConstCalcBuffer(pci->name,temporary,temp2);
-                            return IsStrCalculation(temp2);
-                        }
-
-                        if(pci->type==DEF_STRING) return 1;
-                        else return 0;
+                    ConstMacro *pConstMacro = compiler.GetMeta().GetGlobalConstMacros().Find( temporary );
+                    if(pConstMacro){
+                        //マクロ関数の場合
+                        GetStringInPare_RemovePare(temporary,Command+i2+i3+1);
+                        pConstMacro->GetCalcBuffer( temporary, temp2 );
+                        return IsStrCalculation(temp2);
                     }
                 }
 
                 //定数
-                i3 = CDBConst::obj.GetBasicType(Command+i2);
+                i3 = compiler.GetMeta().GetGlobalConsts().GetBasicType(Command+i2);
                 if(i3==DEF_STRING) return 1;    //文字列
                 if(i3) return 0;            //数値