Merge pull request #234 from BBasile/decl-locs

Add start and end locations to DeclarationOrStatement merged-on-behalf-of: BBasile <[email protected]>
dlang-community · May 13, 2018 · 157d572 · 157d572
2 parents 22c7829 + d75f5a9
commit 157d572
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/dparse/ast.d b/src/dparse/ast.d
@@ -1388,6 +1388,8 @@ public:
 
     /** */ Declaration declaration;
     /** */ Statement statement;
+    /** */ size_t startLocation;
+    /** */ size_t endLocation;
     mixin OpEquals;
 }
 

diff --git a/src/dparse/parser.d b/src/dparse/parser.d
@@ -2232,6 +2232,8 @@ class Parser
     {
         mixin(traceEnterAndExit!(__FUNCTION__));
         auto node = allocator.make!DeclarationOrStatement;
+        if (moreTokens)
+            node.startLocation = current.index;
         // "Any ambiguities in the grammar between Statements and
         // Declarations are resolved by the declarations taking precedence."
         immutable b = setBookmark();
@@ -2252,6 +2254,8 @@ class Parser
             goToBookmark(b);
             node.declaration = parseDeclaration(true, true);
         }
+        if (moreTokens)
+            node.endLocation = current.index;
         return node;
     }