Support program and library files with no begin

Author: fourls

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Parsing errors on `.dpr` files without a top-level `begin`.
 - The `Copy` intrinsic inferred an incorrect return type for `PChar`, `PAnsiChar`, and variants.
 - The `Concat` intrinsic inferred an incorrect return type for single-character string literals.
 - Ideographic space (U+3000) was erroneously accepted as a valid identifier character.

delphi-frontend/src/main/antlr3/au/com/integradev/delphi/antlr/Delphi.g

@@ -147,13 +147,15 @@ fileWithoutImplementation    : program | library | unitWithoutImplementation | p
 // File head
 //----------------------------------------------------------------------------
 
-program                      : (programHead)? (usesFileClause)? block '.'
+program                      : programHead? usesFileClause? programBody '.'
                              ;
-programHead                  : 'program'<ProgramDeclarationNodeImpl>^ qualifiedNameDeclaration (programParmSeq)? ';'!
+programHead                  : 'program'<ProgramDeclarationNodeImpl>^ qualifiedNameDeclaration programParameters? ';'!
                              ;
-programParmSeq               : '(' (ident (',' ident)* )? ')'
+programParameters            : '(' (ident (',' ident)* )? ')' // Used in standard Pascal; Delphi ignores them.
                              ;
-library                      : libraryHead (usesFileClause)? block '.'
+programBody                  : localDeclSection? (compoundStatement | 'end')
+                             ;
+library                      : libraryHead usesFileClause? programBody '.'
                              ;
 libraryHead                  : 'library'<LibraryDeclarationNodeImpl>^ qualifiedNameDeclaration (portabilityDirective!)* ';'!
                              ;
@@ -253,7 +255,7 @@ varValueSpec                 : 'absolute' constExpression
                              ;
 exportsSection               : 'exports' ident exportItem (',' ident exportItem)* ';'
                              ;
-exportItem                   : ('(' formalParameterList ')')? (INDEX expression)? (NAME expression)? ('resident')?
+exportItem                   : ('(' formalParameterList ')')? ('index' expression)? ('name' expression)? ('resident')?
                              ;
 
 //----------------------------------------------------------------------------

delphi-frontend/src/test/java/au/com/integradev/delphi/antlr/GrammarTest.java

@@ -115,6 +115,26 @@ void testParseKeyWordsAsIdentifier() {
     assertParsed("KeyWordsAsIdentifier.pas");
   }
 
+  @Test
+  void testParseExportsSection() {
+    assertParsed("ExportsSection.dpr");
+  }
+
+  @Test
+  void testParseEmptyProgram() {
+    assertParsed("EmptyProgram.dpr");
+  }
+
+  @Test
+  void testParseProgramWithEmptyBlock() {
+    assertParsed("ProgramWithEmptyBlock.dpr");
+  }
+
+  @Test
+  void testParseEnd() {
+    assertParsed("End.dpr");
+  }
+
   @Test
   void testParseListUtils() {
     assertParsed("ListUtils.pas");

delphi-frontend/src/test/resources/au/com/integradev/delphi/grammar/EmptyProgram.dpr

@@ -0,0 +1,3 @@
+program EmptyProgram;
+
+end.

delphi-frontend/src/test/resources/au/com/integradev/delphi/grammar/End.dpr

@@ -0,0 +1 @@
+end.

delphi-frontend/src/test/resources/au/com/integradev/delphi/grammar/ExportsSection.dpr

@@ -0,0 +1,11 @@
+library ExportsSection;
+
+uses System.SysUtils;
+
+exports
+  Foo name FooBar,
+  Bar name BarBaz,
+  Baz index 0,
+  Flarp name BazFlarp resident;
+
+end.

delphi-frontend/src/test/resources/au/com/integradev/delphi/grammar/ProgramWithEmptyBlock.dpr

@@ -0,0 +1,4 @@
+program ProgramWithEmptyBlock;
+
+begin
+end.