yggdrasil/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[flang] A nested STRUCTURE must declare entities (#99379)

Browse Source 
When a DEC legacy STRUCTURE definition appears within another, its
STRUCTURE statement must also declare some components of the enclosing
structure.

Fixes https://github.com/llvm/llvm-project/issues/99288.
This commit is contained in:
Peter Klausler 2024-07-18 16:32:24 -07:00 committed by GitHub
parent 043aca3990
commit 0684db30a1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
flang/lib/Parser/Fortran-parsers.cpp
View File

@ -1304,10 +1304,16 @@ TYPE_PARSER(extension<LanguageFeature::CUDA>(construct<CUDAAttributesStmt>(
defaulted(
maybe("::"_tok) >> nonemptyList("expected names"_err_en_US, name)))))
// Subtle: the name includes the surrounding slashes, which avoids
// Subtle: A structure's name includes the surrounding slashes, which avoids
// clashes with other uses of the name in the same scope.
TYPE_PARSER(construct<StructureStmt>(
"STRUCTURE" >> maybe(sourced("/" >> name / "/")), optionalList(entityDecl)))
constexpr auto structureName{maybe(sourced("/" >> name / "/"))};
// Note that Parser<StructureStmt>{} has a mandatory list of entity-decls
// and is used only by NestedStructureStmt{}.Parse() in user-state.cpp.
TYPE_PARSER(construct<StructureStmt>("STRUCTURE" >> structureName,
localRecovery(
"entity declarations are required on a nested structure"_err_en_US,
nonemptyList(entityDecl), ok)))
constexpr auto nestedStructureDef{
CONTEXT_PARSER("nested STRUCTURE definition"_en_US,
@ -1323,7 +1329,9 @@ TYPE_PARSER(construct<StructureField>(statement(StructureComponents{})) ||
TYPE_CONTEXT_PARSER("STRUCTURE definition"_en_US,
extension<LanguageFeature::DECStructures>(
"nonstandard usage: STRUCTURE"_port_en_US,
construct<StructureDef>(statement(Parser<StructureStmt>{}),
construct<StructureDef>(
statement(construct<StructureStmt>(
"STRUCTURE" >> structureName, optionalList(entityDecl))),
many(Parser<StructureField>{}),
statement(construct<StructureDef::EndStructureStmt>(
"END STRUCTURE"_tok)))))

7
flang/test/Semantics/struct03.f90 Normal file
View File

@ -0,0 +1,7 @@
! RUN: %python %S/test_errors.py %s %flang_fc1
structure /s/
!ERROR: entity declarations are required on a nested structure
structure /nested/
end structure
end structure
end