Add support for alignment on records (#311)

Author: darnocian

Source/DelphiAST.Consts.pas

@@ -153,7 +153,8 @@ interface
     anReintroduce,
     anOverload,
     anAbstract,
-    anInline
+    anInline,
+    anAlign
   );
 
 const
@@ -307,7 +308,8 @@ interface
     'reintroduce',
     'overload',
     'abstract',
-    'inline'
+    'inline',
+    'align'
   );
 
 implementation

Source/DelphiAST.pas

@@ -177,6 +177,7 @@   TPasSyntaxTreeBuilder = class(TmwSimplePasParEx)
     procedure PropertyName; override;
     procedure PropertyParameterList; override;
     procedure RaiseStatement; override;
+    procedure RecordAlignValue; override;
     procedure RecordConstraint; override;
     procedure RecordFieldConstant; override;
     procedure RecordType; override;
@@ -993,6 +994,12 @@ procedure TPasSyntaxTreeBuilder.RecordConstraint;
   end;
 end;
 
+procedure TPasSyntaxTreeBuilder.RecordAlignValue;
+begin
+  FStack.Peek.SetAttribute(anAlign, Lexer.Token);
+  inherited;
+end;
+
 procedure TPasSyntaxTreeBuilder.ConstSection;
 var
   ConstSect, Temp: TSyntaxNode;

Source/SimpleParser/SimpleParser.Lexer.Types.pas

@@ -54,6 +54,7 @@ interface
     ptAbstract,
     ptAdd,
     ptAddressOp,
+    ptAlign,
     ptAmpersand,
     ptAnd,
     ptAnsiComment,

Source/SimpleParser/SimpleParser.Lexer.pas

@@ -757,7 +757,8 @@ function TmwBasePasLex.Func43: TptTokenKind;
 begin
   Result := ptIdentifier;
   if KeyComp('Int64') then FExID := ptInt64
-  else if KeyComp('local') then FExID := ptLocal;
+  else if KeyComp('local') then FExID := ptLocal
+  else if KeyComp('align') then Result := ptAlign;
 end;
 
 function TmwBasePasLex.Func44: TptTokenKind;

Source/SimpleParser/SimpleParser.pas

@@ -437,6 +437,8 @@   TmwSimplePasPar = class(TObject)
     procedure ReadAccessIdentifier; virtual;
     procedure RealIdentifier; virtual;
     procedure RealType; virtual;
+    procedure RecordAlign; virtual;
+    procedure RecordAlignValue; virtual;
     procedure RecordConstant; virtual;
     procedure RecordConstraint; virtual;
     procedure RecordFieldConstant; virtual;
@@ -3304,6 +3306,7 @@ procedure TmwSimplePasPar.RecordType;
   Expected(ptEnd);
 
   ClassTypeEnd;
+  RecordAlign;
 end;
 
 procedure TmwSimplePasPar.FileType;
@@ -4311,6 +4314,20 @@ procedure TmwSimplePasPar.SimpleType;
   end;
 end;
 
+procedure TmwSimplePasPar.RecordAlign;
+begin
+  if TokenID = ptAlign then
+  begin
+    Expected(ptAlign);
+    RecordAlignValue;
+  end;
+end;
+
+procedure TmwSimplePasPar.RecordAlignValue;
+begin
+  Expected(ptIntegerConst);
+end;
+
 procedure TmwSimplePasPar.RecordFieldConstant;
 begin
   Expected(ptIdentifier);

Test/Snippets/alignedrecords.pas

@@ -0,0 +1,25 @@
+unit managedrecords;
+
+interface
+
+type
+  TMyRecord = record
+    Value: Integer;
+    class operator Initialize (out Dest: TMyRecord);
+    class operator Finalize(var Dest: TMyRecord);
+  end align 8;
+
+implementation
+	
+class operator TMyRecord.Initialize (out Dest: TMyRecord);
+begin
+  Dest.Value := 10;
+  Log('created' + IntToHex (Integer(Pointer(@Dest))));
+end;
+ 
+class operator TMyRecord.Finalize(var Dest: TMyRecord);
+begin
+  Log('destroyed' + IntToHex (Integer(Pointer(@Dest))));
+end;
+
+end.

Test/Snippets/nonalignedrecords.pas

@@ -0,0 +1,25 @@
+unit managedrecords;
+
+interface
+
+type
+  TMyRecord = record
+    Value: Integer;
+    class operator Initialize (out Dest: TMyRecord);
+    class operator Finalize(var Dest: TMyRecord);
+  end;
+
+implementation
+	
+class operator TMyRecord.Initialize (out Dest: TMyRecord);
+begin
+  Dest.Value := 10;
+  Log('created' + IntToHex (Integer(Pointer(@Dest))));
+end;
+ 
+class operator TMyRecord.Finalize(var Dest: TMyRecord);
+begin
+  Log('destroyed' + IntToHex (Integer(Pointer(@Dest))));
+end;
+
+end.