ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2024-12-30 01:48:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Accounted for namespace scoping issues

Browse Source
This commit is contained in:
Pherring04 2024-06-24 13:51:14 -05:00
parent 04e1d4b790
commit fa42e8be67
2 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libexec/trick/convert_swig
View File

@ -649,7 +649,6 @@ sub process_class($$$$$) {
# If the type is qualified, assume it's fully qualified and put the
# %template directive in the global namespace.
# See https://github.com/nasa/trick/issues/768
my $qualified = $template_type_no_sp =~ /^\w+(::)\w+</ ;
#print "*** template_type_no_sp = $template_type_no_sp ***\n" ;
if ( ! exists $processed_templates{$template_type_no_sp} ) {
@ -658,16 +657,23 @@ sub process_class($$$$$) {
my $trick_swig_template = "TRICK_SWIG_TEMPLATE_$identifier" ;
my $typedef = "\n#ifndef $trick_swig_template\n" ;
$typedef .= "\%template($identifier) $template_full_type;\n" ;
$typedef .= "#define $trick_swig_template\n" ;
$typedef .= "\%template($identifier) $template_full_type;\n" ;
$typedef .= "#endif\n" ;
if ($qualified) {
$global_template_typedefs .= $typedef
} else {
$template_typedefs .= $typedef
if ($curr_namespace ne "") {
my $in_same_namespace = 1 ;
if ($template_full_type =~ /^\w*(::)\w+</) {
$in_same_namespace = 0 ;
}
if ($in_same_namespace eq 0) {
$curr_namespace =~ /(.*)::/ ;
$typedef = "\n}" . $typedef . "namespace " . $1 . " {" ;
}
}
$template_typedefs .= $typedef ;
$processed_templates{$template_type_no_sp} = 1 ;
}
}

21
test/SIM_test_ip/models/test_ip/include/Namespace_tests.hh
View File

@ -15,6 +15,27 @@ PURPOSE:
#include <iostream>
#include <sstream>
template <class T>
class TemplateNoNS {};
class ClassNoNS {
public:
TemplateNoNS<int> tnns;
};
namespace a {
template <class T>
class Bar {};
class Foo {
public:
Bar<int> bar;
};
}
namespace my_ns {
class BB {