Changeset 828 in dev for trunk/ab5.0/abdev/BasicCompiler_Common/include/Enum.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/BasicCompiler_Common/include/Enum.h (modified) (4 diffs)

trunk/ab5.0/abdev/BasicCompiler_Common/include/Enum.h

@@ -6 +6 @@
     std::string value;
     int sourceIndex;
+
 public:
     EnumMember( const std::string &name, const std::string &value, int sourceIndex )
@@ -13 +14 @@
     {
     }
+
+    EnumMember(EnumMember&& y)
+        : name(std::move(y.name))
+        , value(std::move(y.value))
+        , sourceIndex(std::move(y.sourceIndex))
+    {
+    }
+
+    EnumMember(EnumMember const& y)
+        : name(y.name)
+        , value(y.value)
+        , sourceIndex(y.sourceIndex)
+    {
+    }
+
+    EnumMember& operator =(EnumMember&& y)
+    {
+        name = std::move(y.name);
+        value = std::move(y.value);
+        sourceIndex = std::move(y.sourceIndex);
+        return *this;
+    }
+
+    EnumMember& operator =(EnumMember const& y)
+    {
+        return *this = std::move(EnumMember(y));
+    }
+
     const std::string &GetName() const
     {
@@ -39 +68 @@
         : Symbol( namespaceScopes, name )
     {
+    }
+
+    EnumInfo(EnumInfo&& y)
+        : Symbol(std::move(y))
+        , bConst(std::move(y.bConst))
+        , members(std::move(y.members))
+    {
+    }
+
+    EnumInfo(EnumInfo const& y)
+        : Symbol(y)
+        , bConst(y.bConst)
+        , members(y.members)
+    {
+    }
+
+    EnumInfo& operator =(EnumInfo&& y)
+    {
+        Symbol::operator =(std::move(y));
+        bConst = std::move(y.bConst);
+        members = std::move(y.members);
+        return *this;
+    }
+
+    EnumInfo& operator =(EnumInfo const& y)
+    {
+        return *this = std::move(EnumInfo(y));
     }
 
@@ -80 +136 @@
         return NULL;
     };
+
+    EnumInfoCollection() {}
+
+private:
+    EnumInfoCollection(EnumInfoCollection const&);
+    EnumInfoCollection& operator =(EnumInfoCollection const&);
 };