Changeset 78 in dev for BasicCompiler_Common/VariableOpe.cpp

Timestamp:

Mar 25, 2007, 2:47:49 AM (17 years ago)

Author:

dai_9181

Message:

CTypeDef → TypeDef
Houseクラスを追加。
オーバーロードレベルの種類を追加（レベル1に挿入）

File:

• BasicCompiler_Common/VariableOpe.cpp (modified) (5 diffs)

BasicCompiler_Common/VariableOpe.cpp

@@ -228 +228 @@
     ////////////////////
     int i;
-    i=pobj_DBTypeDef->check(TypeName);
+    i=House::typeDefs.GetIndex(TypeName);
     if(i!=-1){
-        return GetTypeFixed(pobj_DBTypeDef->ppobj_TypeDef[i]->lpszBaseName,lpNum);
+        *lpNum = House::typeDefs[i].GetBaseType().GetIndex();
+        return House::typeDefs[i].GetBaseType().GetBasicType();
     }
 
@@ -251 +252 @@
     return -1;
 }
-void GetOriginalTypeName(char *buffer){
+/*
+TODO: 消す(TypeDef関連の変更)
+void GetOriginalTypeName_Old(char *buffer){
     // TypeDefされた型に対して、オリジナルの型の名前に変更する
 
@@ -257 +260 @@
         if(buffer[1]==1&&(buffer[2]==ESC_FUNCTION||buffer[2]==ESC_SUB)) return;
 
-        GetOriginalTypeName(buffer+1);
+        GetOriginalTypeName_Old(buffer+1);
         return;
     }
 
     int i;
-    i=pobj_DBTypeDef->check(buffer);
+    i=House::typeDefs.GetIndex(buffer);
     if(i!=-1){
-        lstrcpy(buffer,pobj_DBTypeDef->ppobj_TypeDef[i]->lpszBaseName);
-        GetOriginalTypeName(buffer);
-    }
-}
+        lstrcpy(buffer,House::typeDefs[i].GetBaseName().c_str());
+        GetOriginalTypeName_Old(buffer);
+    }
+}*/
 BOOL GetTypeName(int type,LONG_PTR lpIndex,char *name){
     if(PTR_LEVEL(type)){
@@ -309 +312 @@
         if(lpIndex==-1) lstrcpy(name,"VoidPtr");
         else{
-            extern ProcPointer **ppProcPointer;
-            if( ppProcPointer[lpIndex]->ReturnType().IsNull() )
+            if( House::procPointers[lpIndex]->ReturnType().IsNull() )
                 lstrcpy(name,"*Sub");
             else lstrcpy(name,"*Function");
@@ -988 +990 @@
             temporary[i2]=buffer[i];
         }
+        if(temporary[0]=='*'&&
+            temporary[1]==1&&
+            (temporary[2]==ESC_FUNCTION||temporary[2]==ESC_SUB)){
+            if(buffer[i]!='('){
+                SetError(10,temporary,cp);
+                return false;
+            }
+            i3=GetStringInPare(temporary+3,buffer+i);
+            i+=i3;
+            i2+=i3;
+
+            if(temporary[2]==ESC_FUNCTION&&buffer[i]==1&&buffer[i+1]==ESC_AS){
+                temporary[i2++]=buffer[i++];
+                temporary[i2++]=buffer[i++];
+                for(;;i++,i2++){
+                    if(!IsVariableChar(buffer[i])){
+                        temporary[i2]=0;
+                        break;
+                    }
+                    temporary[i2]=buffer[i];
+                }
+            }
+        }
+
         if( !Type::StringToType( temporary, type ) ){
             SetError(3,temporary,cp);
             type.SetBasicType( DEF_LONG );
-        }
-
-        if( type.IsProcPtr() ){
-            if(temporary[0]=='*'&&
-                temporary[1]==1&&
-                (temporary[2]==ESC_FUNCTION||temporary[2]==ESC_SUB)){
-                if(buffer[i]!='('){
-                    SetError(10,temporary,cp);
-                    return false;
-                }
-                i3=GetStringInPare(temporary+3,buffer+i);
-                i+=i3;
-                i2+=i3;
-
-                if(temporary[2]==ESC_FUNCTION&&buffer[i]==1&&buffer[i+1]==ESC_AS){
-                    temporary[i2++]=buffer[i++];
-                    temporary[i2++]=buffer[i++];
-                    for(;;i++,i2++){
-                        if(!IsVariableChar(buffer[i])){
-                            temporary[i2]=0;
-                            break;
-                        }
-                        temporary[i2]=buffer[i];
-                    }
-                }
-            }
-            else{
-                //TypeDefをする前のベース型を取得
-                GetOriginalTypeName(temporary);
-            }
-
-            if(temporary[3]!='('){
-                SetError(10,temporary,cp);
-                return false;
-            }
-
-            //関数ポインタ
-            type.SetIndex( AddProcPtrInfo(temporary+3,temporary[2], cp) );
         }