Changeset 89 in dev for BasicCompiler_Common

Timestamp:

Apr 4, 2007, 2:03:09 AM (18 years ago)

Author:

dai_9181

Message:

実行時型情報の生成に対応。
関数の戻り値の型に抽象クラスを指定できるようにした。

Location:

BasicCompiler_Common

Files:

• Class.cpp (modified) (9 diffs)
• Class.h (modified) (2 diffs)
• Compile.cpp (modified) (3 diffs)
• Object.cpp (modified) (1 diff)
• Procedure.h (modified) (1 diff)
• common.h (modified) (1 diff)
• include/Source.h (modified) (1 diff)
• preprocessor.cpp (deleted)
• src/Source.cpp (modified) (5 diffs)

BasicCompiler_Common/Class.cpp

@@ -117 +117 @@
 
             //ネイティブコードバッファの再確保
-            extern int obp_AllocSize;
-            if(obp_AllocSize<obp+8192){
-                obp_AllocSize+=8192;
-                OpBuffer=(char *)HeapReAlloc(hHeap,0,OpBuffer,obp_AllocSize); //matea
-            }
+            ReallocNativeCodeBuffer();
+
             i++;
         }
@@ -198 +195 @@
 
 void CClass::Inherits( CClass *pInheritsClass ){
-    int i3;
 
     //メンバをコピー
@@ -207 +203 @@
         pInheritsClass->iMemberNum*sizeof(CMember *));
     iMemberNum=pInheritsClass->iMemberNum;
-    for(i3=0;i3<pInheritsClass->iMemberNum;i3++){
+    for(int i3=0;i3<pInheritsClass->iMemberNum;i3++){
         ppobj_Member[i3]=new CMember( *pInheritsClass->ppobj_Member[i3] );
 
@@ -315 +311 @@
 {
     for( int i=(int)methods.size()-1; i>=0; i-- ){
-        if( pUserProc == methods[i]->pUserProc ) return methods[i];
+        if( pUserProc == methods[i]->pUserProc ){
+            return methods[i];
+        }
     }
     return NULL;
@@ -1350 +1348 @@
 
 
-                        if(pobj_c->ppobj_Member[pobj_c->iMemberNum-1]->IsObject()||
-                            pobj_c->ppobj_Member[pobj_c->iMemberNum-1]->IsStruct()){
+                        if(pobj_c->ppobj_Member[pobj_c->iMemberNum-1]->IsStruct()){
                             if(pobj_c->ppobj_Member[pobj_c->iMemberNum-1]->GetClass().ppobj_Member==0){
                                 //参照先が読み取られていないとき
@@ -1359 +1356 @@
 
 
-                        if(pobj_c->ppobj_Member[pobj_c->iMemberNum-1]->IsObject()){
+                        if(pobj_c->ppobj_Member[pobj_c->iMemberNum-1]->IsStruct()){
                             //循環参照のチェック
                             pobj_LoopRefCheck->add(pobj_c->name);
@@ -1422 +1419 @@
     delete pobj_LoopRefCheck;
     pobj_LoopRefCheck=0;
-}
-
-void CDBClass::GenerateRuntimeTypeInfo(){
+
+    // イテレータ用のデータを作る
+    pobj_DBClass->Iterator_Init();
+}
+
+void CDBClass::Compile_System_InitializeUserTypes(){
+
+    ////////////////////////////////////////////////////////////////////
+    // クラス登録
+    ////////////////////////////////////////////////////////////////////
+
+    // イテレータをリセット
+    Iterator_Reset();
+
+    while( Iterator_HasNext() ){
+        CClass *pClass = Iterator_GetNext();
+
+        char temporary[VN_SIZE];
+        sprintf( temporary
+            , "Add(%c%c_System_TypeForClass(\"%s\",\"%s\"))"
+            , 1
+            , ESC_NEW
+            , ""                // 名前空間 (TODO: 実装)
+            , pClass->name      // クラス名
+            );
+
+        // コンパイル
+        ChangeOpcode( temporary );
+
+        // ネイティブコードバッファの再確保
+        ReallocNativeCodeBuffer();
+    }
+
+
+    ////////////////////////////////////////////////////////////////////
+    // 継承関係登録
+    ////////////////////////////////////////////////////////////////////
+    // TODO: 未完成
+    /*
+
+    // イテレータをリセット
+    Iterator_Reset();
+
+    while( Iterator_HasNext() ){
+        CClass *pClass = Iterator_GetNext();
+
+        sprintf( genBuffer + length
+            , "obj.Search( \"%s\" ).SetBaseType( Search( \"%s\" ) ):"
+            , ""                // クラス名
+            , pClass->name      // クラス名
+            );
+        length += lstrlen( genBuffer + length );
+
+        while( length + 8192 > max ){
+            max += 8192;
+            genBuffer = (char *)realloc( genBuffer, max );
+        }
+    }*/
 }
 
@@ -1475 +1527 @@
 //////////////////////
 
-void CDBClass::Iterator_Reset(void){
+void CDBClass::Iterator_Init(void){
     if(ppobj_IteClass) HeapDefaultFree(ppobj_IteClass);
 
@@ -1498 +1550 @@
     }
 }
+void CDBClass::Iterator_Reset(void){
+    iIteNextNum = 0;
+}
 BOOL CDBClass::Iterator_HasNext(void){
     if(iIteNextNum<iIteMaxNum) return 1;

BasicCompiler_Common/Class.h

@@ -217 +217 @@
     void GetClass_recur(const char *lpszInheritsClass);
     void GetAllClassInfo(void);
-    void GenerateRuntimeTypeInfo();
+    void Compile_System_InitializeUserTypes();
 
 
@@ -252 +252 @@
     int iIteNextNum;
 public:
+    void Iterator_Init(void);
     void Iterator_Reset(void);
     BOOL Iterator_HasNext(void);

BasicCompiler_Common/Compile.cpp

@@ -7 +7 @@
 #endif
 
-int obp,obp_AllocSize;
-int GlobalOpBufferSize;
-char *OpBuffer;
-
 //ラベルアドレス
 LABEL *pLabelNames;
@@ -36 +32 @@
 //With情報
 WITHINFO WithInfo;
+
+
+int obp,obp_AllocSize;
+int GlobalOpBufferSize;
+char *OpBuffer;
+void ReallocNativeCodeBuffer(){
+    if(obp_AllocSize<obp+8192){
+        obp_AllocSize+=8192;
+        OpBuffer=(char *)HeapReAlloc(hHeap,0,OpBuffer,obp_AllocSize); //matea
+    }
+}
 
 
@@ -428 +435 @@
                 OpcodeDim(Command+2,0);
 
-            if(obp_AllocSize<obp+8192){
-                obp_AllocSize+=8192;
-                OpBuffer=(char *)HeapReAlloc(hHeap,0,OpBuffer,obp_AllocSize);
-            }
+            // ネイティブコードバッファの再確保
+            ReallocNativeCodeBuffer();
 
             if(basbuf[cp]=='\0') break;

BasicCompiler_Common/Object.cpp

@@ -64 +64 @@
 
             //ネイティブコードバッファの再確保
-            extern int obp_AllocSize;
-            if(obp_AllocSize<obp+8192){
-                obp_AllocSize+=8192;
-                OpBuffer=(char *)HeapReAlloc(hHeap,0,OpBuffer,obp_AllocSize); //matea
-            }
+            ReallocNativeCodeBuffer();
         }
     }

BasicCompiler_Common/Procedure.h

@@ -155 +155 @@
         return *pParentClass;
     }
+    bool HasParentClass() const
+    {
+        return ( pParentClass != NULL );
+    }
     void SetMethod( CMethod *pMethod ){
         this->pMethod = pMethod;

BasicCompiler_Common/common.h

@@ -496 +496 @@
 
 //Compile.cpp
+void ReallocNativeCodeBuffer();
 void GetIdentifierToken( char *token, const char *source, int &pos );
 int JumpStatement(const char *source, int &pos);

BasicCompiler_Common/include/Source.h

@@ -29 +29 @@
 class BasicSource : public Text
 {
+    static const string generateDirectiveName;
+
     void Realloc( int newLength ){
         buffer = (char *)realloc( buffer, newLength + 255 );

BasicCompiler_Common/src/Source.cpp

@@ -4 +4 @@
 #include <windows.h>
 
+
+const string BasicSource::generateDirectiveName = "#generate";
 
 
@@ -409 +411 @@
 
 void BasicSource::ChangeReturnLineChar(){
+    int i,i2;
+
 #ifdef _DEBUG
     //改行コードの整合性チェック
-    for( int i=0; ; i++ ){
+    for( i=0; ; i++ ){
         if( buffer[i] == '\0' ){
             break;
@@ -433 +437 @@
 
     //改行コードのCRLFをLFに変換
-    int i,i2;
     for(i=0,i2=0;;i++,i2++){
         if(buffer[i]=='\r'&&buffer[i+1]=='\n') i++;
@@ -551 +554 @@
         if(i>LastFileByte[layer]){
             HeapDefaultFree(LayerDir[layer]);
+            LayerDir[layer]=0;
             layer--;
         }
@@ -842 +846 @@
 }
 
-bool BasicSource::Generate( const string &genName, const char *buffer ){
-    return true;
+bool BasicSource::Generate( const string &genName, const char *genBuffer ){
+    const int genBufferLength = lstrlen( genBuffer );
+
+#ifdef _DEBUG
+    // 挿入ソースに改行コードが含まれていないかを検査する
+    for( int i=0; genBuffer[i] ; i++ ){
+        if( genBuffer[i] == '\n' ){
+            SetError();
+            break;
+        }
+    }
+#endif
+
+    bool isFound = false;
+
+    for( int i=0; ; i++ ){
+        if( i == 0 || buffer[i] == '\n' ){
+            if( buffer[i] == '\n' ){
+                i++;
+            }
+            while( IsBlank( buffer[i] ) ){
+                i++;
+            }
+
+            int startIndex = i;
+
+            if( memicmp( buffer + i, generateDirectiveName.c_str(), generateDirectiveName.size() ) == 0 ){
+                i += (int)generateDirectiveName.size();
+                while( IsBlank( buffer[i] ) ){
+                    i++;
+                }
+
+                char temporary[VN_SIZE];
+                for( int i2=0; ; i++, i2++ ){
+                    if( buffer[i] == '\n' ){
+                        temporary[i2] = 0;
+                        break;
+                    }
+                    temporary[i2] = buffer[i];
+                }
+                if( genName == temporary ){
+                    // 一致
+
+                    int endIndex = i;
+
+                    int lengthOffset = genBufferLength - ( endIndex - startIndex );
+
+                    Realloc( length + lengthOffset );
+                    SlideString( buffer + endIndex, lengthOffset );
+                    memcpy( buffer + startIndex, genBuffer, genBufferLength );
+
+                    isFound = true;
+
+                    break;
+                }
+            }
+        }
+    }
+
+    return isFound;
 }