fix issue 17619: for statements without curly braces, default endloc …

…to location of last token, not next token
dlang · Oct 7, 2017 · 056160d · 056160d
1 parent cf3005b
commit 056160d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/ddmd/lexer.d b/src/ddmd/lexer.d
@@ -187,6 +187,7 @@ class Lexer
     __gshared OutBuffer stringbuffer;
 
     Loc scanloc;            // for error messages
+    Loc prevloc;            // location of token before current
 
     const(char)* base;      // pointer to start of buffer
     const(char)* end;       // pointer to last element of buffer
@@ -252,6 +253,7 @@ class Lexer
 
     final TOK nextToken()
     {
+        prevloc = token.loc;
         if (token.next)
         {
             Token* t = token.next;

diff --git a/src/ddmd/parse.d b/src/ddmd/parse.d
@@ -5016,7 +5016,7 @@ final class Parser(AST) : Lexer
      * Input:
      *      flags   PSxxxx
      * Output:
-     *      pEndloc if { ... statements ... }, store location of closing brace, otherwise loc of first token of next statement
+     *      pEndloc if { ... statements ... }, store location of closing brace, otherwise loc of last token of statement
      */
     AST.Statement parseStatement(int flags, const(char)** endPtr = null, Loc* pEndloc = null)
     {
@@ -6015,7 +6015,7 @@ final class Parser(AST) : Lexer
             break;
         }
         if (pEndloc)
-            *pEndloc = token.loc;
+            *pEndloc = prevloc;
         return s;
     }