From b73e8c4fca972e4925013e730112fddb13ac1e10 Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Mon, 4 May 2015 14:55:36 -0700 Subject: [PATCH] Update libdparse --- dub.json | 2 +- libdparse | 2 +- src/analysis/enumarrayliteral.d | 3 ++- src/analysis/unmodified.d | 8 ++++---- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dub.json b/dub.json index 9e534bc..69b38c5 100644 --- a/dub.json +++ b/dub.json @@ -8,7 +8,7 @@ "preBuildCommands": ["git log -1 --format='%H' > githash.txt"], "stringImportPaths": ["."], "dependencies": { - "libdparse": "~>0.2.0", + "libdparse": "0.2.1", "inifiled": ">=0.0.3", }, } diff --git a/libdparse b/libdparse index 4c46428..32f6d63 160000 --- a/libdparse +++ b/libdparse @@ -1 +1 @@ -Subproject commit 4c46428bf48abffbd647cd1e16f96ba1805187e2 +Subproject commit 32f6d638e38888e1bb11cf43e93fe2d11132a98f diff --git a/src/analysis/enumarrayliteral.d b/src/analysis/enumarrayliteral.d index 5d2948b..f15ada3 100644 --- a/src/analysis/enumarrayliteral.d +++ b/src/analysis/enumarrayliteral.d @@ -8,6 +8,7 @@ module analysis.enumarrayliteral; import std.d.ast; import std.d.lexer; import analysis.base; +import std.algorithm : canFind; void doNothing(string, size_t, size_t, string, bool) {} @@ -29,7 +30,7 @@ class EnumArrayLiteralCheck : BaseAnalyzer override void visit(const AutoDeclaration autoDec) { - if (autoDec.storageClass && autoDec.storageClass.token == tok!"enum") + if (autoDec.storageClasses.canFind!(a => a.token == tok!"enum")) { foreach (i, initializer; autoDec.initializers) { diff --git a/src/analysis/unmodified.d b/src/analysis/unmodified.d index 419b3c3..b5621ce 100644 --- a/src/analysis/unmodified.d +++ b/src/analysis/unmodified.d @@ -66,11 +66,11 @@ class UnmodifiedFinder:BaseAnalyzer override void visit(const AutoDeclaration autoDeclaration) { + import std.algorithm : canFind; + if (blockStatementDepth > 0 && isImmutable <= 0 - && (autoDeclaration.storageClass !is null - && autoDeclaration.storageClass.token != tok!"const" - && autoDeclaration.storageClass.token != tok!"enum" - && autoDeclaration.storageClass.token != tok!"immutable")) + && (!autoDeclaration.storageClasses.canFind!(a => a.token == tok!"const" + || a.token == tok!"enum" || a.token == tok!"immutable"))) { foreach (size_t i, id; autoDeclaration.identifiers) {