Formatting

Author: quadroid

Parse/BuildParseTree.pas

@@ -2294,15 +2294,15 @@ function TBuildParseTree.RecogniseVarDecl(const inlineVar: boolean): boolean;
   else
     RecogniseIdentList(False);
 
-  // check if we are inside a for loop header
+  // fix: check if we are inside a for loop header
   lc := fcTokenList.FirstSolidToken;
   if lc.TokenType = ttIn then
   begin
-    // Delphi 2005 syntax
+    // Delphi 2005 `for var in` syntax
     PopNode;
     Exit;
-  end;	
-	
+  end;
+
   Recognise(ttColon);
   RecogniseType;
 
@@ -2946,12 +2946,7 @@ procedure TBuildParseTree.RecogniseSimpleStmnt;
   else if lc.TokenType = ttSemicolon then
     // empty statement
     // this gets done later in common code Recognise(ttSemicolon);
-  else if lc.TokenType = ttConst then
-  begin
-    Recognise(ttConst);
-    RecogniseConstantDecl;
-  end
-  // fix: inline `var`
+  // fix: inline `var` declaration
   else if lc.TokenType = ttVar then
   begin
 {$if false}
@@ -2973,6 +2968,12 @@ procedure TBuildParseTree.RecogniseSimpleStmnt;
 {$if false}
     PopNode;
 {$endif}
+  end
+  // fix: inline `const` declaration
+  else if lc.TokenType = ttConst then
+  begin
+    Recognise(ttConst);
+    RecogniseConstantDecl;
   end else
     raise TEParseError.Create('expected simple statement', lc);
 end;

Process/Indent/Indenter.pas

@@ -20,7 +20,7 @@
 under the License.
 
 Alternatively, the contents of this file may be used under the terms of
-the GNU General Public License Version 2 or later (the "GPL") 
+the GNU General Public License Version 2 or later (the "GPL")
 See http://www.gnu.org/licenses/gpl.html
 ------------------------------------------------------------------------------*)
 {*)}
@@ -421,6 +421,7 @@ function CalculateIndent(const pt: TSourceToken): integer;
         if (pt.TokenType = ttVar) and not pt.HasParentNode(nVarSection) then
           Inc(liIndentCount);
 
+        // fix: not for inline constant declaration
         if (pt.TokenType = ttConst) and not pt.HasParentNode(nConstSection) then
           Inc(liIndentCount);
       end;// outdent keywords that start and end the block

test.pas

@@ -36,11 +36,11 @@ function myFunction(aParam: string
 var inline_var_decl2_string,  inline_var_decl3_string: string :=  'this is a string';
 
  const inline_const := 999;
- 
+
    for var currentField in fieldList do
   begin
-                var inline_var_decl4: string = 'a string';
-	 end;
+        var inline_var_decl4: string = 'a string';
+   end;
 
   for i := 1 to 10 do
     if i < 10 then write(i, ',')