Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions source/ddox/main.d
Original file line number Diff line number Diff line change
Expand Up @@ -193,10 +193,10 @@ int cmdFilterDocs(string[] args)
return n;
}

if( json.type == Json.Type.Object ){
if( json.type == Json.Type.object ){
auto comment = json["comment"].opt!string;
if( justdoc && comment.empty ){
if( parent.type != Json.Type.Object || parent["kind"].opt!string() != "template" || templateName(parent) != json["name"].opt!string() )
if( parent.type != Json.Type.object || parent["kind"].opt!string() != "template" || templateName(parent) != json["name"].opt!string() )
return Json.undefined;
}

Expand Down Expand Up @@ -240,7 +240,7 @@ int cmdFilterDocs(string[] args)

if (auto mem = "members" in json)
json["members"] = filterProt(*mem, json, Json.undefined, mod);
} else if( json.type == Json.Type.Array ){
} else if( json.type == Json.Type.array ){
auto last_child_decl = Json.undefined;
Json[] newmem;
foreach (m; json) {
Expand Down
6 changes: 3 additions & 3 deletions source/ddox/parsers/jsonparser.d
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ private struct Parser

Declaration[] parseDeclList(Json json, Entity parent)
{
if( json.type == Json.Type.Undefined ) return null;
if( json.type == Json.Type.undefined ) return null;
DocGroup lastdoc;
Declaration[] ret;
foreach( mem; json ){
Expand Down Expand Up @@ -348,10 +348,10 @@ private struct Parser
out(ret) { assert(!def_type.length || ret != Type.init); }
do {
string str;
if( json.type == Json.Type.Undefined ){
if( json.type == Json.Type.undefined ){
if (warn_if_not_exists) logWarn("No type found for %s.", sc.qualifiedName);
str = def_type;
} else if (json.type == Json.Type.String) str = json.get!string();
} else if (json.type == Json.Type.string) str = json.get!string();
else if (auto pv = "deco" in json) str = demanglePrettyType(pv.get!string());
else if (auto pv = "type" in json) str = fixFunctionType(pv.get!string(), def_type);
else if (auto pv = "originalType" in json) str = fixFunctionType(pv.get!string(), def_type);
Expand Down
Loading