ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-03-24 21:15:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve handling of sim object member initializers

Browse Source 
Rather than just searching for the first pair of curly braces to find a
sim object's constructor, parse any member initializer list that is
present. Fixes #443.
This commit is contained in:
Thadeus Fleming 2017-10-16 15:22:19 -05:00
parent 56ddfab6a5
commit b3f03e3fc4
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libexec/trick/pm/parse_s_define.pm
View File

@ -570,7 +570,31 @@ sub handle_sim_class ($$$$) {
while ( $class_contents =~ /^(.*?)$class_name\s*\([^;]*{/s ) { while ( $class_contents =~ /^(.*?)$class_name\s*\([^;]*{/s ) {
my (@int_job_calls, @double_job_calls) ; my (@int_job_calls, @double_job_calls) ;
$constructor_found = 1 ; $constructor_found = 1 ;
$class_contents =~ s/^(.*?$class_name[^{]+)//s ; # grab the constructor's argument list
$class_contents =~ s/^(.*?$class_name[^(]*)//s ;
$temp_content = $1 ;
$final_contents .= $temp_content ;
($temp_content, $class_contents) = extract_bracketed($class_contents,"()");
$final_contents .= $temp_content ;
# a colon after the constructor arguments starts a member initializer list
if ( $class_contents =~ /^\s*:/s )
{
my $in_init_list = 1 ;
while ( $in_init_list ) {
$class_contents =~ s/^([^{(]+)//s ;
$temp_content = $1 ;
$final_contents .= $temp_content ;
# member initializers can have either parentheses or curly braces
($temp_content, $class_contents) = extract_bracketed($class_contents,"(){}");
$final_contents .= $temp_content ;
# there's another initializer if there is a comma
if ( $class_contents !~ /^\s*,/ ) {
$in_init_list = 0;
}
}
}
$class_contents =~ s/^([^{]*)//s ;
$temp_content = $1 ; $temp_content = $1 ;
$final_contents .= $temp_content ; $final_contents .= $temp_content ;