Changeset fb2ce27 for doc/papers/general/evaluation/object.hpp

Timestamp:

Mar 8, 2018, 1:37:46 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:

28bc8c8

Parents:

f1f8e55

Message:

Update all benchmarks to match new CFA

File:

• doc/papers/general/evaluation/object.hpp (modified) (4 diffs)

doc/papers/general/evaluation/object.hpp

@@ -67 +67 @@
 };
 
-class boolean : public ordered, public printable {
-        bool x;
-public:
-        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); }
-        boolean& operator= (const boolean& that) {
-                x = that.x;
-                return *this;   
-        }
-        object& operator= (const object& that) override { return *this = that.as<boolean>(); } /***/
-        boolean& operator= (boolean&&) = default;
-        ~boolean() override = default;
-
-        int cmp(const boolean& that) const { return x == that.x ? 0 : x == false ? -1 : 1; }
-        int cmp(const ordered& that) const override { return cmp( that.as<boolean>() ); } /***/
-
-        void print(std::ostream& out) const override { out << (x ? "true" : "false"); }
-};
-
 class character : public ordered, public printable {
         char x;
@@ -116 +93 @@
 };
 
+class short_integer : public ordered, public printable {
+        short x;
+public:
+        short_integer() = default;
+        short_integer(short x) : x(x) {}
+        short_integer(const short_integer&) = default;
+        short_integer(short_integer&&) = default;
+        ptr<object> new_inst() const override { return make<short_integer>(); }
+        ptr<object> new_copy() const override { return make<short_integer>(*this); }
+        short_integer& operator= (const short_integer& that) {
+                x = that.x;
+                return *this;   
+        }
+        object& operator= (const object& that) override { return *this = that.as<short_integer>(); } /***/
+        short_integer& operator= (short_integer&&) = default;
+        ~short_integer() override = default;
+
+        int cmp(const short_integer& that) const { return x == that.x ? 0 : x < that.x ? -1 : 1; }
+        int cmp(const ordered& that) const override { return cmp( that.as<short_integer>() ); } /***/
+
+        void print(std::ostream& out) const override { out << x; }
+};
+
 class integer : public ordered, public printable {
         int x;
@@ -137 +137 @@
 
         void print(std::ostream& out) const override { out << x; }
-};
-
-class c_string : public printable {
-        static constexpr const char* empty = "";
-        const char* s;
-public:
-        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); }
-        c_string& operator= (const c_string& that) {
-                s = that.s;
-                return *this;
-        }
-        object& operator= (const object& that) override { return *this = that.as<c_string>(); } /***/
-        c_string& operator= (c_string&&) = default;
-        ~c_string() override = default;
-
-        void print(std::ostream& out) const override { out << s; }
 };
 
@@ -188 +167 @@
                 return y->as<ordered>().cmp( that.y->as<ordered>() ); /***/
         }
-        int cmp(const ordered& that) const override { return cmp( that.as<pair>() ); }
+        int cmp(const ordered& that) const override { return cmp( that.as<pair>() ); } /***/
 
         void print(std::ostream& out) const override {