RomanYankovsky#255 Treat array of const correctly

array of const is a special construct. `const` here is not an identifier.
JBontes · Oct 17, 2017 · bbbe2e2 · bbbe2e2
1 parent 5fcd93f
commit bbbe2e2
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 15 deletions.
diff --git a/Source/DelphiAST.pas b/Source/DelphiAST.pas
@@ -96,6 +96,7 @@   TPasSyntaxTreeBuilder = class(TmwSimplePasPar)
     procedure ArrayBounds; override;
     procedure ArrayConstant; override;
     procedure ArrayDimension; override;
+    procedure ArrayOfConst; override;
     procedure AsmStatement; override;
     procedure AsOp; override;
     procedure AssignOp; override;
@@ -584,6 +585,17 @@ procedure TPasSyntaxTreeBuilder.ArrayDimension;
   end;
 end;
 
+procedure TPasSyntaxTreeBuilder.ArrayOfConst;
+begin
+  //do not fill the name attribute. const is a keyword, not a type.
+  FStack.Push(ntType).Attribute[anKind]:= AttributeValues[atConst];
+  try
+    inherited;
+  finally
+    FStack.Pop;
+  end;
+end;
+
 procedure TPasSyntaxTreeBuilder.AsmStatement;
 begin
   FStack.PushCompoundSyntaxNode(ntStatements).Attribute[anType]:= AttributeValues[atAsm];

diff --git a/Source/SimpleParser/SimpleParser.pas b/Source/SimpleParser/SimpleParser.pas
@@ -249,6 +249,8 @@   TmwSimplePasPar = class(TObject)
     procedure ArrayConstant; virtual;
     procedure ArrayBounds; virtual;
     procedure ArrayDimension; virtual;
+    procedure ArrayOfConst; virtual;
+    procedure ArraySubType; virtual;
     procedure ArrayType; virtual;
     procedure AsmStatement; virtual;
     procedure AssignOp; virtual;
@@ -795,7 +797,7 @@ procedure TmwSimplePasPar.ExpectedEx(const Syms: TptTokenKinds);
     for Sym in Syms do begin
       Symbols:= Symbols + Optional + TokenName(Sym);
       Optional:= ' or ';
-  end;
+    end;
     if (Lexer.TokenID = ptNull) then
       raise ESyntaxError.CreatePos(Format(rsExpected, [Symbols, rsEndOfFile]), FLexer.PosXY)
     else if Assigned(FOnMessage) then begin
@@ -1015,7 +1017,7 @@ procedure TmwSimplePasPar.ThenStatement;
 procedure TmwSimplePasPar.Semicolon;
 begin
   case Lexer.TokenID of
-    ptElse, ptEnd, ptExcept, ptfinally, ptFinalization, ptRoundClose, ptUntil: ;
+    ptElse, ptEnd, ptExcept, ptFinally, ptFinalization, ptRoundClose, ptUntil: ;
   else
     Expected(ptSemiColon);
   end;
@@ -1438,12 +1440,12 @@ procedure TmwSimplePasPar.AccessSpecifier;
 
 procedure TmwSimplePasPar.ReadAccessIdentifier;
 begin
-  variable;
+  Variable;
 end;
 
 procedure TmwSimplePasPar.WriteAccessIdentifier;
 begin
-  variable;
+  Variable;
 end;
 
 procedure TmwSimplePasPar.StorageSpecifier;
@@ -3304,7 +3306,7 @@ procedure TmwSimplePasPar.ArrayType;
   Expected(ptArray);
   ArrayBounds;
   Expected(ptOf);
-  TypeKind;
+  ArraySubType;
 end;
 
 procedure TmwSimplePasPar.EnumeratedType;
@@ -4261,6 +4263,19 @@ procedure TmwSimplePasPar.ArrayDimension;
   OrdinalType;
 end;
 
+procedure TmwSimplePasPar.ArrayOfConst;
+begin
+  Expected(ptConst);
+end;
+
+procedure TmwSimplePasPar.ArraySubType;
+begin
+  case TokenID of
+    ptConst: ArrayOfConst;
+    else TypeKind;
+  end;
+end;
+
 procedure TmwSimplePasPar.ClassForward;
 begin
   Expected(ptClass);
@@ -4867,16 +4882,16 @@ procedure TmwSimplePasPar.TypeSimple;
       begin
         NextToken;
         Expected(ptOf);
-        case TokenID of
-          ptConst: (*new in ObjectPascal80*)
-            begin
-              NextToken;
-            end;
-        else
-          begin
-            TypeID;
-          end;
-        end;
+//        case TokenID of
+//          ptConst: (*new in ObjectPascal80*)
+//            begin
+//              NextToken;
+//            end;
+//        else
+ //         begin
+        TypeID;
+//          end;
+//        end;
       end;
   else
     Expected(ptIdentifier);
@@ -5465,10 +5480,12 @@ procedure TmwSimplePasPar.AnonymousMethodType;
       end;
   end;
 end;
+
 procedure TmwSimplePasPar.AnonymousMethodTypeProcedure;
 begin
   Expected(ptProcedure);
 end;
+
 procedure TmwSimplePasPar.AnonymousMethodTypeFunction;
 begin
   Expected(ptFunction);