Changeset 90 in dev for BasicCompiler_Common

Timestamp:

Apr 7, 2007, 3:02:29 PM (17 years ago)

Author:

dai_9181

Message:

実行時型情報の生成にほぼ対応した。

Location:

BasicCompiler_Common

Files:

• Class.cpp (modified) (12 diffs)
• Class.h (modified) (2 diffs)
• LoopRefCheck.cpp (modified) (1 diff)
• ParamImpl.cpp (modified) (6 diffs)
• Procedure.h (modified) (3 diffs)
• common.h (modified) (2 diffs)

BasicCompiler_Common/Class.cpp

@@ -146 +146 @@
 
 
-
-CClass::CClass(const char *name){
-    memset(this,0,sizeof(CClass));
-
-    vtbl_offset=-1;
-
+CClass::CClass(const char *name):
+    ConstructorMemberSubIndex( 0 ),
+    DestructorMemberSubIndex( 0 ),
+    classType( Class ),
+    pobj_InheritsClass( NULL ),
+    ppobj_Member( NULL ),
+    iMemberNum( 0 ),
+    vtbl_num( 0 ),
+    iAlign( 0 ),
+    vtbl_offset( -1 ),
+    isCompilingConstructor( false ),
+    isCompilingDestructor( false ),
+    pobj_NextClass( NULL )
+{
     this->name=(char *)HeapAlloc(hHeap,0,lstrlen(name)+1);
     lstrcpy(this->name,name);
-
-    isCompilingConstructor = false;
-    isCompilingDestructor = false;
 }
 CClass::~CClass(){
@@ -189 +194 @@
 }
 
+bool CClass::IsClass() const
+{
+    return classType == CClass::Class;
+}
+bool CClass::IsInterface() const
+{
+    return classType == CClass::Interface;
+}
+bool CClass::IsEnum() const
+{
+    return classType == CClass::Enum;
+}
+bool CClass::IsDelegate() const
+{
+    return classType == CClass::Delegate;
+}
 bool CClass::IsStructure() const
 {
@@ -194 +215 @@
 }
 
-void CClass::Inherits( CClass *pInheritsClass ){
+bool CClass::Inherits( CClass &inheritsClass, int nowLine ){
+
+    //ループ継承でないかをチェック
+    if(pobj_LoopRefCheck->check(inheritsClass)){
+        SetError(123,inheritsClass.name,nowLine);
+        return false;
+    }
+
+    if( inheritsClass.ppobj_Member == 0 ){
+        //継承先が読み取られていないとき
+        pobj_LoopRefCheck->add(this->name);
+        pobj_DBClass->GetClass_recur(inheritsClass.name);
+        pobj_LoopRefCheck->del(this->name);
+    }
 
     //メンバをコピー
@@ -201 +235 @@
         0,
         ppobj_Member,
-        pInheritsClass->iMemberNum*sizeof(CMember *));
-    iMemberNum=pInheritsClass->iMemberNum;
-    for(int i3=0;i3<pInheritsClass->iMemberNum;i3++){
-        ppobj_Member[i3]=new CMember( *pInheritsClass->ppobj_Member[i3] );
+        ( iMemberNum + inheritsClass.iMemberNum )*sizeof(CMember *));
+    for(int i3=0;i3<inheritsClass.iMemberNum;i3++){
+        ppobj_Member[iMemberNum]=new CMember( *inheritsClass.ppobj_Member[i3] );
 
         //dwAccess
-        if(pInheritsClass->ppobj_Member[i3]->dwAccess==ACCESS_PRIVATE)
-            ppobj_Member[i3]->dwAccess=ACCESS_NON;
-        else ppobj_Member[i3]->dwAccess=pInheritsClass->ppobj_Member[i3]->dwAccess;
+        if(inheritsClass.ppobj_Member[i3]->dwAccess==ACCESS_PRIVATE)
+            ppobj_Member[iMemberNum]->dwAccess=ACCESS_NON;
+        else ppobj_Member[iMemberNum]->dwAccess=inheritsClass.ppobj_Member[i3]->dwAccess;
+
+        iMemberNum++;
     }
 
     //メソッドをコピー
-    foreach( CMethod *baseMethod, pInheritsClass->methods ){
+    foreach( CMethod *baseMethod, inheritsClass.methods ){
         CMethod *method = new CMethod( baseMethod );
 
@@ -224 +259 @@
         // ※継承元のClassIndexをセット（入れ子継承を考慮する）
         if(baseMethod->pobj_InheritsClass==0)
-            method->pobj_InheritsClass=pInheritsClass;
+            method->pobj_InheritsClass=&inheritsClass;
         else
             method->pobj_InheritsClass=
@@ -233 +268 @@
 
     //仮想関数の数
-    vtbl_num=pInheritsClass->vtbl_num;
+    vtbl_num += inheritsClass.vtbl_num;
 
     //継承先のクラスをメンバとして保持する
-    pobj_InheritsClass = pInheritsClass;
+    pobj_InheritsClass = &inheritsClass;
+
+    return true;
+}
+bool CClass::InheritsInterface( CClass &inheritsInterface, int nowLine ){
+
+    //ループ継承でないかをチェック
+    if(pobj_LoopRefCheck->check(inheritsInterface)){
+        SetError(123,inheritsInterface.name,nowLine);
+        return false;
+    }
+
+    if( inheritsInterface.ppobj_Member == 0 ){
+        //継承先が読み取られていないとき
+        pobj_LoopRefCheck->add(this->name);
+        pobj_DBClass->GetClass_recur(inheritsInterface.name);
+        pobj_LoopRefCheck->del(this->name);
+    }
+
+    //メソッドをコピー
+    foreach( CMethod *baseMethod, inheritsInterface.methods ){
+        CMethod *method = new CMethod( baseMethod );
+
+        //dwAccess
+        if(baseMethod->dwAccess==ACCESS_PRIVATE)
+            method->dwAccess=ACCESS_NON;
+        else method->dwAccess=baseMethod->dwAccess;
+
+        //pobj_Inherits
+        // ※継承元のClassIndexをセット（入れ子継承を考慮する）
+        if(baseMethod->pobj_InheritsClass==0)
+            method->pobj_InheritsClass=&inheritsInterface;
+        else
+            method->pobj_InheritsClass=
+                baseMethod->pobj_InheritsClass;
+
+        methods.push_back( method );
+    }
+
+    //仮想関数の数
+    vtbl_num += inheritsInterface.vtbl_num;
+
+    /*
+    TODO: インターフェイス向けの機構を作る
+    //継承先のクラスをメンバとして保持する
+    pobj_InheritsClass = &inheritsInterface;
+    */
+
+    return true;
 }
 void CClass::AddMember( DWORD dwAccess, bool isConst, bool isRef, char *buffer ){
@@ -950 +1033 @@
         if(pMember->IsStruct()){
             //循環参照でないかをチェック
-            if(pobj_LoopRefCheck->check(pMember->GetClass().name)){
+            if(pobj_LoopRefCheck->check(pMember->GetClass())){
                 extern int cp;
                 SetError(124,pMember->GetClass().name,cp);
@@ -1035 +1118 @@
                 }
 
-                //ループ継承でないかをチェック
-                if(pobj_LoopRefCheck->check(temporary)){
-                    SetError(123,temporary,i);
+                //継承させる
+                if( !pobj_c->InheritsInterface( *pInheritsClass, i ) ){
                     goto Interface_InheritsError;
                 }
-
-                if( pInheritsClass->ppobj_Member == 0 ){
-                    //継承先が読み取られていないとき
-                    pobj_LoopRefCheck->add(pobj_c->name);
-                    GetClass_recur(temporary);
-                    pobj_LoopRefCheck->del(pobj_c->name);
-                }
-
-                //継承させる
-                pobj_c->Inherits( pInheritsClass );
             }
             else{
@@ -1207 +1279 @@
                 }
 
-                //ループ継承でないかをチェック
-                if(pobj_LoopRefCheck->check(temporary)){
-                    SetError(123,temporary,i);
+                if( pInheritsClass->IsInterface() ){
+                    // クラスを継承していないとき
+                    CClass *pObjectClass = check("Object");
+                    if( !pObjectClass ){
+                        SetError(106,"Object",i);
+                        goto InheritsError;
+                    }
+
+                    if( !pobj_c->Inherits( *pObjectClass, i ) ){
+                        goto InheritsError;
+                    }
+                }
+
+                //継承させる
+                if( !pobj_c->Inherits( *pInheritsClass, i ) ){
                     goto InheritsError;
                 }
-
-                if( pInheritsClass->ppobj_Member == 0 ){
-                    //継承先が読み取られていないとき
-                    pobj_LoopRefCheck->add(pobj_c->name);
-                    GetClass_recur(temporary);
-                    pobj_LoopRefCheck->del(pobj_c->name);
-                }
-
-                //継承させる
-                pobj_c->Inherits( pInheritsClass );
             }
 InheritsError:
@@ -1425 +1499 @@
 
 void CDBClass::Compile_System_InitializeUserTypes(){
+    char temporary[VN_SIZE];
 
     ////////////////////////////////////////////////////////////////////
@@ -1436 +1511 @@
         CClass *pClass = Iterator_GetNext();
 
-        char temporary[VN_SIZE];
         sprintf( temporary
             , "Add(%c%c_System_TypeForClass(\"%s\",\"%s\"))"
@@ -1451 +1525 @@
         ReallocNativeCodeBuffer();
     }
+
+
+    ////////////////////////////////////////////////////////////////////
+    // 基底クラスを登録
+    ////////////////////////////////////////////////////////////////////
+
+    sprintf(temporary, "%c%ctempType=Nothing%c%cTypeBaseImpl"
+        , HIBYTE( COM_DIM )
+        , LOBYTE( COM_DIM )
+        , 1
+        , ESC_AS
+        );
+    ChangeOpcode( temporary );
+
+    // イテレータをリセット
+    Iterator_Reset();
+
+    while( Iterator_HasNext() ){
+        CClass *pClass = Iterator_GetNext();
+
+        if( pClass->pobj_InheritsClass ){
+            sprintf( temporary
+                , "tempType=Search(\"%s\",\"%s\")"
+                , ""                // 名前空間 (TODO: 実装)
+                , pClass->name      // クラス名
+                );
+
+            // コンパイル
+            ChangeOpcode( temporary );
+
+            sprintf( temporary
+                , "tempType.SetBaseType(Search(\"%s\",\"%s\"))"
+                , ""                                // 名前空間 (TODO: 実装)
+                , pClass->pobj_InheritsClass->name  // 基底クラス名
+                );
+
+            // コンパイル
+            ChangeOpcode( temporary );
+        }
+
+        // ネイティブコードバッファの再確保
+        ReallocNativeCodeBuffer();
+    }
+
 
 

BasicCompiler_Common/Class.h

@@ -71 +71 @@
     enum ClassType{
         Class,
+        Interface,
+        Enum,
+        Delegate,
         Structure,
-        Interface,
     };
 
@@ -99 +101 @@
     ~CClass();
 
+    bool IsClass() const;
+    bool IsInterface() const;
+    bool IsEnum() const;
+    bool IsDelegate() const;
     bool IsStructure() const;
 
     //継承させる
-    void Inherits( CClass *pInheritsClass );
+    bool Inherits( CClass &inheritsClass, int nowLine );
+    bool InheritsInterface( CClass &inheritsClass, int nowLine );
 
     //メンバ、メソッドの追加

BasicCompiler_Common/LoopRefCheck.cpp

@@ -45 +45 @@
     }
 }
-BOOL CLoopRefCheck::check(char *lpszInheritsClass){
+BOOL CLoopRefCheck::check(const CClass &inheritsClass) const
+{
     //ループ継承チェック
     int i;
     for(i=0;i<num;i++){
-        if(lstrcmp(names[i],lpszInheritsClass)==0) return 1;
+        if(lstrcmp(names[i],inheritsClass.name)==0) return 1;
     }
     return 0;

BasicCompiler_Common/ParamImpl.cpp

@@ -10 +10 @@
 #define OVERLOAD_MAX_LEVEL 4
 #define OVERLOAD_LEVEL0 0       // 型調整なし。厳密に等しい
-#define OVERLOAD_LEVEL1 1       // 型調整なし。整数型/実数型レベルでの同一性チェック
-#define OVERLOAD_LEVEL2 2       // 型調整あり。厳密に等しい
-#define OVERLOAD_LEVEL3 3       // 型調整あり。整数型/実数型レベルでの同一性チェック
-#define OVERLOAD_LEVEL4 4       // 型調整あり。数値型/クラス型レベルでの同一性チェック
+#define OVERLOAD_LEVEL1 1       // 型調整なし。レベル1以上はオブジェクトの場合は派生関係を考慮
+#define OVERLOAD_LEVEL2 2       // 型調整なし。整数型/実数型レベルでの同一性チェック
+#define OVERLOAD_LEVEL3 3       // 型調整あり。厳密に等しい
+#define OVERLOAD_LEVEL4 4       // 型調整あり。整数型/実数型レベルでの同一性チェック
+#define OVERLOAD_LEVEL5 5       // 型調整あり。数値型/クラス型レベルでの同一性チェック
 
 ParamImpl::ParamImpl(const char *buffer):
@@ -127 +128 @@
 
             NumOpe_GetType(Parms[i],
-                (level==OVERLOAD_LEVEL0 || level == OVERLOAD_LEVEL1)? nullParam : param,
+                ( level <= OVERLOAD_LEVEL2 )? nullParam : param,
                 argType);
         }
@@ -135 +136 @@
 
         if(argType.GetBasicType()!=param.GetBasicType()){
-            if( level == OVERLOAD_LEVEL0 || level==OVERLOAD_LEVEL2 ){
+            if( level == OVERLOAD_LEVEL0 || level == OVERLOAD_LEVEL1 || level==OVERLOAD_LEVEL3 ){
                 return false;
             }
-            else if( level == OVERLOAD_LEVEL1 || level==OVERLOAD_LEVEL3){
+            else if( level == OVERLOAD_LEVEL2 || level==OVERLOAD_LEVEL4){
                 if(!(
                     argType.IsWhole()&&param.IsWhole()||
@@ -146 +147 @@
                 }
             }
-            else if(level==OVERLOAD_LEVEL4){
+            else if(level==OVERLOAD_LEVEL5){
                 if(argType.IsObject()||param.IsObject()) return false;
             }
@@ -158 +159 @@
             }
             else if( NATURAL_TYPE(argType.GetBasicType())==DEF_OBJECT ){
-                if( !param.GetClass().IsEqualsOrSubClass( &argType.GetClass() ) ){
-                    return false;
+                if( level == OVERLOAD_LEVEL0 ){
+                    if( !param.GetClass().IsEquals( &argType.GetClass() ) ){
+                        return false;
+                    }
+                }
+                else{
+                    if( !param.GetClass().IsEqualsOrSubClass( &argType.GetClass() ) ){
+                        return false;
+                    }
                 }
             }
@@ -191 +199 @@
 
                 pUserProc = pTempUserProc;
-                break;
             }
         }

BasicCompiler_Common/Procedure.h

@@ -101 +101 @@
     bool isExport;
     bool isSystem;
+    bool isAutoGeneration;
     bool isCompiled;
 
@@ -114 +115 @@
       isExport( isExport ),
       isSystem( false ),
+      isAutoGeneration( false ),
       isCompiled( false ),
       pNextData( NULL )
@@ -176 +178 @@
     {
         return isSystem;
+    }
+    void ThisIsAutoGenerationProc(){
+        isAutoGeneration = true;
+    }
+    bool IsAutoGeneration(){
+        return isAutoGeneration;
     }
     void CompleteCompile(){

BasicCompiler_Common/common.h

@@ -47 +47 @@
 
 #ifdef _AMD64_
-#define VER_INFO        "(x64) β rev.194"
+#define VER_INFO        "(x64) β rev.206"
 #else
-#define VER_INFO        "β rev.194"
+#define VER_INFO        "β rev.206"
 #endif
 
@@ -460 +460 @@
     void add(char *lpszInheritsClass);
     void del(char *lpszInheritsClass);
-    BOOL check(char *lpszInheritsClass);
+    BOOL check(const CClass &inheritsClass) const;
 };
 extern CLoopRefCheck *pobj_LoopRefCheck;