ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-04-11 05:10:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/nasa/Trick

Browse Source
This commit is contained in:
John M. Penn 2015-03-25 16:34:20 -05:00
commit 6d13282e90
6 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bin/C3PO
View File

@ -3,7 +3,6 @@
use File::Basename ;
use Cwd ;
use strict ;
use Data::Dumper ;
use Getopt::Long ;
use Pod::Usage ;
use Pod::Text ;
@ -230,24 +229,11 @@ undef %temp_hash ;
@all_src_files = grep ++$temp_hash{$_} < 2, @all_src_files ;
@all_src_files = grep !/trick_source|\.a$|^\-/ , @all_src_files ;
# TODO: Add back at some time before release
#trick_print($sim{fh}, "MIS-ing all src files... ", "title_cyan" , $sim{args}{v}) ;
#trick_print($sim{fh}, "\n" , "title_white" , $sim{args}{v}) if ( $sim{args}{v} != 1 ) ;
#mis_all_c(\@all_src_files , \%sim ) ;
if ( $sim{args}{v} == 1 ) {
print " Complete\n" ;
}
trick_print($sim{fh}, "\nMIS complete\n\n" , "normal_green" , $sim{args}{v}) ;
if ( $sim{args}{v} > 3 ) {
chdir ($cwd) ;
$Data::Dumper::Indent = 1 ;
open FILE, ">sim_info" or die "Couldn't open sim_info\n";
print FILE Data::Dumper->Dump([\%sim], ["*sim_info"]) , "\n" ;
close FILE ;
}
#--------------------------------------------------------------
# Make Default Data

1
bin/MIS
View File

@ -7,7 +7,6 @@ use Getopt::Long ;
use Pod::Usage ;
use Pod::Text ;
use File::Basename ;
use Data::Dumper ;
use Cwd ;
use Cwd 'abs_path' ;
use mis_dep ;

1
bin/pm/ICG.pm
View File

@ -14,7 +14,6 @@ use MIS ;
use html ;
use trick_print ;
use trick_version ;
use Data::Dumper ;
use Cwd 'abs_path';
##############################################################################

1
bin/pm/MIS.pm
View File

@ -7,7 +7,6 @@ use Exporter ();
use strict ;
use lib $ENV{"TRICK_HOME"} . "/bin/pm" ;
use File::Basename ;
use Data::Dumper ;
use Cwd ;
use Cwd 'abs_path' ;
use html ;

2
bin/start_sim
View File

@ -21,8 +21,6 @@ use gte ;
#use strict ;
require $ENV{"TRICK_HOME"} . "/bin/pm/XML/Parser.pm" ;
use XML::Simple ;
use Data::Dumper ;
my @element_stack;
my $record_index;

13
trick_source/codegen/Interface_Code_Gen/ClassValues.cpp
View File

@ -28,6 +28,19 @@ ClassValues::~ClassValues() {
void ClassValues::addFieldDescription(FieldDescription * in_fdes) {
field_descripts.push_back(in_fdes) ;
// Test to see if the new field overloads a field of the same name. If it does
// then fully qualify the name of the inherited field (the one already in field_name_to_info).
std::map< std::string , FieldDescription * >::iterator mit = field_name_to_info_map.find(in_fdes->getName()) ;
if ( mit != field_name_to_info_map.end() ) {
// If the matched variable is inherited, qualify it with its container class name.
if ( (*mit).second->isInherited() ) {
(*mit).second->setName( (*mit).second->getContainerClass() + "::" + (*mit).second->getName() ) ;
field_name_to_info_map[(*mit).second->getName()] = (*mit).second ;
field_name_to_info_map.erase(mit) ;
}
}
field_name_to_info_map[in_fdes->getName()] = in_fdes ;
}