Skip to content

Add C23 enum type parsing #8539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add C23 enum type parsing #8539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions Ghidra/Features/Base/src/main/javacc/ghidra/app/util/cparser/C/C.jj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2256,14 +2256,19 @@ DataType EnumSpecifier() : {
DataType dt;
ArrayList<EnumMember> list;
Declaration dec = new Declaration();
Declaration tdec = null;
}
{
<ENUM>
(
LOOKAHEAD(3)
[AttributeSpecList(dec)] [ t= <IDENTIFIER> ] "{" list= EnumeratorList() "}"
LOOKAHEAD(5)
[AttributeSpecList(dec)] [ t= <IDENTIFIER> ] [ ":" tdec = TypeName() ] "{" list= EnumeratorList() "}"
{
dt = allocateEnumDT(t, list);
if (tdec != null) {
// type provided
dt = tdec.getDataType();
}
}
|
t= <IDENTIFIER>
Expand Down
2 changes: 2 additions & 0 deletions Ghidra/Features/Base/src/test/resources/ghidra/app/util/cparser/CParserTest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1248,3 +1248,5 @@ struct statcheck {
typedef int test_before;
static_assert(1 + 1 == 2, "That's true!");
typedef int test_after;

enum typedenum : unsigned char {};