Use new dparse and dsymbol

makefile

@@ -10,7 +10,8 @@ SRC := \
 	$(shell find containers/src -name "*.d")\
 	$(shell find dsymbol/src -name "*.d")\
 	$(shell find inifiled/source/ -name "*.d")\
-	$(shell find libdparse/src/std/ -name "*.d")\
+	$(shell find libdparse/src/std/experimental/ -name "*.d")\
+	$(shell find libdparse/src/dparse/ -name "*.d")\
 	$(shell find src/ -name "*.d")
 INCLUDE_PATHS = \
 	-Iinifiled/source -Isrc\

src/analysis/asm_style.d

@@ -6,8 +6,8 @@
 module analysis.asm_style;
 
 import std.stdio;
-import std.d.ast;
+import dparse.ast;
-import std.d.lexer;
+import dparse.lexer;
 import analysis.base;
 import analysis.helpers;
 import dsymbol.scope_ : Scope;

src/analysis/base.d

@@ -2,7 +2,7 @@ module analysis.base;
 
 import std.container;
 import std.string;
-import std.d.ast;
+import dparse.ast;
 import std.array;
 import dsymbol.scope_ : Scope;
 

src/analysis/builtin_property_names.d

@@ -7,8 +7,8 @@ module analysis.builtin_property_names;
 
 import std.stdio;
 import std.regex;
-import std.d.ast;
+import dparse.ast;
-import std.d.lexer;
+import dparse.lexer;
 import analysis.base;
 import analysis.helpers;
 import dsymbol.scope_;

src/analysis/comma_expression.d

@@ -5,8 +5,8 @@
 
 module analysis.comma_expression;
 
-import std.d.ast;
+import dparse.ast;
-import std.d.lexer;
+import dparse.lexer;
 import analysis.base;
 import dsymbol.scope_;
 

src/analysis/constructors.d

@@ -1,7 +1,7 @@
 module analysis.constructors;
 
-import std.d.ast;
+import dparse.ast;
-import std.d.lexer;
+import dparse.lexer;
 import std.stdio;
 import analysis.base;
 import analysis.helpers;

src/analysis/del.d

@@ -6,8 +6,8 @@
 module analysis.del;
 
 import std.stdio;
-import std.d.ast;
+import dparse.ast;
-import std.d.lexer;
+import dparse.lexer;
 import analysis.base;
 import analysis.helpers;
 import dsymbol.scope_;

src/analysis/duplicate_attribute.d

@@ -7,8 +7,8 @@ module analysis.duplicate_attribute;
 
 import std.stdio;
 import std.string;
-import std.d.ast;
+import dparse.ast;
-import std.d.lexer;
+import dparse.lexer;
 import analysis.base;
 import analysis.helpers;
 import dsymbol.scope_ : Scope;

src/analysis/enumarrayliteral.d

@@ -5,8 +5,8 @@
 
 module analysis.enumarrayliteral;
 
-import std.d.ast;
+import dparse.ast;
-import std.d.lexer;
+import dparse.lexer;
 import analysis.base;
 import std.algorithm : canFind;
 import dsymbol.scope_ : Scope;

src/analysis/fish.d

@@ -6,8 +6,8 @@
 module analysis.fish;
 
 import std.stdio;
-import std.d.ast;
+import dparse.ast;
-import std.d.lexer;
+import dparse.lexer;
 import analysis.base;
 import analysis.helpers;
 import dsymbol.scope_ : Scope;

src/analysis/function_attributes.d

@@ -6,8 +6,8 @@
 module analysis.function_attributes;
 
 import analysis.base;
-import std.d.ast;
+import dparse.ast;
-import std.d.lexer;
+import dparse.lexer;
 import std.stdio;
 import dsymbol.scope_;
 

src/analysis/helpers.d

@@ -9,7 +9,7 @@ import std.string;
 import std.traits;
 import std.stdio;
 
-import std.d.ast;
+import dparse.ast;
 import analysis.config;
 import analysis.run;
 import analysis.base;
@@ -53,7 +53,7 @@ S after(S)(S value, S separator)
 void assertAnalyzerWarnings(string code, const StaticAnalysisConfig config, string file=__FILE__, size_t line=__LINE__)
 {
 	import analysis.run : ParseAllocator, parseModule;
-	import std.d.lexer : StringCache;
+	import dparse.lexer : StringCache;
 
 	StringCache cache = StringCache(StringCache.defaultBucketCount);
 	ParseAllocator p = new ParseAllocator;

src/analysis/if_statements.d

@@ -4,9 +4,9 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 module analysis.if_statements;
 
-import std.d.ast;
+import dparse.ast;
-import std.d.lexer;
+import dparse.lexer;
-import std.d.formatter;
+import dparse.formatter;
 import analysis.base;
 import dsymbol.scope_ : Scope;
 
@@ -78,7 +78,7 @@ private:
 		if (expression is null)
 			return;
 		auto app = appender!string();
-		std.d.formatter.format(app, expression);
+		dparse.formatter.format(app, expression);
 		immutable size_t prevLocation = alreadyChecked(app.data, line, column);
 		if (prevLocation != size_t.max)
 		{

src/analysis/ifelsesame.d

@@ -6,8 +6,8 @@
 module analysis.ifelsesame;
 
 import std.stdio;
-import std.d.ast;
+import dparse.ast;
-import std.d.lexer;
+import dparse.lexer;
 import analysis.base;
 import analysis.helpers;
 import dsymbol.scope_ : Scope;

src/analysis/label_var_same_name_check.d

@@ -4,8 +4,8 @@
 
 module analysis.label_var_same_name_check;
 
-import std.d.ast;
+import dparse.ast;
-import std.d.lexer;
+import dparse.lexer;
 
 import analysis.base;
 import analysis.helpers;

src/analysis/length_subtraction.d

@@ -7,8 +7,8 @@ module analysis.length_subtraction;
 
 import std.stdio;
 
-import std.d.ast;
+import dparse.ast;
-import std.d.lexer;
+import dparse.lexer;
 import analysis.base;
 import analysis.helpers;
 import dsymbol.scope_;

src/analysis/local_imports.d

@@ -6,8 +6,8 @@
 module analysis.local_imports;
 
 import std.stdio;
-import std.d.ast;
+import dparse.ast;
-import std.d.lexer;
+import dparse.lexer;
 import analysis.base;
 import analysis.helpers;
 import dsymbol.scope_;

src/analysis/logic_precedence.d

@@ -6,8 +6,8 @@
 module analysis.logic_precedence;
 
 import std.stdio;
-import std.d.ast;
+import dparse.ast;
-import std.d.lexer;
+import dparse.lexer;
 import analysis.base;
 import analysis.helpers;
 import dsymbol.scope_;

src/analysis/mismatched_args.d

@@ -3,8 +3,8 @@ module analysis.mismatched_args;
 import analysis.base : BaseAnalyzer;
 import dsymbol.scope_;
 import dsymbol.symbol;
-import std.d.ast;
+import dparse.ast;
-import std.d.lexer : tok;
+import dparse.lexer : tok;
 import dsymbol.builtin.names;
 
 /// Checks for mismatched argument and parameter names

src/analysis/numbers.d

@@ -7,8 +7,8 @@ module analysis.numbers;
 
 import std.stdio;
 import std.regex;
-import std.d.ast;
+import dparse.ast;
-import std.d.lexer;
+import dparse.lexer;
 import analysis.base;
 import analysis.helpers;
 import dsymbol.scope_ : Scope;

src/analysis/objectconst.d

@@ -7,8 +7,8 @@ module analysis.objectconst;
 
 import std.stdio;
 import std.regex;
-import std.d.ast;
+import dparse.ast;
-import std.d.lexer;
+import dparse.lexer;
 import analysis.base;
 import analysis.helpers;
 import dsymbol.scope_ : Scope;

src/analysis/opequals_without_tohash.d

@@ -6,8 +6,8 @@
 module analysis.opequals_without_tohash;
 
 import std.stdio;
-import std.d.ast;
+import dparse.ast;
-import std.d.lexer;
+import dparse.lexer;
 import analysis.base;
 import analysis.helpers;
 import dsymbol.scope_ : Scope;

src/analysis/pokemon.d

@@ -6,8 +6,8 @@
 module analysis.pokemon;
 
 import std.stdio;
-import std.d.ast;
+import dparse.ast;
-import std.d.lexer;
+import dparse.lexer;
 import analysis.base;
 import analysis.helpers;
 import dsymbol.scope_ : Scope;

src/analysis/range.d

@@ -6,8 +6,8 @@
 module analysis.range;
 
 import std.stdio;
-import std.d.ast;
+import dparse.ast;
-import std.d.lexer;
+import dparse.lexer;
 import analysis.base;
 import analysis.helpers;
 import dsymbol.scope_ : Scope;
@@ -94,14 +94,14 @@ class BackwardsRangeCheck : BaseAnalyzer
 		}
 	}
 
-	override void visit(const SliceExpression sliceExpression)
+	override void visit(const Index index)
 	{
-		if (sliceExpression.lower !is null && sliceExpression.upper !is null)
+		if (index.low !is null && index.high !is null)
 		{
 			state = State.left;
-			visit(sliceExpression.lower);
+			visit(index.low);
 			state = State.right;
-			visit(sliceExpression.upper);
+			visit(index.high);
 			state = State.ignore;
 			if (hasLeft && hasRight && left > right)
 			{
@@ -114,7 +114,7 @@ class BackwardsRangeCheck : BaseAnalyzer
 			hasLeft = false;
 			hasRight = false;
 		}
-		sliceExpression.accept(this);
+		index.accept(this);
 	}
 
 private:

src/analysis/redundant_parens.d

@@ -5,8 +5,8 @@
 
 module analysis.redundant_parens;
 
-import std.d.ast;
+import dparse.ast;
-import std.d.lexer;
+import dparse.lexer;
 import analysis.base;
 import dsymbol.scope_ : Scope;
 

src/analysis/run.d

@@ -11,9 +11,9 @@ import std.conv;
 import std.algorithm;
 import std.range;
 import std.array;
-import std.d.lexer;
+import dparse.lexer;
-import std.d.parser;
+import dparse.parser;
-import std.d.ast;
+import dparse.ast;
 import std.typecons : scoped;
 
 import std.experimental.allocator : CAllocatorImpl;
@@ -181,7 +181,7 @@ const(Module) parseModule(string fileName, ubyte[] code, ParseAllocator p,
 	const(Token)[] tokens = getTokensForParser(code, config, &cache);
 	if (linesOfCode !is null)
 		(*linesOfCode) += count!(a => isLineOfCode(a.type))(tokens);
-	return std.d.parser.parseModule(tokens, fileName, p,
+	return dparse.parser.parseModule(tokens, fileName, p,
 		report ? &messageFunctionJSON : &messageFunction, errorCount, warningCount);
 }
 

src/analysis/stats_collector.d

@@ -5,8 +5,8 @@
 
 module analysis.stats_collector;
 
-import std.d.ast;
+import dparse.ast;
-import std.d.lexer;
+import dparse.lexer;
 import analysis.base;
 
 class StatsCollector : BaseAnalyzer

src/analysis/style.d

@@ -6,8 +6,8 @@
 module analysis.style;
 
 import std.stdio;
-import std.d.ast;
+import dparse.ast;
-import std.d.lexer;
+import dparse.lexer;
 import std.regex;
 import std.array;
 import std.conv;

src/analysis/undocumented.d

@@ -7,8 +7,8 @@ module analysis.undocumented;
 
 import analysis.base;
 import dsymbol.scope_ : Scope;
-import std.d.ast;
+import dparse.ast;
-import std.d.lexer;
+import dparse.lexer;
 
 import std.regex : ctRegex, matchAll;
 import std.stdio;

src/analysis/unmodified.d

@@ -7,13 +7,13 @@ module analysis.unmodified;
 import analysis.base;
 import dsymbol.scope_ : Scope;
 import std.container;
-import std.d.ast;
+import dparse.ast;
-import std.d.lexer;
+import dparse.lexer;
 
 /**
  * Checks for variables that could have been declared const or immutable
  */
-class UnmodifiedFinder:BaseAnalyzer
+class UnmodifiedFinder : BaseAnalyzer
 {
 	alias visit = BaseAnalyzer.visit;
 
@@ -132,7 +132,6 @@ class UnmodifiedFinder:BaseAnalyzer
 
 	mixin PartsMightModify!AsmPrimaryExp;
 	mixin PartsMightModify!IndexExpression;
-	mixin PartsMightModify!SliceExpression;
 	mixin PartsMightModify!FunctionCallExpression;
 	mixin PartsMightModify!IdentifierOrTemplateChain;
 	mixin PartsMightModify!ReturnStatement;

src/analysis/unused.d

@@ -4,8 +4,8 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 module analysis.unused;
 
-import std.d.ast;
+import dparse.ast;
-import std.d.lexer;
+import dparse.lexer;
 import analysis.base;
 import std.container;
 import std.regex : Regex, regex, matchAll;
@@ -69,7 +69,6 @@ class UnusedVariableCheck : BaseAnalyzer
 	mixin PartsUseVariables!Initializer;
 	mixin PartsUseVariables!InterfaceDeclaration;
 	mixin PartsUseVariables!NewExpression;
-	mixin PartsUseVariables!SliceExpression;
 	mixin PartsUseVariables!StaticIfCondition;
 	mixin PartsUseVariables!StructDeclaration;
 	mixin PartsUseVariables!TemplateArgumentList;

src/analysis/unused_label.d

@@ -4,8 +4,8 @@
 
 module analysis.unused_label;
 
-import std.d.ast;
+import dparse.ast;
-import std.d.lexer;
+import dparse.lexer;
 import analysis.base;
 import analysis.helpers;
 import dsymbol.scope_ : Scope;

src/astprinter.d

@@ -3,9 +3,9 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
-import std.d.lexer;
+import dparse.lexer;
-import std.d.ast;
+import dparse.ast;
-import std.d.formatter;
+import dparse.formatter;
 import std.stdio;
 import std.string;
 import std.array;
@@ -727,25 +727,6 @@ class XMLPrinter : ASTVisitor
         output.writeln("</singleImport>");
     }
 
-    override void visit(const SliceExpression sliceExpression)
-    {
-        output.writeln("<sliceExpression>");
-        visit(sliceExpression.unaryExpression);
-        if (sliceExpression.lower !is null)
-        {
-            output.writeln("<low>");
-            visit(sliceExpression.lower);
-            output.writeln("</low>");
-        }
-        if (sliceExpression.upper !is null)
-        {
-            output.writeln("<high>");
-            visit(sliceExpression.upper);
-            output.writeln("</high>");
-        }
-        output.writeln("</sliceExpression>");
-    }
-
     override void visit(const StructDeclaration structDec)
     {
         output.writeln("<structDeclaration line=\"", structDec.name.line, "\">");
@@ -970,6 +951,24 @@ class XMLPrinter : ASTVisitor
         output.writeln("</xorExpression>");
     }
 
+	override void visit(const Index index)
+	{
+		output.writeln("<index>");
+		if (index.high)
+		{
+			output.writeln("<low>");
+			visit(index.low);
+			output.writeln("<low>");
+
+			output.writeln("<high>");
+			visit(index.high);
+			output.writeln("<high>");
+		}
+		else
+			visit(index.low);
+		output.writeln("</index>");
+	}
+
     override void visit(const AliasInitializer aliasInitializer) { mixin (tagAndAccept!"aliasInitializer"); }
     override void visit(const AliasThisDeclaration aliasThisDeclaration) { mixin (tagAndAccept!"aliasThisDeclaration"); }
     override void visit(const AnonymousEnumDeclaration anonymousEnumDeclaration) { mixin (tagAndAccept!"anonymousEnumDeclaration"); }

src/ctags.d

@@ -5,9 +5,9 @@
 
 module ctags;
 
-import std.d.parser;
+import dparse.parser;
-import std.d.lexer;
+import dparse.lexer;
-import std.d.ast;
+import dparse.ast;
 import std.algorithm;
 import std.range;
 import std.stdio;
@@ -68,7 +68,7 @@ void doNothing(string, size_t, size_t, string, bool)
 
 string paramsToString(Dec)(const Dec dec)
 {
-	import std.d.formatter : Formatter;
+	import dparse.formatter : Formatter;
 
 	auto app = appender!string();
 	auto formatter = new Formatter!(typeof(app))(app);

src/etags.d

@@ -6,9 +6,9 @@
 
 module etags;
 
-import std.d.parser;
+import dparse.parser;
-import std.d.lexer;
+import dparse.lexer;
-import std.d.ast;
+import dparse.ast;
 import std.algorithm;
 import std.range;
 import std.stdio;
@@ -288,7 +288,7 @@ private:
 	{
 		maketag(name.text, name.index, name.line);
 	}
-	
+
 	void maketag(string text, size_t index, ulong line)
 	{
 		// skip unittests and hidden declarations

src/highlighter.d

@@ -7,7 +7,7 @@ module highlighter;
 
 import std.stdio;
 import std.array;
-import std.d.lexer;
+import dparse.lexer;
 
 // http://ethanschoonover.com/solarized
 void highlight(R)(ref R tokens, string fileName)

src/imports.d

@@ -5,7 +5,7 @@
 
 module imports;
 
-import std.d.ast;
+import dparse.ast;
 import std.stdio;
 import std.container;
 

src/main.d

@@ -13,9 +13,9 @@ import std.getopt;
 import std.path;
 import std.stdio;
 import std.range;
-import std.lexer;
+import std.experimental.lexer;
-import std.d.lexer;
+import dparse.lexer;
-import std.d.parser;
+import dparse.parser;
 
 import highlighter;
 import stats;

src/outliner.d

@@ -3,9 +3,9 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
-import std.d.lexer;
+import dparse.lexer;
-import std.d.ast;
+import dparse.ast;
-import std.d.formatter;
+import dparse.formatter;
 import std.stdio;
 import std.string;
 import std.array;

src/stats.d

@@ -7,7 +7,7 @@ module stats;
 
 import std.stdio;
 import std.algorithm;
-import std.d.lexer;
+import dparse.lexer;
 
 pure nothrow bool isLineOfCode(IdType t)
 {

src/symbol_finder.d

@@ -6,9 +6,9 @@
 module symbol_finder;
 
 import std.stdio : File;
-import std.d.lexer;
+import dparse.lexer;
-import std.d.parser;
+import dparse.parser;
-import std.d.ast;
+import dparse.ast;
 import std.stdio;
 import std.file:isFile;