Skip to content

fix binding of (function type) typdefs with params #175

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

Merged
ltcmelo merged 1 commit into from
Nov 9, 2025
Merged

fix binding of (function type) typdefs with params #175

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
6 changes: 5 additions & 1 deletion C/sema/DeclarationBinder_Declarators.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,13 @@ SyntaxVisitor::Action DeclarationBinder::visit_AtSingleDeclarator_COMMON(
SyntaxVisitor::Action DeclarationBinder::visitParameterDeclaration_AtDeclarator(
const ParameterDeclarationSyntax* node)
{
return visit_AtSingleDeclarator_COMMON(
auto inTydefDecltor = F_.inTydefDecltor_;
F_.inTydefDecltor_ = false;
auto action = visit_AtSingleDeclarator_COMMON(
node,
&DeclarationBinder::visitParameterDeclaration_AtEnd);
F_.inTydefDecltor_ = inTydefDecltor;
return action;
}

SyntaxVisitor::Action DeclarationBinder::visitFunctionDefinition_AtDeclarator(
Expand Down
10 changes: 10 additions & 0 deletions C/sema/TypedefNameTypeResolver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,16 @@ SyntaxVisitor::Action TypedefNameTypeResolver::visitTypedefDeclaration(
return Action::Skip;
}

SyntaxVisitor::Action TypedefNameTypeResolver::visitParameterDeclaration(
const ParameterDeclarationSyntax* node)
{
auto inTydefDecltor = inTydefDecltor_;
inTydefDecltor_ = false;
VISIT(node->declarator());
inTydefDecltor_ = inTydefDecltor;
return Action::Skip;
}

SyntaxVisitor::Action TypedefNameTypeResolver::visitIdentifierDeclarator(
const IdentifierDeclaratorSyntax* node)
{
Expand Down
1 change: 1 addition & 0 deletions C/sema/TypedefNameTypeResolver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ class PSY_C_INTERNAL_API TypedefNameTypeResolver final : protected SyntaxVisitor
// Declarations //
//--------------//
virtual Action visitTypedefDeclaration(const TypedefDeclarationSyntax*) override;
virtual Action visitParameterDeclaration(const ParameterDeclarationSyntax*) override;

/* Declarators */
virtual Action visitIdentifierDeclarator(const IdentifierDeclaratorSyntax*) override;
Expand Down
24 changes: 24 additions & 0 deletions C/symbols/TagDeclaration_StructOrUnion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,27 @@ void StructOrUnionDeclarationSymbol::addField(const FieldDeclarationSymbol* fld)
{
addMember(fld);
}

namespace psy {
namespace C {

PSY_C_API std::ostream& operator<<(
std::ostream& os,
const StructOrUnionDeclarationSymbol* struktOrUnion)
{
if (!struktOrUnion)
return os << "<StructOrUnionDeclaration is null>";
switch (struktOrUnion->kind()) {
case SymbolKind::StructDeclaration:
return os << struktOrUnion->asStructDeclaration();
case SymbolKind::UnionDeclaration:
return os << struktOrUnion->asUnionDeclaration();
default:
PSY_ASSERT_1(false);
break;
}
return os << "<invalid StructOrUnionDeclaration>";
}

} // C
} // psy
2 changes: 2 additions & 0 deletions C/symbols/TagDeclaration_StructOrUnion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ class PSY_C_API StructOrUnionDeclarationSymbol : public TagDeclarationSymbol
TagType* tagTy);
};

PSY_C_API std::ostream& operator<<(std::ostream& os, const StructOrUnionDeclarationSymbol* struktOrUnion);

} // C
} // psy

Expand Down
34 changes: 32 additions & 2 deletions C/tests/DeclarationBinderTester_1000_1999.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,8 +737,38 @@ void DeclarationBinderTester::case1136()
.ty_.Basic(BasicTypeKind::Double)));
}

void DeclarationBinderTester::case1137() {}
void DeclarationBinderTester::case1138() {}
void DeclarationBinderTester::case1137()
{
bind("x ( * y ) ( double z ) ;",
Expectation()
.declaration(Decl()
.Object("y", SymbolKind::VariableDeclaration)
.ty_.Typedef("x")
.ty_.Derived(TypeKind::Function)
.ty_.addParam().Basic(BasicTypeKind::Double)
.ty_.Derived(TypeKind::Pointer))
.declaration(Decl()
.Object("z", SymbolKind::ParameterDeclaration, ScopeKind::FunctionPrototype)
.ty_.Basic(BasicTypeKind::Double)));
}

void DeclarationBinderTester::case1138()
{
bind("x ( * y ) ( double * z ) ;",
Expectation()
.declaration(Decl()
.Object("y", SymbolKind::VariableDeclaration)
.ty_.Typedef("x")
.ty_.Derived(TypeKind::Function)
.ty_.addParam().Basic(BasicTypeKind::Double)
.ty_.atParam().Derived(TypeKind::Pointer)
.ty_.Derived(TypeKind::Pointer))
.declaration(Decl()
.Object("z", SymbolKind::ParameterDeclaration, ScopeKind::FunctionPrototype)
.ty_.Basic(BasicTypeKind::Double)
.ty_.Derived(TypeKind::Pointer)));
}

void DeclarationBinderTester::case1139() {}
void DeclarationBinderTester::case1140() {}
void DeclarationBinderTester::case1141() {}
Expand Down
53 changes: 50 additions & 3 deletions C/tests/DeclarationBinderTester_3000_3999.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,9 +385,56 @@ void DeclarationBinderTester::case3110()
.ty_.Basic(BasicTypeKind::Int_S, CVR::Const)));
}

void DeclarationBinderTester::case3111(){}
void DeclarationBinderTester::case3112(){}
void DeclarationBinderTester::case3113(){}
void DeclarationBinderTester::case3111()
{
bind("typedef int ( * x ) ( double ) ;",
Expectation()
.declaration(Decl()
.Type("x")
.inNameSpace(NameSpace::OrdinaryIdentifiers)
.withScopeKind(ScopeKind::File)
.ty_.Basic(BasicTypeKind::Int_S)
.ty_.Derived(TypeKind::Function)
.ty_.addParam().Basic(BasicTypeKind::Double)
.ty_.Derived(TypeKind::Pointer)));
}

void DeclarationBinderTester::case3112()
{
bind("typedef int ( * x ) ( double p ) ;",
Expectation()
.declaration(Decl()
.Type("x")
.inNameSpace(NameSpace::OrdinaryIdentifiers)
.withScopeKind(ScopeKind::File)
.ty_.Basic(BasicTypeKind::Int_S)
.ty_.Derived(TypeKind::Function)
.ty_.addParam().Basic(BasicTypeKind::Double)
.ty_.Derived(TypeKind::Pointer)));
}

void DeclarationBinderTester::case3113()
{
bind("typedef int ( * x ) ( double ) , ( * y ) ( double ) ;",
Expectation()
.declaration(Decl()
.Type("x")
.inNameSpace(NameSpace::OrdinaryIdentifiers)
.withScopeKind(ScopeKind::File)
.ty_.Basic(BasicTypeKind::Int_S)
.ty_.Derived(TypeKind::Function)
.ty_.addParam().Basic(BasicTypeKind::Double)
.ty_.Derived(TypeKind::Pointer))
.declaration(Decl()
.Type("y")
.inNameSpace(NameSpace::OrdinaryIdentifiers)
.withScopeKind(ScopeKind::File)
.ty_.Basic(BasicTypeKind::Int_S)
.ty_.Derived(TypeKind::Function)
.ty_.addParam().Basic(BasicTypeKind::Double)
.ty_.Derived(TypeKind::Pointer)));
}

void DeclarationBinderTester::case3114(){}
void DeclarationBinderTester::case3115(){}
void DeclarationBinderTester::case3116(){}
Expand Down