Changeset 209 in dev for trunk/abdev/BasicCompiler_Common/include

Timestamp:

Jul 13, 2007, 4:22:02 AM (17 years ago)

Author:

dai_9181

Message:

DllProcsクラスを追加。

Location:

trunk/abdev/BasicCompiler_Common/include

Files:

• MetaImpl.h (modified) (3 diffs)
• Procedure.h (modified) (5 diffs)

trunk/abdev/BasicCompiler_Common/include/MetaImpl.h

@@ -18 +18 @@
     // 関数・メソッド
     UserProcs userProcs;
+
+    // DLL関数
+    DllProcs dllProcs;
 
     // クラス
@@ -53 +56 @@
         ar & BOOST_SERIALIZATION_NVP( namespaceScopesCollection );
         ar & BOOST_SERIALIZATION_NVP( userProcs );
+        ar & BOOST_SERIALIZATION_NVP( dllProcs );
         ar & BOOST_SERIALIZATION_NVP( classesImpl );
         ar & BOOST_SERIALIZATION_NVP( globalVars );
@@ -87 +91 @@
     {
         return userProcs;
+    }
+
+    const DllProcs &GetDllProcs() const
+    {
+        return dllProcs;
+    }
+    DllProcs &GetDllProcs()
+    {
+        return dllProcs;
     }
 

trunk/abdev/BasicCompiler_Common/include/Procedure.h

@@ -205 +205 @@
     }
 
-    bool IsMacro() const
-    {
-        return isMacro;
-    }
-
-    int GetSecondParmNum() const
-    {
-        return secondParmNum;
-    }
-    const Parameters &RealParams() const
-    {
-        return realParams;
-    }
-    int GetRealSecondParmNum() const
-    {
-        return realSecondParmNum;
-    }
-
-    void ExportOff(){
-        isExport = false;
-    }
-    bool IsExport() const
-    {
-        return isExport;
-    }
-    void ThisIsSystemProc() const
-    {
-        isSystem = true;
-    }
-    bool IsSystem() const
-    {
-        return isSystem;
-    }
-    void ThisIsAutoGenerationProc() const
-    {
-        isAutoGeneration = true;
-    }
-    bool IsAutoGeneration() const
-    {
-        return isAutoGeneration;
-    }
-    void CompleteCompile() const
-    {
-        isCompiled = true;
-    }
-    void KillCompileStatus() const
-    {
-        isCompiled = false;
-    }
-    bool IsCompiled() const
-    {
-        return isCompiled;
-    }
-    bool IsDestructor() const
-    {
-        return ( GetName()[0] == '~' );
-    }
-
-    // バイナリコード位置とサイズ
-    DWORD GetBeginOpAddress() const
-    {
-        return beginOpAddress;
-    }
-    void SetBeginOpAddress( DWORD beginOpAddress ) const
-    {
-        this->beginOpAddress = beginOpAddress;
-    }
-    DWORD GetEndOpAddress() const
-    {
-        return endOpAddress;
-    }
-    void SetEndOpAddress( DWORD endOpAddress ) const
-    {
-        this->endOpAddress = endOpAddress;
-    }
-    int GetCodeSize() const
-    {
-        return endOpAddress - beginOpAddress;
-    }
-
-    virtual const NamespaceScopes &GetNamespaceScopes() const;
-    const NamespaceScopesCollection &GetImportedNamespaces() const;
-
-    Variables &GetLocalVars() const
-    {
-        return localVars;
-    }
-
-    int GetId() const
-    {
-        return id;
-    }
-
-    std::string GetFullName() const;
-
     virtual bool IsDuplication( const UserProc *pUserProc ) const
     {
@@ -311 +216 @@
     }
 
+    bool IsMacro() const
+    {
+        return isMacro;
+    }
+
+    int GetSecondParmNum() const
+    {
+        return secondParmNum;
+    }
+    const Parameters &RealParams() const
+    {
+        return realParams;
+    }
+    int GetRealSecondParmNum() const
+    {
+        return realSecondParmNum;
+    }
+
+    void ExportOff(){
+        isExport = false;
+    }
+    bool IsExport() const
+    {
+        return isExport;
+    }
+    void ThisIsSystemProc() const
+    {
+        isSystem = true;
+    }
+    bool IsSystem() const
+    {
+        return isSystem;
+    }
+    void ThisIsAutoGenerationProc() const
+    {
+        isAutoGeneration = true;
+    }
+    bool IsAutoGeneration() const
+    {
+        return isAutoGeneration;
+    }
+    void CompleteCompile() const
+    {
+        isCompiled = true;
+    }
+    void KillCompileStatus() const
+    {
+        isCompiled = false;
+    }
+    bool IsCompiled() const
+    {
+        return isCompiled;
+    }
+    bool IsDestructor() const
+    {
+        return ( GetName()[0] == '~' );
+    }
+
+    // バイナリコード位置とサイズ
+    DWORD GetBeginOpAddress() const
+    {
+        return beginOpAddress;
+    }
+    void SetBeginOpAddress( DWORD beginOpAddress ) const
+    {
+        this->beginOpAddress = beginOpAddress;
+    }
+    DWORD GetEndOpAddress() const
+    {
+        return endOpAddress;
+    }
+    void SetEndOpAddress( DWORD endOpAddress ) const
+    {
+        this->endOpAddress = endOpAddress;
+    }
+    int GetCodeSize() const
+    {
+        return endOpAddress - beginOpAddress;
+    }
+
+    virtual const NamespaceScopes &GetNamespaceScopes() const;
+    const NamespaceScopesCollection &GetImportedNamespaces() const;
+
+    Variables &GetLocalVars() const
+    {
+        return localVars;
+    }
+
+    int GetId() const
+    {
+        return id;
+    }
+
+    std::string GetFullName() const;
+
     bool IsVirtual() const;
 
@@ -393 +393 @@
 
     void EnumGlobalProcs( const char *simpleName, const char *localName, std::vector<const UserProc *> &subs );
-
-    static void CollectUserProcs( const BasicSource &source, UserProcs &userProcs );
-};
-
-class DllProc : public Procedure
+};
+
+class DllProc : public Procedure, public Jenga::Common::ObjectInHashmap<DllProc>
 {
     string dllFileName;
@@ -428 +426 @@
     {
     }
-    ~DllProc(){}
+    ~DllProc()
+    {
+    }
+
+    virtual const std::string &GetKeyName() const
+    {
+        return GetName();
+    }
+
+    virtual bool IsDuplication( const DllProc *pDllProc ) const
+    {
+        if( pDllProc->IsEqualSymbol( *this )
+            && this->Params().Equals( pDllProc->Params() ) )
+        {
+            return true;
+        }
+        return false;
+    }
 
     const string &GetDllFileName() const
@@ -449 +464 @@
     bool SetParamsAndReturnType( const char *sourceOfParams, int nowLine );
 };
+class DllProcs : public Jenga::Common::Hashmap<DllProc>
+{
+    // XMLシリアライズ用
+private:
+    friend class boost::serialization::access;
+    template<class Archive> void serialize(Archive& ar, const unsigned int version)
+    {
+        trace_for_serialize( "serializing - DllProcs" );
+
+        ar & boost::serialization::make_nvp("Hashmap_DllProc",
+            boost::serialization::base_object<Jenga::Common::Hashmap<DllProc>>(*this));
+    }
+
+public:
+    void Add(const NamespaceScopes &namespaceScopes, char *buffer,int nowLine);
+};
+
+void CollectProcedures( const BasicSource &source, UserProcs &userProcs, DllProcs &dllProcs );
 
 class ProcPointer : public Procedure