Changeset 75 in dev for BasicCompiler32/Compile_Statement.cpp

Timestamp:

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

Author:

dai_9181

Message:

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

File:

• BasicCompiler32/Compile_Statement.cpp (modified) (11 diffs)

BasicCompiler32/Compile_Statement.cpp

@@ -5 +5 @@
     int i,i2;
     char buffer[8192];
-    SubInfo *psi;
+    UserProc *pUserProc;
 
     for(i=0;;i++){
@@ -41 +41 @@
         //////////////////////////////
 
-        psi=GetSubHash(Command);
+        pUserProc=GetSubHash(Command);
 
         //GetSubHash内でエラー提示が行われた場合
-        if(psi==(SubInfo *)-1) return;
-
-        if(psi==0){
+        if(pUserProc==(UserProc *)-1) return;
+
+        if(pUserProc==0){
             char temporary[VN_SIZE];
             lstrcpy(temporary,Command);
 
             CharUpper(temporary);
-            psi=GetSubHash(temporary);
+            pUserProc=GetSubHash(temporary);
 
             //GetSubHash内でエラー提示が行われた場合
-            if(psi==(SubInfo *)-1) return;
-        }
-
-        if(psi){
-            if(psi->dwType!=SUBTYPE_MACRO) SetError(10,Command,cp);
-
-            Opcode_CallProc("",psi,0,"",0);
+            if(pUserProc==(UserProc *)-1) return;
+        }
+
+        if(pUserProc){
+            if( !pUserProc->IsMacro() ) SetError(10,Command,cp);
+
+            Opcode_CallProc("",pUserProc,0,"",0);
 
             return;
@@ -963 +963 @@
 
 int CaseTypeSize;
-void OpcodeSelect(char *Parameter){
+void OpcodeSelect(const char *lpszParams){
     extern DWORD *pCaseSchedule;
     extern int CaseScheduleNum;
@@ -987 +987 @@
 
     LONG_PTR lpIndex;
-    type1=NumOpe(Parameter,0,0,&lpIndex);
+    type1=NumOpe(lpszParams,0,0,&lpIndex);
     if(type1==DEF_INTEGER||
         type1==DEF_WORD||
@@ -1076 +1076 @@
                     pobj_c=(CClass *)lpIndex;
 
-                    std::vector<SubInfo *> subs;
+                    std::vector<UserProc *> subs;
                     pobj_c->EnumMethod( CALC_EQUAL, subs );
                     if( subs.size() == 0 ){
@@ -1082 +1082 @@
                     }
 
-                    PARAMETER_INFO *ppi = (PARAMETER_INFO *)HeapAlloc(hHeap,0,sizeof(PARAMETER_INFO)*3);
-                    int iParmNum=0;
-                    ppi[iParmNum].bArray=0;
-                    ppi[iParmNum].bByVal=0;
-                    ppi[iParmNum].name=0;
-                    ppi[iParmNum].type=type2;
-                    ppi[iParmNum].u.index=lpIndex2;
-                    ppi[iParmNum].SubScripts[0]=-1;
-                    iParmNum++;
+                    Parameters params;
+                    params.push_back( new Parameter( "", Type( type2, lpIndex2 ) ) );
 
                     //オーバーロードを解決
-                    SubInfo *psi;
-                    psi=OverloadSolution("==",subs,ppi,iParmNum,NULL);
-                    HeapDefaultFree(ppi);
-
-                    if(!psi){
+                    UserProc *pUserProc;
+                    pUserProc=OverloadSolution("==",subs, params, NULL);
+
+                    delete params[0];
+
+                    if(!pUserProc){
                         //エラー
                         return;
@@ -1116 +1110 @@
 
                     //call operator_proc    ※ ==演算子
-                    op_call(psi);
+                    op_call(pUserProc);
 
                     //test eax,eax
@@ -1330 +1324 @@
         //戻り値をセット
         if(Parameter[0]){
-            extern SubInfo *pCompilingSubInfo;
-            char *temp;
-            if(pCompilingSubInfo->name[0]==1&&pCompilingSubInfo->name[1]==ESC_OPERATOR)
-                temp="_System_ReturnValue";
-            else temp=pCompilingSubInfo->name;
-
-            /*
-            TODO: 消す
-            if( pCompilingSubInfo->isReturnRef ){
-                //参照型
-                SetRefVariable( temp, Parameter );
-            }
-            else{
-                //値型*/
-                char temporary[VN_SIZE];
-                sprintf(temporary,"%s=%s",temp,Parameter);
-                OpcodeCalc(temporary);
-            //}
+            extern UserProc *pCompilingUserProc;
+            const char *temp = "_System_ReturnValue";
+            if(pCompilingUserProc->GetName()[0]==1&&pCompilingUserProc->GetName()[1]==ESC_OPERATOR)
+            {
+            }
+            else temp=pCompilingUserProc->GetName().c_str();
+
+            char temporary[VN_SIZE];
+            sprintf(temporary,"%s=%s",temp,Parameter);
+            OpcodeCalc(temporary);
         }
 
@@ -1460 +1446 @@
     OpcodeCalc(temp2);
 
-    SubInfo *psi;
-    if(bFile) psi=GetSubHash("INPUT_FromFile");
-    else psi=GetSubHash("INPUT_FromPrompt");
-    if(!psi){
+    UserProc *pUserProc;
+    if(bFile) pUserProc=GetSubHash("INPUT_FromFile");
+    else pUserProc=GetSubHash("INPUT_FromPrompt");
+    if(!pUserProc){
         SetError(3,"Input",cp);
         return;
     }
-    Opcode_CallProc(buffer,psi,0,"",0);
+    Opcode_CallProc(buffer,pUserProc,0,"",0);
 }
 void Opcode_PrintUsing(const char *Parameter,char *buffer,BOOL bFile){
@@ -1562 +1548 @@
     OpcodeCalc(temp2);
 
-    SubInfo *psi;
-    if(bFile) psi=GetSubHash("PRINTUSING_ToFile");
-    else psi=GetSubHash("PRINTUSING_ToPrompt");
-    if(!psi){
+    UserProc *pUserProc;
+    if(bFile) pUserProc=GetSubHash("PRINTUSING_ToFile");
+    else pUserProc=GetSubHash("PRINTUSING_ToPrompt");
+    if(!pUserProc){
         SetError(3,"Print",cp);
         return;
     }
-    Opcode_CallProc(buffer,psi,0,"",0);
+    Opcode_CallProc(buffer,pUserProc,0,"",0);
 }
 void Opcode_Print(const char *Parameter,BOOL bWrite){
@@ -1666 +1652 @@
     if(sw) lstrcat(buffer,"+Ex\"\\r\\n\"");
 
-    SubInfo *psi;
-    if(bFile) psi=GetSubHash("PRINT_ToFile");
-    else psi=GetSubHash("PRINT_ToPrompt");
-    if(!psi){
+    UserProc *pUserProc;
+    if(bFile) pUserProc=GetSubHash("PRINT_ToFile");
+    else pUserProc=GetSubHash("PRINT_ToPrompt");
+    if(!pUserProc){
         SetError(3,"Print",cp);
         return;
     }
-    Opcode_CallProc(buffer,psi,0,"",0);
+    Opcode_CallProc(buffer,pUserProc,0,"",0);
 }