Fixed memory leaks for STEPaggregate data.

davyw · davyw · commit 8a2665e980b8 · 2012-04-05T20:40:09.000+02:00
* Data was created for use with STEPaggregate types in fedex_plus generated
  code but never destroyed.
* Fixed some code style alignment.
* STEPaggregate's STEPnodes never got destroyed.
diff --git a/src/clstepcore/STEPaggregate.cc b/src/clstepcore/STEPaggregate.cc
@@ -40,6 +40,14 @@ STEPaggregate::STEPaggregate() {
 }
 
 STEPaggregate::~STEPaggregate() {
+    STEPnode *node;
+
+    node = (STEPnode*) head;
+    while ( node ) {
+        head = node->NextNode();
+        delete node;
+        node = (STEPnode*) head;
+    }
 }
 
 STEPaggregate & STEPaggregate::ShallowCopy( const STEPaggregate & a ) {
@@ -829,6 +837,7 @@ SelectNode::SelectNode() {
 }
 
 SelectNode::~SelectNode() {
+    delete node;
 }
 
 SingleLinkNode * SelectNode::NewNode() {
diff --git a/src/clstepcore/STEPattribute.h b/src/clstepcore/STEPattribute.h
@@ -105,10 +105,10 @@ class SCL_CORE_EXPORT STEPattribute {
             SDAI_Binary * b;                 // BINARY_TYPE
             SDAI_Real * r;                   // REAL_TYPE and NUMBER_TYPE (Real is a double)
             SDAI_Application_instance * * c; // ENTITY_TYPE
-            STEPaggregate * a;                  // AGGREGATE_TYPE
+            STEPaggregate * a;               // AGGREGATE_TYPE
             SDAI_Enum * e;                   // ENUM_TYPE, BOOLEAN_TYPE, and LOGICAL_TYPE
             SDAI_Select * sh;                // SELECT_TYPE
-            SCLundefined * u;                   // UNKNOWN_TYPE
+            SCLundefined * u;                // UNKNOWN_TYPE
             void * p;
 
         } ptr;
diff --git a/src/fedex_plus/classes.c b/src/fedex_plus/classes.c
@@ -1661,7 +1661,24 @@ void LIBstructor_print( Entity entity, FILE * file, Schema schema ) {
     to be deleted -- attributes will need reference count  */
 
     entnm = ENTITYget_classname( entity );
-    fprintf( file, "%s::~%s () {  }\n", entnm, entnm );
+    fprintf( file, "%s::~%s () {\n", entnm, entnm );
+
+    attr_list = ENTITYget_attributes( entity );
+
+    LISTdo( attr_list, a, Variable )
+    if( VARget_initializer( a ) == EXPRESSION_NULL ) {
+        generate_attribute_name( a, attrnm );
+        t = VARget_type( a );
+
+        if( ( ! VARget_inverse( a ) ) && ( ! VARis_derived( a ) ) )  {
+            if( TYPEis_aggregate( t ) ) {
+                fprintf( file, "    delete _%s;\n", attrnm );
+            }
+        }
+    }
+    LISTod;
+
+    fprintf( file, "}\n" );
 }
 
 /********************/

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,14 @@ STEPaggregate::STEPaggregate() {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`STEPaggregate::~STEPaggregate() {`
	`43`	`+ STEPnode *node;`
	`44`	`+`
	`45`	`+ node = (STEPnode*) head;`
	`46`	`+ while ( node ) {`
	`47`	`+ head = node->NextNode();`
	`48`	`+ delete node;`
	`49`	`+ node = (STEPnode*) head;`
	`50`	`+ }`
`43`	`51`	`}`
`44`	`52`
`45`	`53`	`STEPaggregate & STEPaggregate::ShallowCopy( const STEPaggregate & a ) {`
`@@ -829,6 +837,7 @@ SelectNode::SelectNode() {`
`829`	`837`	`}`
`830`	`838`
`831`	`839`	`SelectNode::~SelectNode() {`
	`840`	`+ delete node;`
`832`	`841`	`}`
`833`	`842`
`834`	`843`	`SingleLinkNode * SelectNode::NewNode() {`