Changeset 46 in dev for BasicCompiler32/Compile_Func.cpp

Timestamp:

Feb 6, 2007, 1:19:17 AM (18 years ago)

Author:

dai_9181

Message:

VarPtrの戻り値の型をVoidPtrではなく、ポインタレベルを増加した型にした。
関連関数のパラメータにconstを適用。

File:

• BasicCompiler32/Compile_Func.cpp (modified) (8 diffs)

BasicCompiler32/Compile_Func.cpp

@@ -44 +44 @@
 }
 
-void Opcode_Func_Fix(char *Parameter){
+void Opcode_Func_Fix(const char *Parameter){
     int i;
 
@@ -161 +161 @@
 }
 
-void Opcode_Func_CUDbl(char *Parameter){
+void Opcode_Func_CUDbl(const char *Parameter){
     int i;
 
@@ -185 +185 @@
     op_add_esp(8);
 }
-void Opcode_Func_Len(char *Parameter){
+void Opcode_Func_Len(const char *Parameter){
     int type,TypeSize;
     LONG_PTR lpIndex;
@@ -192 +192 @@
     type=GetVarType(Parameter,&lpIndex,0);
 
-    char *tempParm=Parameter;
+    const char *tempParm=Parameter;
     char temporary[VN_SIZE];
     char temp2[32];
@@ -241 +241 @@
     obp+=sizeof(long);
 }
-void Opcode_Func_AddressOf(char *name){
+void Opcode_Func_AddressOf(const char *name){
     extern int cp;
     SUBINFO *psi;
@@ -353 +353 @@
     psi->bUse=1;
 }
-void Opcode_Func_SizeOf(char *Parameter){
+void Opcode_Func_SizeOf(const char *Parameter){
     int type,size;
     LONG_PTR lpIndex;
@@ -370 +370 @@
     obp+=sizeof(long);
 }
-void Opcode_Func_VarPtr(char *Parameter){
-    int type;
+void Opcode_Func_VarPtr( const char *Parameter, TYPEINFO &ReturnTypeInfo ){
     RELATIVE_VAR RelativeVar;
 
     //変数のアドレスを取得
-    if(!GetVarOffsetReadOnly(Parameter,&type,&RelativeVar,0)) return;
+    if(!GetVarOffsetReadOnly( Parameter, &ReturnTypeInfo.type, &RelativeVar, &ReturnTypeInfo.u.lpIndex )) return;
+
+    PTR_LEVEL_UP( ReturnTypeInfo.type );
 
     SetVarPtrToEax(&RelativeVar);
 }
-void Opcode_Func_GetPtrData(char *Parameter,int type){
+void Opcode_Func_GetPtrData(const char *Parameter,const int type){
     int i2;
 
@@ -438 +439 @@
 }
 
-int Opcode_CallFunc(char *Parameter,int FuncNum){
+void Opcode_CallFunc( const char *Parameter, const int FuncNum, TYPEINFO &ReturnTypeInfo ){
     switch(FuncNum){
         case FUNC_FIX:
             Opcode_Func_Fix(Parameter);
-            return DEF_LONG;
+            ReturnTypeInfo.type = DEF_LONG;
+            break;
         case FUNC_CUDBL:
             Opcode_Func_CUDbl(Parameter);
-            return DEF_DOUBLE;
+            ReturnTypeInfo.type = DEF_DOUBLE;
+            break;
         case FUNC_LEN:
             Opcode_Func_Len(Parameter);
-            return DEF_LONG;
+            ReturnTypeInfo.type = DEF_LONG;
+            break;
         case FUNC_ADDRESSOF:
             Opcode_Func_AddressOf(Parameter);
-            return DEF_PTR_VOID;
+            ReturnTypeInfo.type = DEF_PTR_VOID;
+            break;
         case FUNC_SIZEOF:
             Opcode_Func_SizeOf(Parameter);
-            return DEF_LONG;
+            ReturnTypeInfo.type = DEF_LONG;
+            break;
         case FUNC_VARPTR:
-            Opcode_Func_VarPtr(Parameter);
-            return DEF_PTR_VOID;
+            Opcode_Func_VarPtr( Parameter, ReturnTypeInfo );
+            break;
 
         case FUNC_GETDOUBLE:
             Opcode_Func_GetPtrData(Parameter,DEF_DOUBLE);
-            return DEF_DOUBLE;
+            ReturnTypeInfo.type = DEF_DOUBLE;
+            break;
         case FUNC_GETSINGLE:
             Opcode_Func_GetPtrData(Parameter,DEF_SINGLE);
-            return DEF_SINGLE;
+            ReturnTypeInfo.type = DEF_SINGLE;
+            break;
         case FUNC_GETQWORD:
             Opcode_Func_GetPtrData(Parameter,DEF_QWORD);
-            return DEF_QWORD;
+            ReturnTypeInfo.type = DEF_QWORD;
+            break;
         case FUNC_GETDWORD:
             Opcode_Func_GetPtrData(Parameter,DEF_DWORD);
-            return DEF_DWORD;
+            ReturnTypeInfo.type = DEF_DWORD;
+            break;
         case FUNC_GETWORD:
             Opcode_Func_GetPtrData(Parameter,DEF_WORD);
-            return DEF_WORD;
+            ReturnTypeInfo.type = DEF_WORD;
+            break;
         case FUNC_GETBYTE:
             Opcode_Func_GetPtrData(Parameter,DEF_BYTE);
-            return DEF_BYTE;
-    }
-    return 0;
-}
+            ReturnTypeInfo.type = DEF_BYTE;
+            break;
+    }
+}