ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2024-12-24 07:16:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #986 from nasa/985

Browse Source 
Fix trick_exclude_typename
This commit is contained in:
dbankieris 2020-04-17 14:45:58 -05:00 committed by GitHub
commit ebaeba7e73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
trick_source/codegen/Interface_Code_Gen/CommentSaver.cpp
View File

@ -196,46 +196,48 @@ bool CommentSaver::hasICGNoComment( std::string file_name ) {
std::set< std::string > CommentSaver::getIgnoreTypes( std::string file_name ) { std::set< std::string > CommentSaver::getIgnoreTypes( std::string file_name ) {
std::set< std::string > ignore_types ; std::set< std::string > ignore_types ;
std::string th_str = getTrickHeaderComment(file_name) ; std::string th_str = getTrickHeaderComment(file_name) ;
if ( ! th_str.empty() ) {
int ret ;
regex_t reg_expr ;
regmatch_t pmatch[10] ;
//std::cout << "here in getIgnoreTypes\n" << th_str << std::endl ;
size_t start = 0 ; if ( th_str.empty() ) {
start = th_str.find( "trick_exclude_typename") ; return ignore_types;
while ( start != std::string::npos ) { }
start += strlen("trick_exclude_typename") ;
std::string temp_str = th_str.substr(start) ;
memset(pmatch , 0 , sizeof(pmatch)) ;
regcomp( &reg_expr , "^\\s*\\{\\s*(\\S+)\\s*\\}" , REG_EXTENDED ) ;
ret = regexec( &reg_expr , temp_str.c_str() , 10 , pmatch , 0 ) ;
regfree(&reg_expr) ;
if ( ret == 0 ) {
std::string item = temp_str.substr(pmatch[1].rm_so, pmatch[1].rm_eo) ;
// regular expression leaving trailing space and brace. Why?
item.erase(item.find_first_of(" \t}")) ;
//std::cout << "icg_ignore_types " << item << std::endl ;
ignore_types.insert(item) ;
}
start = th_str.find( "trick_exclude_typename", start ) ;
}
//std::transform(th_str.begin(), th_str.end(), th_str.begin(), ::toupper) ; int ret ;
regex_t reg_expr ;
regmatch_t pmatch[10] ;
//std::cout << "here in getIgnoreTypes\n" << th_str << std::endl ;
size_t start = 0 ;
start = th_str.find( "trick_exclude_typename") ;
while ( start != std::string::npos ) {
start += strlen("trick_exclude_typename") ;
std::string temp_str = th_str.substr(start) ;
memset(pmatch , 0 , sizeof(pmatch)) ; memset(pmatch , 0 , sizeof(pmatch)) ;
regcomp( &reg_expr , "^\\s*\\{\\s*(\\S+)\\s*\\}" , REG_EXTENDED ) ;
/* POSIX regular expressions are always greedy, making our job harder. ret = regexec( &reg_expr , temp_str.c_str() , 10 , pmatch , 0 ) ;
We have to use several regular expressions to get the types. This was
so much easier in perl! */
/* find the start of the ICG_IGNORE_TYPES field */
regcomp( &reg_expr , "(ICG[ _]IGNORE[ _]TYPE(S)?:)" , REG_EXTENDED | REG_ICASE ) ;
ret = regexec( &reg_expr , th_str.c_str() , 10 , pmatch , 0 ) ;
regfree(&reg_expr) ; regfree(&reg_expr) ;
if ( ret != 0 ) { if ( ret == 0 ) {
return std::set< std::string >() ; std::string item = temp_str.substr(pmatch[1].rm_so, pmatch[1].rm_eo) ;
// regular expression leaving trailing space and brace. Why?
item.erase(item.find_first_of(" \t}")) ;
//std::cout << "icg_ignore_types " << item << std::endl ;
ignore_types.insert(item) ;
} }
start = th_str.find( "trick_exclude_typename", start ) ;
}
//std::transform(th_str.begin(), th_str.end(), th_str.begin(), ::toupper) ;
memset(pmatch , 0 , sizeof(pmatch)) ;
/* POSIX regular expressions are always greedy, making our job harder.
We have to use several regular expressions to get the types. This was
so much easier in perl! */
/* find the start of the ICG_IGNORE_TYPES field */
regcomp( &reg_expr , "(ICG[ _]IGNORE[ _]TYPE(S)?:)" , REG_EXTENDED | REG_ICASE ) ;
ret = regexec( &reg_expr , th_str.c_str() , 10 , pmatch , 0 ) ;
regfree(&reg_expr) ;
if ( !ret ) {
th_str = th_str.substr(pmatch[1].rm_eo) ; th_str = th_str.substr(pmatch[1].rm_eo) ;
/* find the end of the ICG_IGNORE_TYPES field */ /* find the end of the ICG_IGNORE_TYPES field */
@ -243,23 +245,21 @@ std::set< std::string > CommentSaver::getIgnoreTypes( std::string file_name ) {
regcomp( &reg_expr , "(\\)\\s*\\))" , REG_EXTENDED ) ; regcomp( &reg_expr , "(\\)\\s*\\))" , REG_EXTENDED ) ;
ret = regexec( &reg_expr , th_str.c_str() , 10 , pmatch , 0 ) ; ret = regexec( &reg_expr , th_str.c_str() , 10 , pmatch , 0 ) ;
regfree(&reg_expr) ; regfree(&reg_expr) ;
if ( ret != 0 ) { if ( !ret ) {
return std::set< std::string >() ; th_str = th_str.substr(0 , pmatch[1].rm_so) ;
} std::replace( th_str.begin(), th_str.end(), '(', ' ');
th_str = th_str.substr(0 , pmatch[1].rm_so) ; std::replace( th_str.begin(), th_str.end(), ')', ' ');
std::replace( th_str.begin(), th_str.end(), '(', ' '); std::replace( th_str.begin(), th_str.end(), '\n', ' ');
std::replace( th_str.begin(), th_str.end(), ')', ' ');
std::replace( th_str.begin(), th_str.end(), '\n', ' ');
std::stringstream ss(th_str); std::stringstream ss(th_str);
std::string item; std::string item;
while (std::getline(ss, item, ' ')) { while (std::getline(ss, item, ' ')) {
if ( ! item.empty() ) { if ( ! item.empty() ) {
//std::cout << "icg_ignore_types " << item << std::endl ; //std::cout << "icg_ignore_types " << item << std::endl ;
ignore_types.insert(item) ; ignore_types.insert(item) ;
}
} }
} }
} }
return ignore_types ; return ignore_types ;