From 80a99561d02ab2e99b9e4dd31cda40305d6626bb Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Tue, 29 Oct 2013 20:55:50 -0700 Subject: [PATCH] DScanner update --- acvisitor.d | 11 +++++++---- dscanner | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/acvisitor.d b/acvisitor.d index 89baff2..ab471d5 100644 --- a/acvisitor.d +++ b/acvisitor.d @@ -128,7 +128,7 @@ class AutocompleteVisitor : ASTVisitor if (statement.foreachTypeList is null) { - statement.statementNoCaseNoDefault.accept(this); + statement.declarationOrStatement.accept(this); } else if (statement.foreachType !is null) { @@ -145,10 +145,13 @@ class AutocompleteVisitor : ASTVisitor symbols ~= loopVariable; } - if (statement.statementNoCaseNoDefault !is null - && statement.statementNoCaseNoDefault.blockStatement !is null) + // This is much prettier on the 0.2.0-dev branch + if (statement.declarationOrStatement !is null + && statement.declarationOrStatement.statement !is null + && statement.declarationOrStatement.statement.statementNoCaseNoDefault !is null + && statement.declarationOrStatement.statement.statementNoCaseNoDefault.blockStatement !is null) { - BlockStatement block = statement.statementNoCaseNoDefault.blockStatement; + BlockStatement block = statement.declarationOrStatement.statement.statementNoCaseNoDefault.blockStatement; auto s = scope_; scope_ = new Scope(statement.startIndex, block.endLocation); diff --git a/dscanner b/dscanner index 0c84327..1c05726 160000 --- a/dscanner +++ b/dscanner @@ -1 +1 @@ -Subproject commit 0c843275bab1eefc6cdcc65cfa7442e55b5a4532 +Subproject commit 1c057260d5541f2ebd4d5b1780bacf45e482df39