improve stepattr copy constructor

mpictor · mpictor · commit 48f1285e03d6 · 2013-10-09T21:31:57.000-04:00
uses shallow copy, so access violations are possible
diff --git a/src/clstepcore/STEPattribute.inline.cc b/src/clstepcore/STEPattribute.inline.cc
@@ -12,13 +12,63 @@
 
 #include <assert.h>
 #include <STEPattribute.h>
+#include <STEPaggregate.h>
 #include <sdai.h>
 #include <ExpDict.h>
 #include "sc_memmgr.h"
 
-///  This is needed so that STEPattribute's can be passed as references to inline functions
+/// This is needed so that STEPattribute's can be passed as references to inline functions
+/// NOTE this code only does shallow copies. It may be necessary to do more, in which case
+/// the destructor and assignment operator will also need examined.
 STEPattribute::STEPattribute( const STEPattribute & a )
-    : _derive( false ), _redefAttr( 0 ), aDesc( a.aDesc ), refCount( 0 ) {}
+    : _derive( a._derive ), _redefAttr( a._redefAttr ), aDesc( a.aDesc ), refCount( a.refCount ) {
+
+    //the following comes from STEPattribute::ShallowCopy
+    switch( NonRefType() ) {
+        case INTEGER_TYPE:
+            *ptr.i = *( a.ptr.i );
+            break;
+
+        case BINARY_TYPE:
+            *( ptr.b ) = *( a.ptr.b );
+            break;
+
+        case STRING_TYPE:
+            *( ptr.S ) = *( a.ptr.S );
+            break;
+
+        case REAL_TYPE:
+        case NUMBER_TYPE:
+            *ptr.r = *( a.ptr.r );
+            break;
+
+        case ENTITY_TYPE:
+            ptr.c = a.ptr.c; //NOTE may need to deep copy
+            break;
+
+        case AGGREGATE_TYPE:
+        case ARRAY_TYPE:      // DAS
+        case BAG_TYPE:        // DAS
+        case SET_TYPE:        // DAS
+        case LIST_TYPE:       // DAS
+            ptr.a = a.ptr.a; //NOTE may need to deep copy
+            break;
+
+        case SELECT_TYPE:
+            *ptr.sh = *( a.ptr.sh );
+            break;
+
+        case ENUM_TYPE:
+        case BOOLEAN_TYPE:
+        case LOGICAL_TYPE:
+            ptr.e->put( a.ptr.e->asInt() );
+            break;
+
+        default:
+            *ptr.u = *( a.ptr.u );
+            break;
+    }
+}
 
 ///  INTEGER
 STEPattribute::STEPattribute( const class AttrDescriptor & d, SDAI_Integer * p )
diff --git a/src/clstepcore/test/CMakeLists.txt b/src/clstepcore/test/CMakeLists.txt
@@ -19,4 +19,4 @@ function(add_stepcore_test name libs)
 endfunction(add_stepcore_test name libs)
 
 add_stepcore_test( "SupertypesIterator" "stepcore;steputils;stepeditor;stepdai;base" ) #all these libs are necessary?
-add_stepcore_test( "copy_assign_STEPattribute" "stepcore;steputils;stepeditor;stepdai;base" )
+add_stepcore_test( "operators_STEPattribute" "stepcore;steputils;stepeditor;stepdai;base" )
