Changeset 828 in dev for trunk/ab5.0/abdev/ab_common/include/Lexical/Parameter.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/Parameter.h (modified) (3 diffs)

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

@@ -29 +29 @@
     Parameter( const Parameter &param, const Type &type );
     Parameter( const Parameter &param );
+    Parameter(Parameter&& param)
+        : varName(std::move(param.varName))
+        , isRef(std::move(param.isRef))
+        , isArray(std::move(param.isArray))
+        , subscripts(std::move(param.subscripts))
+        , initValue(std::move(param.initValue)) {}
     Parameter();
     ~Parameter();
 
+    Parameter& operator =(Parameter&& y)
+    {
+        varName = std::move(y.varName);
+        isRef = std::move(y.isRef);
+        isArray = std::move(y.isArray);
+        subscripts = std::move(y.subscripts);
+        initValue = std::move(y.initValue);
+        return *this;
+    }
+
+    Parameter& operator =(Parameter const& y)
+    {
+        return *this = std::move(Parameter(y));
+    }
+    
     void SetArray( const Subscripts &subscripts ){
         isArray = true;
@@ -46 +67 @@
         return isRef;
     }
-    bool IsArray(){
+    bool IsArray() const
+    {
         return isArray;
     }
@@ -76 +98 @@
 
 public:
+    Parameters() : std::vector<Parameter *>() {}
+    Parameters(Parameters&& y) : std::vector<Parameter *>(std::move(y)) {}
+    Parameters(Parameters const& y) : std::vector<Parameter *>(y) {}
+
+    Parameters& operator =(Parameters&& y)
+    {
+        std::vector<Parameter *>::operator =(std::move(y));
+        return *this;
+    }
+
+    Parameters& operator =(Parameters const& y)
+    {
+        return *this = std::move(Parameters(y));
+    }
 
     bool Equals( const Parameters &params, bool isContravariant = false ) const;