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

Timestamp:

Jul 13, 2007, 2:49:56 AM (17 years ago)

Author:

dai_9181

Message:

UserProc/DllProc/ProcPointerクラスをSymbolクラスからの派生にした

Location:

trunk/abdev/BasicCompiler_Common/include

Files:

• Class.h (modified) (1 diff)
• Procedure.h (modified) (17 diffs)
• Symbol.h (modified) (4 diffs)

trunk/abdev/BasicCompiler_Common/include/Class.h

@@ -73 +73 @@
 
     // XMLシリアライズ用
+    // TODO: xml未完成
 private:
     friend class boost::serialization::access;

trunk/abdev/BasicCompiler_Common/include/Procedure.h

@@ -3 +3 @@
 #include <jenga/include/common/Hashmap.h>
 #include <jenga/include/smoothie/Source.h>
-#include <jenga/include/smoothie/LexicalAnalysis.h>
 
 #include <option.h>
@@ -16 +15 @@
 class CMethod;
 
-class Procedure
+class Procedure : public Symbol
 {
 public:
@@ -26 +25 @@
 
 private:
-    string name;                        // プロシージャ名
-
     Kind kind;
 
@@ -48 +45 @@
 private:
     friend class boost::serialization::access;
-    BOOST_SERIALIZATION_SPLIT_MEMBER();
-    template<class Archive> void load(Archive& ar, const unsigned int version)
+    template<class Archive> void serialize(Archive& ar, const unsigned int version)
     {
         trace_for_serialize( "serializing - Procedure" );
 
-        std::string _name;
-        ar & BOOST_SERIALIZATION_NVP( _name );
-        this->name = Operator_NaturalStringToCalcMarkString( _name );
-
+        ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Symbol );
         ar & BOOST_SERIALIZATION_NVP( kind );
         ar & BOOST_SERIALIZATION_NVP( isCdecl );
@@ -64 +57 @@
         ar & BOOST_SERIALIZATION_NVP( codePos );
     }
-    template<class Archive> void save(Archive& ar, const unsigned int version) const
-    {
-        trace_for_serialize( "serializing - Procedure" );
-
-        std::string _name = Operator_CalcMarkStringToNaturalString( name );
-        ar & BOOST_SERIALIZATION_NVP( _name );
-
-        ar & BOOST_SERIALIZATION_NVP( kind );
-        ar & BOOST_SERIALIZATION_NVP( isCdecl );
-        ar & BOOST_SERIALIZATION_NVP( isUsing );
-        ar & BOOST_SERIALIZATION_NVP( params );
-        ar & BOOST_SERIALIZATION_NVP( returnType );
-        ar & BOOST_SERIALIZATION_NVP( codePos );
-    }
-
-public:
-    Procedure( const string &name, Kind kind, bool isCdecl )
-        : name( name )
+
+public:
+    Procedure( const NamespaceScopes &namespaceScopes, const string &name, Kind kind, bool isCdecl )
+        : Symbol( namespaceScopes, name )
         , kind( kind )
         , isCdecl( isCdecl )
@@ -97 +76 @@
     }
 
-    const string &GetName() const
-    {
-        return name;
-    }
-
     bool IsSub() const
     {
@@ -145 +119 @@
 
 private:
-    NamespaceScopes namespaceScopes;
     NamespaceScopesCollection importedNamespaces;
 
@@ -183 +156 @@
         ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Procedure );
         ar & BOOST_SERIALIZATION_NVP( _paramStr );
-        ar & BOOST_SERIALIZATION_NVP( namespaceScopes );
         ar & BOOST_SERIALIZATION_NVP( importedNamespaces );
         ar & boost::serialization::make_nvp("pParentClass", const_cast<CClass *&>(pParentClass) );
@@ -204 +176 @@
 
     UserProc( const NamespaceScopes &namespaceScopes, const NamespaceScopesCollection &importedNamespaces, const string &name, Kind kind, bool isMacro, bool isCdecl, bool isExport, int id )
-        : Procedure( name, kind, isCdecl )
-        , namespaceScopes( namespaceScopes )
+        : Procedure( namespaceScopes, name, kind, isCdecl )
         , importedNamespaces( importedNamespaces )
         , pParentClass( NULL )
@@ -314 +285 @@
     }
 
-    const NamespaceScopes &GetNamespaceScopes() const;
+    virtual const NamespaceScopes &GetNamespaceScopes() const;
     const NamespaceScopesCollection &GetImportedNamespaces() const;
 
@@ -340 +311 @@
     }
 
-    bool IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const;
-    bool IsEqualSymbol( const UserProc &globalProc ) const;
-    bool IsEqualSymbol( const string &name ) const;
-
     bool IsVirtual() const;
 
@@ -360 +327 @@
     {
         return ( pParentClass != NULL );
+    }
+    bool IsGlobalProcedure() const
+    {
+        return ( pParentClass == NULL );
     }
     void SetMethod( CMethod *pMethod ){
@@ -428 +399 @@
 class DllProc : public Procedure
 {
-    NamespaceScopes namespaceScopes;
-
     string dllFileName;
     string alias;
@@ -442 +411 @@
 
         ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP( Procedure );
-        ar & BOOST_SERIALIZATION_NVP( namespaceScopes );
         ar & BOOST_SERIALIZATION_NVP( dllFileName );
         ar & BOOST_SERIALIZATION_NVP( alias );
@@ -453 +421 @@
 
     DllProc( const NamespaceScopes &namespaceScopes, const string &name, Kind kind, bool isCdecl, const string &dllFileName, const string &alias ):
-      Procedure( name, kind, isCdecl ),
-      namespaceScopes( namespaceScopes ),
+      Procedure( namespaceScopes, name, kind, isCdecl ),
       dllFileName( dllFileName ),
       alias( alias ),
@@ -463 +430 @@
     ~DllProc(){}
 
-    virtual bool IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const;
-    bool IsEqualSymbol( const string &name ) const;
-
-    const NamespaceScopes &GetNamespaceScopes() const
-    {
-        return namespaceScopes;
-    }
-
     const string &GetDllFileName() const
     {
@@ -505 +464 @@
 public:
     ProcPointer( Kind kind )
-        : Procedure( "", kind, false )
+        : Procedure( NamespaceScopes(), std::string(), kind, false )
     {
     }

trunk/abdev/BasicCompiler_Common/include/Symbol.h

@@ -7 +7 @@
 
 #include <jenga/include/smoothie/Namespace.h>
+#include <jenga/include/smoothie/LexicalAnalysis.h>
 
 using namespace std;
@@ -18 +19 @@
 private:
     friend class boost::serialization::access;
-    template<class Archive> void serialize(Archive& ar, const unsigned int version)
+    BOOST_SERIALIZATION_SPLIT_MEMBER();
+    template<class Archive> void load(Archive& ar, const unsigned int version)
     {
+        trace_for_serialize( "serializing(load) - Symbol" );
+
         ar & BOOST_SERIALIZATION_NVP( namespaceScopes );
-        ar & BOOST_SERIALIZATION_NVP( name );
+
+        std::string _name;
+        ar & BOOST_SERIALIZATION_NVP( _name );
+        this->name = Operator_NaturalStringToCalcMarkString( _name );
+    }
+    template<class Archive> void save(Archive& ar, const unsigned int version) const
+    {
+        trace_for_serialize( "serializing(save) - Symbol" );
+
+        ar & BOOST_SERIALIZATION_NVP( namespaceScopes );
+
+        std::string _name = Operator_CalcMarkStringToNaturalString( name );
+        ar & BOOST_SERIALIZATION_NVP( _name );
     }
 
@@ -41 +57 @@
     }
 
-    const NamespaceScopes &GetNamespaceScopes() const
+    virtual const NamespaceScopes &GetNamespaceScopes() const
     {
         return namespaceScopes;
@@ -53 +69 @@
     bool IsEqualSymbol( const NamespaceScopes &namespaceScopes, const string &name ) const;
     bool IsEqualSymbol( const Symbol &symbol ) const;
-    bool IsEqualSymbol( const string &name ) const;
+    bool IsEqualSymbol( const char *fullName ) const;
+    bool IsEqualSymbol( const string &fullName ) const
+    {
+        return IsEqualSymbol( fullName.c_str() );
+    }
 };