From 26eb0913f1275376dad8a5ead36eeb4c0a7b7322 Mon Sep 17 00:00:00 2001
From: Cameron Ross <elpenguino@gmail.com>
Date: Fri, 6 Jul 2018 03:35:27 -0300
Subject: [PATCH] Some YAMLObject simplification (#180)

* change YAMLObject to an interface

* move YAMLContainer constructor with other private member

* some YAMLContainer simplification
---
 source/dyaml/node.d | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/source/dyaml/node.d b/source/dyaml/node.d
index a05bbff..dfbab19 100644
--- a/source/dyaml/node.d
+++ b/source/dyaml/node.d
@@ -58,16 +58,16 @@ struct YAMLNull
 // Merge YAML type, used to support "tag:yaml.org,2002:merge".
 package struct YAMLMerge{}
 
-// Base class for YAMLContainer - used for user defined YAML types.
-package abstract class YAMLObject
+// Interface for YAMLContainer - used for user defined YAML types.
+package interface YAMLObject
 {
     public:
         // Get type of the stored value.
-        @property TypeInfo type() const pure @safe nothrow {assert(false);}
+        @property TypeInfo type() const pure @safe nothrow;
 
     protected:
         // Compare with another YAMLObject.
-        int cmp(const YAMLObject) const @system {assert(false);}
+        int cmp(const YAMLObject) const @system;
 }
 
 // Stores a user defined YAML data type.
@@ -76,22 +76,23 @@ package class YAMLContainer(T) if (!Node.allowed!T): YAMLObject
     private:
         // Stored value.
         T value_;
+        // Construct a YAMLContainer holding specified value.
+        this(T value) @safe
+        {
+            value_ = value;
+        }
 
     public:
         // Get type of the stored value.
-        @property override TypeInfo type() const pure @safe nothrow {return typeid(T);}
+        @property override TypeInfo type() const pure @safe nothrow
+        {
+            return typeid(T);
+        }
 
         // Get string representation of the container.
         override string toString() @system
         {
-            static if(!hasMember!(T, "toString"))
-            {
-                return super.toString();
-            }
-            else
-            {
-                return format("YAMLContainer(%s)", value_.toString());
-            }
+            return format("YAMLContainer(%s)", value_);
         }
 
     protected:
@@ -107,9 +108,6 @@ package class YAMLContainer(T) if (!Node.allowed!T): YAMLObject
             return (*v1).opCmp(*v2);
         }
 
-    private:
-        // Construct a YAMLContainer holding specified value.
-        this(T value) @safe {value_ = value;}
 }