remove helper function header - code moved to headers for individual types/entities

mpictor · mpictor · commit a7579f0bc977 · 2014-02-28T22:02:07.000-05:00
diff --git a/cmake/schema_scanner/schemaScanner.cc b/cmake/schema_scanner/schemaScanner.cc
@@ -115,7 +115,7 @@ string makeShortName( const char * longName ) {
     if( strlen( longName ) < filename.size() ) {
         filename = longName;
     }
-    filename.insert( 0, "Sdai_" );
+    filename.insert( 0, "sdai_" );
     return filename;
 }
 
@@ -164,7 +164,6 @@ void writeLists( const char * schemaName, stringstream & eh, stringstream & ei,
 
     cmLists << "set( " << shortName << "_misc_hdrs" << endl;
     cmLists << "     Sdaiclasses.h   schema.h" << endl;
-    cmLists << "     Sdai" << schema_upper << "Helpers.h" << endl;
     cmLists << "     Sdai" << schema_upper << "Names.h" << endl;
     cmLists << "     Sdai" << schema_upper << ".h" << endl;
     cmLists << "   )" << endl << endl;
diff --git a/src/exp2cxx/classes.h b/src/exp2cxx/classes.h
@@ -67,8 +67,6 @@ typedef  struct file_holder  {
                                 *    Nec. if ent1 of schemaA has attribute ent2 from schemaB.
                                 */
     FILE * names;               /**< MAP Nov 2011 - header with namespace for entity and attr descriptors */
-    FILE * helpers;             /**< MAP Mar 2012 - header with inline helper functions. Currently only used for
-                                     helper functions to find runtime aggregate bounds */
 }  File_holder, FILES;
 
 /**  these fields are used so that ENTITY types are processed in order
diff --git a/src/exp2cxx/classes_wrapper.cc b/src/exp2cxx/classes_wrapper.cc
@@ -448,7 +448,6 @@ void SCHEMAprint( Schema schema, FILES * files, void * complexCol,
 #endif
         fprintf( initfile, "#include <Registry.h>\n#include <string>\n" );
         fprintf( initfile, "#include <sc_memmgr.h>\n" );
-        fprintf( files->init, "\n#include \"%sHelpers.h\"\n", schnm );
 
         fprintf( initfile, "\nvoid %sInit (Registry& reg) {\n", schnm );
 
@@ -497,15 +496,6 @@ void SCHEMAprint( Schema schema, FILES * files, void * complexCol,
         initfile = files->init = fopen( fnm, "a" );
     }
 
-    // 5. header containing inline helper functions (for runtime aggregate bounds, possibly other uses)
-    sprintf( fnm, "%sHelpers.h", schnm );
-    if( !( files->helpers = FILEcreate( fnm ) ) ) {
-        return;
-    }
-    fprintf( files->helpers, "\n// In the exp2cxx source code, this file is referred to as files->helpers.\n// This line printed at %s:%d (one of two possible locations).\n\n", __FILE__, __LINE__ );
-    fprintf( files->helpers, "//this file contains inline helper functions (for runtime aggregate bounds, possibly other uses)\n\n" );
-
-
     /**********  record in files relating to entire input   ***********/
 
     /*  add to schema's include and initialization file */
@@ -533,7 +523,6 @@ void SCHEMAprint( Schema schema, FILES * files, void * complexCol,
     } else {
         fclose( initfile );
     }
-    FILEclose( files->helpers );
 }
 
 /** ****************************************************************
@@ -650,18 +639,8 @@ EXPRESSPrint( Express express, ComplexCollect & col, FILES * files ) {
     fprintf( files->init, "\n// in the exp2cxx source code, this file is generally referred to as files->init or initfile\n" );
 
     fprintf( initfile, "#include \"%s.h\"\n\n", schnm );
-    fprintf( files->init, "\n#include \"%sHelpers.h\"\n", schnm );
     fprintf( initfile, "void \n%sInit (Registry& reg)\n{\n", schnm );
 
-    // 5. header containing inline helper functions (for runtime aggregate bounds, possibly other uses)
-    sprintf( fnm, "%sHelpers.h", schnm );
-    if( !( files->helpers = FILEcreate( fnm ) ) ) {
-        return;
-    }
-    fprintf( files->helpers, "\n// In the exp2cxx source code, this file is referred to as files->helpers.\n// This line printed at %s:%d (one of two possible locations).\n\n", __FILE__, __LINE__ );
-    fprintf( files->helpers, "//this file contains inline helper functions (for runtime aggregate bounds, possibly other uses)\n\n" );
-
-
     /**********  record in files relating to entire input   ***********/
 
     /*  add to schema's include and initialization file */

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ string makeShortName( const char * longName ) {`
`115`	`115`	`if( strlen( longName ) < filename.size() ) {`
`116`	`116`	`filename = longName;`
`117`	`117`	`}`
`118`		`- filename.insert( 0, "Sdai_" );`
	`118`	`+ filename.insert( 0, "sdai_" );`
`119`	`119`	`return filename;`
`120`	`120`	`}`
`121`	`121`
`@@ -164,7 +164,6 @@ void writeLists( const char * schemaName, stringstream & eh, stringstream & ei,`
`164`	`164`
`165`	`165`	`cmLists << "set( " << shortName << "_misc_hdrs" << endl;`
`166`	`166`	`cmLists << " Sdaiclasses.h schema.h" << endl;`
`167`		`- cmLists << " Sdai" << schema_upper << "Helpers.h" << endl;`
`168`	`167`	`cmLists << " Sdai" << schema_upper << "Names.h" << endl;`
`169`	`168`	`cmLists << " Sdai" << schema_upper << ".h" << endl;`
`170`	`169`	`cmLists << " )" << endl << endl;`