Changeset 191 in dev for trunk

Timestamp:

Jun 26, 2007, 12:06:12 AM (17 years ago)

Author:

dai_9181

Message:

 

Location:

trunk/abdev

Files:

• BasicCompiler32/BasicCompiler.vcproj (modified) (2 diffs)
• BasicCompiler32/MakePeHdr.cpp (modified) (2 diffs)
• BasicCompiler_Common/DebugMiddleFile.cpp (modified) (3 diffs)
• BasicCompiler_Common/MakeExe.cpp (modified) (1 diff)
• BasicCompiler_Common/include/ClassImpl.h (modified) (3 diffs)
• BasicCompiler_Common/include/MetaImpl.h (added)
• BasicCompiler_Common/include/SmoothieImpl.h (added)
• BasicCompiler_Common/src/SmoothieImpl.cpp (modified) (1 diff)

trunk/abdev/BasicCompiler32/BasicCompiler.vcproj

@@ -1365 +1365 @@
                 </File>
                 <File
+                    RelativePath="..\BasicCompiler_Common\include\MetaImpl.h"
+                    >
+                </File>
+                <File
                     RelativePath="..\BasicCompiler_Common\include\ProcedureImpl.h"
                     >
@@ -1370 +1374 @@
                 <File
                     RelativePath="..\BasicCompiler_Common\include\Program.h"
+                    >
+                </File>
+                <File
+                    RelativePath="..\BasicCompiler_Common\include\SmoothieImpl.h"
                     >
                 </File>

trunk/abdev/BasicCompiler32/MakePeHdr.cpp

@@ -191 +191 @@
     //クラス情報を取得（※注 - GetSubInfoの後に呼び出す）
     Smoothie::GetMeta().GetClasses().GetAllClassInfo();
+
+    if( !Smoothie::GetMeta().AutoWrite( Jenga::Common::Environment::GetAppDir() + "\\meta_test.xml" ) )
+    {
+        ts(0);
+    }
 
     //コードと行番号の関係
@@ -1702 +1707 @@
 
     //コードバッファを解放
-    HeapDefaultFree(OpBuffer);
+    free(OpBuffer);
     OpBuffer=0;
 

trunk/abdev/BasicCompiler_Common/DebugMiddleFile.cpp

@@ -456 +456 @@
     IncludeFileInfo.FilesNum=*(long *)(buffer+i2);
     i2+=sizeof(long);
-    IncludeFileInfo.ppFileNames=(char **)HeapAlloc(hHeap,0,IncludeFileInfo.FilesNum*sizeof(char *));
+    IncludeFileInfo.ppFileNames=(char **)malloc(IncludeFileInfo.FilesNum*sizeof(char *));
     for(i3=0;i3<IncludeFileInfo.FilesNum;i3++){
         if(buffer[i2]=='\0') break;
-        IncludeFileInfo.ppFileNames[i3]=(char *)HeapAlloc(hHeap,0,lstrlen(buffer+i2)+1);
+        IncludeFileInfo.ppFileNames[i3]=(char *)malloc(lstrlen(buffer+i2)+1);
         lstrcpy(IncludeFileInfo.ppFileNames[i3],buffer+i2);
         i2+=lstrlen(buffer+i2)+1;
@@ -905 +905 @@
 
 
-    if(OpBuffer) HeapDefaultFree(OpBuffer);
+    if(OpBuffer) free(OpBuffer);
     OpBuffer=(char *)malloc(SizeOf_CodeSection);
 
@@ -976 +976 @@
     //インクルード情報を解放
     for(i2=0;i2<IncludeFileInfo.FilesNum;i2++)
-        HeapDefaultFree(IncludeFileInfo.ppFileNames[i2]);
-    HeapDefaultFree(IncludeFileInfo.ppFileNames);
+    {
+        free(IncludeFileInfo.ppFileNames[i2]);
+    }
+    free(IncludeFileInfo.ppFileNames);
 
     //クラスに関するメモリを解放

trunk/abdev/BasicCompiler_Common/MakeExe.cpp

@@ -249 +249 @@
     extern INCLUDEFILEINFO IncludeFileInfo;
     for(i2=0;i2<IncludeFileInfo.FilesNum;i2++)
-        HeapDefaultFree(IncludeFileInfo.ppFileNames[i2]);
-    HeapDefaultFree(IncludeFileInfo.ppFileNames);
+    {
+        free(IncludeFileInfo.ppFileNames[i2]);
+    }
+    free(IncludeFileInfo.ppFileNames);
 }
 int MainThread(DWORD dummy){

trunk/abdev/BasicCompiler_Common/include/ClassImpl.h

@@ -8 +8 @@
     ClassImpl( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const string &name )
         : CClass( namespaceScopes, importedNamespaces, name )
+    {
+    }
+    ClassImpl()
+        : CClass()
     {
     }
@@ -26 +30 @@
     virtual LONG_PTR GetVtblGlobalOffset(void) const;
     virtual void ActionVtblSchedule(LONG_PTR ImageBase, LONG_PTR MemPos_CodeSection);
+
+
+    // XMLシリアライズ用
+private:
+    friend class boost::serialization::access;
+    template<class Archive> void serialize(Archive& ar, const unsigned int version)
+    {
+        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( CClass );
+    }
 };
+BOOST_IS_ABSTRACT( CClass );
 
 class ClassesImpl : public Classes
 {
 public:
+    ClassesImpl()
+        : Classes()
+    {
+    }
+
     virtual CClass *Create( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const char *name);
     virtual void CollectClassesForNameOnly( const BasicSource &source );
@@ -43 +62 @@
     virtual void Compile_System_InitializeUserTypes();
 
+
+    // XMLシリアライズ用
+private:
+    friend class boost::serialization::access;
+    BOOST_SERIALIZATION_SPLIT_MEMBER();
+    template<class Archive> void load(Archive& ar, const unsigned int version)
+    {
+        std::vector<ClassImpl *> vectorClasses;
+        ar & BOOST_SERIALIZATION_NVP( vectorClasses );
+
+        // 読み込み後の処理
+        Clear();
+        BOOST_FOREACH( CClass *pClass, vectorClasses )
+        {
+            Insert( pClass );
+        }
+    }
+    template<class Archive> void save(Archive& ar, const unsigned int version) const
+    {
+        // 保存準備
+        std::vector<ClassImpl *> vectorClasses;
+        vectorClasses.clear();
+        Iterator_Reset();
+        while( Iterator_HasNext() )
+        {
+            vectorClasses.push_back( dynamic_cast<ClassImpl *>(Iterator_GetNext()) );
+        }
+
+        ar & BOOST_SERIALIZATION_NVP( vectorClasses );
+    }
 };
+BOOST_IS_ABSTRACT( Classes );

trunk/abdev/BasicCompiler_Common/src/SmoothieImpl.cpp

@@ -1 +1 @@
 #include <jenga/include/smoothie/Smoothie.h>
 
+#include <SmoothieImpl.h>
 #include <ClassImpl.h>
 #include <ProcedureImpl.h>
 #include <LexicalScopingImpl.h>
 
-Meta Smoothie::meta(
-                new ClassesImpl(),
-                new ProcPointersImpl()
-                );
+MetaImpl SmoothieImpl::metaImpl(
+    new ClassesImpl()
+);
 
 CLexicalScopes *Smoothie::Temp::pLexicalScopes = new LexicalScopesImpl();
+
+
+Meta &Smoothie::GetMeta()
+{
+    return SmoothieImpl::metaImpl;
+}