Changeset 828 in dev for trunk/ab5.0/abdev/ab_common/include/Lexical/Method.h

Timestamp:

Mar 19, 2012, 1:59:48 AM (12 years ago)

Author:

イグトランス (egtra)

Message:

egtraブランチの内容をマージ。

Location:

trunk

Files:

• . (modified) (1 prop)
• ab5.0/abdev (modified) (1 prop)
• ab5.0/abdev/ab_common/include/Lexical/Method.h (modified) (8 diffs)

trunk/ab5.0/abdev/ab_common/include/Lexical/Method.h

@@ -25 +25 @@
     {
     }
+
     CMethod()
-    {
-    }
-
+        : MemberPrototype()
+        , pUserProc()
+    {
+    }
+
+protected:
+    CMethod(CMethod const& y)
+        : MemberPrototype(y)
+        , pUserProc(y.pUserProc)
+    {
+    }
+
+public:
     const UserProc &GetUserProc() const
     {
@@ -50 +61 @@
 
     virtual bool Resolve( const ObjectModule &resolver, ResolveErrors &resolveErrors );
+
+private:
+    CMethod& operator =(CMethod const&);
 };
 
@@ -103 +117 @@
     {
     }
-    DynamicMethod( const CMethod &method )
+    explicit DynamicMethod( const CMethod &method )
         : CMethod( &method.GetUserProc(), method.GetAccessibility() )
         , isAbstract( method.IsAbstract() )
@@ -116 +130 @@
     }
 
+    DynamicMethod(DynamicMethod&& y)
+        : CMethod(std::move(y))
+        , isAbstract(std::move(y.isAbstract))
+        , isVirtual(std::move(y.isVirtual))
+        , isConst(std::move(y.isConst))
+        , pInheritsClass(std::move(y.pInheritsClass))
+        , isNotUse(std::move(y.isNotUse))
+    {
+    }
+
+    DynamicMethod(DynamicMethod const& y)
+        : CMethod(y)
+        , isAbstract(y.isAbstract)
+        , isVirtual(y.isVirtual)
+        , isConst(y.isConst)
+        , pInheritsClass(y.pInheritsClass)
+        , isNotUse(y.isNotUse)
+    {
+    }
+
+    DynamicMethod& operator =(DynamicMethod const&);
+
     DynamicMethod::OverrideResult::EnumType Override( const UserProc *pUserProc, Prototype::Accessibility accessibility, bool isOverrideModifier );
 
@@ -161 +197 @@
     virtual bool Resolve( const ObjectModule &resolver, ResolveErrors &resolveErrors );
 };
-BOOST_CLASS_EXPORT( DynamicMethod );
+BOOST_CLASS_EXPORT_KEY( DynamicMethod );
 class StaticMethod : public CMethod
 {
@@ -182 +218 @@
     }
 
+    // ムーブコンストラクタ
+    StaticMethod(StaticMethod&& y);
+
     // コピーコンストラクタ
     StaticMethod( const StaticMethod &staticMethod );
@@ -237 +276 @@
     virtual bool Resolve( const ObjectModule &resolver, ResolveErrors &resolveErrors );
 };
-BOOST_CLASS_EXPORT( StaticMethod );
+BOOST_CLASS_EXPORT_KEY( StaticMethod );
 
 class Methods : public std::vector<CMethod *>
@@ -255 +294 @@
     Methods();
 
+    // ムーブコンストラクタ
+    Methods(Methods&& methods);
+
     // コピーコンストラクタ
-    Methods( const Methods &methods );
+    Methods(const Methods &methods);
+
+    Methods& operator =(Methods&& methods)
+    {
+        std::vector<CMethod *>::operator =(std::move(methods));
+        return *this;
+    }
+
+    Methods& operator =(const Methods &methods)
+    {
+        return *this = Methods(methods);
+    }
 
     // デストラクタ