Changeset 75 in dev for BasicCompiler_Common/Object.cpp

Timestamp:

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

Author:

dai_9181

Message:

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

File:

• BasicCompiler_Common/Object.cpp (modified) (4 diffs)

BasicCompiler_Common/Object.cpp

@@ -9 +9 @@
 extern HANDLE hHeap;
 
-void CallConstructor(char *ObjectName,int *SubScripts,TYPEINFO &TypeInfo,char *Parameter){
-    if(TypeInfo.type!=DEF_OBJECT) return;
+void CallConstructor( const char *ObjectName,const int *SubScripts,const Type &type,const char *Parameter){
+    if( !type.IsObject() ){
+        return;
+    }
 
     /////////////////////////////////////
@@ -16 +18 @@
     // ※コンストラクタの呼び出し
     /////////////////////////////////////
-    CClass *pobj_c;
-    pobj_c=(CClass *)TypeInfo.u.lpIndex;
 
-    SubInfo *psi;
-    psi=GetMethodHash(ObjectName,pobj_c->name,Parameter);
-    if(!psi){
-        if(Parameter[0]) SetError(113,pobj_c->name,cp);
+    UserProc *pUserProc;
+    pUserProc=GetMethodHash(ObjectName,type.GetClass().name,Parameter);
+    if(!pUserProc){
+        if(Parameter[0]) SetError(113,type.GetClass().name,cp);
         return;
     }
@@ -52 +52 @@
             lstrcat(temporary,"]");
 
-            LONG_PTR lp;
-            sprintf(temporary+lstrlen(temporary),".%s",pobj_c->name);
-            CallProc(PROC_DEFAULT,
-                psi,
+            Type dummyType;
+            sprintf(temporary+lstrlen(temporary),".%s",type.GetClass().name);
+            CallProc( PROC_DEFAULT,
+                pUserProc,
                 temporary,
                 Parameter,
-                &lp);
+                dummyType );
 
             ss[0]++;
@@ -72 +72 @@
     }
     else{
-        LONG_PTR lp;
-        sprintf(temporary,"%s.%s",ObjectName,pobj_c->name);
-        CallProc(PROC_DEFAULT,
-            psi,
+        Type dummyType;
+        sprintf(temporary,"%s.%s",ObjectName,type.GetClass().name);
+        CallProc( PROC_DEFAULT,
+            pUserProc,
             temporary,
             Parameter,
-            &lp);
+            dummyType );
     }
 }
+
+bool Operator_New( const char *expression, const Type &baseType, Type &resultType ){
+    char CreateParameter[VN_SIZE],objectSizeStr[VN_SIZE];
+    int i,i2;
+
+    i=0;
+
+    if(expression[0]=='['){
+        i=GetStringInBracket(objectSizeStr,expression);
+
+        SlideString(objectSizeStr+1,-1);
+        objectSizeStr[i-2]=0;
+    }
+    else objectSizeStr[0]=0;
+
+    char typeName[VN_SIZE];
+    for(i2=0;;i++,i2++){
+        if(expression[i]=='('){
+            typeName[i2]=0;
+
+            //コンストラクタに渡すパラメータを取得
+            i2=GetStringInPare(CreateParameter,expression+i);
+            RemoveStringPare(CreateParameter);
+            i+=i2;
+            if(expression[i]!='\0'){
+                SetError(42,NULL,cp);
+                return false;
+            }
+            break;
+        }
+        typeName[i2]=expression[i];
+        if(expression[i]=='\0'){
+            CreateParameter[0]=0;
+            break;
+        }
+    }
+
+    if( !Type::StringToType( typeName, resultType ) ){
+        SetError(3,typeName,cp);
+        return false;
+    }
+
+    if( !resultType.IsObject() ){
+        ////////////////////////
+        // 通常のデータ型の場合
+        ////////////////////////
+
+        SetError(121,NULL,cp);
+        return false;
+    }
+
+    Operator_New( resultType.GetClass(), objectSizeStr, CreateParameter, baseType );
+
+    if( !baseType.IsObject() ){
+        // オブジェクトポインタ向け
+        resultType.SetBasicType( DEF_PTR_OBJECT );
+    }
+
+    return true;
+}