From 386aa5671142c9d9c9c39992c37d11d6740b357a Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Tue, 11 Jun 2024 12:29:04 -0400 Subject: [PATCH] wikiheaders: Make cleaning out function attributes more generic. Changes the wiki page's "Syntax" section from things like... ```c void SDL_LockMutex(SDL_Mutex *mutex) SDL_ACQUIRE(mutex); ``` ...to... ```c void SDL_LockMutex(SDL_Mutex *mutex); ``` --- build-scripts/wikiheaders.pl | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/build-scripts/wikiheaders.pl b/build-scripts/wikiheaders.pl index bb24d70d7b..83a764875b 100755 --- a/build-scripts/wikiheaders.pl +++ b/build-scripts/wikiheaders.pl @@ -889,9 +889,8 @@ while (my $d = readdir(DH)) { $decl =~ s/\s+\Z//; - $decl =~ s/\s*SDL_W?PRINTF_VARARG_FUNCV?\s*\(\d+\)\s*//; # don't want this metadata as part of the documentation. $decl =~ s/SDL_PRINTF_FORMAT_STRING\s*//; # don't want this metadata as part of the documentation. - $decl =~ s/\s*SDL_ANALYZER_NORETURN\s*//; # don't want this metadata as part of the documentation. + $decl =~ s/\)(\s*SDL_[a-zA-Z_]+(\(.*?\)|))*;/);/; # don't want this metadata as part of the documentation. if (!$is_forced_inline && $decl =~ /\A\s*extern\s+(SDL_DEPRECATED\s+|)(SDLMAIN_|SDL_)DECLSPEC\s+(const\s+|)(unsigned\s+|)(.*?)\s*(\*?)\s*SDLCALL\s+(.*?)\s*\((.*?)\);/) { $sym = $7; @@ -924,9 +923,8 @@ while (my $d = readdir(DH)) { } } - $decl =~ s/\s*SDL_W?PRINTF_VARARG_FUNCV?\s*\(\d+\)\s*//; # don't want this metadata as part of the documentation. $decl =~ s/SDL_PRINTF_FORMAT_STRING\s*//; # don't want this metadata as part of the documentation. - $decl =~ s/\s*SDL_ANALYZER_NORETURN\s*//; # don't want this metadata as part of the documentation. + $decl =~ s/\)(\s*SDL_[a-zA-Z_]+(\(.*?\)|))*;/);/; # don't want this metadata as part of the documentation. # !!! FIXME: code duplication with typedef processing, below. # We assume any `#define`s directly after the function are related to it: probably bitflags for an integer typedef.