Merge branch 'range-based-lexer' of https://github.com/Hackerpilot/Dscanner into range-based-lexer

std/d/ast.d

@@ -105,7 +105,6 @@ abstract class ASTVisitor
     /** */ void visit(FinalSwitchStatement finalSwitchStatement) { finalSwitchStatement.accept(this); }
     /** */ void visit(Finally finally_) { finally_.accept(this); }
     /** */ void visit(ForStatement forStatement) { forStatement.accept(this); }
-	/** */ void visit(ForeachRangeStatement foreachRangeStatement) { foreachRangeStatement.accept(this); }
     /** */ void visit(ForeachStatement foreachStatement) { foreachStatement.accept(this); }
     /** */ void visit(ForeachType foreachType) { foreachType.accept(this); }
     /** */ void visit(ForeachTypeList foreachTypeList) { foreachTypeList.accept(this); }
@@ -263,7 +262,7 @@ public:
     mixin(DEFAULT_ACCEPT);
     /** */ Type type;
     /** */ Declarator declarator;
-	/** */ AliasInitializer[] initializations;
+    /** */ AliasInitializer[] initializers;
 }
 
 ///
@@ -314,7 +313,7 @@ class ArgumentList : ASTNode
 {
 public:
     mixin(DEFAULT_ACCEPT);
-	/** */ AssignExpression[] arguments;
+    /** */ AssignExpression[] items;
 }
 
 ///
@@ -882,15 +881,24 @@ public:
 class DeclarationsAndStatements : ASTNode
 {
     mixin(DEFAULT_ACCEPT);
-	/** */ ASTNode[] declarationsAndStatements;
+    /** */ DeclarationOrStatement[] declarationsAndStatements;
 }
 
 ///
 class DeclarationOrInvariant : ASTNode
 {
     mixin(DEFAULT_ACCEPT);
-    Declaration declaration;
-    Invariant invariant_;
+    /** */ Declaration declaration;
+    /** */ Invariant invariant_;
+}
+
+///
+class DeclarationOrStatement : ASTNode
+{
+public:
+    mixin(DEFAULT_ACCEPT);
+    /** */ Declaration declaration;
+    /** */ StatementNoCaseNoDefault statement;
 }
 
 ///
@@ -1033,25 +1041,15 @@ public:
     /** */ StatementNoCaseNoDefault statementNoCaseNoDefault;
 }
 
-///
-class ForeachRangeStatement : ASTNode
-{
-public:
-	mixin(DEFAULT_ACCEPT);
-	/** */ ForeachType foreachType;
-	/** */ Expression lower;
-	/** */ Expression higher;
-	/** */ StatementNoCaseNoDefault statementNoCaseNoDefault;
-}
-
 ///
 class ForeachStatement : ASTNode
 {
 public:
     mixin(DEFAULT_ACCEPT);
-	/** */ Token foreachType;
+    /** */ TokenType foreachType;
     /** */ ForeachTypeList foreachTypeList;
-	/** */ Expression expression;
+    /** */ Expression low;
+    /** */ Expression high;
     /** */ StatementNoCaseNoDefault statementNoCaseNoDefault;
 }
 
@@ -1116,6 +1114,8 @@ class FunctionDeclaration : ASTNode
 {
 public:
     mixin(DEFAULT_ACCEPT);
+    /** */ bool hasAuto;
+    /** */ bool hasRef;
     /** */ Type returnType;
     /** */ Token name;
     /** */ TemplateParameters templateParameters;
@@ -1351,7 +1351,7 @@ class LambdaExpression : ASTNode
 public:
     mixin(DEFAULT_ACCEPT);
     /** */ Token identifier;
-	/** */ Parameters paramaters;
+    /** */ Parameters parameters;
     /** */ FunctionAttribute[] functionAttributes;
     /** */ AssignExpression assignExpression;
 }
@@ -1500,7 +1500,6 @@ public:
     /** */ ThrowStatement throwStatement;
     /** */ ScopeGuardStatement scopeGuardStatement;
     /** */ AsmStatement asmStatement;
-	/** */ ForeachRangeStatement foreachRangeStatement;
     /** */ ConditionalStatement conditionalStatement;
     /** */ StaticAssertStatement staticAssertStatement;
     /** */ TemplateMixinStatement templateMixinStatement;
@@ -1737,6 +1736,7 @@ class SliceExpression : ASTNode
 {
 public:
     mixin(DEFAULT_ACCEPT);
+    /** */ UnaryExpression unaryExpression;
     /** */ AssignExpression lower;
     /** */ AssignExpression upper;
 }
@@ -1947,7 +1947,7 @@ class TemplateInstance : ASTNode
 {
 public:
     mixin(DEFAULT_ACCEPT);
-	/** */ Symbol symbol;
+    /** */ Token identifier;
     /** */ TemplateArguments templateArguments;
 }
 
@@ -2177,6 +2177,8 @@ public:
     /** */ ArgumentList argumentList;
     /** */ IdentifierOrTemplateInstance identifierOrTemplateInstance;
     /** */ AssertExpression assertExpression;
+    /** */ SliceExpression sliceExpression;
+    /** */ IndexExpression indexExpression;
 }
 
 ///
@@ -2248,8 +2250,7 @@ class WithStatement : ASTNode
 public:
     mixin(DEFAULT_ACCEPT);
     /** */ Expression expression;
-	/** */ Symbol symbol;
-	/** */ TemplateInstance templateInstance;
+    /** */ StatementNoCaseNoDefault statementNoCaseNoDefault;
 }
 
 ///