improve comments, a few other small changes that don't affect behavior

mpictor · mpictor · commit b1387b731e13 · 2014-12-26T13:24:56.000-05:00
diff --git a/src/cllazyfile/lazyInstMgr.cc b/src/cllazyfile/lazyInstMgr.cc
@@ -47,8 +47,12 @@ void lazyInstMgr::addLazyInstance( namedLazyInstance inst ) {
     }
     _instanceTypes->insert( inst.name, inst.loc.instance );
     /* store 16 bits of section id and 48 of instance offset into one 64-bit int
-    * TODO: check and warn if anything is lost (in calling code?)
-    * does 32bit need anything special?
+    ** TODO: check and warn if anything is lost (in calling code?)
+    ** does 32bit need anything special?
+    **
+    ** create conversion class?
+    **  could then initialize conversion object with number of bits
+    **  also a good place to check for data loss
     */
     positionAndSection ps = inst.loc.section;
     ps <<= 48;
@@ -91,10 +95,9 @@ void lazyInstMgr::openFile( std::string fname ) {
 
 SDAI_Application_instance * lazyInstMgr::loadInstance( instanceID id ) {
     assert( _mainRegistry && "Main registry has not been initialized. Do so with initRegistry() or setRegistry()." );
-    SDAI_Application_instance * inst = 0;
     positionAndSection ps;
     sectionID sid;
-    inst = _instancesLoaded.find( id );
+    SDAI_Application_instance * inst = _instancesLoaded.find( id );
     instanceStreamPos_t::cvector * cv;
     if( !inst && 0 != ( cv = _instanceStreamPos.find( id ) ) ) {
         //FIXME _instanceStreamPos.find( id ) can return nonzero for nonexistent key?!
diff --git a/src/cllazyfile/lazyInstMgr.h b/src/cllazyfile/lazyInstMgr.h
@@ -22,11 +22,11 @@ class instMgrAdapter;
 
 class lazyInstMgr {
     protected:
-        /** map from instance number to instances that it refers to
+        /** multimap from instance number to instances that it refers to
          * \sa instanceRefs_pair
          */
         instanceRefs_t  _fwdInstanceRefs;
-        /** map from instance number to instances that refer to it
+        /** multimap from instance number to instances that refer to it
          * \sa instanceRefs_pair
          */
         instanceRefs_t _revInstanceRefs;
@@ -39,6 +39,8 @@ class lazyInstMgr {
 
         /** map from instance number to instance pointer (loaded instances only)
          * \sa instancesLoaded_pair
+         * TODO should be multimap to allow use of instances in multiple data sections?
+         * a unique instance ID (containing sectionID and instanceID) would also work
          */
         instancesLoaded_t _instancesLoaded;
 
@@ -65,7 +67,6 @@ class lazyInstMgr {
     public:
         lazyInstMgr();
         ~lazyInstMgr();
-        void addSchema( void ( *initFn )() ); //?
         void openFile( std::string fname );
 
         void addLazyInstance( namedLazyInstance inst );
@@ -174,20 +175,25 @@ class lazyInstMgr {
         }
 
         // TODO implement these
-             //list all instances that one instance depends on (recursive)
-             //std::vector<instanceID> instanceDependencies( instanceID id ); //set is faster?
 
-        // TODO implement these
-             /* * the opposite of instanceDependencies() - all instances that are *not* dependencies of one particular instance
+            // add another schema to registry
+            //void addSchema( void ( *initFn )() );
+
+            //list all instances that one instance depends on (recursive)
+            //std::vector<instanceID> instanceDependencies( instanceID id ); //set is faster?
+
+            /* * the opposite of instanceDependencies() - all instances that are *not* dependencies of one particular instance
                  same as above, but with list of instances */
-             //std::vector<instanceID> notDependencies(...)
-
-             //renumber instances so that they are numbered 1..N where N is the total number of instances
-             //void normalizeInstanceIds();
-             //find data that is repeated and eliminate, if possible
-             //void eliminateDuplicates();
-             //tell instMgr to use instances from this section
-             //void useDataSection( sectionID id );
+            //std::vector<instanceID> notDependencies(...)
+
+            //renumber instances so that they are numbered 1..N where N is the total number of instances
+            //void normalizeInstanceIds();
+
+            //find data that is repeated and eliminate, if possible
+            //void eliminateDuplicates();
+
+            //tell instMgr to use instances from this section
+            //void useDataSection( sectionID id );
 
         // TODO support references from one file to another
 };
diff --git a/test/cpp/schema_specific/inverse_attr2.cc b/test/cpp/schema_specific/inverse_attr2.cc
@@ -1,4 +1,4 @@
-/** \file inverse_attr.cc
+/** \file inverse_attr2.cc
 ** 1-Jul-2012
 ** Test inverse attributes; uses a tiny schema similar to a subset of IFC2x3
 **
diff --git a/test/cpp/schema_specific/inverse_attr3.cc b/test/cpp/schema_specific/inverse_attr3.cc
@@ -6,7 +6,6 @@
  */
 #include <sc_cf.h>
 extern void SchemaInit( class Registry & );
-#include "sc_version_string.h"
 #include <lazyInstMgr.h>
 #include <lazyRefs.h>
 #include <sdai.h>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/** \file inverse_attr.cc`
	`1`	`+/** \file inverse_attr2.cc`
`2`	`2`	`** 1-Jul-2012`
`3`	`3`	`** Test inverse attributes; uses a tiny schema similar to a subset of IFC2x3`
`4`	`4`	`**`