Fix #769 with hack

gnunn1 · Feb 17, 2017 · 03bcbaa · 03bcbaa
1 parent 4df376a
commit 03bcbaa
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 5 deletions.
diff --git a/dub.json b/dub.json
@@ -15,7 +15,7 @@
         },
         "debug": {
             "debugVersions": ["GC"],
-            "dflags-dmd": ["-g"]
+            "dflags": ["-gc"]
         },
         "localize": {
             "versions": ["Localize"]

diff --git a/source/gx/terminix/bookmark/manager.d b/source/gx/terminix/bookmark/manager.d
@@ -203,7 +203,13 @@ public:
     }
 
     override JSONValue serialize(FolderBookmark parent) {
-        JSONValue value = super.serialize(parent);
+        // LDC 1.0.0 breaks on super call to abstract class, see #769
+        JSONValue value = [NODE_BOOKMARK_TYPE : to!string(type())];
+        value[NODE_NAME] = name;
+        _parent = parent;
+
+        //JSONValue value = super.serialize(parent);
+
         JSONValue[] jsonList = [];
         foreach(item; list) {
             jsonList ~= item.serialize(this);
@@ -266,7 +272,12 @@ public:
     }
 
     override JSONValue serialize(FolderBookmark parent) {
-        JSONValue value = super.serialize(parent);
+        // LDC 1.0.0 breaks on super call to abstract class, see #769
+        JSONValue value = [NODE_BOOKMARK_TYPE : to!string(type())];
+        value[NODE_NAME] = name;
+        _parent = parent;
+
+        //JSONValue value = super.serialize(parent);
         value[NODE_PATH] = _path;
         return value;
     }
@@ -383,7 +394,12 @@ public:
     }
 
     override JSONValue serialize(FolderBookmark parent) {
-        JSONValue value = super.serialize(parent);
+        // LDC 1.0.0 breaks on super call to abstract class, see #769
+        JSONValue value = [NODE_BOOKMARK_TYPE : to!string(type())];
+        value[NODE_NAME] = name;
+        _parent = parent;
+
+        //JSONValue value = super.serialize(parent);
         value[NODE_HOST] = _host;
         value[NODE_PORT] = _port;
         value[NODE_USER] = _user;
@@ -466,7 +482,12 @@ public:
     }
 
     override JSONValue serialize(FolderBookmark parent) {
-        JSONValue value = super.serialize(parent);
+        // LDC 1.0.0 breaks on super call to abstract class, see #769
+        JSONValue value = [NODE_BOOKMARK_TYPE : to!string(type())];
+        value[NODE_NAME] = name;
+        _parent = parent;
+
+        //JSONValue value = super.serialize(parent);
         value[NODE_COMMAND] = _command;
         return value;
     }