From 33102ee9e346d9b137290cbc75da8fc1d606d04a Mon Sep 17 00:00:00 2001 From: Clifford Yapp <238416+starseeker@users.noreply.github.com> Date: Sun, 2 Oct 2022 08:39:18 -0400 Subject: [PATCH 01/23] First steps of resituating stepcode headers Goal is for client codes to be able to simply include the stepcode direcotry and have everything work, rather than having to worry about individual step libraries. Will also make it clear with the dir prefixes when libraries are using .h files from other libraries, rather than their own. --- include/core/CMakeLists.txt | 71 +++++++++++++++++++ .../core}/aggrTypeDescriptor.h | 0 .../core}/attrDescriptor.h | 0 .../core}/attrDescriptorList.h | 0 src/cldai/CMakeLists.txt | 1 + src/cleditor/CMakeLists.txt | 1 + src/cllazyfile/CMakeLists.txt | 1 + src/clstepcore/CMakeLists.txt | 4 +- src/clstepcore/ExpDict.h | 6 +- src/clstepcore/aggrTypeDescriptor.cc | 2 +- src/clstepcore/attrDescriptor.cc | 2 +- src/clstepcore/attrDescriptorList.cc | 4 +- src/clstepcore/derivedAttribute.h | 2 +- src/clstepcore/entityDescriptor.cc | 2 +- src/clstepcore/entityDescriptor.h | 4 +- src/clstepcore/inverseAttribute.h | 2 +- src/clutils/CMakeLists.txt | 1 + 17 files changed, 88 insertions(+), 15 deletions(-) create mode 100644 include/core/CMakeLists.txt rename {src/clstepcore => include/core}/aggrTypeDescriptor.h (100%) rename {src/clstepcore => include/core}/attrDescriptor.h (100%) rename {src/clstepcore => include/core}/attrDescriptorList.h (100%) diff --git a/include/core/CMakeLists.txt b/include/core/CMakeLists.txt new file mode 100644 index 000000000..4129130a0 --- /dev/null +++ b/include/core/CMakeLists.txt @@ -0,0 +1,71 @@ +set(CORE_HDRS + aggrTypeDescriptor.h + attrDescriptor.h + attrDescriptorList.h +# baseType.h +# complexSupport.h +# create_Aggr.h +# derivedAttribute.h +# dictSchema.h +# dictdefs.h +# dictionaryInstance.h +# dispnode.h +# dispnodelist.h +# entityDescriptor.h +# entityDescriptorList.h +# enumTypeDescriptor.h +# ExpDict.h +# explicitItemId.h +# globalRule.h +# implicitItemId.h +# instmgr.h +# interfaceSpec.h +# interfacedItem.h +# inverseAttribute.h +# inverseAttributeList.h +# mgrnode.h +# mgrnodearray.h +# mgrnodelist.h +# needFunc.h +# read_func.h +# realTypeDescriptor.h +# Registry.h +# schRename.h +# sdai.h +# sdaiApplication_instance.h +# sdaiSelect.h +# selectTypeDescriptor.h +# SingleLinkList.h +# STEPaggregate.h +# STEPaggrBinary.h +# STEPaggrEntity.h +# STEPaggrEnum.h +# STEPaggrGeneric.h +# STEPaggrInt.h +# STEPaggrReal.h +# STEPaggrSelect.h +# STEPaggrString.h +# STEPattribute.h +# STEPattributeList.h +# STEPcomplex.h +# STEPinvAttrList.h +# STEPundefined.h +# stringTypeDescriptor.h +# SubSuperIterators.h +# typeDescriptor.h +# typeDescriptorList.h +# typeOrRuleVar.h +# uniquenessRule.h +# whereRule.h +) + +install(FILES ${CORE_HDRS} + DESTINATION ${INCLUDE_DIR}/stepcode/core) + +# Local Variables: +# tab-width: 8 +# mode: cmake +# indent-tabs-mode: t +# End: +# ex: shiftwidth=2 tabstop=8 + diff --git a/src/clstepcore/aggrTypeDescriptor.h b/include/core/aggrTypeDescriptor.h similarity index 100% rename from src/clstepcore/aggrTypeDescriptor.h rename to include/core/aggrTypeDescriptor.h diff --git a/src/clstepcore/attrDescriptor.h b/include/core/attrDescriptor.h similarity index 100% rename from src/clstepcore/attrDescriptor.h rename to include/core/attrDescriptor.h diff --git a/src/clstepcore/attrDescriptorList.h b/include/core/attrDescriptorList.h similarity index 100% rename from src/clstepcore/attrDescriptorList.h rename to include/core/attrDescriptorList.h diff --git a/src/cldai/CMakeLists.txt b/src/cldai/CMakeLists.txt index b34b5f161..9d8616f1c 100644 --- a/src/cldai/CMakeLists.txt +++ b/src/cldai/CMakeLists.txt @@ -29,6 +29,7 @@ SET(SC_CLDAI_HDRS include_directories( ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/include/stepcode ${SC_SOURCE_DIR}/src/clstepcore ${SC_SOURCE_DIR}/src/clutils ) diff --git a/src/cleditor/CMakeLists.txt b/src/cleditor/CMakeLists.txt index 2e2ec980d..75340aa3c 100644 --- a/src/cleditor/CMakeLists.txt +++ b/src/cleditor/CMakeLists.txt @@ -21,6 +21,7 @@ SET(SC_CLEDITOR_HDRS include_directories( ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/include/stepcode ${SC_SOURCE_DIR}/src/cldai ${SC_SOURCE_DIR}/src/clstepcore ${SC_SOURCE_DIR}/src/clutils diff --git a/src/cllazyfile/CMakeLists.txt b/src/cllazyfile/CMakeLists.txt index d9646b74d..392f56fdc 100644 --- a/src/cllazyfile/CMakeLists.txt +++ b/src/cllazyfile/CMakeLists.txt @@ -29,6 +29,7 @@ set( SC_CLLAZYFILE_HDRS include_directories( ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/include/stepcode ${SC_SOURCE_DIR}/src/cleditor ${SC_SOURCE_DIR}/src/cldai ${SC_SOURCE_DIR}/src/clstepcore diff --git a/src/clstepcore/CMakeLists.txt b/src/clstepcore/CMakeLists.txt index 67132ee45..845c37677 100644 --- a/src/clstepcore/CMakeLists.txt +++ b/src/clstepcore/CMakeLists.txt @@ -63,9 +63,6 @@ set(LIBSTEPCORE_SRCS ) set(SC_CLSTEPCORE_HDRS - aggrTypeDescriptor.h - attrDescriptor.h - attrDescriptorList.h baseType.h complexSupport.h create_Aggr.h @@ -125,6 +122,7 @@ set(SC_CLSTEPCORE_HDRS include_directories( ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/include/stepcode ${SC_SOURCE_DIR}/src/cldai ${SC_SOURCE_DIR}/src/cleditor ${SC_SOURCE_DIR}/src/clutils diff --git a/src/clstepcore/ExpDict.h b/src/clstepcore/ExpDict.h index e73b8dd01..f59ca5fe4 100644 --- a/src/clstepcore/ExpDict.h +++ b/src/clstepcore/ExpDict.h @@ -28,7 +28,7 @@ #include // each of these contains linked list, list node, iterator -#include "attrDescriptorList.h" +#include "core/attrDescriptorList.h" #include "inverseAttributeList.h" #include "typeDescriptorList.h" #include "entityDescriptorList.h" @@ -37,7 +37,7 @@ #include "typeDescriptor.h" #include "entityDescriptor.h" #include "enumTypeDescriptor.h" -#include "attrDescriptor.h" +#include "core/attrDescriptor.h" #include "derivedAttribute.h" #include "inverseAttribute.h" @@ -56,7 +56,7 @@ #include "dictSchema.h" #include "schRename.h" -#include "aggrTypeDescriptor.h" +#include "core/aggrTypeDescriptor.h" #include "selectTypeDescriptor.h" #include "stringTypeDescriptor.h" #include "realTypeDescriptor.h" diff --git a/src/clstepcore/aggrTypeDescriptor.cc b/src/clstepcore/aggrTypeDescriptor.cc index 91bed40be..e1e87a78c 100644 --- a/src/clstepcore/aggrTypeDescriptor.cc +++ b/src/clstepcore/aggrTypeDescriptor.cc @@ -1,4 +1,4 @@ -#include "aggrTypeDescriptor.h" +#include "core/aggrTypeDescriptor.h" STEPaggregate * AggrTypeDescriptor::CreateAggregate() { if( CreateNewAggr ) { diff --git a/src/clstepcore/attrDescriptor.cc b/src/clstepcore/attrDescriptor.cc index 329d90393..2ce5e74e1 100644 --- a/src/clstepcore/attrDescriptor.cc +++ b/src/clstepcore/attrDescriptor.cc @@ -1,4 +1,4 @@ -#include "attrDescriptor.h" +#include "core/attrDescriptor.h" AttrDescriptor::AttrDescriptor( const char * name, const TypeDescriptor * domainType, Logical optional, Logical unique, AttrType_Enum at, diff --git a/src/clstepcore/attrDescriptorList.cc b/src/clstepcore/attrDescriptorList.cc index c197ac5e2..987f34243 100644 --- a/src/clstepcore/attrDescriptorList.cc +++ b/src/clstepcore/attrDescriptorList.cc @@ -1,6 +1,6 @@ -#include "attrDescriptorList.h" +#include "core/attrDescriptorList.h" -#include "attrDescriptor.h" +#include "core/attrDescriptor.h" AttrDescriptorList::AttrDescriptorList() { } diff --git a/src/clstepcore/derivedAttribute.h b/src/clstepcore/derivedAttribute.h index 234521a07..a882b0448 100644 --- a/src/clstepcore/derivedAttribute.h +++ b/src/clstepcore/derivedAttribute.h @@ -1,7 +1,7 @@ #ifndef DERIVEDATTRIBUTE_H #define DERIVEDATTRIBUTE_H -#include "attrDescriptor.h" +#include "core/attrDescriptor.h" #include "sc_export.h" diff --git a/src/clstepcore/entityDescriptor.cc b/src/clstepcore/entityDescriptor.cc index 0e58c4db6..f8fb6a2d0 100644 --- a/src/clstepcore/entityDescriptor.cc +++ b/src/clstepcore/entityDescriptor.cc @@ -2,7 +2,7 @@ #include "entityDescriptor.h" #include "Registry.h" -#include "attrDescriptor.h" +#include "core/attrDescriptor.h" #include "inverseAttribute.h" #include "SubSuperIterators.h" diff --git a/src/clstepcore/entityDescriptor.h b/src/clstepcore/entityDescriptor.h index e0bd25ec8..2e85e7a66 100644 --- a/src/clstepcore/entityDescriptor.h +++ b/src/clstepcore/entityDescriptor.h @@ -2,9 +2,9 @@ #define ENTITYDESCRIPTOR_H #include "typeDescriptor.h" -#include "attrDescriptor.h" +#include "core/attrDescriptor.h" #include "uniquenessRule.h" -#include "attrDescriptorList.h" +#include "core/attrDescriptorList.h" #include "inverseAttributeList.h" #include "sc_export.h" diff --git a/src/clstepcore/inverseAttribute.h b/src/clstepcore/inverseAttribute.h index 0d02b793d..368eaa67f 100644 --- a/src/clstepcore/inverseAttribute.h +++ b/src/clstepcore/inverseAttribute.h @@ -1,7 +1,7 @@ #ifndef INVERSEATTRIBUTE_H #define INVERSEATTRIBUTE_H -#include "attrDescriptor.h" +#include "core/attrDescriptor.h" class SC_CORE_EXPORT Inverse_attribute : public AttrDescriptor { diff --git a/src/clutils/CMakeLists.txt b/src/clutils/CMakeLists.txt index 427ecb43d..69f2f935d 100644 --- a/src/clutils/CMakeLists.txt +++ b/src/clutils/CMakeLists.txt @@ -22,6 +22,7 @@ set(SC_CLUTILS_HDRS include_directories( ${SC_BINARY_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/include/stepcode ) if(BUILD_SHARED_LIBS) From 840d57c2f18f45c3b601363c4d48f70c0a183af3 Mon Sep 17 00:00:00 2001 From: Clifford Yapp <238416+starseeker@users.noreply.github.com> Date: Sun, 2 Oct 2022 09:03:31 -0400 Subject: [PATCH 02/23] Move a few more headers --- include/core/CMakeLists.txt | 6 +++--- include/core/aggrTypeDescriptor.h | 2 +- {src/clstepcore => include/core}/baseType.h | 0 {src/clstepcore => include/core}/complexSupport.h | 0 {src/clstepcore => include/core}/create_Aggr.h | 0 src/cleditor/SdaiSchemaInit.h | 2 +- src/clstepcore/CMakeLists.txt | 3 --- src/clstepcore/ExpDict.h | 4 ++-- src/clstepcore/Registry.h | 2 +- src/clstepcore/STEPaggregate.h | 2 +- src/clstepcore/STEPattribute.h | 2 +- src/clstepcore/STEPcomplex.cc | 2 +- src/clstepcore/STEPcomplex.h | 2 +- src/clstepcore/collect.cc | 2 +- src/clstepcore/complexlist.cc | 2 +- src/clstepcore/create_Aggr.cc | 2 +- src/clstepcore/entlist.cc | 2 +- src/clstepcore/entnode.cc | 2 +- src/clstepcore/match-ors.cc | 2 +- src/clstepcore/multlist.cc | 2 +- src/clstepcore/non-ors.cc | 2 +- src/clstepcore/orlist.cc | 2 +- src/clstepcore/print.cc | 2 +- src/clstepcore/sdai.h | 2 +- src/clstepcore/test/test_operators_SDAI_Select.cc | 2 +- src/clstepcore/trynext.cc | 2 +- src/exp2cxx/multpass.c | 2 +- src/exp2cxx/write.cc | 4 ++-- src/exp2python/src/multpass_python.c | 2 +- src/test/scl2html/scl2html.cc | 2 +- 30 files changed, 30 insertions(+), 33 deletions(-) rename {src/clstepcore => include/core}/baseType.h (100%) rename {src/clstepcore => include/core}/complexSupport.h (100%) rename {src/clstepcore => include/core}/create_Aggr.h (100%) diff --git a/include/core/CMakeLists.txt b/include/core/CMakeLists.txt index 4129130a0..ade73c57e 100644 --- a/include/core/CMakeLists.txt +++ b/include/core/CMakeLists.txt @@ -2,9 +2,9 @@ set(CORE_HDRS aggrTypeDescriptor.h attrDescriptor.h attrDescriptorList.h -# baseType.h -# complexSupport.h -# create_Aggr.h + baseType.h + complexSupport.h + create_Aggr.h # derivedAttribute.h # dictSchema.h # dictdefs.h diff --git a/include/core/aggrTypeDescriptor.h b/include/core/aggrTypeDescriptor.h index 44282bb6c..3a08d56eb 100644 --- a/include/core/aggrTypeDescriptor.h +++ b/include/core/aggrTypeDescriptor.h @@ -2,7 +2,7 @@ #define AGGRTYPEDESCRIPTOR_H #include "typeDescriptor.h" -#include "create_Aggr.h" +#include "core/create_Aggr.h" #include "assert.h" diff --git a/src/clstepcore/baseType.h b/include/core/baseType.h similarity index 100% rename from src/clstepcore/baseType.h rename to include/core/baseType.h diff --git a/src/clstepcore/complexSupport.h b/include/core/complexSupport.h similarity index 100% rename from src/clstepcore/complexSupport.h rename to include/core/complexSupport.h diff --git a/src/clstepcore/create_Aggr.h b/include/core/create_Aggr.h similarity index 100% rename from src/clstepcore/create_Aggr.h rename to include/core/create_Aggr.h diff --git a/src/cleditor/SdaiSchemaInit.h b/src/cleditor/SdaiSchemaInit.h index a0868fbc6..256ef7356 100644 --- a/src/cleditor/SdaiSchemaInit.h +++ b/src/cleditor/SdaiSchemaInit.h @@ -15,7 +15,7 @@ #include #include #include -#include +#include "core/complexSupport.h" #include #include diff --git a/src/clstepcore/CMakeLists.txt b/src/clstepcore/CMakeLists.txt index 845c37677..bb1fb7850 100644 --- a/src/clstepcore/CMakeLists.txt +++ b/src/clstepcore/CMakeLists.txt @@ -63,9 +63,6 @@ set(LIBSTEPCORE_SRCS ) set(SC_CLSTEPCORE_HDRS - baseType.h - complexSupport.h - create_Aggr.h derivedAttribute.h dictSchema.h dictdefs.h diff --git a/src/clstepcore/ExpDict.h b/src/clstepcore/ExpDict.h index f59ca5fe4..b187ad762 100644 --- a/src/clstepcore/ExpDict.h +++ b/src/clstepcore/ExpDict.h @@ -23,7 +23,7 @@ #include -#include +#include "core/baseType.h" #include #include @@ -41,7 +41,7 @@ #include "derivedAttribute.h" #include "inverseAttribute.h" -#include "create_Aggr.h" +#include "core/create_Aggr.h" #include "dictionaryInstance.h" #include "uniquenessRule.h" diff --git a/src/clstepcore/Registry.h b/src/clstepcore/Registry.h index d4d4d4db0..d340bdd01 100644 --- a/src/clstepcore/Registry.h +++ b/src/clstepcore/Registry.h @@ -17,7 +17,7 @@ #include #include #include -#include +#include "core/complexSupport.h" // defined and created in Registry.cc diff --git a/src/clstepcore/STEPaggregate.h b/src/clstepcore/STEPaggregate.h index df2178ee9..1b9f52193 100644 --- a/src/clstepcore/STEPaggregate.h +++ b/src/clstepcore/STEPaggregate.h @@ -19,7 +19,7 @@ class TypeDescriptor; #include #include #include -#include +#include "core/baseType.h" #include #include #include diff --git a/src/clstepcore/STEPattribute.h b/src/clstepcore/STEPattribute.h index 47b99e025..61fbeaf71 100644 --- a/src/clstepcore/STEPattribute.h +++ b/src/clstepcore/STEPattribute.h @@ -16,7 +16,7 @@ #include #include #include -#include +#include "core/baseType.h" #include diff --git a/src/clstepcore/STEPcomplex.cc b/src/clstepcore/STEPcomplex.cc index 13d67267e..f4576a20b 100644 --- a/src/clstepcore/STEPcomplex.cc +++ b/src/clstepcore/STEPcomplex.cc @@ -2,7 +2,7 @@ #include #include -#include +#include "core/complexSupport.h" #include #include #include diff --git a/src/clstepcore/STEPcomplex.h b/src/clstepcore/STEPcomplex.h index caf7ea255..f190ea7d7 100644 --- a/src/clstepcore/STEPcomplex.h +++ b/src/clstepcore/STEPcomplex.h @@ -4,7 +4,7 @@ #include #include #include -#include +#include "core/baseType.h" #include #include diff --git a/src/clstepcore/collect.cc b/src/clstepcore/collect.cc index 6f5ae75dc..255036c6a 100644 --- a/src/clstepcore/collect.cc +++ b/src/clstepcore/collect.cc @@ -11,7 +11,7 @@ * Date: 11/14/96 * *****************************************************************************/ -#include "complexSupport.h" +#include "core/complexSupport.h" /** * Inserts a new ComplexList to our list. The ComplexLists are ordered by diff --git a/src/clstepcore/complexlist.cc b/src/clstepcore/complexlist.cc index 92dfecb1f..6d2df417b 100644 --- a/src/clstepcore/complexlist.cc +++ b/src/clstepcore/complexlist.cc @@ -10,7 +10,7 @@ * Date: 01/07/97 * *****************************************************************************/ -#include "complexSupport.h" +#include "core/complexSupport.h" /** * Destructor for ComplexList. diff --git a/src/clstepcore/create_Aggr.cc b/src/clstepcore/create_Aggr.cc index 72f6adb53..7bb13257d 100644 --- a/src/clstepcore/create_Aggr.cc +++ b/src/clstepcore/create_Aggr.cc @@ -1,4 +1,4 @@ -#include "create_Aggr.h" +#include "core/create_Aggr.h" #include EnumAggregate * create_EnumAggregate() { diff --git a/src/clstepcore/entlist.cc b/src/clstepcore/entlist.cc index 8b4cf98f0..086f3bd76 100644 --- a/src/clstepcore/entlist.cc +++ b/src/clstepcore/entlist.cc @@ -13,7 +13,7 @@ * Date: 9/18/96 * *****************************************************************************/ -#include "complexSupport.h" +#include "core/complexSupport.h" /** * Returns the number of EntLists in this's list (EntList->next, next->next diff --git a/src/clstepcore/entnode.cc b/src/clstepcore/entnode.cc index 81c05a6eb..0d594c993 100644 --- a/src/clstepcore/entnode.cc +++ b/src/clstepcore/entnode.cc @@ -11,7 +11,7 @@ * Date: 9/18/96 * *****************************************************************************/ -#include "complexSupport.h" +#include "core/complexSupport.h" /** * Given a list of entity names, creates a sorted linked list of EntNodes diff --git a/src/clstepcore/match-ors.cc b/src/clstepcore/match-ors.cc index 915c95620..2a97254ab 100644 --- a/src/clstepcore/match-ors.cc +++ b/src/clstepcore/match-ors.cc @@ -13,7 +13,7 @@ * Date: 10/17/96 * *****************************************************************************/ -#include "complexSupport.h" +#include "core/complexSupport.h" /** * Loops through descendants of this, invoking their matchOR functions. diff --git a/src/clstepcore/multlist.cc b/src/clstepcore/multlist.cc index f82dba642..9e30e5ab1 100644 --- a/src/clstepcore/multlist.cc +++ b/src/clstepcore/multlist.cc @@ -13,7 +13,7 @@ * Date: 9/18/96 * *****************************************************************************/ -#include "complexSupport.h" +#include "core/complexSupport.h" /** * Deletes the childList of this, before this is deleted. diff --git a/src/clstepcore/non-ors.cc b/src/clstepcore/non-ors.cc index addc49522..78c3c5fe6 100644 --- a/src/clstepcore/non-ors.cc +++ b/src/clstepcore/non-ors.cc @@ -10,7 +10,7 @@ * Date: 10/17/96 * *****************************************************************************/ -#include "complexSupport.h" +#include "core/complexSupport.h" /** * Checks if we match the nodes of ents. If only one unmarked is left diff --git a/src/clstepcore/orlist.cc b/src/clstepcore/orlist.cc index c829e4ae6..6e58242eb 100644 --- a/src/clstepcore/orlist.cc +++ b/src/clstepcore/orlist.cc @@ -10,7 +10,7 @@ * Date: 9/18/96 * *****************************************************************************/ -#include "complexSupport.h" +#include "core/complexSupport.h" /** * Check if we matched nm. We have two possibilities here: If we have a diff --git a/src/clstepcore/print.cc b/src/clstepcore/print.cc index bd7ad8b7b..b30643b06 100644 --- a/src/clstepcore/print.cc +++ b/src/clstepcore/print.cc @@ -7,7 +7,7 @@ * Date: 10/31/96 * *****************************************************************************/ -#include "complexSupport.h" +#include "core/complexSupport.h" // Local function prototypes: static char * joinText( JoinType, char * ); diff --git a/src/clstepcore/sdai.h b/src/clstepcore/sdai.h index 46ae3996b..065cf42c3 100644 --- a/src/clstepcore/sdai.h +++ b/src/clstepcore/sdai.h @@ -29,7 +29,7 @@ extern const char * SCLversion; #include "dictdefs.h" -#include "baseType.h" +#include "core/baseType.h" #include "Str.h" #include "errordesc.h" diff --git a/src/clstepcore/test/test_operators_SDAI_Select.cc b/src/clstepcore/test/test_operators_SDAI_Select.cc index fcb6cde4d..2d89a0a75 100644 --- a/src/clstepcore/test/test_operators_SDAI_Select.cc +++ b/src/clstepcore/test/test_operators_SDAI_Select.cc @@ -7,7 +7,7 @@ #include #include "ExpDict.h" -#include "baseType.h" +#include "core/baseType.h" #include "sdaiSelect.h" using namespace std; diff --git a/src/clstepcore/trynext.cc b/src/clstepcore/trynext.cc index 3554cd378..4b9571a20 100644 --- a/src/clstepcore/trynext.cc +++ b/src/clstepcore/trynext.cc @@ -11,7 +11,7 @@ * Date: 10/24/96 * *****************************************************************************/ -#include "complexSupport.h" +#include "core/complexSupport.h" // Local function prototypes: static EntList * firstCandidate( EntList * ); diff --git a/src/exp2cxx/multpass.c b/src/exp2cxx/multpass.c index fbba2b271..50adf2eb1 100644 --- a/src/exp2cxx/multpass.c +++ b/src/exp2cxx/multpass.c @@ -159,7 +159,7 @@ void print_schemas_separate( Express express, void * complexCol, FILES * files ) // which hasn't been closed yet. (That's done on 2nd line below.)) */ fprintf( files->initall, " reg.SetCompCollect( gencomplex() );\n" ); fprintf( files->initall, "}\n\n" ); - fprintf( files->incall, "\n#include \n" ); + fprintf( files->incall, "\n#include \"core\/complexSupport.h\"\n" ); fprintf( files->incall, "ComplexCollect *gencomplex();\n" ); /* Function GetModelContents() is printed at the end of the schema.xx diff --git a/src/exp2cxx/write.cc b/src/exp2cxx/write.cc index d864b3476..1d73dc46a 100644 --- a/src/exp2cxx/write.cc +++ b/src/exp2cxx/write.cc @@ -116,7 +116,7 @@ static void writeheader( ostream & os, int noLists ) << " * file, however, there are no complex entities, so this\n" << " * function is a stub.\n" << " */" << endl << endl; - os << "#include \"complexSupport.h\"\n\n"; + os << "#include \"core/complexSupport.h\"\n\n"; os << "ComplexCollect *gencomplex()" << endl; os << "{" << endl; return; @@ -128,7 +128,7 @@ static void writeheader( ostream & os, int noLists ) << " * support structures. The structures will be used in the SCL to\n" << " * validate user requests to instantiate complex entities.\n" << " */" << endl << endl; - os << "#include \"complexSupport.h\"\n\n"; + os << "#include \"core/complexSupport.h\"\n\n"; os << "ComplexCollect *gencomplex()" << endl; os << " /*" << endl << " * This function contains instantiation statements for all the\n" diff --git a/src/exp2python/src/multpass_python.c b/src/exp2python/src/multpass_python.c index bbc8a6611..a4204c1c8 100644 --- a/src/exp2python/src/multpass_python.c +++ b/src/exp2python/src/multpass_python.c @@ -150,7 +150,7 @@ void print_schemas_separate( Express express, FILES * files ) // which hasn't been closed yet. (That's done on 2nd line below.)) * / //fprintf( files->initall, "\t reg.SetCompCollect( gencomplex() );\n" ); //fprintf( files->initall, "}\n\n" ); - //fprintf( files->incall, "\n#include \n" ); + //fprintf( files->incall, "\n#include \"core/complexSupport.h\"\n" ); //fprintf( files->incall, "ComplexCollect *gencomplex();\n" ); */ /* Function GetModelContents() is printed at the end of the schema.xx diff --git a/src/test/scl2html/scl2html.cc b/src/test/scl2html/scl2html.cc index f597b36e4..72160c7df 100644 --- a/src/test/scl2html/scl2html.cc +++ b/src/test/scl2html/scl2html.cc @@ -49,7 +49,7 @@ void PrintAttrTypeWithAnchor( const TypeDescriptor * typeDesc, ofstream & outhtml ) { std::string buf; - // The type. See src/clstepcore/baseType.h for info + // The type. See core/baseType.h for info PrimitiveType base = typeDesc->Type(); // the type descriptor for the "referent type," if any. From 8a7e0af3b5a0cbcedbc58f928b025294549a931c Mon Sep 17 00:00:00 2001 From: Clifford Yapp <238416+starseeker@users.noreply.github.com> Date: Sun, 2 Oct 2022 09:13:51 -0400 Subject: [PATCH 03/23] See if we can script some of the move process --- include/core/CMakeLists.txt | 2 +- {src/clstepcore => include/core}/derivedAttribute.h | 0 misc/header_mv.sh | 4 ++++ src/clstepcore/ExpDict.h | 2 +- src/clstepcore/derivedAttribute.cc | 2 +- 5 files changed, 7 insertions(+), 3 deletions(-) rename {src/clstepcore => include/core}/derivedAttribute.h (100%) create mode 100755 misc/header_mv.sh diff --git a/include/core/CMakeLists.txt b/include/core/CMakeLists.txt index ade73c57e..7089bfd88 100644 --- a/include/core/CMakeLists.txt +++ b/include/core/CMakeLists.txt @@ -5,7 +5,7 @@ set(CORE_HDRS baseType.h complexSupport.h create_Aggr.h -# derivedAttribute.h + derivedAttribute.h # dictSchema.h # dictdefs.h # dictionaryInstance.h diff --git a/src/clstepcore/derivedAttribute.h b/include/core/derivedAttribute.h similarity index 100% rename from src/clstepcore/derivedAttribute.h rename to include/core/derivedAttribute.h diff --git a/misc/header_mv.sh b/misc/header_mv.sh new file mode 100755 index 000000000..3a7690876 --- /dev/null +++ b/misc/header_mv.sh @@ -0,0 +1,4 @@ +#!/bin/bash +find . -type f -path "*/cl*" -not -path "*.git/*" -not -path "*/exp*" -regex '.*\(c\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include \"$1\"/include \"core\/$1\"/g" {} \; +find . -type f -path "*/cl*" -not -path "*.git/*" -not -path "*/exp*" -regex '.*\(c\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include <$1>/include \"core\/$1\"/g" {} \; + diff --git a/src/clstepcore/ExpDict.h b/src/clstepcore/ExpDict.h index b187ad762..7835ff341 100644 --- a/src/clstepcore/ExpDict.h +++ b/src/clstepcore/ExpDict.h @@ -38,7 +38,7 @@ #include "entityDescriptor.h" #include "enumTypeDescriptor.h" #include "core/attrDescriptor.h" -#include "derivedAttribute.h" +#include "core/derivedAttribute.h" #include "inverseAttribute.h" #include "core/create_Aggr.h" diff --git a/src/clstepcore/derivedAttribute.cc b/src/clstepcore/derivedAttribute.cc index 7fca3b16f..d361ca1be 100644 --- a/src/clstepcore/derivedAttribute.cc +++ b/src/clstepcore/derivedAttribute.cc @@ -1,4 +1,4 @@ -#include "derivedAttribute.h" +#include "core/derivedAttribute.h" Derived_attribute::Derived_attribute( const char * name, const TypeDescriptor * domainType, Logical optional, Logical unique, AttrType_Enum at, const EntityDescriptor & owner ) From 94c978359de09cb9b2a926e71b82ccc73997b136 Mon Sep 17 00:00:00 2001 From: Clifford Yapp <238416+starseeker@users.noreply.github.com> Date: Sun, 2 Oct 2022 09:20:21 -0400 Subject: [PATCH 04/23] Move d* headers in clstepcore --- include/core/CMakeLists.txt | 10 +++++----- {src/clstepcore => include/core}/dictSchema.h | 0 {src/clstepcore => include/core}/dictdefs.h | 0 {src/clstepcore => include/core}/dictionaryInstance.h | 0 {src/clstepcore => include/core}/dispnode.h | 0 {src/clstepcore => include/core}/dispnodelist.h | 2 +- src/cleditor/cmdmgr.h | 4 ++-- src/clstepcore/CMakeLists.txt | 6 ------ src/clstepcore/ExpDict.h | 6 +++--- src/clstepcore/dictSchema.cc | 2 +- src/clstepcore/dispnode.cc | 4 ++-- src/clstepcore/dispnodelist.cc | 4 ++-- src/clstepcore/globalRule.h | 2 +- src/clstepcore/instmgr.h | 4 ++-- src/clstepcore/interfaceSpec.h | 2 +- src/clstepcore/interfacedItem.h | 2 +- src/clstepcore/mgrnode.cc | 4 ++-- src/clstepcore/mgrnodelist.cc | 4 ++-- src/clstepcore/sdai.h | 2 +- src/clstepcore/typeDescriptor.h | 2 +- src/clstepcore/typeOrRuleVar.h | 2 +- src/clstepcore/uniquenessRule.h | 2 +- src/clstepcore/whereRule.h | 2 +- 23 files changed, 30 insertions(+), 36 deletions(-) rename {src/clstepcore => include/core}/dictSchema.h (100%) rename {src/clstepcore => include/core}/dictdefs.h (100%) rename {src/clstepcore => include/core}/dictionaryInstance.h (100%) rename {src/clstepcore => include/core}/dispnode.h (100%) rename {src/clstepcore => include/core}/dispnodelist.h (98%) diff --git a/include/core/CMakeLists.txt b/include/core/CMakeLists.txt index 7089bfd88..b41ebd4a4 100644 --- a/include/core/CMakeLists.txt +++ b/include/core/CMakeLists.txt @@ -6,11 +6,11 @@ set(CORE_HDRS complexSupport.h create_Aggr.h derivedAttribute.h -# dictSchema.h -# dictdefs.h -# dictionaryInstance.h -# dispnode.h -# dispnodelist.h + dictSchema.h + dictdefs.h + dictionaryInstance.h + dispnode.h + dispnodelist.h # entityDescriptor.h # entityDescriptorList.h # enumTypeDescriptor.h diff --git a/src/clstepcore/dictSchema.h b/include/core/dictSchema.h similarity index 100% rename from src/clstepcore/dictSchema.h rename to include/core/dictSchema.h diff --git a/src/clstepcore/dictdefs.h b/include/core/dictdefs.h similarity index 100% rename from src/clstepcore/dictdefs.h rename to include/core/dictdefs.h diff --git a/src/clstepcore/dictionaryInstance.h b/include/core/dictionaryInstance.h similarity index 100% rename from src/clstepcore/dictionaryInstance.h rename to include/core/dictionaryInstance.h diff --git a/src/clstepcore/dispnode.h b/include/core/dispnode.h similarity index 100% rename from src/clstepcore/dispnode.h rename to include/core/dispnode.h diff --git a/src/clstepcore/dispnodelist.h b/include/core/dispnodelist.h similarity index 98% rename from src/clstepcore/dispnodelist.h rename to include/core/dispnodelist.h index c4fe4dde3..c67dcfd11 100644 --- a/src/clstepcore/dispnodelist.h +++ b/include/core/dispnodelist.h @@ -21,7 +21,7 @@ //#include #include #include -#include +#include "core/dispnode.h" #include /////////////////////////////////////////////////////////////////////////////// diff --git a/src/cleditor/cmdmgr.h b/src/cleditor/cmdmgr.h index c9c45b404..41c37f2e6 100644 --- a/src/cleditor/cmdmgr.h +++ b/src/cleditor/cmdmgr.h @@ -20,8 +20,8 @@ #include #include #include -#include -#include +#include "core/dispnode.h" +#include "core/dispnodelist.h" #include //#define NUM_CMDMGR_CMDS 9 diff --git a/src/clstepcore/CMakeLists.txt b/src/clstepcore/CMakeLists.txt index bb1fb7850..e97911dd5 100644 --- a/src/clstepcore/CMakeLists.txt +++ b/src/clstepcore/CMakeLists.txt @@ -63,12 +63,6 @@ set(LIBSTEPCORE_SRCS ) set(SC_CLSTEPCORE_HDRS - derivedAttribute.h - dictSchema.h - dictdefs.h - dictionaryInstance.h - dispnode.h - dispnodelist.h entityDescriptor.h entityDescriptorList.h enumTypeDescriptor.h diff --git a/src/clstepcore/ExpDict.h b/src/clstepcore/ExpDict.h index 7835ff341..7974b93fb 100644 --- a/src/clstepcore/ExpDict.h +++ b/src/clstepcore/ExpDict.h @@ -24,7 +24,7 @@ #include #include "core/baseType.h" -#include +#include "core/dictdefs.h" #include // each of these contains linked list, list node, iterator @@ -42,7 +42,7 @@ #include "inverseAttribute.h" #include "core/create_Aggr.h" -#include "dictionaryInstance.h" +#include "core/dictionaryInstance.h" #include "uniquenessRule.h" #include "whereRule.h" @@ -53,7 +53,7 @@ #include "interfaceSpec.h" #include "typeOrRuleVar.h" #include "globalRule.h" -#include "dictSchema.h" +#include "core/dictSchema.h" #include "schRename.h" #include "core/aggrTypeDescriptor.h" diff --git a/src/clstepcore/dictSchema.cc b/src/clstepcore/dictSchema.cc index 11170d4df..3b3b7e494 100644 --- a/src/clstepcore/dictSchema.cc +++ b/src/clstepcore/dictSchema.cc @@ -1,4 +1,4 @@ -#include "dictSchema.h" +#include "core/dictSchema.h" #include "typeDescriptor.h" #include "entityDescriptor.h" diff --git a/src/clstepcore/dispnode.cc b/src/clstepcore/dispnode.cc index 3756143bc..6950a0e6e 100644 --- a/src/clstepcore/dispnode.cc +++ b/src/clstepcore/dispnode.cc @@ -16,8 +16,8 @@ #include //#include -#include -#include +#include "core/dispnode.h" +#include "core/dispnodelist.h" // define this to be the name of the display object class StepEntityEditor; diff --git a/src/clstepcore/dispnodelist.cc b/src/clstepcore/dispnodelist.cc index 66761e3a3..7f947f9d5 100644 --- a/src/clstepcore/dispnodelist.cc +++ b/src/clstepcore/dispnodelist.cc @@ -17,8 +17,8 @@ #include #include -#include -#include +#include "core/dispnode.h" +#include "core/dispnodelist.h" void DisplayNodeList::Remove( GenericNode * node ) { GenNodeList::Remove( node ); diff --git a/src/clstepcore/globalRule.h b/src/clstepcore/globalRule.h index ffd1200fd..2fe3ee14f 100644 --- a/src/clstepcore/globalRule.h +++ b/src/clstepcore/globalRule.h @@ -1,7 +1,7 @@ #ifndef GLOBALRULE_H #define GLOBALRULE_H -#include "dictionaryInstance.h" +#include "core/dictionaryInstance.h" #include "whereRule.h" #include "entityDescriptorList.h" diff --git a/src/clstepcore/instmgr.h b/src/clstepcore/instmgr.h index 3f185b3fb..d45900ead 100644 --- a/src/clstepcore/instmgr.h +++ b/src/clstepcore/instmgr.h @@ -34,8 +34,8 @@ #include #include -#include -#include +#include "core/dispnode.h" +#include "core/dispnodelist.h" #include diff --git a/src/clstepcore/interfaceSpec.h b/src/clstepcore/interfaceSpec.h index 0b61b4b04..6ab0a4563 100644 --- a/src/clstepcore/interfaceSpec.h +++ b/src/clstepcore/interfaceSpec.h @@ -1,7 +1,7 @@ #ifndef INTERFACESPEC_H #define INTERFACESPEC_H -#include "dictionaryInstance.h" +#include "core/dictionaryInstance.h" #include "explicitItemId.h" #include "implicitItemId.h" diff --git a/src/clstepcore/interfacedItem.h b/src/clstepcore/interfacedItem.h index 00401b68b..5084cab60 100644 --- a/src/clstepcore/interfacedItem.h +++ b/src/clstepcore/interfacedItem.h @@ -1,7 +1,7 @@ #ifndef INTERFACEDITEM_H #define INTERFACEDITEM_H -#include "dictionaryInstance.h" +#include "core/dictionaryInstance.h" #include "sdai.h" diff --git a/src/clstepcore/mgrnode.cc b/src/clstepcore/mgrnode.cc index 00caf283e..11c122ad2 100644 --- a/src/clstepcore/mgrnode.cc +++ b/src/clstepcore/mgrnode.cc @@ -14,8 +14,8 @@ #include #include -#include -#include +#include "core/dispnode.h" +#include "core/dispnodelist.h" #include //#include diff --git a/src/clstepcore/mgrnodelist.cc b/src/clstepcore/mgrnodelist.cc index a52870f56..d8b835ded 100644 --- a/src/clstepcore/mgrnodelist.cc +++ b/src/clstepcore/mgrnodelist.cc @@ -14,8 +14,8 @@ #include #include -#include -#include +#include "core/dispnode.h" +#include "core/dispnodelist.h" MgrNodeList::MgrNodeList( stateEnum type ) : GenNodeList( new MgrNode() ) { // if(debug_level >= PrintFunctionTrace) diff --git a/src/clstepcore/sdai.h b/src/clstepcore/sdai.h index 065cf42c3..11a1c7588 100644 --- a/src/clstepcore/sdai.h +++ b/src/clstepcore/sdai.h @@ -27,7 +27,7 @@ extern const char * SCLversion; #include -#include "dictdefs.h" +#include "core/dictdefs.h" #include "core/baseType.h" #include "Str.h" diff --git a/src/clstepcore/typeDescriptor.h b/src/clstepcore/typeDescriptor.h index 7fb53a53c..a3e64a33b 100644 --- a/src/clstepcore/typeDescriptor.h +++ b/src/clstepcore/typeDescriptor.h @@ -3,7 +3,7 @@ #include "schRename.h" #include "whereRule.h" -#include "dictSchema.h" +#include "core/dictSchema.h" #include "sc_export.h" diff --git a/src/clstepcore/typeOrRuleVar.h b/src/clstepcore/typeOrRuleVar.h index 09f78da59..9fa58be34 100644 --- a/src/clstepcore/typeOrRuleVar.h +++ b/src/clstepcore/typeOrRuleVar.h @@ -1,7 +1,7 @@ #ifndef TYPEORRULEVAR_H #define TYPEORRULEVAR_H -#include "dictionaryInstance.h" +#include "core/dictionaryInstance.h" #include "sc_export.h" diff --git a/src/clstepcore/uniquenessRule.h b/src/clstepcore/uniquenessRule.h index 4751ce97b..2ce576b66 100644 --- a/src/clstepcore/uniquenessRule.h +++ b/src/clstepcore/uniquenessRule.h @@ -1,7 +1,7 @@ #ifndef UNIQUENESSRULE_H #define UNIQUENESSRULE_H -#include "dictionaryInstance.h" +#include "core/dictionaryInstance.h" #include "sdai.h" diff --git a/src/clstepcore/whereRule.h b/src/clstepcore/whereRule.h index ef9043a4b..7c36ec1ee 100644 --- a/src/clstepcore/whereRule.h +++ b/src/clstepcore/whereRule.h @@ -3,7 +3,7 @@ #include #include "sdai.h" -#include "dictionaryInstance.h" +#include "core/dictionaryInstance.h" #include "typeOrRuleVar.h" #include "sc_export.h" From 9d1583be630658c6b4c27c41cd7bf321e6ff1f16 Mon Sep 17 00:00:00 2001 From: Clifford Yapp <238416+starseeker@users.noreply.github.com> Date: Sun, 2 Oct 2022 10:20:10 -0400 Subject: [PATCH 05/23] Move the e* clstepcore headers --- include/core/CMakeLists.txt | 12 ++++++------ {src/clstepcore => include/core}/ExpDict.h | 0 {src/clstepcore => include/core}/entityDescriptor.h | 0 .../core}/entityDescriptorList.h | 0 .../clstepcore => include/core}/enumTypeDescriptor.h | 0 {src/clstepcore => include/core}/explicitItemId.h | 0 {src/clstepcore => include/core}/globalRule.h | 0 misc/header_mv.sh | 4 ++-- src/cleditor/SdaiHeaderSchema.cc | 2 +- src/cleditor/SdaiHeaderSchemaInit.cc | 2 +- src/cleditor/SdaiSchemaInit.h | 2 +- src/cllazyfile/lazyRefs.h | 2 +- src/clstepcore/CMakeLists.txt | 6 ------ src/clstepcore/Registry.cc | 2 +- src/clstepcore/STEPaggregate.cc | 2 +- src/clstepcore/STEPattribute.cc | 2 +- src/clstepcore/STEPcomplex.h | 2 +- src/clstepcore/STEPinvAttrList.cc | 2 +- src/clstepcore/SubSuperIterators.h | 4 ++-- src/clstepcore/dictSchema.cc | 2 +- src/clstepcore/entityDescriptor.cc | 2 +- src/clstepcore/entityDescriptorList.cc | 2 +- src/clstepcore/enumTypeDescriptor.cc | 2 +- src/clstepcore/explicitItemId.cc | 2 +- src/clstepcore/globalRule.cc | 2 +- src/clstepcore/interfaceSpec.h | 2 +- src/clstepcore/sdaiSelect.cc | 2 +- src/clstepcore/superInvAttrIter.h | 2 +- src/clstepcore/test/test_SupertypesIterator.cc | 2 +- src/clstepcore/test/test_null_attr.cc | 2 +- src/clstepcore/test/test_operators_SDAI_Select.cc | 2 +- src/clstepcore/test/test_operators_STEPattribute.cc | 2 +- src/exp2cxx/classes_wrapper.cc | 2 +- src/test/p21read/p21read.cc | 2 +- src/test/tests.h | 2 +- 35 files changed, 35 insertions(+), 41 deletions(-) rename {src/clstepcore => include/core}/ExpDict.h (100%) rename {src/clstepcore => include/core}/entityDescriptor.h (100%) rename {src/clstepcore => include/core}/entityDescriptorList.h (100%) rename {src/clstepcore => include/core}/enumTypeDescriptor.h (100%) rename {src/clstepcore => include/core}/explicitItemId.h (100%) rename {src/clstepcore => include/core}/globalRule.h (100%) diff --git a/include/core/CMakeLists.txt b/include/core/CMakeLists.txt index b41ebd4a4..14f279243 100644 --- a/include/core/CMakeLists.txt +++ b/include/core/CMakeLists.txt @@ -11,12 +11,12 @@ set(CORE_HDRS dictionaryInstance.h dispnode.h dispnodelist.h -# entityDescriptor.h -# entityDescriptorList.h -# enumTypeDescriptor.h -# ExpDict.h -# explicitItemId.h -# globalRule.h + entityDescriptor.h + entityDescriptorList.h + enumTypeDescriptor.h + ExpDict.h + explicitItemId.h + globalRule.h # implicitItemId.h # instmgr.h # interfaceSpec.h diff --git a/src/clstepcore/ExpDict.h b/include/core/ExpDict.h similarity index 100% rename from src/clstepcore/ExpDict.h rename to include/core/ExpDict.h diff --git a/src/clstepcore/entityDescriptor.h b/include/core/entityDescriptor.h similarity index 100% rename from src/clstepcore/entityDescriptor.h rename to include/core/entityDescriptor.h diff --git a/src/clstepcore/entityDescriptorList.h b/include/core/entityDescriptorList.h similarity index 100% rename from src/clstepcore/entityDescriptorList.h rename to include/core/entityDescriptorList.h diff --git a/src/clstepcore/enumTypeDescriptor.h b/include/core/enumTypeDescriptor.h similarity index 100% rename from src/clstepcore/enumTypeDescriptor.h rename to include/core/enumTypeDescriptor.h diff --git a/src/clstepcore/explicitItemId.h b/include/core/explicitItemId.h similarity index 100% rename from src/clstepcore/explicitItemId.h rename to include/core/explicitItemId.h diff --git a/src/clstepcore/globalRule.h b/include/core/globalRule.h similarity index 100% rename from src/clstepcore/globalRule.h rename to include/core/globalRule.h diff --git a/misc/header_mv.sh b/misc/header_mv.sh index 3a7690876..6e3170786 100755 --- a/misc/header_mv.sh +++ b/misc/header_mv.sh @@ -1,4 +1,4 @@ #!/bin/bash -find . -type f -path "*/cl*" -not -path "*.git/*" -not -path "*/exp*" -regex '.*\(c\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include \"$1\"/include \"core\/$1\"/g" {} \; -find . -type f -path "*/cl*" -not -path "*.git/*" -not -path "*/exp*" -regex '.*\(c\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include <$1>/include \"core\/$1\"/g" {} \; +find . -type f -path "*/cl*" -not -path "*.git/*" -not -path "*/exp*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include \"$1\"/include \"core\/$1\"/g" {} \; +find . -type f -path "*/cl*" -not -path "*.git/*" -not -path "*/exp*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include <$1>/include \"core\/$1\"/g" {} \; diff --git a/src/cleditor/SdaiHeaderSchema.cc b/src/cleditor/SdaiHeaderSchema.cc index af08cb2e3..f013606b9 100644 --- a/src/cleditor/SdaiHeaderSchema.cc +++ b/src/cleditor/SdaiHeaderSchema.cc @@ -10,7 +10,7 @@ extern ofstream * logStream; #define SCLLOGFILE "scl.log" #endif -#include +#include "core/ExpDict.h" #include #include diff --git a/src/cleditor/SdaiHeaderSchemaInit.cc b/src/cleditor/SdaiHeaderSchemaInit.cc index 1c9f691ab..e0bbb9247 100644 --- a/src/cleditor/SdaiHeaderSchemaInit.cc +++ b/src/cleditor/SdaiHeaderSchemaInit.cc @@ -5,7 +5,7 @@ // regenerate it. #include -#include +#include "core/ExpDict.h" #include #include diff --git a/src/cleditor/SdaiSchemaInit.h b/src/cleditor/SdaiSchemaInit.h index 256ef7356..fe5bc387a 100644 --- a/src/cleditor/SdaiSchemaInit.h +++ b/src/cleditor/SdaiSchemaInit.h @@ -13,7 +13,7 @@ #include #include #include -#include +#include "core/ExpDict.h" #include #include "core/complexSupport.h" diff --git a/src/cllazyfile/lazyRefs.h b/src/cllazyfile/lazyRefs.h index 723dd0998..bcfa3fa9b 100644 --- a/src/cllazyfile/lazyRefs.h +++ b/src/cllazyfile/lazyRefs.h @@ -9,7 +9,7 @@ #include "sc_export.h" #include "lazyTypes.h" #include "lazyInstMgr.h" -#include "ExpDict.h" +#include "core/ExpDict.h" #include "SubSuperIterators.h" #include #include diff --git a/src/clstepcore/CMakeLists.txt b/src/clstepcore/CMakeLists.txt index e97911dd5..fea36750b 100644 --- a/src/clstepcore/CMakeLists.txt +++ b/src/clstepcore/CMakeLists.txt @@ -63,12 +63,6 @@ set(LIBSTEPCORE_SRCS ) set(SC_CLSTEPCORE_HDRS - entityDescriptor.h - entityDescriptorList.h - enumTypeDescriptor.h - ExpDict.h - explicitItemId.h - globalRule.h implicitItemId.h instmgr.h interfaceSpec.h diff --git a/src/clstepcore/Registry.cc b/src/clstepcore/Registry.cc index 851e9e3bf..4cf6a7f0c 100644 --- a/src/clstepcore/Registry.cc +++ b/src/clstepcore/Registry.cc @@ -9,7 +9,7 @@ * and is not subject to copyright. */ -#include +#include "core/ExpDict.h" #include /* these may be shared between multiple Registry instances, so don't create/destroy in Registry ctor/dtor diff --git a/src/clstepcore/STEPaggregate.cc b/src/clstepcore/STEPaggregate.cc index 2226d1713..036501ea3 100644 --- a/src/clstepcore/STEPaggregate.cc +++ b/src/clstepcore/STEPaggregate.cc @@ -16,7 +16,7 @@ #include #include #include -#include +#include "core/ExpDict.h" /** diff --git a/src/clstepcore/STEPattribute.cc b/src/clstepcore/STEPattribute.cc index 83d21fe3b..8f1a9625e 100644 --- a/src/clstepcore/STEPattribute.cc +++ b/src/clstepcore/STEPattribute.cc @@ -17,7 +17,7 @@ #include #include #include -#include +#include "core/ExpDict.h" #include // REAL_NUM_PRECISION is defined in STEPattribute.h, and is also used diff --git a/src/clstepcore/STEPcomplex.h b/src/clstepcore/STEPcomplex.h index f190ea7d7..8225ec8c2 100644 --- a/src/clstepcore/STEPcomplex.h +++ b/src/clstepcore/STEPcomplex.h @@ -5,7 +5,7 @@ #include #include #include "core/baseType.h" -#include +#include "core/ExpDict.h" #include #include diff --git a/src/clstepcore/STEPinvAttrList.cc b/src/clstepcore/STEPinvAttrList.cc index 991a7d98c..b8f4a824b 100644 --- a/src/clstepcore/STEPinvAttrList.cc +++ b/src/clstepcore/STEPinvAttrList.cc @@ -4,7 +4,7 @@ */ #include -#include +#include "core/ExpDict.h" invAttrListNodeI::invAttrListNodeI(Inverse_attribute* a, setterI_t s, getterI_t g): invAttrListNode(a), set( s ), get( g ) {} invAttrListNodeA::invAttrListNodeA(Inverse_attribute* a, setterA_t s, getterA_t g): invAttrListNode(a), set( s ), get( g ) {} diff --git a/src/clstepcore/SubSuperIterators.h b/src/clstepcore/SubSuperIterators.h index 9ca78765b..b70c4bde7 100644 --- a/src/clstepcore/SubSuperIterators.h +++ b/src/clstepcore/SubSuperIterators.h @@ -1,8 +1,8 @@ #ifndef SUB_SUPER_ITERATORS #define SUB_SUPER_ITERATORS -#include "ExpDict.h" -#include "ExpDict.h" +#include "core/ExpDict.h" +#include "core/ExpDict.h" #include #include diff --git a/src/clstepcore/dictSchema.cc b/src/clstepcore/dictSchema.cc index 3b3b7e494..5e739287c 100644 --- a/src/clstepcore/dictSchema.cc +++ b/src/clstepcore/dictSchema.cc @@ -1,7 +1,7 @@ #include "core/dictSchema.h" #include "typeDescriptor.h" -#include "entityDescriptor.h" +#include "core/entityDescriptor.h" Schema::Schema( const char * schemaName ) : _use_interface_list( new Interface_spec__set ), diff --git a/src/clstepcore/entityDescriptor.cc b/src/clstepcore/entityDescriptor.cc index f8fb6a2d0..6816fc492 100644 --- a/src/clstepcore/entityDescriptor.cc +++ b/src/clstepcore/entityDescriptor.cc @@ -1,6 +1,6 @@ #include -#include "entityDescriptor.h" +#include "core/entityDescriptor.h" #include "Registry.h" #include "core/attrDescriptor.h" #include "inverseAttribute.h" diff --git a/src/clstepcore/entityDescriptorList.cc b/src/clstepcore/entityDescriptorList.cc index 86d937c76..bef52120a 100644 --- a/src/clstepcore/entityDescriptorList.cc +++ b/src/clstepcore/entityDescriptorList.cc @@ -1,4 +1,4 @@ -#include "entityDescriptorList.h" +#include "core/entityDescriptorList.h" EntityDescLinkNode::EntityDescLinkNode() { _entityDesc = 0; diff --git a/src/clstepcore/enumTypeDescriptor.cc b/src/clstepcore/enumTypeDescriptor.cc index 9598702f0..653a1cc0d 100644 --- a/src/clstepcore/enumTypeDescriptor.cc +++ b/src/clstepcore/enumTypeDescriptor.cc @@ -1,4 +1,4 @@ -#include "enumTypeDescriptor.h" +#include "core/enumTypeDescriptor.h" /* * why have EnumTypeDescriptor + EnumerationTypeDescriptor ??? diff --git a/src/clstepcore/explicitItemId.cc b/src/clstepcore/explicitItemId.cc index c229f6369..8436befd5 100644 --- a/src/clstepcore/explicitItemId.cc +++ b/src/clstepcore/explicitItemId.cc @@ -1,4 +1,4 @@ -#include "explicitItemId.h" +#include "core/explicitItemId.h" Explicit_item_id::Explicit_item_id() { _local_definition = 0; diff --git a/src/clstepcore/globalRule.cc b/src/clstepcore/globalRule.cc index b6fdeb19a..06629f2c1 100644 --- a/src/clstepcore/globalRule.cc +++ b/src/clstepcore/globalRule.cc @@ -1,4 +1,4 @@ -#include "globalRule.h" +#include "core/globalRule.h" Global_rule::Global_rule() : _entities( 0 ), _where_rules( 0 ), _parent_schema( 0 ) { diff --git a/src/clstepcore/interfaceSpec.h b/src/clstepcore/interfaceSpec.h index 6ab0a4563..f0b4bde19 100644 --- a/src/clstepcore/interfaceSpec.h +++ b/src/clstepcore/interfaceSpec.h @@ -2,7 +2,7 @@ #define INTERFACESPEC_H #include "core/dictionaryInstance.h" -#include "explicitItemId.h" +#include "core/explicitItemId.h" #include "implicitItemId.h" #include "sc_export.h" diff --git a/src/clstepcore/sdaiSelect.cc b/src/clstepcore/sdaiSelect.cc index 08e789a6d..060a7b149 100644 --- a/src/clstepcore/sdaiSelect.cc +++ b/src/clstepcore/sdaiSelect.cc @@ -11,7 +11,7 @@ */ #include // to get the BUFSIZ #define -#include +#include "core/ExpDict.h" #include #include #include diff --git a/src/clstepcore/superInvAttrIter.h b/src/clstepcore/superInvAttrIter.h index bfe73dc17..4b7a02a1d 100644 --- a/src/clstepcore/superInvAttrIter.h +++ b/src/clstepcore/superInvAttrIter.h @@ -2,7 +2,7 @@ #define SUPERINVATTRITER_H #include "SubSuperIterators.h" -#include "ExpDict.h" +#include "core/ExpDict.h" /** * this class implements an iterator for inverse attributes in an EntityDescriptor's supertypes diff --git a/src/clstepcore/test/test_SupertypesIterator.cc b/src/clstepcore/test/test_SupertypesIterator.cc index f557d7c72..9fe2a54b7 100644 --- a/src/clstepcore/test/test_SupertypesIterator.cc +++ b/src/clstepcore/test/test_SupertypesIterator.cc @@ -5,7 +5,7 @@ //subtypesiterator shouldn't need tested separately from supertypesiterator since there is very little difference #include "SubSuperIterators.h" -#include "ExpDict.h" +#include "core/ExpDict.h" #include int main( int /*argc*/, char ** /*argv*/ ) { diff --git a/src/clstepcore/test/test_null_attr.cc b/src/clstepcore/test/test_null_attr.cc index 0c96c5798..cb7064ebb 100644 --- a/src/clstepcore/test/test_null_attr.cc +++ b/src/clstepcore/test/test_null_attr.cc @@ -1,4 +1,4 @@ -#include +#include "core/ExpDict.h" #include #include diff --git a/src/clstepcore/test/test_operators_SDAI_Select.cc b/src/clstepcore/test/test_operators_SDAI_Select.cc index 2d89a0a75..83e0f6469 100644 --- a/src/clstepcore/test/test_operators_SDAI_Select.cc +++ b/src/clstepcore/test/test_operators_SDAI_Select.cc @@ -6,7 +6,7 @@ #include -#include "ExpDict.h" +#include "core/ExpDict.h" #include "core/baseType.h" #include "sdaiSelect.h" diff --git a/src/clstepcore/test/test_operators_STEPattribute.cc b/src/clstepcore/test/test_operators_STEPattribute.cc index abd396816..cc14cb102 100644 --- a/src/clstepcore/test/test_operators_STEPattribute.cc +++ b/src/clstepcore/test/test_operators_STEPattribute.cc @@ -1,7 +1,7 @@ ///test constructors, destructor, shallow copy, assignment operators for STEPattribute #include -#include +#include "core/ExpDict.h" #include diff --git a/src/exp2cxx/classes_wrapper.cc b/src/exp2cxx/classes_wrapper.cc index 3d9151178..69487ef32 100644 --- a/src/exp2cxx/classes_wrapper.cc +++ b/src/exp2cxx/classes_wrapper.cc @@ -79,7 +79,7 @@ void print_file_header( FILES * files ) { fprintf( files->incall, "\n#include \n" ); fprintf( files->incall, "\n#include \n" ); fprintf( files->incall, "\n#include \n" ); - fprintf( files->incall, "\n#include \n" ); + fprintf( files->incall, "\n#include \"core/ExpDict.h\"\n" ); fprintf( files->incall, "\n#include \n" ); fprintf( files->incall, "\n#include \n" ); diff --git a/src/test/p21read/p21read.cc b/src/test/p21read/p21read.cc index c8faddd52..b9b0a9b0e 100644 --- a/src/test/p21read/p21read.cc +++ b/src/test/p21read/p21read.cc @@ -16,7 +16,7 @@ extern void SchemaInit( class Registry & ); #include #include #include -#include +#include "core/ExpDict.h" #include #include #include diff --git a/src/test/tests.h b/src/test/tests.h index 52fcb3a59..85b3b010c 100644 --- a/src/test/tests.h +++ b/src/test/tests.h @@ -16,7 +16,7 @@ #include /* General SCL stuff */ -#include +#include "core/ExpDict.h" #include #include #include From 6e53c8f83365b411ad12dbded9b1f79fb6c58355 Mon Sep 17 00:00:00 2001 From: Clifford Yapp <238416+starseeker@users.noreply.github.com> Date: Sun, 2 Oct 2022 10:24:21 -0400 Subject: [PATCH 06/23] Relocate i* stepcore headers --- {src/clstepcore => include/core}/implicitItemId.h | 0 {src/clstepcore => include/core}/instmgr.h | 0 {src/clstepcore => include/core}/interfaceSpec.h | 0 {src/clstepcore => include/core}/interfacedItem.h | 0 {src/clstepcore => include/core}/inverseAttribute.h | 0 {src/clstepcore => include/core}/inverseAttributeList.h | 0 src/cleditor/STEPfile.h | 2 +- src/cllazyfile/instMgrHelper.h | 2 +- src/clstepcore/STEPaggregate.cc | 2 +- src/clstepcore/STEPattribute.cc | 2 +- src/clstepcore/entityDescriptor.cc | 2 +- src/clstepcore/implicitItemId.cc | 2 +- src/clstepcore/instmgr.cc | 2 +- src/clstepcore/interfaceSpec.cc | 2 +- src/clstepcore/interfacedItem.cc | 2 +- src/clstepcore/inverseAttribute.cc | 2 +- src/clstepcore/inverseAttributeList.cc | 4 ++-- src/clstepcore/mgrnode.cc | 2 +- src/clstepcore/sdaiApplication_instance.cc | 2 +- 19 files changed, 14 insertions(+), 14 deletions(-) rename {src/clstepcore => include/core}/implicitItemId.h (100%) rename {src/clstepcore => include/core}/instmgr.h (100%) rename {src/clstepcore => include/core}/interfaceSpec.h (100%) rename {src/clstepcore => include/core}/interfacedItem.h (100%) rename {src/clstepcore => include/core}/inverseAttribute.h (100%) rename {src/clstepcore => include/core}/inverseAttributeList.h (100%) diff --git a/src/clstepcore/implicitItemId.h b/include/core/implicitItemId.h similarity index 100% rename from src/clstepcore/implicitItemId.h rename to include/core/implicitItemId.h diff --git a/src/clstepcore/instmgr.h b/include/core/instmgr.h similarity index 100% rename from src/clstepcore/instmgr.h rename to include/core/instmgr.h diff --git a/src/clstepcore/interfaceSpec.h b/include/core/interfaceSpec.h similarity index 100% rename from src/clstepcore/interfaceSpec.h rename to include/core/interfaceSpec.h diff --git a/src/clstepcore/interfacedItem.h b/include/core/interfacedItem.h similarity index 100% rename from src/clstepcore/interfacedItem.h rename to include/core/interfacedItem.h diff --git a/src/clstepcore/inverseAttribute.h b/include/core/inverseAttribute.h similarity index 100% rename from src/clstepcore/inverseAttribute.h rename to include/core/inverseAttribute.h diff --git a/src/clstepcore/inverseAttributeList.h b/include/core/inverseAttributeList.h similarity index 100% rename from src/clstepcore/inverseAttributeList.h rename to include/core/inverseAttributeList.h diff --git a/src/cleditor/STEPfile.h b/src/cleditor/STEPfile.h index 37c7d20bc..402473ef0 100644 --- a/src/cleditor/STEPfile.h +++ b/src/cleditor/STEPfile.h @@ -15,7 +15,7 @@ #include #include -#include +#include "core/instmgr.h" #include #include #include diff --git a/src/cllazyfile/instMgrHelper.h b/src/cllazyfile/instMgrHelper.h index 659f1ec8e..16588cf1e 100644 --- a/src/cllazyfile/instMgrHelper.h +++ b/src/cllazyfile/instMgrHelper.h @@ -5,7 +5,7 @@ #include #include -#include +#include "core/instmgr.h" /** * \file instMgrHelper.h helper classes for the lazyInstMgr. Allows use of SDAI_Application_instance class diff --git a/src/clstepcore/STEPaggregate.cc b/src/clstepcore/STEPaggregate.cc index 036501ea3..0f9620f57 100644 --- a/src/clstepcore/STEPaggregate.cc +++ b/src/clstepcore/STEPaggregate.cc @@ -15,7 +15,7 @@ #include #include #include -#include +#include "core/instmgr.h" #include "core/ExpDict.h" diff --git a/src/clstepcore/STEPattribute.cc b/src/clstepcore/STEPattribute.cc index 8f1a9625e..fa67b3e40 100644 --- a/src/clstepcore/STEPattribute.cc +++ b/src/clstepcore/STEPattribute.cc @@ -14,7 +14,7 @@ #include #include -#include +#include "core/instmgr.h" #include #include #include "core/ExpDict.h" diff --git a/src/clstepcore/entityDescriptor.cc b/src/clstepcore/entityDescriptor.cc index 6816fc492..6b816d67d 100644 --- a/src/clstepcore/entityDescriptor.cc +++ b/src/clstepcore/entityDescriptor.cc @@ -3,7 +3,7 @@ #include "core/entityDescriptor.h" #include "Registry.h" #include "core/attrDescriptor.h" -#include "inverseAttribute.h" +#include "core/inverseAttribute.h" #include "SubSuperIterators.h" EntityDescriptor::EntityDescriptor( ) diff --git a/src/clstepcore/implicitItemId.cc b/src/clstepcore/implicitItemId.cc index 1961727af..dd43fc1f1 100644 --- a/src/clstepcore/implicitItemId.cc +++ b/src/clstepcore/implicitItemId.cc @@ -1,4 +1,4 @@ -#include "implicitItemId.h" +#include "core/implicitItemId.h" Implicit_item_id::Implicit_item_id() { _local_definition = 0; diff --git a/src/clstepcore/instmgr.cc b/src/clstepcore/instmgr.cc index 691167f6d..2da10f762 100644 --- a/src/clstepcore/instmgr.cc +++ b/src/clstepcore/instmgr.cc @@ -17,7 +17,7 @@ ////////////////////////////////////////////////////////////////////////////// #include -#include +#include "core/instmgr.h" /////////////////////////////////////////////////////////////////////////////// // debug_level >= 2 => tells when a command is chosen diff --git a/src/clstepcore/interfaceSpec.cc b/src/clstepcore/interfaceSpec.cc index eb0fecf3a..c8698789e 100644 --- a/src/clstepcore/interfaceSpec.cc +++ b/src/clstepcore/interfaceSpec.cc @@ -1,4 +1,4 @@ -#include "interfaceSpec.h" +#include "core/interfaceSpec.h" Interface_spec__set::Interface_spec__set( int defaultSize ) { _bufsize = defaultSize; diff --git a/src/clstepcore/interfacedItem.cc b/src/clstepcore/interfacedItem.cc index 749a5922e..aadfce68d 100644 --- a/src/clstepcore/interfacedItem.cc +++ b/src/clstepcore/interfacedItem.cc @@ -1,4 +1,4 @@ -#include "interfacedItem.h" +#include "core/interfacedItem.h" Interfaced_item::Interfaced_item() { } diff --git a/src/clstepcore/inverseAttribute.cc b/src/clstepcore/inverseAttribute.cc index eeccec90a..be7f7cfa3 100644 --- a/src/clstepcore/inverseAttribute.cc +++ b/src/clstepcore/inverseAttribute.cc @@ -1,4 +1,4 @@ -#include "inverseAttribute.h" +#include "core/inverseAttribute.h" #include const char * Inverse_attribute::AttrExprDefStr( std::string & s ) const { diff --git a/src/clstepcore/inverseAttributeList.cc b/src/clstepcore/inverseAttributeList.cc index 22591d41c..e1767e3b3 100644 --- a/src/clstepcore/inverseAttributeList.cc +++ b/src/clstepcore/inverseAttributeList.cc @@ -1,5 +1,5 @@ -#include "inverseAttributeList.h" -#include "inverseAttribute.h" +#include "core/inverseAttributeList.h" +#include "core/inverseAttribute.h" Inverse_attributeLinkNode::Inverse_attributeLinkNode() { _invAttr = 0; diff --git a/src/clstepcore/mgrnode.cc b/src/clstepcore/mgrnode.cc index 11c122ad2..f2d4a389d 100644 --- a/src/clstepcore/mgrnode.cc +++ b/src/clstepcore/mgrnode.cc @@ -17,7 +17,7 @@ #include "core/dispnode.h" #include "core/dispnodelist.h" -#include +#include "core/instmgr.h" //#include #include diff --git a/src/clstepcore/sdaiApplication_instance.cc b/src/clstepcore/sdaiApplication_instance.cc index de5d19b76..c1c9b129d 100644 --- a/src/clstepcore/sdaiApplication_instance.cc +++ b/src/clstepcore/sdaiApplication_instance.cc @@ -12,7 +12,7 @@ #include #include -#include +#include "core/instmgr.h" #include #include #include //for ReadTokenSeparator, used when comments are inside entities From fc4edb9b069e5f2535cb38f881e8953054e9fcf7 Mon Sep 17 00:00:00 2001 From: Clifford Yapp <238416+starseeker@users.noreply.github.com> Date: Sun, 2 Oct 2022 10:32:25 -0400 Subject: [PATCH 07/23] Move stepcore headers through r* --- include/core/CMakeLists.txt | 26 +++++++++---------- {src/clstepcore => include/core}/Registry.h | 0 include/core/dispnodelist.h | 2 +- include/core/instmgr.h | 6 ++--- {src/clstepcore => include/core}/mgrnode.h | 0 .../core}/mgrnodearray.h | 4 +-- .../clstepcore => include/core}/mgrnodelist.h | 0 {src/clstepcore => include/core}/needFunc.h | 0 {src/clstepcore => include/core}/read_func.h | 0 .../core}/realTypeDescriptor.h | 0 src/cleditor/STEPfile.h | 4 +-- src/cleditor/SdaiHeaderSchema.h | 2 +- src/cleditor/SdaiHeaderSchemaInit.cc | 2 +- src/cleditor/SdaiSchemaInit.h | 2 +- src/cleditor/cmdmgr.h | 4 +-- src/cllazyfile/instMgrHelper.h | 2 +- src/cllazyfile/lazyInstMgr.cc | 2 +- src/cllazyfile/lazyInstMgr.h | 2 +- src/cllazyfile/sectionReader.cc | 4 +-- src/clstepcore/CMakeLists.txt | 13 ---------- src/clstepcore/Registry.cc | 2 +- src/clstepcore/STEPaggregate.cc | 2 +- src/clstepcore/STEPattribute.cc | 2 +- src/clstepcore/STEPcomplex.h | 2 +- src/clstepcore/STEPundefined.h | 2 +- src/clstepcore/dispnodelist.cc | 4 +-- src/clstepcore/entityDescriptor.cc | 2 +- src/clstepcore/mgrnode.cc | 4 +-- src/clstepcore/mgrnodearray.cc | 2 +- src/clstepcore/mgrnodelist.cc | 4 +-- src/clstepcore/needFunc.cc | 2 +- src/clstepcore/read_func.cc | 2 +- src/clstepcore/sdaiApplication_instance.cc | 2 +- src/exp2cxx/classes_wrapper.cc | 4 +-- src/test/p21read/p21read.cc | 2 +- 35 files changed, 50 insertions(+), 63 deletions(-) rename {src/clstepcore => include/core}/Registry.h (100%) rename {src/clstepcore => include/core}/mgrnode.h (100%) rename {src/clstepcore => include/core}/mgrnodearray.h (98%) rename {src/clstepcore => include/core}/mgrnodelist.h (100%) rename {src/clstepcore => include/core}/needFunc.h (100%) rename {src/clstepcore => include/core}/read_func.h (100%) rename {src/clstepcore => include/core}/realTypeDescriptor.h (100%) diff --git a/include/core/CMakeLists.txt b/include/core/CMakeLists.txt index 14f279243..de22dfee7 100644 --- a/include/core/CMakeLists.txt +++ b/include/core/CMakeLists.txt @@ -17,19 +17,19 @@ set(CORE_HDRS ExpDict.h explicitItemId.h globalRule.h -# implicitItemId.h -# instmgr.h -# interfaceSpec.h -# interfacedItem.h -# inverseAttribute.h -# inverseAttributeList.h -# mgrnode.h -# mgrnodearray.h -# mgrnodelist.h -# needFunc.h -# read_func.h -# realTypeDescriptor.h -# Registry.h + implicitItemId.h + instmgr.h + interfaceSpec.h + interfacedItem.h + inverseAttribute.h + inverseAttributeList.h + mgrnode.h + mgrnodearray.h + mgrnodelist.h + needFunc.h + read_func.h + realTypeDescriptor.h + Registry.h # schRename.h # sdai.h # sdaiApplication_instance.h diff --git a/src/clstepcore/Registry.h b/include/core/Registry.h similarity index 100% rename from src/clstepcore/Registry.h rename to include/core/Registry.h diff --git a/include/core/dispnodelist.h b/include/core/dispnodelist.h index c67dcfd11..88da55f76 100644 --- a/include/core/dispnodelist.h +++ b/include/core/dispnodelist.h @@ -20,7 +20,7 @@ #include //#include #include -#include +#include "core/mgrnode.h" #include "core/dispnode.h" #include diff --git a/include/core/instmgr.h b/include/core/instmgr.h index d45900ead..94f334982 100644 --- a/include/core/instmgr.h +++ b/include/core/instmgr.h @@ -31,13 +31,13 @@ #include #include -#include -#include +#include "core/mgrnode.h" +#include "core/mgrnodelist.h" #include "core/dispnode.h" #include "core/dispnodelist.h" -#include +#include "core/mgrnodearray.h" class SC_CORE_EXPORT InstMgrBase { public: diff --git a/src/clstepcore/mgrnode.h b/include/core/mgrnode.h similarity index 100% rename from src/clstepcore/mgrnode.h rename to include/core/mgrnode.h diff --git a/src/clstepcore/mgrnodearray.h b/include/core/mgrnodearray.h similarity index 98% rename from src/clstepcore/mgrnodearray.h rename to include/core/mgrnodearray.h index 22019d071..05a11dff9 100644 --- a/src/clstepcore/mgrnodearray.h +++ b/include/core/mgrnodearray.h @@ -23,8 +23,8 @@ #include //#include -#include -#include +#include "core/mgrnode.h" +#include "core/mgrnodelist.h" #include diff --git a/src/clstepcore/mgrnodelist.h b/include/core/mgrnodelist.h similarity index 100% rename from src/clstepcore/mgrnodelist.h rename to include/core/mgrnodelist.h diff --git a/src/clstepcore/needFunc.h b/include/core/needFunc.h similarity index 100% rename from src/clstepcore/needFunc.h rename to include/core/needFunc.h diff --git a/src/clstepcore/read_func.h b/include/core/read_func.h similarity index 100% rename from src/clstepcore/read_func.h rename to include/core/read_func.h diff --git a/src/clstepcore/realTypeDescriptor.h b/include/core/realTypeDescriptor.h similarity index 100% rename from src/clstepcore/realTypeDescriptor.h rename to include/core/realTypeDescriptor.h diff --git a/src/cleditor/STEPfile.h b/src/cleditor/STEPfile.h index 402473ef0..316fe2b34 100644 --- a/src/cleditor/STEPfile.h +++ b/src/cleditor/STEPfile.h @@ -16,13 +16,13 @@ #include #include #include "core/instmgr.h" -#include +#include "core/Registry.h" #include #include #include #include -#include +#include "core/read_func.h" //error reporting level #define READ_COMPLETE 10 diff --git a/src/cleditor/SdaiHeaderSchema.h b/src/cleditor/SdaiHeaderSchema.h index 7cd45d848..c57dc582d 100644 --- a/src/cleditor/SdaiHeaderSchema.h +++ b/src/cleditor/SdaiHeaderSchema.h @@ -6,7 +6,7 @@ #include #include -#include +#include "core/Registry.h" #include #include #include diff --git a/src/cleditor/SdaiHeaderSchemaInit.cc b/src/cleditor/SdaiHeaderSchemaInit.cc index e0bbb9247..2f906e30c 100644 --- a/src/cleditor/SdaiHeaderSchemaInit.cc +++ b/src/cleditor/SdaiHeaderSchemaInit.cc @@ -4,7 +4,7 @@ // it since your modifications will be lost if exp2cxx is used to // regenerate it. -#include +#include "core/Registry.h" #include "core/ExpDict.h" #include #include diff --git a/src/cleditor/SdaiSchemaInit.h b/src/cleditor/SdaiSchemaInit.h index fe5bc387a..a4dc6f740 100644 --- a/src/cleditor/SdaiSchemaInit.h +++ b/src/cleditor/SdaiSchemaInit.h @@ -10,7 +10,7 @@ #include #include -#include +#include "core/Registry.h" #include #include #include "core/ExpDict.h" diff --git a/src/cleditor/cmdmgr.h b/src/cleditor/cmdmgr.h index 41c37f2e6..2d2651db3 100644 --- a/src/cleditor/cmdmgr.h +++ b/src/cleditor/cmdmgr.h @@ -18,8 +18,8 @@ #include #include -#include -#include +#include "core/mgrnode.h" +#include "core/mgrnodelist.h" #include "core/dispnode.h" #include "core/dispnodelist.h" #include diff --git a/src/cllazyfile/instMgrHelper.h b/src/cllazyfile/instMgrHelper.h index 16588cf1e..b6cf550b7 100644 --- a/src/cllazyfile/instMgrHelper.h +++ b/src/cllazyfile/instMgrHelper.h @@ -3,7 +3,7 @@ #include -#include +#include "core/mgrnode.h" #include #include "core/instmgr.h" diff --git a/src/cllazyfile/lazyInstMgr.cc b/src/cllazyfile/lazyInstMgr.cc index 7ce253ee9..f2a4f3867 100644 --- a/src/cllazyfile/lazyInstMgr.cc +++ b/src/cllazyfile/lazyInstMgr.cc @@ -1,6 +1,6 @@ #include "lazyTypes.h" #include "lazyInstMgr.h" -#include "Registry.h" +#include "core/Registry.h" #include #include "SdaiSchemaInit.h" #include "instMgrHelper.h" diff --git a/src/cllazyfile/lazyInstMgr.h b/src/cllazyfile/lazyInstMgr.h index 881031620..689f611a5 100644 --- a/src/cllazyfile/lazyInstMgr.h +++ b/src/cllazyfile/lazyInstMgr.h @@ -9,7 +9,7 @@ #include "lazyFileReader.h" #include "lazyTypes.h" -#include "Registry.h" +#include "core/Registry.h" #include "sc_export.h" #include "judyLArray.h" diff --git a/src/cllazyfile/sectionReader.cc b/src/cllazyfile/sectionReader.cc index 445ef6502..7125fda46 100644 --- a/src/cllazyfile/sectionReader.cc +++ b/src/cllazyfile/sectionReader.cc @@ -12,9 +12,9 @@ # define ULLONG_MAX _UI64_MAX #endif -#include "Registry.h" +#include "core/Registry.h" #include "sdaiApplication_instance.h" -#include "read_func.h" +#include "core/read_func.h" #include "SdaiSchemaInit.h" #include "STEPcomplex.h" diff --git a/src/clstepcore/CMakeLists.txt b/src/clstepcore/CMakeLists.txt index fea36750b..27b1d2ffc 100644 --- a/src/clstepcore/CMakeLists.txt +++ b/src/clstepcore/CMakeLists.txt @@ -63,19 +63,6 @@ set(LIBSTEPCORE_SRCS ) set(SC_CLSTEPCORE_HDRS - implicitItemId.h - instmgr.h - interfaceSpec.h - interfacedItem.h - inverseAttribute.h - inverseAttributeList.h - mgrnode.h - mgrnodearray.h - mgrnodelist.h - needFunc.h - read_func.h - realTypeDescriptor.h - Registry.h schRename.h sdai.h sdaiApplication_instance.h diff --git a/src/clstepcore/Registry.cc b/src/clstepcore/Registry.cc index 4cf6a7f0c..5d9f5d917 100644 --- a/src/clstepcore/Registry.cc +++ b/src/clstepcore/Registry.cc @@ -10,7 +10,7 @@ */ #include "core/ExpDict.h" -#include +#include "core/Registry.h" /* these may be shared between multiple Registry instances, so don't create/destroy in Registry ctor/dtor * Name, FundamentalType, Originating Schema, Description */ diff --git a/src/clstepcore/STEPaggregate.cc b/src/clstepcore/STEPaggregate.cc index 0f9620f57..3a2ee0914 100644 --- a/src/clstepcore/STEPaggregate.cc +++ b/src/clstepcore/STEPaggregate.cc @@ -12,7 +12,7 @@ #include -#include +#include "core/read_func.h" #include #include #include "core/instmgr.h" diff --git a/src/clstepcore/STEPattribute.cc b/src/clstepcore/STEPattribute.cc index fa67b3e40..2175a2670 100644 --- a/src/clstepcore/STEPattribute.cc +++ b/src/clstepcore/STEPattribute.cc @@ -12,7 +12,7 @@ #include #include -#include +#include "core/read_func.h" #include #include "core/instmgr.h" #include diff --git a/src/clstepcore/STEPcomplex.h b/src/clstepcore/STEPcomplex.h index 8225ec8c2..d437e6dc2 100644 --- a/src/clstepcore/STEPcomplex.h +++ b/src/clstepcore/STEPcomplex.h @@ -6,7 +6,7 @@ #include #include "core/baseType.h" #include "core/ExpDict.h" -#include +#include "core/Registry.h" #include diff --git a/src/clstepcore/STEPundefined.h b/src/clstepcore/STEPundefined.h index 306eb0ef2..da9883215 100644 --- a/src/clstepcore/STEPundefined.h +++ b/src/clstepcore/STEPundefined.h @@ -15,7 +15,7 @@ #include #include #include -#include +#include "core/read_func.h" class SC_CORE_EXPORT SCLundefined { protected: diff --git a/src/clstepcore/dispnodelist.cc b/src/clstepcore/dispnodelist.cc index 7f947f9d5..b58d12db2 100644 --- a/src/clstepcore/dispnodelist.cc +++ b/src/clstepcore/dispnodelist.cc @@ -15,8 +15,8 @@ #include #include -#include -#include +#include "core/mgrnode.h" +#include "core/mgrnodelist.h" #include "core/dispnode.h" #include "core/dispnodelist.h" diff --git a/src/clstepcore/entityDescriptor.cc b/src/clstepcore/entityDescriptor.cc index 6b816d67d..ef16eca82 100644 --- a/src/clstepcore/entityDescriptor.cc +++ b/src/clstepcore/entityDescriptor.cc @@ -1,7 +1,7 @@ #include #include "core/entityDescriptor.h" -#include "Registry.h" +#include "core/Registry.h" #include "core/attrDescriptor.h" #include "core/inverseAttribute.h" #include "SubSuperIterators.h" diff --git a/src/clstepcore/mgrnode.cc b/src/clstepcore/mgrnode.cc index f2d4a389d..33007e7fc 100644 --- a/src/clstepcore/mgrnode.cc +++ b/src/clstepcore/mgrnode.cc @@ -12,8 +12,8 @@ /* $Id: mgrnode.cc,v 3.0.1.3 1997/11/05 22:11:37 sauderd DP3.1 $ */ -#include -#include +#include "core/mgrnode.h" +#include "core/mgrnodelist.h" #include "core/dispnode.h" #include "core/dispnodelist.h" diff --git a/src/clstepcore/mgrnodearray.cc b/src/clstepcore/mgrnodearray.cc index 304738b88..aae8efc43 100644 --- a/src/clstepcore/mgrnodearray.cc +++ b/src/clstepcore/mgrnodearray.cc @@ -32,7 +32,7 @@ static int PrintFunctionTrace = 2; // values within functions get printed out //static int PrintValues = 3; -#include +#include "core/mgrnodearray.h" //#include #include diff --git a/src/clstepcore/mgrnodelist.cc b/src/clstepcore/mgrnodelist.cc index d8b835ded..e477e366c 100644 --- a/src/clstepcore/mgrnodelist.cc +++ b/src/clstepcore/mgrnodelist.cc @@ -12,8 +12,8 @@ /* $Id: mgrnodelist.cc,v 3.0.1.2 1997/11/05 22:11:39 sauderd DP3.1 $ */ -#include -#include +#include "core/mgrnode.h" +#include "core/mgrnodelist.h" #include "core/dispnode.h" #include "core/dispnodelist.h" diff --git a/src/clstepcore/needFunc.cc b/src/clstepcore/needFunc.cc index d71c8f28c..731230d60 100644 --- a/src/clstepcore/needFunc.cc +++ b/src/clstepcore/needFunc.cc @@ -1,4 +1,4 @@ -#include +#include "core/needFunc.h" /////////////////////////////////////////////////////////////////////////////// // Function defined as a stub (necessary to use the scl) diff --git a/src/clstepcore/read_func.cc b/src/clstepcore/read_func.cc index a1715d736..e251ed603 100644 --- a/src/clstepcore/read_func.cc +++ b/src/clstepcore/read_func.cc @@ -2,7 +2,7 @@ #include #include #include -#include +#include "core/read_func.h" #include #include "Str.h" diff --git a/src/clstepcore/sdaiApplication_instance.cc b/src/clstepcore/sdaiApplication_instance.cc index c1c9b129d..7bd94355d 100644 --- a/src/clstepcore/sdaiApplication_instance.cc +++ b/src/clstepcore/sdaiApplication_instance.cc @@ -15,7 +15,7 @@ #include "core/instmgr.h" #include #include -#include //for ReadTokenSeparator, used when comments are inside entities +#include "core/read_func.h" //for ReadTokenSeparator, used when comments are inside entities #include "sdaiApplication_instance.h" #include "superInvAttrIter.h" diff --git a/src/exp2cxx/classes_wrapper.cc b/src/exp2cxx/classes_wrapper.cc index 69487ef32..3a3a3e322 100644 --- a/src/exp2cxx/classes_wrapper.cc +++ b/src/exp2cxx/classes_wrapper.cc @@ -76,7 +76,7 @@ void print_file_header( FILES * files ) { fprintf( files->incall, "#endif\n" ); fprintf( files->incall, "#include \n\n" ); - fprintf( files->incall, "\n#include \n" ); + fprintf( files->incall, "\n#include \"core/Registry.h\"\n" ); fprintf( files->incall, "\n#include \n" ); fprintf( files->incall, "\n#include \n" ); fprintf( files->incall, "\n#include \"core/ExpDict.h\"\n" ); @@ -494,7 +494,7 @@ void SCHEMAprint( Schema schema, FILES * files, void * complexCol, int suffix ) "#include \"schema.h\"\n" "#endif\n" ); #endif - fprintf( initfile, "#include \n#include \n" ); + fprintf( initfile, "#include \"core/Registry.h\"\n#include \n" ); fprintf( initfile, "\nvoid %sInit (Registry& reg) {\n", schnm ); diff --git a/src/test/p21read/p21read.cc b/src/test/p21read/p21read.cc index b9b0a9b0e..c9fa7875a 100644 --- a/src/test/p21read/p21read.cc +++ b/src/test/p21read/p21read.cc @@ -17,7 +17,7 @@ extern void SchemaInit( class Registry & ); #include #include #include "core/ExpDict.h" -#include +#include "core/Registry.h" #include #include #include From 77a43bc3f2eabc3738ff6b7958a299c6cac26795 Mon Sep 17 00:00:00 2001 From: Clifford Yapp <238416+starseeker@users.noreply.github.com> Date: Sun, 2 Oct 2022 10:43:22 -0400 Subject: [PATCH 08/23] Move all non STEP* headers in stepcore --- include/core/CMakeLists.txt | 26 +++++++++---------- include/core/ExpDict.h | 4 +-- include/core/Registry.h | 2 +- .../core}/SingleLinkList.h | 0 .../core}/SubSuperIterators.h | 0 include/core/dispnode.h | 2 +- include/core/mgrnode.h | 2 +- include/core/read_func.h | 2 +- {src/clstepcore => include/core}/schRename.h | 0 {src/clstepcore => include/core}/sdai.h | 4 +-- .../core}/sdaiApplication_instance.h | 0 {src/clstepcore => include/core}/sdaiSelect.h | 0 .../core}/selectTypeDescriptor.h | 0 .../core}/stringTypeDescriptor.h | 0 .../core}/typeDescriptor.h | 0 .../core}/typeDescriptorList.h | 0 .../core}/typeOrRuleVar.h | 0 .../core}/uniquenessRule.h | 0 {src/clstepcore => include/core}/whereRule.h | 0 src/cldai/sdaiApplication_instance_set.cc | 4 +-- src/cldai/sdaiBinary.cc | 2 +- src/cldai/sdaiDaObject.cc | 2 +- src/cldai/sdaiEntity_extent.cc | 2 +- src/cldai/sdaiEntity_extent_set.cc | 2 +- src/cldai/sdaiEnum.cc | 2 +- src/cldai/sdaiModel_contents.cc | 2 +- src/cldai/sdaiModel_contents_list.cc | 2 +- src/cldai/sdaiObject.cc | 2 +- src/cldai/sdaiSession_instance.cc | 2 +- src/cldai/sdaiSession_instance.h | 2 +- src/cldai/sdaiString.cc | 2 +- src/cleditor/STEPfile.cc | 2 +- src/cleditor/SdaiHeaderSchema.h | 2 +- src/cleditor/SdaiSchemaInit.h | 2 +- src/cleditor/cmdmgr.h | 2 +- src/cleditor/seeinfodefault.h | 2 +- src/cllazyfile/lazyInstMgr.cc | 4 +-- src/cllazyfile/lazyRefs.h | 2 +- src/cllazyfile/sectionReader.cc | 2 +- src/clstepcore/CMakeLists.txt | 13 ---------- src/clstepcore/STEPaggrEntity.cc | 2 +- src/clstepcore/STEPaggrSelect.cc | 2 +- src/clstepcore/STEPaggregate.h | 4 +-- src/clstepcore/STEPattribute.cc | 2 +- src/clstepcore/STEPattribute.h | 2 +- src/clstepcore/STEPattributeList.h | 2 +- src/clstepcore/STEPcomplex.h | 2 +- src/clstepcore/STEPinvAttrList.h | 2 +- src/clstepcore/SingleLinkList.cc | 2 +- src/clstepcore/dictSchema.cc | 2 +- src/clstepcore/entityDescriptor.cc | 2 +- src/clstepcore/instmgr.cc | 2 +- src/clstepcore/mgrnode.cc | 2 +- src/clstepcore/mgrnodearray.cc | 2 +- src/clstepcore/read_func.cc | 2 +- src/clstepcore/schRename.cc | 2 +- src/clstepcore/sdai.cc | 2 +- src/clstepcore/sdaiApplication_instance.cc | 4 +-- src/clstepcore/sdaiSelect.cc | 2 +- src/clstepcore/selectTypeDescriptor.cc | 2 +- src/clstepcore/superInvAttrIter.h | 2 +- .../test/test_SupertypesIterator.cc | 2 +- .../test/test_operators_SDAI_Select.cc | 2 +- src/clstepcore/typeDescriptor.cc | 2 +- src/clstepcore/typeDescriptorList.cc | 2 +- src/clstepcore/typeOrRuleVar.cc | 2 +- src/clstepcore/uniquenessRule.cc | 2 +- src/clstepcore/whereRule.cc | 2 +- src/exp2cxx/classes_wrapper.cc | 4 +-- 69 files changed, 75 insertions(+), 88 deletions(-) rename {src/clstepcore => include/core}/SingleLinkList.h (100%) rename {src/clstepcore => include/core}/SubSuperIterators.h (100%) rename {src/clstepcore => include/core}/schRename.h (100%) rename {src/clstepcore => include/core}/sdai.h (99%) rename {src/clstepcore => include/core}/sdaiApplication_instance.h (100%) rename {src/clstepcore => include/core}/sdaiSelect.h (100%) rename {src/clstepcore => include/core}/selectTypeDescriptor.h (100%) rename {src/clstepcore => include/core}/stringTypeDescriptor.h (100%) rename {src/clstepcore => include/core}/typeDescriptor.h (100%) rename {src/clstepcore => include/core}/typeDescriptorList.h (100%) rename {src/clstepcore => include/core}/typeOrRuleVar.h (100%) rename {src/clstepcore => include/core}/uniquenessRule.h (100%) rename {src/clstepcore => include/core}/whereRule.h (100%) diff --git a/include/core/CMakeLists.txt b/include/core/CMakeLists.txt index de22dfee7..209bffb51 100644 --- a/include/core/CMakeLists.txt +++ b/include/core/CMakeLists.txt @@ -30,12 +30,12 @@ set(CORE_HDRS read_func.h realTypeDescriptor.h Registry.h -# schRename.h -# sdai.h -# sdaiApplication_instance.h -# sdaiSelect.h -# selectTypeDescriptor.h -# SingleLinkList.h + schRename.h + sdai.h + sdaiApplication_instance.h + sdaiSelect.h + selectTypeDescriptor.h + SingleLinkList.h # STEPaggregate.h # STEPaggrBinary.h # STEPaggrEntity.h @@ -50,13 +50,13 @@ set(CORE_HDRS # STEPcomplex.h # STEPinvAttrList.h # STEPundefined.h -# stringTypeDescriptor.h -# SubSuperIterators.h -# typeDescriptor.h -# typeDescriptorList.h -# typeOrRuleVar.h -# uniquenessRule.h -# whereRule.h + stringTypeDescriptor.h + SubSuperIterators.h + typeDescriptor.h + typeDescriptorList.h + typeOrRuleVar.h + uniquenessRule.h + whereRule.h ) install(FILES ${CORE_HDRS} diff --git a/include/core/ExpDict.h b/include/core/ExpDict.h index 7974b93fb..8aa82df55 100644 --- a/include/core/ExpDict.h +++ b/include/core/ExpDict.h @@ -15,13 +15,13 @@ */ #include -#include +#include "core/sdai.h" #include #include #include -#include +#include "core/SingleLinkList.h" #include "core/baseType.h" #include "core/dictdefs.h" diff --git a/include/core/Registry.h b/include/core/Registry.h index d340bdd01..eda955b39 100644 --- a/include/core/Registry.h +++ b/include/core/Registry.h @@ -13,7 +13,7 @@ */ #include -#include +#include "core/sdai.h" #include #include #include diff --git a/src/clstepcore/SingleLinkList.h b/include/core/SingleLinkList.h similarity index 100% rename from src/clstepcore/SingleLinkList.h rename to include/core/SingleLinkList.h diff --git a/src/clstepcore/SubSuperIterators.h b/include/core/SubSuperIterators.h similarity index 100% rename from src/clstepcore/SubSuperIterators.h rename to include/core/SubSuperIterators.h diff --git a/include/core/dispnode.h b/include/core/dispnode.h index 1209b9c3e..c22b62644 100644 --- a/include/core/dispnode.h +++ b/include/core/dispnode.h @@ -19,7 +19,7 @@ /*#include */ /*#include */ -#include +#include "core/sdai.h" #include #include diff --git a/include/core/mgrnode.h b/include/core/mgrnode.h index eca3e19e7..f2ffd5caf 100644 --- a/include/core/mgrnode.h +++ b/include/core/mgrnode.h @@ -18,7 +18,7 @@ class GenericNode; class DisplayNode; -#include +#include "core/sdai.h" #include #include diff --git a/include/core/read_func.h b/include/core/read_func.h index 92cff5705..66289efbe 100644 --- a/include/core/read_func.h +++ b/include/core/read_func.h @@ -2,7 +2,7 @@ #define READ_FUNC_H #include -#include +#include "core/sdai.h" /// This was 512. According to 10303-21:2002 section 5.6: comment length is unlimited. FIXME need to check the code for potential problems before eliminating this limit completely. #define MAX_COMMENT_LENGTH 8192 diff --git a/src/clstepcore/schRename.h b/include/core/schRename.h similarity index 100% rename from src/clstepcore/schRename.h rename to include/core/schRename.h diff --git a/src/clstepcore/sdai.h b/include/core/sdai.h similarity index 99% rename from src/clstepcore/sdai.h rename to include/core/sdai.h index 11a1c7588..b5f316708 100644 --- a/src/clstepcore/sdai.h +++ b/include/core/sdai.h @@ -188,7 +188,7 @@ BOOLEAN and LOGICAL #include -#include +#include "core/sdaiApplication_instance.h" #include /****************************************************************************** @@ -198,7 +198,7 @@ SELECT sdaiSelect.h ******************************************************************************/ -#include +#include "core/sdaiSelect.h" class SDAI_Model_contents; typedef SDAI_Model_contents * SDAI_Model_contents_ptr; diff --git a/src/clstepcore/sdaiApplication_instance.h b/include/core/sdaiApplication_instance.h similarity index 100% rename from src/clstepcore/sdaiApplication_instance.h rename to include/core/sdaiApplication_instance.h diff --git a/src/clstepcore/sdaiSelect.h b/include/core/sdaiSelect.h similarity index 100% rename from src/clstepcore/sdaiSelect.h rename to include/core/sdaiSelect.h diff --git a/src/clstepcore/selectTypeDescriptor.h b/include/core/selectTypeDescriptor.h similarity index 100% rename from src/clstepcore/selectTypeDescriptor.h rename to include/core/selectTypeDescriptor.h diff --git a/src/clstepcore/stringTypeDescriptor.h b/include/core/stringTypeDescriptor.h similarity index 100% rename from src/clstepcore/stringTypeDescriptor.h rename to include/core/stringTypeDescriptor.h diff --git a/src/clstepcore/typeDescriptor.h b/include/core/typeDescriptor.h similarity index 100% rename from src/clstepcore/typeDescriptor.h rename to include/core/typeDescriptor.h diff --git a/src/clstepcore/typeDescriptorList.h b/include/core/typeDescriptorList.h similarity index 100% rename from src/clstepcore/typeDescriptorList.h rename to include/core/typeDescriptorList.h diff --git a/src/clstepcore/typeOrRuleVar.h b/include/core/typeOrRuleVar.h similarity index 100% rename from src/clstepcore/typeOrRuleVar.h rename to include/core/typeOrRuleVar.h diff --git a/src/clstepcore/uniquenessRule.h b/include/core/uniquenessRule.h similarity index 100% rename from src/clstepcore/uniquenessRule.h rename to include/core/uniquenessRule.h diff --git a/src/clstepcore/whereRule.h b/include/core/whereRule.h similarity index 100% rename from src/clstepcore/whereRule.h rename to include/core/whereRule.h diff --git a/src/cldai/sdaiApplication_instance_set.cc b/src/cldai/sdaiApplication_instance_set.cc index ec0511500..ff4033e74 100644 --- a/src/cldai/sdaiApplication_instance_set.cc +++ b/src/cldai/sdaiApplication_instance_set.cc @@ -25,12 +25,12 @@ */ //#include -#include +#include "core/sdai.h" #include #include -#include "sdaiApplication_instance.h" +#include "core/sdaiApplication_instance.h" // to help ObjectCenter #ifndef HAVE_MEMMOVE diff --git a/src/cldai/sdaiBinary.cc b/src/cldai/sdaiBinary.cc index 4d1a9b4c9..7ccf00689 100644 --- a/src/cldai/sdaiBinary.cc +++ b/src/cldai/sdaiBinary.cc @@ -10,7 +10,7 @@ */ #include -#include +#include "core/sdai.h" SDAI_Binary::SDAI_Binary( const char * str, int max ) { content = std::string( str, max ); diff --git a/src/cldai/sdaiDaObject.cc b/src/cldai/sdaiDaObject.cc index edae7f5b9..801b21b8f 100644 --- a/src/cldai/sdaiDaObject.cc +++ b/src/cldai/sdaiDaObject.cc @@ -2,7 +2,7 @@ #include #include -#include +#include "core/sdai.h" // to help ObjectCenter #ifndef HAVE_MEMMOVE diff --git a/src/cldai/sdaiEntity_extent.cc b/src/cldai/sdaiEntity_extent.cc index 90d37089c..d28fca2bb 100644 --- a/src/cldai/sdaiEntity_extent.cc +++ b/src/cldai/sdaiEntity_extent.cc @@ -2,7 +2,7 @@ //#include -#include +#include "core/sdai.h" SDAI_Entity_extent::SDAI_Entity_extent( ) : _definition( 0 ), _definition_name( 0 ), _owned_by( 0 ) { diff --git a/src/cldai/sdaiEntity_extent_set.cc b/src/cldai/sdaiEntity_extent_set.cc index 1cda8be03..ca464eb2b 100644 --- a/src/cldai/sdaiEntity_extent_set.cc +++ b/src/cldai/sdaiEntity_extent_set.cc @@ -26,7 +26,7 @@ #include #include -#include +#include "core/sdai.h" /* #include diff --git a/src/cldai/sdaiEnum.cc b/src/cldai/sdaiEnum.cc index e89ddd8dc..65ce8828f 100644 --- a/src/cldai/sdaiEnum.cc +++ b/src/cldai/sdaiEnum.cc @@ -1,5 +1,5 @@ -#include +#include "core/sdai.h" /* * NIST STEP Core Class Library diff --git a/src/cldai/sdaiModel_contents.cc b/src/cldai/sdaiModel_contents.cc index c061d20a7..b7043a454 100644 --- a/src/cldai/sdaiModel_contents.cc +++ b/src/cldai/sdaiModel_contents.cc @@ -1,5 +1,5 @@ -#include +#include "core/sdai.h" ///////// SDAI_Model_contents_instances diff --git a/src/cldai/sdaiModel_contents_list.cc b/src/cldai/sdaiModel_contents_list.cc index 882f4287c..a74aadb41 100644 --- a/src/cldai/sdaiModel_contents_list.cc +++ b/src/cldai/sdaiModel_contents_list.cc @@ -23,7 +23,7 @@ /* * UArray implementation. */ -#include +#include "core/sdai.h" // to help ObjectCenter #ifndef HAVE_MEMMOVE diff --git a/src/cldai/sdaiObject.cc b/src/cldai/sdaiObject.cc index 2ab8352ad..f0a1ac592 100644 --- a/src/cldai/sdaiObject.cc +++ b/src/cldai/sdaiObject.cc @@ -1,4 +1,4 @@ -#include +#include "core/sdai.h" SDAI_sdaiObject::SDAI_sdaiObject() { } diff --git a/src/cldai/sdaiSession_instance.cc b/src/cldai/sdaiSession_instance.cc index 578154428..5c8a901d2 100644 --- a/src/cldai/sdaiSession_instance.cc +++ b/src/cldai/sdaiSession_instance.cc @@ -1,4 +1,4 @@ -#include +#include "core/sdai.h" SDAI_Session_instance::SDAI_Session_instance() { } diff --git a/src/cldai/sdaiSession_instance.h b/src/cldai/sdaiSession_instance.h index fcc8fad15..4423037cf 100644 --- a/src/cldai/sdaiSession_instance.h +++ b/src/cldai/sdaiSession_instance.h @@ -3,7 +3,7 @@ #define SESSION_INSTANCE_H 1 #include -//#include +//#include "core/sdai.h" class SC_DAI_EXPORT SDAI_Session_instance : public SDAI_sdaiObject { diff --git a/src/cldai/sdaiString.cc b/src/cldai/sdaiString.cc index f640633ee..e5818d190 100644 --- a/src/cldai/sdaiString.cc +++ b/src/cldai/sdaiString.cc @@ -9,7 +9,7 @@ * and is not subject to copyright. */ -#include +#include "core/sdai.h" #include SDAI_String::SDAI_String( const char * str, size_t max ) { diff --git a/src/cleditor/STEPfile.cc b/src/cleditor/STEPfile.cc index b7f536a39..a162f8a69 100644 --- a/src/cleditor/STEPfile.cc +++ b/src/cleditor/STEPfile.cc @@ -25,7 +25,7 @@ #include #include -#include +#include "core/sdai.h" #include #include #include diff --git a/src/cleditor/SdaiHeaderSchema.h b/src/cleditor/SdaiHeaderSchema.h index c57dc582d..3fc7a851a 100644 --- a/src/cleditor/SdaiHeaderSchema.h +++ b/src/cleditor/SdaiHeaderSchema.h @@ -5,7 +5,7 @@ // regenerate it. #include -#include +#include "core/sdai.h" #include "core/Registry.h" #include #include diff --git a/src/cleditor/SdaiSchemaInit.h b/src/cleditor/SdaiSchemaInit.h index a4dc6f740..642f0bd97 100644 --- a/src/cleditor/SdaiSchemaInit.h +++ b/src/cleditor/SdaiSchemaInit.h @@ -9,7 +9,7 @@ #endif #include -#include +#include "core/sdai.h" #include "core/Registry.h" #include #include diff --git a/src/cleditor/cmdmgr.h b/src/cleditor/cmdmgr.h index 2d2651db3..dda9810e9 100644 --- a/src/cleditor/cmdmgr.h +++ b/src/cleditor/cmdmgr.h @@ -22,7 +22,7 @@ #include "core/mgrnodelist.h" #include "core/dispnode.h" #include "core/dispnodelist.h" -#include +#include "core/SingleLinkList.h" //#define NUM_CMDMGR_CMDS 9 // this is the number of columns that contain cmds (as opposed diff --git a/src/cleditor/seeinfodefault.h b/src/cleditor/seeinfodefault.h index 51198eac8..66ba1ce89 100644 --- a/src/cleditor/seeinfodefault.h +++ b/src/cleditor/seeinfodefault.h @@ -20,7 +20,7 @@ class MgrNode; class DisplayNode; class DisplayNodelist; -#include +#include "core/sdai.h" //class SDAI_Application_instance; #include diff --git a/src/cllazyfile/lazyInstMgr.cc b/src/cllazyfile/lazyInstMgr.cc index f2a4f3867..107bdfb5d 100644 --- a/src/cllazyfile/lazyInstMgr.cc +++ b/src/cllazyfile/lazyInstMgr.cc @@ -1,12 +1,12 @@ #include "lazyTypes.h" #include "lazyInstMgr.h" #include "core/Registry.h" -#include +#include "core/SubSuperIterators.h" #include "SdaiSchemaInit.h" #include "instMgrHelper.h" #include "lazyRefs.h" -#include "sdaiApplication_instance.h" +#include "core/sdaiApplication_instance.h" lazyInstMgr::lazyInstMgr() { _headerRegistry = new Registry( HeaderSchemaInit ); diff --git a/src/cllazyfile/lazyRefs.h b/src/cllazyfile/lazyRefs.h index bcfa3fa9b..62fbd0dc4 100644 --- a/src/cllazyfile/lazyRefs.h +++ b/src/cllazyfile/lazyRefs.h @@ -10,7 +10,7 @@ #include "lazyTypes.h" #include "lazyInstMgr.h" #include "core/ExpDict.h" -#include "SubSuperIterators.h" +#include "core/SubSuperIterators.h" #include #include diff --git a/src/cllazyfile/sectionReader.cc b/src/cllazyfile/sectionReader.cc index 7125fda46..70385a0f6 100644 --- a/src/cllazyfile/sectionReader.cc +++ b/src/cllazyfile/sectionReader.cc @@ -13,7 +13,7 @@ #endif #include "core/Registry.h" -#include "sdaiApplication_instance.h" +#include "core/sdaiApplication_instance.h" #include "core/read_func.h" #include "SdaiSchemaInit.h" #include "STEPcomplex.h" diff --git a/src/clstepcore/CMakeLists.txt b/src/clstepcore/CMakeLists.txt index 27b1d2ffc..3280aefc3 100644 --- a/src/clstepcore/CMakeLists.txt +++ b/src/clstepcore/CMakeLists.txt @@ -63,12 +63,6 @@ set(LIBSTEPCORE_SRCS ) set(SC_CLSTEPCORE_HDRS - schRename.h - sdai.h - sdaiApplication_instance.h - sdaiSelect.h - selectTypeDescriptor.h - SingleLinkList.h STEPaggregate.h STEPaggrBinary.h STEPaggrEntity.h @@ -83,13 +77,6 @@ set(SC_CLSTEPCORE_HDRS STEPcomplex.h STEPinvAttrList.h STEPundefined.h - stringTypeDescriptor.h - SubSuperIterators.h - typeDescriptor.h - typeDescriptorList.h - typeOrRuleVar.h - uniquenessRule.h - whereRule.h ) include_directories( diff --git a/src/clstepcore/STEPaggrEntity.cc b/src/clstepcore/STEPaggrEntity.cc index c0fddfbbb..6b4fc1512 100644 --- a/src/clstepcore/STEPaggrEntity.cc +++ b/src/clstepcore/STEPaggrEntity.cc @@ -1,6 +1,6 @@ #include "STEPaggrEntity.h" #include "STEPattribute.h" -#include "typeDescriptor.h" +#include "core/typeDescriptor.h" #include /** \file STEPaggrEntity.cc diff --git a/src/clstepcore/STEPaggrSelect.cc b/src/clstepcore/STEPaggrSelect.cc index 2e02113d7..b14a1a4f7 100644 --- a/src/clstepcore/STEPaggrSelect.cc +++ b/src/clstepcore/STEPaggrSelect.cc @@ -1,5 +1,5 @@ #include "STEPaggrSelect.h" -#include "typeDescriptor.h" +#include "core/typeDescriptor.h" #include /** \file STEPaggrSelect.cc diff --git a/src/clstepcore/STEPaggregate.h b/src/clstepcore/STEPaggregate.h index 1b9f52193..2d62f227a 100644 --- a/src/clstepcore/STEPaggregate.h +++ b/src/clstepcore/STEPaggregate.h @@ -18,9 +18,9 @@ class TypeDescriptor; #include #include -#include +#include "core/SingleLinkList.h" #include "core/baseType.h" -#include +#include "core/sdai.h" #include #include diff --git a/src/clstepcore/STEPattribute.cc b/src/clstepcore/STEPattribute.cc index 2175a2670..cf8ea382e 100644 --- a/src/clstepcore/STEPattribute.cc +++ b/src/clstepcore/STEPattribute.cc @@ -18,7 +18,7 @@ #include #include #include "core/ExpDict.h" -#include +#include "core/sdai.h" // REAL_NUM_PRECISION is defined in STEPattribute.h, and is also used // in aggregate real handling (STEPaggregate.cc) -- IMS 6 Jun 95 diff --git a/src/clstepcore/STEPattribute.h b/src/clstepcore/STEPattribute.h index 61fbeaf71..754cec9d1 100644 --- a/src/clstepcore/STEPattribute.h +++ b/src/clstepcore/STEPattribute.h @@ -18,7 +18,7 @@ #include #include "core/baseType.h" -#include +#include "core/sdai.h" /** \def REAL_NUM_PRECISION * this is used to set a const int Real_Num_Precision diff --git a/src/clstepcore/STEPattributeList.h b/src/clstepcore/STEPattributeList.h index 9159f4664..929ef84a2 100644 --- a/src/clstepcore/STEPattributeList.h +++ b/src/clstepcore/STEPattributeList.h @@ -16,7 +16,7 @@ class STEPattribute; #include -#include +#include "core/SingleLinkList.h" class STEPattributeList; diff --git a/src/clstepcore/STEPcomplex.h b/src/clstepcore/STEPcomplex.h index d437e6dc2..6e64f3e20 100644 --- a/src/clstepcore/STEPcomplex.h +++ b/src/clstepcore/STEPcomplex.h @@ -3,7 +3,7 @@ #include #include -#include +#include "core/sdai.h" #include "core/baseType.h" #include "core/ExpDict.h" #include "core/Registry.h" diff --git a/src/clstepcore/STEPinvAttrList.h b/src/clstepcore/STEPinvAttrList.h index 342720065..7df262a34 100644 --- a/src/clstepcore/STEPinvAttrList.h +++ b/src/clstepcore/STEPinvAttrList.h @@ -15,7 +15,7 @@ class Inverse_attribute; #include -#include +#include "core/SingleLinkList.h" class STEPinvAttrList; class EntityAggregate; diff --git a/src/clstepcore/SingleLinkList.cc b/src/clstepcore/SingleLinkList.cc index d46cc062e..9a4f750dc 100644 --- a/src/clstepcore/SingleLinkList.cc +++ b/src/clstepcore/SingleLinkList.cc @@ -10,7 +10,7 @@ * and is not subject to copyright. */ -#include +#include "core/SingleLinkList.h" #include diff --git a/src/clstepcore/dictSchema.cc b/src/clstepcore/dictSchema.cc index 5e739287c..301d2c42d 100644 --- a/src/clstepcore/dictSchema.cc +++ b/src/clstepcore/dictSchema.cc @@ -1,6 +1,6 @@ #include "core/dictSchema.h" -#include "typeDescriptor.h" +#include "core/typeDescriptor.h" #include "core/entityDescriptor.h" Schema::Schema( const char * schemaName ) diff --git a/src/clstepcore/entityDescriptor.cc b/src/clstepcore/entityDescriptor.cc index ef16eca82..4b4ceaf98 100644 --- a/src/clstepcore/entityDescriptor.cc +++ b/src/clstepcore/entityDescriptor.cc @@ -4,7 +4,7 @@ #include "core/Registry.h" #include "core/attrDescriptor.h" #include "core/inverseAttribute.h" -#include "SubSuperIterators.h" +#include "core/SubSuperIterators.h" EntityDescriptor::EntityDescriptor( ) : _abstractEntity( LUnknown ), _extMapping( LUnknown ), diff --git a/src/clstepcore/instmgr.cc b/src/clstepcore/instmgr.cc index 2da10f762..f0ef13892 100644 --- a/src/clstepcore/instmgr.cc +++ b/src/clstepcore/instmgr.cc @@ -16,7 +16,7 @@ // ////////////////////////////////////////////////////////////////////////////// -#include +#include "core/sdai.h" #include "core/instmgr.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/src/clstepcore/mgrnode.cc b/src/clstepcore/mgrnode.cc index 33007e7fc..f6ceafcaf 100644 --- a/src/clstepcore/mgrnode.cc +++ b/src/clstepcore/mgrnode.cc @@ -19,7 +19,7 @@ #include "core/instmgr.h" //#include -#include +#include "core/sdai.h" #include diff --git a/src/clstepcore/mgrnodearray.cc b/src/clstepcore/mgrnodearray.cc index aae8efc43..0467f73a1 100644 --- a/src/clstepcore/mgrnodearray.cc +++ b/src/clstepcore/mgrnodearray.cc @@ -34,7 +34,7 @@ static int PrintFunctionTrace = 2; #include "core/mgrnodearray.h" //#include -#include +#include "core/sdai.h" #include // to get bcopy() - ANSI diff --git a/src/clstepcore/read_func.cc b/src/clstepcore/read_func.cc index e251ed603..3a0d3bcc7 100644 --- a/src/clstepcore/read_func.cc +++ b/src/clstepcore/read_func.cc @@ -1,7 +1,7 @@ #include #include -#include +#include "core/sdai.h" #include "core/read_func.h" #include #include "Str.h" diff --git a/src/clstepcore/schRename.cc b/src/clstepcore/schRename.cc index b7159a6e0..b0f96c4c0 100644 --- a/src/clstepcore/schRename.cc +++ b/src/clstepcore/schRename.cc @@ -1,4 +1,4 @@ -#include "schRename.h" +#include "core/schRename.h" /** diff --git a/src/clstepcore/sdai.cc b/src/clstepcore/sdai.cc index ee1631e74..00ea0f932 100644 --- a/src/clstepcore/sdai.cc +++ b/src/clstepcore/sdai.cc @@ -1,7 +1,7 @@ #include #include -#include +#include "core/sdai.h" const char * SCLversion = "STEPcode, github.com/stepcode/stepcode"; diff --git a/src/clstepcore/sdaiApplication_instance.cc b/src/clstepcore/sdaiApplication_instance.cc index 7bd94355d..26824bfb9 100644 --- a/src/clstepcore/sdaiApplication_instance.cc +++ b/src/clstepcore/sdaiApplication_instance.cc @@ -11,13 +11,13 @@ */ #include -#include +#include "core/sdai.h" #include "core/instmgr.h" #include #include #include "core/read_func.h" //for ReadTokenSeparator, used when comments are inside entities -#include "sdaiApplication_instance.h" +#include "core/sdaiApplication_instance.h" #include "superInvAttrIter.h" SDAI_Application_instance NilSTEPentity; diff --git a/src/clstepcore/sdaiSelect.cc b/src/clstepcore/sdaiSelect.cc index 060a7b149..69595178c 100644 --- a/src/clstepcore/sdaiSelect.cc +++ b/src/clstepcore/sdaiSelect.cc @@ -14,7 +14,7 @@ #include "core/ExpDict.h" #include #include -#include +#include "core/sdai.h" #include #ifdef SC_LOGGING diff --git a/src/clstepcore/selectTypeDescriptor.cc b/src/clstepcore/selectTypeDescriptor.cc index a7c0ad032..c3737b85b 100644 --- a/src/clstepcore/selectTypeDescriptor.cc +++ b/src/clstepcore/selectTypeDescriptor.cc @@ -1,4 +1,4 @@ -#include "selectTypeDescriptor.h" +#include "core/selectTypeDescriptor.h" /////////////////////////////////////////////////////////////////////////////// // SelectTypeDescriptor functions diff --git a/src/clstepcore/superInvAttrIter.h b/src/clstepcore/superInvAttrIter.h index 4b7a02a1d..0f7853bc1 100644 --- a/src/clstepcore/superInvAttrIter.h +++ b/src/clstepcore/superInvAttrIter.h @@ -1,7 +1,7 @@ #ifndef SUPERINVATTRITER_H #define SUPERINVATTRITER_H -#include "SubSuperIterators.h" +#include "core/SubSuperIterators.h" #include "core/ExpDict.h" /** diff --git a/src/clstepcore/test/test_SupertypesIterator.cc b/src/clstepcore/test/test_SupertypesIterator.cc index 9fe2a54b7..52f6ca795 100644 --- a/src/clstepcore/test/test_SupertypesIterator.cc +++ b/src/clstepcore/test/test_SupertypesIterator.cc @@ -4,7 +4,7 @@ //subtypesiterator shouldn't need tested separately from supertypesiterator since there is very little difference -#include "SubSuperIterators.h" +#include "core/SubSuperIterators.h" #include "core/ExpDict.h" #include diff --git a/src/clstepcore/test/test_operators_SDAI_Select.cc b/src/clstepcore/test/test_operators_SDAI_Select.cc index 83e0f6469..a0e920c38 100644 --- a/src/clstepcore/test/test_operators_SDAI_Select.cc +++ b/src/clstepcore/test/test_operators_SDAI_Select.cc @@ -8,7 +8,7 @@ #include "core/ExpDict.h" #include "core/baseType.h" -#include "sdaiSelect.h" +#include "core/sdaiSelect.h" using namespace std; diff --git a/src/clstepcore/typeDescriptor.cc b/src/clstepcore/typeDescriptor.cc index 651a508f5..c1394c8f6 100644 --- a/src/clstepcore/typeDescriptor.cc +++ b/src/clstepcore/typeDescriptor.cc @@ -1,4 +1,4 @@ -#include "typeDescriptor.h" +#include "core/typeDescriptor.h" TypeDescriptor::TypeDescriptor( ) : _name( 0 ), altNames( 0 ), _fundamentalType( UNKNOWN_TYPE ), diff --git a/src/clstepcore/typeDescriptorList.cc b/src/clstepcore/typeDescriptorList.cc index f47e8f502..2a5444378 100644 --- a/src/clstepcore/typeDescriptorList.cc +++ b/src/clstepcore/typeDescriptorList.cc @@ -1,4 +1,4 @@ -#include "typeDescriptorList.h" +#include "core/typeDescriptorList.h" TypeDescLinkNode::TypeDescLinkNode() { _typeDesc = 0; diff --git a/src/clstepcore/typeOrRuleVar.cc b/src/clstepcore/typeOrRuleVar.cc index 0b06f1949..dec362a28 100644 --- a/src/clstepcore/typeOrRuleVar.cc +++ b/src/clstepcore/typeOrRuleVar.cc @@ -1,4 +1,4 @@ -#include "typeOrRuleVar.h" +#include "core/typeOrRuleVar.h" #include diff --git a/src/clstepcore/uniquenessRule.cc b/src/clstepcore/uniquenessRule.cc index 038f1a68f..fd8ba05ca 100644 --- a/src/clstepcore/uniquenessRule.cc +++ b/src/clstepcore/uniquenessRule.cc @@ -1,4 +1,4 @@ -#include "uniquenessRule.h" +#include "core/uniquenessRule.h" #include diff --git a/src/clstepcore/whereRule.cc b/src/clstepcore/whereRule.cc index e60c64940..44f23dc14 100644 --- a/src/clstepcore/whereRule.cc +++ b/src/clstepcore/whereRule.cc @@ -1,4 +1,4 @@ -#include "whereRule.h" +#include "core/whereRule.h" Where_rule::Where_rule() { _type_or_rule = 0; diff --git a/src/exp2cxx/classes_wrapper.cc b/src/exp2cxx/classes_wrapper.cc index 3a3a3e322..0efdae642 100644 --- a/src/exp2cxx/classes_wrapper.cc +++ b/src/exp2cxx/classes_wrapper.cc @@ -75,7 +75,7 @@ void print_file_header( FILES * files ) { fprintf( files->incall, "#include \n" ); fprintf( files->incall, "#endif\n" ); - fprintf( files->incall, "#include \n\n" ); + fprintf( files->incall, "#include \"core/sdai.h\"\n\n" ); fprintf( files->incall, "\n#include \"core/Registry.h\"\n" ); fprintf( files->incall, "\n#include \n" ); fprintf( files->incall, "\n#include \n" ); @@ -643,7 +643,7 @@ void EXPRESSPrint( Express express, ComplexCollect & col, FILES * files ) { } fprintf( files->inc, "\n// in the exp2cxx source code, this file is generally referred to as files->inc or incfile\n" ); - fprintf( incfile, "#include \n" ); + fprintf( incfile, "#include \"core/sdai.h\" \n" ); np = fnm + strlen( fnm ) - 1; /* point to end of constant part of string */ /* 1.9 init unity files (large translation units, faster compilation) */ From b36b78ffce6239dccecad2e5441d9b1a7d5d9a32 Mon Sep 17 00:00:00 2001 From: Clifford Yapp <238416+starseeker@users.noreply.github.com> Date: Sun, 2 Oct 2022 10:50:05 -0400 Subject: [PATCH 09/23] Need to process a few more directories --- include/core/create_Aggr.h | 2 +- include/core/interfacedItem.h | 2 +- include/core/uniquenessRule.h | 2 +- include/core/whereRule.h | 2 +- misc/header_mv.sh | 6 ++++++ src/test/p21read/p21read.cc | 2 +- src/test/tests.h | 2 +- test/cpp/schema_specific/aggregate_bound_runtime.cc | 6 +++--- test/cpp/schema_specific/attribute.cc | 6 +++--- test/cpp/schema_specific/inverse_attr1.cc | 6 +++--- test/cpp/schema_specific/inverse_attr2.cc | 6 +++--- test/cpp/schema_specific/inverse_attr3.cc | 6 +++--- test/cpp/schema_specific/stepfile_rw_progress.cc | 6 +++--- 13 files changed, 30 insertions(+), 24 deletions(-) diff --git a/include/core/create_Aggr.h b/include/core/create_Aggr.h index a0483fa66..e6b6b39cb 100644 --- a/include/core/create_Aggr.h +++ b/include/core/create_Aggr.h @@ -3,7 +3,7 @@ //typedef's for aggregate creators -#include "sdai.h" +#include "core/sdai.h" #include "sc_export.h" diff --git a/include/core/interfacedItem.h b/include/core/interfacedItem.h index 5084cab60..909aa3881 100644 --- a/include/core/interfacedItem.h +++ b/include/core/interfacedItem.h @@ -3,7 +3,7 @@ #include "core/dictionaryInstance.h" -#include "sdai.h" +#include "core/sdai.h" #include "sc_export.h" diff --git a/include/core/uniquenessRule.h b/include/core/uniquenessRule.h index 2ce576b66..93c13a75d 100644 --- a/include/core/uniquenessRule.h +++ b/include/core/uniquenessRule.h @@ -3,7 +3,7 @@ #include "core/dictionaryInstance.h" -#include "sdai.h" +#include "core/sdai.h" #include "sc_export.h" diff --git a/include/core/whereRule.h b/include/core/whereRule.h index 7c36ec1ee..3a88f71c9 100644 --- a/include/core/whereRule.h +++ b/include/core/whereRule.h @@ -2,7 +2,7 @@ #define WHERERULE_H #include -#include "sdai.h" +#include "core/sdai.h" #include "core/dictionaryInstance.h" #include "typeOrRuleVar.h" diff --git a/misc/header_mv.sh b/misc/header_mv.sh index 6e3170786..8735a4421 100755 --- a/misc/header_mv.sh +++ b/misc/header_mv.sh @@ -2,3 +2,9 @@ find . -type f -path "*/cl*" -not -path "*.git/*" -not -path "*/exp*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include \"$1\"/include \"core\/$1\"/g" {} \; find . -type f -path "*/cl*" -not -path "*.git/*" -not -path "*/exp*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include <$1>/include \"core\/$1\"/g" {} \; +find . -type f -path "*/include*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include \"$1\"/include \"core\/$1\"/g" {} \; +find . -type f -path "*/include*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include <$1>/include \"core\/$1\"/g" {} \; + +find . -type f -path "*/test*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include \"$1\"/include \"core\/$1\"/g" {} \; +find . -type f -path "*/test*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include <$1>/include \"core\/$1\"/g" {} \; + diff --git a/src/test/p21read/p21read.cc b/src/test/p21read/p21read.cc index c9fa7875a..1bf8d6c12 100644 --- a/src/test/p21read/p21read.cc +++ b/src/test/p21read/p21read.cc @@ -14,7 +14,7 @@ extern void SchemaInit( class Registry & ); #include -#include +#include "core/sdai.h" #include #include "core/ExpDict.h" #include "core/Registry.h" diff --git a/src/test/tests.h b/src/test/tests.h index 85b3b010c..df4e3af01 100644 --- a/src/test/tests.h +++ b/src/test/tests.h @@ -19,7 +19,7 @@ #include "core/ExpDict.h" #include #include -#include +#include "core/sdai.h" /* Stuff more or less specifically for the Example schema */ /* The only program that needs this is tstatic. Since the other programs */ diff --git a/test/cpp/schema_specific/aggregate_bound_runtime.cc b/test/cpp/schema_specific/aggregate_bound_runtime.cc index fe103ab8e..e4d8ea64c 100644 --- a/test/cpp/schema_specific/aggregate_bound_runtime.cc +++ b/test/cpp/schema_specific/aggregate_bound_runtime.cc @@ -1,9 +1,9 @@ #include -#include +#include "core/sdai.h" #include -#include -#include +#include "core/ExpDict.h" +#include "core/Registry.h" #include #include #include diff --git a/test/cpp/schema_specific/attribute.cc b/test/cpp/schema_specific/attribute.cc index 79d462fda..c7b951d5a 100644 --- a/test/cpp/schema_specific/attribute.cc +++ b/test/cpp/schema_specific/attribute.cc @@ -4,10 +4,10 @@ */ #include "config.h" #include -#include +#include "core/sdai.h" #include -#include -#include +#include "core/ExpDict.h" +#include "core/Registry.h" #include #include #include diff --git a/test/cpp/schema_specific/inverse_attr1.cc b/test/cpp/schema_specific/inverse_attr1.cc index 079ababbf..46b066839 100644 --- a/test/cpp/schema_specific/inverse_attr1.cc +++ b/test/cpp/schema_specific/inverse_attr1.cc @@ -6,10 +6,10 @@ #include "config.h" #include "SubSuperIterators.h" #include -#include +#include "core/sdai.h" #include -#include -#include +#include "core/ExpDict.h" +#include "core/Registry.h" #include #include #include diff --git a/test/cpp/schema_specific/inverse_attr2.cc b/test/cpp/schema_specific/inverse_attr2.cc index 6423786f6..44d5e18cb 100644 --- a/test/cpp/schema_specific/inverse_attr2.cc +++ b/test/cpp/schema_specific/inverse_attr2.cc @@ -5,10 +5,10 @@ */ #include "config.h" #include -#include +#include "core/sdai.h" #include -#include -#include +#include "core/ExpDict.h" +#include "core/Registry.h" #include #include #include diff --git a/test/cpp/schema_specific/inverse_attr3.cc b/test/cpp/schema_specific/inverse_attr3.cc index 782ebb1df..70d884092 100644 --- a/test/cpp/schema_specific/inverse_attr3.cc +++ b/test/cpp/schema_specific/inverse_attr3.cc @@ -7,10 +7,10 @@ #include "config.h" #include #include -#include +#include "core/sdai.h" #include -#include -#include +#include "core/ExpDict.h" +#include "core/Registry.h" #include #include #include diff --git a/test/cpp/schema_specific/stepfile_rw_progress.cc b/test/cpp/schema_specific/stepfile_rw_progress.cc index e007c7f37..a740d9b0c 100644 --- a/test/cpp/schema_specific/stepfile_rw_progress.cc +++ b/test/cpp/schema_specific/stepfile_rw_progress.cc @@ -1,9 +1,9 @@ #include -#include +#include "core/sdai.h" #include -#include -#include +#include "core/ExpDict.h" +#include "core/Registry.h" #include #include #include From ac19698fde1f893fb46f92629a7979ba68c372d8 Mon Sep 17 00:00:00 2001 From: Clifford Yapp <238416+starseeker@users.noreply.github.com> Date: Sun, 2 Oct 2022 10:59:16 -0400 Subject: [PATCH 10/23] Move remaining stepcore headers --- include/core/CMakeLists.txt | 28 +++++++++---------- .../core}/STEPaggrBinary.h | 2 +- .../core}/STEPaggrEntity.h | 2 +- .../core}/STEPaggrEnum.h | 2 +- .../core}/STEPaggrGeneric.h | 2 +- .../clstepcore => include/core}/STEPaggrInt.h | 2 +- .../core}/STEPaggrReal.h | 2 +- .../core}/STEPaggrSelect.h | 2 +- .../core}/STEPaggrString.h | 2 +- .../core}/STEPaggregate.h | 18 ++++++------ .../core}/STEPattribute.h | 0 .../core}/STEPattributeList.h | 0 .../clstepcore => include/core}/STEPcomplex.h | 0 .../core}/STEPinvAttrList.h | 0 .../core}/STEPundefined.h | 0 include/core/dispnode.h | 2 +- include/core/sdai.h | 4 +-- src/cleditor/STEPfile.cc | 6 ++-- src/cleditor/STEPfile.inline.cc | 2 +- src/cleditor/SdaiHeaderSchema.cc | 2 +- src/cleditor/SdaiHeaderSchema.h | 2 +- src/cleditor/SdaiHeaderSchemaInit.cc | 2 +- src/cleditor/SdaiSchemaInit.h | 6 ++-- src/cllazyfile/lazyRefs.h | 4 +-- src/cllazyfile/sectionReader.cc | 2 +- src/cllazyfile/sectionReader.h | 2 +- src/clstepcore/CMakeLists.txt | 20 ------------- src/clstepcore/STEPaggrBinary.cc | 2 +- src/clstepcore/STEPaggrEntity.cc | 4 +-- src/clstepcore/STEPaggrEnum.cc | 2 +- src/clstepcore/STEPaggrGeneric.cc | 2 +- src/clstepcore/STEPaggrInt.cc | 2 +- src/clstepcore/STEPaggrReal.cc | 2 +- src/clstepcore/STEPaggrSelect.cc | 2 +- src/clstepcore/STEPaggrString.cc | 2 +- src/clstepcore/STEPaggregate.cc | 4 +-- src/clstepcore/STEPattribute.cc | 6 ++-- src/clstepcore/STEPattributeList.cc | 4 +-- src/clstepcore/STEPcomplex.cc | 6 ++-- src/clstepcore/STEPinvAttrList.cc | 2 +- src/clstepcore/STEPundefined.cc | 4 +-- src/clstepcore/create_Aggr.cc | 2 +- src/clstepcore/read_func.cc | 2 +- src/clstepcore/sdaiApplication_instance.cc | 4 +-- src/clstepcore/sdaiSelect.cc | 2 +- src/clstepcore/test/test_null_attr.cc | 2 +- .../test/test_operators_STEPattribute.cc | 2 +- src/exp2cxx/classes_wrapper.cc | 6 ++-- src/exp2cxx/multpass.c | 2 +- src/test/p21read/p21read.cc | 2 +- src/test/tests.h | 2 +- .../aggregate_bound_runtime.cc | 2 +- test/cpp/schema_specific/attribute.cc | 2 +- test/cpp/schema_specific/inverse_attr1.cc | 2 +- test/cpp/schema_specific/inverse_attr2.cc | 2 +- test/cpp/schema_specific/inverse_attr3.cc | 2 +- .../schema_specific/stepfile_rw_progress.cc | 2 +- 57 files changed, 89 insertions(+), 109 deletions(-) rename {src/clstepcore => include/core}/STEPaggrBinary.h (97%) rename {src/clstepcore => include/core}/STEPaggrEntity.h (98%) rename {src/clstepcore => include/core}/STEPaggrEnum.h (98%) rename {src/clstepcore => include/core}/STEPaggrGeneric.h (98%) rename {src/clstepcore => include/core}/STEPaggrInt.h (97%) rename {src/clstepcore => include/core}/STEPaggrReal.h (97%) rename {src/clstepcore => include/core}/STEPaggrSelect.h (99%) rename {src/clstepcore => include/core}/STEPaggrString.h (97%) rename {src/clstepcore => include/core}/STEPaggregate.h (93%) rename {src/clstepcore => include/core}/STEPattribute.h (100%) rename {src/clstepcore => include/core}/STEPattributeList.h (100%) rename {src/clstepcore => include/core}/STEPcomplex.h (100%) rename {src/clstepcore => include/core}/STEPinvAttrList.h (100%) rename {src/clstepcore => include/core}/STEPundefined.h (100%) diff --git a/include/core/CMakeLists.txt b/include/core/CMakeLists.txt index 209bffb51..f43f93519 100644 --- a/include/core/CMakeLists.txt +++ b/include/core/CMakeLists.txt @@ -36,20 +36,20 @@ set(CORE_HDRS sdaiSelect.h selectTypeDescriptor.h SingleLinkList.h -# STEPaggregate.h -# STEPaggrBinary.h -# STEPaggrEntity.h -# STEPaggrEnum.h -# STEPaggrGeneric.h -# STEPaggrInt.h -# STEPaggrReal.h -# STEPaggrSelect.h -# STEPaggrString.h -# STEPattribute.h -# STEPattributeList.h -# STEPcomplex.h -# STEPinvAttrList.h -# STEPundefined.h + STEPaggregate.h + STEPaggrBinary.h + STEPaggrEntity.h + STEPaggrEnum.h + STEPaggrGeneric.h + STEPaggrInt.h + STEPaggrReal.h + STEPaggrSelect.h + STEPaggrString.h + STEPattribute.h + STEPattributeList.h + STEPcomplex.h + STEPinvAttrList.h + STEPundefined.h stringTypeDescriptor.h SubSuperIterators.h typeDescriptor.h diff --git a/src/clstepcore/STEPaggrBinary.h b/include/core/STEPaggrBinary.h similarity index 97% rename from src/clstepcore/STEPaggrBinary.h rename to include/core/STEPaggrBinary.h index cd4991bbb..0afe1612f 100644 --- a/src/clstepcore/STEPaggrBinary.h +++ b/include/core/STEPaggrBinary.h @@ -1,7 +1,7 @@ #ifndef STEPAGGRBINARY_H #define STEPAGGRBINARY_H -#include "STEPaggregate.h" +#include "core/STEPaggregate.h" #include /** \file STEPaggrBinary.h diff --git a/src/clstepcore/STEPaggrEntity.h b/include/core/STEPaggrEntity.h similarity index 98% rename from src/clstepcore/STEPaggrEntity.h rename to include/core/STEPaggrEntity.h index f18bc3d0f..2f80985bf 100644 --- a/src/clstepcore/STEPaggrEntity.h +++ b/include/core/STEPaggrEntity.h @@ -5,7 +5,7 @@ * classes EntityAggregate, EntityNode */ -#include "STEPaggregate.h" +#include "core/STEPaggregate.h" #include class SC_CORE_EXPORT EntityAggregate : public STEPaggregate { diff --git a/src/clstepcore/STEPaggrEnum.h b/include/core/STEPaggrEnum.h similarity index 98% rename from src/clstepcore/STEPaggrEnum.h rename to include/core/STEPaggrEnum.h index 14cf1d6de..fb181ee8e 100644 --- a/src/clstepcore/STEPaggrEnum.h +++ b/include/core/STEPaggrEnum.h @@ -1,7 +1,7 @@ #ifndef STEPAGGRENUM_H #define STEPAGGRENUM_H -#include "STEPaggregate.h" +#include "core/STEPaggregate.h" #include "sc_export.h" /** \file StepaggrEnum.h * classes EnumAggregate, LOGICALS, BOOLEANS, EnumNode diff --git a/src/clstepcore/STEPaggrGeneric.h b/include/core/STEPaggrGeneric.h similarity index 98% rename from src/clstepcore/STEPaggrGeneric.h rename to include/core/STEPaggrGeneric.h index 76190406e..c122d2be9 100644 --- a/src/clstepcore/STEPaggrGeneric.h +++ b/include/core/STEPaggrGeneric.h @@ -1,7 +1,7 @@ #ifndef STEPAGGRGENERIC_H #define STEPAGGRGENERIC_H -#include "STEPaggregate.h" +#include "core/STEPaggregate.h" #include /** \file STEPaggrGeneric.h diff --git a/src/clstepcore/STEPaggrInt.h b/include/core/STEPaggrInt.h similarity index 97% rename from src/clstepcore/STEPaggrInt.h rename to include/core/STEPaggrInt.h index 726d07c0e..95d392f64 100644 --- a/src/clstepcore/STEPaggrInt.h +++ b/include/core/STEPaggrInt.h @@ -1,7 +1,7 @@ #ifndef STEPAGGRINT_H #define STEPAGGRINT_H -#include "STEPaggregate.h" +#include "core/STEPaggregate.h" #include class SC_CORE_EXPORT IntAggregate : public STEPaggregate { diff --git a/src/clstepcore/STEPaggrReal.h b/include/core/STEPaggrReal.h similarity index 97% rename from src/clstepcore/STEPaggrReal.h rename to include/core/STEPaggrReal.h index 48cd90e51..fb3dad7c4 100644 --- a/src/clstepcore/STEPaggrReal.h +++ b/include/core/STEPaggrReal.h @@ -1,7 +1,7 @@ #ifndef STEPAGGRREAL_H #define STEPAGGRREAL_H -#include "STEPaggregate.h" +#include "core/STEPaggregate.h" #include class SC_CORE_EXPORT RealAggregate : public STEPaggregate { diff --git a/src/clstepcore/STEPaggrSelect.h b/include/core/STEPaggrSelect.h similarity index 99% rename from src/clstepcore/STEPaggrSelect.h rename to include/core/STEPaggrSelect.h index 1b97d6e43..82e39dbf6 100644 --- a/src/clstepcore/STEPaggrSelect.h +++ b/include/core/STEPaggrSelect.h @@ -1,7 +1,7 @@ #ifndef STEPAGGRSELECT_H #define STEPAGGRSELECT_H -#include "STEPaggregate.h" +#include "core/STEPaggregate.h" #include /** \file STEPaggrSelect.h diff --git a/src/clstepcore/STEPaggrString.h b/include/core/STEPaggrString.h similarity index 97% rename from src/clstepcore/STEPaggrString.h rename to include/core/STEPaggrString.h index 6f5cc8331..91c148891 100644 --- a/src/clstepcore/STEPaggrString.h +++ b/include/core/STEPaggrString.h @@ -1,7 +1,7 @@ #ifndef STEPAGGRSTRING_H #define STEPAGGRSTRING_H -#include "STEPaggregate.h" +#include "core/STEPaggregate.h" #include /** \file STEPaggrString.h diff --git a/src/clstepcore/STEPaggregate.h b/include/core/STEPaggregate.h similarity index 93% rename from src/clstepcore/STEPaggregate.h rename to include/core/STEPaggregate.h index 2d62f227a..efb3477a6 100644 --- a/src/clstepcore/STEPaggregate.h +++ b/include/core/STEPaggregate.h @@ -21,7 +21,7 @@ class TypeDescriptor; #include "core/SingleLinkList.h" #include "core/baseType.h" #include "core/sdai.h" -#include +#include "core/STEPundefined.h" #include #define AGGR_NULL &NilSTEPaggregate @@ -110,14 +110,14 @@ class SC_CORE_EXPORT STEPnode : public SingleLinkNode { }; typedef STEPnode * STEPnodeH; -#include "STEPaggrGeneric.h" -#include "STEPaggrEntity.h" -#include "STEPaggrSelect.h" -#include "STEPaggrString.h" -#include "STEPaggrBinary.h" -#include "STEPaggrEnum.h" -#include "STEPaggrReal.h" -#include "STEPaggrInt.h" +#include "core/STEPaggrGeneric.h" +#include "core/STEPaggrEntity.h" +#include "core/STEPaggrSelect.h" +#include "core/STEPaggrString.h" +#include "core/STEPaggrBinary.h" +#include "core/STEPaggrEnum.h" +#include "core/STEPaggrReal.h" +#include "core/STEPaggrInt.h" /****************************************************************** ** FIXME The following classes are currently stubs diff --git a/src/clstepcore/STEPattribute.h b/include/core/STEPattribute.h similarity index 100% rename from src/clstepcore/STEPattribute.h rename to include/core/STEPattribute.h diff --git a/src/clstepcore/STEPattributeList.h b/include/core/STEPattributeList.h similarity index 100% rename from src/clstepcore/STEPattributeList.h rename to include/core/STEPattributeList.h diff --git a/src/clstepcore/STEPcomplex.h b/include/core/STEPcomplex.h similarity index 100% rename from src/clstepcore/STEPcomplex.h rename to include/core/STEPcomplex.h diff --git a/src/clstepcore/STEPinvAttrList.h b/include/core/STEPinvAttrList.h similarity index 100% rename from src/clstepcore/STEPinvAttrList.h rename to include/core/STEPinvAttrList.h diff --git a/src/clstepcore/STEPundefined.h b/include/core/STEPundefined.h similarity index 100% rename from src/clstepcore/STEPundefined.h rename to include/core/STEPundefined.h diff --git a/include/core/dispnode.h b/include/core/dispnode.h index c22b62644..44b0cc233 100644 --- a/include/core/dispnode.h +++ b/include/core/dispnode.h @@ -17,7 +17,7 @@ #include -/*#include */ +/*#include "core/STEPattribute.h"*/ /*#include */ #include "core/sdai.h" diff --git a/include/core/sdai.h b/include/core/sdai.h index b5f316708..9e080f019 100644 --- a/include/core/sdai.h +++ b/include/core/sdai.h @@ -40,8 +40,8 @@ class EntityDescriptor; class SelectTypeDescriptor; class InstMgrBase; -#include "STEPattributeList.h" -#include "STEPinvAttrList.h" +#include "core/STEPattributeList.h" +#include "core/STEPinvAttrList.h" class STEPattributeList; class STEPattribute; diff --git a/src/cleditor/STEPfile.cc b/src/cleditor/STEPfile.cc index a162f8a69..0d7f90450 100644 --- a/src/cleditor/STEPfile.cc +++ b/src/cleditor/STEPfile.cc @@ -26,13 +26,13 @@ #include #include "core/sdai.h" -#include -#include +#include "core/STEPcomplex.h" +#include "core/STEPattribute.h" #include // STEPundefined contains // void PushPastString (istream& in, std::string &s, ErrorDescriptor *err) -#include +#include "core/STEPundefined.h" /** * \returns The new file name for the class. diff --git a/src/cleditor/STEPfile.inline.cc b/src/cleditor/STEPfile.inline.cc index b02d84d97..e525a5206 100644 --- a/src/cleditor/STEPfile.inline.cc +++ b/src/cleditor/STEPfile.inline.cc @@ -13,7 +13,7 @@ #include #include -#include +#include "core/STEPaggregate.h" #include #include diff --git a/src/cleditor/SdaiHeaderSchema.cc b/src/cleditor/SdaiHeaderSchema.cc index f013606b9..efca80295 100644 --- a/src/cleditor/SdaiHeaderSchema.cc +++ b/src/cleditor/SdaiHeaderSchema.cc @@ -11,7 +11,7 @@ extern ofstream * logStream; #endif #include "core/ExpDict.h" -#include +#include "core/STEPattribute.h" #include Schema * s_header_section_schema = 0; diff --git a/src/cleditor/SdaiHeaderSchema.h b/src/cleditor/SdaiHeaderSchema.h index 3fc7a851a..78e2089b8 100644 --- a/src/cleditor/SdaiHeaderSchema.h +++ b/src/cleditor/SdaiHeaderSchema.h @@ -7,7 +7,7 @@ #include #include "core/sdai.h" #include "core/Registry.h" -#include +#include "core/STEPaggregate.h" #include #include diff --git a/src/cleditor/SdaiHeaderSchemaInit.cc b/src/cleditor/SdaiHeaderSchemaInit.cc index 2f906e30c..b5e1a7125 100644 --- a/src/cleditor/SdaiHeaderSchemaInit.cc +++ b/src/cleditor/SdaiHeaderSchemaInit.cc @@ -6,7 +6,7 @@ #include "core/Registry.h" #include "core/ExpDict.h" -#include +#include "core/STEPattribute.h" #include void SdaiHEADER_SECTION_SCHEMAInit( Registry & reg ) { diff --git a/src/cleditor/SdaiSchemaInit.h b/src/cleditor/SdaiSchemaInit.h index 642f0bd97..f5d1a4464 100644 --- a/src/cleditor/SdaiSchemaInit.h +++ b/src/cleditor/SdaiSchemaInit.h @@ -11,10 +11,10 @@ #include #include "core/sdai.h" #include "core/Registry.h" -#include -#include +#include "core/STEPaggregate.h" +#include "core/STEPundefined.h" #include "core/ExpDict.h" -#include +#include "core/STEPattribute.h" #include "core/complexSupport.h" #include diff --git a/src/cllazyfile/lazyRefs.h b/src/cllazyfile/lazyRefs.h index 62fbd0dc4..801cc642d 100644 --- a/src/cllazyfile/lazyRefs.h +++ b/src/cllazyfile/lazyRefs.h @@ -11,8 +11,8 @@ #include "lazyInstMgr.h" #include "core/ExpDict.h" #include "core/SubSuperIterators.h" -#include -#include +#include "core/STEPattribute.h" +#include "core/STEPaggregate.h" #ifdef _WIN32 #define strcasecmp _strcmpi diff --git a/src/cllazyfile/sectionReader.cc b/src/cllazyfile/sectionReader.cc index 70385a0f6..144d386b3 100644 --- a/src/cllazyfile/sectionReader.cc +++ b/src/cllazyfile/sectionReader.cc @@ -16,7 +16,7 @@ #include "core/sdaiApplication_instance.h" #include "core/read_func.h" #include "SdaiSchemaInit.h" -#include "STEPcomplex.h" +#include "core/STEPcomplex.h" #include "sectionReader.h" #include "lazyFileReader.h" diff --git a/src/cllazyfile/sectionReader.h b/src/cllazyfile/sectionReader.h index b2b7f726a..1e3379cc1 100644 --- a/src/cllazyfile/sectionReader.h +++ b/src/cllazyfile/sectionReader.h @@ -6,7 +6,7 @@ #include "lazyTypes.h" #include "sc_export.h" #include "errordesc.h" -#include "STEPcomplex.h" +#include "core/STEPcomplex.h" class SDAI_Application_instance; class lazyFileReader; diff --git a/src/clstepcore/CMakeLists.txt b/src/clstepcore/CMakeLists.txt index 3280aefc3..d7f6cd539 100644 --- a/src/clstepcore/CMakeLists.txt +++ b/src/clstepcore/CMakeLists.txt @@ -62,23 +62,6 @@ set(LIBSTEPCORE_SRCS whereRule.cc ) -set(SC_CLSTEPCORE_HDRS - STEPaggregate.h - STEPaggrBinary.h - STEPaggrEntity.h - STEPaggrEnum.h - STEPaggrGeneric.h - STEPaggrInt.h - STEPaggrReal.h - STEPaggrSelect.h - STEPaggrString.h - STEPattribute.h - STEPattributeList.h - STEPcomplex.h - STEPinvAttrList.h - STEPundefined.h -) - include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/include/stepcode @@ -100,9 +83,6 @@ if(BUILD_STATIC_LIBS) SC_ADDLIB(stepcore-static STATIC SOURCES ${LIBSTEPCORE_SRCS} LINK_LIBRARIES $-static) endif() -install(FILES ${SC_CLSTEPCORE_HDRS} - DESTINATION ${INCLUDE_DIR}/stepcode/clstepcore) - if(SC_ENABLE_TESTING) add_subdirectory(test) endif(SC_ENABLE_TESTING) diff --git a/src/clstepcore/STEPaggrBinary.cc b/src/clstepcore/STEPaggrBinary.cc index fd7302748..90172139f 100644 --- a/src/clstepcore/STEPaggrBinary.cc +++ b/src/clstepcore/STEPaggrBinary.cc @@ -1,4 +1,4 @@ -#include "STEPaggrBinary.h" +#include "core/STEPaggrBinary.h" #include /** \file STEPaggrBinary.cc diff --git a/src/clstepcore/STEPaggrEntity.cc b/src/clstepcore/STEPaggrEntity.cc index 6b4fc1512..5f677ee1e 100644 --- a/src/clstepcore/STEPaggrEntity.cc +++ b/src/clstepcore/STEPaggrEntity.cc @@ -1,5 +1,5 @@ -#include "STEPaggrEntity.h" -#include "STEPattribute.h" +#include "core/STEPaggrEntity.h" +#include "core/STEPattribute.h" #include "core/typeDescriptor.h" #include diff --git a/src/clstepcore/STEPaggrEnum.cc b/src/clstepcore/STEPaggrEnum.cc index 41b77aa21..d0b1e944b 100644 --- a/src/clstepcore/STEPaggrEnum.cc +++ b/src/clstepcore/STEPaggrEnum.cc @@ -1,4 +1,4 @@ -#include "STEPaggrEnum.h" +#include "core/STEPaggrEnum.h" #include /** \file StepaggrEnum.cc diff --git a/src/clstepcore/STEPaggrGeneric.cc b/src/clstepcore/STEPaggrGeneric.cc index 899d6c656..8ddcf413f 100644 --- a/src/clstepcore/STEPaggrGeneric.cc +++ b/src/clstepcore/STEPaggrGeneric.cc @@ -1,4 +1,4 @@ -#include "STEPaggrGeneric.h" +#include "core/STEPaggrGeneric.h" #include /** \file STEPaggrGeneric.cc diff --git a/src/clstepcore/STEPaggrInt.cc b/src/clstepcore/STEPaggrInt.cc index 3989e82f9..4d6740623 100644 --- a/src/clstepcore/STEPaggrInt.cc +++ b/src/clstepcore/STEPaggrInt.cc @@ -1,4 +1,4 @@ -#include "STEPaggrInt.h" +#include "core/STEPaggrInt.h" IntAggregate::IntAggregate() { diff --git a/src/clstepcore/STEPaggrReal.cc b/src/clstepcore/STEPaggrReal.cc index 7d05c1333..92920e202 100644 --- a/src/clstepcore/STEPaggrReal.cc +++ b/src/clstepcore/STEPaggrReal.cc @@ -1,4 +1,4 @@ -#include "STEPaggrReal.h" +#include "core/STEPaggrReal.h" /** \file STEPaggrReal.cc * implementation of classes RealAggregate and RealNode diff --git a/src/clstepcore/STEPaggrSelect.cc b/src/clstepcore/STEPaggrSelect.cc index b14a1a4f7..c70f91c70 100644 --- a/src/clstepcore/STEPaggrSelect.cc +++ b/src/clstepcore/STEPaggrSelect.cc @@ -1,4 +1,4 @@ -#include "STEPaggrSelect.h" +#include "core/STEPaggrSelect.h" #include "core/typeDescriptor.h" #include diff --git a/src/clstepcore/STEPaggrString.cc b/src/clstepcore/STEPaggrString.cc index fd9285ad3..7f2a99579 100644 --- a/src/clstepcore/STEPaggrString.cc +++ b/src/clstepcore/STEPaggrString.cc @@ -1,4 +1,4 @@ -#include "STEPaggrString.h" +#include "core/STEPaggrString.h" #include /** \file STEPaggrString.cc diff --git a/src/clstepcore/STEPaggregate.cc b/src/clstepcore/STEPaggregate.cc index 3a2ee0914..e71723251 100644 --- a/src/clstepcore/STEPaggregate.cc +++ b/src/clstepcore/STEPaggregate.cc @@ -13,8 +13,8 @@ #include #include "core/read_func.h" -#include -#include +#include "core/STEPaggregate.h" +#include "core/STEPattribute.h" #include "core/instmgr.h" #include "core/ExpDict.h" diff --git a/src/clstepcore/STEPattribute.cc b/src/clstepcore/STEPattribute.cc index cf8ea382e..93a7dcd26 100644 --- a/src/clstepcore/STEPattribute.cc +++ b/src/clstepcore/STEPattribute.cc @@ -13,10 +13,10 @@ #include #include "core/read_func.h" -#include +#include "core/STEPattribute.h" #include "core/instmgr.h" -#include -#include +#include "core/STEPundefined.h" +#include "core/STEPaggregate.h" #include "core/ExpDict.h" #include "core/sdai.h" diff --git a/src/clstepcore/STEPattributeList.cc b/src/clstepcore/STEPattributeList.cc index 721175e90..10a0b80b6 100644 --- a/src/clstepcore/STEPattributeList.cc +++ b/src/clstepcore/STEPattributeList.cc @@ -10,8 +10,8 @@ * and is not subject to copyright. */ -#include -#include +#include "core/STEPattributeList.h" +#include "core/STEPattribute.h" AttrListNode::AttrListNode( STEPattribute * a ) { attr = a; diff --git a/src/clstepcore/STEPcomplex.cc b/src/clstepcore/STEPcomplex.cc index f4576a20b..f49b1ea4e 100644 --- a/src/clstepcore/STEPcomplex.cc +++ b/src/clstepcore/STEPcomplex.cc @@ -1,10 +1,10 @@ #include -#include +#include "core/STEPcomplex.h" #include "core/complexSupport.h" -#include -#include +#include "core/STEPattribute.h" +#include "core/STEPaggregate.h" #include extern const char * diff --git a/src/clstepcore/STEPinvAttrList.cc b/src/clstepcore/STEPinvAttrList.cc index b8f4a824b..502af4567 100644 --- a/src/clstepcore/STEPinvAttrList.cc +++ b/src/clstepcore/STEPinvAttrList.cc @@ -3,7 +3,7 @@ * derived from STEPattributeList.cc */ -#include +#include "core/STEPinvAttrList.h" #include "core/ExpDict.h" invAttrListNodeI::invAttrListNodeI(Inverse_attribute* a, setterI_t s, getterI_t g): invAttrListNode(a), set( s ), get( g ) {} diff --git a/src/clstepcore/STEPundefined.cc b/src/clstepcore/STEPundefined.cc index e2dd94f00..c74fc7a8c 100644 --- a/src/clstepcore/STEPundefined.cc +++ b/src/clstepcore/STEPundefined.cc @@ -11,8 +11,8 @@ */ #include // to get the BUFSIZ #define -#include -#include +#include "core/STEPattribute.h" +#include "core/STEPundefined.h" /** \class SCLundefined ** helper functions for reading unknown types diff --git a/src/clstepcore/create_Aggr.cc b/src/clstepcore/create_Aggr.cc index 7bb13257d..0fe195bb7 100644 --- a/src/clstepcore/create_Aggr.cc +++ b/src/clstepcore/create_Aggr.cc @@ -1,5 +1,5 @@ #include "core/create_Aggr.h" -#include +#include "core/STEPaggregate.h" EnumAggregate * create_EnumAggregate() { return new EnumAggregate; diff --git a/src/clstepcore/read_func.cc b/src/clstepcore/read_func.cc index 3a0d3bcc7..65a635dbe 100644 --- a/src/clstepcore/read_func.cc +++ b/src/clstepcore/read_func.cc @@ -3,7 +3,7 @@ #include #include "core/sdai.h" #include "core/read_func.h" -#include +#include "core/STEPattribute.h" #include "Str.h" const int RealNumPrecision = REAL_NUM_PRECISION; diff --git a/src/clstepcore/sdaiApplication_instance.cc b/src/clstepcore/sdaiApplication_instance.cc index 26824bfb9..1b39b12c4 100644 --- a/src/clstepcore/sdaiApplication_instance.cc +++ b/src/clstepcore/sdaiApplication_instance.cc @@ -13,8 +13,8 @@ #include #include "core/sdai.h" #include "core/instmgr.h" -#include -#include +#include "core/STEPcomplex.h" +#include "core/STEPattribute.h" #include "core/read_func.h" //for ReadTokenSeparator, used when comments are inside entities #include "core/sdaiApplication_instance.h" diff --git a/src/clstepcore/sdaiSelect.cc b/src/clstepcore/sdaiSelect.cc index 69595178c..5c3168281 100644 --- a/src/clstepcore/sdaiSelect.cc +++ b/src/clstepcore/sdaiSelect.cc @@ -15,7 +15,7 @@ #include #include #include "core/sdai.h" -#include +#include "core/STEPattribute.h" #ifdef SC_LOGGING #include diff --git a/src/clstepcore/test/test_null_attr.cc b/src/clstepcore/test/test_null_attr.cc index cb7064ebb..b82cb49ba 100644 --- a/src/clstepcore/test/test_null_attr.cc +++ b/src/clstepcore/test/test_null_attr.cc @@ -1,5 +1,5 @@ #include "core/ExpDict.h" -#include +#include "core/STEPattribute.h" #include AttrDescriptor *ad = 0; diff --git a/src/clstepcore/test/test_operators_STEPattribute.cc b/src/clstepcore/test/test_operators_STEPattribute.cc index cc14cb102..b5266cde3 100644 --- a/src/clstepcore/test/test_operators_STEPattribute.cc +++ b/src/clstepcore/test/test_operators_STEPattribute.cc @@ -1,6 +1,6 @@ ///test constructors, destructor, shallow copy, assignment operators for STEPattribute -#include +#include "core/STEPattribute.h" #include "core/ExpDict.h" #include diff --git a/src/exp2cxx/classes_wrapper.cc b/src/exp2cxx/classes_wrapper.cc index 0efdae642..b668361b9 100644 --- a/src/exp2cxx/classes_wrapper.cc +++ b/src/exp2cxx/classes_wrapper.cc @@ -77,10 +77,10 @@ void print_file_header( FILES * files ) { fprintf( files->incall, "#include \"core/sdai.h\"\n\n" ); fprintf( files->incall, "\n#include \"core/Registry.h\"\n" ); - fprintf( files->incall, "\n#include \n" ); - fprintf( files->incall, "\n#include \n" ); + fprintf( files->incall, "\n#include \"core/STEPaggregate.h\"\n" ); + fprintf( files->incall, "\n#include \"core/STEPundefined.h\"\n" ); fprintf( files->incall, "\n#include \"core/ExpDict.h\"\n" ); - fprintf( files->incall, "\n#include \n" ); + fprintf( files->incall, "\n#include \"core/STEPattribute.h\"\n" ); fprintf( files->incall, "\n#include \n" ); diff --git a/src/exp2cxx/multpass.c b/src/exp2cxx/multpass.c index 50adf2eb1..2db9f744e 100644 --- a/src/exp2cxx/multpass.c +++ b/src/exp2cxx/multpass.c @@ -159,7 +159,7 @@ void print_schemas_separate( Express express, void * complexCol, FILES * files ) // which hasn't been closed yet. (That's done on 2nd line below.)) */ fprintf( files->initall, " reg.SetCompCollect( gencomplex() );\n" ); fprintf( files->initall, "}\n\n" ); - fprintf( files->incall, "\n#include \"core\/complexSupport.h\"\n" ); + fprintf( files->incall, "\n#include \"core/complexSupport.h\"\n" ); fprintf( files->incall, "ComplexCollect *gencomplex();\n" ); /* Function GetModelContents() is printed at the end of the schema.xx diff --git a/src/test/p21read/p21read.cc b/src/test/p21read/p21read.cc index 1bf8d6c12..fe60301c5 100644 --- a/src/test/p21read/p21read.cc +++ b/src/test/p21read/p21read.cc @@ -15,7 +15,7 @@ extern void SchemaInit( class Registry & ); #include #include "core/sdai.h" -#include +#include "core/STEPattribute.h" #include "core/ExpDict.h" #include "core/Registry.h" #include diff --git a/src/test/tests.h b/src/test/tests.h index df4e3af01..d4dd60d4a 100644 --- a/src/test/tests.h +++ b/src/test/tests.h @@ -18,7 +18,7 @@ /* General SCL stuff */ #include "core/ExpDict.h" #include -#include +#include "core/STEPattribute.h" #include "core/sdai.h" /* Stuff more or less specifically for the Example schema */ diff --git a/test/cpp/schema_specific/aggregate_bound_runtime.cc b/test/cpp/schema_specific/aggregate_bound_runtime.cc index e4d8ea64c..9dab65f65 100644 --- a/test/cpp/schema_specific/aggregate_bound_runtime.cc +++ b/test/cpp/schema_specific/aggregate_bound_runtime.cc @@ -1,7 +1,7 @@ #include #include "core/sdai.h" -#include +#include "core/STEPattribute.h" #include "core/ExpDict.h" #include "core/Registry.h" #include diff --git a/test/cpp/schema_specific/attribute.cc b/test/cpp/schema_specific/attribute.cc index c7b951d5a..d06a93a34 100644 --- a/test/cpp/schema_specific/attribute.cc +++ b/test/cpp/schema_specific/attribute.cc @@ -5,7 +5,7 @@ #include "config.h" #include #include "core/sdai.h" -#include +#include "core/STEPattribute.h" #include "core/ExpDict.h" #include "core/Registry.h" #include diff --git a/test/cpp/schema_specific/inverse_attr1.cc b/test/cpp/schema_specific/inverse_attr1.cc index 46b066839..ee8a46f01 100644 --- a/test/cpp/schema_specific/inverse_attr1.cc +++ b/test/cpp/schema_specific/inverse_attr1.cc @@ -7,7 +7,7 @@ #include "SubSuperIterators.h" #include #include "core/sdai.h" -#include +#include "core/STEPattribute.h" #include "core/ExpDict.h" #include "core/Registry.h" #include diff --git a/test/cpp/schema_specific/inverse_attr2.cc b/test/cpp/schema_specific/inverse_attr2.cc index 44d5e18cb..2edfb88e0 100644 --- a/test/cpp/schema_specific/inverse_attr2.cc +++ b/test/cpp/schema_specific/inverse_attr2.cc @@ -6,7 +6,7 @@ #include "config.h" #include #include "core/sdai.h" -#include +#include "core/STEPattribute.h" #include "core/ExpDict.h" #include "core/Registry.h" #include diff --git a/test/cpp/schema_specific/inverse_attr3.cc b/test/cpp/schema_specific/inverse_attr3.cc index 70d884092..cea95a2fb 100644 --- a/test/cpp/schema_specific/inverse_attr3.cc +++ b/test/cpp/schema_specific/inverse_attr3.cc @@ -8,7 +8,7 @@ #include #include #include "core/sdai.h" -#include +#include "core/STEPattribute.h" #include "core/ExpDict.h" #include "core/Registry.h" #include diff --git a/test/cpp/schema_specific/stepfile_rw_progress.cc b/test/cpp/schema_specific/stepfile_rw_progress.cc index a740d9b0c..6ace78348 100644 --- a/test/cpp/schema_specific/stepfile_rw_progress.cc +++ b/test/cpp/schema_specific/stepfile_rw_progress.cc @@ -1,7 +1,7 @@ #include #include "core/sdai.h" -#include +#include "core/STEPattribute.h" #include "core/ExpDict.h" #include "core/Registry.h" #include From c85720fbb4a8354204f2f5eb8c0a891e88c0ab03 Mon Sep 17 00:00:00 2001 From: Clifford Yapp <238416+starseeker@users.noreply.github.com> Date: Sun, 2 Oct 2022 11:15:07 -0400 Subject: [PATCH 11/23] Stub in CMake logic for other header dirs --- include/CMakeLists.txt | 6 ++++++ include/dai/CMakeLists.txt | 14 ++++++++++++++ include/editor/CMakeLists.txt | 14 ++++++++++++++ include/lazy/CMakeLists.txt | 14 ++++++++++++++ include/utils/CMakeLists.txt | 14 ++++++++++++++ 5 files changed, 62 insertions(+) create mode 100644 include/dai/CMakeLists.txt create mode 100644 include/editor/CMakeLists.txt create mode 100644 include/lazy/CMakeLists.txt create mode 100644 include/utils/CMakeLists.txt diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 9ad25faeb..c6e9ec18f 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -37,6 +37,12 @@ install(FILES ordered_attrs.h install(FILES ${SC_BINARY_DIR}/${INCLUDE_DIR}/config.h DESTINATION ${INCLUDE_DIR}/stepcode) +add_subdirectory(core) +add_subdirectory(dai) +add_subdirectory(editor) +add_subdirectory(lazy) +add_subdirectory(utils) + # Local Variables: # tab-width: 8 # mode: cmake diff --git a/include/dai/CMakeLists.txt b/include/dai/CMakeLists.txt new file mode 100644 index 000000000..a37d635e7 --- /dev/null +++ b/include/dai/CMakeLists.txt @@ -0,0 +1,14 @@ +set(DAI_HDRS + + ) + +install(FILES ${DAI_HDRS} + DESTINATION ${INCLUDE_DIR}/stepcode/dai) + +# Local Variables: +# tab-width: 8 +# mode: cmake +# indent-tabs-mode: t +# End: +# ex: shiftwidth=2 tabstop=8 + diff --git a/include/editor/CMakeLists.txt b/include/editor/CMakeLists.txt new file mode 100644 index 000000000..3558d4805 --- /dev/null +++ b/include/editor/CMakeLists.txt @@ -0,0 +1,14 @@ +set(EDITOR_HDRS + + ) + +install(FILES ${EDITOR_HDRS} + DESTINATION ${INCLUDE_DIR}/stepcode/editor) + +# Local Variables: +# tab-width: 8 +# mode: cmake +# indent-tabs-mode: t +# End: +# ex: shiftwidth=2 tabstop=8 + diff --git a/include/lazy/CMakeLists.txt b/include/lazy/CMakeLists.txt new file mode 100644 index 000000000..70d657254 --- /dev/null +++ b/include/lazy/CMakeLists.txt @@ -0,0 +1,14 @@ +set(LAZY_HDRS + + ) + +install(FILES ${LAZY_HDRS} + DESTINATION ${INCLUDE_DIR}/stepcode/lazy) + +# Local Variables: +# tab-width: 8 +# mode: cmake +# indent-tabs-mode: t +# End: +# ex: shiftwidth=2 tabstop=8 + diff --git a/include/utils/CMakeLists.txt b/include/utils/CMakeLists.txt new file mode 100644 index 000000000..9fb164919 --- /dev/null +++ b/include/utils/CMakeLists.txt @@ -0,0 +1,14 @@ +set(UTILS_HDRS + + ) + +install(FILES ${UTILS_HDRS} + DESTINATION ${INCLUDE_DIR}/stepcode/utils) + +# Local Variables: +# tab-width: 8 +# mode: cmake +# indent-tabs-mode: t +# End: +# ex: shiftwidth=2 tabstop=8 + From 04a5404e60dd985544892b8f1a0bcdf4ef9b368f Mon Sep 17 00:00:00 2001 From: Clifford Yapp <238416+starseeker@users.noreply.github.com> Date: Sun, 2 Oct 2022 11:22:16 -0400 Subject: [PATCH 12/23] Move cldai headers --- include/core/attrDescriptor.h | 2 +- include/core/sdai.h | 20 +++++++++---------- include/core/sdaiApplication_instance.h | 2 +- include/dai/CMakeLists.txt | 12 ++++++++++- .../dai}/sdaiApplication_instance_set.h | 0 {src/cldai => include/dai}/sdaiBinary.h | 0 {src/cldai => include/dai}/sdaiDaObject.h | 4 ++-- .../cldai => include/dai}/sdaiEntity_extent.h | 0 .../dai}/sdaiEntity_extent_set.h | 0 {src/cldai => include/dai}/sdaiEnum.h | 0 .../dai}/sdaiModel_contents.h | 0 .../dai}/sdaiModel_contents_list.h | 0 {src/cldai => include/dai}/sdaiObject.h | 0 .../dai}/sdaiSession_instance.h | 0 misc/header_mv.sh | 12 +++++------ src/cldai/sdaiApplication_instance_set.cc | 2 +- 16 files changed, 32 insertions(+), 22 deletions(-) rename {src/cldai => include/dai}/sdaiApplication_instance_set.h (100%) rename {src/cldai => include/dai}/sdaiBinary.h (100%) rename {src/cldai => include/dai}/sdaiDaObject.h (99%) rename {src/cldai => include/dai}/sdaiEntity_extent.h (100%) rename {src/cldai => include/dai}/sdaiEntity_extent_set.h (100%) rename {src/cldai => include/dai}/sdaiEnum.h (100%) rename {src/cldai => include/dai}/sdaiModel_contents.h (100%) rename {src/cldai => include/dai}/sdaiModel_contents_list.h (100%) rename {src/cldai => include/dai}/sdaiObject.h (100%) rename {src/cldai => include/dai}/sdaiSession_instance.h (100%) diff --git a/include/core/attrDescriptor.h b/include/core/attrDescriptor.h index cee4d13bc..ca146d8b8 100644 --- a/include/core/attrDescriptor.h +++ b/include/core/attrDescriptor.h @@ -3,7 +3,7 @@ #include "typeDescriptor.h" -#include "sdaiEnum.h" +#include "dai/sdaiEnum.h" #include "sc_export.h" diff --git a/include/core/sdai.h b/include/core/sdai.h index 9e080f019..26888a377 100644 --- a/include/core/sdai.h +++ b/include/core/sdai.h @@ -157,10 +157,10 @@ typedef char * SDAI_Schema_name; #include -#include +#include "dai/sdaiBinary.h" // define Object which I am calling sdaiObject for now - DAS -#include +#include "dai/sdaiObject.h" /****************************************************************************** ENUMERATION @@ -172,7 +172,7 @@ ENUMERATION * the value ENUM_NULL is used to represent NULL for all enumerated types *****************************************************************************/ -#include +#include "dai/sdaiEnum.h" /****************************************************************************** BOOLEAN and LOGICAL @@ -185,11 +185,11 @@ BOOLEAN and LOGICAL // ***note*** this file needs classes from sdaiEnum.h // define DAObjectID and classes PID, PID_DA, PID_SDAI, DAObject, DAObject_SDAI -#include +#include "dai/sdaiDaObject.h" #include "core/sdaiApplication_instance.h" -#include +#include "dai/sdaiApplication_instance_set.h" /****************************************************************************** SELECT @@ -204,12 +204,12 @@ class SDAI_Model_contents; typedef SDAI_Model_contents * SDAI_Model_contents_ptr; typedef SDAI_Model_contents_ptr SDAI_Model_contents_var; -#include +#include "dai/sdaiModel_contents_list.h" -#include -#include -#include -#include +#include "dai/sdaiSession_instance.h" +#include "dai/sdaiEntity_extent.h" +#include "dai/sdaiEntity_extent_set.h" +#include "dai/sdaiModel_contents.h" // ENTITY extern SC_CORE_EXPORT SDAI_Application_instance NilSTEPentity; diff --git a/include/core/sdaiApplication_instance.h b/include/core/sdaiApplication_instance.h index 405964c24..9fbca1e72 100644 --- a/include/core/sdaiApplication_instance.h +++ b/include/core/sdaiApplication_instance.h @@ -16,7 +16,7 @@ #include #include -#include +#include "dai/sdaiDaObject.h" class EntityAggregate; class Inverse_attribute; diff --git a/include/dai/CMakeLists.txt b/include/dai/CMakeLists.txt index a37d635e7..1a394d32f 100644 --- a/include/dai/CMakeLists.txt +++ b/include/dai/CMakeLists.txt @@ -1,5 +1,15 @@ set(DAI_HDRS - + sdaiApplication_instance_set.h + sdaiBinary.h + sdaiDaObject.h + sdaiEntity_extent.h + sdaiEntity_extent_set.h + sdaiEnum.h + sdaiModel_contents.h + sdaiModel_contents_list.h + sdaiObject.h + sdaiSession_instance.h + sdaiString.h ) install(FILES ${DAI_HDRS} diff --git a/src/cldai/sdaiApplication_instance_set.h b/include/dai/sdaiApplication_instance_set.h similarity index 100% rename from src/cldai/sdaiApplication_instance_set.h rename to include/dai/sdaiApplication_instance_set.h diff --git a/src/cldai/sdaiBinary.h b/include/dai/sdaiBinary.h similarity index 100% rename from src/cldai/sdaiBinary.h rename to include/dai/sdaiBinary.h diff --git a/src/cldai/sdaiDaObject.h b/include/dai/sdaiDaObject.h similarity index 99% rename from src/cldai/sdaiDaObject.h rename to include/dai/sdaiDaObject.h index 168c7bfbc..b27bb2421 100644 --- a/src/cldai/sdaiDaObject.h +++ b/include/dai/sdaiDaObject.h @@ -1,9 +1,9 @@ #ifndef SDAIDAOBJECT_H #define SDAIDAOBJECT_H 1 -#include +#include "dai/sdaiObject.h" #include -#include +#include "dai/sdaiEnum.h" #include diff --git a/src/cldai/sdaiEntity_extent.h b/include/dai/sdaiEntity_extent.h similarity index 100% rename from src/cldai/sdaiEntity_extent.h rename to include/dai/sdaiEntity_extent.h diff --git a/src/cldai/sdaiEntity_extent_set.h b/include/dai/sdaiEntity_extent_set.h similarity index 100% rename from src/cldai/sdaiEntity_extent_set.h rename to include/dai/sdaiEntity_extent_set.h diff --git a/src/cldai/sdaiEnum.h b/include/dai/sdaiEnum.h similarity index 100% rename from src/cldai/sdaiEnum.h rename to include/dai/sdaiEnum.h diff --git a/src/cldai/sdaiModel_contents.h b/include/dai/sdaiModel_contents.h similarity index 100% rename from src/cldai/sdaiModel_contents.h rename to include/dai/sdaiModel_contents.h diff --git a/src/cldai/sdaiModel_contents_list.h b/include/dai/sdaiModel_contents_list.h similarity index 100% rename from src/cldai/sdaiModel_contents_list.h rename to include/dai/sdaiModel_contents_list.h diff --git a/src/cldai/sdaiObject.h b/include/dai/sdaiObject.h similarity index 100% rename from src/cldai/sdaiObject.h rename to include/dai/sdaiObject.h diff --git a/src/cldai/sdaiSession_instance.h b/include/dai/sdaiSession_instance.h similarity index 100% rename from src/cldai/sdaiSession_instance.h rename to include/dai/sdaiSession_instance.h diff --git a/misc/header_mv.sh b/misc/header_mv.sh index 8735a4421..72890820a 100755 --- a/misc/header_mv.sh +++ b/misc/header_mv.sh @@ -1,10 +1,10 @@ #!/bin/bash -find . -type f -path "*/cl*" -not -path "*.git/*" -not -path "*/exp*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include \"$1\"/include \"core\/$1\"/g" {} \; -find . -type f -path "*/cl*" -not -path "*.git/*" -not -path "*/exp*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include <$1>/include \"core\/$1\"/g" {} \; +find . -type f -path "*/cl*" -not -path "*.git/*" -not -path "*/exp*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include \"$1\"/include \"dai\/$1\"/g" {} \; +find . -type f -path "*/cl*" -not -path "*.git/*" -not -path "*/exp*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include <$1>/include \"dai\/$1\"/g" {} \; -find . -type f -path "*/include*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include \"$1\"/include \"core\/$1\"/g" {} \; -find . -type f -path "*/include*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include <$1>/include \"core\/$1\"/g" {} \; +find . -type f -path "*/include*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include \"$1\"/include \"dai\/$1\"/g" {} \; +find . -type f -path "*/include*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include <$1>/include \"dai\/$1\"/g" {} \; -find . -type f -path "*/test*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include \"$1\"/include \"core\/$1\"/g" {} \; -find . -type f -path "*/test*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include <$1>/include \"core\/$1\"/g" {} \; +find . -type f -path "*/test*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include \"$1\"/include \"dai\/$1\"/g" {} \; +find . -type f -path "*/test*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include <$1>/include \"dai\/$1\"/g" {} \; diff --git a/src/cldai/sdaiApplication_instance_set.cc b/src/cldai/sdaiApplication_instance_set.cc index ff4033e74..d1961fce3 100644 --- a/src/cldai/sdaiApplication_instance_set.cc +++ b/src/cldai/sdaiApplication_instance_set.cc @@ -24,7 +24,7 @@ * UArray implementation. */ -//#include +//#include "dai/sdaiApplication_instance_set.h" #include "core/sdai.h" #include From 84d939baa79e7945d108c7244ceab644cde89b2c Mon Sep 17 00:00:00 2001 From: Clifford Yapp <238416+starseeker@users.noreply.github.com> Date: Sun, 2 Oct 2022 11:24:25 -0400 Subject: [PATCH 13/23] Missed sdaiString.h --- include/core/sdai.h | 2 +- include/dai/sdaiDaObject.h | 2 +- {src/cldai => include/dai}/sdaiString.h | 0 src/cldai/CMakeLists.txt | 17 ----------------- src/clstepcore/test/test_null_attr.cc | 2 +- 5 files changed, 3 insertions(+), 20 deletions(-) rename {src/cldai => include/dai}/sdaiString.h (100%) diff --git a/include/core/sdai.h b/include/core/sdai.h index 26888a377..d47cbca3b 100644 --- a/include/core/sdai.h +++ b/include/core/sdai.h @@ -155,7 +155,7 @@ typedef char * SDAI_Time_stamp; typedef char * SDAI_Entity_name; typedef char * SDAI_Schema_name; -#include +#include "dai/sdaiString.h" #include "dai/sdaiBinary.h" diff --git a/include/dai/sdaiDaObject.h b/include/dai/sdaiDaObject.h index b27bb2421..e615e4244 100644 --- a/include/dai/sdaiDaObject.h +++ b/include/dai/sdaiDaObject.h @@ -2,7 +2,7 @@ #define SDAIDAOBJECT_H 1 #include "dai/sdaiObject.h" -#include +#include "dai/sdaiString.h" #include "dai/sdaiEnum.h" #include diff --git a/src/cldai/sdaiString.h b/include/dai/sdaiString.h similarity index 100% rename from src/cldai/sdaiString.h rename to include/dai/sdaiString.h diff --git a/src/cldai/CMakeLists.txt b/src/cldai/CMakeLists.txt index 9d8616f1c..1905704b5 100644 --- a/src/cldai/CMakeLists.txt +++ b/src/cldai/CMakeLists.txt @@ -13,20 +13,6 @@ set(LIBSTEPDAI_SRCS sdaiString.cc ) -SET(SC_CLDAI_HDRS - sdaiApplication_instance_set.h - sdaiBinary.h - sdaiDaObject.h - sdaiEntity_extent.h - sdaiEntity_extent_set.h - sdaiEnum.h - sdaiModel_contents.h - sdaiModel_contents_list.h - sdaiObject.h - sdaiSession_instance.h - sdaiString.h - ) - include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/include/stepcode @@ -47,9 +33,6 @@ if(BUILD_STATIC_LIBS) SC_ADDLIB(stepdai-static STATIC SOURCES ${LIBSTEPDAI_SRCS} LINK_LIBRARIES $-static) endif() -install(FILES ${SC_CLDAI_HDRS} - DESTINATION ${INCLUDE_DIR}/stepcode/cldai) - # Local Variables: # tab-width: 8 # mode: cmake diff --git a/src/clstepcore/test/test_null_attr.cc b/src/clstepcore/test/test_null_attr.cc index b82cb49ba..c25025614 100644 --- a/src/clstepcore/test/test_null_attr.cc +++ b/src/clstepcore/test/test_null_attr.cc @@ -1,6 +1,6 @@ #include "core/ExpDict.h" #include "core/STEPattribute.h" -#include +#include "dai/sdaiString.h" AttrDescriptor *ad = 0; EntityDescriptor *ed = 0; From f9f5c71204728b2d805f6ea58648538ed5574187 Mon Sep 17 00:00:00 2001 From: Clifford Yapp <238416+starseeker@users.noreply.github.com> Date: Sun, 2 Oct 2022 11:29:38 -0400 Subject: [PATCH 14/23] Move editor headers --- include/core/dispnode.h | 2 +- include/core/dispnodelist.h | 2 +- include/core/mgrnode.h | 2 +- include/core/mgrnodelist.h | 2 +- include/editor/CMakeLists.txt | 8 +++++++- {src/cleditor => include/editor}/STEPfile.h | 0 {src/cleditor => include/editor}/SdaiHeaderSchema.h | 4 ++-- .../editor}/SdaiHeaderSchemaClasses.h | 0 {src/cleditor => include/editor}/SdaiSchemaInit.h | 4 ++-- {src/cleditor => include/editor}/cmdmgr.h | 2 +- {src/cleditor => include/editor}/editordefines.h | 0 {src/cleditor => include/editor}/seeinfodefault.h | 2 +- misc/header_mv.sh | 12 ++++++------ src/cleditor/CMakeLists.txt | 13 ------------- src/cleditor/STEPfile.cc | 4 ++-- src/cleditor/STEPfile.inline.cc | 4 ++-- src/cleditor/SdaiHeaderSchema.cc | 2 +- src/cleditor/SdaiHeaderSchemaAll.cc | 2 +- src/cleditor/SdaiHeaderSchemaInit.cc | 2 +- src/cleditor/SdaiSchemaInit.cc | 2 +- src/cleditor/cmdmgr.cc | 2 +- src/cllazyfile/lazyInstMgr.cc | 2 +- src/cllazyfile/lazy_test.cc | 2 +- src/cllazyfile/sectionReader.cc | 2 +- src/test/p21read/p21read.cc | 2 +- src/test/tests.h | 2 +- test/cpp/schema_specific/aggregate_bound_runtime.cc | 2 +- test/cpp/schema_specific/attribute.cc | 2 +- test/cpp/schema_specific/inverse_attr1.cc | 2 +- test/cpp/schema_specific/inverse_attr2.cc | 2 +- test/cpp/schema_specific/stepfile_rw_progress.cc | 2 +- 31 files changed, 42 insertions(+), 49 deletions(-) rename {src/cleditor => include/editor}/STEPfile.h (100%) rename {src/cleditor => include/editor}/SdaiHeaderSchema.h (99%) rename {src/cleditor => include/editor}/SdaiHeaderSchemaClasses.h (100%) rename {src/cleditor => include/editor}/SdaiSchemaInit.h (89%) rename {src/cleditor => include/editor}/cmdmgr.h (99%) rename {src/cleditor => include/editor}/editordefines.h (100%) rename {src/cleditor => include/editor}/seeinfodefault.h (96%) diff --git a/include/core/dispnode.h b/include/core/dispnode.h index 44b0cc233..ad519f87f 100644 --- a/include/core/dispnode.h +++ b/include/core/dispnode.h @@ -24,7 +24,7 @@ #include #include //#include -#include +#include "editor/editordefines.h" //#include class MgrNode; diff --git a/include/core/dispnodelist.h b/include/core/dispnodelist.h index 88da55f76..af64fabc5 100644 --- a/include/core/dispnodelist.h +++ b/include/core/dispnodelist.h @@ -19,7 +19,7 @@ #include //#include -#include +#include "editor/editordefines.h" #include "core/mgrnode.h" #include "core/dispnode.h" #include diff --git a/include/core/mgrnode.h b/include/core/mgrnode.h index f2ffd5caf..ef871b071 100644 --- a/include/core/mgrnode.h +++ b/include/core/mgrnode.h @@ -23,7 +23,7 @@ class DisplayNode; #include #include -#include +#include "editor/editordefines.h" class InstMgr; diff --git a/include/core/mgrnodelist.h b/include/core/mgrnodelist.h index be822c798..92edcfe39 100644 --- a/include/core/mgrnodelist.h +++ b/include/core/mgrnodelist.h @@ -20,7 +20,7 @@ #include //#include #include -#include +#include "editor/editordefines.h" ////////////////////////////////////////////////////////////////////////////// // class MgrNodeList diff --git a/include/editor/CMakeLists.txt b/include/editor/CMakeLists.txt index 3558d4805..bd3421699 100644 --- a/include/editor/CMakeLists.txt +++ b/include/editor/CMakeLists.txt @@ -1,5 +1,11 @@ set(EDITOR_HDRS - + STEPfile.h + cmdmgr.h + editordefines.h + SdaiHeaderSchema.h + SdaiHeaderSchemaClasses.h + SdaiSchemaInit.h + seeinfodefault.h ) install(FILES ${EDITOR_HDRS} diff --git a/src/cleditor/STEPfile.h b/include/editor/STEPfile.h similarity index 100% rename from src/cleditor/STEPfile.h rename to include/editor/STEPfile.h diff --git a/src/cleditor/SdaiHeaderSchema.h b/include/editor/SdaiHeaderSchema.h similarity index 99% rename from src/cleditor/SdaiHeaderSchema.h rename to include/editor/SdaiHeaderSchema.h index 78e2089b8..592e32a8e 100644 --- a/src/cleditor/SdaiHeaderSchema.h +++ b/include/editor/SdaiHeaderSchema.h @@ -8,8 +8,8 @@ #include "core/sdai.h" #include "core/Registry.h" #include "core/STEPaggregate.h" -#include -#include +#include "editor/SdaiHeaderSchemaClasses.h" +#include "editor/SdaiSchemaInit.h" ///////// ENTITY section_language diff --git a/src/cleditor/SdaiHeaderSchemaClasses.h b/include/editor/SdaiHeaderSchemaClasses.h similarity index 100% rename from src/cleditor/SdaiHeaderSchemaClasses.h rename to include/editor/SdaiHeaderSchemaClasses.h diff --git a/src/cleditor/SdaiSchemaInit.h b/include/editor/SdaiSchemaInit.h similarity index 89% rename from src/cleditor/SdaiSchemaInit.h rename to include/editor/SdaiSchemaInit.h index f5d1a4464..de267adb9 100644 --- a/src/cleditor/SdaiSchemaInit.h +++ b/include/editor/SdaiSchemaInit.h @@ -17,8 +17,8 @@ #include "core/STEPattribute.h" #include "core/complexSupport.h" -#include -#include +#include "editor/SdaiHeaderSchemaClasses.h" +#include "editor/SdaiHeaderSchema.h" SC_EDITOR_EXPORT void HeaderSchemaInit( Registry & ); SC_EDITOR_EXPORT void HeaderInitSchemasAndEnts( Registry & ); diff --git a/src/cleditor/cmdmgr.h b/include/editor/cmdmgr.h similarity index 99% rename from src/cleditor/cmdmgr.h rename to include/editor/cmdmgr.h index dda9810e9..3b8607640 100644 --- a/src/cleditor/cmdmgr.h +++ b/include/editor/cmdmgr.h @@ -17,7 +17,7 @@ #include #include -#include +#include "editor/editordefines.h" #include "core/mgrnode.h" #include "core/mgrnodelist.h" #include "core/dispnode.h" diff --git a/src/cleditor/editordefines.h b/include/editor/editordefines.h similarity index 100% rename from src/cleditor/editordefines.h rename to include/editor/editordefines.h diff --git a/src/cleditor/seeinfodefault.h b/include/editor/seeinfodefault.h similarity index 96% rename from src/cleditor/seeinfodefault.h rename to include/editor/seeinfodefault.h index 66ba1ce89..bf2e765ad 100644 --- a/src/cleditor/seeinfodefault.h +++ b/include/editor/seeinfodefault.h @@ -23,7 +23,7 @@ class DisplayNodelist; #include "core/sdai.h" //class SDAI_Application_instance; -#include +#include "editor/editordefines.h" class SC_EDITOR_EXPORT seeInfo : public DisplayNode { public: diff --git a/misc/header_mv.sh b/misc/header_mv.sh index 72890820a..d43a1cd0f 100755 --- a/misc/header_mv.sh +++ b/misc/header_mv.sh @@ -1,10 +1,10 @@ #!/bin/bash -find . -type f -path "*/cl*" -not -path "*.git/*" -not -path "*/exp*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include \"$1\"/include \"dai\/$1\"/g" {} \; -find . -type f -path "*/cl*" -not -path "*.git/*" -not -path "*/exp*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include <$1>/include \"dai\/$1\"/g" {} \; +find . -type f -path "*/cl*" -not -path "*.git/*" -not -path "*/exp*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include \"$1\"/include \"editor\/$1\"/g" {} \; +find . -type f -path "*/cl*" -not -path "*.git/*" -not -path "*/exp*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include <$1>/include \"editor\/$1\"/g" {} \; -find . -type f -path "*/include*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include \"$1\"/include \"dai\/$1\"/g" {} \; -find . -type f -path "*/include*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include <$1>/include \"dai\/$1\"/g" {} \; +find . -type f -path "*/include*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include \"$1\"/include \"editor\/$1\"/g" {} \; +find . -type f -path "*/include*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include <$1>/include \"editor\/$1\"/g" {} \; -find . -type f -path "*/test*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include \"$1\"/include \"dai\/$1\"/g" {} \; -find . -type f -path "*/test*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include <$1>/include \"dai\/$1\"/g" {} \; +find . -type f -path "*/test*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include \"$1\"/include \"editor\/$1\"/g" {} \; +find . -type f -path "*/test*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include <$1>/include \"editor\/$1\"/g" {} \; diff --git a/src/cleditor/CMakeLists.txt b/src/cleditor/CMakeLists.txt index 75340aa3c..3e21261ae 100644 --- a/src/cleditor/CMakeLists.txt +++ b/src/cleditor/CMakeLists.txt @@ -9,16 +9,6 @@ set(LIBSTEPEDITOR_SRCS SdaiSchemaInit.cc ) -SET(SC_CLEDITOR_HDRS - STEPfile.h - cmdmgr.h - editordefines.h - SdaiHeaderSchema.h - SdaiHeaderSchemaClasses.h - SdaiSchemaInit.h - seeinfodefault.h - ) - include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/include/stepcode @@ -38,9 +28,6 @@ if(BUILD_STATIC_LIBS) SC_ADDLIB(stepeditor-static STATIC SOURCES ${LIBSTEPEDITOR_SRCS} LINK_LIBRARIES stepcore-static stepdai-static steputils-static) endif() -install(FILES ${SC_CLEDITOR_HDRS} - DESTINATION ${INCLUDE_DIR}/stepcode/cleditor) - # Local Variables: # tab-width: 8 # mode: cmake diff --git a/src/cleditor/STEPfile.cc b/src/cleditor/STEPfile.cc index 0d7f90450..2d4999bcc 100644 --- a/src/cleditor/STEPfile.cc +++ b/src/cleditor/STEPfile.cc @@ -24,11 +24,11 @@ #include #include -#include +#include "editor/STEPfile.h" #include "core/sdai.h" #include "core/STEPcomplex.h" #include "core/STEPattribute.h" -#include +#include "editor/SdaiHeaderSchema.h" // STEPundefined contains // void PushPastString (istream& in, std::string &s, ErrorDescriptor *err) diff --git a/src/cleditor/STEPfile.inline.cc b/src/cleditor/STEPfile.inline.cc index e525a5206..404c6780b 100644 --- a/src/cleditor/STEPfile.inline.cc +++ b/src/cleditor/STEPfile.inline.cc @@ -11,8 +11,8 @@ * and is not subject to copyright. */ -#include -#include +#include "editor/STEPfile.h" +#include "editor/SdaiHeaderSchema.h" #include "core/STEPaggregate.h" #include diff --git a/src/cleditor/SdaiHeaderSchema.cc b/src/cleditor/SdaiHeaderSchema.cc index efca80295..bf23f340e 100644 --- a/src/cleditor/SdaiHeaderSchema.cc +++ b/src/cleditor/SdaiHeaderSchema.cc @@ -12,7 +12,7 @@ extern ofstream * logStream; #include "core/ExpDict.h" #include "core/STEPattribute.h" -#include +#include "editor/SdaiHeaderSchema.h" Schema * s_header_section_schema = 0; diff --git a/src/cleditor/SdaiHeaderSchemaAll.cc b/src/cleditor/SdaiHeaderSchemaAll.cc index 83996e685..76fc8d996 100644 --- a/src/cleditor/SdaiHeaderSchemaAll.cc +++ b/src/cleditor/SdaiHeaderSchemaAll.cc @@ -4,7 +4,7 @@ // it since your modifications will be lost if exp2cxx is used to // regenerate it. -#include +#include "editor/SdaiHeaderSchema.h" void HeaderInitSchemasAndEnts( Registry & reg ) { Uniqueness_rule_ptr ur; diff --git a/src/cleditor/SdaiHeaderSchemaInit.cc b/src/cleditor/SdaiHeaderSchemaInit.cc index b5e1a7125..94e0d50eb 100644 --- a/src/cleditor/SdaiHeaderSchemaInit.cc +++ b/src/cleditor/SdaiHeaderSchemaInit.cc @@ -7,7 +7,7 @@ #include "core/Registry.h" #include "core/ExpDict.h" #include "core/STEPattribute.h" -#include +#include "editor/SdaiHeaderSchema.h" void SdaiHEADER_SECTION_SCHEMAInit( Registry & reg ) { header_section_schemat_time_stamp_text->ReferentType( t_sdaiSTRING ); diff --git a/src/cleditor/SdaiSchemaInit.cc b/src/cleditor/SdaiSchemaInit.cc index 9515f85ea..d7a54bdd0 100644 --- a/src/cleditor/SdaiSchemaInit.cc +++ b/src/cleditor/SdaiSchemaInit.cc @@ -4,7 +4,7 @@ // it since your modifications will be lost if exp2cxx is used to // regenerate it. -#include +#include "editor/SdaiSchemaInit.h" void HeaderSchemaInit( Registry & reg ) { HeaderInitSchemasAndEnts( reg ); diff --git a/src/cleditor/cmdmgr.cc b/src/cleditor/cmdmgr.cc index 0196cede8..6646ee0a8 100644 --- a/src/cleditor/cmdmgr.cc +++ b/src/cleditor/cmdmgr.cc @@ -10,7 +10,7 @@ * and is not subject to copyright. */ -#include +#include "editor/cmdmgr.h" ReplicateLinkNode * ReplicateList::FindNode( MgrNode * mn ) { ReplicateLinkNode * rln = ( ReplicateLinkNode * )GetHead(); diff --git a/src/cllazyfile/lazyInstMgr.cc b/src/cllazyfile/lazyInstMgr.cc index 107bdfb5d..6f4a3ffb0 100644 --- a/src/cllazyfile/lazyInstMgr.cc +++ b/src/cllazyfile/lazyInstMgr.cc @@ -2,7 +2,7 @@ #include "lazyInstMgr.h" #include "core/Registry.h" #include "core/SubSuperIterators.h" -#include "SdaiSchemaInit.h" +#include "editor/SdaiSchemaInit.h" #include "instMgrHelper.h" #include "lazyRefs.h" diff --git a/src/cllazyfile/lazy_test.cc b/src/cllazyfile/lazy_test.cc index 10aebaa1e..b0216daa4 100644 --- a/src/cllazyfile/lazy_test.cc +++ b/src/cllazyfile/lazy_test.cc @@ -1,6 +1,6 @@ #include "lazyInstMgr.h" #include "./sc_benchmark.h" -#include "SdaiSchemaInit.h" +#include "editor/SdaiSchemaInit.h" #include "config.h" #ifndef NO_REGISTRY diff --git a/src/cllazyfile/sectionReader.cc b/src/cllazyfile/sectionReader.cc index 144d386b3..9a49d05b7 100644 --- a/src/cllazyfile/sectionReader.cc +++ b/src/cllazyfile/sectionReader.cc @@ -15,7 +15,7 @@ #include "core/Registry.h" #include "core/sdaiApplication_instance.h" #include "core/read_func.h" -#include "SdaiSchemaInit.h" +#include "editor/SdaiSchemaInit.h" #include "core/STEPcomplex.h" #include "sectionReader.h" diff --git a/src/test/p21read/p21read.cc b/src/test/p21read/p21read.cc index fe60301c5..d896faa48 100644 --- a/src/test/p21read/p21read.cc +++ b/src/test/p21read/p21read.cc @@ -13,7 +13,7 @@ */ extern void SchemaInit( class Registry & ); -#include +#include "editor/STEPfile.h" #include "core/sdai.h" #include "core/STEPattribute.h" #include "core/ExpDict.h" diff --git a/src/test/tests.h b/src/test/tests.h index d4dd60d4a..504a6f5a3 100644 --- a/src/test/tests.h +++ b/src/test/tests.h @@ -17,7 +17,7 @@ /* General SCL stuff */ #include "core/ExpDict.h" -#include +#include "editor/STEPfile.h" #include "core/STEPattribute.h" #include "core/sdai.h" diff --git a/test/cpp/schema_specific/aggregate_bound_runtime.cc b/test/cpp/schema_specific/aggregate_bound_runtime.cc index 9dab65f65..e8ebb598a 100644 --- a/test/cpp/schema_specific/aggregate_bound_runtime.cc +++ b/test/cpp/schema_specific/aggregate_bound_runtime.cc @@ -1,5 +1,5 @@ -#include +#include "editor/STEPfile.h" #include "core/sdai.h" #include "core/STEPattribute.h" #include "core/ExpDict.h" diff --git a/test/cpp/schema_specific/attribute.cc b/test/cpp/schema_specific/attribute.cc index d06a93a34..8dff9d8fd 100644 --- a/test/cpp/schema_specific/attribute.cc +++ b/test/cpp/schema_specific/attribute.cc @@ -3,7 +3,7 @@ * Test attribute access; uses a tiny schema similar to a subset of IFC2x3 */ #include "config.h" -#include +#include "editor/STEPfile.h" #include "core/sdai.h" #include "core/STEPattribute.h" #include "core/ExpDict.h" diff --git a/test/cpp/schema_specific/inverse_attr1.cc b/test/cpp/schema_specific/inverse_attr1.cc index ee8a46f01..201aeff8e 100644 --- a/test/cpp/schema_specific/inverse_attr1.cc +++ b/test/cpp/schema_specific/inverse_attr1.cc @@ -5,7 +5,7 @@ */ #include "config.h" #include "SubSuperIterators.h" -#include +#include "editor/STEPfile.h" #include "core/sdai.h" #include "core/STEPattribute.h" #include "core/ExpDict.h" diff --git a/test/cpp/schema_specific/inverse_attr2.cc b/test/cpp/schema_specific/inverse_attr2.cc index 2edfb88e0..fea50f309 100644 --- a/test/cpp/schema_specific/inverse_attr2.cc +++ b/test/cpp/schema_specific/inverse_attr2.cc @@ -4,7 +4,7 @@ ** */ #include "config.h" -#include +#include "editor/STEPfile.h" #include "core/sdai.h" #include "core/STEPattribute.h" #include "core/ExpDict.h" diff --git a/test/cpp/schema_specific/stepfile_rw_progress.cc b/test/cpp/schema_specific/stepfile_rw_progress.cc index 6ace78348..c2c3c1522 100644 --- a/test/cpp/schema_specific/stepfile_rw_progress.cc +++ b/test/cpp/schema_specific/stepfile_rw_progress.cc @@ -1,5 +1,5 @@ -#include +#include "editor/STEPfile.h" #include "core/sdai.h" #include "core/STEPattribute.h" #include "core/ExpDict.h" From 820ca861592b391c74500d7a5de4f70f26f37cd5 Mon Sep 17 00:00:00 2001 From: Clifford Yapp <238416+starseeker@users.noreply.github.com> Date: Sun, 2 Oct 2022 11:43:53 -0400 Subject: [PATCH 15/23] Move the cllazyfile headers, trim down judy arrays I'm not sure if this logic was ever brought to a production level - needs investigateion... maybe we should just arcive it if there isn't any active development? Regardless, there appears to be no upstream activity on the judy code, so just make it a part of cllazy directly. --- include/lazy/CMakeLists.txt | 15 +- .../lazy}/headerSectionReader.h | 6 +- .../lazy}/instMgrHelper.h | 2 +- .../judy/src => include/lazy}/judy.h | 0 .../judy/src => include/lazy}/judyL2Array.h | 0 .../judy/src => include/lazy}/judyLArray.h | 0 .../judy/src => include/lazy}/judyS2Array.h | 0 .../judy/src => include/lazy}/judySArray.h | 0 .../lazy}/lazyDataSectionReader.h | 4 +- .../lazy}/lazyFileReader.h | 6 +- .../cllazyfile => include/lazy}/lazyInstMgr.h | 6 +- .../lazy}/lazyP21DataSectionReader.h | 4 +- {src/cllazyfile => include/lazy}/lazyTypes.h | 0 .../lazy}/p21HeaderSectionReader.h | 2 +- .../lazy}/sectionReader.h | 2 +- misc/header_mv.sh | 12 +- src/cllazyfile/CMakeLists.txt | 24 +- src/cllazyfile/{judy/src => }/judy.c | 2 +- src/cllazyfile/judy/CMakeLists.txt | 78 - src/cllazyfile/judy/README.md | 43 - src/cllazyfile/judy/misc/astyle.cfg | 29 - src/cllazyfile/judy/misc/hextest.sh | 8 - src/cllazyfile/judy/misc/judy64n.c | 2084 ----------------- src/cllazyfile/judy/test/hexSort.c | 124 - src/cllazyfile/judy/test/judyL2test.cc | 72 - src/cllazyfile/judy/test/judyLtest.cc | 33 - src/cllazyfile/judy/test/judyS2test.cc | 75 - src/cllazyfile/judy/test/judyStest.cc | 43 - src/cllazyfile/judy/test/pennySort.c | 236 -- src/cllazyfile/judy/test/sort.c | 233 -- src/cllazyfile/judy/test/sort.h | 58 - src/cllazyfile/lazyDataSectionReader.cc | 6 +- src/cllazyfile/lazyFileReader.cc | 8 +- src/cllazyfile/lazyInstMgr.cc | 6 +- src/cllazyfile/lazyP21DataSectionReader.cc | 4 +- src/cllazyfile/lazyRefs.h | 4 +- src/cllazyfile/lazy_test.cc | 2 +- src/cllazyfile/p21HeaderSectionReader.cc | 10 +- src/cllazyfile/sectionReader.cc | 8 +- test/cpp/schema_specific/inverse_attr3.cc | 2 +- 40 files changed, 63 insertions(+), 3188 deletions(-) rename {src/cllazyfile => include/lazy}/headerSectionReader.h (91%) rename {src/cllazyfile => include/lazy}/instMgrHelper.h (98%) rename {src/cllazyfile/judy/src => include/lazy}/judy.h (100%) rename {src/cllazyfile/judy/src => include/lazy}/judyL2Array.h (100%) rename {src/cllazyfile/judy/src => include/lazy}/judyLArray.h (100%) rename {src/cllazyfile/judy/src => include/lazy}/judyS2Array.h (100%) rename {src/cllazyfile/judy/src => include/lazy}/judySArray.h (100%) rename {src/cllazyfile => include/lazy}/lazyDataSectionReader.h (93%) rename {src/cllazyfile => include/lazy}/lazyFileReader.h (92%) rename {src/cllazyfile => include/lazy}/lazyInstMgr.h (98%) rename {src/cllazyfile => include/lazy}/lazyP21DataSectionReader.h (90%) rename {src/cllazyfile => include/lazy}/lazyTypes.h (100%) rename {src/cllazyfile => include/lazy}/p21HeaderSectionReader.h (94%) rename {src/cllazyfile => include/lazy}/sectionReader.h (99%) rename src/cllazyfile/{judy/src => }/judy.c (99%) delete mode 100644 src/cllazyfile/judy/CMakeLists.txt delete mode 100644 src/cllazyfile/judy/README.md delete mode 100644 src/cllazyfile/judy/misc/astyle.cfg delete mode 100755 src/cllazyfile/judy/misc/hextest.sh delete mode 100644 src/cllazyfile/judy/misc/judy64n.c delete mode 100644 src/cllazyfile/judy/test/hexSort.c delete mode 100644 src/cllazyfile/judy/test/judyL2test.cc delete mode 100644 src/cllazyfile/judy/test/judyLtest.cc delete mode 100644 src/cllazyfile/judy/test/judyS2test.cc delete mode 100644 src/cllazyfile/judy/test/judyStest.cc delete mode 100644 src/cllazyfile/judy/test/pennySort.c delete mode 100644 src/cllazyfile/judy/test/sort.c delete mode 100644 src/cllazyfile/judy/test/sort.h diff --git a/include/lazy/CMakeLists.txt b/include/lazy/CMakeLists.txt index 70d657254..c7ed6ad9e 100644 --- a/include/lazy/CMakeLists.txt +++ b/include/lazy/CMakeLists.txt @@ -1,5 +1,18 @@ set(LAZY_HDRS - + headerSectionReader.h + lazyFileReader.h + lazyP21DataSectionReader.h + p21HeaderSectionReader.h + lazyDataSectionReader.h + lazyInstMgr.h + lazyTypes.h + sectionReader.h + instMgrHelper.h + judy.h + judyL2Array.h + judyLArray.h + judyS2Array.h + judySArray.h ) install(FILES ${LAZY_HDRS} diff --git a/src/cllazyfile/headerSectionReader.h b/include/lazy/headerSectionReader.h similarity index 91% rename from src/cllazyfile/headerSectionReader.h rename to include/lazy/headerSectionReader.h index bea5582aa..b4eb807f9 100644 --- a/src/cllazyfile/headerSectionReader.h +++ b/include/lazy/headerSectionReader.h @@ -5,9 +5,9 @@ #include #include "judyL2Array.h" -#include "lazyFileReader.h" -#include "sectionReader.h" -#include "lazyTypes.h" +#include "lazy/lazyFileReader.h" +#include "lazy/sectionReader.h" +#include "lazy/lazyTypes.h" #include "sc_export.h" diff --git a/src/cllazyfile/instMgrHelper.h b/include/lazy/instMgrHelper.h similarity index 98% rename from src/cllazyfile/instMgrHelper.h rename to include/lazy/instMgrHelper.h index b6cf550b7..fc36863ea 100644 --- a/src/cllazyfile/instMgrHelper.h +++ b/include/lazy/instMgrHelper.h @@ -4,7 +4,7 @@ #include #include "core/mgrnode.h" -#include +#include "lazy/lazyInstMgr.h" #include "core/instmgr.h" /** diff --git a/src/cllazyfile/judy/src/judy.h b/include/lazy/judy.h similarity index 100% rename from src/cllazyfile/judy/src/judy.h rename to include/lazy/judy.h diff --git a/src/cllazyfile/judy/src/judyL2Array.h b/include/lazy/judyL2Array.h similarity index 100% rename from src/cllazyfile/judy/src/judyL2Array.h rename to include/lazy/judyL2Array.h diff --git a/src/cllazyfile/judy/src/judyLArray.h b/include/lazy/judyLArray.h similarity index 100% rename from src/cllazyfile/judy/src/judyLArray.h rename to include/lazy/judyLArray.h diff --git a/src/cllazyfile/judy/src/judyS2Array.h b/include/lazy/judyS2Array.h similarity index 100% rename from src/cllazyfile/judy/src/judyS2Array.h rename to include/lazy/judyS2Array.h diff --git a/src/cllazyfile/judy/src/judySArray.h b/include/lazy/judySArray.h similarity index 100% rename from src/cllazyfile/judy/src/judySArray.h rename to include/lazy/judySArray.h diff --git a/src/cllazyfile/lazyDataSectionReader.h b/include/lazy/lazyDataSectionReader.h similarity index 93% rename from src/cllazyfile/lazyDataSectionReader.h rename to include/lazy/lazyDataSectionReader.h index 41ad62a5c..449345007 100644 --- a/src/cllazyfile/lazyDataSectionReader.h +++ b/include/lazy/lazyDataSectionReader.h @@ -3,8 +3,8 @@ #include #include -#include "sectionReader.h" -#include "lazyTypes.h" +#include "lazy/sectionReader.h" +#include "lazy/lazyTypes.h" #include "sc_export.h" diff --git a/src/cllazyfile/lazyFileReader.h b/include/lazy/lazyFileReader.h similarity index 92% rename from src/cllazyfile/lazyFileReader.h rename to include/lazy/lazyFileReader.h index 20c35f73a..40c4d9c95 100644 --- a/src/cllazyfile/lazyFileReader.h +++ b/include/lazy/lazyFileReader.h @@ -8,9 +8,9 @@ #include "sc_export.h" // PART 21 -#include "lazyP21DataSectionReader.h" -#include "p21HeaderSectionReader.h" -#include "headerSectionReader.h" +#include "lazy/lazyP21DataSectionReader.h" +#include "lazy/p21HeaderSectionReader.h" +#include "lazy/headerSectionReader.h" /* // PART 28 * #include "lazyP28DataSectionReader.h" diff --git a/src/cllazyfile/lazyInstMgr.h b/include/lazy/lazyInstMgr.h similarity index 98% rename from src/cllazyfile/lazyInstMgr.h rename to include/lazy/lazyInstMgr.h index 689f611a5..ff9afc5cb 100644 --- a/src/cllazyfile/lazyInstMgr.h +++ b/include/lazy/lazyInstMgr.h @@ -5,9 +5,9 @@ #include #include -#include "lazyDataSectionReader.h" -#include "lazyFileReader.h" -#include "lazyTypes.h" +#include "lazy/lazyDataSectionReader.h" +#include "lazy/lazyFileReader.h" +#include "lazy/lazyTypes.h" #include "core/Registry.h" #include "sc_export.h" diff --git a/src/cllazyfile/lazyP21DataSectionReader.h b/include/lazy/lazyP21DataSectionReader.h similarity index 90% rename from src/cllazyfile/lazyP21DataSectionReader.h rename to include/lazy/lazyP21DataSectionReader.h index 0602b421a..81e5f6bde 100644 --- a/src/cllazyfile/lazyP21DataSectionReader.h +++ b/include/lazy/lazyP21DataSectionReader.h @@ -1,8 +1,8 @@ #ifndef LAZYP21DATASECTIONREADER_H #define LAZYP21DATASECTIONREADER_H -#include "lazyDataSectionReader.h" -#include "lazyFileReader.h" +#include "lazy/lazyDataSectionReader.h" +#include "lazy/lazyFileReader.h" #include "sc_export.h" class SC_LAZYFILE_EXPORT lazyP21DataSectionReader: public lazyDataSectionReader { diff --git a/src/cllazyfile/lazyTypes.h b/include/lazy/lazyTypes.h similarity index 100% rename from src/cllazyfile/lazyTypes.h rename to include/lazy/lazyTypes.h diff --git a/src/cllazyfile/p21HeaderSectionReader.h b/include/lazy/p21HeaderSectionReader.h similarity index 94% rename from src/cllazyfile/p21HeaderSectionReader.h rename to include/lazy/p21HeaderSectionReader.h index 01452ea06..e89c50288 100644 --- a/src/cllazyfile/p21HeaderSectionReader.h +++ b/include/lazy/p21HeaderSectionReader.h @@ -1,7 +1,7 @@ #ifndef P21HEADERSECTIONREADER_H #define P21HEADERSECTIONREADER_H -#include "headerSectionReader.h" +#include "lazy/headerSectionReader.h" #include "sc_export.h" class SC_LAZYFILE_EXPORT p21HeaderSectionReader: public headerSectionReader { diff --git a/src/cllazyfile/sectionReader.h b/include/lazy/sectionReader.h similarity index 99% rename from src/cllazyfile/sectionReader.h rename to include/lazy/sectionReader.h index 1e3379cc1..7b62a910c 100644 --- a/src/cllazyfile/sectionReader.h +++ b/include/lazy/sectionReader.h @@ -3,7 +3,7 @@ #include #include -#include "lazyTypes.h" +#include "lazy/lazyTypes.h" #include "sc_export.h" #include "errordesc.h" #include "core/STEPcomplex.h" diff --git a/misc/header_mv.sh b/misc/header_mv.sh index d43a1cd0f..8d5a67d39 100755 --- a/misc/header_mv.sh +++ b/misc/header_mv.sh @@ -1,10 +1,10 @@ #!/bin/bash -find . -type f -path "*/cl*" -not -path "*.git/*" -not -path "*/exp*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include \"$1\"/include \"editor\/$1\"/g" {} \; -find . -type f -path "*/cl*" -not -path "*.git/*" -not -path "*/exp*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include <$1>/include \"editor\/$1\"/g" {} \; +find . -type f -path "*/cl*" -not -path "*.git/*" -not -path "*/exp*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include \"$1\"/include \"lazy\/$1\"/g" {} \; +find . -type f -path "*/cl*" -not -path "*.git/*" -not -path "*/exp*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include <$1>/include \"lazy\/$1\"/g" {} \; -find . -type f -path "*/include*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include \"$1\"/include \"editor\/$1\"/g" {} \; -find . -type f -path "*/include*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include <$1>/include \"editor\/$1\"/g" {} \; +find . -type f -path "*/include*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include \"$1\"/include \"lazy\/$1\"/g" {} \; +find . -type f -path "*/include*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include <$1>/include \"lazy\/$1\"/g" {} \; -find . -type f -path "*/test*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include \"$1\"/include \"editor\/$1\"/g" {} \; -find . -type f -path "*/test*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include <$1>/include \"editor\/$1\"/g" {} \; +find . -type f -path "*/test*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include \"$1\"/include \"lazy\/$1\"/g" {} \; +find . -type f -path "*/test*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include <$1>/include \"lazy\/$1\"/g" {} \; diff --git a/src/cllazyfile/CMakeLists.txt b/src/cllazyfile/CMakeLists.txt index 392f56fdc..ea6d37a77 100644 --- a/src/cllazyfile/CMakeLists.txt +++ b/src/cllazyfile/CMakeLists.txt @@ -6,25 +6,7 @@ set( clLazyFile_SRCS p21HeaderSectionReader.cc sectionReader.cc lazyP21DataSectionReader.cc - judy/src/judy.c - ) - -set( SC_CLLAZYFILE_HDRS - headerSectionReader.h - lazyFileReader.h - lazyP21DataSectionReader.h - p21HeaderSectionReader.h - lazyDataSectionReader.h - lazyInstMgr.h - lazyTypes.h - sectionReader.h - sectionReader.h - instMgrHelper.h - judy/src/judy.h - judy/src/judyLArray.h - judy/src/judyL2Array.h - judy/src/judySArray.h - judy/src/judyS2Array.h + judy.c ) include_directories( @@ -34,7 +16,6 @@ include_directories( ${SC_SOURCE_DIR}/src/cldai ${SC_SOURCE_DIR}/src/clstepcore ${SC_SOURCE_DIR}/src/clutils - ${CMAKE_CURRENT_SOURCE_DIR}/judy/src ) set(_libdeps stepcore stepdai steputils stepeditor) @@ -54,9 +35,6 @@ endif() SC_ADDEXEC(lazy_test SOURCES "lazy_test.cc;sc_benchmark.cc" LINK_LIBRARIES steplazyfile stepeditor NO_INSTALL) target_compile_definitions(lazy_test PRIVATE NO_REGISTRY) -install(FILES ${SC_CLLAZYFILE_HDRS} - DESTINATION ${INCLUDE_DIR}/stepcode/cllazyfile) - # Local Variables: # tab-width: 8 # mode: cmake diff --git a/src/cllazyfile/judy/src/judy.c b/src/cllazyfile/judy.c similarity index 99% rename from src/cllazyfile/judy/src/judy.c rename to src/cllazyfile/judy.c index 91380cead..2bdba01ea 100644 --- a/src/cllazyfile/judy/src/judy.c +++ b/src/cllazyfile/judy.c @@ -60,7 +60,7 @@ # endif #endif -#include "judy.h" +#include "lazy/judy.h" #include #include diff --git a/src/cllazyfile/judy/CMakeLists.txt b/src/cllazyfile/judy/CMakeLists.txt deleted file mode 100644 index 3c26e4df2..000000000 --- a/src/cllazyfile/judy/CMakeLists.txt +++ /dev/null @@ -1,78 +0,0 @@ - -cmake_minimum_required(VERSION 3.12) -project( JudyTemplates ) - -if( NOT DEFINED CMAKE_BUILD_TYPE ) - # set( CMAKE_BUILD_TYPE "RelWithDebInfo" ) #optimize, but include debug info - set( CMAKE_BUILD_TYPE "Release" ) -endif( NOT DEFINED CMAKE_BUILD_TYPE ) - -SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib ) -SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib ) -SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin ) - -if( NOT DEFINED JUDY_OPTIMIZE_FLAGS ) - if( CMAKE_COMPILER_IS_GNUCC ) - set( JUDY_OPTIMIZE_FLAGS "-march=native" ) - - #test for LTO; this uses an internal variable so it may break - if( DEFINED CMAKE_C_COMPILER_VERSION ) - if( ${CMAKE_C_COMPILER_VERSION} VERSION_GREATER 4.7.0 ) - set( JUDY_OPTIMIZE_FLAGS "${JUDY_OPTIMIZE_FLAGS} -flto" ) - message( " -- GCC version: ${CMAKE_C_COMPILER_VERSION}. Enabling link-time optimization." ) - endif( ${CMAKE_C_COMPILER_VERSION} VERSION_GREATER 4.7.0 ) - endif( DEFINED CMAKE_C_COMPILER_VERSION ) - #elseif( MSVC ) - # set( JUDY_OPTIMIZE_FLAGS "..." ) # <--- set MSVC flags here <--- - else() - message( "Unrecognized compiler - no optimization flags set. Edit CMakeLists.txt or set JUDY_OPTIMIZE_FLAGS." ) - set( JUDY_OPTIMIZE_FLAGS "" ) - endif( CMAKE_COMPILER_IS_GNUCC ) -endif( NOT DEFINED JUDY_OPTIMIZE_FLAGS ) -add_definitions( ${JUDY_OPTIMIZE_FLAGS} ) - -set( JUDYS_SOURCES src/judy.c src/judy.h ) - -if( CMAKE_COMPILER_IS_GNUCC ) - add_definitions( -pedantic -W -Wall -Wundef -Wfloat-equal -Wshadow -Winline -Wno-long-long ) -endif( CMAKE_COMPILER_IS_GNUCC ) - -add_library( judy_lib STATIC ${JUDYS_SOURCES} ) - -include_directories( src ) - -if( ENABLE_TESTING ) - include( CTest ) - include_directories( test ) - enable_testing() - - add_executable( pennysort test/pennySort.c test/sort.c ${JUDYS_SOURCES} ) - add_executable( hexsort test/hexSort.c test/sort.c ${JUDYS_SOURCES} ) - set_target_properties( pennysort hexsort PROPERTIES COMPILE_FLAGS "-DSTANDALONE" ) - - - add_executable( judyLtest test/judyLtest.cc ) - target_link_libraries( judyLtest judy_lib ) - add_test( judyLtest judyLtest ) - - add_executable( judyL2test test/judyL2test.cc ) - target_link_libraries( judyL2test judy_lib ) - add_test( judyL2test judyL2test ) - - add_executable( judyStest test/judyStest.cc ) - target_link_libraries( judyStest judy_lib ) - add_test( judyStest judyStest ) - - add_executable( judyS2test test/judyS2test.cc ) - target_link_libraries( judyS2test judy_lib ) - add_test( judyS2test judyS2test ) - -endif( ENABLE_TESTING ) - -# Local Variables: -# tab-width: 8 -# mode: cmake -# indent-tabs-mode: t -# End: -# ex: shiftwidth=2 tabstop=8 - diff --git a/src/cllazyfile/judy/README.md b/src/cllazyfile/judy/README.md deleted file mode 100644 index 5fc134587..000000000 --- a/src/cllazyfile/judy/README.md +++ /dev/null @@ -1,43 +0,0 @@ -# Judy Array Templates -The Judy Array is a sparse dynamic array. It is a particular kind of trie that is highly efficient in space and time, and does not require tuning. - -This uses [Karl Malbrain's implementation](http://code.google.com/p/judyarray/) of the Judy Array. Additional information can be found with Doug Baskins' [original implementation](http://judy.sourceforge.net/) on sourceforge, or on [Wikipedia](http://en.wikipedia.org/wiki/Judy_array). -## The templates -* `judyLArray` - a C++ template wrapper for an int-int Judy Array. JudyKey and JudyValue must be integer types and the same size as a pointer (i.e. 32- or 64-bit) -* `judySArray` - Same as judyLArray, but with string-int mapping. The above restrictions on JudyValue apply here as well. -* **TODO** - single-key, multi-value versions of the above -* **TODO** - single-key, n-value versions of the above *(?)* - -## Comparison between this and the versions Karl and Doug wrote -* Doug Baskins' code is licenced under the LGPL. While more permissive than the GPL, it's still not always acceptable. His code is very fast but weighs in at ~20k lines. -* Karl Malbrain's code is ~1250 lines, in a single file containing the judy array and the test code; use requires creating a header. -* Both of the above are written in C, so they don't fit neatly into object-oriented C++. -* Unlike Doug's code, this is ~1250 lines. Unlike Karl's, this is split into several files. - -## Files -* `CMakeLists.txt` - CMake build logic. If you don't have CMake, it should be quite easy to write a file for the build system of your choice. -* **src/** - * `judy.c`, `judy.h` - implementation of the Judy Array - * `judyLArray.h` - the judyLArray template - * `judySArray.h` - the judySArray template -* **test/** - * `hexSort.c` - Sorts a file where each line contains 32 hex chars. Compiles to `hexsort`, which is the same executable as compiling Karl's code with `-DHEXSORT -DSTANDALONE` - * `pennySort.c` - Sorts strings; compiles to `pennysort`. Same as compiling Karl's code with `-DSTANDALONE`. - * `sort.c`, `sort.h` - Karl's sorting functions. Only used by `hexsort` and `pennysort`. - * `judyLtest.cc` - an incomplete test of the judyLArray template. - * `judyStest.cc` - an incomplete test of the judySArray template. - - -## Compiling -* requires C and C++ compilers, CMake. -* from the command line: - * `mkdir build; cd build` - * `cmake .. -DENABLE_TESTING=TRUE` - * `make` - -## License - -Karl Malbrain's judy array code is public domain; what I've added is public domain as well. - -## Contact -mpictor -a-t- gmail diff --git a/src/cllazyfile/judy/misc/astyle.cfg b/src/cllazyfile/judy/misc/astyle.cfg deleted file mode 100644 index eec1dd399..000000000 --- a/src/cllazyfile/judy/misc/astyle.cfg +++ /dev/null @@ -1,29 +0,0 @@ -#astyle config file - -#run astyle on one or a few files: use -# astyle --options=misc/astyle.cfg path/to/file - -#run astyle on all files: from the root dir, use -# astyle --options=misc/astyle.cfg --recursive "src/*.c" "src/*.h" "test/*.c" "test/*.h" -# in the above line, the double quotes *are* necessary - - -suffix=none #don't create backup files - -style=java #compact bracket style - -indent=spaces=4 - -indent-preprocessor -indent-classes -indent-switches -indent-namespaces -pad-oper #pad (space) around operators -pad-paren-in #pad inside parenthesis -unpad-paren #remove parenthesis padding other than requested above - -add-brackets #add brackets on one-line conditionals -convert-tabs #convert all tabs to spaces -align-pointer=middle #char * foo - -lineend=linux #lines end with LF (linux), not CRLF (windows) diff --git a/src/cllazyfile/judy/misc/hextest.sh b/src/cllazyfile/judy/misc/hextest.sh deleted file mode 100755 index ee8606d48..000000000 --- a/src/cllazyfile/judy/misc/hextest.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -#generates a file of hex keys and runs hexsort on it. No verification is done. -#hex data comes from /dev/urandom, so it isn't all that random. - -hexdump -v -e '2/8 "%08x"' -e '"\n"' /dev/urandom |head -n 1000000 >ukeys -#a.out [in-file] [out-file] [keysize] [recordlen] [keyoffset] [mergerecs] -time bin/hexsort ukeys skeys \ No newline at end of file diff --git a/src/cllazyfile/judy/misc/judy64n.c b/src/cllazyfile/judy/misc/judy64n.c deleted file mode 100644 index 8dc8f909a..000000000 --- a/src/cllazyfile/judy/misc/judy64n.c +++ /dev/null @@ -1,2084 +0,0 @@ -// Judy arrays 23 NOV 2012 - -// Author Karl Malbrain, malbrain@yahoo.com -// with assistance from Jan Weiss. - -// Simplified judy arrays for strings and integers -// Adapted from the ideas of Douglas Baskins of HP. - -// The -D ASKITIS benchmarking option was implemented with -// assistance from Dr. Nikolas Askitis (www.naskitis.com). - -// Map a set of keys to corresponding memory cells (unsigned ints). -// Each cell must be set to a non-zero value by the caller. - -// STANDALONE is defined to compile into a string sorter. - -// String mappings are denoted by calling judy_open with zero as -// the second argument. Integer mappings are denoted by calling -// judy_open with the Integer depth of the Judy Trie as the second -// argument. - -//#define STANDALONE - -// functions: -// judy_open: open a new judy array returning a judy object. -// judy_close: close an open judy array, freeing all memory. -// judy_clone: clone an open judy array, duplicating the stack. -// judy_data: allocate data memory within judy array for external use. -// judy_cell: insert a string into the judy array, return cell pointer. -// judy_strt: retrieve the cell pointer greater than or equal to given key -// judy_slot: retrieve the cell pointer, or return NULL for a given key. -// judy_key: retrieve the string value for the most recent judy query. -// judy_end: retrieve the cell pointer for the last string in the array. -// judy_nxt: retrieve the cell pointer for the next string in the array. -// judy_prv: retrieve the cell pointer for the prev string in the array. -// judy_del: delete the key and cell for the current stack entry. - -#include -#include -#include - -#ifdef linux - #define _FILE_OFFSET_BITS 64 - #define _LARGEFILE_SOURCE - #define __USE_FILE_OFFSET64 - - #include -#else - #ifdef __BIG_ENDIAN__ - #ifndef BYTE_ORDER - #define BYTE_ORDER 4321 - #endif - #else - #ifndef BYTE_ORDER - #define BYTE_ORDER 1234 - #endif - #endif - #ifndef BIG_ENDIAN - #define BIG_ENDIAN 4321 - #endif -#endif - - - -#define PRIuint "u" - -#if defined(__LP64__) || \ - defined(__x86_64__) || \ - defined(__amd64__) || \ - defined(_WIN64) || \ - defined(__sparc64__) || \ - defined(__arch64__) || \ - defined(__powerpc64__) || \ - defined (__s390x__) - // defines for 64 bit - - typedef unsigned long long judyvalue; - typedef unsigned long long JudySlot; - #define JUDY_key_mask (0x07) - #define JUDY_key_size 8 - #define JUDY_slot_size 8 - #define JUDY_span_bytes (3 * JUDY_key_size) - #define JUDY_span_equiv JUDY_2 - #define JUDY_radix_equiv JUDY_8 - - #define PRIjudyvalue "llu" - -#else - // defines for 32 bit - - typedef unsigned int judyvalue; - typedef unsigned int JudySlot; - #define JUDY_key_mask (0x03) - #define JUDY_key_size 4 - #define JUDY_slot_size 4 - #define JUDY_span_bytes (7 * JUDY_key_size) - #define JUDY_span_equiv JUDY_4 - #define JUDY_radix_equiv JUDY_8 - - #define PRIjudyvalue "u" - -#endif - -#define JUDY_mask (~(JudySlot)0x07) - -// define the alignment factor for judy nodes and allocations -// to enable this feature, set to 64 - -#define JUDY_cache_line 8 // minimum size is 8 bytes - -#if defined(STANDALONE) || defined(ASKITIS) -#include -#include - -unsigned int MaxMem = 0; - -// void judy_abort (char *msg) __attribute__ ((noreturn)); // Tell static analyser that this function will not return -void judy_abort (char *msg) -{ - fprintf(stderr, "%s\n", msg); - exit(1); -} -#endif - -#define JUDY_seg 65536 - -enum JUDY_types { - JUDY_radix = 0, // inner and outer radix fan-out - JUDY_1 = 1, // linear list nodes of designated count - JUDY_2 = 2, - JUDY_4 = 3, - JUDY_8 = 4, - JUDY_16 = 5, - JUDY_32 = 6, -#ifdef ASKITIS - JUDY_64 = 7 -#else - JUDY_span = 7 // up to 28 tail bytes of key contiguously stored -#endif -}; - -int JudySize[] = { - (JUDY_slot_size * 16), // JUDY_radix node size - (JUDY_slot_size + JUDY_key_size), // JUDY_1 node size - (2 * JUDY_slot_size + 2 * JUDY_key_size), - (4 * JUDY_slot_size + 4 * JUDY_key_size), - (8 * JUDY_slot_size + 8 * JUDY_key_size), - (16 * JUDY_slot_size + 16 * JUDY_key_size), - (32 * JUDY_slot_size + 32 * JUDY_key_size), -#ifndef ASKITIS - (JUDY_span_bytes + JUDY_slot_size) -#else - (64 * JUDY_slot_size + 64 * JUDY_key_size) -#endif -}; - -judyvalue JudyMask[9] = { -0, 0xff, 0xffff, 0xffffff, 0xffffffff, -#if JUDY_key_size > 4 -0xffffffffffULL, 0xffffffffffffULL, 0xffffffffffffffULL, 0xffffffffffffffffULL -#endif -}; - -typedef struct { - void *seg; // next used allocator - unsigned int next; // next available offset -} JudySeg; - -typedef struct { - JudySlot next; // judy object - unsigned int off; // offset within key - int slot; // slot within object -} JudyStack; - -typedef struct { - JudySlot root[1]; // root of judy array - void **reuse[8]; // reuse judy blocks - JudySeg *seg; // current judy allocator - unsigned int level; // current height of stack - unsigned int max; // max height of stack - unsigned int depth; // number of Integers in a key, or zero for string keys - JudyStack stack[1]; // current cursor -} Judy; - -#ifdef ASKITIS -int Words = 0; -int Inserts = 0; -int Found = 0; - -#if JUDY_key_size < 8 -#define JUDY_max JUDY_16 -#else -#define JUDY_max JUDY_64 -#endif -#else -#define JUDY_max JUDY_32 -#endif - -// open judy object -// call with max key size -// and Integer tree depth. - -void *judy_open (unsigned int max, unsigned int depth) -{ -JudySeg *seg; -Judy *judy; -unsigned int amt; - - max++; // allow for zero terminator on keys - - if( (seg = malloc(JUDY_seg)) ) { - seg->seg = NULL; - seg->next = JUDY_seg; - } else { -#if defined(STANDALONE) || defined(ASKITIS) - judy_abort ("No virtual memory"); -#else - return NULL; -#endif - } - - amt = sizeof(Judy) + max * sizeof(JudyStack); - - if( amt & (JUDY_cache_line - 1) ) - amt |= JUDY_cache_line - 1, amt++; - -#if defined(STANDALONE) || defined(ASKITIS) - MaxMem += JUDY_seg; -#endif - - seg->next -= (JudySlot)seg & (JUDY_cache_line - 1); - seg->next -= amt; - - judy = (Judy *)((unsigned char *)seg + seg->next); - memset(judy, 0, amt); - judy->depth = depth; - judy->seg = seg; - judy->max = max; - return judy; -} - -void judy_close (Judy *judy) -{ -JudySeg *seg, *nxt = judy->seg; - - while( (seg = nxt) ) - nxt = seg->seg, free (seg); -} - -// allocate judy node - -void *judy_alloc (Judy *judy, unsigned int type) -{ -unsigned int amt, idx, min; -JudySeg *seg; -void **block; -void **rtn; - - if( !judy->seg ) -#if defined(STANDALONE) || defined(ASKITIS) - judy_abort("illegal allocation from judy clone"); -#else - return NULL; -#endif - - if( type == JUDY_radix ) - type = JUDY_radix_equiv; - -#ifndef ASKITIS - if( type == JUDY_span ) - type = JUDY_span_equiv; -#endif - - amt = JudySize[type]; - - if( amt & 0x07 ) - amt |= 0x07, amt += 1; - - // see if free block is already available - - if( (block = judy->reuse[type]) ) { - judy->reuse[type] = *block; - memset (block, 0, amt); - return (void *)block; - } - - // break down available larger block - // for reuse into smaller blocks - - if( type >= JUDY_1 ) - for( idx = type; idx++ < JUDY_max; ) - if( block = judy->reuse[idx] ) { - judy->reuse[idx] = *block; - while( idx-- > type) { - judy->reuse[idx] = block + JudySize[idx] / sizeof(void *); - block[JudySize[idx] / sizeof(void *)] = 0; - } - memset (block, 0, amt); - return (void *)block; - } - - min = amt < JUDY_cache_line ? JUDY_cache_line : amt; - - if( judy->seg->next < min + sizeof(*seg) ) { - if( (seg = malloc (JUDY_seg)) ) { - seg->next = JUDY_seg; - seg->seg = judy->seg; - judy->seg = seg; - seg->next -= (JudySlot)seg & (JUDY_cache_line - 1); - } else { -#if defined(STANDALONE) || defined(ASKITIS) - judy_abort("Out of virtual memory"); -#else - return NULL; -#endif - } - -#if defined(STANDALONE) || defined(ASKITIS) - MaxMem += JUDY_seg; -#endif - } - - // generate additional free blocks - // to fill up to cache line size - - rtn = (void **)((unsigned char *)judy->seg + judy->seg->next - amt); - - for( idx = type; amt & (JUDY_cache_line - 1); amt <<= 1 ) { - block = (void **)((unsigned char *)judy->seg + judy->seg->next - 2 * amt); - judy->reuse[idx++] = block; - *block = 0; - } - - judy->seg->next -= amt; - memset (rtn, 0, JudySize[type]); - return (void *)rtn; -} - -void *judy_data (Judy *judy, unsigned int amt) - -{ -JudySeg *seg; -void *block; - - if( !judy->seg ) -#if defined(STANDALONE) || defined(ASKITIS) - judy_abort("illegal allocation from judy clone"); -#else - return NULL; -#endif - - if( amt & (JUDY_cache_line - 1)) - amt |= (JUDY_cache_line - 1), amt += 1; - - if( judy->seg->next < amt + sizeof(*seg) ) { - if( (seg = malloc (JUDY_seg)) ) { - seg->next = JUDY_seg; - seg->seg = judy->seg; - judy->seg = seg; - seg->next -= (JudySlot)seg & (JUDY_cache_line - 1); - } else { -#if defined(STANDALONE) || defined(ASKITIS) - judy_abort("Out of virtual memory"); -#else - return NULL; -#endif - } - -#if defined(STANDALONE) || defined(ASKITIS) - MaxMem += JUDY_seg; -#endif - } - - judy->seg->next -= amt; - - block = (void *)((unsigned char *)judy->seg + judy->seg->next); - memset (block, 0, amt); - return block; -} - -void *judy_clone (Judy *judy) -{ -Judy *clone; -unsigned int amt; - - amt = sizeof(Judy) + judy->max * sizeof(JudyStack); - clone = judy_data (judy, amt); - memcpy (clone, judy, amt); - clone->seg = NULL; // stop allocations from cloned array - return clone; -} - -void judy_free (Judy *judy, void *block, int type) -{ - if( type == JUDY_radix ) - type = JUDY_radix_equiv; - -#ifndef ASKITIS - if( type == JUDY_span ) - type = JUDY_span_equiv; -#endif - - *((void **)(block)) = judy->reuse[type]; - judy->reuse[type] = (void **)block; - return; -} - -// assemble key from current path - -unsigned int judy_key (Judy *judy, unsigned char *buff, unsigned int max) -{ -judyvalue *dest = (judyvalue *)buff; -unsigned int len = 0, idx = 0, depth; -int slot, off, type; -judyvalue value; -unsigned char *base; -int keysize; - - if( judy->depth ) - max = judy->depth * JUDY_key_size; - else - max--; // leave room for zero terminator - - while( len < max && ++idx <= judy->level ) { - type = judy->stack[idx].next & 0x07; - slot = judy->stack[idx].slot; - depth = len / JUDY_key_size; - - if( judy->depth ) - if( !(len & JUDY_key_mask) ) - dest[depth] = 0; - - switch( type ) { - case JUDY_1: - case JUDY_2: - case JUDY_4: - case JUDY_8: - case JUDY_16: - case JUDY_32: -#ifdef ASKITIS - case JUDY_64: -#endif - keysize = JUDY_key_size - (judy->stack[idx].off & JUDY_key_mask); - base = (unsigned char *)(judy->stack[idx].next & JUDY_mask); - - if( judy->depth ) { - value = *(judyvalue *)(base + slot * keysize); - value &= JudyMask[keysize]; - dest[depth++] |= value; - len += keysize; - - if( depth < judy->depth ) - continue; - - return len; - } - -#if BYTE_ORDER != BIG_ENDIAN - off = keysize; - - while( off-- && len < max ) - if( buff[len] = base[slot * keysize + off] ) - len++; - else - break; -#else - for( off = 0; off < keysize && len < max; off++ ) - if( buff[len] = base[slot * keysize + off] ) - len++; - else - break; -#endif - continue; - - case JUDY_radix: - if( judy->depth ) { - dest[depth] |= (judyvalue)slot << (JUDY_key_size - (++len & JUDY_key_mask)) * 8; - if( !(len & JUDY_key_mask) ) - depth++; - if( depth < judy->depth ) - continue; - - return len; - } - - if( !slot ) - break; - buff[len++] = (unsigned char)slot; - continue; - -#ifndef ASKITIS - case JUDY_span: - base = (unsigned char *)(judy->stack[idx].next & JUDY_mask); - - for( slot = 0; slot < JUDY_span_bytes && base[slot]; slot++ ) - if( len < max ) - buff[len++] = base[slot]; - continue; -#endif - } - } - buff[len] = 0; - return len; -} - -// find slot & setup cursor - -JudySlot *judy_slot (Judy *judy, unsigned char *buff, unsigned int max) -{ -judyvalue *src = (judyvalue *)buff; -int slot, size, keysize, tst, cnt; -JudySlot next = *judy->root; -judyvalue value, test = 0; -JudySlot *table; -JudySlot *node; -unsigned int depth = 0; -unsigned int off = 0; -unsigned char *base; - -#ifndef ASKITIS - judy->level = 0; -#endif - - while( next ) { -#ifndef ASKITIS - if( judy->level < judy->max ) - judy->level++; - - judy->stack[judy->level].next = next; - judy->stack[judy->level].off = off; -#endif - size = JudySize[next & 0x07]; - - switch( next & 0x07 ) { - - case JUDY_1: - case JUDY_2: - case JUDY_4: - case JUDY_8: - case JUDY_16: - case JUDY_32: -#ifdef ASKITIS - case JUDY_64: -#endif - base = (unsigned char *)(next & JUDY_mask); - node = (JudySlot *)((next & JUDY_mask) + size); - keysize = JUDY_key_size - (off & JUDY_key_mask); - cnt = size / (sizeof(JudySlot) + keysize); - slot = cnt; - value = 0; - - if( judy->depth ) { - value = src[depth++]; - off |= JUDY_key_mask; - off++; - value &= JudyMask[keysize]; - } else - do { - value <<= 8; - if( off < max ) - value |= buff[off]; - } while( ++off & JUDY_key_mask ); - - // find slot > key - - while( slot-- ) { - test = *(judyvalue *)(base + slot * keysize); -#if BYTE_ORDER == BIG_ENDIAN - test >>= 8 * (JUDY_key_size - keysize); -#else - test &= JudyMask[keysize]; -#endif - if( test <= value ) - break; - } -#ifndef ASKITIS - judy->stack[judy->level].slot = slot; -#endif - if( test == value ) { - - // is this a leaf? - - if( !judy->depth && !(value & 0xFF) || judy->depth && depth == judy->depth ) - return &node[-slot-1]; - - next = node[-slot-1]; - continue; - } - - return NULL; - - case JUDY_radix: - table = (JudySlot *)(next & JUDY_mask); // outer radix - - if( judy->depth ) - slot = (src[depth] >> ((JUDY_key_size - off++ & JUDY_key_mask) * 8)) & 0xff; - else if( off < max ) - slot = buff[off++]; - else - slot = 0; -#ifndef ASKITIS - // put radix slot on judy stack - - judy->stack[judy->level].slot = slot; -#endif - if( (next = table[slot >> 4]) ) - table = (JudySlot *)(next & JUDY_mask); // inner radix - else - return NULL; - - if( judy->depth ) - if( !(off & JUDY_key_mask) ) - depth++; - - if( !judy->depth && !slot || judy->depth && depth == judy->depth ) // leaf? - if( table[slot & 0x0F] ) // occupied? - return &table[slot & 0x0F]; - else - return NULL; - - next = table[slot & 0x0F]; - continue; - -#ifndef ASKITIS - case JUDY_span: - node = (JudySlot *)((next & JUDY_mask) + JudySize[JUDY_span]); - base = (unsigned char *)(next & JUDY_mask); - cnt = tst = JUDY_span_bytes; - if( tst > (int)(max - off) ) - tst = max - off; - value = strncmp((const char *)base, (const char *)(buff + off), tst); - if( !value && tst < cnt && !base[tst] ) // leaf? - return &node[-1]; - - if( !value && tst == cnt ) { - next = node[-1]; - off += cnt; - continue; - } - return NULL; -#endif - } - } - - return NULL; -} - -// promote full nodes to next larger size - -JudySlot *judy_promote (Judy *judy, JudySlot *next, int idx, judyvalue value, int keysize) -{ -unsigned char *base = (unsigned char *)(*next & JUDY_mask); -int oldcnt, newcnt, slot; -#if BYTE_ORDER == BIG_ENDIAN - int i; -#endif -JudySlot *newnode, *node; -JudySlot *result; -unsigned char *newbase; -unsigned int type; - - type = (*next & 0x07) + 1; - node = (JudySlot *)((*next & JUDY_mask) + JudySize[type-1]); - oldcnt = JudySize[type-1] / (sizeof(JudySlot) + keysize); - newcnt = JudySize[type] / (sizeof(JudySlot) + keysize); - - // promote node to next larger size - - newbase = judy_alloc (judy, type); - newnode = (JudySlot *)(newbase + JudySize[type]); - *next = (JudySlot)newbase | type; - - // open up slot at idx - - memcpy(newbase + (newcnt - oldcnt - 1) * keysize, base, idx * keysize); // copy keys - - for( slot = 0; slot < idx; slot++ ) - newnode[-(slot + newcnt - oldcnt)] = node[-(slot + 1)]; // copy ptr - - // fill in new node - -#if BYTE_ORDER != BIG_ENDIAN - memcpy(newbase + (idx + newcnt - oldcnt - 1) * keysize, &value, keysize); // copy key -#else - i = keysize; - - while( i-- ) - newbase[(idx + newcnt - oldcnt - 1) * keysize + i] = value, value >>= 8; -#endif - result = &newnode[-(idx + newcnt - oldcnt)]; - - // copy rest of old node - - memcpy(newbase + (idx + newcnt - oldcnt) * keysize, base + (idx * keysize), (oldcnt - slot) * keysize); // copy keys - - for( ; slot < oldcnt; slot++ ) - newnode[-(slot + newcnt - oldcnt + 1)] = node[-(slot + 1)]; // copy ptr - -#ifndef ASKITIS - judy->stack[judy->level].next = *next; - judy->stack[judy->level].slot = idx + newcnt - oldcnt - 1; -#endif - judy_free (judy, (void **)base, type - 1); - return result; -} - -// construct new node for JUDY_radix entry -// make node with slot - start entries -// moving key over one offset - -void judy_radix (Judy *judy, JudySlot *radix, unsigned char *old, int start, int slot, int keysize, unsigned char key, unsigned int depth) -{ -int size, idx, cnt = slot - start, newcnt; -JudySlot *node, *oldnode; -unsigned int type = JUDY_1 - 1; -JudySlot *table; -unsigned char *base; - - // if necessary, setup inner radix node - - if( !(table = (JudySlot *)(radix[key >> 4] & JUDY_mask)) ) { - table = judy_alloc (judy, JUDY_radix); - radix[key >> 4] = (JudySlot)table | JUDY_radix; - } - - oldnode = (JudySlot *)(old + JudySize[JUDY_max]); - - // is this slot a leaf? - - if( !judy->depth && (!key || !keysize) || judy->depth && !keysize && depth == judy->depth) { - table[key & 0x0F] = oldnode[-start-1]; - return; - } - - // calculate new node big enough to contain slots - - do { - type++; - size = JudySize[type]; - newcnt = size / (sizeof(JudySlot) + keysize); - } while( cnt > newcnt && type < JUDY_max ); - - // store new node pointer in inner table - - base = judy_alloc (judy, type); - node = (JudySlot *)(base + size); - table[key & 0x0F] = (JudySlot)base | type; - - // allocate node and copy old contents - // shorten keys by 1 byte during copy - - for( idx = 0; idx < cnt; idx++ ) { -#if BYTE_ORDER != BIG_ENDIAN - memcpy (base + (newcnt - idx - 1) * keysize, old + (start + cnt - idx - 1) * (keysize + 1), keysize); -#else - memcpy (base + (newcnt - idx - 1) * keysize, old + (start + cnt - idx - 1) * (keysize + 1) + 1, keysize); -#endif - node[-(newcnt - idx)] = oldnode[-(start + cnt - idx)]; - } -} - -// decompose full node to radix nodes - -void judy_splitnode (Judy *judy, JudySlot *next, unsigned int size, unsigned int keysize, unsigned int depth) -{ -int cnt, slot, start = 0; -unsigned int key = 0x0100, nxt; -JudySlot *newradix; -unsigned char *base; - - base = (unsigned char *)(*next & JUDY_mask); - cnt = size / (sizeof(JudySlot) + keysize); - - // allocate outer judy_radix node - - newradix = judy_alloc (judy, JUDY_radix); - *next = (JudySlot)newradix | JUDY_radix; - - for( slot = 0; slot < cnt; slot++ ) { -#if BYTE_ORDER != BIG_ENDIAN - nxt = base[slot * keysize + keysize - 1]; -#else - nxt = base[slot * keysize]; -#endif - - if( key > 0xFF ) - key = nxt; - if( nxt == key ) - continue; - - // decompose portion of old node into radix nodes - - judy_radix (judy, newradix, base, start, slot, keysize - 1, (unsigned char)key, depth); - start = slot; - key = nxt; - } - - judy_radix (judy, newradix, base, start, slot, keysize - 1, (unsigned char)key, depth); - judy_free (judy, (void **)base, JUDY_max); -} - -// return first leaf - -JudySlot *judy_first (Judy *judy, JudySlot next, unsigned int off, unsigned int depth) -{ -JudySlot *table, *inner; -unsigned int keysize, size; -JudySlot *node; -int slot, cnt; -unsigned char *base; - - while( next ) { - if( judy->level < judy->max ) - judy->level++; - - judy->stack[judy->level].off = off; - judy->stack[judy->level].next = next; - size = JudySize[next & 0x07]; - - switch( next & 0x07 ) { - case JUDY_1: - case JUDY_2: - case JUDY_4: - case JUDY_8: - case JUDY_16: - case JUDY_32: -#ifdef ASKITIS - case JUDY_64: -#endif - keysize = JUDY_key_size - (off & JUDY_key_mask); - node = (JudySlot *)((next & JUDY_mask) + size); - base = (unsigned char *)(next & JUDY_mask); - cnt = size / (sizeof(JudySlot) + keysize); - - for( slot = 0; slot < cnt; slot++ ) - if( node[-slot-1] ) - break; - - judy->stack[judy->level].slot = slot; -#if BYTE_ORDER != BIG_ENDIAN - if( !judy->depth && !base[slot * keysize] || judy->depth && ++depth == judy->depth ) - return &node[-slot-1]; -#else - if( !judy->depth && !base[slot * keysize + keysize - 1] || judy->depth && ++depth == judy->depth ) - return &node[-slot-1]; -#endif - next = node[-slot - 1]; - off = (off | JUDY_key_mask) + 1; - continue; - case JUDY_radix: - off++; - - if( judy->depth ) - if( !(off & JUDY_key_mask) ) - depth++; - - table = (JudySlot *)(next & JUDY_mask); - for( slot = 0; slot < 256; slot++ ) - if( (inner = (JudySlot *)(table[slot >> 4] & JUDY_mask)) ) { - if( (next = inner[slot & 0x0F]) ) { - judy->stack[judy->level].slot = slot; - if( !judy->depth && !slot || judy->depth && depth == judy->depth ) - return &inner[slot & 0x0F]; - else - break; - } - } else - slot |= 0x0F; - continue; -#ifndef ASKITIS - case JUDY_span: - node = (JudySlot *)((next & JUDY_mask) + JudySize[JUDY_span]); - base = (unsigned char *)(next & JUDY_mask); - cnt = JUDY_span_bytes; - if( !base[cnt - 1] ) // leaf node? - return &node[-1]; - next = node[-1]; - off += cnt; - continue; -#endif - } - } - return NULL; -} - -// return last leaf cell pointer - -JudySlot *judy_last (Judy *judy, JudySlot next, unsigned int off, unsigned int depth) -{ -JudySlot *table, *inner; -unsigned int keysize, size; -JudySlot *node; -int slot, cnt; -unsigned char *base; - - while( next ) { - if( judy->level < judy->max ) - judy->level++; - - judy->stack[judy->level].next = next; - judy->stack[judy->level].off = off; - size = JudySize[next & 0x07]; - switch( next & 0x07 ) { - case JUDY_1: - case JUDY_2: - case JUDY_4: - case JUDY_8: - case JUDY_16: - case JUDY_32: -#ifdef ASKITIS - case JUDY_64: -#endif - keysize = JUDY_key_size - (off & JUDY_key_mask); - slot = size / (sizeof(JudySlot) + keysize); - base = (unsigned char *)(next & JUDY_mask); - node = (JudySlot *)((next & JUDY_mask) + size); - judy->stack[judy->level].slot = --slot; - -#if BYTE_ORDER != BIG_ENDIAN - if( !judy->depth && !base[slot * keysize] || judy->depth && ++depth == judy->depth ) -#else - if( !judy->depth && !base[slot * keysize + keysize - 1] || judy->depth && ++depth == judy->depth ) -#endif - return &node[-slot-1]; - - next = node[-slot-1]; - off += keysize; - continue; - - case JUDY_radix: - table = (JudySlot *)(next & JUDY_mask); - off++; - - if( judy->depth ) - if( !(off & JUDY_key_mask) ) - depth++; - - for( slot = 256; slot--; ) { - judy->stack[judy->level].slot = slot; - if( (inner = (JudySlot *)(table[slot >> 4] & JUDY_mask)) ) { - if( (next = inner[slot & 0x0F]) ) - if( !judy->depth && !slot || judy->depth && depth == judy->depth ) - return &inner[0]; - else - break; - } else - slot &= 0xF0; - } - continue; - -#ifndef ASKITIS - case JUDY_span: - node = (JudySlot *)((next & JUDY_mask) + JudySize[JUDY_span]); - base = (unsigned char *)(next & JUDY_mask); - cnt = JUDY_span_bytes; - if( !base[cnt - 1] ) // leaf node? - return &node[-1]; - next = node[-1]; - off += cnt; - continue; -#endif - } - } - return NULL; -} - -// judy_end: return last entry - -JudySlot *judy_end (Judy *judy) -{ - judy->level = 0; - return judy_last (judy, *judy->root, 0, 0); -} // judy_nxt: return next entry - -JudySlot *judy_nxt (Judy *judy) -{ -JudySlot *table, *inner; -int slot, size, cnt; -JudySlot *node; -JudySlot next; -unsigned int keysize; -unsigned char *base; -unsigned int depth; -unsigned int off; - - if( !judy->level ) - return judy_first (judy, *judy->root, 0, 0); - - while( judy->level ) { - next = judy->stack[judy->level].next; - slot = judy->stack[judy->level].slot; - off = judy->stack[judy->level].off; - keysize = JUDY_key_size - (off & JUDY_key_mask); - size = JudySize[next & 0x07]; - depth = off / JUDY_key_size; - - switch( next & 0x07 ) { - case JUDY_1: - case JUDY_2: - case JUDY_4: - case JUDY_8: - case JUDY_16: - case JUDY_32: -#ifdef ASKITIS - case JUDY_64: -#endif - cnt = size / (sizeof(JudySlot) + keysize); - node = (JudySlot *)((next & JUDY_mask) + size); - base = (unsigned char *)(next & JUDY_mask); - if( ++slot < cnt ) -#if BYTE_ORDER != BIG_ENDIAN - if( !judy->depth && !base[slot * keysize] || judy->depth && ++depth == judy->depth ) -#else - if( !judy->depth && !base[slot * keysize + keysize - 1] || judy->depth && ++depth == judy->depth ) -#endif - { - judy->stack[judy->level].slot = slot; - return &node[-slot - 1]; - } else { - judy->stack[judy->level].slot = slot; - return judy_first (judy, node[-slot-1], (off | JUDY_key_mask) + 1, depth); - } - judy->level--; - continue; - - case JUDY_radix: - table = (JudySlot *)(next & JUDY_mask); - - if( judy->depth ) - if( !((off+1) & JUDY_key_mask) ) - depth++; - - while( ++slot < 256 ) - if( (inner = (JudySlot *)(table[slot >> 4] & JUDY_mask)) ) { - if( inner[slot & 0x0F] ) { - judy->stack[judy->level].slot = slot; - if( !judy->depth || depth < judy->depth ) - return judy_first(judy, inner[slot & 0x0F], off + 1, depth); - return &inner[slot & 0x0F]; - } - } else - slot |= 0x0F; - - judy->level--; - continue; -#ifndef ASKITIS - case JUDY_span: - judy->level--; - continue; -#endif - } - } - return NULL; -} - -// judy_prv: return ptr to previous entry - -JudySlot *judy_prv (Judy *judy) -{ -int slot, size, keysize; -JudySlot *table, *inner; -JudySlot *node, next; -unsigned char *base; -unsigned int depth; -unsigned int off; - - if( !judy->level ) - return judy_last (judy, *judy->root, 0, 0); - - while( judy->level ) { - next = judy->stack[judy->level].next; - slot = judy->stack[judy->level].slot; - off = judy->stack[judy->level].off; - size = JudySize[next & 0x07]; - depth = off / JUDY_key_size; - - switch( next & 0x07 ) { - case JUDY_1: - case JUDY_2: - case JUDY_4: - case JUDY_8: - case JUDY_16: - case JUDY_32: -#ifdef ASKITIS - case JUDY_64: -#endif - node = (JudySlot *)((next & JUDY_mask) + size); - if( !slot || !node[-slot] ) { - judy->level--; - continue; - } - - base = (unsigned char *)(next & JUDY_mask); - judy->stack[judy->level].slot--; - keysize = JUDY_key_size - (off & JUDY_key_mask); - -#if BYTE_ORDER != BIG_ENDIAN - if( !judy->depth && !base[(slot - 1) * keysize] || judy->depth && ++depth == judy->depth ) -#else - if( !judy->depth && !base[(slot - 1) * keysize + keysize - 1] || judy->depth && ++depth == judy->depth ) -#endif - return &node[-slot]; - return judy_last (judy, node[-slot], (off | JUDY_key_mask) + 1, depth); - - case JUDY_radix: - table = (JudySlot *)(next & JUDY_mask); - - if( judy->depth ) - if( !((off + 1) & JUDY_key_mask) ) - depth++; - - while( slot-- ) { - judy->stack[judy->level].slot--; - if( (inner = (JudySlot *)(table[slot >> 4] & JUDY_mask)) ) - if( inner[slot & 0x0F] ) - if( !judy->depth && !slot || judy->depth && depth == judy->depth ) - return &inner[0]; - else - return judy_last(judy, inner[slot & 0x0F], off + 1, depth); - } - - judy->level--; - continue; - -#ifndef ASKITIS - case JUDY_span: - judy->level--; - continue; -#endif - } - } - return NULL; -} - -// judy_del: delete string from judy array -// returning previous entry. - -JudySlot *judy_del (Judy *judy) -{ -int slot, off, size, type, high; -JudySlot *table, *inner; -JudySlot next, *node; -int keysize, cnt; -unsigned char *base; - - while( judy->level ) { - next = judy->stack[judy->level].next; - slot = judy->stack[judy->level].slot; - off = judy->stack[judy->level].off; - size = JudySize[next & 0x07]; - - switch( type = next & 0x07 ) { - case JUDY_1: - case JUDY_2: - case JUDY_4: - case JUDY_8: - case JUDY_16: - case JUDY_32: -#ifdef ASKITIS - case JUDY_64: -#endif - keysize = JUDY_key_size - (off & JUDY_key_mask); - cnt = size / (sizeof(JudySlot) + keysize); - node = (JudySlot *)((next & JUDY_mask) + size); - base = (unsigned char *)(next & JUDY_mask); - - // move deleted slot to first slot - - while( slot ) { - node[-slot-1] = node[-slot]; - memcpy (base + slot * keysize, base + (slot - 1) * keysize, keysize); - slot--; - } - - // zero out first slot - - node[-1] = 0; - memset (base, 0, keysize); - - if( node[-cnt] ) { // does node have any slots left? - judy->stack[judy->level].slot++; - return judy_prv (judy); - } - - judy_free (judy, base, type); - judy->level--; - continue; - - case JUDY_radix: - table = (JudySlot *)(next & JUDY_mask); - inner = (JudySlot *)(table[slot >> 4] & JUDY_mask); - inner[slot & 0x0F] = 0; - high = slot & 0xF0; - - for( cnt = 16; cnt--; ) - if( inner[cnt] ) - return judy_prv (judy); - - judy_free (judy, inner, JUDY_radix); - table[slot >> 4] = 0; - - for( cnt = 16; cnt--; ) - if( table[cnt] ) - return judy_prv (judy); - - judy_free (judy, table, JUDY_radix); - judy->level--; - continue; - -#ifndef ASKITIS - case JUDY_span: - base = (unsigned char *)(next & JUDY_mask); - judy_free (judy, base, type); - judy->level--; - continue; -#endif - } - } - - // tree is now empty - - *judy->root = 0; - return NULL; -} - -// return cell for first key greater than or equal to given key - -JudySlot *judy_strt (Judy *judy, unsigned char *buff, unsigned int max) -{ -JudySlot *cell; - - judy->level = 0; - - if( !max ) - return judy_first (judy, *judy->root, 0, 0); - - if( (cell = judy_slot (judy, buff, max)) ) - return cell; - - return judy_nxt (judy); -} - -// split open span node - -#ifndef ASKITIS -void judy_splitspan (Judy *judy, JudySlot *next, unsigned char *base) -{ -JudySlot *node = (JudySlot *)(base + JudySize[JUDY_span]); -unsigned int cnt = JUDY_span_bytes; -unsigned char *newbase; -unsigned int off = 0; -#if BYTE_ORDER != BIG_ENDIAN -int i; -#endif - - do { - newbase = judy_alloc (judy, JUDY_1); - *next = (JudySlot)newbase | JUDY_1; - -#if BYTE_ORDER != BIG_ENDIAN - i = JUDY_key_size; - while( i-- ) - *newbase++ = base[off + i]; -#else - memcpy (newbase, base + off, JUDY_key_size); - newbase += JUDY_key_size; -#endif - next = (JudySlot *)newbase; - - off += JUDY_key_size; - cnt -= JUDY_key_size; - } while( cnt && base[off - 1] ); - - *next = node[-1]; - judy_free (judy, base, JUDY_span); -} -#endif - -// judy_cell: add string to judy array - -JudySlot *judy_cell (Judy *judy, unsigned char *buff, unsigned int max) -{ -judyvalue *src = (judyvalue *)buff; -int size, idx, slot, cnt, tst; -JudySlot *next = judy->root; -judyvalue test, value; -unsigned int off = 0, start; -JudySlot *table; -JudySlot *node; -unsigned int depth = 0; -unsigned int keysize; -unsigned char *base; - - judy->level = 0; -#ifdef ASKITIS - Words++; -#endif - - while( *next ) { -#ifndef ASKITIS - if( judy->level < judy->max ) - judy->level++; - - judy->stack[judy->level].next = *next; - judy->stack[judy->level].off = off; -#endif - switch( *next & 0x07 ) { - default: - size = JudySize[*next & 0x07]; - keysize = JUDY_key_size - (off & JUDY_key_mask); - cnt = size / (sizeof(JudySlot) + keysize); - base = (unsigned char *)(*next & JUDY_mask); - node = (JudySlot *)((*next & JUDY_mask) + size); - start = off; - slot = cnt; - value = 0; - - if( judy->depth ) { - value = src[depth++]; - off |= JUDY_key_mask; - off++; - value &= JudyMask[keysize]; - } else - do { - value <<= 8; - if( off < max ) - value |= buff[off]; - } while( ++off & JUDY_key_mask ); - - // find slot > key - - while( slot-- ) { - test = *(judyvalue *)(base + slot * keysize); -#if BYTE_ORDER == BIG_ENDIAN - test >>= 8 * (JUDY_key_size - keysize); -#else - test &= JudyMask[keysize]; -#endif - if( test <= value ) - break; - } -#ifndef ASKITIS - judy->stack[judy->level].slot = slot; -#endif - if( test == value ) { // new key is equal to slot key - next = &node[-slot-1]; - - // is this a leaf? - - if( !judy->depth && !(value & 0xFF) || judy->depth && depth == judy->depth ) { -#ifdef ASKITIS - if( *next ) - Found++; - else - Inserts++; -#endif - return next; - } - - continue; - } - - // if this node is not full - // open up cell after slot - - if( !node[-1] ) { - memmove(base, base + keysize, slot * keysize); // move keys less than new key down one slot -#if BYTE_ORDER != BIG_ENDIAN - memcpy(base + slot * keysize, &value, keysize); // copy new key into slot -#else - test = value; - idx = keysize; - - while( idx-- ) - base[slot * keysize + idx] = test, test >>= 8; -#endif - for( idx = 0; idx < slot; idx++ ) - node[-idx-1] = node[-idx-2];// copy tree ptrs/cells down one slot - - node[-slot-1] = 0; // set new tree ptr/cell - next = &node[-slot-1]; - - if( !judy->depth && !(value & 0xFF) || judy->depth && depth == judy->depth ) { -#ifdef ASKITIS - if( *next ) - Found++; - else - Inserts++; -#endif - return next; - } - - continue; - } - - if( size < JudySize[JUDY_max] ) { - next = judy_promote (judy, next, slot+1, value, keysize); - - if( !judy->depth && !(value & 0xFF) || judy->depth && depth == judy->depth ) { -#ifdef ASKITIS - if( *next ) - Found++; - else - Inserts++; -#endif - return next; - } - - continue; - } - - // split full maximal node into JUDY_radix nodes - // loop to reprocess new insert - - judy_splitnode (judy, next, size, keysize, depth); -#ifndef ASKITIS - judy->level--; -#endif - off = start; - if( judy->depth ) - depth--; - continue; - - case JUDY_radix: - table = (JudySlot *)(*next & JUDY_mask); // outer radix - - if( judy->depth ) - slot = (src[depth] >> ((JUDY_key_size - ++off & JUDY_key_mask) * 8)) & 0xff; - else if( off < max ) - slot = buff[off++]; - else - slot = 0, off++; - - if( judy->depth ) - if( !(off & JUDY_key_mask) ) - depth++; - - // allocate inner radix if empty - - if( !table[slot >> 4] ) - table[slot >> 4] = (JudySlot)judy_alloc (judy, JUDY_radix) | JUDY_radix; - - table = (JudySlot *)(table[slot >> 4] & JUDY_mask); -#ifndef ASKITIS - judy->stack[judy->level].slot = slot; -#endif - next = &table[slot & 0x0F]; - - if( !judy->depth && !slot || judy->depth && depth == judy->depth ) { // leaf? -#ifdef ASKITIS - if( *next ) - Found++; - else - Inserts++; -#endif - return next; - } - - continue; - -#ifndef ASKITIS - case JUDY_span: - base = (unsigned char *)(*next & JUDY_mask); - node = (JudySlot *)((*next & JUDY_mask) + JudySize[JUDY_span]); - cnt = JUDY_span_bytes; - tst = cnt; - - if( tst > (int)(max - off) ) - tst = max - off; - - value = strncmp((const char *)base, (const char *)(buff + off), tst); - - if( !value && tst < cnt && !base[tst] ) // leaf? - return &node[-1]; - - if( !value && tst == cnt ) { - next = &node[-1]; - off += cnt; - continue; - } - - // bust up JUDY_span node and produce JUDY_1 nodes - // then loop to reprocess insert - - judy_splitspan (judy, next, base); - judy->level--; - continue; -#endif - } - } - - // place JUDY_1 node under JUDY_radix node(s) - -#ifndef ASKITIS - if( off & JUDY_key_mask ) - if( judy->depth || off <= max ) { -#else - while( off <= max ) { -#endif - base = judy_alloc (judy, JUDY_1); - keysize = JUDY_key_size - (off & JUDY_key_mask); - node = (JudySlot *)(base + JudySize[JUDY_1]); - *next = (JudySlot)base | JUDY_1; - - // fill in slot 0 with bytes of key - - if( judy->depth ) { - value = src[depth]; -#if BYTE_ORDER != BIG_ENDIAN - memcpy(base, &value, keysize); // copy new key into slot -#else - while( keysize-- ) - base[keysize] = value, value >>= 8; -#endif - } else { -#if BYTE_ORDER != BIG_ENDIAN - while( keysize ) - if( off + keysize <= max ) - *base++ = buff[off + --keysize]; - else - base++, --keysize; -#else - tst = keysize; - - if( tst > (int)(max - off) ) - tst = max - off; - - memcpy (base, buff + off, tst); -#endif - } -#ifndef ASKITIS - if( judy->level < judy->max ) - judy->level++; - judy->stack[judy->level].next = *next; - judy->stack[judy->level].slot = 0; - judy->stack[judy->level].off = off; -#endif - next = &node[-1]; - - off |= JUDY_key_mask; - depth++; - off++; - } - - // produce span nodes to consume rest of key - // or judy_1 nodes if not string tree - -#ifndef ASKITIS - if( !judy->depth ) - while( off <= max ) { - base = judy_alloc (judy, JUDY_span); - *next = (JudySlot)base | JUDY_span; - node = (JudySlot *)(base + JudySize[JUDY_span]); - cnt = tst = JUDY_span_bytes; - if( tst > (int)(max - off) ) - tst = max - off; - memcpy (base, buff + off, tst); - - if( judy->level < judy->max ) - judy->level++; - judy->stack[judy->level].next = *next; - judy->stack[judy->level].slot = 0; - judy->stack[judy->level].off = off; - next = &node[-1]; - off += tst; - depth++; - - if( !base[cnt-1] ) // done on leaf - break; - } - else - while( depth < judy->depth ) { - base = judy_alloc (judy, JUDY_1); - node = (JudySlot *)(base + JudySize[JUDY_1]); - *next = (JudySlot)base | JUDY_1; - - // fill in slot 0 with bytes of key - - *(judyvalue *)base = src[depth]; - - if( judy->level < judy->max ) - judy->level++; - judy->stack[judy->level].next = *next; - judy->stack[judy->level].slot = 0; - judy->stack[judy->level].off = off; - next = &node[-1]; - off |= JUDY_key_mask; - depth++; - off++; - } -#endif - -#ifdef ASKITIS - Inserts++; -#endif - return next; -} - -#if defined(STANDALONE) || defined(ASKITIS) - -#if defined(__APPLE__) || defined(linux) -#include -#include -#include -#include -#include -#else -#include -#include -#endif - -#include - -// memory map input file and sort - -// define pennysort parameters - -unsigned int PennyRecs = (4096 * 400); // records to sort to temp files -unsigned int PennyLine = 100; // length of input record -unsigned int PennyKey = 10; // length of input key -unsigned int PennyOff = 0; // key offset in input record - -unsigned long long PennyMerge; // PennyRecs * PennyLine = file map length -unsigned int PennyPasses; // number of intermediate files created -unsigned int PennySortTime; // cpu time to run sort -unsigned int PennyMergeTime; // cpu time to run merge - -typedef struct { - void *buff; // record pointer in input file map - void *next; // duplicate chain -} PennySort; - -void sort (FILE *infile, char *outname) -{ -unsigned long long size, off, offset, part; -int ifd = fileno (infile); -char filename[512]; -PennySort *line; -JudySlot *cell; -unsigned char *inbuff; -void *judy; -FILE *out; -#if defined(_WIN32) -HANDLE hndl, fm; -DWORD hiword; -FILETIME dummy[1]; -FILETIME user[1]; -#else -struct tms buff[1]; -#endif -time_t start = time(NULL); - - if( PennyOff + PennyKey > PennyLine ) - fprintf (stderr, "Key Offset + Key Length > Record Length\n"), exit(1); - - offset = 0; - PennyPasses = 0; - -#if defined(_WIN32) - hndl = (HANDLE)_get_osfhandle(ifd); - size = GetFileSize (hndl, &hiword); - fm = CreateFileMapping(hndl, NULL, PAGE_READONLY, hiword, (DWORD)size, NULL); - if( !fm ) - fprintf (stderr, "CreateFileMapping error %d\n", GetLastError()), exit(1); - size |= (unsigned long long)hiword << 32; -#else - size = lseek (ifd, 0L, 2); -#endif - - while( offset < size ) { -#if defined(_WIN32) - part = offset + PennyMerge > size ? size - offset : PennyMerge; - inbuff = MapViewOfFile( fm, FILE_MAP_READ, offset >> 32, offset, part); - if( !inbuff ) - fprintf (stderr, "MapViewOfFile error %d\n", GetLastError()), exit(1); -#else - inbuff = mmap (NULL, PennyMerge, PROT_READ, MAP_SHARED, ifd, offset); - - if( inbuff == MAP_FAILED ) - fprintf (stderr, "mmap error %d\n", errno), exit(1); - - if( madvise (inbuff, PennyMerge, MADV_WILLNEED | MADV_SEQUENTIAL) < 0 ) - fprintf (stderr, "madvise error %d\n", errno); -#endif - judy = judy_open (PennyKey, 0); - - off = 0; - - // build judy array from mapped input chunk - - while( offset + off < size && off < PennyMerge ) { - line = judy_data (judy, sizeof(PennySort)); - cell = judy_cell (judy, inbuff + off + PennyOff, PennyKey); - line->next = *(void **)cell; - line->buff = inbuff + off; - - *(PennySort **)cell = line; - off += PennyLine; - } - - sprintf (filename, "%s.%d", outname, PennyPasses); - out = fopen (filename, "wb"); - setvbuf (out, NULL, _IOFBF, 4096 * 1024); - -#ifndef _WIN32 - if( madvise (inbuff, PennyMerge, MADV_WILLNEED | MADV_RANDOM) < 0 ) - fprintf (stderr, "madvise error %d\n", errno); -#endif - - // write judy array in sorted order to temporary file - - cell = judy_strt (judy, NULL, 0); - - if( cell ) do { - line = *(PennySort **)cell; - do fwrite (line->buff, PennyLine, 1, out); - while( line = line->next ); - } while( cell = judy_nxt (judy) ); - -#if defined(_WIN32) - UnmapViewOfFile (inbuff); -#else - munmap (inbuff, PennyMerge); -#endif - judy_close (judy); - offset += off; - fflush (out); - fclose (out); - PennyPasses++; - } - fprintf (stderr, "End Sort %d secs", time(NULL) - start); -#if defined(_WIN32) - CloseHandle (fm); - GetProcessTimes (GetCurrentProcess(), dummy, dummy, dummy, user); - PennySortTime = *(unsigned long long*)user / 10000000; -#else - times (buff); - PennySortTime = buff->tms_utime/100; -#endif - fprintf (stderr, " Cpu %d\n", PennySortTime); -} - -int merge (FILE *out, char *outname) -{ -time_t start = time(NULL); -char filename[512]; -JudySlot *cell; -unsigned int nxt, idx; -unsigned char **line; -unsigned int *next; -void *judy; -FILE **in; - - next = calloc (PennyPasses + 1, sizeof(unsigned int)); - line = calloc (PennyPasses, sizeof(void *)); - in = calloc (PennyPasses, sizeof(void *)); - - judy = judy_open (PennyKey, 0); - - // initialize merge with one record from each temp file - - for( idx = 0; idx < PennyPasses; idx++ ) { - sprintf (filename, "%s.%d", outname, idx); - in[idx] = fopen (filename, "rb"); - line[idx] = malloc (PennyLine); - setvbuf (in[idx], NULL, _IOFBF, 4096 * 1024); - fread (line[idx], PennyLine, 1, in[idx]); - cell = judy_cell (judy, line[idx] + PennyOff, PennyKey); - next[idx + 1] = *(unsigned int *)cell; - *cell = idx + 1; - } - - // output records, replacing smallest each time - - while( cell = judy_strt (judy, NULL, 0) ) { - nxt = *(unsigned int *)cell; - judy_del (judy); - - // process duplicates - - while( idx = nxt ) { - nxt = next[idx--]; - fwrite (line[idx], PennyLine, 1, out); - - if( fread (line[idx], PennyLine, 1, in[idx]) ) { - cell = judy_cell (judy, line[idx] + PennyOff, PennyKey); - next[idx + 1] = *(unsigned int *)cell; - *cell = idx + 1; - } else - next[idx + 1] = 0; - } - } - - for( idx = 0; idx < PennyPasses; idx++ ) { - fclose (in[idx]); - free (line[idx]); - } - - free (line); - free (next); - free (in); - - fprintf (stderr, "End Merge %d secs", time(NULL) - start); -#ifdef _WIN32 - { - FILETIME dummy[1]; - FILETIME user[1]; - GetProcessTimes (GetCurrentProcess(), dummy, dummy, dummy, user); - PennyMergeTime = *(unsigned long long*)user / 10000000; - } -#else - { - struct tms buff[1]; - times (buff); - PennyMergeTime = buff->tms_utime/100; - } -#endif - fprintf (stderr, " Cpu %d\n", PennyMergeTime - PennySortTime); - judy_close (judy); - fflush (out); - fclose (out); - return 0; -} - -// compilation: -// cc -O3 judy64j.c - -// usage: -// a.out [in-file] [out-file] [keysize] [recordlen] [keyoffset] [mergerecs] -// where keysize is 10 to indicate pennysort files - -#if !defined(_WIN32) -typedef struct timeval timer; -#endif - -// ASKITIS compilation: -// cc -O3 judy64n.c - -// usage: -// a.out [in-file] [out-file] [keysize] [recordlen] [keyoffset] [mergerecs] -// where keysize is 10 to indicate pennysort files - -// naskitis.com. -// g++ -O3 -fpermissive -fomit-frame-pointer -w -D STANDALONE -D ASKITIS -o judy64n judy64n.c -// ./judy64n [input-file-to-build-judy] e.g. distinct_1 or skew1_1 - -// note: the judy array is an in-memory data structure. As such, make sure you -// have enough memory to hold the entire input file + data structure, otherwise -// you'll have to break the input file into smaller pieces and load them in -// on-by-one. - -// Also, the file to search judy is hardcoded to skew1_1. - -int main (int argc, char **argv) -{ -unsigned char buff[1024]; -JudySlot max = 0; -JudySlot *cell; -FILE *in, *out; -void *judy; -unsigned int len; -unsigned int idx; -#ifdef ASKITIS -char *askitis; -int prev, off; -float insert_real_time=0.0; -float search_real_time=0.0; -int size; -#if !defined(_WIN32) -timer start, stop; -#else -time_t start[1], stop[1]; -#endif -#endif - - if( argc > 1 ) - in = fopen (argv[1], "rb"); - else - in = stdin; - - if( argc > 2 ) - out = fopen (argv[2], "wb"); - else - out = stdout; - - setvbuf (out, NULL, _IOFBF, 4096 * 1024); - - if( !in ) - fprintf (stderr, "unable to open input file\n"); - - if( !out ) - fprintf (stderr, "unable to open output file\n"); - - if( argc > 6 ) - PennyRecs = atoi(argv[6]); - - if( argc > 5 ) - PennyOff = atoi(argv[5]); - - if( argc > 4 ) - PennyLine = atoi(argv[4]); - - PennyMerge = (unsigned long long)PennyLine * PennyRecs; - - if( argc > 3 ) { - PennyKey = atoi(argv[3]); - sort (in, argv[2]); - return merge (out, argv[2]); - } - -#ifdef ASKITIS - judy = judy_open (1024, 0); - -// build judy array - size = lseek (fileno(in), 0L, 2); - askitis = malloc(size); - lseek (fileno(in), 0L, 0); - read (fileno(in), askitis,size); - prev = 0; -// naskitis.com: -// Start the timer. - -#if !defined(_WIN32) - gettimeofday(&start, NULL); -#else - time(start); -#endif - - for( off = 0; off < size; off++ ) - if( askitis[off] == '\n' ) { - *(judy_cell (judy, askitis+prev, off - prev)) += 1; // count instances of string - prev = off + 1; - } -// naskitis.com: -// Stop the timer and do some math to compute the time required to insert the strings into the judy array. - -#if !defined(_WIN32) - gettimeofday(&stop, NULL); - - insert_real_time = 1000.0 * ( stop.tv_sec - start.tv_sec ) + 0.001 * (stop.tv_usec - start.tv_usec ); - insert_real_time = insert_real_time/1000.0; -#else - time (stop); - insert_real_time = *stop - *start; -#endif - -// naskitis.com: -// Free the input buffer used to store the first file. We must do this before we get the process size below. - free (askitis); - fprintf(stderr, "JudyArray@Karl_Malbrain\nDASKITIS option enabled\n-------------------------------\n%-20s %.2f MB\n%-20s %.2f sec\n", - "Judy Array size:", MaxMem/1000000., "Time to insert:", insert_real_time); - fprintf(stderr, "%-20s %d\n", "Words:", Words); - fprintf(stderr, "%-20s %d\n", "Inserts:", Inserts); - fprintf(stderr, "%-20s %d\n", "Found:", Found); - - Words = 0; - Inserts = 0; - Found = 0; - -// search judy array - if( in = freopen ("skew1_1", "rb", in) ) - size = lseek (fileno(in), 0L, 2); - else - exit(0); - askitis = malloc(size); - lseek (fileno(in), 0L, 0); - read (fileno(in), askitis,size); - prev = 0; - -#if !defined(_WIN32) - gettimeofday(&start, NULL); -#else - time(start); -#endif - - for( off = 0; off < size; off++ ) - if( askitis[off] == '\n' ) { - *judy_cell (judy, askitis+prev, off - prev) += 1; - prev = off + 1; - } -// naskitis.com: -// Stop the timer and do some math to compute the time required to search the judy array. - -#if !defined(_WIN32) - gettimeofday(&stop, NULL); - search_real_time = 1000.0 * ( stop.tv_sec - start.tv_sec ) + 0.001 - * (stop.tv_usec - start.tv_usec ); - search_real_time = search_real_time/1000.0; -#else - time(stop); - search_real_time = *stop - *start; -#endif - -// naskitis.com: -// To do: report a count on the number of strings found. - - fprintf(stderr,"\n%-20s %.2f MB\n%-20s %.2f sec\n", - "Judy Array size:", MaxMem/1000000., "Time to search:", search_real_time); - fprintf(stderr, "%-20s %d\n", "Words:", Words); - fprintf(stderr, "%-20s %d\n", "Inserts:", Inserts); - fprintf(stderr, "%-20s %d\n", "Found:", Found); - exit(0); -#endif -#ifdef HEXKEYS - judy = judy_open (1024, 16/JUDY_key_size); - - while( fgets((char *)buff, sizeof(buff), in) ) { - judyvalue key[16/JUDY_key_size]; - if( len = strlen((const char *)buff) ) - buff[--len] = 0; // remove LF -#if JUDY_key_size == 4 - key[3] = strtoul (buff + 24, NULL, 16); - buff[24] = 0; - key[2] = strtoul (buff + 16, NULL, 16); - buff[16] = 0; - key[1] = strtoul (buff + 8, NULL, 16); - buff[8] = 0; - key[0] = strtoul (buff, NULL, 16); -#else - key[1] = strtoull (buff + 16, NULL, 16); - buff[16] = 0; - key[0] = strtoull (buff, NULL, 16); -#endif - *(judy_cell (judy, (void *)key, 0)) += 1; // count instances of string - max++; - } - - fprintf(stderr, "%" PRIuint " memory used\n", MaxMem); - - cell = judy_strt (judy, NULL, 0); - - if( cell ) do { - judyvalue key[16/JUDY_key_size]; - len = judy_key(judy, (void *)key, 0); - for( idx = 0; idx < *cell; idx++ ){ // spit out duplicates -#if JUDY_key_size == 4 - fprintf (out, "%.8X", key[0]); - fprintf (out, "%.8X", key[1]); - fprintf (out, "%.8X", key[2]); - fprintf (out, "%.8X", key[3]); -#else - fprintf (out, "%.16llX", key[0]); - fprintf (out, "%.16llX", key[1]); -#endif - fputc('\n', out); - } - } while( cell = judy_nxt (judy) ); - -#else - judy = judy_open (1024, 0); - - while( fgets((char *)buff, sizeof(buff), in) ) { - if( len = strlen((const char *)buff) ) - buff[--len] = 0; // remove LF - *(judy_cell (judy, buff, len)) += 1; // count instances of string - max++; - } - - fprintf(stderr, "%" PRIuint " memory used\n", MaxMem); - - cell = judy_strt (judy, NULL, 0); - - if( cell ) do { - len = judy_key(judy, buff, sizeof(buff)); - for( idx = 0; idx < *cell; idx++ ){ // spit out duplicates - fwrite(buff, len, 1, out); - fputc('\n', out); - } - } while( cell = judy_nxt (judy) ); -#endif -#if 0 - // test deletion all the way to an empty tree - - if( cell = judy_prv (judy) ) - do max -= *cell; - while( cell = judy_del (judy) ); - - assert (max == 0); -#endif - judy_close(judy); - return 0; -} -#endif - diff --git a/src/cllazyfile/judy/test/hexSort.c b/src/cllazyfile/judy/test/hexSort.c deleted file mode 100644 index 0d770d752..000000000 --- a/src/cllazyfile/judy/test/hexSort.c +++ /dev/null @@ -1,124 +0,0 @@ -// Judy arrays 13 DEC 2012 (judy64n.c from http://code.google.com/p/judyarray/ ) -// This code is public domain. - -// Author Karl Malbrain, malbrain AT yahoo.com -// with assistance from Jan Weiss. -// modifications (and any bugs) by Mark Pictor, mpictor at gmail - -// Simplified judy arrays for strings and integers -// Adapted from the ideas of Douglas Baskins of HP. - -// Map a set of keys to corresponding memory cells (uints). -// Each cell must be set to a non-zero value by the caller. - - -// Integer mappings are denoted by calling judy_open with the -// Integer depth of the Judy Trie as the second argument. - -#ifndef STANDALONE -# error must define STANDALONE while compiling this file and judy64.c -#endif - -#include "judy.h" -#include "sort.h" - -unsigned int MaxMem = 0; -/** - usage: - a.out [in-file] [out-file] - where all lines of in-file are 32 chars, hexadecimal - On linux, a 1M-line file can be created with the following: - hexdump -v -e '2/8 "%08x"' -e '"\n"' /dev/urandom |head -n 1000000 >in-file -*/ -int main( int argc, char ** argv ) { - unsigned char buff[1024]; - JudySlot max = 0; - JudySlot * cell; - FILE * in, *out; - void * judy; - unsigned int len; - unsigned int idx; - - if( argc > 1 ) { - in = fopen( argv[1], "rb" ); - } else { - in = stdin; - } - - if( argc > 2 ) { - out = fopen( argv[2], "wb" ); - } else { - out = stdout; - } - - setvbuf( out, NULL, _IOFBF, 4096 * 1024 ); - - if( !in ) { - fprintf( stderr, "unable to open input file\n" ); - } - - if( !out ) { - fprintf( stderr, "unable to open output file\n" ); - } - - PennyMerge = ( unsigned long long )PennyLine * PennyRecs; - - judy = judy_open( 1024, 16 / JUDY_key_size ); - - while( fgets( ( char * )buff, sizeof( buff ), in ) ) { - judyvalue key[16 / JUDY_key_size]; - if( len = strlen( ( const char * )buff ) ) { - buff[--len] = 0; // remove LF - } -#if JUDY_key_size == 4 - key[3] = strtoul( buff + 24, NULL, 16 ); - buff[24] = 0; - key[2] = strtoul( buff + 16, NULL, 16 ); - buff[16] = 0; - key[1] = strtoul( buff + 8, NULL, 16 ); - buff[8] = 0; - key[0] = strtoul( buff, NULL, 16 ); -#else - key[1] = strtoull( buff + 16, NULL, 16 ); - buff[16] = 0; - key[0] = strtoull( buff, NULL, 16 ); -#endif - *( judy_cell( judy, ( void * )key, 0 ) ) += 1; // count instances of string - max++; - } - - fprintf( stderr, "%" PRIuint " memory used\n", MaxMem ); - - cell = judy_strt( judy, NULL, 0 ); - - if( cell ) do { - judyvalue key[16 / JUDY_key_size]; - len = judy_key( judy, ( void * )key, 0 ); - for( idx = 0; idx < *cell; idx++ ) { // spit out duplicates -#if JUDY_key_size == 4 - fprintf( out, "%.8X", key[0] ); - fprintf( out, "%.8X", key[1] ); - fprintf( out, "%.8X", key[2] ); - fprintf( out, "%.8X", key[3] ); -#else - fprintf( out, "%.16llX", key[0] ); - fprintf( out, "%.16llX", key[1] ); -#endif - fputc( '\n', out ); - } - } while( cell = judy_nxt( judy ) ); - -#if 0 - // test deletion all the way to an empty tree - - if( cell = judy_prv( judy ) ) - do { - max -= *cell; - } while( cell = judy_del( judy ) ); - - assert( max == 0 ); -#endif - judy_close( judy ); - return 0; -} - diff --git a/src/cllazyfile/judy/test/judyL2test.cc b/src/cllazyfile/judy/test/judyL2test.cc deleted file mode 100644 index 20ef559a9..000000000 --- a/src/cllazyfile/judy/test/judyL2test.cc +++ /dev/null @@ -1,72 +0,0 @@ -#include -#include -#include - -#include "judyL2Array.h" -typedef judyL2Array< uint64_t, uint64_t > jl2a; - -bool testFind( jl2a & j, uint64_t key, unsigned int count ) { - jl2a::cvector * v = j.find( key ); - std::cout << "find: key " << key << " ..." << std::endl; - if( count > 0 ) { - if( !v || !j.success() || ( v->size() != count ) ) { - std::cout << " false negative - v: " << v << " success: " << j.success(); - if( v ) { - std::cout << " expected count: " << count << " actual: " << v->size(); - } - std::cout << std::endl; - return false; - } else { - // note - this doesn't verify that the right keys are returned, just the right number! - jl2a::vector::const_iterator it = v->begin(); - std::cout << " correct number of values -"; - for( ; it != v->end(); it++ ) { - std::cout << " " << *it; - } - std::cout << std::endl; - } - } else { - if( v || j.success() ) { - std::cout << " false positive - v: " << v << " success: " << j.success() << std::endl; - return false; - } else { - std::cout << " not found, as expected." << std::endl; - } - } - return true; -} - -int main() { - bool pass = true; - jl2a jl; - std::cout.setf( std::ios::boolalpha ); -// std::cout << "size of judyL2Array: " << sizeof( jl ) << std::endl; - jl.insert( 5, 12 ); - jl.insert( 6, 2 ); - jl.insert( 7, 312 ); - jl.insert( 11, 412 ); - jl.insert( 7, 313 ); - jl2a::cpair kv = jl.atOrAfter( 4 ); - std::cout << "atOrAfter test ..." << std::endl; - if( kv.value != 0 && jl.success() ) { - std::cout << " key " << kv.key << " value " << kv.value->at( 0 ) << std::endl; - } else { - std::cout << " failed" << std::endl; - pass = false; - } - - pass &= testFind( jl, 8, 0 ); - pass &= testFind( jl, 11, 1 ); - pass &= testFind( jl, 7, 2 ); - - jl.clear(); - - //TODO test all of judyL2Array - if( pass ) { - std::cout << "All tests passed." << std::endl; - exit( EXIT_SUCCESS ); - } else { - std::cout << "At least one test failed." << std::endl; - exit( EXIT_FAILURE ); - } -} \ No newline at end of file diff --git a/src/cllazyfile/judy/test/judyLtest.cc b/src/cllazyfile/judy/test/judyLtest.cc deleted file mode 100644 index 01ae3d5d7..000000000 --- a/src/cllazyfile/judy/test/judyLtest.cc +++ /dev/null @@ -1,33 +0,0 @@ -#include -#include -#include - -#include "judyLArray.h" - -int main() { - std::cout.setf( std::ios::boolalpha ); - judyLArray< uint64_t, uint64_t > jl; - std::cout << "size of judyLArray: " << sizeof( jl ) << std::endl; - jl.insert( 5, 12 ); - jl.insert( 6, 2 ); - jl.insert( 7, 312 ); - jl.insert( 8, 412 ); - judyLArray< uint64_t, uint64_t >::pair kv = jl.atOrAfter( 4 ); - std::cout << "k " << kv.key << " v " << kv.value << std::endl; - - long v = jl.find( 11 ); - if( v != 0 || jl.success() ) { - std::cout << "find: false positive - v: " << v << " success: " << jl.success() << std::endl; - exit( EXIT_FAILURE ); - } - v = jl.find( 7 ); - if( v != 312 || !jl.success() ) { - std::cout << "find: false negative - v: " << v << " success: " << jl.success() << std::endl; - exit( EXIT_FAILURE ); - } - - jl.clear(); - - //TODO test all of judyLArray - exit( EXIT_SUCCESS ); -} \ No newline at end of file diff --git a/src/cllazyfile/judy/test/judyS2test.cc b/src/cllazyfile/judy/test/judyS2test.cc deleted file mode 100644 index ec25f960b..000000000 --- a/src/cllazyfile/judy/test/judyS2test.cc +++ /dev/null @@ -1,75 +0,0 @@ -#include -#include -#include - -#include "judyS2Array.h" - -typedef judyS2Array< uint64_t > js2a; - -bool testFind( js2a & j, const char * key, unsigned int count ) { - js2a::cvector * v = j.find( key ); - std::cout << "find: key " << key << " ..." << std::endl; - if( count > 0 ) { - if( !v || !j.success() || ( v->size() != count ) ) { - std::cout << " false negative - v: " << v << " success: " << j.success(); - if( v ) { - std::cout << " expected count: " << count << " actual: " << v->size(); - } - std::cout << std::endl; - return false; - } else { - // note - this doesn't verify that the right keys are returned, just the right number! - js2a::vector::const_iterator it = v->begin(); - std::cout << " correct number of values -"; - for( ; it != v->end(); it++ ) { - std::cout << " " << *it; - } - std::cout << std::endl; - } - } else { - if( v || j.success() ) { - std::cout << " false positive - v: " << v << " success: " << j.success() << std::endl; - return false; - } else { - std::cout << " not found, as expected." << std::endl; - } - } - return true; -} - -int main() { - bool pass = true; - std::cout.setf( std::ios::boolalpha ); - - js2a js( 255 ); - js.insert( "blah", 1234 ); - js.insert( "bah", 124 ); - js.insert( "blh", 123 ); - js.insert( "blh", 4123 ); - js.insert( "bla", 134 ); - js.insert( "bh", 234 ); - - js2a::cpair kv = js.atOrAfter( "ab" ); - std::cout << "atOrAfter test ..." << std::endl; - if( kv.value != 0 && js.success() ) { - std::cout << " key " << kv.key << " value " << kv.value->at( 0 ) << std::endl; - } else { - std::cout << " failed" << std::endl; - pass = false; - } - - pass &= testFind( js, "sdafsd", 0 ); - pass &= testFind( js, "bah", 1 ); - pass &= testFind( js, "blh", 2 ); - - js.clear(); - - //TODO test all of judyS2Array - if( pass ) { - std::cout << "All tests passed." << std::endl; - exit( EXIT_SUCCESS ); - } else { - std::cout << "At least one test failed." << std::endl; - exit( EXIT_FAILURE ); - } -} \ No newline at end of file diff --git a/src/cllazyfile/judy/test/judyStest.cc b/src/cllazyfile/judy/test/judyStest.cc deleted file mode 100644 index 3d620b015..000000000 --- a/src/cllazyfile/judy/test/judyStest.cc +++ /dev/null @@ -1,43 +0,0 @@ -#include -#include -#include - -#include "judySArray.h" - -int main() { - bool pass = true; - std::cout.setf( std::ios::boolalpha ); - - judySArray< uint64_t > js( 255 ); - js.insert( "blah", 1234 ); - js.insert( "bah", 124 ); - js.insert( "blh", 123 ); - js.insert( "bla", 134 ); - js.insert( "bh", 234 ); - - - judySArray< uint64_t >::pair kv = js.atOrAfter( "ab" ); - //TODO if()... - std::cout << "k " << kv.key << " v " << kv.value << std::endl; - - long v = js.find( "sdafsd" ); - if( v != 0 || js.success() ) { - std::cout << "find: false positive - v: " << v << " success: " << js.success() << std::endl; - pass = false; - } - v = js.find( "bah" ); - if( v != 124 || !js.success() ) { - std::cout << "find: false negative - v: " << v << " success: " << js.success() << std::endl; - pass = false; - } - - - //TODO test all of judySArray - if( pass ) { - std::cout << "All tests passed." << std::endl; - exit( EXIT_SUCCESS ); - } else { - std::cout << "At least one test failed." << std::endl; - exit( EXIT_FAILURE ); - } -} \ No newline at end of file diff --git a/src/cllazyfile/judy/test/pennySort.c b/src/cllazyfile/judy/test/pennySort.c deleted file mode 100644 index a279b1a70..000000000 --- a/src/cllazyfile/judy/test/pennySort.c +++ /dev/null @@ -1,236 +0,0 @@ -// Judy arrays 13 DEC 2012 (judy64n.c from http://code.google.com/p/judyarray/ ) -// This code is public domain. - -// Author Karl Malbrain, malbrain AT yahoo.com -// with assistance from Jan Weiss. -// modifications (and any bugs) by Mark Pictor, mpictor at gmail - -// Simplified judy arrays for strings and integers -// Adapted from the ideas of Douglas Baskins of HP. - -// Map a set of keys to corresponding memory cells (uints). -// Each cell must be set to a non-zero value by the caller. - -// STANDALONE is defined to compile into a string sorter. - -// String mappings are denoted by calling judy_open with zero as -// the second argument. - -#ifndef STANDALONE -# error must define STANDALONE while compiling this file and judy64.c -#endif - -#include "judy.h" -#include "sort.h" - -unsigned int MaxMem = 0; - -// usage: -// a.out [in-file] [out-file] [keysize] [recordlen] [keyoffset] [mergerecs] -// where keysize is 10 to indicate pennysort files - -// ASKITIS compilation: -// g++ -O3 -fpermissive -fomit-frame-pointer -w -D STANDALONE -D ASKITIS -o judy64n judy64n.c -// ./judy64n [input-file-to-build-judy] e.g. distinct_1 or skew1_1 - -// note: the judy array is an in-memory data structure. As such, make sure you -// have enough memory to hold the entire input file + data structure, otherwise -// you'll have to break the input file into smaller pieces and load them in -// on-by-one. - -// Also, the file to search judy is hardcoded to skew1_1. - -int main( int argc, char ** argv ) { - unsigned char buff[1024]; - JudySlot max = 0; - JudySlot * cell; - FILE * in, *out; - void * judy; - unsigned int len; - unsigned int idx; -#ifdef ASKITIS - char * askitis; - int prev, off; - float insert_real_time = 0.0; - float search_real_time = 0.0; - int size; -#if !defined(_WIN32) - timer start, stop; -#else - time_t start[1], stop[1]; -#endif -#endif - - if( argc > 1 ) { - in = fopen( argv[1], "rb" ); - } else { - in = stdin; - } - - if( argc > 2 ) { - out = fopen( argv[2], "wb" ); - } else { - out = stdout; - } - - setvbuf( out, NULL, _IOFBF, 4096 * 1024 ); - - if( !in ) { - fprintf( stderr, "unable to open input file\n" ); - } - - if( !out ) { - fprintf( stderr, "unable to open output file\n" ); - } - - if( argc > 6 ) { - PennyRecs = atoi( argv[6] ); - } - - if( argc > 5 ) { - PennyOff = atoi( argv[5] ); - } - - if( argc > 4 ) { - PennyLine = atoi( argv[4] ); - } - - PennyMerge = ( unsigned long long )PennyLine * PennyRecs; - - if( argc > 3 ) { - PennyKey = atoi( argv[3] ); - sort( in, argv[2] ); - return merge( out, argv[2] ); - } - -#ifdef ASKITIS - judy = judy_open( 1024, 0 ); - -// build judy array - size = lseek( fileno( in ), 0L, 2 ); - askitis = malloc( size ); - lseek( fileno( in ), 0L, 0 ); - read( fileno( in ), askitis, size ); - prev = 0; -// naskitis.com: -// Start the timer. - -#if !defined(_WIN32) - gettimeofday( &start, NULL ); -#else - time( start ); -#endif - - for( off = 0; off < size; off++ ) - if( askitis[off] == '\n' ) { - *( judy_cell( judy, askitis + prev, off - prev ) ) += 1; // count instances of string - prev = off + 1; - } -// naskitis.com: -// Stop the timer and do some math to compute the time required to insert the strings into the judy array. - -#if !defined(_WIN32) - gettimeofday( &stop, NULL ); - - insert_real_time = 1000.0 * ( stop.tv_sec - start.tv_sec ) + 0.001 * ( stop.tv_usec - start.tv_usec ); - insert_real_time = insert_real_time / 1000.0; -#else - time( stop ); - insert_real_time = *stop - *start; -#endif - -// naskitis.com: -// Free the input buffer used to store the first file. We must do this before we get the process size below. - free( askitis ); - fprintf( stderr, "JudyArray@Karl_Malbrain\nDASKITIS option enabled\n-------------------------------\n%-20s %.2f MB\n%-20s %.2f sec\n", - "Judy Array size:", MaxMem / 1000000., "Time to insert:", insert_real_time ); - fprintf( stderr, "%-20s %d\n", "Words:", Words ); - fprintf( stderr, "%-20s %d\n", "Inserts:", Inserts ); - fprintf( stderr, "%-20s %d\n", "Found:", Found ); - - Words = 0; - Inserts = 0; - Found = 0; - -// search judy array - if( in = freopen( "skew1_1", "rb", in ) ) { - size = lseek( fileno( in ), 0L, 2 ); - } else { - exit( 0 ); - } - askitis = malloc( size ); - lseek( fileno( in ), 0L, 0 ); - read( fileno( in ), askitis, size ); - prev = 0; - -#if !defined(_WIN32) - gettimeofday( &start, NULL ); -#else - time( start ); -#endif - - for( off = 0; off < size; off++ ) - if( askitis[off] == '\n' ) { - *judy_cell( judy, askitis + prev, off - prev ) += 1; - prev = off + 1; - } -// naskitis.com: -// Stop the timer and do some math to compute the time required to search the judy array. - -#if !defined(_WIN32) - gettimeofday( &stop, NULL ); - search_real_time = 1000.0 * ( stop.tv_sec - start.tv_sec ) + 0.001 - * ( stop.tv_usec - start.tv_usec ); - search_real_time = search_real_time / 1000.0; -#else - time( stop ); - search_real_time = *stop - *start; -#endif - -// naskitis.com: -// To do: report a count on the number of strings found. - - fprintf( stderr, "\n%-20s %.2f MB\n%-20s %.2f sec\n", - "Judy Array size:", MaxMem / 1000000., "Time to search:", search_real_time ); - fprintf( stderr, "%-20s %d\n", "Words:", Words ); - fprintf( stderr, "%-20s %d\n", "Inserts:", Inserts ); - fprintf( stderr, "%-20s %d\n", "Found:", Found ); - exit( 0 ); -#endif - - judy = judy_open( 1024, 0 ); - - while( fgets( ( char * )buff, sizeof( buff ), in ) ) { - if( len = strlen( ( const char * )buff ) ) { - buff[--len] = 0; // remove LF - } - *( judy_cell( judy, buff, len ) ) += 1; // count instances of string - max++; - } - - fprintf( stderr, "%" PRIuint " memory used\n", MaxMem ); - - cell = judy_strt( judy, NULL, 0 ); - - if( cell ) do { - len = judy_key( judy, buff, sizeof( buff ) ); - for( idx = 0; idx < *cell; idx++ ) { // spit out duplicates - fwrite( buff, len, 1, out ); - fputc( '\n', out ); - } - } while( cell = judy_nxt( judy ) ); - -#if 0 - // test deletion all the way to an empty tree - - if( cell = judy_prv( judy ) ) - do { - max -= *cell; - } while( cell = judy_del( judy ) ); - - assert( max == 0 ); -#endif - judy_close( judy ); - return 0; -} - diff --git a/src/cllazyfile/judy/test/sort.c b/src/cllazyfile/judy/test/sort.c deleted file mode 100644 index e483b92e0..000000000 --- a/src/cllazyfile/judy/test/sort.c +++ /dev/null @@ -1,233 +0,0 @@ -// Judy arrays 13 DEC 2012 (judy64n.c from http://code.google.com/p/judyarray/ ) -// This code is public domain. - -// Author Karl Malbrain, malbrain AT yahoo.com -// with assistance from Jan Weiss. -// modifications (and any bugs) by Mark Pictor, mpictor at gmail - -// Simplified judy arrays for strings and integers -// Adapted from the ideas of Douglas Baskins of HP. - -// Map a set of keys to corresponding memory cells (uints). -// Each cell must be set to a non-zero value by the caller. - -// STANDALONE is defined to compile into a string sorter. - -// String mappings are denoted by calling judy_open with zero as -// the second argument. Integer mappings are denoted by calling -// judy_open with the Integer depth of the Judy Trie as the second -// argument. - -#include "judy.h" -#include "sort.h" - -// memory map input file and sort - -// define pennysort parameters -unsigned int PennyRecs = ( 4096 * 400 ); // records to sort to temp files -unsigned int PennyLine = 100; // length of input record -unsigned int PennyKey = 10; // length of input key -unsigned int PennyOff = 0; // key offset in input record - -unsigned long long PennyMerge; // PennyRecs * PennyLine = file map length -unsigned int PennyPasses; // number of intermediate files created -unsigned int PennySortTime; // cpu time to run sort -unsigned int PennyMergeTime; // cpu time to run merge - -void sort( FILE * infile, char * outname ) { - unsigned long long size, off, offset, part; - int ifd = fileno( infile ); - char filename[512]; - PennySort * line; - JudySlot * cell; - unsigned char * inbuff; - void * judy; - FILE * out; -#if defined(_WIN32) - HANDLE hndl, fm; - DWORD hiword; - FILETIME dummy[1]; - FILETIME user[1]; -#else - struct tms buff[1]; -#endif - time_t start = time( NULL ); - - if( PennyOff + PennyKey > PennyLine ) { - fprintf( stderr, "Key Offset + Key Length > Record Length\n" ), exit( 1 ); - } - - offset = 0; - PennyPasses = 0; - -#if defined(_WIN32) - hndl = ( HANDLE )_get_osfhandle( ifd ); - size = GetFileSize( hndl, &hiword ); - fm = CreateFileMapping( hndl, NULL, PAGE_READONLY, hiword, ( DWORD )size, NULL ); - if( !fm ) { - fprintf( stderr, "CreateFileMapping error %d\n", GetLastError() ), exit( 1 ); - } - size |= ( unsigned long long )hiword << 32; -#else - size = lseek( ifd, 0L, 2 ); -#endif - - while( offset < size ) { -#if defined(_WIN32) - part = offset + PennyMerge > size ? size - offset : PennyMerge; - inbuff = MapViewOfFile( fm, FILE_MAP_READ, offset >> 32, offset, part ); - if( !inbuff ) { - fprintf( stderr, "MapViewOfFile error %d\n", GetLastError() ), exit( 1 ); - } -#else - inbuff = mmap( NULL, PennyMerge, PROT_READ, MAP_SHARED, ifd, offset ); - - if( inbuff == MAP_FAILED ) { - fprintf( stderr, "mmap error %d\n", errno ), exit( 1 ); - } - - if( madvise( inbuff, PennyMerge, MADV_WILLNEED | MADV_SEQUENTIAL ) < 0 ) { - fprintf( stderr, "madvise error %d\n", errno ); - } -#endif - judy = judy_open( PennyKey, 0 ); - - off = 0; - - // build judy array from mapped input chunk - - while( offset + off < size && off < PennyMerge ) { - line = judy_data( judy, sizeof( PennySort ) ); - cell = judy_cell( judy, inbuff + off + PennyOff, PennyKey ); - line->next = *( void ** )cell; - line->buff = inbuff + off; - - *( PennySort ** )cell = line; - off += PennyLine; - } - - sprintf( filename, "%s.%d", outname, PennyPasses ); - out = fopen( filename, "wb" ); - setvbuf( out, NULL, _IOFBF, 4096 * 1024 ); - -#ifndef _WIN32 - if( madvise( inbuff, PennyMerge, MADV_WILLNEED | MADV_RANDOM ) < 0 ) { - fprintf( stderr, "madvise error %d\n", errno ); - } -#endif - - // write judy array in sorted order to temporary file - - cell = judy_strt( judy, NULL, 0 ); - - if( cell ) do { - line = *( PennySort ** )cell; - do { - fwrite( line->buff, PennyLine, 1, out ); - } while( line = line->next ); - } while( cell = judy_nxt( judy ) ); - -#if defined(_WIN32) - UnmapViewOfFile( inbuff ); -#else - munmap( inbuff, PennyMerge ); -#endif - judy_close( judy ); - offset += off; - fflush( out ); - fclose( out ); - PennyPasses++; - } - fprintf( stderr, "End Sort %llu secs", ( unsigned long long ) time( NULL ) - start ); -#if defined(_WIN32) - CloseHandle( fm ); - GetProcessTimes( GetCurrentProcess(), dummy, dummy, dummy, user ); - PennySortTime = *( unsigned long long * )user / 10000000; -#else - times( buff ); - PennySortTime = buff->tms_utime / 100; -#endif - fprintf( stderr, " Cpu %d\n", PennySortTime ); -} - -int merge( FILE * out, char * outname ) { - time_t start = time( NULL ); - char filename[512]; - JudySlot * cell; - unsigned int nxt, idx; - unsigned char ** line; - unsigned int * next; - void * judy; - FILE ** in; - - next = calloc( PennyPasses + 1, sizeof( unsigned int ) ); - line = calloc( PennyPasses, sizeof( void * ) ); - in = calloc( PennyPasses, sizeof( void * ) ); - - judy = judy_open( PennyKey, 0 ); - - // initialize merge with one record from each temp file - - for( idx = 0; idx < PennyPasses; idx++ ) { - sprintf( filename, "%s.%d", outname, idx ); - in[idx] = fopen( filename, "rb" ); - line[idx] = malloc( PennyLine ); - setvbuf( in[idx], NULL, _IOFBF, 4096 * 1024 ); - fread( line[idx], PennyLine, 1, in[idx] ); - cell = judy_cell( judy, line[idx] + PennyOff, PennyKey ); - next[idx + 1] = *( unsigned int * )cell; - *cell = idx + 1; - } - - // output records, replacing smallest each time - - while( cell = judy_strt( judy, NULL, 0 ) ) { - nxt = *( unsigned int * )cell; - judy_del( judy ); - - // process duplicates - - while( idx = nxt ) { - nxt = next[idx--]; - fwrite( line[idx], PennyLine, 1, out ); - - if( fread( line[idx], PennyLine, 1, in[idx] ) ) { - cell = judy_cell( judy, line[idx] + PennyOff, PennyKey ); - next[idx + 1] = *( unsigned int * )cell; - *cell = idx + 1; - } else { - next[idx + 1] = 0; - } - } - } - - for( idx = 0; idx < PennyPasses; idx++ ) { - fclose( in[idx] ); - free( line[idx] ); - } - - free( line ); - free( next ); - free( in ); - - fprintf( stderr, "End Merge %llu secs", ( unsigned long long ) time( NULL ) - start ); -#ifdef _WIN32 - { - FILETIME dummy[1]; - FILETIME user[1]; - GetProcessTimes( GetCurrentProcess(), dummy, dummy, dummy, user ); - PennyMergeTime = *( unsigned long long * )user / 10000000; - } -#else - { - struct tms buff[1]; - times( buff ); - PennyMergeTime = buff->tms_utime / 100; - } -#endif - fprintf( stderr, " Cpu %d\n", PennyMergeTime - PennySortTime ); - judy_close( judy ); - fflush( out ); - fclose( out ); - return 0; -} diff --git a/src/cllazyfile/judy/test/sort.h b/src/cllazyfile/judy/test/sort.h deleted file mode 100644 index 785e58d69..000000000 --- a/src/cllazyfile/judy/test/sort.h +++ /dev/null @@ -1,58 +0,0 @@ -#ifndef SORT_H -#define SORT_H - -// Judy arrays 13 DEC 2012 (judy64n.c from http://code.google.com/p/judyarray/ ) -// This code is public domain. - -// Author Karl Malbrain, malbrain AT yahoo.com -// with assistance from Jan Weiss. -// modifications (and any bugs) by Mark Pictor, mpictor at gmail - -// Simplified judy arrays for strings and integers -// Adapted from the ideas of Douglas Baskins of HP. - -// Map a set of keys to corresponding memory cells (uints). -// Each cell must be set to a non-zero value by the caller. - -// STANDALONE is defined to compile into a string sorter. - -// String mappings are denoted by calling judy_open with zero as -// the second argument. Integer mappings are denoted by calling -// judy_open with the Integer depth of the Judy Trie as the second -// argument. - -#include -#include -#include -#include -#include "judy.h" - -#ifdef linux -# include -# include -# include -# include -# include -#else -# include -# include -#endif - -#include - -#define PRIuint "u" - - -//these are initialized in penny.c -extern unsigned int PennyRecs; -extern unsigned int PennyLine; -extern unsigned int PennyKey; -extern unsigned int PennyOff; -extern unsigned long long PennyMerge; - -typedef struct { - void * buff; // record pointer in input file map - void * next; // duplicate chain -} PennySort; - -#endif //SORT_H \ No newline at end of file diff --git a/src/cllazyfile/lazyDataSectionReader.cc b/src/cllazyfile/lazyDataSectionReader.cc index 4b1bc1785..cede12733 100644 --- a/src/cllazyfile/lazyDataSectionReader.cc +++ b/src/cllazyfile/lazyDataSectionReader.cc @@ -1,6 +1,6 @@ -#include "lazyDataSectionReader.h" -#include "lazyFileReader.h" -#include "lazyInstMgr.h" +#include "lazy/lazyDataSectionReader.h" +#include "lazy/lazyFileReader.h" +#include "lazy/lazyInstMgr.h" #include lazyDataSectionReader::lazyDataSectionReader( lazyFileReader * parent, std::ifstream & file, diff --git a/src/cllazyfile/lazyFileReader.cc b/src/cllazyfile/lazyFileReader.cc index 9cc294df0..090e3337f 100644 --- a/src/cllazyfile/lazyFileReader.cc +++ b/src/cllazyfile/lazyFileReader.cc @@ -1,10 +1,10 @@ #include -#include "lazyFileReader.h" -#include "lazyDataSectionReader.h" -#include "headerSectionReader.h" -#include "lazyInstMgr.h" +#include "lazy/lazyFileReader.h" +#include "lazy/lazyDataSectionReader.h" +#include "lazy/headerSectionReader.h" +#include "lazy/lazyInstMgr.h" void lazyFileReader::initP21() { _header = new p21HeaderSectionReader( this, _file, 0, -1 ); diff --git a/src/cllazyfile/lazyInstMgr.cc b/src/cllazyfile/lazyInstMgr.cc index 6f4a3ffb0..f7aec713f 100644 --- a/src/cllazyfile/lazyInstMgr.cc +++ b/src/cllazyfile/lazyInstMgr.cc @@ -1,9 +1,9 @@ -#include "lazyTypes.h" -#include "lazyInstMgr.h" +#include "lazy/lazyTypes.h" +#include "lazy/lazyInstMgr.h" #include "core/Registry.h" #include "core/SubSuperIterators.h" #include "editor/SdaiSchemaInit.h" -#include "instMgrHelper.h" +#include "lazy/instMgrHelper.h" #include "lazyRefs.h" #include "core/sdaiApplication_instance.h" diff --git a/src/cllazyfile/lazyP21DataSectionReader.cc b/src/cllazyfile/lazyP21DataSectionReader.cc index baecb260e..0a726cde8 100644 --- a/src/cllazyfile/lazyP21DataSectionReader.cc +++ b/src/cllazyfile/lazyP21DataSectionReader.cc @@ -1,7 +1,7 @@ #include #include -#include "lazyP21DataSectionReader.h" -#include "lazyInstMgr.h" +#include "lazy/lazyP21DataSectionReader.h" +#include "lazy/lazyInstMgr.h" lazyP21DataSectionReader::lazyP21DataSectionReader( lazyFileReader * parent, std::ifstream & file, std::streampos start, sectionID sid ): diff --git a/src/cllazyfile/lazyRefs.h b/src/cllazyfile/lazyRefs.h index 801cc642d..b13a4b4e2 100644 --- a/src/cllazyfile/lazyRefs.h +++ b/src/cllazyfile/lazyRefs.h @@ -7,8 +7,8 @@ #include #include "sc_export.h" -#include "lazyTypes.h" -#include "lazyInstMgr.h" +#include "lazy/lazyTypes.h" +#include "lazy/lazyInstMgr.h" #include "core/ExpDict.h" #include "core/SubSuperIterators.h" #include "core/STEPattribute.h" diff --git a/src/cllazyfile/lazy_test.cc b/src/cllazyfile/lazy_test.cc index b0216daa4..47af530da 100644 --- a/src/cllazyfile/lazy_test.cc +++ b/src/cllazyfile/lazy_test.cc @@ -1,4 +1,4 @@ -#include "lazyInstMgr.h" +#include "lazy/lazyInstMgr.h" #include "./sc_benchmark.h" #include "editor/SdaiSchemaInit.h" #include "config.h" diff --git a/src/cllazyfile/p21HeaderSectionReader.cc b/src/cllazyfile/p21HeaderSectionReader.cc index a01e47c3d..126d2295f 100644 --- a/src/cllazyfile/p21HeaderSectionReader.cc +++ b/src/cllazyfile/p21HeaderSectionReader.cc @@ -1,11 +1,11 @@ #include #include -#include "p21HeaderSectionReader.h" -#include "headerSectionReader.h" -#include "sectionReader.h" -#include "lazyInstMgr.h" -#include "judyL2Array.h" +#include "lazy/p21HeaderSectionReader.h" +#include "lazy/headerSectionReader.h" +#include "lazy/sectionReader.h" +#include "lazy/lazyInstMgr.h" +#include "lazy/judyL2Array.h" void p21HeaderSectionReader::findSectionStart() { diff --git a/src/cllazyfile/sectionReader.cc b/src/cllazyfile/sectionReader.cc index 9a49d05b7..1d1a81253 100644 --- a/src/cllazyfile/sectionReader.cc +++ b/src/cllazyfile/sectionReader.cc @@ -18,10 +18,10 @@ #include "editor/SdaiSchemaInit.h" #include "core/STEPcomplex.h" -#include "sectionReader.h" -#include "lazyFileReader.h" -#include "lazyInstMgr.h" -#include "lazyTypes.h" +#include "lazy/sectionReader.h" +#include "lazy/lazyFileReader.h" +#include "lazy/lazyInstMgr.h" +#include "lazy/lazyTypes.h" #include "current_function.hpp" diff --git a/test/cpp/schema_specific/inverse_attr3.cc b/test/cpp/schema_specific/inverse_attr3.cc index cea95a2fb..61f5b6577 100644 --- a/test/cpp/schema_specific/inverse_attr3.cc +++ b/test/cpp/schema_specific/inverse_attr3.cc @@ -5,7 +5,7 @@ * This test originally used STEPfile, which didn't work. Fixing STEPfile would have been very difficult, it uses lazyInstMgr now. */ #include "config.h" -#include +#include "lazy/lazyInstMgr.h" #include #include "core/sdai.h" #include "core/STEPattribute.h" From bc96f29d6bc8a41a6e2d52ebeaab7eaabd03d0ae Mon Sep 17 00:00:00 2001 From: Clifford Yapp <238416+starseeker@users.noreply.github.com> Date: Sun, 2 Oct 2022 11:52:27 -0400 Subject: [PATCH 16/23] Move utils headers --- include/core/ExpDict.h | 2 +- include/core/Registry.h | 6 +++--- include/core/STEPaggregate.h | 2 +- include/core/STEPattribute.h | 2 +- include/core/STEPcomplex.h | 2 +- include/core/STEPundefined.h | 2 +- include/core/complexSupport.h | 2 +- include/core/dispnode.h | 4 ++-- include/core/dispnodelist.h | 4 ++-- include/core/instmgr.h | 6 +++--- include/core/mgrnode.h | 4 ++-- include/core/mgrnodearray.h | 6 +++--- include/core/mgrnodelist.h | 4 ++-- include/core/schRename.h | 2 +- include/core/sdai.h | 4 ++-- include/editor/STEPfile.h | 4 ++-- include/editor/cmdmgr.h | 6 +++--- include/lazy/sectionReader.h | 2 +- include/utils/CMakeLists.txt | 8 +++++++- {src/clutils => include/utils}/Str.h | 2 +- {src/clutils => include/utils}/dirobj.h | 0 {src/clutils => include/utils}/errordesc.h | 0 {src/clutils => include/utils}/gennode.h | 0 {src/clutils => include/utils}/gennodearray.h | 2 +- {src/clutils => include/utils}/gennodelist.h | 0 {src/clutils => include/utils}/sc_hash.h | 0 misc/header_mv.sh | 12 ++++++------ src/clstepcore/dispnode.cc | 4 ++-- src/clstepcore/dispnodelist.cc | 4 ++-- src/clstepcore/read_func.cc | 4 ++-- src/clutils/CMakeLists.txt | 14 -------------- src/clutils/Str.cc | 2 +- src/clutils/dirobj.cc | 2 +- src/clutils/errordesc.cc | 4 ++-- src/clutils/gennode.cc | 4 ++-- src/clutils/gennodearray.cc | 6 +++--- src/clutils/gennodelist.cc | 6 +++--- src/clutils/sc_hash.cc | 2 +- src/test/p21read/p21read.cc | 2 +- .../cpp/schema_specific/aggregate_bound_runtime.cc | 2 +- test/cpp/schema_specific/attribute.cc | 2 +- test/cpp/schema_specific/inverse_attr1.cc | 2 +- test/cpp/schema_specific/inverse_attr2.cc | 2 +- test/cpp/schema_specific/inverse_attr3.cc | 2 +- test/cpp/schema_specific/stepfile_rw_progress.cc | 2 +- 45 files changed, 73 insertions(+), 81 deletions(-) rename {src/clutils => include/utils}/Str.h (98%) rename {src/clutils => include/utils}/dirobj.h (100%) rename {src/clutils => include/utils}/errordesc.h (100%) rename {src/clutils => include/utils}/gennode.h (100%) rename {src/clutils => include/utils}/gennodearray.h (98%) rename {src/clutils => include/utils}/gennodelist.h (100%) rename {src/clutils => include/utils}/sc_hash.h (100%) diff --git a/include/core/ExpDict.h b/include/core/ExpDict.h index 8aa82df55..4e7087cfb 100644 --- a/include/core/ExpDict.h +++ b/include/core/ExpDict.h @@ -25,7 +25,7 @@ #include "core/baseType.h" #include "core/dictdefs.h" -#include +#include "utils/Str.h" // each of these contains linked list, list node, iterator #include "core/attrDescriptorList.h" diff --git a/include/core/Registry.h b/include/core/Registry.h index eda955b39..2f97f9d7a 100644 --- a/include/core/Registry.h +++ b/include/core/Registry.h @@ -14,9 +14,9 @@ #include #include "core/sdai.h" -#include -#include -#include +#include "utils/errordesc.h" +#include "utils/sc_hash.h" +#include "utils/Str.h" #include "core/complexSupport.h" diff --git a/include/core/STEPaggregate.h b/include/core/STEPaggregate.h index efb3477a6..69a78b420 100644 --- a/include/core/STEPaggregate.h +++ b/include/core/STEPaggregate.h @@ -17,7 +17,7 @@ class STEPaggregate; class TypeDescriptor; #include -#include +#include "utils/errordesc.h" #include "core/SingleLinkList.h" #include "core/baseType.h" #include "core/sdai.h" diff --git a/include/core/STEPattribute.h b/include/core/STEPattribute.h index 754cec9d1..fd361c817 100644 --- a/include/core/STEPattribute.h +++ b/include/core/STEPattribute.h @@ -15,7 +15,7 @@ #include #include -#include +#include "utils/errordesc.h" #include "core/baseType.h" #include "core/sdai.h" diff --git a/include/core/STEPcomplex.h b/include/core/STEPcomplex.h index 6e64f3e20..2b8c24d8e 100644 --- a/include/core/STEPcomplex.h +++ b/include/core/STEPcomplex.h @@ -2,7 +2,7 @@ #define STEPCOMPLEX_H #include -#include +#include "utils/errordesc.h" #include "core/sdai.h" #include "core/baseType.h" #include "core/ExpDict.h" diff --git a/include/core/STEPundefined.h b/include/core/STEPundefined.h index da9883215..25e3f99b2 100644 --- a/include/core/STEPundefined.h +++ b/include/core/STEPundefined.h @@ -13,7 +13,7 @@ */ #include -#include +#include "utils/errordesc.h" #include #include "core/read_func.h" diff --git a/include/core/complexSupport.h b/include/core/complexSupport.h index f7d3db734..83dbf2006 100644 --- a/include/core/complexSupport.h +++ b/include/core/complexSupport.h @@ -18,7 +18,7 @@ #include #include using namespace std; -#include "Str.h" +#include "utils/Str.h" #define LISTEND 999 /** \def LISTEND diff --git a/include/core/dispnode.h b/include/core/dispnode.h index ad519f87f..b25ff46ca 100644 --- a/include/core/dispnode.h +++ b/include/core/dispnode.h @@ -21,8 +21,8 @@ /*#include */ #include "core/sdai.h" -#include -#include +#include "utils/gennode.h" +#include "utils/gennodelist.h" //#include #include "editor/editordefines.h" //#include diff --git a/include/core/dispnodelist.h b/include/core/dispnodelist.h index af64fabc5..385dbbf5e 100644 --- a/include/core/dispnodelist.h +++ b/include/core/dispnodelist.h @@ -17,12 +17,12 @@ #include -#include +#include "utils/gennode.h" //#include #include "editor/editordefines.h" #include "core/mgrnode.h" #include "core/dispnode.h" -#include +#include "utils/gennodelist.h" /////////////////////////////////////////////////////////////////////////////// // class DisplayNodeList diff --git a/include/core/instmgr.h b/include/core/instmgr.h index 94f334982..b763b87b7 100644 --- a/include/core/instmgr.h +++ b/include/core/instmgr.h @@ -27,9 +27,9 @@ // IT IS VERY IMPORTANT THAT THE ORDER OF THE FOLLOWING INCLUDE FILES // BE PRESERVED -#include -#include -#include +#include "utils/gennode.h" +#include "utils/gennodelist.h" +#include "utils/gennodearray.h" #include "core/mgrnode.h" #include "core/mgrnodelist.h" diff --git a/include/core/mgrnode.h b/include/core/mgrnode.h index ef871b071..3befa9393 100644 --- a/include/core/mgrnode.h +++ b/include/core/mgrnode.h @@ -20,8 +20,8 @@ class GenericNode; class DisplayNode; #include "core/sdai.h" -#include -#include +#include "utils/gennode.h" +#include "utils/gennodelist.h" #include "editor/editordefines.h" diff --git a/include/core/mgrnodearray.h b/include/core/mgrnodearray.h index 05a11dff9..02d2191fa 100644 --- a/include/core/mgrnodearray.h +++ b/include/core/mgrnodearray.h @@ -19,14 +19,14 @@ #include -#include -#include +#include "utils/gennode.h" +#include "utils/gennodelist.h" //#include #include "core/mgrnode.h" #include "core/mgrnodelist.h" -#include +#include "utils/gennodearray.h" #define ARRAY_DEFAULT_SIZE (1024) diff --git a/include/core/mgrnodelist.h b/include/core/mgrnodelist.h index 92edcfe39..471e40216 100644 --- a/include/core/mgrnodelist.h +++ b/include/core/mgrnodelist.h @@ -17,9 +17,9 @@ #include -#include +#include "utils/gennode.h" //#include -#include +#include "utils/gennodelist.h" #include "editor/editordefines.h" ////////////////////////////////////////////////////////////////////////////// diff --git a/include/core/schRename.h b/include/core/schRename.h index b5ffdbaa1..042b7fda2 100644 --- a/include/core/schRename.h +++ b/include/core/schRename.h @@ -4,7 +4,7 @@ #include #include -#include "Str.h" +#include "utils/Str.h" #include "sc_export.h" diff --git a/include/core/sdai.h b/include/core/sdai.h index d47cbca3b..674571bde 100644 --- a/include/core/sdai.h +++ b/include/core/sdai.h @@ -30,8 +30,8 @@ extern const char * SCLversion; #include "core/dictdefs.h" #include "core/baseType.h" -#include "Str.h" -#include "errordesc.h" +#include "utils/Str.h" +#include "utils/errordesc.h" typedef std::string Express_id; diff --git a/include/editor/STEPfile.h b/include/editor/STEPfile.h index 316fe2b34..b85ea4d22 100644 --- a/include/editor/STEPfile.h +++ b/include/editor/STEPfile.h @@ -18,8 +18,8 @@ #include "core/instmgr.h" #include "core/Registry.h" #include -#include -#include +#include "utils/dirobj.h" +#include "utils/errordesc.h" #include #include "core/read_func.h" diff --git a/include/editor/cmdmgr.h b/include/editor/cmdmgr.h index 3b8607640..cac165b78 100644 --- a/include/editor/cmdmgr.h +++ b/include/editor/cmdmgr.h @@ -13,9 +13,9 @@ */ #include -#include -#include -#include +#include "utils/gennode.h" +#include "utils/gennodelist.h" +#include "utils/gennodearray.h" #include "editor/editordefines.h" #include "core/mgrnode.h" diff --git a/include/lazy/sectionReader.h b/include/lazy/sectionReader.h index 7b62a910c..2afbf500e 100644 --- a/include/lazy/sectionReader.h +++ b/include/lazy/sectionReader.h @@ -5,7 +5,7 @@ #include #include "lazy/lazyTypes.h" #include "sc_export.h" -#include "errordesc.h" +#include "utils/errordesc.h" #include "core/STEPcomplex.h" class SDAI_Application_instance; diff --git a/include/utils/CMakeLists.txt b/include/utils/CMakeLists.txt index 9fb164919..127b971e2 100644 --- a/include/utils/CMakeLists.txt +++ b/include/utils/CMakeLists.txt @@ -1,5 +1,11 @@ set(UTILS_HDRS - + dirobj.h + errordesc.h + gennodearray.h + gennode.h + gennodelist.h + sc_hash.h + Str.h ) install(FILES ${UTILS_HDRS} diff --git a/src/clutils/Str.h b/include/utils/Str.h similarity index 98% rename from src/clutils/Str.h rename to include/utils/Str.h index f605bfdda..80ea6ab1d 100644 --- a/src/clutils/Str.h +++ b/include/utils/Str.h @@ -19,7 +19,7 @@ #include #include #include -#include +#include "utils/errordesc.h" #ifndef STRING_DELIM #define STRING_DELIM '\'' diff --git a/src/clutils/dirobj.h b/include/utils/dirobj.h similarity index 100% rename from src/clutils/dirobj.h rename to include/utils/dirobj.h diff --git a/src/clutils/errordesc.h b/include/utils/errordesc.h similarity index 100% rename from src/clutils/errordesc.h rename to include/utils/errordesc.h diff --git a/src/clutils/gennode.h b/include/utils/gennode.h similarity index 100% rename from src/clutils/gennode.h rename to include/utils/gennode.h diff --git a/src/clutils/gennodearray.h b/include/utils/gennodearray.h similarity index 98% rename from src/clutils/gennodearray.h rename to include/utils/gennodearray.h index 4c0ee075a..f19dc21be 100644 --- a/src/clutils/gennodearray.h +++ b/include/utils/gennodearray.h @@ -26,7 +26,7 @@ #include #include // to get bcopy for CenterLine -#include +#include "utils/gennode.h" // the initial size of the array #define ARRAY_DEFAULT_SIZE (1024) diff --git a/src/clutils/gennodelist.h b/include/utils/gennodelist.h similarity index 100% rename from src/clutils/gennodelist.h rename to include/utils/gennodelist.h diff --git a/src/clutils/sc_hash.h b/include/utils/sc_hash.h similarity index 100% rename from src/clutils/sc_hash.h rename to include/utils/sc_hash.h diff --git a/misc/header_mv.sh b/misc/header_mv.sh index 8d5a67d39..0d2be0f0f 100755 --- a/misc/header_mv.sh +++ b/misc/header_mv.sh @@ -1,10 +1,10 @@ #!/bin/bash -find . -type f -path "*/cl*" -not -path "*.git/*" -not -path "*/exp*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include \"$1\"/include \"lazy\/$1\"/g" {} \; -find . -type f -path "*/cl*" -not -path "*.git/*" -not -path "*/exp*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include <$1>/include \"lazy\/$1\"/g" {} \; +find . -type f -path "*/cl*" -not -path "*.git/*" -not -path "*/exp*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include \"$1\"/include \"utils\/$1\"/g" {} \; +find . -type f -path "*/cl*" -not -path "*.git/*" -not -path "*/exp*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include <$1>/include \"utils\/$1\"/g" {} \; -find . -type f -path "*/include*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include \"$1\"/include \"lazy\/$1\"/g" {} \; -find . -type f -path "*/include*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include <$1>/include \"lazy\/$1\"/g" {} \; +find . -type f -path "*/include*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include \"$1\"/include \"utils\/$1\"/g" {} \; +find . -type f -path "*/include*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include <$1>/include \"utils\/$1\"/g" {} \; -find . -type f -path "*/test*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include \"$1\"/include \"lazy\/$1\"/g" {} \; -find . -type f -path "*/test*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include <$1>/include \"lazy\/$1\"/g" {} \; +find . -type f -path "*/test*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include \"$1\"/include \"utils\/$1\"/g" {} \; +find . -type f -path "*/test*" -not -path "*.git/*" -regex '.*\(c\|cc\|cpp\|cxx\|h\|hpp\)$' -exec perl -0777 -pi -e "s/include <$1>/include \"utils\/$1\"/g" {} \; diff --git a/src/clstepcore/dispnode.cc b/src/clstepcore/dispnode.cc index 6950a0e6e..8b01541ad 100644 --- a/src/clstepcore/dispnode.cc +++ b/src/clstepcore/dispnode.cc @@ -12,8 +12,8 @@ /* $Id: dispnode.cc,v 3.0.1.2 1997/11/05 22:11:39 sauderd DP3.1 $ */ -#include -#include +#include "utils/gennode.h" +#include "utils/gennodelist.h" //#include #include "core/dispnode.h" diff --git a/src/clstepcore/dispnodelist.cc b/src/clstepcore/dispnodelist.cc index b58d12db2..f00ca79df 100644 --- a/src/clstepcore/dispnodelist.cc +++ b/src/clstepcore/dispnodelist.cc @@ -12,8 +12,8 @@ /* $Id: dispnodelist.cc,v 3.0.1.2 1997/11/05 22:11:40 sauderd DP3.1 $ */ -#include -#include +#include "utils/gennode.h" +#include "utils/gennodelist.h" #include "core/mgrnode.h" #include "core/mgrnodelist.h" diff --git a/src/clstepcore/read_func.cc b/src/clstepcore/read_func.cc index 65a635dbe..85fb28a29 100644 --- a/src/clstepcore/read_func.cc +++ b/src/clstepcore/read_func.cc @@ -1,10 +1,10 @@ -#include +#include "utils/errordesc.h" #include #include "core/sdai.h" #include "core/read_func.h" #include "core/STEPattribute.h" -#include "Str.h" +#include "utils/Str.h" const int RealNumPrecision = REAL_NUM_PRECISION; diff --git a/src/clutils/CMakeLists.txt b/src/clutils/CMakeLists.txt index 69f2f935d..2032efc02 100644 --- a/src/clutils/CMakeLists.txt +++ b/src/clutils/CMakeLists.txt @@ -1,4 +1,3 @@ - set(LIBSTEPUTILS_SRCS Str.cc dirobj.cc @@ -9,16 +8,6 @@ set(LIBSTEPUTILS_SRCS errordesc.cc ) -set(SC_CLUTILS_HDRS - dirobj.h - errordesc.h - gennodearray.h - gennode.h - gennodelist.h - sc_hash.h - Str.h - ) - include_directories( ${SC_BINARY_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR} @@ -40,9 +29,6 @@ if(BUILD_STATIC_LIBS) endif() endif() -install(FILES ${SC_CLUTILS_HDRS} - DESTINATION ${INCLUDE_DIR}/stepcode/clutils) - # Local Variables: # tab-width: 8 # mode: cmake diff --git a/src/clutils/Str.cc b/src/clutils/Str.cc index 4ae8ef69c..ec8f5b3da 100644 --- a/src/clutils/Str.cc +++ b/src/clutils/Str.cc @@ -9,7 +9,7 @@ * and is not subject to copyright. */ -#include "Str.h" +#include "utils/Str.h" #include #include diff --git a/src/clutils/dirobj.cc b/src/clutils/dirobj.cc index 37110948f..97dc4fda6 100644 --- a/src/clutils/dirobj.cc +++ b/src/clutils/dirobj.cc @@ -40,7 +40,7 @@ */ #include "config.h" -#include +#include "utils/dirobj.h" #ifdef HAVE_DIRENT_H # include #endif diff --git a/src/clutils/errordesc.cc b/src/clutils/errordesc.cc index 46d6c820d..4cfb1f2c1 100644 --- a/src/clutils/errordesc.cc +++ b/src/clutils/errordesc.cc @@ -10,8 +10,8 @@ * and is not subject to copyright. */ -#include -#include +#include "utils/errordesc.h" +#include "utils/Str.h" DebugLevel ErrorDescriptor::_debug_level = DEBUG_OFF; ostream * ErrorDescriptor::_out = 0; diff --git a/src/clutils/gennode.cc b/src/clutils/gennode.cc index 44a2b0aa6..e1f7d83b9 100644 --- a/src/clutils/gennode.cc +++ b/src/clutils/gennode.cc @@ -12,8 +12,8 @@ /* $Id: gennode.cc,v 3.0.1.4 1997/11/05 22:33:47 sauderd DP3.1 $ */ -#include -#include +#include "utils/gennode.h" +#include "utils/gennodelist.h" ////////////////////////////////////////////////////////////////////////////// // class GenericNode inline functions that depend on other classes diff --git a/src/clutils/gennodearray.cc b/src/clutils/gennodearray.cc index 801742293..1645589d5 100644 --- a/src/clutils/gennodearray.cc +++ b/src/clutils/gennodearray.cc @@ -13,9 +13,9 @@ #include "config.h" -#include -#include -#include +#include "utils/gennode.h" +#include "utils/gennodelist.h" +#include "utils/gennodearray.h" #ifndef HAVE_MEMMOVE extern "C" { diff --git a/src/clutils/gennodelist.cc b/src/clutils/gennodelist.cc index f333d6585..7650781cf 100644 --- a/src/clutils/gennodelist.cc +++ b/src/clutils/gennodelist.cc @@ -12,10 +12,10 @@ /* $Id: gennodelist.cc,v 3.0.1.2 1997/11/05 22:33:49 sauderd DP3.1 $ */ -#include -#include +#include "utils/gennode.h" +#include "utils/gennodelist.h" //#include -#include +#include "utils/gennodearray.h" // inserts after existNode void GenNodeList::InsertAfter( GenericNode * newNode, diff --git a/src/clutils/sc_hash.cc b/src/clutils/sc_hash.cc index 5b754c769..db6eda0ec 100644 --- a/src/clutils/sc_hash.cc +++ b/src/clutils/sc_hash.cc @@ -5,7 +5,7 @@ * also, hcreate/hdestroy routines added to simulate hsearch(3). */ -#include +#include "utils/sc_hash.h" #include #include #include diff --git a/src/test/p21read/p21read.cc b/src/test/p21read/p21read.cc index d896faa48..cd7bd9748 100644 --- a/src/test/p21read/p21read.cc +++ b/src/test/p21read/p21read.cc @@ -18,7 +18,7 @@ extern void SchemaInit( class Registry & ); #include "core/STEPattribute.h" #include "core/ExpDict.h" #include "core/Registry.h" -#include +#include "utils/errordesc.h" #include #include #include "sc_benchmark.h" diff --git a/test/cpp/schema_specific/aggregate_bound_runtime.cc b/test/cpp/schema_specific/aggregate_bound_runtime.cc index e8ebb598a..72b507634 100644 --- a/test/cpp/schema_specific/aggregate_bound_runtime.cc +++ b/test/cpp/schema_specific/aggregate_bound_runtime.cc @@ -4,7 +4,7 @@ #include "core/STEPattribute.h" #include "core/ExpDict.h" #include "core/Registry.h" -#include +#include "utils/errordesc.h" #include #include #ifdef HAVE_UNISTD_H diff --git a/test/cpp/schema_specific/attribute.cc b/test/cpp/schema_specific/attribute.cc index 8dff9d8fd..4c8674da2 100644 --- a/test/cpp/schema_specific/attribute.cc +++ b/test/cpp/schema_specific/attribute.cc @@ -8,7 +8,7 @@ #include "core/STEPattribute.h" #include "core/ExpDict.h" #include "core/Registry.h" -#include +#include "utils/errordesc.h" #include #include #ifdef HAVE_UNISTD_H diff --git a/test/cpp/schema_specific/inverse_attr1.cc b/test/cpp/schema_specific/inverse_attr1.cc index 201aeff8e..0ec52d47d 100644 --- a/test/cpp/schema_specific/inverse_attr1.cc +++ b/test/cpp/schema_specific/inverse_attr1.cc @@ -10,7 +10,7 @@ #include "core/STEPattribute.h" #include "core/ExpDict.h" #include "core/Registry.h" -#include +#include "utils/errordesc.h" #include #include #ifdef HAVE_UNISTD_H diff --git a/test/cpp/schema_specific/inverse_attr2.cc b/test/cpp/schema_specific/inverse_attr2.cc index fea50f309..5948660e0 100644 --- a/test/cpp/schema_specific/inverse_attr2.cc +++ b/test/cpp/schema_specific/inverse_attr2.cc @@ -9,7 +9,7 @@ #include "core/STEPattribute.h" #include "core/ExpDict.h" #include "core/Registry.h" -#include +#include "utils/errordesc.h" #include #include #ifdef HAVE_UNISTD_H diff --git a/test/cpp/schema_specific/inverse_attr3.cc b/test/cpp/schema_specific/inverse_attr3.cc index 61f5b6577..a20a822c1 100644 --- a/test/cpp/schema_specific/inverse_attr3.cc +++ b/test/cpp/schema_specific/inverse_attr3.cc @@ -11,7 +11,7 @@ #include "core/STEPattribute.h" #include "core/ExpDict.h" #include "core/Registry.h" -#include +#include "utils/errordesc.h" #include #include #include diff --git a/test/cpp/schema_specific/stepfile_rw_progress.cc b/test/cpp/schema_specific/stepfile_rw_progress.cc index c2c3c1522..4ee676627 100644 --- a/test/cpp/schema_specific/stepfile_rw_progress.cc +++ b/test/cpp/schema_specific/stepfile_rw_progress.cc @@ -4,7 +4,7 @@ #include "core/STEPattribute.h" #include "core/ExpDict.h" #include "core/Registry.h" -#include +#include "utils/errordesc.h" #include #include From 1bd7ad942bd8b28b7101b56570b3baffb883e6d9 Mon Sep 17 00:00:00 2001 From: Clifford Yapp <238416+starseeker@users.noreply.github.com> Date: Sun, 2 Oct 2022 12:17:48 -0400 Subject: [PATCH 17/23] Remove includes of other lib src directories --- src/cldai/CMakeLists.txt | 9 +++------ src/cleditor/CMakeLists.txt | 10 +++------- src/cllazyfile/CMakeLists.txt | 11 +++-------- src/clstepcore/CMakeLists.txt | 10 +++------- src/clutils/CMakeLists.txt | 7 +++---- 5 files changed, 15 insertions(+), 32 deletions(-) diff --git a/src/cldai/CMakeLists.txt b/src/cldai/CMakeLists.txt index 1905704b5..e37ac06d2 100644 --- a/src/cldai/CMakeLists.txt +++ b/src/cldai/CMakeLists.txt @@ -1,5 +1,4 @@ - -set(LIBSTEPDAI_SRCS +set(DAI_SRCS sdaiApplication_instance_set.cc sdaiBinary.cc sdaiDaObject.cc @@ -16,21 +15,19 @@ set(LIBSTEPDAI_SRCS include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/include/stepcode - ${SC_SOURCE_DIR}/src/clstepcore - ${SC_SOURCE_DIR}/src/clutils ) set(_libdeps steputils) if(BUILD_SHARED_LIBS) - SC_ADDLIB(stepdai SHARED SOURCES ${LIBSTEPDAI_SRCS} LINK_LIBRARIES ${_libdeps}) + SC_ADDLIB(stepdai SHARED SOURCES ${DAI_SRCS} LINK_LIBRARIES ${_libdeps}) if(WIN32) target_compile_definitions(stepdai PRIVATE SC_DAI_DLL_EXPORTS) endif() endif() if(BUILD_STATIC_LIBS) - SC_ADDLIB(stepdai-static STATIC SOURCES ${LIBSTEPDAI_SRCS} LINK_LIBRARIES $-static) + SC_ADDLIB(stepdai-static STATIC SOURCES ${DAI_SRCS} LINK_LIBRARIES $-static) endif() # Local Variables: diff --git a/src/cleditor/CMakeLists.txt b/src/cleditor/CMakeLists.txt index 3e21261ae..2b306068e 100644 --- a/src/cleditor/CMakeLists.txt +++ b/src/cleditor/CMakeLists.txt @@ -1,5 +1,4 @@ - -set(LIBSTEPEDITOR_SRCS +set(EDITOR_SRCS STEPfile.cc STEPfile.inline.cc cmdmgr.cc @@ -12,20 +11,17 @@ set(LIBSTEPEDITOR_SRCS include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/include/stepcode - ${SC_SOURCE_DIR}/src/cldai - ${SC_SOURCE_DIR}/src/clstepcore - ${SC_SOURCE_DIR}/src/clutils ) if(BUILD_SHARED_LIBS) - SC_ADDLIB(stepeditor SHARED SOURCES ${LIBSTEPEDITOR_SRCS} LINK_LIBRARIES stepcore stepdai steputils) + SC_ADDLIB(stepeditor SHARED SOURCES ${EDITOR_SRCS} LINK_LIBRARIES stepcore stepdai steputils) if(WIN32) target_compile_definitions(stepeditor PRIVATE SC_EDITOR_DLL_EXPORTS) endif() endif() if(BUILD_STATIC_LIBS) - SC_ADDLIB(stepeditor-static STATIC SOURCES ${LIBSTEPEDITOR_SRCS} LINK_LIBRARIES stepcore-static stepdai-static steputils-static) + SC_ADDLIB(stepeditor-static STATIC SOURCES ${EDITOR_SRCS} LINK_LIBRARIES stepcore-static stepdai-static steputils-static) endif() # Local Variables: diff --git a/src/cllazyfile/CMakeLists.txt b/src/cllazyfile/CMakeLists.txt index ea6d37a77..c56e8dbbc 100644 --- a/src/cllazyfile/CMakeLists.txt +++ b/src/cllazyfile/CMakeLists.txt @@ -1,5 +1,4 @@ - -set( clLazyFile_SRCS +set(LAZY_SRCS lazyDataSectionReader.cc lazyFileReader.cc lazyInstMgr.cc @@ -12,16 +11,12 @@ set( clLazyFile_SRCS include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/include/stepcode - ${SC_SOURCE_DIR}/src/cleditor - ${SC_SOURCE_DIR}/src/cldai - ${SC_SOURCE_DIR}/src/clstepcore - ${SC_SOURCE_DIR}/src/clutils ) set(_libdeps stepcore stepdai steputils stepeditor) if(BUILD_SHARED_LIBS) - SC_ADDLIB(steplazyfile SHARED SOURCES ${clLazyFile_SRCS} LINK_LIBRARIES ${_libdeps}) + SC_ADDLIB(steplazyfile SHARED SOURCES ${LAZY_SRCS} LINK_LIBRARIES ${_libdeps}) if(WIN32) target_compile_definitions(steplazyfile PRIVATE SC_LAZYFILE_DLL_EXPORTS) endif() @@ -29,7 +24,7 @@ endif() if(BUILD_STATIC_LIBS) set(_libdeps stepcore-static stepdai-static steputils-static stepeditor-static) - SC_ADDLIB(steplazyfile-static STATIC SOURCES ${clLazyFile_SRCS} LINK_LIBRARIES ${_libdeps}) + SC_ADDLIB(steplazyfile-static STATIC SOURCES ${LAZY_SRCS} LINK_LIBRARIES ${_libdeps}) endif() SC_ADDEXEC(lazy_test SOURCES "lazy_test.cc;sc_benchmark.cc" LINK_LIBRARIES steplazyfile stepeditor NO_INSTALL) diff --git a/src/clstepcore/CMakeLists.txt b/src/clstepcore/CMakeLists.txt index d7f6cd539..e31f8ad8e 100644 --- a/src/clstepcore/CMakeLists.txt +++ b/src/clstepcore/CMakeLists.txt @@ -1,5 +1,4 @@ - -set(LIBSTEPCORE_SRCS +set(CORE_SRCS aggrTypeDescriptor.cc attrDescriptor.cc attrDescriptorList.cc @@ -65,22 +64,19 @@ set(LIBSTEPCORE_SRCS include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/include/stepcode - ${SC_SOURCE_DIR}/src/cldai - ${SC_SOURCE_DIR}/src/cleditor - ${SC_SOURCE_DIR}/src/clutils ) set(_libdeps steputils stepdai) if(BUILD_SHARED_LIBS) - SC_ADDLIB(stepcore SHARED SOURCES ${LIBSTEPCORE_SRCS} LINK_LIBRARIES ${_libdeps}) + SC_ADDLIB(stepcore SHARED SOURCES ${CORE_SRCS} LINK_LIBRARIES ${_libdeps}) if(WIN32) target_compile_definitions(stepcore PRIVATE SC_CORE_DLL_EXPORTS) endif() endif() if(BUILD_STATIC_LIBS) - SC_ADDLIB(stepcore-static STATIC SOURCES ${LIBSTEPCORE_SRCS} LINK_LIBRARIES $-static) + SC_ADDLIB(stepcore-static STATIC SOURCES ${CORE_SRCS} LINK_LIBRARIES $-static) endif() if(SC_ENABLE_TESTING) diff --git a/src/clutils/CMakeLists.txt b/src/clutils/CMakeLists.txt index 2032efc02..27cb08745 100644 --- a/src/clutils/CMakeLists.txt +++ b/src/clutils/CMakeLists.txt @@ -1,4 +1,4 @@ -set(LIBSTEPUTILS_SRCS +set(UTILS_SRCS Str.cc dirobj.cc gennode.cc @@ -11,11 +11,10 @@ set(LIBSTEPUTILS_SRCS include_directories( ${SC_BINARY_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/include/stepcode ) if(BUILD_SHARED_LIBS) - SC_ADDLIB(steputils SHARED SOURCES ${LIBSTEPUTILS_SRCS}) + SC_ADDLIB(steputils SHARED SOURCES ${UTILS_SRCS}) if(WIN32) target_compile_definitions(steputils PRIVATE SC_UTILS_DLL_EXPORTS) target_link_libraries(steputils shlwapi) @@ -23,7 +22,7 @@ if(BUILD_SHARED_LIBS) endif() if(BUILD_STATIC_LIBS) - SC_ADDLIB(steputils-static STATIC SOURCES ${LIBSTEPUTILS_SRCS}) + SC_ADDLIB(steputils-static STATIC SOURCES ${UTILS_SRCS}) if(WIN32) target_link_libraries(steputils-static shlwapi) endif() From d824fc0c4ee5f3921f7137f2e65847a017727878 Mon Sep 17 00:00:00 2001 From: Clifford Yapp <238416+starseeker@users.noreply.github.com> Date: Sun, 2 Oct 2022 16:48:51 -0400 Subject: [PATCH 18/23] Keep longer directory names We want to be consistent with the previous layout, to avoid needlessly breaking existing codes. The header update means client codes are not required to include all of the stepcode library includes explicitly - i.e., stepcode itself does not force this requirement with its own internal includes. However, if client codes do not want to add the library prefixes to their own includes as we have for stepcode, they should still be able to add the various includes and work as before. Adjust the include directory names accordingly. --- include/CMakeLists.txt | 10 ++--- include/{dai => cldai}/CMakeLists.txt | 2 +- .../sdaiApplication_instance_set.h | 0 include/{dai => cldai}/sdaiBinary.h | 0 include/{dai => cldai}/sdaiDaObject.h | 6 +-- include/{dai => cldai}/sdaiEntity_extent.h | 0 .../{dai => cldai}/sdaiEntity_extent_set.h | 0 include/{dai => cldai}/sdaiEnum.h | 0 include/{dai => cldai}/sdaiModel_contents.h | 0 .../{dai => cldai}/sdaiModel_contents_list.h | 0 include/{dai => cldai}/sdaiObject.h | 0 include/{dai => cldai}/sdaiSession_instance.h | 2 +- include/{dai => cldai}/sdaiString.h | 0 include/{editor => cleditor}/CMakeLists.txt | 2 +- include/{editor => cleditor}/STEPfile.h | 10 ++--- .../{editor => cleditor}/SdaiHeaderSchema.h | 10 ++--- .../SdaiHeaderSchemaClasses.h | 0 include/{editor => cleditor}/SdaiSchemaInit.h | 18 ++++----- include/{editor => cleditor}/cmdmgr.h | 20 +++++----- include/{editor => cleditor}/editordefines.h | 0 include/{editor => cleditor}/seeinfodefault.h | 4 +- include/{lazy => cllazyfile}/CMakeLists.txt | 2 +- .../headerSectionReader.h | 6 +-- include/{lazy => cllazyfile}/instMgrHelper.h | 6 +-- include/{lazy => cllazyfile}/judy.h | 0 include/{lazy => cllazyfile}/judyL2Array.h | 0 include/{lazy => cllazyfile}/judyLArray.h | 0 include/{lazy => cllazyfile}/judyS2Array.h | 0 include/{lazy => cllazyfile}/judySArray.h | 0 .../lazyDataSectionReader.h | 4 +- include/{lazy => cllazyfile}/lazyFileReader.h | 6 +-- include/{lazy => cllazyfile}/lazyInstMgr.h | 8 ++-- .../lazyP21DataSectionReader.h | 4 +- include/{lazy => cllazyfile}/lazyTypes.h | 0 .../p21HeaderSectionReader.h | 2 +- include/{lazy => cllazyfile}/sectionReader.h | 6 +-- include/{core => clstepcore}/CMakeLists.txt | 2 +- include/{core => clstepcore}/ExpDict.h | 24 ++++++------ include/{core => clstepcore}/Registry.h | 10 ++--- include/{core => clstepcore}/STEPaggrBinary.h | 2 +- include/{core => clstepcore}/STEPaggrEntity.h | 2 +- include/{core => clstepcore}/STEPaggrEnum.h | 2 +- .../{core => clstepcore}/STEPaggrGeneric.h | 2 +- include/{core => clstepcore}/STEPaggrInt.h | 2 +- include/{core => clstepcore}/STEPaggrReal.h | 2 +- include/{core => clstepcore}/STEPaggrSelect.h | 2 +- include/{core => clstepcore}/STEPaggrString.h | 2 +- include/{core => clstepcore}/STEPaggregate.h | 26 ++++++------- include/{core => clstepcore}/STEPattribute.h | 6 +-- .../{core => clstepcore}/STEPattributeList.h | 2 +- include/{core => clstepcore}/STEPcomplex.h | 10 ++--- .../{core => clstepcore}/STEPinvAttrList.h | 2 +- include/{core => clstepcore}/STEPundefined.h | 4 +- include/{core => clstepcore}/SingleLinkList.h | 0 .../{core => clstepcore}/SubSuperIterators.h | 4 +- .../{core => clstepcore}/aggrTypeDescriptor.h | 2 +- include/{core => clstepcore}/attrDescriptor.h | 2 +- .../{core => clstepcore}/attrDescriptorList.h | 0 include/{core => clstepcore}/baseType.h | 0 include/{core => clstepcore}/complexSupport.h | 2 +- include/{core => clstepcore}/create_Aggr.h | 2 +- .../{core => clstepcore}/derivedAttribute.h | 2 +- include/{core => clstepcore}/dictSchema.h | 0 include/{core => clstepcore}/dictdefs.h | 0 .../{core => clstepcore}/dictionaryInstance.h | 0 include/{core => clstepcore}/dispnode.h | 10 ++--- include/{core => clstepcore}/dispnodelist.h | 10 ++--- .../{core => clstepcore}/entityDescriptor.h | 4 +- .../entityDescriptorList.h | 0 .../{core => clstepcore}/enumTypeDescriptor.h | 0 include/{core => clstepcore}/explicitItemId.h | 0 include/{core => clstepcore}/globalRule.h | 2 +- include/{core => clstepcore}/implicitItemId.h | 0 include/{core => clstepcore}/instmgr.h | 16 ++++---- include/{core => clstepcore}/interfaceSpec.h | 4 +- include/{core => clstepcore}/interfacedItem.h | 4 +- .../{core => clstepcore}/inverseAttribute.h | 2 +- .../inverseAttributeList.h | 0 include/{core => clstepcore}/mgrnode.h | 8 ++-- include/{core => clstepcore}/mgrnodearray.h | 10 ++--- include/{core => clstepcore}/mgrnodelist.h | 6 +-- include/{core => clstepcore}/needFunc.h | 0 include/{core => clstepcore}/read_func.h | 2 +- .../{core => clstepcore}/realTypeDescriptor.h | 0 include/{core => clstepcore}/schRename.h | 2 +- include/{core => clstepcore}/sdai.h | 38 +++++++++---------- .../sdaiApplication_instance.h | 2 +- include/{core => clstepcore}/sdaiSelect.h | 0 .../selectTypeDescriptor.h | 0 .../stringTypeDescriptor.h | 0 include/{core => clstepcore}/typeDescriptor.h | 2 +- .../{core => clstepcore}/typeDescriptorList.h | 0 include/{core => clstepcore}/typeOrRuleVar.h | 2 +- include/{core => clstepcore}/uniquenessRule.h | 4 +- include/{core => clstepcore}/whereRule.h | 4 +- include/{utils => clutils}/CMakeLists.txt | 2 +- include/{utils => clutils}/Str.h | 2 +- include/{utils => clutils}/dirobj.h | 0 include/{utils => clutils}/errordesc.h | 0 include/{utils => clutils}/gennode.h | 0 include/{utils => clutils}/gennodearray.h | 2 +- include/{utils => clutils}/gennodelist.h | 0 include/{utils => clutils}/sc_hash.h | 0 src/cldai/sdaiApplication_instance_set.cc | 6 +-- src/cldai/sdaiBinary.cc | 2 +- src/cldai/sdaiDaObject.cc | 2 +- src/cldai/sdaiEntity_extent.cc | 2 +- src/cldai/sdaiEntity_extent_set.cc | 2 +- src/cldai/sdaiEnum.cc | 2 +- src/cldai/sdaiModel_contents.cc | 2 +- src/cldai/sdaiModel_contents_list.cc | 2 +- src/cldai/sdaiObject.cc | 2 +- src/cldai/sdaiSession_instance.cc | 2 +- src/cldai/sdaiString.cc | 2 +- src/cleditor/STEPfile.cc | 12 +++--- src/cleditor/STEPfile.inline.cc | 6 +-- src/cleditor/SdaiHeaderSchema.cc | 6 +-- src/cleditor/SdaiHeaderSchemaAll.cc | 2 +- src/cleditor/SdaiHeaderSchemaInit.cc | 8 ++-- src/cleditor/SdaiSchemaInit.cc | 2 +- src/cleditor/cmdmgr.cc | 2 +- src/cllazyfile/judy.c | 2 +- src/cllazyfile/lazyDataSectionReader.cc | 6 +-- src/cllazyfile/lazyFileReader.cc | 8 ++-- src/cllazyfile/lazyInstMgr.cc | 14 +++---- src/cllazyfile/lazyP21DataSectionReader.cc | 4 +- src/cllazyfile/lazyRefs.h | 12 +++--- src/cllazyfile/lazy_test.cc | 4 +- src/cllazyfile/p21HeaderSectionReader.cc | 10 ++--- src/cllazyfile/sectionReader.cc | 18 ++++----- src/clstepcore/Registry.cc | 4 +- src/clstepcore/STEPaggrBinary.cc | 2 +- src/clstepcore/STEPaggrEntity.cc | 6 +-- src/clstepcore/STEPaggrEnum.cc | 2 +- src/clstepcore/STEPaggrGeneric.cc | 2 +- src/clstepcore/STEPaggrInt.cc | 2 +- src/clstepcore/STEPaggrReal.cc | 2 +- src/clstepcore/STEPaggrSelect.cc | 4 +- src/clstepcore/STEPaggrString.cc | 2 +- src/clstepcore/STEPaggregate.cc | 10 ++--- src/clstepcore/STEPattribute.cc | 14 +++---- src/clstepcore/STEPattributeList.cc | 4 +- src/clstepcore/STEPcomplex.cc | 8 ++-- src/clstepcore/STEPinvAttrList.cc | 4 +- src/clstepcore/STEPundefined.cc | 4 +- src/clstepcore/SingleLinkList.cc | 2 +- src/clstepcore/aggrTypeDescriptor.cc | 2 +- src/clstepcore/attrDescriptor.cc | 2 +- src/clstepcore/attrDescriptorList.cc | 4 +- src/clstepcore/collect.cc | 2 +- src/clstepcore/complexlist.cc | 2 +- src/clstepcore/create_Aggr.cc | 4 +- src/clstepcore/derivedAttribute.cc | 2 +- src/clstepcore/dictSchema.cc | 6 +-- src/clstepcore/dispnode.cc | 8 ++-- src/clstepcore/dispnodelist.cc | 12 +++--- src/clstepcore/entityDescriptor.cc | 10 ++--- src/clstepcore/entityDescriptorList.cc | 2 +- src/clstepcore/entlist.cc | 2 +- src/clstepcore/entnode.cc | 2 +- src/clstepcore/enumTypeDescriptor.cc | 2 +- src/clstepcore/explicitItemId.cc | 2 +- src/clstepcore/globalRule.cc | 2 +- src/clstepcore/implicitItemId.cc | 2 +- src/clstepcore/instmgr.cc | 4 +- src/clstepcore/interfaceSpec.cc | 2 +- src/clstepcore/interfacedItem.cc | 2 +- src/clstepcore/inverseAttribute.cc | 2 +- src/clstepcore/inverseAttributeList.cc | 4 +- src/clstepcore/match-ors.cc | 2 +- src/clstepcore/mgrnode.cc | 12 +++--- src/clstepcore/mgrnodearray.cc | 4 +- src/clstepcore/mgrnodelist.cc | 8 ++-- src/clstepcore/multlist.cc | 2 +- src/clstepcore/needFunc.cc | 2 +- src/clstepcore/non-ors.cc | 2 +- src/clstepcore/orlist.cc | 2 +- src/clstepcore/print.cc | 2 +- src/clstepcore/read_func.cc | 10 ++--- src/clstepcore/schRename.cc | 2 +- src/clstepcore/sdai.cc | 2 +- src/clstepcore/sdaiApplication_instance.cc | 12 +++--- src/clstepcore/sdaiSelect.cc | 6 +-- src/clstepcore/selectTypeDescriptor.cc | 2 +- src/clstepcore/superInvAttrIter.h | 4 +- .../test/test_SupertypesIterator.cc | 4 +- src/clstepcore/test/test_null_attr.cc | 6 +-- .../test/test_operators_SDAI_Select.cc | 6 +-- .../test/test_operators_STEPattribute.cc | 4 +- src/clstepcore/trynext.cc | 2 +- src/clstepcore/typeDescriptor.cc | 2 +- src/clstepcore/typeDescriptorList.cc | 2 +- src/clstepcore/typeOrRuleVar.cc | 2 +- src/clstepcore/uniquenessRule.cc | 2 +- src/clstepcore/whereRule.cc | 2 +- src/clutils/Str.cc | 2 +- src/clutils/dirobj.cc | 2 +- src/clutils/errordesc.cc | 4 +- src/clutils/gennode.cc | 4 +- src/clutils/gennodearray.cc | 6 +-- src/clutils/gennodelist.cc | 6 +-- src/clutils/sc_hash.cc | 2 +- src/exp2cxx/classes_wrapper.cc | 14 +++---- src/exp2cxx/multpass.c | 2 +- src/exp2cxx/write.cc | 4 +- src/test/p21read/p21read.cc | 12 +++--- src/test/scl2html/scl2html.cc | 2 +- src/test/tests.h | 8 ++-- .../aggregate_bound_runtime.cc | 12 +++--- test/cpp/schema_specific/attribute.cc | 12 +++--- test/cpp/schema_specific/inverse_attr1.cc | 12 +++--- test/cpp/schema_specific/inverse_attr2.cc | 12 +++--- test/cpp/schema_specific/inverse_attr3.cc | 12 +++--- .../schema_specific/stepfile_rw_progress.cc | 12 +++--- 214 files changed, 462 insertions(+), 462 deletions(-) rename include/{dai => cldai}/CMakeLists.txt (89%) rename include/{dai => cldai}/sdaiApplication_instance_set.h (100%) rename include/{dai => cldai}/sdaiBinary.h (100%) rename include/{dai => cldai}/sdaiDaObject.h (99%) rename include/{dai => cldai}/sdaiEntity_extent.h (100%) rename include/{dai => cldai}/sdaiEntity_extent_set.h (100%) rename include/{dai => cldai}/sdaiEnum.h (100%) rename include/{dai => cldai}/sdaiModel_contents.h (100%) rename include/{dai => cldai}/sdaiModel_contents_list.h (100%) rename include/{dai => cldai}/sdaiObject.h (100%) rename include/{dai => cldai}/sdaiSession_instance.h (94%) rename include/{dai => cldai}/sdaiString.h (100%) rename include/{editor => cleditor}/CMakeLists.txt (85%) rename include/{editor => cleditor}/STEPfile.h (98%) rename include/{editor => cleditor}/SdaiHeaderSchema.h (97%) rename include/{editor => cleditor}/SdaiHeaderSchemaClasses.h (100%) rename include/{editor => cleditor}/SdaiSchemaInit.h (60%) rename include/{editor => cleditor}/cmdmgr.h (94%) rename include/{editor => cleditor}/editordefines.h (100%) rename include/{editor => cleditor}/seeinfodefault.h (94%) rename include/{lazy => cllazyfile}/CMakeLists.txt (89%) rename include/{lazy => cllazyfile}/headerSectionReader.h (90%) rename include/{lazy => cllazyfile}/instMgrHelper.h (94%) rename include/{lazy => cllazyfile}/judy.h (100%) rename include/{lazy => cllazyfile}/judyL2Array.h (100%) rename include/{lazy => cllazyfile}/judyLArray.h (100%) rename include/{lazy => cllazyfile}/judyS2Array.h (100%) rename include/{lazy => cllazyfile}/judySArray.h (100%) rename include/{lazy => cllazyfile}/lazyDataSectionReader.h (92%) rename include/{lazy => cllazyfile}/lazyFileReader.h (90%) rename include/{lazy => cllazyfile}/lazyInstMgr.h (98%) rename include/{lazy => cllazyfile}/lazyP21DataSectionReader.h (89%) rename include/{lazy => cllazyfile}/lazyTypes.h (100%) rename include/{lazy => cllazyfile}/p21HeaderSectionReader.h (93%) rename include/{lazy => cllazyfile}/sectionReader.h (97%) rename include/{core => clstepcore}/CMakeLists.txt (96%) rename include/{core => clstepcore}/ExpDict.h (70%) rename include/{core => clstepcore}/Registry.h (95%) rename include/{core => clstepcore}/STEPaggrBinary.h (97%) rename include/{core => clstepcore}/STEPaggrEntity.h (98%) rename include/{core => clstepcore}/STEPaggrEnum.h (98%) rename include/{core => clstepcore}/STEPaggrGeneric.h (97%) rename include/{core => clstepcore}/STEPaggrInt.h (97%) rename include/{core => clstepcore}/STEPaggrReal.h (97%) rename include/{core => clstepcore}/STEPaggrSelect.h (98%) rename include/{core => clstepcore}/STEPaggrString.h (97%) rename include/{core => clstepcore}/STEPaggregate.h (89%) rename include/{core => clstepcore}/STEPattribute.h (99%) rename include/{core => clstepcore}/STEPattributeList.h (97%) rename include/{core => clstepcore}/STEPcomplex.h (95%) rename include/{core => clstepcore}/STEPinvAttrList.h (98%) rename include/{core => clstepcore}/STEPundefined.h (95%) rename include/{core => clstepcore}/SingleLinkList.h (100%) rename include/{core => clstepcore}/SubSuperIterators.h (99%) rename include/{core => clstepcore}/aggrTypeDescriptor.h (99%) rename include/{core => clstepcore}/attrDescriptor.h (99%) rename include/{core => clstepcore}/attrDescriptorList.h (100%) rename include/{core => clstepcore}/baseType.h (100%) rename include/{core => clstepcore}/complexSupport.h (99%) rename include/{core => clstepcore}/create_Aggr.h (97%) rename include/{core => clstepcore}/derivedAttribute.h (95%) rename include/{core => clstepcore}/dictSchema.h (100%) rename include/{core => clstepcore}/dictdefs.h (100%) rename include/{core => clstepcore}/dictionaryInstance.h (100%) rename include/{core => clstepcore}/dispnode.h (92%) rename include/{core => clstepcore}/dispnodelist.h (92%) rename include/{core => clstepcore}/entityDescriptor.h (98%) rename include/{core => clstepcore}/entityDescriptorList.h (100%) rename include/{core => clstepcore}/enumTypeDescriptor.h (100%) rename include/{core => clstepcore}/explicitItemId.h (100%) rename include/{core => clstepcore}/globalRule.h (97%) rename include/{core => clstepcore}/implicitItemId.h (100%) rename include/{core => clstepcore}/instmgr.h (93%) rename include/{core => clstepcore}/interfaceSpec.h (97%) rename include/{core => clstepcore}/interfacedItem.h (89%) rename include/{core => clstepcore}/inverseAttribute.h (98%) rename include/{core => clstepcore}/inverseAttributeList.h (100%) rename include/{core => clstepcore}/mgrnode.h (97%) rename include/{core => clstepcore}/mgrnodearray.h (95%) rename include/{core => clstepcore}/mgrnodelist.h (94%) rename include/{core => clstepcore}/needFunc.h (100%) rename include/{core => clstepcore}/read_func.h (99%) rename include/{core => clstepcore}/realTypeDescriptor.h (100%) rename include/{core => clstepcore}/schRename.h (98%) rename include/{core => clstepcore}/sdai.h (92%) rename include/{core => clstepcore}/sdaiApplication_instance.h (99%) rename include/{core => clstepcore}/sdaiSelect.h (100%) rename include/{core => clstepcore}/selectTypeDescriptor.h (100%) rename include/{core => clstepcore}/stringTypeDescriptor.h (100%) rename include/{core => clstepcore}/typeDescriptor.h (99%) rename include/{core => clstepcore}/typeDescriptorList.h (100%) rename include/{core => clstepcore}/typeOrRuleVar.h (89%) rename include/{core => clstepcore}/uniquenessRule.h (96%) rename include/{core => clstepcore}/whereRule.h (96%) rename include/{utils => clutils}/CMakeLists.txt (83%) rename include/{utils => clutils}/Str.h (98%) rename include/{utils => clutils}/dirobj.h (100%) rename include/{utils => clutils}/errordesc.h (100%) rename include/{utils => clutils}/gennode.h (100%) rename include/{utils => clutils}/gennodearray.h (98%) rename include/{utils => clutils}/gennodelist.h (100%) rename include/{utils => clutils}/sc_hash.h (100%) diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index c6e9ec18f..5f39f0ba9 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -37,11 +37,11 @@ install(FILES ordered_attrs.h install(FILES ${SC_BINARY_DIR}/${INCLUDE_DIR}/config.h DESTINATION ${INCLUDE_DIR}/stepcode) -add_subdirectory(core) -add_subdirectory(dai) -add_subdirectory(editor) -add_subdirectory(lazy) -add_subdirectory(utils) +add_subdirectory(cldai) +add_subdirectory(cleditor) +add_subdirectory(cllazyfile) +add_subdirectory(clstepcore) +add_subdirectory(clutils) # Local Variables: # tab-width: 8 diff --git a/include/dai/CMakeLists.txt b/include/cldai/CMakeLists.txt similarity index 89% rename from include/dai/CMakeLists.txt rename to include/cldai/CMakeLists.txt index 1a394d32f..471671fbd 100644 --- a/include/dai/CMakeLists.txt +++ b/include/cldai/CMakeLists.txt @@ -13,7 +13,7 @@ set(DAI_HDRS ) install(FILES ${DAI_HDRS} - DESTINATION ${INCLUDE_DIR}/stepcode/dai) + DESTINATION ${INCLUDE_DIR}/stepcode/cldai) # Local Variables: # tab-width: 8 diff --git a/include/dai/sdaiApplication_instance_set.h b/include/cldai/sdaiApplication_instance_set.h similarity index 100% rename from include/dai/sdaiApplication_instance_set.h rename to include/cldai/sdaiApplication_instance_set.h diff --git a/include/dai/sdaiBinary.h b/include/cldai/sdaiBinary.h similarity index 100% rename from include/dai/sdaiBinary.h rename to include/cldai/sdaiBinary.h diff --git a/include/dai/sdaiDaObject.h b/include/cldai/sdaiDaObject.h similarity index 99% rename from include/dai/sdaiDaObject.h rename to include/cldai/sdaiDaObject.h index e615e4244..3bb0c20f4 100644 --- a/include/dai/sdaiDaObject.h +++ b/include/cldai/sdaiDaObject.h @@ -1,9 +1,9 @@ #ifndef SDAIDAOBJECT_H #define SDAIDAOBJECT_H 1 -#include "dai/sdaiObject.h" -#include "dai/sdaiString.h" -#include "dai/sdaiEnum.h" +#include "cldai/sdaiObject.h" +#include "cldai/sdaiString.h" +#include "cldai/sdaiEnum.h" #include diff --git a/include/dai/sdaiEntity_extent.h b/include/cldai/sdaiEntity_extent.h similarity index 100% rename from include/dai/sdaiEntity_extent.h rename to include/cldai/sdaiEntity_extent.h diff --git a/include/dai/sdaiEntity_extent_set.h b/include/cldai/sdaiEntity_extent_set.h similarity index 100% rename from include/dai/sdaiEntity_extent_set.h rename to include/cldai/sdaiEntity_extent_set.h diff --git a/include/dai/sdaiEnum.h b/include/cldai/sdaiEnum.h similarity index 100% rename from include/dai/sdaiEnum.h rename to include/cldai/sdaiEnum.h diff --git a/include/dai/sdaiModel_contents.h b/include/cldai/sdaiModel_contents.h similarity index 100% rename from include/dai/sdaiModel_contents.h rename to include/cldai/sdaiModel_contents.h diff --git a/include/dai/sdaiModel_contents_list.h b/include/cldai/sdaiModel_contents_list.h similarity index 100% rename from include/dai/sdaiModel_contents_list.h rename to include/cldai/sdaiModel_contents_list.h diff --git a/include/dai/sdaiObject.h b/include/cldai/sdaiObject.h similarity index 100% rename from include/dai/sdaiObject.h rename to include/cldai/sdaiObject.h diff --git a/include/dai/sdaiSession_instance.h b/include/cldai/sdaiSession_instance.h similarity index 94% rename from include/dai/sdaiSession_instance.h rename to include/cldai/sdaiSession_instance.h index 4423037cf..7aa9a1502 100644 --- a/include/dai/sdaiSession_instance.h +++ b/include/cldai/sdaiSession_instance.h @@ -3,7 +3,7 @@ #define SESSION_INSTANCE_H 1 #include -//#include "core/sdai.h" +//#include "clstepcore/sdai.h" class SC_DAI_EXPORT SDAI_Session_instance : public SDAI_sdaiObject { diff --git a/include/dai/sdaiString.h b/include/cldai/sdaiString.h similarity index 100% rename from include/dai/sdaiString.h rename to include/cldai/sdaiString.h diff --git a/include/editor/CMakeLists.txt b/include/cleditor/CMakeLists.txt similarity index 85% rename from include/editor/CMakeLists.txt rename to include/cleditor/CMakeLists.txt index bd3421699..1d128c8fa 100644 --- a/include/editor/CMakeLists.txt +++ b/include/cleditor/CMakeLists.txt @@ -9,7 +9,7 @@ set(EDITOR_HDRS ) install(FILES ${EDITOR_HDRS} - DESTINATION ${INCLUDE_DIR}/stepcode/editor) + DESTINATION ${INCLUDE_DIR}/stepcode/cleditor) # Local Variables: # tab-width: 8 diff --git a/include/editor/STEPfile.h b/include/cleditor/STEPfile.h similarity index 98% rename from include/editor/STEPfile.h rename to include/cleditor/STEPfile.h index b85ea4d22..1ecfb67c2 100644 --- a/include/editor/STEPfile.h +++ b/include/cleditor/STEPfile.h @@ -15,14 +15,14 @@ #include #include -#include "core/instmgr.h" -#include "core/Registry.h" +#include "clstepcore/instmgr.h" +#include "clstepcore/Registry.h" #include -#include "utils/dirobj.h" -#include "utils/errordesc.h" +#include "clutils/dirobj.h" +#include "clutils/errordesc.h" #include -#include "core/read_func.h" +#include "clstepcore/read_func.h" //error reporting level #define READ_COMPLETE 10 diff --git a/include/editor/SdaiHeaderSchema.h b/include/cleditor/SdaiHeaderSchema.h similarity index 97% rename from include/editor/SdaiHeaderSchema.h rename to include/cleditor/SdaiHeaderSchema.h index 592e32a8e..5979202f0 100644 --- a/include/editor/SdaiHeaderSchema.h +++ b/include/cleditor/SdaiHeaderSchema.h @@ -5,11 +5,11 @@ // regenerate it. #include -#include "core/sdai.h" -#include "core/Registry.h" -#include "core/STEPaggregate.h" -#include "editor/SdaiHeaderSchemaClasses.h" -#include "editor/SdaiSchemaInit.h" +#include "clstepcore/sdai.h" +#include "clstepcore/Registry.h" +#include "clstepcore/STEPaggregate.h" +#include "cleditor/SdaiHeaderSchemaClasses.h" +#include "cleditor/SdaiSchemaInit.h" ///////// ENTITY section_language diff --git a/include/editor/SdaiHeaderSchemaClasses.h b/include/cleditor/SdaiHeaderSchemaClasses.h similarity index 100% rename from include/editor/SdaiHeaderSchemaClasses.h rename to include/cleditor/SdaiHeaderSchemaClasses.h diff --git a/include/editor/SdaiSchemaInit.h b/include/cleditor/SdaiSchemaInit.h similarity index 60% rename from include/editor/SdaiSchemaInit.h rename to include/cleditor/SdaiSchemaInit.h index de267adb9..862f297bd 100644 --- a/include/editor/SdaiSchemaInit.h +++ b/include/cleditor/SdaiSchemaInit.h @@ -9,16 +9,16 @@ #endif #include -#include "core/sdai.h" -#include "core/Registry.h" -#include "core/STEPaggregate.h" -#include "core/STEPundefined.h" -#include "core/ExpDict.h" -#include "core/STEPattribute.h" -#include "core/complexSupport.h" +#include "clstepcore/sdai.h" +#include "clstepcore/Registry.h" +#include "clstepcore/STEPaggregate.h" +#include "clstepcore/STEPundefined.h" +#include "clstepcore/ExpDict.h" +#include "clstepcore/STEPattribute.h" +#include "clstepcore/complexSupport.h" -#include "editor/SdaiHeaderSchemaClasses.h" -#include "editor/SdaiHeaderSchema.h" +#include "cleditor/SdaiHeaderSchemaClasses.h" +#include "cleditor/SdaiHeaderSchema.h" SC_EDITOR_EXPORT void HeaderSchemaInit( Registry & ); SC_EDITOR_EXPORT void HeaderInitSchemasAndEnts( Registry & ); diff --git a/include/editor/cmdmgr.h b/include/cleditor/cmdmgr.h similarity index 94% rename from include/editor/cmdmgr.h rename to include/cleditor/cmdmgr.h index cac165b78..4f420467b 100644 --- a/include/editor/cmdmgr.h +++ b/include/cleditor/cmdmgr.h @@ -13,16 +13,16 @@ */ #include -#include "utils/gennode.h" -#include "utils/gennodelist.h" -#include "utils/gennodearray.h" - -#include "editor/editordefines.h" -#include "core/mgrnode.h" -#include "core/mgrnodelist.h" -#include "core/dispnode.h" -#include "core/dispnodelist.h" -#include "core/SingleLinkList.h" +#include "clutils/gennode.h" +#include "clutils/gennodelist.h" +#include "clutils/gennodearray.h" + +#include "cleditor/editordefines.h" +#include "clstepcore/mgrnode.h" +#include "clstepcore/mgrnodelist.h" +#include "clstepcore/dispnode.h" +#include "clstepcore/dispnodelist.h" +#include "clstepcore/SingleLinkList.h" //#define NUM_CMDMGR_CMDS 9 // this is the number of columns that contain cmds (as opposed diff --git a/include/editor/editordefines.h b/include/cleditor/editordefines.h similarity index 100% rename from include/editor/editordefines.h rename to include/cleditor/editordefines.h diff --git a/include/editor/seeinfodefault.h b/include/cleditor/seeinfodefault.h similarity index 94% rename from include/editor/seeinfodefault.h rename to include/cleditor/seeinfodefault.h index bf2e765ad..202c5eb1a 100644 --- a/include/editor/seeinfodefault.h +++ b/include/cleditor/seeinfodefault.h @@ -20,10 +20,10 @@ class MgrNode; class DisplayNode; class DisplayNodelist; -#include "core/sdai.h" +#include "clstepcore/sdai.h" //class SDAI_Application_instance; -#include "editor/editordefines.h" +#include "cleditor/editordefines.h" class SC_EDITOR_EXPORT seeInfo : public DisplayNode { public: diff --git a/include/lazy/CMakeLists.txt b/include/cllazyfile/CMakeLists.txt similarity index 89% rename from include/lazy/CMakeLists.txt rename to include/cllazyfile/CMakeLists.txt index c7ed6ad9e..853aa98b9 100644 --- a/include/lazy/CMakeLists.txt +++ b/include/cllazyfile/CMakeLists.txt @@ -16,7 +16,7 @@ set(LAZY_HDRS ) install(FILES ${LAZY_HDRS} - DESTINATION ${INCLUDE_DIR}/stepcode/lazy) + DESTINATION ${INCLUDE_DIR}/stepcode/cllazyfile) # Local Variables: # tab-width: 8 diff --git a/include/lazy/headerSectionReader.h b/include/cllazyfile/headerSectionReader.h similarity index 90% rename from include/lazy/headerSectionReader.h rename to include/cllazyfile/headerSectionReader.h index b4eb807f9..e3a9f5725 100644 --- a/include/lazy/headerSectionReader.h +++ b/include/cllazyfile/headerSectionReader.h @@ -5,9 +5,9 @@ #include #include "judyL2Array.h" -#include "lazy/lazyFileReader.h" -#include "lazy/sectionReader.h" -#include "lazy/lazyTypes.h" +#include "cllazyfile/lazyFileReader.h" +#include "cllazyfile/sectionReader.h" +#include "cllazyfile/lazyTypes.h" #include "sc_export.h" diff --git a/include/lazy/instMgrHelper.h b/include/cllazyfile/instMgrHelper.h similarity index 94% rename from include/lazy/instMgrHelper.h rename to include/cllazyfile/instMgrHelper.h index fc36863ea..1af698160 100644 --- a/include/lazy/instMgrHelper.h +++ b/include/cllazyfile/instMgrHelper.h @@ -3,9 +3,9 @@ #include -#include "core/mgrnode.h" -#include "lazy/lazyInstMgr.h" -#include "core/instmgr.h" +#include "clstepcore/mgrnode.h" +#include "cllazyfile/lazyInstMgr.h" +#include "clstepcore/instmgr.h" /** * \file instMgrHelper.h helper classes for the lazyInstMgr. Allows use of SDAI_Application_instance class diff --git a/include/lazy/judy.h b/include/cllazyfile/judy.h similarity index 100% rename from include/lazy/judy.h rename to include/cllazyfile/judy.h diff --git a/include/lazy/judyL2Array.h b/include/cllazyfile/judyL2Array.h similarity index 100% rename from include/lazy/judyL2Array.h rename to include/cllazyfile/judyL2Array.h diff --git a/include/lazy/judyLArray.h b/include/cllazyfile/judyLArray.h similarity index 100% rename from include/lazy/judyLArray.h rename to include/cllazyfile/judyLArray.h diff --git a/include/lazy/judyS2Array.h b/include/cllazyfile/judyS2Array.h similarity index 100% rename from include/lazy/judyS2Array.h rename to include/cllazyfile/judyS2Array.h diff --git a/include/lazy/judySArray.h b/include/cllazyfile/judySArray.h similarity index 100% rename from include/lazy/judySArray.h rename to include/cllazyfile/judySArray.h diff --git a/include/lazy/lazyDataSectionReader.h b/include/cllazyfile/lazyDataSectionReader.h similarity index 92% rename from include/lazy/lazyDataSectionReader.h rename to include/cllazyfile/lazyDataSectionReader.h index 449345007..6fad4e0b8 100644 --- a/include/lazy/lazyDataSectionReader.h +++ b/include/cllazyfile/lazyDataSectionReader.h @@ -3,8 +3,8 @@ #include #include -#include "lazy/sectionReader.h" -#include "lazy/lazyTypes.h" +#include "cllazyfile/sectionReader.h" +#include "cllazyfile/lazyTypes.h" #include "sc_export.h" diff --git a/include/lazy/lazyFileReader.h b/include/cllazyfile/lazyFileReader.h similarity index 90% rename from include/lazy/lazyFileReader.h rename to include/cllazyfile/lazyFileReader.h index 40c4d9c95..9a5fccb5e 100644 --- a/include/lazy/lazyFileReader.h +++ b/include/cllazyfile/lazyFileReader.h @@ -8,9 +8,9 @@ #include "sc_export.h" // PART 21 -#include "lazy/lazyP21DataSectionReader.h" -#include "lazy/p21HeaderSectionReader.h" -#include "lazy/headerSectionReader.h" +#include "cllazyfile/lazyP21DataSectionReader.h" +#include "cllazyfile/p21HeaderSectionReader.h" +#include "cllazyfile/headerSectionReader.h" /* // PART 28 * #include "lazyP28DataSectionReader.h" diff --git a/include/lazy/lazyInstMgr.h b/include/cllazyfile/lazyInstMgr.h similarity index 98% rename from include/lazy/lazyInstMgr.h rename to include/cllazyfile/lazyInstMgr.h index ff9afc5cb..e3445660a 100644 --- a/include/lazy/lazyInstMgr.h +++ b/include/cllazyfile/lazyInstMgr.h @@ -5,11 +5,11 @@ #include #include -#include "lazy/lazyDataSectionReader.h" -#include "lazy/lazyFileReader.h" -#include "lazy/lazyTypes.h" +#include "cllazyfile/lazyDataSectionReader.h" +#include "cllazyfile/lazyFileReader.h" +#include "cllazyfile/lazyTypes.h" -#include "core/Registry.h" +#include "clstepcore/Registry.h" #include "sc_export.h" #include "judyLArray.h" diff --git a/include/lazy/lazyP21DataSectionReader.h b/include/cllazyfile/lazyP21DataSectionReader.h similarity index 89% rename from include/lazy/lazyP21DataSectionReader.h rename to include/cllazyfile/lazyP21DataSectionReader.h index 81e5f6bde..c14376fc0 100644 --- a/include/lazy/lazyP21DataSectionReader.h +++ b/include/cllazyfile/lazyP21DataSectionReader.h @@ -1,8 +1,8 @@ #ifndef LAZYP21DATASECTIONREADER_H #define LAZYP21DATASECTIONREADER_H -#include "lazy/lazyDataSectionReader.h" -#include "lazy/lazyFileReader.h" +#include "cllazyfile/lazyDataSectionReader.h" +#include "cllazyfile/lazyFileReader.h" #include "sc_export.h" class SC_LAZYFILE_EXPORT lazyP21DataSectionReader: public lazyDataSectionReader { diff --git a/include/lazy/lazyTypes.h b/include/cllazyfile/lazyTypes.h similarity index 100% rename from include/lazy/lazyTypes.h rename to include/cllazyfile/lazyTypes.h diff --git a/include/lazy/p21HeaderSectionReader.h b/include/cllazyfile/p21HeaderSectionReader.h similarity index 93% rename from include/lazy/p21HeaderSectionReader.h rename to include/cllazyfile/p21HeaderSectionReader.h index e89c50288..ab91fb2bd 100644 --- a/include/lazy/p21HeaderSectionReader.h +++ b/include/cllazyfile/p21HeaderSectionReader.h @@ -1,7 +1,7 @@ #ifndef P21HEADERSECTIONREADER_H #define P21HEADERSECTIONREADER_H -#include "lazy/headerSectionReader.h" +#include "cllazyfile/headerSectionReader.h" #include "sc_export.h" class SC_LAZYFILE_EXPORT p21HeaderSectionReader: public headerSectionReader { diff --git a/include/lazy/sectionReader.h b/include/cllazyfile/sectionReader.h similarity index 97% rename from include/lazy/sectionReader.h rename to include/cllazyfile/sectionReader.h index 2afbf500e..74f1fa5bf 100644 --- a/include/lazy/sectionReader.h +++ b/include/cllazyfile/sectionReader.h @@ -3,10 +3,10 @@ #include #include -#include "lazy/lazyTypes.h" +#include "cllazyfile/lazyTypes.h" #include "sc_export.h" -#include "utils/errordesc.h" -#include "core/STEPcomplex.h" +#include "clutils/errordesc.h" +#include "clstepcore/STEPcomplex.h" class SDAI_Application_instance; class lazyFileReader; diff --git a/include/core/CMakeLists.txt b/include/clstepcore/CMakeLists.txt similarity index 96% rename from include/core/CMakeLists.txt rename to include/clstepcore/CMakeLists.txt index f43f93519..a8447cea3 100644 --- a/include/core/CMakeLists.txt +++ b/include/clstepcore/CMakeLists.txt @@ -60,7 +60,7 @@ set(CORE_HDRS ) install(FILES ${CORE_HDRS} - DESTINATION ${INCLUDE_DIR}/stepcode/core) + DESTINATION ${INCLUDE_DIR}/stepcode/clstepcore) # Local Variables: # tab-width: 8 diff --git a/include/core/ExpDict.h b/include/clstepcore/ExpDict.h similarity index 70% rename from include/core/ExpDict.h rename to include/clstepcore/ExpDict.h index 4e7087cfb..c8c71258b 100644 --- a/include/core/ExpDict.h +++ b/include/clstepcore/ExpDict.h @@ -15,20 +15,20 @@ */ #include -#include "core/sdai.h" +#include "clstepcore/sdai.h" #include #include #include -#include "core/SingleLinkList.h" +#include "clstepcore/SingleLinkList.h" -#include "core/baseType.h" -#include "core/dictdefs.h" -#include "utils/Str.h" +#include "clstepcore/baseType.h" +#include "clstepcore/dictdefs.h" +#include "clutils/Str.h" // each of these contains linked list, list node, iterator -#include "core/attrDescriptorList.h" +#include "clstepcore/attrDescriptorList.h" #include "inverseAttributeList.h" #include "typeDescriptorList.h" #include "entityDescriptorList.h" @@ -37,12 +37,12 @@ #include "typeDescriptor.h" #include "entityDescriptor.h" #include "enumTypeDescriptor.h" -#include "core/attrDescriptor.h" -#include "core/derivedAttribute.h" +#include "clstepcore/attrDescriptor.h" +#include "clstepcore/derivedAttribute.h" #include "inverseAttribute.h" -#include "core/create_Aggr.h" -#include "core/dictionaryInstance.h" +#include "clstepcore/create_Aggr.h" +#include "clstepcore/dictionaryInstance.h" #include "uniquenessRule.h" #include "whereRule.h" @@ -53,10 +53,10 @@ #include "interfaceSpec.h" #include "typeOrRuleVar.h" #include "globalRule.h" -#include "core/dictSchema.h" +#include "clstepcore/dictSchema.h" #include "schRename.h" -#include "core/aggrTypeDescriptor.h" +#include "clstepcore/aggrTypeDescriptor.h" #include "selectTypeDescriptor.h" #include "stringTypeDescriptor.h" #include "realTypeDescriptor.h" diff --git a/include/core/Registry.h b/include/clstepcore/Registry.h similarity index 95% rename from include/core/Registry.h rename to include/clstepcore/Registry.h index 2f97f9d7a..099015686 100644 --- a/include/core/Registry.h +++ b/include/clstepcore/Registry.h @@ -13,11 +13,11 @@ */ #include -#include "core/sdai.h" -#include "utils/errordesc.h" -#include "utils/sc_hash.h" -#include "utils/Str.h" -#include "core/complexSupport.h" +#include "clstepcore/sdai.h" +#include "clutils/errordesc.h" +#include "clutils/sc_hash.h" +#include "clutils/Str.h" +#include "clstepcore/complexSupport.h" // defined and created in Registry.cc diff --git a/include/core/STEPaggrBinary.h b/include/clstepcore/STEPaggrBinary.h similarity index 97% rename from include/core/STEPaggrBinary.h rename to include/clstepcore/STEPaggrBinary.h index 0afe1612f..59ea61ab5 100644 --- a/include/core/STEPaggrBinary.h +++ b/include/clstepcore/STEPaggrBinary.h @@ -1,7 +1,7 @@ #ifndef STEPAGGRBINARY_H #define STEPAGGRBINARY_H -#include "core/STEPaggregate.h" +#include "clstepcore/STEPaggregate.h" #include /** \file STEPaggrBinary.h diff --git a/include/core/STEPaggrEntity.h b/include/clstepcore/STEPaggrEntity.h similarity index 98% rename from include/core/STEPaggrEntity.h rename to include/clstepcore/STEPaggrEntity.h index 2f80985bf..8338fc8f8 100644 --- a/include/core/STEPaggrEntity.h +++ b/include/clstepcore/STEPaggrEntity.h @@ -5,7 +5,7 @@ * classes EntityAggregate, EntityNode */ -#include "core/STEPaggregate.h" +#include "clstepcore/STEPaggregate.h" #include class SC_CORE_EXPORT EntityAggregate : public STEPaggregate { diff --git a/include/core/STEPaggrEnum.h b/include/clstepcore/STEPaggrEnum.h similarity index 98% rename from include/core/STEPaggrEnum.h rename to include/clstepcore/STEPaggrEnum.h index fb181ee8e..cf16fb0e6 100644 --- a/include/core/STEPaggrEnum.h +++ b/include/clstepcore/STEPaggrEnum.h @@ -1,7 +1,7 @@ #ifndef STEPAGGRENUM_H #define STEPAGGRENUM_H -#include "core/STEPaggregate.h" +#include "clstepcore/STEPaggregate.h" #include "sc_export.h" /** \file StepaggrEnum.h * classes EnumAggregate, LOGICALS, BOOLEANS, EnumNode diff --git a/include/core/STEPaggrGeneric.h b/include/clstepcore/STEPaggrGeneric.h similarity index 97% rename from include/core/STEPaggrGeneric.h rename to include/clstepcore/STEPaggrGeneric.h index c122d2be9..ecb286d00 100644 --- a/include/core/STEPaggrGeneric.h +++ b/include/clstepcore/STEPaggrGeneric.h @@ -1,7 +1,7 @@ #ifndef STEPAGGRGENERIC_H #define STEPAGGRGENERIC_H -#include "core/STEPaggregate.h" +#include "clstepcore/STEPaggregate.h" #include /** \file STEPaggrGeneric.h diff --git a/include/core/STEPaggrInt.h b/include/clstepcore/STEPaggrInt.h similarity index 97% rename from include/core/STEPaggrInt.h rename to include/clstepcore/STEPaggrInt.h index 95d392f64..11bf57464 100644 --- a/include/core/STEPaggrInt.h +++ b/include/clstepcore/STEPaggrInt.h @@ -1,7 +1,7 @@ #ifndef STEPAGGRINT_H #define STEPAGGRINT_H -#include "core/STEPaggregate.h" +#include "clstepcore/STEPaggregate.h" #include class SC_CORE_EXPORT IntAggregate : public STEPaggregate { diff --git a/include/core/STEPaggrReal.h b/include/clstepcore/STEPaggrReal.h similarity index 97% rename from include/core/STEPaggrReal.h rename to include/clstepcore/STEPaggrReal.h index fb3dad7c4..920c98907 100644 --- a/include/core/STEPaggrReal.h +++ b/include/clstepcore/STEPaggrReal.h @@ -1,7 +1,7 @@ #ifndef STEPAGGRREAL_H #define STEPAGGRREAL_H -#include "core/STEPaggregate.h" +#include "clstepcore/STEPaggregate.h" #include class SC_CORE_EXPORT RealAggregate : public STEPaggregate { diff --git a/include/core/STEPaggrSelect.h b/include/clstepcore/STEPaggrSelect.h similarity index 98% rename from include/core/STEPaggrSelect.h rename to include/clstepcore/STEPaggrSelect.h index 82e39dbf6..dd6621caa 100644 --- a/include/core/STEPaggrSelect.h +++ b/include/clstepcore/STEPaggrSelect.h @@ -1,7 +1,7 @@ #ifndef STEPAGGRSELECT_H #define STEPAGGRSELECT_H -#include "core/STEPaggregate.h" +#include "clstepcore/STEPaggregate.h" #include /** \file STEPaggrSelect.h diff --git a/include/core/STEPaggrString.h b/include/clstepcore/STEPaggrString.h similarity index 97% rename from include/core/STEPaggrString.h rename to include/clstepcore/STEPaggrString.h index 91c148891..93aa1636e 100644 --- a/include/core/STEPaggrString.h +++ b/include/clstepcore/STEPaggrString.h @@ -1,7 +1,7 @@ #ifndef STEPAGGRSTRING_H #define STEPAGGRSTRING_H -#include "core/STEPaggregate.h" +#include "clstepcore/STEPaggregate.h" #include /** \file STEPaggrString.h diff --git a/include/core/STEPaggregate.h b/include/clstepcore/STEPaggregate.h similarity index 89% rename from include/core/STEPaggregate.h rename to include/clstepcore/STEPaggregate.h index 69a78b420..0acb638d6 100644 --- a/include/core/STEPaggregate.h +++ b/include/clstepcore/STEPaggregate.h @@ -17,11 +17,11 @@ class STEPaggregate; class TypeDescriptor; #include -#include "utils/errordesc.h" -#include "core/SingleLinkList.h" -#include "core/baseType.h" -#include "core/sdai.h" -#include "core/STEPundefined.h" +#include "clutils/errordesc.h" +#include "clstepcore/SingleLinkList.h" +#include "clstepcore/baseType.h" +#include "clstepcore/sdai.h" +#include "clstepcore/STEPundefined.h" #include #define AGGR_NULL &NilSTEPaggregate @@ -110,14 +110,14 @@ class SC_CORE_EXPORT STEPnode : public SingleLinkNode { }; typedef STEPnode * STEPnodeH; -#include "core/STEPaggrGeneric.h" -#include "core/STEPaggrEntity.h" -#include "core/STEPaggrSelect.h" -#include "core/STEPaggrString.h" -#include "core/STEPaggrBinary.h" -#include "core/STEPaggrEnum.h" -#include "core/STEPaggrReal.h" -#include "core/STEPaggrInt.h" +#include "clstepcore/STEPaggrGeneric.h" +#include "clstepcore/STEPaggrEntity.h" +#include "clstepcore/STEPaggrSelect.h" +#include "clstepcore/STEPaggrString.h" +#include "clstepcore/STEPaggrBinary.h" +#include "clstepcore/STEPaggrEnum.h" +#include "clstepcore/STEPaggrReal.h" +#include "clstepcore/STEPaggrInt.h" /****************************************************************** ** FIXME The following classes are currently stubs diff --git a/include/core/STEPattribute.h b/include/clstepcore/STEPattribute.h similarity index 99% rename from include/core/STEPattribute.h rename to include/clstepcore/STEPattribute.h index fd361c817..f496fa46c 100644 --- a/include/core/STEPattribute.h +++ b/include/clstepcore/STEPattribute.h @@ -15,10 +15,10 @@ #include #include -#include "utils/errordesc.h" -#include "core/baseType.h" +#include "clutils/errordesc.h" +#include "clstepcore/baseType.h" -#include "core/sdai.h" +#include "clstepcore/sdai.h" /** \def REAL_NUM_PRECISION * this is used to set a const int Real_Num_Precision diff --git a/include/core/STEPattributeList.h b/include/clstepcore/STEPattributeList.h similarity index 97% rename from include/core/STEPattributeList.h rename to include/clstepcore/STEPattributeList.h index 929ef84a2..54aca69b4 100644 --- a/include/core/STEPattributeList.h +++ b/include/clstepcore/STEPattributeList.h @@ -16,7 +16,7 @@ class STEPattribute; #include -#include "core/SingleLinkList.h" +#include "clstepcore/SingleLinkList.h" class STEPattributeList; diff --git a/include/core/STEPcomplex.h b/include/clstepcore/STEPcomplex.h similarity index 95% rename from include/core/STEPcomplex.h rename to include/clstepcore/STEPcomplex.h index 2b8c24d8e..3c8a75fc3 100644 --- a/include/core/STEPcomplex.h +++ b/include/clstepcore/STEPcomplex.h @@ -2,11 +2,11 @@ #define STEPCOMPLEX_H #include -#include "utils/errordesc.h" -#include "core/sdai.h" -#include "core/baseType.h" -#include "core/ExpDict.h" -#include "core/Registry.h" +#include "clutils/errordesc.h" +#include "clstepcore/sdai.h" +#include "clstepcore/baseType.h" +#include "clstepcore/ExpDict.h" +#include "clstepcore/Registry.h" #include diff --git a/include/core/STEPinvAttrList.h b/include/clstepcore/STEPinvAttrList.h similarity index 98% rename from include/core/STEPinvAttrList.h rename to include/clstepcore/STEPinvAttrList.h index 7df262a34..ccbb733b0 100644 --- a/include/core/STEPinvAttrList.h +++ b/include/clstepcore/STEPinvAttrList.h @@ -15,7 +15,7 @@ class Inverse_attribute; #include -#include "core/SingleLinkList.h" +#include "clstepcore/SingleLinkList.h" class STEPinvAttrList; class EntityAggregate; diff --git a/include/core/STEPundefined.h b/include/clstepcore/STEPundefined.h similarity index 95% rename from include/core/STEPundefined.h rename to include/clstepcore/STEPundefined.h index 25e3f99b2..9cbb87ee7 100644 --- a/include/core/STEPundefined.h +++ b/include/clstepcore/STEPundefined.h @@ -13,9 +13,9 @@ */ #include -#include "utils/errordesc.h" +#include "clutils/errordesc.h" #include -#include "core/read_func.h" +#include "clstepcore/read_func.h" class SC_CORE_EXPORT SCLundefined { protected: diff --git a/include/core/SingleLinkList.h b/include/clstepcore/SingleLinkList.h similarity index 100% rename from include/core/SingleLinkList.h rename to include/clstepcore/SingleLinkList.h diff --git a/include/core/SubSuperIterators.h b/include/clstepcore/SubSuperIterators.h similarity index 99% rename from include/core/SubSuperIterators.h rename to include/clstepcore/SubSuperIterators.h index b70c4bde7..ccc059d28 100644 --- a/include/core/SubSuperIterators.h +++ b/include/clstepcore/SubSuperIterators.h @@ -1,8 +1,8 @@ #ifndef SUB_SUPER_ITERATORS #define SUB_SUPER_ITERATORS -#include "core/ExpDict.h" -#include "core/ExpDict.h" +#include "clstepcore/ExpDict.h" +#include "clstepcore/ExpDict.h" #include #include diff --git a/include/core/aggrTypeDescriptor.h b/include/clstepcore/aggrTypeDescriptor.h similarity index 99% rename from include/core/aggrTypeDescriptor.h rename to include/clstepcore/aggrTypeDescriptor.h index 3a08d56eb..0031adf2d 100644 --- a/include/core/aggrTypeDescriptor.h +++ b/include/clstepcore/aggrTypeDescriptor.h @@ -2,7 +2,7 @@ #define AGGRTYPEDESCRIPTOR_H #include "typeDescriptor.h" -#include "core/create_Aggr.h" +#include "clstepcore/create_Aggr.h" #include "assert.h" diff --git a/include/core/attrDescriptor.h b/include/clstepcore/attrDescriptor.h similarity index 99% rename from include/core/attrDescriptor.h rename to include/clstepcore/attrDescriptor.h index ca146d8b8..c3d6493dd 100644 --- a/include/core/attrDescriptor.h +++ b/include/clstepcore/attrDescriptor.h @@ -3,7 +3,7 @@ #include "typeDescriptor.h" -#include "dai/sdaiEnum.h" +#include "cldai/sdaiEnum.h" #include "sc_export.h" diff --git a/include/core/attrDescriptorList.h b/include/clstepcore/attrDescriptorList.h similarity index 100% rename from include/core/attrDescriptorList.h rename to include/clstepcore/attrDescriptorList.h diff --git a/include/core/baseType.h b/include/clstepcore/baseType.h similarity index 100% rename from include/core/baseType.h rename to include/clstepcore/baseType.h diff --git a/include/core/complexSupport.h b/include/clstepcore/complexSupport.h similarity index 99% rename from include/core/complexSupport.h rename to include/clstepcore/complexSupport.h index 83dbf2006..34e78814e 100644 --- a/include/core/complexSupport.h +++ b/include/clstepcore/complexSupport.h @@ -18,7 +18,7 @@ #include #include using namespace std; -#include "utils/Str.h" +#include "clutils/Str.h" #define LISTEND 999 /** \def LISTEND diff --git a/include/core/create_Aggr.h b/include/clstepcore/create_Aggr.h similarity index 97% rename from include/core/create_Aggr.h rename to include/clstepcore/create_Aggr.h index e6b6b39cb..7e5fdb0b3 100644 --- a/include/core/create_Aggr.h +++ b/include/clstepcore/create_Aggr.h @@ -3,7 +3,7 @@ //typedef's for aggregate creators -#include "core/sdai.h" +#include "clstepcore/sdai.h" #include "sc_export.h" diff --git a/include/core/derivedAttribute.h b/include/clstepcore/derivedAttribute.h similarity index 95% rename from include/core/derivedAttribute.h rename to include/clstepcore/derivedAttribute.h index a882b0448..69e0a37cf 100644 --- a/include/core/derivedAttribute.h +++ b/include/clstepcore/derivedAttribute.h @@ -1,7 +1,7 @@ #ifndef DERIVEDATTRIBUTE_H #define DERIVEDATTRIBUTE_H -#include "core/attrDescriptor.h" +#include "clstepcore/attrDescriptor.h" #include "sc_export.h" diff --git a/include/core/dictSchema.h b/include/clstepcore/dictSchema.h similarity index 100% rename from include/core/dictSchema.h rename to include/clstepcore/dictSchema.h diff --git a/include/core/dictdefs.h b/include/clstepcore/dictdefs.h similarity index 100% rename from include/core/dictdefs.h rename to include/clstepcore/dictdefs.h diff --git a/include/core/dictionaryInstance.h b/include/clstepcore/dictionaryInstance.h similarity index 100% rename from include/core/dictionaryInstance.h rename to include/clstepcore/dictionaryInstance.h diff --git a/include/core/dispnode.h b/include/clstepcore/dispnode.h similarity index 92% rename from include/core/dispnode.h rename to include/clstepcore/dispnode.h index b25ff46ca..fccde675c 100644 --- a/include/core/dispnode.h +++ b/include/clstepcore/dispnode.h @@ -17,14 +17,14 @@ #include -/*#include "core/STEPattribute.h"*/ +/*#include "clstepcore/STEPattribute.h"*/ /*#include */ -#include "core/sdai.h" +#include "clstepcore/sdai.h" -#include "utils/gennode.h" -#include "utils/gennodelist.h" +#include "clutils/gennode.h" +#include "clutils/gennodelist.h" //#include -#include "editor/editordefines.h" +#include "cleditor/editordefines.h" //#include class MgrNode; diff --git a/include/core/dispnodelist.h b/include/clstepcore/dispnodelist.h similarity index 92% rename from include/core/dispnodelist.h rename to include/clstepcore/dispnodelist.h index 385dbbf5e..6dfc697bd 100644 --- a/include/core/dispnodelist.h +++ b/include/clstepcore/dispnodelist.h @@ -17,12 +17,12 @@ #include -#include "utils/gennode.h" +#include "clutils/gennode.h" //#include -#include "editor/editordefines.h" -#include "core/mgrnode.h" -#include "core/dispnode.h" -#include "utils/gennodelist.h" +#include "cleditor/editordefines.h" +#include "clstepcore/mgrnode.h" +#include "clstepcore/dispnode.h" +#include "clutils/gennodelist.h" /////////////////////////////////////////////////////////////////////////////// // class DisplayNodeList diff --git a/include/core/entityDescriptor.h b/include/clstepcore/entityDescriptor.h similarity index 98% rename from include/core/entityDescriptor.h rename to include/clstepcore/entityDescriptor.h index 2e85e7a66..a51810c3f 100644 --- a/include/core/entityDescriptor.h +++ b/include/clstepcore/entityDescriptor.h @@ -2,9 +2,9 @@ #define ENTITYDESCRIPTOR_H #include "typeDescriptor.h" -#include "core/attrDescriptor.h" +#include "clstepcore/attrDescriptor.h" #include "uniquenessRule.h" -#include "core/attrDescriptorList.h" +#include "clstepcore/attrDescriptorList.h" #include "inverseAttributeList.h" #include "sc_export.h" diff --git a/include/core/entityDescriptorList.h b/include/clstepcore/entityDescriptorList.h similarity index 100% rename from include/core/entityDescriptorList.h rename to include/clstepcore/entityDescriptorList.h diff --git a/include/core/enumTypeDescriptor.h b/include/clstepcore/enumTypeDescriptor.h similarity index 100% rename from include/core/enumTypeDescriptor.h rename to include/clstepcore/enumTypeDescriptor.h diff --git a/include/core/explicitItemId.h b/include/clstepcore/explicitItemId.h similarity index 100% rename from include/core/explicitItemId.h rename to include/clstepcore/explicitItemId.h diff --git a/include/core/globalRule.h b/include/clstepcore/globalRule.h similarity index 97% rename from include/core/globalRule.h rename to include/clstepcore/globalRule.h index 2fe3ee14f..0987fbfbd 100644 --- a/include/core/globalRule.h +++ b/include/clstepcore/globalRule.h @@ -1,7 +1,7 @@ #ifndef GLOBALRULE_H #define GLOBALRULE_H -#include "core/dictionaryInstance.h" +#include "clstepcore/dictionaryInstance.h" #include "whereRule.h" #include "entityDescriptorList.h" diff --git a/include/core/implicitItemId.h b/include/clstepcore/implicitItemId.h similarity index 100% rename from include/core/implicitItemId.h rename to include/clstepcore/implicitItemId.h diff --git a/include/core/instmgr.h b/include/clstepcore/instmgr.h similarity index 93% rename from include/core/instmgr.h rename to include/clstepcore/instmgr.h index b763b87b7..86ed28603 100644 --- a/include/core/instmgr.h +++ b/include/clstepcore/instmgr.h @@ -27,17 +27,17 @@ // IT IS VERY IMPORTANT THAT THE ORDER OF THE FOLLOWING INCLUDE FILES // BE PRESERVED -#include "utils/gennode.h" -#include "utils/gennodelist.h" -#include "utils/gennodearray.h" +#include "clutils/gennode.h" +#include "clutils/gennodelist.h" +#include "clutils/gennodearray.h" -#include "core/mgrnode.h" -#include "core/mgrnodelist.h" +#include "clstepcore/mgrnode.h" +#include "clstepcore/mgrnodelist.h" -#include "core/dispnode.h" -#include "core/dispnodelist.h" +#include "clstepcore/dispnode.h" +#include "clstepcore/dispnodelist.h" -#include "core/mgrnodearray.h" +#include "clstepcore/mgrnodearray.h" class SC_CORE_EXPORT InstMgrBase { public: diff --git a/include/core/interfaceSpec.h b/include/clstepcore/interfaceSpec.h similarity index 97% rename from include/core/interfaceSpec.h rename to include/clstepcore/interfaceSpec.h index f0b4bde19..9eeea3f85 100644 --- a/include/core/interfaceSpec.h +++ b/include/clstepcore/interfaceSpec.h @@ -1,8 +1,8 @@ #ifndef INTERFACESPEC_H #define INTERFACESPEC_H -#include "core/dictionaryInstance.h" -#include "core/explicitItemId.h" +#include "clstepcore/dictionaryInstance.h" +#include "clstepcore/explicitItemId.h" #include "implicitItemId.h" #include "sc_export.h" diff --git a/include/core/interfacedItem.h b/include/clstepcore/interfacedItem.h similarity index 89% rename from include/core/interfacedItem.h rename to include/clstepcore/interfacedItem.h index 909aa3881..238969836 100644 --- a/include/core/interfacedItem.h +++ b/include/clstepcore/interfacedItem.h @@ -1,9 +1,9 @@ #ifndef INTERFACEDITEM_H #define INTERFACEDITEM_H -#include "core/dictionaryInstance.h" +#include "clstepcore/dictionaryInstance.h" -#include "core/sdai.h" +#include "clstepcore/sdai.h" #include "sc_export.h" diff --git a/include/core/inverseAttribute.h b/include/clstepcore/inverseAttribute.h similarity index 98% rename from include/core/inverseAttribute.h rename to include/clstepcore/inverseAttribute.h index 368eaa67f..4008cdaf8 100644 --- a/include/core/inverseAttribute.h +++ b/include/clstepcore/inverseAttribute.h @@ -1,7 +1,7 @@ #ifndef INVERSEATTRIBUTE_H #define INVERSEATTRIBUTE_H -#include "core/attrDescriptor.h" +#include "clstepcore/attrDescriptor.h" class SC_CORE_EXPORT Inverse_attribute : public AttrDescriptor { diff --git a/include/core/inverseAttributeList.h b/include/clstepcore/inverseAttributeList.h similarity index 100% rename from include/core/inverseAttributeList.h rename to include/clstepcore/inverseAttributeList.h diff --git a/include/core/mgrnode.h b/include/clstepcore/mgrnode.h similarity index 97% rename from include/core/mgrnode.h rename to include/clstepcore/mgrnode.h index 3befa9393..9bc96ef1d 100644 --- a/include/core/mgrnode.h +++ b/include/clstepcore/mgrnode.h @@ -18,12 +18,12 @@ class GenericNode; class DisplayNode; -#include "core/sdai.h" +#include "clstepcore/sdai.h" -#include "utils/gennode.h" -#include "utils/gennodelist.h" +#include "clutils/gennode.h" +#include "clutils/gennodelist.h" -#include "editor/editordefines.h" +#include "cleditor/editordefines.h" class InstMgr; diff --git a/include/core/mgrnodearray.h b/include/clstepcore/mgrnodearray.h similarity index 95% rename from include/core/mgrnodearray.h rename to include/clstepcore/mgrnodearray.h index 02d2191fa..c09f6995f 100644 --- a/include/core/mgrnodearray.h +++ b/include/clstepcore/mgrnodearray.h @@ -19,14 +19,14 @@ #include -#include "utils/gennode.h" -#include "utils/gennodelist.h" +#include "clutils/gennode.h" +#include "clutils/gennodelist.h" //#include -#include "core/mgrnode.h" -#include "core/mgrnodelist.h" +#include "clstepcore/mgrnode.h" +#include "clstepcore/mgrnodelist.h" -#include "utils/gennodearray.h" +#include "clutils/gennodearray.h" #define ARRAY_DEFAULT_SIZE (1024) diff --git a/include/core/mgrnodelist.h b/include/clstepcore/mgrnodelist.h similarity index 94% rename from include/core/mgrnodelist.h rename to include/clstepcore/mgrnodelist.h index 471e40216..e085b66c5 100644 --- a/include/core/mgrnodelist.h +++ b/include/clstepcore/mgrnodelist.h @@ -17,10 +17,10 @@ #include -#include "utils/gennode.h" +#include "clutils/gennode.h" //#include -#include "utils/gennodelist.h" -#include "editor/editordefines.h" +#include "clutils/gennodelist.h" +#include "cleditor/editordefines.h" ////////////////////////////////////////////////////////////////////////////// // class MgrNodeList diff --git a/include/core/needFunc.h b/include/clstepcore/needFunc.h similarity index 100% rename from include/core/needFunc.h rename to include/clstepcore/needFunc.h diff --git a/include/core/read_func.h b/include/clstepcore/read_func.h similarity index 99% rename from include/core/read_func.h rename to include/clstepcore/read_func.h index 66289efbe..448297164 100644 --- a/include/core/read_func.h +++ b/include/clstepcore/read_func.h @@ -2,7 +2,7 @@ #define READ_FUNC_H #include -#include "core/sdai.h" +#include "clstepcore/sdai.h" /// This was 512. According to 10303-21:2002 section 5.6: comment length is unlimited. FIXME need to check the code for potential problems before eliminating this limit completely. #define MAX_COMMENT_LENGTH 8192 diff --git a/include/core/realTypeDescriptor.h b/include/clstepcore/realTypeDescriptor.h similarity index 100% rename from include/core/realTypeDescriptor.h rename to include/clstepcore/realTypeDescriptor.h diff --git a/include/core/schRename.h b/include/clstepcore/schRename.h similarity index 98% rename from include/core/schRename.h rename to include/clstepcore/schRename.h index 042b7fda2..b3f7fdefd 100644 --- a/include/core/schRename.h +++ b/include/clstepcore/schRename.h @@ -4,7 +4,7 @@ #include #include -#include "utils/Str.h" +#include "clutils/Str.h" #include "sc_export.h" diff --git a/include/core/sdai.h b/include/clstepcore/sdai.h similarity index 92% rename from include/core/sdai.h rename to include/clstepcore/sdai.h index 674571bde..f063653ce 100644 --- a/include/core/sdai.h +++ b/include/clstepcore/sdai.h @@ -27,11 +27,11 @@ extern const char * SCLversion; #include -#include "core/dictdefs.h" +#include "clstepcore/dictdefs.h" -#include "core/baseType.h" -#include "utils/Str.h" -#include "utils/errordesc.h" +#include "clstepcore/baseType.h" +#include "clutils/Str.h" +#include "clutils/errordesc.h" typedef std::string Express_id; @@ -40,8 +40,8 @@ class EntityDescriptor; class SelectTypeDescriptor; class InstMgrBase; -#include "core/STEPattributeList.h" -#include "core/STEPinvAttrList.h" +#include "clstepcore/STEPattributeList.h" +#include "clstepcore/STEPinvAttrList.h" class STEPattributeList; class STEPattribute; @@ -155,12 +155,12 @@ typedef char * SDAI_Time_stamp; typedef char * SDAI_Entity_name; typedef char * SDAI_Schema_name; -#include "dai/sdaiString.h" +#include "cldai/sdaiString.h" -#include "dai/sdaiBinary.h" +#include "cldai/sdaiBinary.h" // define Object which I am calling sdaiObject for now - DAS -#include "dai/sdaiObject.h" +#include "cldai/sdaiObject.h" /****************************************************************************** ENUMERATION @@ -172,7 +172,7 @@ ENUMERATION * the value ENUM_NULL is used to represent NULL for all enumerated types *****************************************************************************/ -#include "dai/sdaiEnum.h" +#include "cldai/sdaiEnum.h" /****************************************************************************** BOOLEAN and LOGICAL @@ -185,11 +185,11 @@ BOOLEAN and LOGICAL // ***note*** this file needs classes from sdaiEnum.h // define DAObjectID and classes PID, PID_DA, PID_SDAI, DAObject, DAObject_SDAI -#include "dai/sdaiDaObject.h" +#include "cldai/sdaiDaObject.h" -#include "core/sdaiApplication_instance.h" -#include "dai/sdaiApplication_instance_set.h" +#include "clstepcore/sdaiApplication_instance.h" +#include "cldai/sdaiApplication_instance_set.h" /****************************************************************************** SELECT @@ -198,18 +198,18 @@ SELECT sdaiSelect.h ******************************************************************************/ -#include "core/sdaiSelect.h" +#include "clstepcore/sdaiSelect.h" class SDAI_Model_contents; typedef SDAI_Model_contents * SDAI_Model_contents_ptr; typedef SDAI_Model_contents_ptr SDAI_Model_contents_var; -#include "dai/sdaiModel_contents_list.h" +#include "cldai/sdaiModel_contents_list.h" -#include "dai/sdaiSession_instance.h" -#include "dai/sdaiEntity_extent.h" -#include "dai/sdaiEntity_extent_set.h" -#include "dai/sdaiModel_contents.h" +#include "cldai/sdaiSession_instance.h" +#include "cldai/sdaiEntity_extent.h" +#include "cldai/sdaiEntity_extent_set.h" +#include "cldai/sdaiModel_contents.h" // ENTITY extern SC_CORE_EXPORT SDAI_Application_instance NilSTEPentity; diff --git a/include/core/sdaiApplication_instance.h b/include/clstepcore/sdaiApplication_instance.h similarity index 99% rename from include/core/sdaiApplication_instance.h rename to include/clstepcore/sdaiApplication_instance.h index 9fbca1e72..4e764f593 100644 --- a/include/core/sdaiApplication_instance.h +++ b/include/clstepcore/sdaiApplication_instance.h @@ -16,7 +16,7 @@ #include #include -#include "dai/sdaiDaObject.h" +#include "cldai/sdaiDaObject.h" class EntityAggregate; class Inverse_attribute; diff --git a/include/core/sdaiSelect.h b/include/clstepcore/sdaiSelect.h similarity index 100% rename from include/core/sdaiSelect.h rename to include/clstepcore/sdaiSelect.h diff --git a/include/core/selectTypeDescriptor.h b/include/clstepcore/selectTypeDescriptor.h similarity index 100% rename from include/core/selectTypeDescriptor.h rename to include/clstepcore/selectTypeDescriptor.h diff --git a/include/core/stringTypeDescriptor.h b/include/clstepcore/stringTypeDescriptor.h similarity index 100% rename from include/core/stringTypeDescriptor.h rename to include/clstepcore/stringTypeDescriptor.h diff --git a/include/core/typeDescriptor.h b/include/clstepcore/typeDescriptor.h similarity index 99% rename from include/core/typeDescriptor.h rename to include/clstepcore/typeDescriptor.h index a3e64a33b..51a815593 100644 --- a/include/core/typeDescriptor.h +++ b/include/clstepcore/typeDescriptor.h @@ -3,7 +3,7 @@ #include "schRename.h" #include "whereRule.h" -#include "core/dictSchema.h" +#include "clstepcore/dictSchema.h" #include "sc_export.h" diff --git a/include/core/typeDescriptorList.h b/include/clstepcore/typeDescriptorList.h similarity index 100% rename from include/core/typeDescriptorList.h rename to include/clstepcore/typeDescriptorList.h diff --git a/include/core/typeOrRuleVar.h b/include/clstepcore/typeOrRuleVar.h similarity index 89% rename from include/core/typeOrRuleVar.h rename to include/clstepcore/typeOrRuleVar.h index 9fa58be34..c698c5bd5 100644 --- a/include/core/typeOrRuleVar.h +++ b/include/clstepcore/typeOrRuleVar.h @@ -1,7 +1,7 @@ #ifndef TYPEORRULEVAR_H #define TYPEORRULEVAR_H -#include "core/dictionaryInstance.h" +#include "clstepcore/dictionaryInstance.h" #include "sc_export.h" diff --git a/include/core/uniquenessRule.h b/include/clstepcore/uniquenessRule.h similarity index 96% rename from include/core/uniquenessRule.h rename to include/clstepcore/uniquenessRule.h index 93c13a75d..b42a7414d 100644 --- a/include/core/uniquenessRule.h +++ b/include/clstepcore/uniquenessRule.h @@ -1,9 +1,9 @@ #ifndef UNIQUENESSRULE_H #define UNIQUENESSRULE_H -#include "core/dictionaryInstance.h" +#include "clstepcore/dictionaryInstance.h" -#include "core/sdai.h" +#include "clstepcore/sdai.h" #include "sc_export.h" diff --git a/include/core/whereRule.h b/include/clstepcore/whereRule.h similarity index 96% rename from include/core/whereRule.h rename to include/clstepcore/whereRule.h index 3a88f71c9..98952d049 100644 --- a/include/core/whereRule.h +++ b/include/clstepcore/whereRule.h @@ -2,8 +2,8 @@ #define WHERERULE_H #include -#include "core/sdai.h" -#include "core/dictionaryInstance.h" +#include "clstepcore/sdai.h" +#include "clstepcore/dictionaryInstance.h" #include "typeOrRuleVar.h" #include "sc_export.h" diff --git a/include/utils/CMakeLists.txt b/include/clutils/CMakeLists.txt similarity index 83% rename from include/utils/CMakeLists.txt rename to include/clutils/CMakeLists.txt index 127b971e2..9992890bc 100644 --- a/include/utils/CMakeLists.txt +++ b/include/clutils/CMakeLists.txt @@ -9,7 +9,7 @@ set(UTILS_HDRS ) install(FILES ${UTILS_HDRS} - DESTINATION ${INCLUDE_DIR}/stepcode/utils) + DESTINATION ${INCLUDE_DIR}/stepcode/clutils) # Local Variables: # tab-width: 8 diff --git a/include/utils/Str.h b/include/clutils/Str.h similarity index 98% rename from include/utils/Str.h rename to include/clutils/Str.h index 80ea6ab1d..487a2c9e2 100644 --- a/include/utils/Str.h +++ b/include/clutils/Str.h @@ -19,7 +19,7 @@ #include #include #include -#include "utils/errordesc.h" +#include "clutils/errordesc.h" #ifndef STRING_DELIM #define STRING_DELIM '\'' diff --git a/include/utils/dirobj.h b/include/clutils/dirobj.h similarity index 100% rename from include/utils/dirobj.h rename to include/clutils/dirobj.h diff --git a/include/utils/errordesc.h b/include/clutils/errordesc.h similarity index 100% rename from include/utils/errordesc.h rename to include/clutils/errordesc.h diff --git a/include/utils/gennode.h b/include/clutils/gennode.h similarity index 100% rename from include/utils/gennode.h rename to include/clutils/gennode.h diff --git a/include/utils/gennodearray.h b/include/clutils/gennodearray.h similarity index 98% rename from include/utils/gennodearray.h rename to include/clutils/gennodearray.h index f19dc21be..1643f05e6 100644 --- a/include/utils/gennodearray.h +++ b/include/clutils/gennodearray.h @@ -26,7 +26,7 @@ #include #include // to get bcopy for CenterLine -#include "utils/gennode.h" +#include "clutils/gennode.h" // the initial size of the array #define ARRAY_DEFAULT_SIZE (1024) diff --git a/include/utils/gennodelist.h b/include/clutils/gennodelist.h similarity index 100% rename from include/utils/gennodelist.h rename to include/clutils/gennodelist.h diff --git a/include/utils/sc_hash.h b/include/clutils/sc_hash.h similarity index 100% rename from include/utils/sc_hash.h rename to include/clutils/sc_hash.h diff --git a/src/cldai/sdaiApplication_instance_set.cc b/src/cldai/sdaiApplication_instance_set.cc index d1961fce3..f1733d40d 100644 --- a/src/cldai/sdaiApplication_instance_set.cc +++ b/src/cldai/sdaiApplication_instance_set.cc @@ -24,13 +24,13 @@ * UArray implementation. */ -//#include "dai/sdaiApplication_instance_set.h" -#include "core/sdai.h" +//#include "cldai/sdaiApplication_instance_set.h" +#include "clstepcore/sdai.h" #include #include -#include "core/sdaiApplication_instance.h" +#include "clstepcore/sdaiApplication_instance.h" // to help ObjectCenter #ifndef HAVE_MEMMOVE diff --git a/src/cldai/sdaiBinary.cc b/src/cldai/sdaiBinary.cc index 7ccf00689..e9c384f74 100644 --- a/src/cldai/sdaiBinary.cc +++ b/src/cldai/sdaiBinary.cc @@ -10,7 +10,7 @@ */ #include -#include "core/sdai.h" +#include "clstepcore/sdai.h" SDAI_Binary::SDAI_Binary( const char * str, int max ) { content = std::string( str, max ); diff --git a/src/cldai/sdaiDaObject.cc b/src/cldai/sdaiDaObject.cc index 801b21b8f..52f06fc16 100644 --- a/src/cldai/sdaiDaObject.cc +++ b/src/cldai/sdaiDaObject.cc @@ -2,7 +2,7 @@ #include #include -#include "core/sdai.h" +#include "clstepcore/sdai.h" // to help ObjectCenter #ifndef HAVE_MEMMOVE diff --git a/src/cldai/sdaiEntity_extent.cc b/src/cldai/sdaiEntity_extent.cc index d28fca2bb..7c27ea6e4 100644 --- a/src/cldai/sdaiEntity_extent.cc +++ b/src/cldai/sdaiEntity_extent.cc @@ -2,7 +2,7 @@ //#include -#include "core/sdai.h" +#include "clstepcore/sdai.h" SDAI_Entity_extent::SDAI_Entity_extent( ) : _definition( 0 ), _definition_name( 0 ), _owned_by( 0 ) { diff --git a/src/cldai/sdaiEntity_extent_set.cc b/src/cldai/sdaiEntity_extent_set.cc index ca464eb2b..4080e336b 100644 --- a/src/cldai/sdaiEntity_extent_set.cc +++ b/src/cldai/sdaiEntity_extent_set.cc @@ -26,7 +26,7 @@ #include #include -#include "core/sdai.h" +#include "clstepcore/sdai.h" /* #include diff --git a/src/cldai/sdaiEnum.cc b/src/cldai/sdaiEnum.cc index 65ce8828f..8228855b5 100644 --- a/src/cldai/sdaiEnum.cc +++ b/src/cldai/sdaiEnum.cc @@ -1,5 +1,5 @@ -#include "core/sdai.h" +#include "clstepcore/sdai.h" /* * NIST STEP Core Class Library diff --git a/src/cldai/sdaiModel_contents.cc b/src/cldai/sdaiModel_contents.cc index b7043a454..3cb0828a0 100644 --- a/src/cldai/sdaiModel_contents.cc +++ b/src/cldai/sdaiModel_contents.cc @@ -1,5 +1,5 @@ -#include "core/sdai.h" +#include "clstepcore/sdai.h" ///////// SDAI_Model_contents_instances diff --git a/src/cldai/sdaiModel_contents_list.cc b/src/cldai/sdaiModel_contents_list.cc index a74aadb41..62197b190 100644 --- a/src/cldai/sdaiModel_contents_list.cc +++ b/src/cldai/sdaiModel_contents_list.cc @@ -23,7 +23,7 @@ /* * UArray implementation. */ -#include "core/sdai.h" +#include "clstepcore/sdai.h" // to help ObjectCenter #ifndef HAVE_MEMMOVE diff --git a/src/cldai/sdaiObject.cc b/src/cldai/sdaiObject.cc index f0a1ac592..fd930881c 100644 --- a/src/cldai/sdaiObject.cc +++ b/src/cldai/sdaiObject.cc @@ -1,4 +1,4 @@ -#include "core/sdai.h" +#include "clstepcore/sdai.h" SDAI_sdaiObject::SDAI_sdaiObject() { } diff --git a/src/cldai/sdaiSession_instance.cc b/src/cldai/sdaiSession_instance.cc index 5c8a901d2..291c0c21b 100644 --- a/src/cldai/sdaiSession_instance.cc +++ b/src/cldai/sdaiSession_instance.cc @@ -1,4 +1,4 @@ -#include "core/sdai.h" +#include "clstepcore/sdai.h" SDAI_Session_instance::SDAI_Session_instance() { } diff --git a/src/cldai/sdaiString.cc b/src/cldai/sdaiString.cc index e5818d190..06f94d9e6 100644 --- a/src/cldai/sdaiString.cc +++ b/src/cldai/sdaiString.cc @@ -9,7 +9,7 @@ * and is not subject to copyright. */ -#include "core/sdai.h" +#include "clstepcore/sdai.h" #include SDAI_String::SDAI_String( const char * str, size_t max ) { diff --git a/src/cleditor/STEPfile.cc b/src/cleditor/STEPfile.cc index 2d4999bcc..a05ef9a7f 100644 --- a/src/cleditor/STEPfile.cc +++ b/src/cleditor/STEPfile.cc @@ -24,15 +24,15 @@ #include #include -#include "editor/STEPfile.h" -#include "core/sdai.h" -#include "core/STEPcomplex.h" -#include "core/STEPattribute.h" -#include "editor/SdaiHeaderSchema.h" +#include "cleditor/STEPfile.h" +#include "clstepcore/sdai.h" +#include "clstepcore/STEPcomplex.h" +#include "clstepcore/STEPattribute.h" +#include "cleditor/SdaiHeaderSchema.h" // STEPundefined contains // void PushPastString (istream& in, std::string &s, ErrorDescriptor *err) -#include "core/STEPundefined.h" +#include "clstepcore/STEPundefined.h" /** * \returns The new file name for the class. diff --git a/src/cleditor/STEPfile.inline.cc b/src/cleditor/STEPfile.inline.cc index 404c6780b..86af07564 100644 --- a/src/cleditor/STEPfile.inline.cc +++ b/src/cleditor/STEPfile.inline.cc @@ -11,9 +11,9 @@ * and is not subject to copyright. */ -#include "editor/STEPfile.h" -#include "editor/SdaiHeaderSchema.h" -#include "core/STEPaggregate.h" +#include "cleditor/STEPfile.h" +#include "cleditor/SdaiHeaderSchema.h" +#include "clstepcore/STEPaggregate.h" #include #include diff --git a/src/cleditor/SdaiHeaderSchema.cc b/src/cleditor/SdaiHeaderSchema.cc index bf23f340e..73212bc48 100644 --- a/src/cleditor/SdaiHeaderSchema.cc +++ b/src/cleditor/SdaiHeaderSchema.cc @@ -10,9 +10,9 @@ extern ofstream * logStream; #define SCLLOGFILE "scl.log" #endif -#include "core/ExpDict.h" -#include "core/STEPattribute.h" -#include "editor/SdaiHeaderSchema.h" +#include "clstepcore/ExpDict.h" +#include "clstepcore/STEPattribute.h" +#include "cleditor/SdaiHeaderSchema.h" Schema * s_header_section_schema = 0; diff --git a/src/cleditor/SdaiHeaderSchemaAll.cc b/src/cleditor/SdaiHeaderSchemaAll.cc index 76fc8d996..cf88eb3aa 100644 --- a/src/cleditor/SdaiHeaderSchemaAll.cc +++ b/src/cleditor/SdaiHeaderSchemaAll.cc @@ -4,7 +4,7 @@ // it since your modifications will be lost if exp2cxx is used to // regenerate it. -#include "editor/SdaiHeaderSchema.h" +#include "cleditor/SdaiHeaderSchema.h" void HeaderInitSchemasAndEnts( Registry & reg ) { Uniqueness_rule_ptr ur; diff --git a/src/cleditor/SdaiHeaderSchemaInit.cc b/src/cleditor/SdaiHeaderSchemaInit.cc index 94e0d50eb..32b1655d1 100644 --- a/src/cleditor/SdaiHeaderSchemaInit.cc +++ b/src/cleditor/SdaiHeaderSchemaInit.cc @@ -4,10 +4,10 @@ // it since your modifications will be lost if exp2cxx is used to // regenerate it. -#include "core/Registry.h" -#include "core/ExpDict.h" -#include "core/STEPattribute.h" -#include "editor/SdaiHeaderSchema.h" +#include "clstepcore/Registry.h" +#include "clstepcore/ExpDict.h" +#include "clstepcore/STEPattribute.h" +#include "cleditor/SdaiHeaderSchema.h" void SdaiHEADER_SECTION_SCHEMAInit( Registry & reg ) { header_section_schemat_time_stamp_text->ReferentType( t_sdaiSTRING ); diff --git a/src/cleditor/SdaiSchemaInit.cc b/src/cleditor/SdaiSchemaInit.cc index d7a54bdd0..82323987a 100644 --- a/src/cleditor/SdaiSchemaInit.cc +++ b/src/cleditor/SdaiSchemaInit.cc @@ -4,7 +4,7 @@ // it since your modifications will be lost if exp2cxx is used to // regenerate it. -#include "editor/SdaiSchemaInit.h" +#include "cleditor/SdaiSchemaInit.h" void HeaderSchemaInit( Registry & reg ) { HeaderInitSchemasAndEnts( reg ); diff --git a/src/cleditor/cmdmgr.cc b/src/cleditor/cmdmgr.cc index 6646ee0a8..4b78d4f90 100644 --- a/src/cleditor/cmdmgr.cc +++ b/src/cleditor/cmdmgr.cc @@ -10,7 +10,7 @@ * and is not subject to copyright. */ -#include "editor/cmdmgr.h" +#include "cleditor/cmdmgr.h" ReplicateLinkNode * ReplicateList::FindNode( MgrNode * mn ) { ReplicateLinkNode * rln = ( ReplicateLinkNode * )GetHead(); diff --git a/src/cllazyfile/judy.c b/src/cllazyfile/judy.c index 2bdba01ea..f3bba2b7e 100644 --- a/src/cllazyfile/judy.c +++ b/src/cllazyfile/judy.c @@ -60,7 +60,7 @@ # endif #endif -#include "lazy/judy.h" +#include "cllazyfile/judy.h" #include #include diff --git a/src/cllazyfile/lazyDataSectionReader.cc b/src/cllazyfile/lazyDataSectionReader.cc index cede12733..6de006fe4 100644 --- a/src/cllazyfile/lazyDataSectionReader.cc +++ b/src/cllazyfile/lazyDataSectionReader.cc @@ -1,6 +1,6 @@ -#include "lazy/lazyDataSectionReader.h" -#include "lazy/lazyFileReader.h" -#include "lazy/lazyInstMgr.h" +#include "cllazyfile/lazyDataSectionReader.h" +#include "cllazyfile/lazyFileReader.h" +#include "cllazyfile/lazyInstMgr.h" #include lazyDataSectionReader::lazyDataSectionReader( lazyFileReader * parent, std::ifstream & file, diff --git a/src/cllazyfile/lazyFileReader.cc b/src/cllazyfile/lazyFileReader.cc index 090e3337f..fed35c6f5 100644 --- a/src/cllazyfile/lazyFileReader.cc +++ b/src/cllazyfile/lazyFileReader.cc @@ -1,10 +1,10 @@ #include -#include "lazy/lazyFileReader.h" -#include "lazy/lazyDataSectionReader.h" -#include "lazy/headerSectionReader.h" -#include "lazy/lazyInstMgr.h" +#include "cllazyfile/lazyFileReader.h" +#include "cllazyfile/lazyDataSectionReader.h" +#include "cllazyfile/headerSectionReader.h" +#include "cllazyfile/lazyInstMgr.h" void lazyFileReader::initP21() { _header = new p21HeaderSectionReader( this, _file, 0, -1 ); diff --git a/src/cllazyfile/lazyInstMgr.cc b/src/cllazyfile/lazyInstMgr.cc index f7aec713f..65f3e7558 100644 --- a/src/cllazyfile/lazyInstMgr.cc +++ b/src/cllazyfile/lazyInstMgr.cc @@ -1,12 +1,12 @@ -#include "lazy/lazyTypes.h" -#include "lazy/lazyInstMgr.h" -#include "core/Registry.h" -#include "core/SubSuperIterators.h" -#include "editor/SdaiSchemaInit.h" -#include "lazy/instMgrHelper.h" +#include "cllazyfile/lazyTypes.h" +#include "cllazyfile/lazyInstMgr.h" +#include "clstepcore/Registry.h" +#include "clstepcore/SubSuperIterators.h" +#include "cleditor/SdaiSchemaInit.h" +#include "cllazyfile/instMgrHelper.h" #include "lazyRefs.h" -#include "core/sdaiApplication_instance.h" +#include "clstepcore/sdaiApplication_instance.h" lazyInstMgr::lazyInstMgr() { _headerRegistry = new Registry( HeaderSchemaInit ); diff --git a/src/cllazyfile/lazyP21DataSectionReader.cc b/src/cllazyfile/lazyP21DataSectionReader.cc index 0a726cde8..0716f5c5f 100644 --- a/src/cllazyfile/lazyP21DataSectionReader.cc +++ b/src/cllazyfile/lazyP21DataSectionReader.cc @@ -1,7 +1,7 @@ #include #include -#include "lazy/lazyP21DataSectionReader.h" -#include "lazy/lazyInstMgr.h" +#include "cllazyfile/lazyP21DataSectionReader.h" +#include "cllazyfile/lazyInstMgr.h" lazyP21DataSectionReader::lazyP21DataSectionReader( lazyFileReader * parent, std::ifstream & file, std::streampos start, sectionID sid ): diff --git a/src/cllazyfile/lazyRefs.h b/src/cllazyfile/lazyRefs.h index b13a4b4e2..b8daff295 100644 --- a/src/cllazyfile/lazyRefs.h +++ b/src/cllazyfile/lazyRefs.h @@ -7,12 +7,12 @@ #include #include "sc_export.h" -#include "lazy/lazyTypes.h" -#include "lazy/lazyInstMgr.h" -#include "core/ExpDict.h" -#include "core/SubSuperIterators.h" -#include "core/STEPattribute.h" -#include "core/STEPaggregate.h" +#include "cllazyfile/lazyTypes.h" +#include "cllazyfile/lazyInstMgr.h" +#include "clstepcore/ExpDict.h" +#include "clstepcore/SubSuperIterators.h" +#include "clstepcore/STEPattribute.h" +#include "clstepcore/STEPaggregate.h" #ifdef _WIN32 #define strcasecmp _strcmpi diff --git a/src/cllazyfile/lazy_test.cc b/src/cllazyfile/lazy_test.cc index 47af530da..d5ce6081a 100644 --- a/src/cllazyfile/lazy_test.cc +++ b/src/cllazyfile/lazy_test.cc @@ -1,6 +1,6 @@ -#include "lazy/lazyInstMgr.h" +#include "cllazyfile/lazyInstMgr.h" #include "./sc_benchmark.h" -#include "editor/SdaiSchemaInit.h" +#include "cleditor/SdaiSchemaInit.h" #include "config.h" #ifndef NO_REGISTRY diff --git a/src/cllazyfile/p21HeaderSectionReader.cc b/src/cllazyfile/p21HeaderSectionReader.cc index 126d2295f..037604fc4 100644 --- a/src/cllazyfile/p21HeaderSectionReader.cc +++ b/src/cllazyfile/p21HeaderSectionReader.cc @@ -1,11 +1,11 @@ #include #include -#include "lazy/p21HeaderSectionReader.h" -#include "lazy/headerSectionReader.h" -#include "lazy/sectionReader.h" -#include "lazy/lazyInstMgr.h" -#include "lazy/judyL2Array.h" +#include "cllazyfile/p21HeaderSectionReader.h" +#include "cllazyfile/headerSectionReader.h" +#include "cllazyfile/sectionReader.h" +#include "cllazyfile/lazyInstMgr.h" +#include "cllazyfile/judyL2Array.h" void p21HeaderSectionReader::findSectionStart() { diff --git a/src/cllazyfile/sectionReader.cc b/src/cllazyfile/sectionReader.cc index 1d1a81253..bfa8a2a12 100644 --- a/src/cllazyfile/sectionReader.cc +++ b/src/cllazyfile/sectionReader.cc @@ -12,16 +12,16 @@ # define ULLONG_MAX _UI64_MAX #endif -#include "core/Registry.h" -#include "core/sdaiApplication_instance.h" -#include "core/read_func.h" -#include "editor/SdaiSchemaInit.h" -#include "core/STEPcomplex.h" +#include "clstepcore/Registry.h" +#include "clstepcore/sdaiApplication_instance.h" +#include "clstepcore/read_func.h" +#include "cleditor/SdaiSchemaInit.h" +#include "clstepcore/STEPcomplex.h" -#include "lazy/sectionReader.h" -#include "lazy/lazyFileReader.h" -#include "lazy/lazyInstMgr.h" -#include "lazy/lazyTypes.h" +#include "cllazyfile/sectionReader.h" +#include "cllazyfile/lazyFileReader.h" +#include "cllazyfile/lazyInstMgr.h" +#include "cllazyfile/lazyTypes.h" #include "current_function.hpp" diff --git a/src/clstepcore/Registry.cc b/src/clstepcore/Registry.cc index 5d9f5d917..9eeb975e0 100644 --- a/src/clstepcore/Registry.cc +++ b/src/clstepcore/Registry.cc @@ -9,8 +9,8 @@ * and is not subject to copyright. */ -#include "core/ExpDict.h" -#include "core/Registry.h" +#include "clstepcore/ExpDict.h" +#include "clstepcore/Registry.h" /* these may be shared between multiple Registry instances, so don't create/destroy in Registry ctor/dtor * Name, FundamentalType, Originating Schema, Description */ diff --git a/src/clstepcore/STEPaggrBinary.cc b/src/clstepcore/STEPaggrBinary.cc index 90172139f..f1170926c 100644 --- a/src/clstepcore/STEPaggrBinary.cc +++ b/src/clstepcore/STEPaggrBinary.cc @@ -1,4 +1,4 @@ -#include "core/STEPaggrBinary.h" +#include "clstepcore/STEPaggrBinary.h" #include /** \file STEPaggrBinary.cc diff --git a/src/clstepcore/STEPaggrEntity.cc b/src/clstepcore/STEPaggrEntity.cc index 5f677ee1e..02bfa3fb2 100644 --- a/src/clstepcore/STEPaggrEntity.cc +++ b/src/clstepcore/STEPaggrEntity.cc @@ -1,6 +1,6 @@ -#include "core/STEPaggrEntity.h" -#include "core/STEPattribute.h" -#include "core/typeDescriptor.h" +#include "clstepcore/STEPaggrEntity.h" +#include "clstepcore/STEPattribute.h" +#include "clstepcore/typeDescriptor.h" #include /** \file STEPaggrEntity.cc diff --git a/src/clstepcore/STEPaggrEnum.cc b/src/clstepcore/STEPaggrEnum.cc index d0b1e944b..01ac21e4a 100644 --- a/src/clstepcore/STEPaggrEnum.cc +++ b/src/clstepcore/STEPaggrEnum.cc @@ -1,4 +1,4 @@ -#include "core/STEPaggrEnum.h" +#include "clstepcore/STEPaggrEnum.h" #include /** \file StepaggrEnum.cc diff --git a/src/clstepcore/STEPaggrGeneric.cc b/src/clstepcore/STEPaggrGeneric.cc index 8ddcf413f..5db812b27 100644 --- a/src/clstepcore/STEPaggrGeneric.cc +++ b/src/clstepcore/STEPaggrGeneric.cc @@ -1,4 +1,4 @@ -#include "core/STEPaggrGeneric.h" +#include "clstepcore/STEPaggrGeneric.h" #include /** \file STEPaggrGeneric.cc diff --git a/src/clstepcore/STEPaggrInt.cc b/src/clstepcore/STEPaggrInt.cc index 4d6740623..936ab36d8 100644 --- a/src/clstepcore/STEPaggrInt.cc +++ b/src/clstepcore/STEPaggrInt.cc @@ -1,4 +1,4 @@ -#include "core/STEPaggrInt.h" +#include "clstepcore/STEPaggrInt.h" IntAggregate::IntAggregate() { diff --git a/src/clstepcore/STEPaggrReal.cc b/src/clstepcore/STEPaggrReal.cc index 92920e202..96ae53406 100644 --- a/src/clstepcore/STEPaggrReal.cc +++ b/src/clstepcore/STEPaggrReal.cc @@ -1,4 +1,4 @@ -#include "core/STEPaggrReal.h" +#include "clstepcore/STEPaggrReal.h" /** \file STEPaggrReal.cc * implementation of classes RealAggregate and RealNode diff --git a/src/clstepcore/STEPaggrSelect.cc b/src/clstepcore/STEPaggrSelect.cc index c70f91c70..73fe97176 100644 --- a/src/clstepcore/STEPaggrSelect.cc +++ b/src/clstepcore/STEPaggrSelect.cc @@ -1,5 +1,5 @@ -#include "core/STEPaggrSelect.h" -#include "core/typeDescriptor.h" +#include "clstepcore/STEPaggrSelect.h" +#include "clstepcore/typeDescriptor.h" #include /** \file STEPaggrSelect.cc diff --git a/src/clstepcore/STEPaggrString.cc b/src/clstepcore/STEPaggrString.cc index 7f2a99579..1aaf752e1 100644 --- a/src/clstepcore/STEPaggrString.cc +++ b/src/clstepcore/STEPaggrString.cc @@ -1,4 +1,4 @@ -#include "core/STEPaggrString.h" +#include "clstepcore/STEPaggrString.h" #include /** \file STEPaggrString.cc diff --git a/src/clstepcore/STEPaggregate.cc b/src/clstepcore/STEPaggregate.cc index e71723251..4336aa6f6 100644 --- a/src/clstepcore/STEPaggregate.cc +++ b/src/clstepcore/STEPaggregate.cc @@ -12,11 +12,11 @@ #include -#include "core/read_func.h" -#include "core/STEPaggregate.h" -#include "core/STEPattribute.h" -#include "core/instmgr.h" -#include "core/ExpDict.h" +#include "clstepcore/read_func.h" +#include "clstepcore/STEPaggregate.h" +#include "clstepcore/STEPattribute.h" +#include "clstepcore/instmgr.h" +#include "clstepcore/ExpDict.h" /** diff --git a/src/clstepcore/STEPattribute.cc b/src/clstepcore/STEPattribute.cc index 93a7dcd26..ff07d55b7 100644 --- a/src/clstepcore/STEPattribute.cc +++ b/src/clstepcore/STEPattribute.cc @@ -12,13 +12,13 @@ #include #include -#include "core/read_func.h" -#include "core/STEPattribute.h" -#include "core/instmgr.h" -#include "core/STEPundefined.h" -#include "core/STEPaggregate.h" -#include "core/ExpDict.h" -#include "core/sdai.h" +#include "clstepcore/read_func.h" +#include "clstepcore/STEPattribute.h" +#include "clstepcore/instmgr.h" +#include "clstepcore/STEPundefined.h" +#include "clstepcore/STEPaggregate.h" +#include "clstepcore/ExpDict.h" +#include "clstepcore/sdai.h" // REAL_NUM_PRECISION is defined in STEPattribute.h, and is also used // in aggregate real handling (STEPaggregate.cc) -- IMS 6 Jun 95 diff --git a/src/clstepcore/STEPattributeList.cc b/src/clstepcore/STEPattributeList.cc index 10a0b80b6..2993dd275 100644 --- a/src/clstepcore/STEPattributeList.cc +++ b/src/clstepcore/STEPattributeList.cc @@ -10,8 +10,8 @@ * and is not subject to copyright. */ -#include "core/STEPattributeList.h" -#include "core/STEPattribute.h" +#include "clstepcore/STEPattributeList.h" +#include "clstepcore/STEPattribute.h" AttrListNode::AttrListNode( STEPattribute * a ) { attr = a; diff --git a/src/clstepcore/STEPcomplex.cc b/src/clstepcore/STEPcomplex.cc index f49b1ea4e..9451d6df6 100644 --- a/src/clstepcore/STEPcomplex.cc +++ b/src/clstepcore/STEPcomplex.cc @@ -1,10 +1,10 @@ #include -#include "core/STEPcomplex.h" -#include "core/complexSupport.h" -#include "core/STEPattribute.h" -#include "core/STEPaggregate.h" +#include "clstepcore/STEPcomplex.h" +#include "clstepcore/complexSupport.h" +#include "clstepcore/STEPattribute.h" +#include "clstepcore/STEPaggregate.h" #include extern const char * diff --git a/src/clstepcore/STEPinvAttrList.cc b/src/clstepcore/STEPinvAttrList.cc index 502af4567..3eaa9d352 100644 --- a/src/clstepcore/STEPinvAttrList.cc +++ b/src/clstepcore/STEPinvAttrList.cc @@ -3,8 +3,8 @@ * derived from STEPattributeList.cc */ -#include "core/STEPinvAttrList.h" -#include "core/ExpDict.h" +#include "clstepcore/STEPinvAttrList.h" +#include "clstepcore/ExpDict.h" invAttrListNodeI::invAttrListNodeI(Inverse_attribute* a, setterI_t s, getterI_t g): invAttrListNode(a), set( s ), get( g ) {} invAttrListNodeA::invAttrListNodeA(Inverse_attribute* a, setterA_t s, getterA_t g): invAttrListNode(a), set( s ), get( g ) {} diff --git a/src/clstepcore/STEPundefined.cc b/src/clstepcore/STEPundefined.cc index c74fc7a8c..19c63f37d 100644 --- a/src/clstepcore/STEPundefined.cc +++ b/src/clstepcore/STEPundefined.cc @@ -11,8 +11,8 @@ */ #include // to get the BUFSIZ #define -#include "core/STEPattribute.h" -#include "core/STEPundefined.h" +#include "clstepcore/STEPattribute.h" +#include "clstepcore/STEPundefined.h" /** \class SCLundefined ** helper functions for reading unknown types diff --git a/src/clstepcore/SingleLinkList.cc b/src/clstepcore/SingleLinkList.cc index 9a4f750dc..19a1f82e7 100644 --- a/src/clstepcore/SingleLinkList.cc +++ b/src/clstepcore/SingleLinkList.cc @@ -10,7 +10,7 @@ * and is not subject to copyright. */ -#include "core/SingleLinkList.h" +#include "clstepcore/SingleLinkList.h" #include diff --git a/src/clstepcore/aggrTypeDescriptor.cc b/src/clstepcore/aggrTypeDescriptor.cc index e1e87a78c..b61b08f72 100644 --- a/src/clstepcore/aggrTypeDescriptor.cc +++ b/src/clstepcore/aggrTypeDescriptor.cc @@ -1,4 +1,4 @@ -#include "core/aggrTypeDescriptor.h" +#include "clstepcore/aggrTypeDescriptor.h" STEPaggregate * AggrTypeDescriptor::CreateAggregate() { if( CreateNewAggr ) { diff --git a/src/clstepcore/attrDescriptor.cc b/src/clstepcore/attrDescriptor.cc index 2ce5e74e1..a6a71b65a 100644 --- a/src/clstepcore/attrDescriptor.cc +++ b/src/clstepcore/attrDescriptor.cc @@ -1,4 +1,4 @@ -#include "core/attrDescriptor.h" +#include "clstepcore/attrDescriptor.h" AttrDescriptor::AttrDescriptor( const char * name, const TypeDescriptor * domainType, Logical optional, Logical unique, AttrType_Enum at, diff --git a/src/clstepcore/attrDescriptorList.cc b/src/clstepcore/attrDescriptorList.cc index 987f34243..903180c5b 100644 --- a/src/clstepcore/attrDescriptorList.cc +++ b/src/clstepcore/attrDescriptorList.cc @@ -1,6 +1,6 @@ -#include "core/attrDescriptorList.h" +#include "clstepcore/attrDescriptorList.h" -#include "core/attrDescriptor.h" +#include "clstepcore/attrDescriptor.h" AttrDescriptorList::AttrDescriptorList() { } diff --git a/src/clstepcore/collect.cc b/src/clstepcore/collect.cc index 255036c6a..7a952f556 100644 --- a/src/clstepcore/collect.cc +++ b/src/clstepcore/collect.cc @@ -11,7 +11,7 @@ * Date: 11/14/96 * *****************************************************************************/ -#include "core/complexSupport.h" +#include "clstepcore/complexSupport.h" /** * Inserts a new ComplexList to our list. The ComplexLists are ordered by diff --git a/src/clstepcore/complexlist.cc b/src/clstepcore/complexlist.cc index 6d2df417b..3dcdff482 100644 --- a/src/clstepcore/complexlist.cc +++ b/src/clstepcore/complexlist.cc @@ -10,7 +10,7 @@ * Date: 01/07/97 * *****************************************************************************/ -#include "core/complexSupport.h" +#include "clstepcore/complexSupport.h" /** * Destructor for ComplexList. diff --git a/src/clstepcore/create_Aggr.cc b/src/clstepcore/create_Aggr.cc index 0fe195bb7..e71cfbc86 100644 --- a/src/clstepcore/create_Aggr.cc +++ b/src/clstepcore/create_Aggr.cc @@ -1,5 +1,5 @@ -#include "core/create_Aggr.h" -#include "core/STEPaggregate.h" +#include "clstepcore/create_Aggr.h" +#include "clstepcore/STEPaggregate.h" EnumAggregate * create_EnumAggregate() { return new EnumAggregate; diff --git a/src/clstepcore/derivedAttribute.cc b/src/clstepcore/derivedAttribute.cc index d361ca1be..8d21b0884 100644 --- a/src/clstepcore/derivedAttribute.cc +++ b/src/clstepcore/derivedAttribute.cc @@ -1,4 +1,4 @@ -#include "core/derivedAttribute.h" +#include "clstepcore/derivedAttribute.h" Derived_attribute::Derived_attribute( const char * name, const TypeDescriptor * domainType, Logical optional, Logical unique, AttrType_Enum at, const EntityDescriptor & owner ) diff --git a/src/clstepcore/dictSchema.cc b/src/clstepcore/dictSchema.cc index 301d2c42d..aa87b4586 100644 --- a/src/clstepcore/dictSchema.cc +++ b/src/clstepcore/dictSchema.cc @@ -1,7 +1,7 @@ -#include "core/dictSchema.h" +#include "clstepcore/dictSchema.h" -#include "core/typeDescriptor.h" -#include "core/entityDescriptor.h" +#include "clstepcore/typeDescriptor.h" +#include "clstepcore/entityDescriptor.h" Schema::Schema( const char * schemaName ) : _use_interface_list( new Interface_spec__set ), diff --git a/src/clstepcore/dispnode.cc b/src/clstepcore/dispnode.cc index 8b01541ad..15f249d37 100644 --- a/src/clstepcore/dispnode.cc +++ b/src/clstepcore/dispnode.cc @@ -12,12 +12,12 @@ /* $Id: dispnode.cc,v 3.0.1.2 1997/11/05 22:11:39 sauderd DP3.1 $ */ -#include "utils/gennode.h" -#include "utils/gennodelist.h" +#include "clutils/gennode.h" +#include "clutils/gennodelist.h" //#include -#include "core/dispnode.h" -#include "core/dispnodelist.h" +#include "clstepcore/dispnode.h" +#include "clstepcore/dispnodelist.h" // define this to be the name of the display object class StepEntityEditor; diff --git a/src/clstepcore/dispnodelist.cc b/src/clstepcore/dispnodelist.cc index f00ca79df..7fbd788c3 100644 --- a/src/clstepcore/dispnodelist.cc +++ b/src/clstepcore/dispnodelist.cc @@ -12,13 +12,13 @@ /* $Id: dispnodelist.cc,v 3.0.1.2 1997/11/05 22:11:40 sauderd DP3.1 $ */ -#include "utils/gennode.h" -#include "utils/gennodelist.h" +#include "clutils/gennode.h" +#include "clutils/gennodelist.h" -#include "core/mgrnode.h" -#include "core/mgrnodelist.h" -#include "core/dispnode.h" -#include "core/dispnodelist.h" +#include "clstepcore/mgrnode.h" +#include "clstepcore/mgrnodelist.h" +#include "clstepcore/dispnode.h" +#include "clstepcore/dispnodelist.h" void DisplayNodeList::Remove( GenericNode * node ) { GenNodeList::Remove( node ); diff --git a/src/clstepcore/entityDescriptor.cc b/src/clstepcore/entityDescriptor.cc index 4b4ceaf98..764d77066 100644 --- a/src/clstepcore/entityDescriptor.cc +++ b/src/clstepcore/entityDescriptor.cc @@ -1,10 +1,10 @@ #include -#include "core/entityDescriptor.h" -#include "core/Registry.h" -#include "core/attrDescriptor.h" -#include "core/inverseAttribute.h" -#include "core/SubSuperIterators.h" +#include "clstepcore/entityDescriptor.h" +#include "clstepcore/Registry.h" +#include "clstepcore/attrDescriptor.h" +#include "clstepcore/inverseAttribute.h" +#include "clstepcore/SubSuperIterators.h" EntityDescriptor::EntityDescriptor( ) : _abstractEntity( LUnknown ), _extMapping( LUnknown ), diff --git a/src/clstepcore/entityDescriptorList.cc b/src/clstepcore/entityDescriptorList.cc index bef52120a..e23baeabb 100644 --- a/src/clstepcore/entityDescriptorList.cc +++ b/src/clstepcore/entityDescriptorList.cc @@ -1,4 +1,4 @@ -#include "core/entityDescriptorList.h" +#include "clstepcore/entityDescriptorList.h" EntityDescLinkNode::EntityDescLinkNode() { _entityDesc = 0; diff --git a/src/clstepcore/entlist.cc b/src/clstepcore/entlist.cc index 086f3bd76..e7c0d7c89 100644 --- a/src/clstepcore/entlist.cc +++ b/src/clstepcore/entlist.cc @@ -13,7 +13,7 @@ * Date: 9/18/96 * *****************************************************************************/ -#include "core/complexSupport.h" +#include "clstepcore/complexSupport.h" /** * Returns the number of EntLists in this's list (EntList->next, next->next diff --git a/src/clstepcore/entnode.cc b/src/clstepcore/entnode.cc index 0d594c993..bc2141360 100644 --- a/src/clstepcore/entnode.cc +++ b/src/clstepcore/entnode.cc @@ -11,7 +11,7 @@ * Date: 9/18/96 * *****************************************************************************/ -#include "core/complexSupport.h" +#include "clstepcore/complexSupport.h" /** * Given a list of entity names, creates a sorted linked list of EntNodes diff --git a/src/clstepcore/enumTypeDescriptor.cc b/src/clstepcore/enumTypeDescriptor.cc index 653a1cc0d..61c4eef0f 100644 --- a/src/clstepcore/enumTypeDescriptor.cc +++ b/src/clstepcore/enumTypeDescriptor.cc @@ -1,4 +1,4 @@ -#include "core/enumTypeDescriptor.h" +#include "clstepcore/enumTypeDescriptor.h" /* * why have EnumTypeDescriptor + EnumerationTypeDescriptor ??? diff --git a/src/clstepcore/explicitItemId.cc b/src/clstepcore/explicitItemId.cc index 8436befd5..b7177c189 100644 --- a/src/clstepcore/explicitItemId.cc +++ b/src/clstepcore/explicitItemId.cc @@ -1,4 +1,4 @@ -#include "core/explicitItemId.h" +#include "clstepcore/explicitItemId.h" Explicit_item_id::Explicit_item_id() { _local_definition = 0; diff --git a/src/clstepcore/globalRule.cc b/src/clstepcore/globalRule.cc index 06629f2c1..227562faa 100644 --- a/src/clstepcore/globalRule.cc +++ b/src/clstepcore/globalRule.cc @@ -1,4 +1,4 @@ -#include "core/globalRule.h" +#include "clstepcore/globalRule.h" Global_rule::Global_rule() : _entities( 0 ), _where_rules( 0 ), _parent_schema( 0 ) { diff --git a/src/clstepcore/implicitItemId.cc b/src/clstepcore/implicitItemId.cc index dd43fc1f1..963844314 100644 --- a/src/clstepcore/implicitItemId.cc +++ b/src/clstepcore/implicitItemId.cc @@ -1,4 +1,4 @@ -#include "core/implicitItemId.h" +#include "clstepcore/implicitItemId.h" Implicit_item_id::Implicit_item_id() { _local_definition = 0; diff --git a/src/clstepcore/instmgr.cc b/src/clstepcore/instmgr.cc index f0ef13892..6b6cc6a7e 100644 --- a/src/clstepcore/instmgr.cc +++ b/src/clstepcore/instmgr.cc @@ -16,8 +16,8 @@ // ////////////////////////////////////////////////////////////////////////////// -#include "core/sdai.h" -#include "core/instmgr.h" +#include "clstepcore/sdai.h" +#include "clstepcore/instmgr.h" /////////////////////////////////////////////////////////////////////////////// // debug_level >= 2 => tells when a command is chosen diff --git a/src/clstepcore/interfaceSpec.cc b/src/clstepcore/interfaceSpec.cc index c8698789e..b0ed39bc5 100644 --- a/src/clstepcore/interfaceSpec.cc +++ b/src/clstepcore/interfaceSpec.cc @@ -1,4 +1,4 @@ -#include "core/interfaceSpec.h" +#include "clstepcore/interfaceSpec.h" Interface_spec__set::Interface_spec__set( int defaultSize ) { _bufsize = defaultSize; diff --git a/src/clstepcore/interfacedItem.cc b/src/clstepcore/interfacedItem.cc index aadfce68d..9ddb5b5a5 100644 --- a/src/clstepcore/interfacedItem.cc +++ b/src/clstepcore/interfacedItem.cc @@ -1,4 +1,4 @@ -#include "core/interfacedItem.h" +#include "clstepcore/interfacedItem.h" Interfaced_item::Interfaced_item() { } diff --git a/src/clstepcore/inverseAttribute.cc b/src/clstepcore/inverseAttribute.cc index be7f7cfa3..512c71c34 100644 --- a/src/clstepcore/inverseAttribute.cc +++ b/src/clstepcore/inverseAttribute.cc @@ -1,4 +1,4 @@ -#include "core/inverseAttribute.h" +#include "clstepcore/inverseAttribute.h" #include const char * Inverse_attribute::AttrExprDefStr( std::string & s ) const { diff --git a/src/clstepcore/inverseAttributeList.cc b/src/clstepcore/inverseAttributeList.cc index e1767e3b3..2dd7d46b0 100644 --- a/src/clstepcore/inverseAttributeList.cc +++ b/src/clstepcore/inverseAttributeList.cc @@ -1,5 +1,5 @@ -#include "core/inverseAttributeList.h" -#include "core/inverseAttribute.h" +#include "clstepcore/inverseAttributeList.h" +#include "clstepcore/inverseAttribute.h" Inverse_attributeLinkNode::Inverse_attributeLinkNode() { _invAttr = 0; diff --git a/src/clstepcore/match-ors.cc b/src/clstepcore/match-ors.cc index 2a97254ab..72427ca6b 100644 --- a/src/clstepcore/match-ors.cc +++ b/src/clstepcore/match-ors.cc @@ -13,7 +13,7 @@ * Date: 10/17/96 * *****************************************************************************/ -#include "core/complexSupport.h" +#include "clstepcore/complexSupport.h" /** * Loops through descendants of this, invoking their matchOR functions. diff --git a/src/clstepcore/mgrnode.cc b/src/clstepcore/mgrnode.cc index f6ceafcaf..a7d13b538 100644 --- a/src/clstepcore/mgrnode.cc +++ b/src/clstepcore/mgrnode.cc @@ -12,14 +12,14 @@ /* $Id: mgrnode.cc,v 3.0.1.3 1997/11/05 22:11:37 sauderd DP3.1 $ */ -#include "core/mgrnode.h" -#include "core/mgrnodelist.h" -#include "core/dispnode.h" -#include "core/dispnodelist.h" +#include "clstepcore/mgrnode.h" +#include "clstepcore/mgrnodelist.h" +#include "clstepcore/dispnode.h" +#include "clstepcore/dispnodelist.h" -#include "core/instmgr.h" +#include "clstepcore/instmgr.h" //#include -#include "core/sdai.h" +#include "clstepcore/sdai.h" #include diff --git a/src/clstepcore/mgrnodearray.cc b/src/clstepcore/mgrnodearray.cc index 0467f73a1..d777b596f 100644 --- a/src/clstepcore/mgrnodearray.cc +++ b/src/clstepcore/mgrnodearray.cc @@ -32,9 +32,9 @@ static int PrintFunctionTrace = 2; // values within functions get printed out //static int PrintValues = 3; -#include "core/mgrnodearray.h" +#include "clstepcore/mgrnodearray.h" //#include -#include "core/sdai.h" +#include "clstepcore/sdai.h" #include // to get bcopy() - ANSI diff --git a/src/clstepcore/mgrnodelist.cc b/src/clstepcore/mgrnodelist.cc index e477e366c..77ee20100 100644 --- a/src/clstepcore/mgrnodelist.cc +++ b/src/clstepcore/mgrnodelist.cc @@ -12,10 +12,10 @@ /* $Id: mgrnodelist.cc,v 3.0.1.2 1997/11/05 22:11:39 sauderd DP3.1 $ */ -#include "core/mgrnode.h" -#include "core/mgrnodelist.h" -#include "core/dispnode.h" -#include "core/dispnodelist.h" +#include "clstepcore/mgrnode.h" +#include "clstepcore/mgrnodelist.h" +#include "clstepcore/dispnode.h" +#include "clstepcore/dispnodelist.h" MgrNodeList::MgrNodeList( stateEnum type ) : GenNodeList( new MgrNode() ) { // if(debug_level >= PrintFunctionTrace) diff --git a/src/clstepcore/multlist.cc b/src/clstepcore/multlist.cc index 9e30e5ab1..b36488377 100644 --- a/src/clstepcore/multlist.cc +++ b/src/clstepcore/multlist.cc @@ -13,7 +13,7 @@ * Date: 9/18/96 * *****************************************************************************/ -#include "core/complexSupport.h" +#include "clstepcore/complexSupport.h" /** * Deletes the childList of this, before this is deleted. diff --git a/src/clstepcore/needFunc.cc b/src/clstepcore/needFunc.cc index 731230d60..e72215fed 100644 --- a/src/clstepcore/needFunc.cc +++ b/src/clstepcore/needFunc.cc @@ -1,4 +1,4 @@ -#include "core/needFunc.h" +#include "clstepcore/needFunc.h" /////////////////////////////////////////////////////////////////////////////// // Function defined as a stub (necessary to use the scl) diff --git a/src/clstepcore/non-ors.cc b/src/clstepcore/non-ors.cc index 78c3c5fe6..14b6a4f6c 100644 --- a/src/clstepcore/non-ors.cc +++ b/src/clstepcore/non-ors.cc @@ -10,7 +10,7 @@ * Date: 10/17/96 * *****************************************************************************/ -#include "core/complexSupport.h" +#include "clstepcore/complexSupport.h" /** * Checks if we match the nodes of ents. If only one unmarked is left diff --git a/src/clstepcore/orlist.cc b/src/clstepcore/orlist.cc index 6e58242eb..f5fa185b0 100644 --- a/src/clstepcore/orlist.cc +++ b/src/clstepcore/orlist.cc @@ -10,7 +10,7 @@ * Date: 9/18/96 * *****************************************************************************/ -#include "core/complexSupport.h" +#include "clstepcore/complexSupport.h" /** * Check if we matched nm. We have two possibilities here: If we have a diff --git a/src/clstepcore/print.cc b/src/clstepcore/print.cc index b30643b06..63759b9fc 100644 --- a/src/clstepcore/print.cc +++ b/src/clstepcore/print.cc @@ -7,7 +7,7 @@ * Date: 10/31/96 * *****************************************************************************/ -#include "core/complexSupport.h" +#include "clstepcore/complexSupport.h" // Local function prototypes: static char * joinText( JoinType, char * ); diff --git a/src/clstepcore/read_func.cc b/src/clstepcore/read_func.cc index 85fb28a29..9f31db401 100644 --- a/src/clstepcore/read_func.cc +++ b/src/clstepcore/read_func.cc @@ -1,10 +1,10 @@ -#include "utils/errordesc.h" +#include "clutils/errordesc.h" #include -#include "core/sdai.h" -#include "core/read_func.h" -#include "core/STEPattribute.h" -#include "utils/Str.h" +#include "clstepcore/sdai.h" +#include "clstepcore/read_func.h" +#include "clstepcore/STEPattribute.h" +#include "clutils/Str.h" const int RealNumPrecision = REAL_NUM_PRECISION; diff --git a/src/clstepcore/schRename.cc b/src/clstepcore/schRename.cc index b0f96c4c0..6e5e12686 100644 --- a/src/clstepcore/schRename.cc +++ b/src/clstepcore/schRename.cc @@ -1,4 +1,4 @@ -#include "core/schRename.h" +#include "clstepcore/schRename.h" /** diff --git a/src/clstepcore/sdai.cc b/src/clstepcore/sdai.cc index 00ea0f932..ec96a63b3 100644 --- a/src/clstepcore/sdai.cc +++ b/src/clstepcore/sdai.cc @@ -1,7 +1,7 @@ #include #include -#include "core/sdai.h" +#include "clstepcore/sdai.h" const char * SCLversion = "STEPcode, github.com/stepcode/stepcode"; diff --git a/src/clstepcore/sdaiApplication_instance.cc b/src/clstepcore/sdaiApplication_instance.cc index 1b39b12c4..c44a2c5ea 100644 --- a/src/clstepcore/sdaiApplication_instance.cc +++ b/src/clstepcore/sdaiApplication_instance.cc @@ -11,13 +11,13 @@ */ #include -#include "core/sdai.h" -#include "core/instmgr.h" -#include "core/STEPcomplex.h" -#include "core/STEPattribute.h" -#include "core/read_func.h" //for ReadTokenSeparator, used when comments are inside entities +#include "clstepcore/sdai.h" +#include "clstepcore/instmgr.h" +#include "clstepcore/STEPcomplex.h" +#include "clstepcore/STEPattribute.h" +#include "clstepcore/read_func.h" //for ReadTokenSeparator, used when comments are inside entities -#include "core/sdaiApplication_instance.h" +#include "clstepcore/sdaiApplication_instance.h" #include "superInvAttrIter.h" SDAI_Application_instance NilSTEPentity; diff --git a/src/clstepcore/sdaiSelect.cc b/src/clstepcore/sdaiSelect.cc index 5c3168281..95e6d83bc 100644 --- a/src/clstepcore/sdaiSelect.cc +++ b/src/clstepcore/sdaiSelect.cc @@ -11,11 +11,11 @@ */ #include // to get the BUFSIZ #define -#include "core/ExpDict.h" +#include "clstepcore/ExpDict.h" #include #include -#include "core/sdai.h" -#include "core/STEPattribute.h" +#include "clstepcore/sdai.h" +#include "clstepcore/STEPattribute.h" #ifdef SC_LOGGING #include diff --git a/src/clstepcore/selectTypeDescriptor.cc b/src/clstepcore/selectTypeDescriptor.cc index c3737b85b..e143a3a30 100644 --- a/src/clstepcore/selectTypeDescriptor.cc +++ b/src/clstepcore/selectTypeDescriptor.cc @@ -1,4 +1,4 @@ -#include "core/selectTypeDescriptor.h" +#include "clstepcore/selectTypeDescriptor.h" /////////////////////////////////////////////////////////////////////////////// // SelectTypeDescriptor functions diff --git a/src/clstepcore/superInvAttrIter.h b/src/clstepcore/superInvAttrIter.h index 0f7853bc1..6228b67be 100644 --- a/src/clstepcore/superInvAttrIter.h +++ b/src/clstepcore/superInvAttrIter.h @@ -1,8 +1,8 @@ #ifndef SUPERINVATTRITER_H #define SUPERINVATTRITER_H -#include "core/SubSuperIterators.h" -#include "core/ExpDict.h" +#include "clstepcore/SubSuperIterators.h" +#include "clstepcore/ExpDict.h" /** * this class implements an iterator for inverse attributes in an EntityDescriptor's supertypes diff --git a/src/clstepcore/test/test_SupertypesIterator.cc b/src/clstepcore/test/test_SupertypesIterator.cc index 52f6ca795..084189bf0 100644 --- a/src/clstepcore/test/test_SupertypesIterator.cc +++ b/src/clstepcore/test/test_SupertypesIterator.cc @@ -4,8 +4,8 @@ //subtypesiterator shouldn't need tested separately from supertypesiterator since there is very little difference -#include "core/SubSuperIterators.h" -#include "core/ExpDict.h" +#include "clstepcore/SubSuperIterators.h" +#include "clstepcore/ExpDict.h" #include int main( int /*argc*/, char ** /*argv*/ ) { diff --git a/src/clstepcore/test/test_null_attr.cc b/src/clstepcore/test/test_null_attr.cc index c25025614..95c7dcd02 100644 --- a/src/clstepcore/test/test_null_attr.cc +++ b/src/clstepcore/test/test_null_attr.cc @@ -1,6 +1,6 @@ -#include "core/ExpDict.h" -#include "core/STEPattribute.h" -#include "dai/sdaiString.h" +#include "clstepcore/ExpDict.h" +#include "clstepcore/STEPattribute.h" +#include "cldai/sdaiString.h" AttrDescriptor *ad = 0; EntityDescriptor *ed = 0; diff --git a/src/clstepcore/test/test_operators_SDAI_Select.cc b/src/clstepcore/test/test_operators_SDAI_Select.cc index a0e920c38..b82d20ddc 100644 --- a/src/clstepcore/test/test_operators_SDAI_Select.cc +++ b/src/clstepcore/test/test_operators_SDAI_Select.cc @@ -6,9 +6,9 @@ #include -#include "core/ExpDict.h" -#include "core/baseType.h" -#include "core/sdaiSelect.h" +#include "clstepcore/ExpDict.h" +#include "clstepcore/baseType.h" +#include "clstepcore/sdaiSelect.h" using namespace std; diff --git a/src/clstepcore/test/test_operators_STEPattribute.cc b/src/clstepcore/test/test_operators_STEPattribute.cc index b5266cde3..a64d274de 100644 --- a/src/clstepcore/test/test_operators_STEPattribute.cc +++ b/src/clstepcore/test/test_operators_STEPattribute.cc @@ -1,7 +1,7 @@ ///test constructors, destructor, shallow copy, assignment operators for STEPattribute -#include "core/STEPattribute.h" -#include "core/ExpDict.h" +#include "clstepcore/STEPattribute.h" +#include "clstepcore/ExpDict.h" #include diff --git a/src/clstepcore/trynext.cc b/src/clstepcore/trynext.cc index 4b9571a20..dd2941edd 100644 --- a/src/clstepcore/trynext.cc +++ b/src/clstepcore/trynext.cc @@ -11,7 +11,7 @@ * Date: 10/24/96 * *****************************************************************************/ -#include "core/complexSupport.h" +#include "clstepcore/complexSupport.h" // Local function prototypes: static EntList * firstCandidate( EntList * ); diff --git a/src/clstepcore/typeDescriptor.cc b/src/clstepcore/typeDescriptor.cc index c1394c8f6..1d654f609 100644 --- a/src/clstepcore/typeDescriptor.cc +++ b/src/clstepcore/typeDescriptor.cc @@ -1,4 +1,4 @@ -#include "core/typeDescriptor.h" +#include "clstepcore/typeDescriptor.h" TypeDescriptor::TypeDescriptor( ) : _name( 0 ), altNames( 0 ), _fundamentalType( UNKNOWN_TYPE ), diff --git a/src/clstepcore/typeDescriptorList.cc b/src/clstepcore/typeDescriptorList.cc index 2a5444378..bbc91de9e 100644 --- a/src/clstepcore/typeDescriptorList.cc +++ b/src/clstepcore/typeDescriptorList.cc @@ -1,4 +1,4 @@ -#include "core/typeDescriptorList.h" +#include "clstepcore/typeDescriptorList.h" TypeDescLinkNode::TypeDescLinkNode() { _typeDesc = 0; diff --git a/src/clstepcore/typeOrRuleVar.cc b/src/clstepcore/typeOrRuleVar.cc index dec362a28..c9b823cbf 100644 --- a/src/clstepcore/typeOrRuleVar.cc +++ b/src/clstepcore/typeOrRuleVar.cc @@ -1,4 +1,4 @@ -#include "core/typeOrRuleVar.h" +#include "clstepcore/typeOrRuleVar.h" #include diff --git a/src/clstepcore/uniquenessRule.cc b/src/clstepcore/uniquenessRule.cc index fd8ba05ca..d22bf2c2c 100644 --- a/src/clstepcore/uniquenessRule.cc +++ b/src/clstepcore/uniquenessRule.cc @@ -1,4 +1,4 @@ -#include "core/uniquenessRule.h" +#include "clstepcore/uniquenessRule.h" #include diff --git a/src/clstepcore/whereRule.cc b/src/clstepcore/whereRule.cc index 44f23dc14..191b1ec36 100644 --- a/src/clstepcore/whereRule.cc +++ b/src/clstepcore/whereRule.cc @@ -1,4 +1,4 @@ -#include "core/whereRule.h" +#include "clstepcore/whereRule.h" Where_rule::Where_rule() { _type_or_rule = 0; diff --git a/src/clutils/Str.cc b/src/clutils/Str.cc index ec8f5b3da..1f6a3dce3 100644 --- a/src/clutils/Str.cc +++ b/src/clutils/Str.cc @@ -9,7 +9,7 @@ * and is not subject to copyright. */ -#include "utils/Str.h" +#include "clutils/Str.h" #include #include diff --git a/src/clutils/dirobj.cc b/src/clutils/dirobj.cc index 97dc4fda6..e0e3f970a 100644 --- a/src/clutils/dirobj.cc +++ b/src/clutils/dirobj.cc @@ -40,7 +40,7 @@ */ #include "config.h" -#include "utils/dirobj.h" +#include "clutils/dirobj.h" #ifdef HAVE_DIRENT_H # include #endif diff --git a/src/clutils/errordesc.cc b/src/clutils/errordesc.cc index 4cfb1f2c1..17a2de465 100644 --- a/src/clutils/errordesc.cc +++ b/src/clutils/errordesc.cc @@ -10,8 +10,8 @@ * and is not subject to copyright. */ -#include "utils/errordesc.h" -#include "utils/Str.h" +#include "clutils/errordesc.h" +#include "clutils/Str.h" DebugLevel ErrorDescriptor::_debug_level = DEBUG_OFF; ostream * ErrorDescriptor::_out = 0; diff --git a/src/clutils/gennode.cc b/src/clutils/gennode.cc index e1f7d83b9..c8a993632 100644 --- a/src/clutils/gennode.cc +++ b/src/clutils/gennode.cc @@ -12,8 +12,8 @@ /* $Id: gennode.cc,v 3.0.1.4 1997/11/05 22:33:47 sauderd DP3.1 $ */ -#include "utils/gennode.h" -#include "utils/gennodelist.h" +#include "clutils/gennode.h" +#include "clutils/gennodelist.h" ////////////////////////////////////////////////////////////////////////////// // class GenericNode inline functions that depend on other classes diff --git a/src/clutils/gennodearray.cc b/src/clutils/gennodearray.cc index 1645589d5..22a9a73d3 100644 --- a/src/clutils/gennodearray.cc +++ b/src/clutils/gennodearray.cc @@ -13,9 +13,9 @@ #include "config.h" -#include "utils/gennode.h" -#include "utils/gennodelist.h" -#include "utils/gennodearray.h" +#include "clutils/gennode.h" +#include "clutils/gennodelist.h" +#include "clutils/gennodearray.h" #ifndef HAVE_MEMMOVE extern "C" { diff --git a/src/clutils/gennodelist.cc b/src/clutils/gennodelist.cc index 7650781cf..c75d7a712 100644 --- a/src/clutils/gennodelist.cc +++ b/src/clutils/gennodelist.cc @@ -12,10 +12,10 @@ /* $Id: gennodelist.cc,v 3.0.1.2 1997/11/05 22:33:49 sauderd DP3.1 $ */ -#include "utils/gennode.h" -#include "utils/gennodelist.h" +#include "clutils/gennode.h" +#include "clutils/gennodelist.h" //#include -#include "utils/gennodearray.h" +#include "clutils/gennodearray.h" // inserts after existNode void GenNodeList::InsertAfter( GenericNode * newNode, diff --git a/src/clutils/sc_hash.cc b/src/clutils/sc_hash.cc index db6eda0ec..8ed4c54ab 100644 --- a/src/clutils/sc_hash.cc +++ b/src/clutils/sc_hash.cc @@ -5,7 +5,7 @@ * also, hcreate/hdestroy routines added to simulate hsearch(3). */ -#include "utils/sc_hash.h" +#include "clutils/sc_hash.h" #include #include #include diff --git a/src/exp2cxx/classes_wrapper.cc b/src/exp2cxx/classes_wrapper.cc index b668361b9..ef874a790 100644 --- a/src/exp2cxx/classes_wrapper.cc +++ b/src/exp2cxx/classes_wrapper.cc @@ -75,12 +75,12 @@ void print_file_header( FILES * files ) { fprintf( files->incall, "#include \n" ); fprintf( files->incall, "#endif\n" ); - fprintf( files->incall, "#include \"core/sdai.h\"\n\n" ); - fprintf( files->incall, "\n#include \"core/Registry.h\"\n" ); - fprintf( files->incall, "\n#include \"core/STEPaggregate.h\"\n" ); - fprintf( files->incall, "\n#include \"core/STEPundefined.h\"\n" ); - fprintf( files->incall, "\n#include \"core/ExpDict.h\"\n" ); - fprintf( files->incall, "\n#include \"core/STEPattribute.h\"\n" ); + fprintf( files->incall, "#include \"clstepcore/sdai.h\"\n\n" ); + fprintf( files->incall, "\n#include \"clstepcore/Registry.h\"\n" ); + fprintf( files->incall, "\n#include \"clstepcore/STEPaggregate.h\"\n" ); + fprintf( files->incall, "\n#include \"clstepcore/STEPundefined.h\"\n" ); + fprintf( files->incall, "\n#include \"clstepcore/ExpDict.h\"\n" ); + fprintf( files->incall, "\n#include \"clstepcore/STEPattribute.h\"\n" ); fprintf( files->incall, "\n#include \n" ); @@ -494,7 +494,7 @@ void SCHEMAprint( Schema schema, FILES * files, void * complexCol, int suffix ) "#include \"schema.h\"\n" "#endif\n" ); #endif - fprintf( initfile, "#include \"core/Registry.h\"\n#include \n" ); + fprintf( initfile, "#include \"clstepcore/Registry.h\"\n#include \n" ); fprintf( initfile, "\nvoid %sInit (Registry& reg) {\n", schnm ); diff --git a/src/exp2cxx/multpass.c b/src/exp2cxx/multpass.c index 2db9f744e..03e1eb885 100644 --- a/src/exp2cxx/multpass.c +++ b/src/exp2cxx/multpass.c @@ -159,7 +159,7 @@ void print_schemas_separate( Express express, void * complexCol, FILES * files ) // which hasn't been closed yet. (That's done on 2nd line below.)) */ fprintf( files->initall, " reg.SetCompCollect( gencomplex() );\n" ); fprintf( files->initall, "}\n\n" ); - fprintf( files->incall, "\n#include \"core/complexSupport.h\"\n" ); + fprintf( files->incall, "\n#include \"clstepcore/complexSupport.h\"\n" ); fprintf( files->incall, "ComplexCollect *gencomplex();\n" ); /* Function GetModelContents() is printed at the end of the schema.xx diff --git a/src/exp2cxx/write.cc b/src/exp2cxx/write.cc index 1d73dc46a..da1ecb747 100644 --- a/src/exp2cxx/write.cc +++ b/src/exp2cxx/write.cc @@ -116,7 +116,7 @@ static void writeheader( ostream & os, int noLists ) << " * file, however, there are no complex entities, so this\n" << " * function is a stub.\n" << " */" << endl << endl; - os << "#include \"core/complexSupport.h\"\n\n"; + os << "#include \"clstepcore/complexSupport.h\"\n\n"; os << "ComplexCollect *gencomplex()" << endl; os << "{" << endl; return; @@ -128,7 +128,7 @@ static void writeheader( ostream & os, int noLists ) << " * support structures. The structures will be used in the SCL to\n" << " * validate user requests to instantiate complex entities.\n" << " */" << endl << endl; - os << "#include \"core/complexSupport.h\"\n\n"; + os << "#include \"clstepcore/complexSupport.h\"\n\n"; os << "ComplexCollect *gencomplex()" << endl; os << " /*" << endl << " * This function contains instantiation statements for all the\n" diff --git a/src/test/p21read/p21read.cc b/src/test/p21read/p21read.cc index cd7bd9748..cf96b86dd 100644 --- a/src/test/p21read/p21read.cc +++ b/src/test/p21read/p21read.cc @@ -13,12 +13,12 @@ */ extern void SchemaInit( class Registry & ); -#include "editor/STEPfile.h" -#include "core/sdai.h" -#include "core/STEPattribute.h" -#include "core/ExpDict.h" -#include "core/Registry.h" -#include "utils/errordesc.h" +#include "cleditor/STEPfile.h" +#include "clstepcore/sdai.h" +#include "clstepcore/STEPattribute.h" +#include "clstepcore/ExpDict.h" +#include "clstepcore/Registry.h" +#include "clutils/errordesc.h" #include #include #include "sc_benchmark.h" diff --git a/src/test/scl2html/scl2html.cc b/src/test/scl2html/scl2html.cc index 72160c7df..afe65b11f 100644 --- a/src/test/scl2html/scl2html.cc +++ b/src/test/scl2html/scl2html.cc @@ -49,7 +49,7 @@ void PrintAttrTypeWithAnchor( const TypeDescriptor * typeDesc, ofstream & outhtml ) { std::string buf; - // The type. See core/baseType.h for info + // The type. See clstepcore/baseType.h for info PrimitiveType base = typeDesc->Type(); // the type descriptor for the "referent type," if any. diff --git a/src/test/tests.h b/src/test/tests.h index 504a6f5a3..0494b55d2 100644 --- a/src/test/tests.h +++ b/src/test/tests.h @@ -16,10 +16,10 @@ #include /* General SCL stuff */ -#include "core/ExpDict.h" -#include "editor/STEPfile.h" -#include "core/STEPattribute.h" -#include "core/sdai.h" +#include "clstepcore/ExpDict.h" +#include "cleditor/STEPfile.h" +#include "clstepcore/STEPattribute.h" +#include "clstepcore/sdai.h" /* Stuff more or less specifically for the Example schema */ /* The only program that needs this is tstatic. Since the other programs */ diff --git a/test/cpp/schema_specific/aggregate_bound_runtime.cc b/test/cpp/schema_specific/aggregate_bound_runtime.cc index 72b507634..f459697e6 100644 --- a/test/cpp/schema_specific/aggregate_bound_runtime.cc +++ b/test/cpp/schema_specific/aggregate_bound_runtime.cc @@ -1,10 +1,10 @@ -#include "editor/STEPfile.h" -#include "core/sdai.h" -#include "core/STEPattribute.h" -#include "core/ExpDict.h" -#include "core/Registry.h" -#include "utils/errordesc.h" +#include "cleditor/STEPfile.h" +#include "clstepcore/sdai.h" +#include "clstepcore/STEPattribute.h" +#include "clstepcore/ExpDict.h" +#include "clstepcore/Registry.h" +#include "clutils/errordesc.h" #include #include #ifdef HAVE_UNISTD_H diff --git a/test/cpp/schema_specific/attribute.cc b/test/cpp/schema_specific/attribute.cc index 4c8674da2..4fab32933 100644 --- a/test/cpp/schema_specific/attribute.cc +++ b/test/cpp/schema_specific/attribute.cc @@ -3,12 +3,12 @@ * Test attribute access; uses a tiny schema similar to a subset of IFC2x3 */ #include "config.h" -#include "editor/STEPfile.h" -#include "core/sdai.h" -#include "core/STEPattribute.h" -#include "core/ExpDict.h" -#include "core/Registry.h" -#include "utils/errordesc.h" +#include "cleditor/STEPfile.h" +#include "clstepcore/sdai.h" +#include "clstepcore/STEPattribute.h" +#include "clstepcore/ExpDict.h" +#include "clstepcore/Registry.h" +#include "clutils/errordesc.h" #include #include #ifdef HAVE_UNISTD_H diff --git a/test/cpp/schema_specific/inverse_attr1.cc b/test/cpp/schema_specific/inverse_attr1.cc index 0ec52d47d..52cc3628b 100644 --- a/test/cpp/schema_specific/inverse_attr1.cc +++ b/test/cpp/schema_specific/inverse_attr1.cc @@ -5,12 +5,12 @@ */ #include "config.h" #include "SubSuperIterators.h" -#include "editor/STEPfile.h" -#include "core/sdai.h" -#include "core/STEPattribute.h" -#include "core/ExpDict.h" -#include "core/Registry.h" -#include "utils/errordesc.h" +#include "cleditor/STEPfile.h" +#include "clstepcore/sdai.h" +#include "clstepcore/STEPattribute.h" +#include "clstepcore/ExpDict.h" +#include "clstepcore/Registry.h" +#include "clutils/errordesc.h" #include #include #ifdef HAVE_UNISTD_H diff --git a/test/cpp/schema_specific/inverse_attr2.cc b/test/cpp/schema_specific/inverse_attr2.cc index 5948660e0..cdf8dbbd0 100644 --- a/test/cpp/schema_specific/inverse_attr2.cc +++ b/test/cpp/schema_specific/inverse_attr2.cc @@ -4,12 +4,12 @@ ** */ #include "config.h" -#include "editor/STEPfile.h" -#include "core/sdai.h" -#include "core/STEPattribute.h" -#include "core/ExpDict.h" -#include "core/Registry.h" -#include "utils/errordesc.h" +#include "cleditor/STEPfile.h" +#include "clstepcore/sdai.h" +#include "clstepcore/STEPattribute.h" +#include "clstepcore/ExpDict.h" +#include "clstepcore/Registry.h" +#include "clutils/errordesc.h" #include #include #ifdef HAVE_UNISTD_H diff --git a/test/cpp/schema_specific/inverse_attr3.cc b/test/cpp/schema_specific/inverse_attr3.cc index a20a822c1..bb4ce0929 100644 --- a/test/cpp/schema_specific/inverse_attr3.cc +++ b/test/cpp/schema_specific/inverse_attr3.cc @@ -5,13 +5,13 @@ * This test originally used STEPfile, which didn't work. Fixing STEPfile would have been very difficult, it uses lazyInstMgr now. */ #include "config.h" -#include "lazy/lazyInstMgr.h" +#include "cllazyfile/lazyInstMgr.h" #include -#include "core/sdai.h" -#include "core/STEPattribute.h" -#include "core/ExpDict.h" -#include "core/Registry.h" -#include "utils/errordesc.h" +#include "clstepcore/sdai.h" +#include "clstepcore/STEPattribute.h" +#include "clstepcore/ExpDict.h" +#include "clstepcore/Registry.h" +#include "clutils/errordesc.h" #include #include #include diff --git a/test/cpp/schema_specific/stepfile_rw_progress.cc b/test/cpp/schema_specific/stepfile_rw_progress.cc index 4ee676627..1fe5cb0dc 100644 --- a/test/cpp/schema_specific/stepfile_rw_progress.cc +++ b/test/cpp/schema_specific/stepfile_rw_progress.cc @@ -1,10 +1,10 @@ -#include "editor/STEPfile.h" -#include "core/sdai.h" -#include "core/STEPattribute.h" -#include "core/ExpDict.h" -#include "core/Registry.h" -#include "utils/errordesc.h" +#include "cleditor/STEPfile.h" +#include "clstepcore/sdai.h" +#include "clstepcore/STEPattribute.h" +#include "clstepcore/ExpDict.h" +#include "clstepcore/Registry.h" +#include "clutils/errordesc.h" #include #include From f35d25d93dd5d039627a4b38a89253fd7a137074 Mon Sep 17 00:00:00 2001 From: Clifford Yapp <238416+starseeker@users.noreply.github.com> Date: Mon, 3 Oct 2022 21:41:17 -0400 Subject: [PATCH 19/23] Missed a header conversion --- test/cpp/schema_specific/inverse_attr1.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/cpp/schema_specific/inverse_attr1.cc b/test/cpp/schema_specific/inverse_attr1.cc index 52cc3628b..9f776a37a 100644 --- a/test/cpp/schema_specific/inverse_attr1.cc +++ b/test/cpp/schema_specific/inverse_attr1.cc @@ -4,7 +4,7 @@ ** */ #include "config.h" -#include "SubSuperIterators.h" +#include "clstepcore/SubSuperIterators.h" #include "cleditor/STEPfile.h" #include "clstepcore/sdai.h" #include "clstepcore/STEPattribute.h" From 6fd22a1e0af4c42c428f60764bf6df3e896e5aec Mon Sep 17 00:00:00 2001 From: Clifford Yapp <238416+starseeker@users.noreply.github.com> Date: Mon, 17 Oct 2022 10:02:16 -0400 Subject: [PATCH 20/23] Make expparse explicitly depend on scanner header Without this dependency, we get intermittent failures where parallel builds attempt the expparse.c compile before the necessary header is in place. --- src/express/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/express/CMakeLists.txt b/src/express/CMakeLists.txt index ae4e97bd0..e5c0dfe04 100644 --- a/src/express/CMakeLists.txt +++ b/src/express/CMakeLists.txt @@ -18,6 +18,7 @@ if(SC_GENERATE_LP_SOURCES) add_library(objlib_expparse_c OBJECT ${LEMON_ExpParser_OUTPUTS}) set_property(TARGET objlib_expparse_c PROPERTY POSITION_INDEPENDENT_CODE ON) + set_source_files_properties(${LEMON_ExpParser_OUTPUTS} PROPERTIES OBJECT_DEPENDS "${PERPLEX_ExpScanner_HDR}") else(SC_GENERATE_LP_SOURCES) add_subdirectory(generated) From 592823b64b9e2a108f6de495b5580c083fb1a000 Mon Sep 17 00:00:00 2001 From: Clifford Yapp <238416+starseeker@users.noreply.github.com> Date: Wed, 23 Aug 2023 14:54:33 -0400 Subject: [PATCH 21/23] List the generated .h file explicitly as an output Occasional compile problems with libexpress appear to be an attempt to compile with an incompletely generated header. Make the dependency explicit to assist CMake in generating proper build ordering rules. --- cmake/FindLEMON.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/FindLEMON.cmake b/cmake/FindLEMON.cmake index 7ad58984e..83c63c487 100644 --- a/cmake/FindLEMON.cmake +++ b/cmake/FindLEMON.cmake @@ -141,7 +141,7 @@ if (LEMON_EXECUTABLE) # execute lemon add_custom_command( - OUTPUT ${_out_src_file} + OUTPUT ${_out_src_file} ${_basename}.h COMMAND ${LEMON_EXECUTABLE} -T${LEMON_TEMPLATE} ${LEMON_EXECUTABLE_opts} ${_in_y_file} DEPENDS ${Name}_input_cpy WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} @@ -152,7 +152,7 @@ if (LEMON_EXECUTABLE) add_custom_command( OUTPUT ${_out_hdr_file} COMMAND ${CMAKE_COMMAND} ARGS -E rename ${_basename}.h ${_out_hdr_file} - DEPENDS ${_out_src_file} + DEPENDS ${_out_src_file} ${_basename}.h WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) From db2c3d8e5ba75684373830704fbe0efdb018ce48 Mon Sep 17 00:00:00 2001 From: Clifford Yapp <238416+starseeker@users.noreply.github.com> Date: Wed, 23 Aug 2023 14:57:10 -0400 Subject: [PATCH 22/23] Minor updates for newer compilers The Wstrict-prototypes flag didn't like some of the stepcode function definitions. Also add a couple includes and defines for isascii. --- include/express/object.h | 2 +- src/express/expparse.y | 7 +++---- src/express/expscan.l | 7 +++++-- src/express/generated/expparse.c | 7 +++---- src/express/generated/expscan.c | 6 +++++- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/include/express/object.h b/include/express/object.h index e5736f45b..15e4a435f 100644 --- a/include/express/object.h +++ b/include/express/object.h @@ -68,7 +68,7 @@ /***************************/ struct Object { - struct Symbol_ * ( *get_symbol )(); + struct Symbol_ * ( *get_symbol )( void * ); char * type; /**< should complete the phrase "X is ..." - i.e., "an entity", "a type", "of unknown type" */ int bits; /**< a bitwise selector of a type, i.e. OBJ_XX_BITS */ }; diff --git a/src/express/expparse.y b/src/express/expparse.y index f6bc296c2..92a9bfcca 100644 --- a/src/express/expparse.y +++ b/src/express/expparse.y @@ -51,7 +51,7 @@ YYSTYPE yylval; Express yyexpresult; /* hook to everything built by parser */ Symbol *interface_schema; /* schema of interest in use/ref clauses */ - void (*interface_func)(); /* func to attach rename clauses */ + void (*interface_func)(struct Scope_ *, Symbol *, Symbol *, Symbol *); /* func to attach rename clauses */ /* record schemas found in a single parse here, allowing them to be */ /* differentiated from other schemas parsed earlier */ @@ -106,7 +106,7 @@ YYSTYPE yylval; #define ERROR(code) ERRORreport(code, yylineno) -void parserInitState() +void parserInitState( void ) { scope = scopes; /* no need to define scope->this */ @@ -402,8 +402,7 @@ aggregate_type(A) ::= TOK_AGGREGATE TOK_OF parameter_type(B). Symbol sym; sym.line = yylineno; sym.filename = current_filename; - ERRORreport_with_symbol(UNLABELLED_PARAM_TYPE, &sym, - CURRENT_SCOPE_NAME); + ERRORreport_with_symbol(UNLABELLED_PARAM_TYPE, &sym, CURRENT_SCOPE_NAME); } } aggregate_type(A) ::= TOK_AGGREGATE TOK_COLON TOK_IDENTIFIER(B) TOK_OF diff --git a/src/express/expscan.l b/src/express/expscan.l index cbd56c535..755e21fc1 100644 --- a/src/express/expscan.l +++ b/src/express/expscan.l @@ -98,9 +98,12 @@ * * Revision 4.1 90/09/13 16:29:00 clark * BPR 2.1 alpha - * + * */ - +#include +#if !defined(isascii) && defined(__isascii) +# define isascii __isascii +#endif #include "express/basic.h" #include "express/error.h" #include "express/lexact.h" diff --git a/src/express/generated/expparse.c b/src/express/generated/expparse.c index 217c349d6..393d5c303 100644 --- a/src/express/generated/expparse.c +++ b/src/express/generated/expparse.c @@ -57,7 +57,7 @@ YYSTYPE yylval; Express yyexpresult; /* hook to everything built by parser */ Symbol *interface_schema; /* schema of interest in use/ref clauses */ - void (*interface_func)(); /* func to attach rename clauses */ + void (*interface_func)(struct Scope_ *, Symbol *, Symbol *, Symbol *); /* func to attach rename clauses */ /* record schemas found in a single parse here, allowing them to be */ /* differentiated from other schemas parsed earlier */ @@ -112,7 +112,7 @@ YYSTYPE yylval; #define ERROR(code) ERRORreport(code, yylineno) -void parserInitState() +void parserInitState( void ) { scope = scopes; /* no need to define scope->this */ @@ -2348,8 +2348,7 @@ static void yy_reduce( Symbol sym; sym.line = yylineno; sym.filename = current_filename; - ERRORreport_with_symbol(UNLABELLED_PARAM_TYPE, &sym, - CURRENT_SCOPE_NAME); + ERRORreport_with_symbol(UNLABELLED_PARAM_TYPE, &sym, CURRENT_SCOPE_NAME); } } #line 2356 "expparse.c" diff --git a/src/express/generated/expscan.c b/src/express/generated/expscan.c index b78b863a5..0b60210cb 100644 --- a/src/express/generated/expscan.c +++ b/src/express/generated/expscan.c @@ -99,6 +99,10 @@ * Revision 4.1 90/09/13 16:29:00 clark * BPR 2.1 alpha * */ +#include +#if !defined(isascii) && defined(__isascii) +# define isascii __isascii +#endif #include "express/basic.h" #include "express/error.h" #include "express/lexact.h" @@ -617,7 +621,7 @@ getTokenText(perplex_t scanner) #define yyextra scanner->extra static perplex_t -newScanner() +newScanner(void) { perplex_t scanner; scanner = (perplex_t)calloc(1, sizeof(struct perplex)); From 56da4ab614cb60f45ab093f31ac263223cb39ad9 Mon Sep 17 00:00:00 2001 From: Clifford Yapp <238416+starseeker@users.noreply.github.com> Date: Sat, 2 Sep 2023 20:26:58 -0400 Subject: [PATCH 23/23] Update ap203min example for new header setup. --- example/ap203min/CMakeLists.txt | 4 ---- example/ap203min/ap203min.cpp | 18 +++++++++--------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/example/ap203min/CMakeLists.txt b/example/ap203min/CMakeLists.txt index 6537d3e80..5aea13a4b 100644 --- a/example/ap203min/CMakeLists.txt +++ b/example/ap203min/CMakeLists.txt @@ -58,10 +58,6 @@ add_subdirectory(${STEPCODE_ROOT_DIR} "${CMAKE_CURRENT_BINARY_DIR}/sc" EXCLUDE_F # Set up STEPcode include directories. set(STEPCODE_INCLUDE_DIR - ${STEPCODE_ROOT_DIR}/src/clstepcore - ${STEPCODE_ROOT_DIR}/src/cldai - ${STEPCODE_ROOT_DIR}/src/clutils - ${STEPCODE_ROOT_DIR}/src/cleditor ${STEPCODE_BUILD_DIR}/include ${STEPCODE_ROOT_DIR}/include ${CMAKE_BINARY_DIR} diff --git a/example/ap203min/ap203min.cpp b/example/ap203min/ap203min.cpp index 5e05b7b59..1a6039f83 100644 --- a/example/ap203min/ap203min.cpp +++ b/example/ap203min/ap203min.cpp @@ -49,15 +49,15 @@ // $./AP203Minimum // AP203Minimum outfile.stp -#include -#include -#include -#include -#include -#include - -#include -#include +#include +#include +#include +#include +#include +#include + +#include +#include #include "schema.h"