Changeset c87cd93 for doc/generic_types/evaluation/object.hpp

Timestamp:

Apr 17, 2017, 3:47:07 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

4ae83a4b

Parents:

33e22da

Message:

Final version of the benchmark code

File:

• doc/generic_types/evaluation/object.hpp (modified) (10 diffs)

doc/generic_types/evaluation/object.hpp

@@ -72 +72 @@
         boolean() = default;
         boolean(bool x) : x(x) {}
+        boolean(const boolean&) = default;
+        boolean(boolean&&) = default;
         ptr<object> new_inst() const override { return make<boolean>(); }
         ptr<object> new_copy() const override { return make<boolean>(*this); }
@@ -79 +81 @@
         }
         object& operator= (const object& that) override { return *this = that.as<boolean>(); } /***/
+        boolean& operator= (boolean&&) = default;
         ~boolean() override = default;
 
@@ -92 +95 @@
         character() = default;
         character(char x) : x(x) {}
+        character(const character&) = default;
+        character(character&&) = default;
         ptr<object> new_inst() const override { return make<character>(); }
         ptr<object> new_copy() const override { return make<character>(*this); }
@@ -99 +104 @@
         }
         object& operator= (const object& that) override { return *this = that.as<character>(); } /***/
+        character& operator= (character&&) = default;
         ~character() override = default;
 
@@ -115 +121 @@
         integer() = default;
         integer(int x) : x(x) {}
+        integer(const integer&) = default;
+        integer(integer&&) = default;
         ptr<object> new_inst() const override { return make<integer>(); }
         ptr<object> new_copy() const override { return make<integer>(*this); }
@@ -122 +130 @@
         }
         object& operator= (const object& that) override { return *this = that.as<integer>(); } /***/
+        integer& operator= (integer&&) = default;
         ~integer() override = default;
 
@@ -136 +145 @@
         c_string() : s(empty) {}
         c_string(const char* s) : s(s) {}
+        c_string(const c_string&) = default;
+        c_string(c_string&&) = default;
         ptr<object> new_inst() const override { return make<c_string>(); }
         ptr<object> new_copy() const override { return make<c_string>(s); }
@@ -143 +154 @@
         }
         object& operator= (const object& that) override { return *this = that.as<c_string>(); } /***/
+        c_string& operator= (c_string&&) = default;
         ~c_string() override = default;
 
@@ -154 +166 @@
         pair() = default;
         pair(ptr<object>&& x, ptr<object>&& y) : x(std::move(x)), y(std::move(y)) {}
+        pair(const pair& that) : x(that.x->new_copy()), y(that.y->new_copy()) {}
+        pair(pair&& that) : x(std::move(that.x)), y(std::move(that.y)) {}
         ptr<object> new_inst() const override { return make<pair>(); }
         ptr<object> new_copy() const override { return make<pair>(x->new_copy(), y->new_copy()); }
@@ -162 +176 @@
         }
         object& operator= (const object& that) override { return *this = that.as<pair>(); } /***/
+        pair& operator= (pair&& that) {
+                x = std::move(that.x);
+                y = std::move(that.y);
+                return *this;
+        }
         ~pair() override = default;