Changeset 75 in dev for BasicCompiler_Common/Intermediate_Step2.cpp

Timestamp:

Mar 20, 2007, 4:36:16 AM (18 years ago)

Author:

dai_9181

Message:

TYPEINFO→Typeへのリファクタリングを実施。64bitはほぼ完了。32bitが全般的に未完成。

File:

• BasicCompiler_Common/Intermediate_Step2.cpp (modified) (7 diffs)

BasicCompiler_Common/Intermediate_Step2.cpp

@@ -146 +146 @@
         //数値定数
         _int64 i64data;
-        pci->type=StaticCalculation(true, temporary,0,&i64data,&pci->lpIndex);
+        Type resultType;
+        StaticCalculation(true, temporary,0,&i64data,resultType);
+        pci->type=resultType.GetBasicType();
         if(IsRealNumberType(pci->type)){
             //実数型
@@ -231 +233 @@
 
             _int64 i64data;
-            LONG_PTR lpIndex;
-            StaticCalculation(true, temp2,DEF_LONG,&i64data,&lpIndex);
+            StaticCalculation(true, temp2,DEF_LONG,&i64data,Type());
             NextValue=(int)i64data;
         }
@@ -303 +304 @@
 
 char ConstructorDestructorSchedule[MAX_PATH];
-void MakeConstructorAndDestructor(char *buffer,int NowLine,char *ClassName){
+void MakeConstructorAndDestructor(char *buffer,int nowLine,char *ClassName){
     int i,i2;
     char temporary[MAX_PATH],*pTemp;
@@ -312 +313 @@
     bDestructor=0;
 
-    for(i=NowLine;;i++){
+    for(i=nowLine;;i++){
         if(buffer[i]=='\0') break;
         if(buffer[i]==1&&buffer[i+1]==ESC_ENDCLASS){
@@ -360 +361 @@
     }
 }
-void ChangeCommand(char *buffer,int NowLine,char *Command){
+void ChangeCommand(char *buffer,int nowLine,char *Command){
     int i,i2,IsStr;
     unsigned _int16 ComNum;
@@ -391 +392 @@
 
                 //コンストラクタ、デストラクタを暗黙的に生成
-                MakeConstructorAndDestructor(buffer,NowLine,Command+2);
+                MakeConstructorAndDestructor(buffer,nowLine,Command+2);
                 break;
             case ESC_INTERFACE:
@@ -457 +458 @@
     if( nCountOfNonGlobalScope == 0 ){
         //グローバル
-        if(lstrcmpi(com,"Open")==0) ComOpen(Command+i,pam,NowLine);
+        if(lstrcmpi(com,"Open")==0) ComOpen(Command+i,pam,nowLine);
         else if(lstrcmpi(com,"Close")==0) ComClose(Command+i,pam);
         else if(lstrcmpi(com,"Field")==0||
             lstrcmpi(com,"Get")==0||
             lstrcmpi(com,"Put")==0) ComField(Command+i,pam);
-        else if(lstrcmpi(com,"Line")==0) ComLine(Command+i,pam,NowLine);
-        else if(lstrcmpi(com,"Circle")==0) ComCircle(Command+i,pam,NowLine);
-        else if(lstrcmpi(com,"PSet")==0) ComPSet(Command+i,pam,NowLine);
-        else if(lstrcmpi(com,"Paint")==0) ComPaint(Command+i,pam,NowLine);
+        else if(lstrcmpi(com,"Line")==0) ComLine(Command+i,pam,nowLine);
+        else if(lstrcmpi(com,"Circle")==0) ComCircle(Command+i,pam,nowLine);
+        else if(lstrcmpi(com,"PSet")==0) ComPSet(Command+i,pam,nowLine);
+        else if(lstrcmpi(com,"Paint")==0) ComPaint(Command+i,pam,nowLine);
 
         else if(