From 96ec168f775728e94249d8a425854dbb61211870 Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Mon, 11 Jan 2016 17:41:55 -0800 Subject: [PATCH] Dependency updates --- dsymbol | 2 +- libdparse | 2 +- src/analysis/label_var_same_name_check.d | 4 ++-- src/analysis/undocumented.d | 5 +++-- src/astprinter.d | 9 +++++---- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dsymbol b/dsymbol index 5839223..2664939 160000 --- a/dsymbol +++ b/dsymbol @@ -1 +1 @@ -Subproject commit 58392233a0e8cef78910e75f80b8214af6229e87 +Subproject commit 26649393504a8617760f9c7fd99b31f0362f095e diff --git a/libdparse b/libdparse index e45e75e..668db0c 160000 --- a/libdparse +++ b/libdparse @@ -1 +1 @@ -Subproject commit e45e75e486d0237ec8162b789d9033a802514f74 +Subproject commit 668db0cd0121684c47af1ee945a271fcddcbd421 diff --git a/src/analysis/label_var_same_name_check.d b/src/analysis/label_var_same_name_check.d index db6bfd5..599c14b 100644 --- a/src/analysis/label_var_same_name_check.d +++ b/src/analysis/label_var_same_name_check.d @@ -56,10 +56,10 @@ class LabelVarNameCheck : BaseAnalyzer override void visit(const ConditionalDeclaration condition) { - if (condition.falseDeclaration) + if (condition.falseDeclarations.length > 0) ++conditionalDepth; condition.accept(this); - if (condition.falseDeclaration) + if (condition.falseDeclarations.length > 0) --conditionalDepth; } diff --git a/src/analysis/undocumented.d b/src/analysis/undocumented.d index 1b5e082..fd30650 100644 --- a/src/analysis/undocumented.d +++ b/src/analysis/undocumented.d @@ -114,8 +114,9 @@ class UndocumentedDeclarationCheck : BaseAnalyzer const VersionCondition ver = cond.compileCondition.versionCondition; if (ver is null || (ver.token != tok!"unittest" && ver.token.text != "none")) cond.accept(this); - else if (cond.falseDeclaration !is null) - visit(cond.falseDeclaration); + else if (cond.falseDeclarations.length > 0) + foreach (f; cond.falseDeclarations) + visit(f); } override void visit(const FunctionBody fb) {} diff --git a/src/astprinter.d b/src/astprinter.d index ad33b10..d755e2f 100644 --- a/src/astprinter.d +++ b/src/astprinter.d @@ -208,11 +208,12 @@ class XMLPrinter : ASTVisitor foreach (dec; conditionalDeclaration.trueDeclarations) visit(dec); output.writeln(""); - if (conditionalDeclaration.falseDeclaration !is null) + if (conditionalDeclaration.falseDeclarations.length > 0) { - output.writeln(""); - visit(conditionalDeclaration.falseDeclaration); - output.writeln(""); + output.writeln(""); + foreach (dec; conditionalDeclaration.falseDeclarations) + visit(dec); + output.writeln(""); } output.writeln(""); }