ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2024-12-18 20:57:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

No longer print template directives if use case is within #ifndef SWIG

Browse Source
This commit is contained in:
Pherring04 2024-07-01 14:57:01 -05:00
parent 72b3fcaa09
commit c3008a2cca
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libexec/trick/convert_swig
View File

@ -617,6 +617,8 @@ sub process_class($$$$$) {
# SWIG doesn't like "const static". Change it to "static const" # SWIG doesn't like "const static". Change it to "static const"
$extracted =~ s/const\s+static/static const/g ; $extracted =~ s/const\s+static/static const/g ;
my $isSwigExcludeBlock = 0 ;
# templated variables need to be declared with the SWIG %template directive. # templated variables need to be declared with the SWIG %template directive.
# This loop looks for any templated variables and creates the %template lines. # This loop looks for any templated variables and creates the %template lines.
while ( $extracted =~ s/^(.*?)(?:($template_var_def))//sx ) { while ( $extracted =~ s/^(.*?)(?:($template_var_def))//sx ) {
@ -626,6 +628,16 @@ sub process_class($$$$$) {
if ( $non_var ne "" ) { if ( $non_var ne "" ) {
#print "*** non_var = $non_var ***\n" ; #print "*** non_var = $non_var ***\n" ;
$my_class_contents .= $non_var ; $my_class_contents .= $non_var ;
my $ifndefSwig = $non_var;
if ($isSwigExcludeBlock == 0) {
if ($ifndefSwig =~ /(?:ifndef\s*SWIG|if\s*!\s*defined\s*\(\s*SWIG\s*\))/ ) {
$isSwigExcludeBlock = 1;
}
} else {
if ($ifndefSwig =~ /endif/ ) {
$isSwigExcludeBlock = 0;
}
}
} }
if ( $template_var_def_str ne "" ) { if ( $template_var_def_str ne "" ) {
@ -673,8 +685,10 @@ sub process_class($$$$$) {
$typedef = "\n}" . $typedef . "namespace " . $1 . " {" ; $typedef = "\n}" . $typedef . "namespace " . $1 . " {" ;
} }
} }
$template_typedefs .= $typedef ; if ($isSwigExcludeBlock == 0) {
$template_typedefs .= $typedef ;
}
$processed_templates{$template_type_no_sp} = 1 ; $processed_templates{$template_type_no_sp} = 1 ;
} }