Skip to content
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

Jump to bottom

update printer to handle newer IFC changes #68

Merged
merged 1 commit into from
Mar 26, 2024
Merged

update printer to handle newer IFC changes #68

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
60 changes: 31 additions & 29 deletions include/ifc/reader.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,35 +250,36 @@ namespace ifc {
// clang-format off
switch (index.sort())
{
case DeclSort::Enumerator: return std::forward<F>(f)(index, get<symbolic::EnumeratorDecl>(index));
case DeclSort::Variable: return std::forward<F>(f)(index, get<symbolic::VariableDecl>(index));
case DeclSort::Parameter: return std::forward<F>(f)(index, get<symbolic::ParameterDecl>(index));
case DeclSort::Field: return std::forward<F>(f)(index, get<symbolic::FieldDecl>(index));
case DeclSort::Bitfield: return std::forward<F>(f)(index, get<symbolic::BitfieldDecl>(index));
case DeclSort::Scope: return std::forward<F>(f)(index, get<symbolic::ScopeDecl>(index));
case DeclSort::Enumeration: return std::forward<F>(f)(index, get<symbolic::EnumerationDecl>(index));
case DeclSort::Alias: return std::forward<F>(f)(index, get<symbolic::AliasDecl>(index));
case DeclSort::Temploid: return std::forward<F>(f)(index, get<symbolic::TemploidDecl>(index));
case DeclSort::Template: return std::forward<F>(f)(index, get<symbolic::TemplateDecl>(index));
case DeclSort::PartialSpecialization: return std::forward<F>(f)(index, get<symbolic::PartialSpecializationDecl>(index));
case DeclSort::Specialization: return std::forward<F>(f)(index, get<symbolic::SpecializationDecl>(index));
case DeclSort::Concept: return std::forward<F>(f)(index, get<symbolic::ConceptDecl>(index));
case DeclSort::Function: return std::forward<F>(f)(index, get<symbolic::FunctionDecl>(index));
case DeclSort::Method: return std::forward<F>(f)(index, get<symbolic::NonStaticMemberFunctionDecl>(index));
case DeclSort::Constructor: return std::forward<F>(f)(index, get<symbolic::ConstructorDecl>(index));
case DeclSort::InheritedConstructor: return std::forward<F>(f)(index, get<symbolic::InheritedConstructorDecl>(index));
case DeclSort::Destructor: return std::forward<F>(f)(index, get<symbolic::DestructorDecl>(index));
case DeclSort::Reference: return std::forward<F>(f)(index, get<symbolic::ReferenceDecl>(index));
case DeclSort::Using: return std::forward<F>(f)(index, get<symbolic::UsingDecl>(index));
case DeclSort::Friend: return std::forward<F>(f)(index, get<symbolic::FriendDecl>(index));
case DeclSort::Expansion: return std::forward<F>(f)(index, get<symbolic::ExpansionDecl>(index));
case DeclSort::DeductionGuide: return std::forward<F>(f)(index, get<symbolic::DeductionGuideDecl>(index));
case DeclSort::Tuple: return std::forward<F>(f)(index, get<symbolic::TupleDecl>(index));
case DeclSort::Intrinsic: return std::forward<F>(f)(index, get<symbolic::IntrinsicDecl>(index));
case DeclSort::Property: return std::forward<F>(f)(index, get<symbolic::PropertyDecl>(index));
case DeclSort::OutputSegment: return std::forward<F>(f)(index, get<symbolic::SegmentDecl>(index));
case DeclSort::SyntaxTree: return std::forward<F>(f)(index, get<symbolic::SyntacticDecl>(index));
case DeclSort::Barren: return std::forward<F>(f)(index, get<symbolic::BarrenDecl>(index));
case DeclSort::Enumerator: return std::forward<F>(f)(index, get<symbolic::EnumeratorDecl>(index));
case DeclSort::Variable: return std::forward<F>(f)(index, get<symbolic::VariableDecl>(index));
case DeclSort::Parameter: return std::forward<F>(f)(index, get<symbolic::ParameterDecl>(index));
case DeclSort::Field: return std::forward<F>(f)(index, get<symbolic::FieldDecl>(index));
case DeclSort::Bitfield: return std::forward<F>(f)(index, get<symbolic::BitfieldDecl>(index));
case DeclSort::Scope: return std::forward<F>(f)(index, get<symbolic::ScopeDecl>(index));
case DeclSort::Enumeration: return std::forward<F>(f)(index, get<symbolic::EnumerationDecl>(index));
case DeclSort::Alias: return std::forward<F>(f)(index, get<symbolic::AliasDecl>(index));
case DeclSort::Temploid: return std::forward<F>(f)(index, get<symbolic::TemploidDecl>(index));
case DeclSort::Template: return std::forward<F>(f)(index, get<symbolic::TemplateDecl>(index));
case DeclSort::PartialSpecialization: return std::forward<F>(f)(index, get<symbolic::PartialSpecializationDecl>(index));
case DeclSort::Specialization: return std::forward<F>(f)(index, get<symbolic::SpecializationDecl>(index));
case DeclSort::Concept: return std::forward<F>(f)(index, get<symbolic::ConceptDecl>(index));
case DeclSort::Function: return std::forward<F>(f)(index, get<symbolic::FunctionDecl>(index));
case DeclSort::Method: return std::forward<F>(f)(index, get<symbolic::NonStaticMemberFunctionDecl>(index));
case DeclSort::Constructor: return std::forward<F>(f)(index, get<symbolic::ConstructorDecl>(index));
case DeclSort::InheritedConstructor: return std::forward<F>(f)(index, get<symbolic::InheritedConstructorDecl>(index));
case DeclSort::Destructor: return std::forward<F>(f)(index, get<symbolic::DestructorDecl>(index));
case DeclSort::Reference: return std::forward<F>(f)(index, get<symbolic::ReferenceDecl>(index));
case DeclSort::Using: return std::forward<F>(f)(index, get<symbolic::UsingDecl>(index));
case DeclSort::Friend: return std::forward<F>(f)(index, get<symbolic::FriendDecl>(index));
case DeclSort::Expansion: return std::forward<F>(f)(index, get<symbolic::ExpansionDecl>(index));
case DeclSort::DeductionGuide: return std::forward<F>(f)(index, get<symbolic::DeductionGuideDecl>(index));
case DeclSort::Tuple: return std::forward<F>(f)(index, get<symbolic::TupleDecl>(index));
case DeclSort::Intrinsic: return std::forward<F>(f)(index, get<symbolic::IntrinsicDecl>(index));
case DeclSort::Property: return std::forward<F>(f)(index, get<symbolic::PropertyDecl>(index));
case DeclSort::OutputSegment: return std::forward<F>(f)(index, get<symbolic::SegmentDecl>(index));
case DeclSort::SyntaxTree: return std::forward<F>(f)(index, get<symbolic::SyntacticDecl>(index));
case DeclSort::Barren: return std::forward<F>(f)(index, get<symbolic::BarrenDecl>(index));
case DeclSort::DefaultArgument: return std::forward<F>(f)(index, get<symbolic::DefaultArgumentDecl>(index));

case DeclSort::VendorExtension:
case DeclSort::Count:
Expand Down Expand Up @@ -350,6 +351,7 @@ namespace ifc {
case ExprSort::PackedTemplateArguments: return std::forward<F>(f)(get<symbolic::PackedTemplateArgumentsExpr>(index));
case ExprSort::Tokens: return std::forward<F>(f)(get<symbolic::TokenExpr>(index));
case ExprSort::AssignInitializer: return std::forward<F>(f)(get<symbolic::AssignInitializerExpr>(index));
case ExprSort::Statement: return std::forward<F>(f)(get<symbolic::StatementExpr>(index));

case ExprSort::VendorExtension:
case ExprSort::Generic: // C11 generic extension (no IFC structure yet)
Expand Down
6 changes: 6 additions & 0 deletions src/ifc-dom/decls.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,12 @@ namespace ifc::util {
// TODO: Add more detail.
load_common_props(ctx, node, decl);
}

void operator()(DeclIndex, const symbolic::DefaultArgumentDecl& decl)
{
// TODO: Add more detail.
load_common_props(ctx, node, decl);
}
};

void load(Loader& ctx, Node& node, DeclIndex index)
Expand Down
2 changes: 1 addition & 1 deletion src/ifc-dom/exprs.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ namespace ifc::util {

void load(Loader& ctx, Node& node, symbolic::DefaultIndex index)
{
load(ctx, node, std::bit_cast<ExprIndex>(index));
load(ctx, node, as_expr_index(index));
}

std::string expr_list(Loader& ctx, ExprIndex index, std::string delimiters)
Expand Down
Loading