Merge branch 'develop'

v0.8.2
Merge pull request #452 from starseeker/headers
2023-09-17 12:07:49 -04:00 · 2023-09-03 23:32:12 -04:00 · 2023-09-02 20:26:58 -04:00 · 2023-09-02 20:15:42 -04:00 · 2023-08-23 14:57:10 -04:00 · 2023-08-23 14:54:33 -04:00
344 changed files with 15141 additions and 5455 deletions
@@ -10,6 +10,7 @@
 [._]*.sw[a-p]
 [._]s[a-v][a-z]
 [._]sw[a-p]
+**/__pycache__/

 # OS specific files
 .DS_Store
@@ -48,7 +48,7 @@ endif (POLICY CMP0077)

 # SC version
 set(SC_VERSION_MAJOR 0)
-set(SC_VERSION_MINOR 9)
+set(SC_VERSION_MINOR 8)
 set(SC_VERSION_PATCH 1)
 set(SC_VERSION ${SC_VERSION_MAJOR}.${SC_VERSION_MINOR}.${SC_VERSION_PATCH})

@@ -120,7 +120,6 @@ option(BUILD_STATIC_LIBS "Build static libraries" OFF)
 option(SC_PYTHON_GENERATOR "Compile exp2python" ON)
 option(SC_CPP_GENERATOR "Compile exp2cxx" ON)

-option(SC_MEMMGR_ENABLE_CHECKS "Enable sc_memmgr's memory leak detection" OFF)
 option(SC_TRACE_FPRINTF "Enable extra comments in generated code so the code's source in exp2cxx may be located" OFF)

 option(SC_ENABLE_COVERAGE "Enable code coverage test" OFF)
@@ -153,7 +152,7 @@ include(SC_Locale)
 # logic related to regenerating the lexer and parser source code
 include(SC_Regenerate)

-# create config header sc_cf.h
+# create config.h header
 include(SC_Config_Headers)

 if(NOT DEFINED SC_SDAI_ADDITIONAL_EXES_SRCS)
@@ -174,10 +173,6 @@ if(NOT SC_IS_SUBBUILD)
    ".. Generating step can take a while if you are building several schemas.")
 endif(NOT SC_IS_SUBBUILD)

-# create config headers sc_cf.h
-include(SC_Config_Headers)
-
-
 ################

 if(MSVC)
@@ -193,7 +188,6 @@ include_directories(
  ${SC_BINARY_DIR}/include
 )

-add_subdirectory(src/base)
 add_subdirectory(src/express)
 add_subdirectory(src/exppp)
 add_subdirectory(src/exp2cxx)
@@ -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}
 	)

@@ -27,16 +27,16 @@ endmacro(P21_TESTS sfile)
 # create p21read_sdai_*, lazy_sdai_*, any exes listed in SC_SDAI_ADDITIONAL_EXES_SRCS
 macro(SCHEMA_EXES)
  RELATIVE_PATH_TO_TOPLEVEL(${CMAKE_CURRENT_SOURCE_DIR} RELATIVE_PATH_COMPONENT)
-  SC_ADDEXEC(p21read_${PROJECT_NAME} SOURCES "${RELATIVE_PATH_COMPONENT}/src/test/p21read/p21read.cc" LINK_LIBRARIES ${PROJECT_NAME} stepdai stepcore stepeditor steputils base TESTABLE)
+  SC_ADDEXEC(p21read_${PROJECT_NAME} SOURCES "${RELATIVE_PATH_COMPONENT}/src/test/p21read/p21read.cc;${RELATIVE_PATH_COMPONENT}/src/test/p21read/sc_benchmark.cc" LINK_LIBRARIES ${PROJECT_NAME} stepdai stepcore stepeditor steputils TESTABLE)
  if(NOT WIN32)
-    SC_ADDEXEC(lazy_${PROJECT_NAME} SOURCES "${RELATIVE_PATH_COMPONENT}/src/cllazyfile/lazy_test.cc" LINK_LIBRARIES ${PROJECT_NAME} steplazyfile stepdai stepcore stepeditor steputils base TESTABLE)
+    SC_ADDEXEC(lazy_${PROJECT_NAME} SOURCES "${RELATIVE_PATH_COMPONENT}/src/cllazyfile/lazy_test.cc;${RELATIVE_PATH_COMPONENT}/src/cllazyfile/sc_benchmark.cc" LINK_LIBRARIES ${PROJECT_NAME} steplazyfile stepdai stepcore stepeditor steputils TESTABLE)
  endif(NOT WIN32)

  #add user-defined executables
  foreach(src ${SC_SDAI_ADDITIONAL_EXES_SRCS})
    get_filename_component(name ${src} NAME_WE)
    get_filename_component(path ${src} ABSOLUTE)
-    SC_ADDEXEC(${name}_${PROJECT_NAME} SOURCES ${src} LINK_LIBRARIES ${PROJECT_NAME} stepdai stepcore stepeditor steputils base TESTABLE)
+    SC_ADDEXEC(${name}_${PROJECT_NAME} SOURCES ${src} LINK_LIBRARIES ${PROJECT_NAME} stepdai stepcore stepeditor steputils TESTABLE)
    #set_target_properties(${name}_${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "${${PROJECT_NAME}_COMPILE_FLAGS} -I${path}")
  endforeach(src ${SC_SDAI_ADDITIONAL_EXES_SRCS})
 ENDMACRO(SCHEMA_EXES)
@@ -89,12 +89,12 @@ macro(SCHEMA_TARGETS expFile schemaName sourceFiles)
  )
  include_directories(
    ${CMAKE_CURRENT_SOURCE_DIR}         ${SC_SOURCE_DIR}/src/cldai          ${SC_SOURCE_DIR}/src/cleditor
-    ${SC_SOURCE_DIR}/src/clutils        ${SC_SOURCE_DIR}/src/clstepcore     ${SC_SOURCE_DIR}/src/base
-    ${SC_SOURCE_DIR}/src/base/judy/src
+    ${SC_SOURCE_DIR}/src/clutils        ${SC_SOURCE_DIR}/src/clstepcore     ${SC_SOURCE_DIR}/src/cllazyfile
+    ${SC_SOURCE_DIR}/src/cllazyfile/judy/src
  )
  # if testing is enabled, "TESTABLE" sets property EXCLUDE_FROM_ALL and prevents installation
  if(BUILD_SHARED_LIBS)
-    SC_ADDLIB(${PROJECT_NAME} SHARED SOURCES ${sourceFiles} LINK_LIBRARIES stepdai stepcore stepeditor steputils base TESTABLE)
+    SC_ADDLIB(${PROJECT_NAME} SHARED SOURCES ${sourceFiles} LINK_LIBRARIES stepdai stepcore stepeditor steputils TESTABLE)
    add_dependencies(${PROJECT_NAME} generate_cpp_${PROJECT_NAME})
    if(WIN32)
      target_compile_definitions("${PROJECT_NAME}" PRIVATE SC_SCHEMA_DLL_EXPORTS)
@@ -111,9 +111,9 @@ macro(SCHEMA_TARGETS expFile schemaName sourceFiles)
  endif()

  if($CACHE{SC_BUILD_STATIC_LIBS})
-    SC_ADDLIB(${PROJECT_NAME}-static STATIC SOURCES ${sourceFiles} LINK_LIBRARIES stepdai-static stepcore-static stepeditor-static steputils-static base-static TESTABLE)
+    SC_ADDLIB(${PROJECT_NAME}-static STATIC SOURCES ${sourceFiles} LINK_LIBRARIES stepdai-static stepcore-static stepeditor-static steputils-static TESTABLE)
    add_dependencies(${PROJECT_NAME}-static generate_cpp_${PROJECT_NAME})
-    target_compile_defines("${PROJECT_NAME}-static" PRIVATE SC_STATIC)
+    target_compile_definitions("${PROJECT_NAME}-static" PRIVATE SC_STATIC)
    if(MSVC)
      target_compile_options("${PROJECT_NAME}-static" PRIVATE "/bigobj")
    endif()
@@ -1,4 +1,4 @@
-# create sc_cf.h
+# create config.h

 include(CheckLibraryExists)
 include(CheckIncludeFile)
@@ -77,9 +77,9 @@ int main() {return !(f() == f());}
  cmake_pop_check_state()
 endif(SC_ENABLE_CXX11)

-# Now that all the tests are done, configure the sc_cf.h file:
-configure_file(${CMAKE_SOURCE_DIR}/include/sc_cf.h.in ${SC_BINARY_DIR}/${INCLUDE_DIR}/sc_cf.h.gen)
-execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SC_BINARY_DIR}/${INCLUDE_DIR}/sc_cf.h.gen ${SC_BINARY_DIR}/${INCLUDE_DIR}/sc_cf.h)
+# Now that all the tests are done, configure the config.h file:
+configure_file(${CMAKE_SOURCE_DIR}/include/config.h.in ${SC_BINARY_DIR}/${INCLUDE_DIR}/config.h.gen)
+execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SC_BINARY_DIR}/${INCLUDE_DIR}/config.h.gen ${SC_BINARY_DIR}/${INCLUDE_DIR}/config.h)

 # Local Variables:
 # tab-width: 8
@@ -16,7 +16,6 @@ set(SC_BINARY_DIR ${SC_BUILDDIR})
 include(${CMAKE_CURRENT_SOURCE_DIR}/../SC_Outdirs.cmake)

 set(schema_scanner_src
-  ${SC_ROOT}/src/base/sc_mkdir.c
  ${SC_ROOT}/src/exp2cxx/genCxxFilenames.c
  ${SC_ROOT}/src/exp2cxx/class_strings.c
  ${SC_ROOT}/src/express/generated/expparse.c
@@ -52,7 +51,6 @@ include_directories(
  ${SC_ROOT}/include/
  ${SC_ROOT}/src/express/
  ${SC_ROOT}/src/express/generated
-  ${SC_ROOT}/src/base
  ${SC_ROOT}/src/exp2cxx
  ${SC_BUILDDIR}/include
 )
@@ -14,20 +14,25 @@
 */

 extern "C" {
-#  include "expparse.h"
-#  include "expscan.h"
-#  include "express/scope.h"
-#  include "genCxxFilenames.h"
-#  include "sc_mkdir.h"
+#define _XOPEN_SOURCE /* for S_IFDIR */

-#  include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <errno.h>

-#  ifdef _WIN32
-#    include <direct.h>
-#    define getcwd _getcwd
-#  else
-#    include <unistd.h>
-#  endif
+#include "expparse.h"
+#include "expscan.h"
+#include "express/scope.h"
+#include "genCxxFilenames.h"
+
+#include <string.h>
+
+#ifdef _WIN32
+#  include <direct.h>
+#  define getcwd _getcwd
+#else
+#  include <unistd.h>
+#endif
 }

 #include <string>
@@ -125,6 +130,30 @@ string makeShortName( const char * longName ) {
    return filename;
 }

+/* cross-platform mkdir */
+int sc_mkdir( const char * path ) {
+    #ifdef _WIN32
+    return mkdir( path );
+    #else
+    return mkdir( path, 0777 );
+    #endif /* _WIN32 */
+}
+
+/* return -1 if error, 0 if created, 1 if dir existed already */
+static int mkDirIfNone( const char * path ) {
+	struct stat s;
+	if( stat( path, &s ) != 0 ) {
+		if( errno == ENOENT ) {
+			return sc_mkdir( path );
+		}
+	} else if( s.st_mode & S_IFDIR ) {
+		return 1;
+	}
+	/* either stat returned an error other than ENOENT, or 'path' exists but isn't a dir */
+	return -1;
+}
+
+
 /** write a CMakeLists.txt file for the schema; print its directory to stdout for CMake's add_subdirectory() command */
 void writeLists( const char * schemaName, stringstream & eh, stringstream & ei, int ecount,
                                           stringstream & th, stringstream & ti, int tcount ) {
@@ -220,7 +249,7 @@ void writeLists( const char * schemaName, stringstream & eh, stringstream & ei,

    cmLists.close();

-    char pwd[BUFSIZ] = {0};
+    char pwd[BUFSIZ+1] = {0};
    if( getcwd( pwd, BUFSIZ ) ) {
        cout << pwd << "/" << shortName << endl;
    } else {
@@ -51,18 +51,13 @@ endif(NOT EXISTS ${SCHEMA_FILE})

 get_filename_component(SCHEMA_SN ${SCHEMA_FILE} NAME)
 string(REGEX REPLACE "\(.*\).[Ee][Xx][Pp]" "sdai_\\1" SCHEMA_LINK_NAME ${SCHEMA_SN})
-set(STEPCODE_LIBRARIES base stepcore stepeditor stepdai steputils ${SCHEMA_LINK_NAME})
+set(STEPCODE_LIBRARIES stepcore stepeditor stepdai steputils ${SCHEMA_LINK_NAME})

 # Add STEPCode project to CMake build.
 add_subdirectory(${STEPCODE_ROOT_DIR} "${CMAKE_CURRENT_BINARY_DIR}/sc" EXCLUDE_FROM_ALL)

 # Set up STEPcode include directories.
 set(STEPCODE_INCLUDE_DIR
-  ${STEPCODE_ROOT_DIR}/src/base
-  ${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}
@@ -19,7 +19,6 @@ INCLUDE( External_STEPCode )

 IF(NOT WIN32)
 	set( STEPCODE_LIBRARIES
-	${STEPCODE_INSTALL_DIR}/lib/libbase.a
 	${STEPCODE_INSTALL_DIR}/lib/libstepcore.a
 	${STEPCODE_INSTALL_DIR}/lib/libstepeditor.a
 	${STEPCODE_INSTALL_DIR}/lib/libstepdai.a
@@ -28,7 +27,6 @@ IF(NOT WIN32)
 	)
 ELSE()
 	set( STEPCODE_LIBRARIES
-	${STEPCODE_INSTALL_DIR}/lib/libbase.lib
 	${STEPCODE_INSTALL_DIR}/lib/libstepcore.lib
 	${STEPCODE_INSTALL_DIR}/lib/libstepeditor.lib
 	${STEPCODE_INSTALL_DIR}/lib/libstepdai.lib
@@ -44,7 +42,6 @@ MESSAGE( STATUS "STEPCODE_INSTALL_DIR: " ${STEPCODE_INSTALL_DIR} )

 set( STEPCODE_INCLUDE_DIR
 ${STEPCODE_INSTALL_DIR}/include/stepcode
-${STEPCODE_INSTALL_DIR}/include/stepcode/base
 ${STEPCODE_INSTALL_DIR}/include/stepcode/clstepcore
 ${STEPCODE_INSTALL_DIR}/include/stepcode/cldai
 ${STEPCODE_INSTALL_DIR}/include/stepcode/clutils
@@ -49,15 +49,15 @@
 //  $./AP203Minimum
 //  AP203Minimum    outfile.stp

-#include <STEPfile.h>
-#include <sdai.h>
-#include <STEPattribute.h>
-#include <ExpDict.h>
-#include <Registry.h>
-#include <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 <STEPcomplex.h>
-#include <SdaiHeaderSchema.h>
+#include <clstepcore/STEPcomplex.h>
+#include <cleditor/SdaiHeaderSchema.h>

 #include "schema.h"

@@ -15,7 +15,6 @@
 #cmakedefine HAVE_IO_H 1

 #cmakedefine SC_TRACE_FPRINTF 1
-#cmakedefine SC_MEMMGR_ENABLE_CHECKS 1

 #cmakedefine HAVE_ABS 1
 #cmakedefine HAVE_MEMCPY 1
@@ -32,12 +32,17 @@ install(FILES ${exppp_HDRS}

 install(FILES ordered_attrs.h
  sc_export.h
-  sc_stdbool.h
  DESTINATION ${INCLUDE_DIR}/stepcode)

-install(FILES ${SC_BINARY_DIR}/${INCLUDE_DIR}/sc_cf.h
+install(FILES ${SC_BINARY_DIR}/${INCLUDE_DIR}/config.h
  DESTINATION ${INCLUDE_DIR}/stepcode)

+add_subdirectory(cldai)
+add_subdirectory(cleditor)
+add_subdirectory(cllazyfile)
+add_subdirectory(clstepcore)
+add_subdirectory(clutils)
+
 # Local Variables:
 # tab-width: 8
 # mode: cmake
@@ -0,0 +1,24 @@
+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}
+  DESTINATION ${INCLUDE_DIR}/stepcode/cldai)
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
+
@@ -1,9 +1,9 @@
 #ifndef SDAIDAOBJECT_H
 #define SDAIDAOBJECT_H 1

-#include <sdaiObject.h>
-#include <sdaiString.h>
-#include <sdaiEnum.h>
+#include "cldai/sdaiObject.h"
+#include "cldai/sdaiString.h"
+#include "cldai/sdaiEnum.h"

 #include <sc_export.h>

@@ -3,7 +3,7 @@
 #define SESSION_INSTANCE_H 1

 #include <sc_export.h>
-//#include <sdai.h>
+//#include "clstepcore/sdai.h"

 class SC_DAI_EXPORT SDAI_Session_instance : public SDAI_sdaiObject {

@@ -0,0 +1,20 @@
+set(EDITOR_HDRS
+  STEPfile.h
+  cmdmgr.h
+  editordefines.h
+  SdaiHeaderSchema.h
+  SdaiHeaderSchemaClasses.h
+  SdaiSchemaInit.h
+  seeinfodefault.h
+  )
+
+install(FILES ${EDITOR_HDRS}
+  DESTINATION ${INCLUDE_DIR}/stepcode/cleditor)
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
+
@@ -15,14 +15,14 @@

 #include <sc_export.h>
 #include <string>
-#include <instmgr.h>
-#include <Registry.h>
+#include "clstepcore/instmgr.h"
+#include "clstepcore/Registry.h"
 #include <fstream>
-#include <dirobj.h>
-#include <errordesc.h>
+#include "clutils/dirobj.h"
+#include "clutils/errordesc.h"
 #include <time.h>

-#include <read_func.h>
+#include "clstepcore/read_func.h"

 //error reporting level
 #define READ_COMPLETE    10
@@ -5,11 +5,11 @@
 // regenerate it.

 #include <sc_export.h>
-#include <sdai.h>
-#include <Registry.h>
-#include <STEPaggregate.h>
-#include <SdaiHeaderSchemaClasses.h>
-#include <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

@@ -9,16 +9,16 @@
 #endif

 #include <sc_export.h>
-#include <sdai.h>
-#include <Registry.h>
-#include <STEPaggregate.h>
-#include <STEPundefined.h>
-#include <ExpDict.h>
-#include <STEPattribute.h>
-#include <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 <SdaiHeaderSchemaClasses.h>
-#include <SdaiHeaderSchema.h>
+#include "cleditor/SdaiHeaderSchemaClasses.h"
+#include "cleditor/SdaiHeaderSchema.h"

 SC_EDITOR_EXPORT void HeaderSchemaInit( Registry & );
 SC_EDITOR_EXPORT void HeaderInitSchemasAndEnts( Registry & );
@@ -13,16 +13,16 @@
 */

 #include <sc_export.h>
-#include <gennode.h>
-#include <gennodelist.h>
-#include <gennodearray.h>
+#include "clutils/gennode.h"
+#include "clutils/gennodelist.h"
+#include "clutils/gennodearray.h"

-#include <editordefines.h>
-#include <mgrnode.h>
-#include <mgrnodelist.h>
-#include <dispnode.h>
-#include <dispnodelist.h>
-#include <SingleLinkList.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
@@ -145,6 +145,7 @@ class SC_EDITOR_EXPORT CmdMgr {
    public:

        CmdMgr();
+        ~CmdMgr();

 // STATE LIST OPERATIONS
        MgrNode   *  GetHead( stateEnum listType );
@@ -20,10 +20,10 @@
 class MgrNode;
 class DisplayNode;
 class DisplayNodelist;
-#include <sdai.h>
+#include "clstepcore/sdai.h"
 //class SDAI_Application_instance;

-#include <editordefines.h>
+#include "cleditor/editordefines.h"

 class SC_EDITOR_EXPORT seeInfo : public DisplayNode {
    public:
@@ -0,0 +1,27 @@
+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}
+  DESTINATION ${INCLUDE_DIR}/stepcode/cllazyfile)
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
+
@@ -5,10 +5,9 @@
 #include <fstream>

 #include "judyL2Array.h"
-#include "lazyFileReader.h"
-#include "sectionReader.h"
-#include "lazyTypes.h"
-#include "sc_memmgr.h"
+#include "cllazyfile/lazyFileReader.h"
+#include "cllazyfile/sectionReader.h"
+#include "cllazyfile/lazyTypes.h"

 #include "sc_export.h"

@@ -31,6 +30,7 @@ class SC_LAZYFILE_EXPORT headerSectionReader: public sectionReader {
            //FIXME delete each instance?! maybe add to clear, since it iterates over everything already
            //enum clearHow { rawData, deletePointers }
            _headerInstances->clear();
+	    delete _headerInstances;
        }
 };

@@ -3,9 +3,9 @@

 #include <sc_export.h>

-#include <mgrnode.h>
-#include <lazyInstMgr.h>
-#include <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
@@ -3,9 +3,8 @@

 #include <map>
 #include <iostream>
-#include "sectionReader.h"
-#include "lazyTypes.h"
-#include "sc_memmgr.h"
+#include "cllazyfile/sectionReader.h"
+#include "cllazyfile/lazyTypes.h"

 #include "sc_export.h"

@@ -8,16 +8,14 @@
 #include "sc_export.h"

 // PART 21
-#include "lazyP21DataSectionReader.h"
-#include "p21HeaderSectionReader.h"
-#include "headerSectionReader.h"
+#include "cllazyfile/lazyP21DataSectionReader.h"
+#include "cllazyfile/p21HeaderSectionReader.h"
+#include "cllazyfile/headerSectionReader.h"

 /* // PART 28
 * #include "lazyP28DataSectionReader.h"
 * #include "p28HeaderSectionReader.h"
 */
-#include "sc_memmgr.h"
-
 class lazyInstMgr;
 class Registry;
 class headerSectionReader;
@@ -5,12 +5,11 @@
 #include <string>
 #include <assert.h>

-#include "lazyDataSectionReader.h"
-#include "lazyFileReader.h"
-#include "lazyTypes.h"
+#include "cllazyfile/lazyDataSectionReader.h"
+#include "cllazyfile/lazyFileReader.h"
+#include "cllazyfile/lazyTypes.h"

-#include "Registry.h"
-#include "sc_memmgr.h"
+#include "clstepcore/Registry.h"
 #include "sc_export.h"

 #include "judyLArray.h"
@@ -1,9 +1,8 @@
 #ifndef LAZYP21DATASECTIONREADER_H
 #define LAZYP21DATASECTIONREADER_H

-#include "lazyDataSectionReader.h"
-#include "lazyFileReader.h"
-#include "sc_memmgr.h"
+#include "cllazyfile/lazyDataSectionReader.h"
+#include "cllazyfile/lazyFileReader.h"
 #include "sc_export.h"

 class SC_LAZYFILE_EXPORT lazyP21DataSectionReader: public lazyDataSectionReader {
@@ -1,7 +1,7 @@
 #ifndef LAZYTYPES_H
 #define LAZYTYPES_H

-#include "sc_cf.h"
+#include "config.h"

 #include <iostream>
 #include <vector>
@@ -1,8 +1,7 @@
 #ifndef P21HEADERSECTIONREADER_H
 #define P21HEADERSECTIONREADER_H

-#include "headerSectionReader.h"
-#include "sc_memmgr.h"
+#include "cllazyfile/headerSectionReader.h"
 #include "sc_export.h"

 class SC_LAZYFILE_EXPORT p21HeaderSectionReader: public headerSectionReader {
@@ -3,11 +3,10 @@

 #include <fstream>
 #include <set>
-#include "lazyTypes.h"
-#include "sc_memmgr.h"
+#include "cllazyfile/lazyTypes.h"
 #include "sc_export.h"
-#include "errordesc.h"
-#include "STEPcomplex.h"
+#include "clutils/errordesc.h"
+#include "clstepcore/STEPcomplex.h"

 class SDAI_Application_instance;
 class lazyFileReader;
@@ -38,6 +37,7 @@ class SC_LAZYFILE_EXPORT sectionReader {
        // protected member functions

        sectionReader( lazyFileReader * parent, std::ifstream & file, std::streampos start, sectionID sid );
+	~sectionReader();

        /** Find a string, ignoring occurrences in comments or Part 21 strings (i.e. 'string with \S\' control directive' )
         * \param str string to find
@@ -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/clstepcore)
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
+
@@ -15,20 +15,20 @@
 */

 #include <sc_export.h>
-#include <sdai.h>
+#include "clstepcore/sdai.h"

 #include <vector>
 #include <string>
 #include <assert.h>

-#include <SingleLinkList.h>
+#include "clstepcore/SingleLinkList.h"

-#include <baseType.h>
-#include <dictdefs.h>
-#include <Str.h>
+#include "clstepcore/baseType.h"
+#include "clstepcore/dictdefs.h"
+#include "clutils/Str.h"

 // each of these contains linked list, list node, iterator
-#include "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 "attrDescriptor.h"
-#include "derivedAttribute.h"
+#include "clstepcore/attrDescriptor.h"
+#include "clstepcore/derivedAttribute.h"
 #include "inverseAttribute.h"

-#include "create_Aggr.h"
-#include "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 "dictSchema.h"
+#include "clstepcore/dictSchema.h"
 #include "schRename.h"

-#include "aggrTypeDescriptor.h"
+#include "clstepcore/aggrTypeDescriptor.h"
 #include "selectTypeDescriptor.h"
 #include "stringTypeDescriptor.h"
 #include "realTypeDescriptor.h"
@@ -13,11 +13,11 @@
 */

 #include <sc_export.h>
-#include <sdai.h>
-#include <errordesc.h>
-#include <sc_hash.h>
-#include <Str.h>
-#include <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
@@ -1,7 +1,7 @@
 #ifndef STEPAGGRBINARY_H
 #define STEPAGGRBINARY_H

-#include "STEPaggregate.h"
+#include "clstepcore/STEPaggregate.h"
 #include <sc_export.h>

 /** \file STEPaggrBinary.h
@@ -5,7 +5,7 @@
 * classes EntityAggregate, EntityNode
 */

-#include "STEPaggregate.h"
+#include "clstepcore/STEPaggregate.h"
 #include <sc_export.h>

 class SC_CORE_EXPORT EntityAggregate  :  public  STEPaggregate {
@@ -1,7 +1,7 @@
 #ifndef STEPAGGRENUM_H
 #define STEPAGGRENUM_H

-#include "STEPaggregate.h"
+#include "clstepcore/STEPaggregate.h"
 #include "sc_export.h"
 /** \file StepaggrEnum.h
 * classes EnumAggregate, LOGICALS, BOOLEANS, EnumNode
@@ -9,7 +9,7 @@

 /**
 * \class EnumAggregate
- * This is a minimal representions for a collection of SDAI_Enum
+ * This is a minimal representation for a collection of SDAI_Enum
 */
 class SC_CORE_EXPORT EnumAggregate  :  public STEPaggregate {
 public:
@@ -55,7 +55,7 @@ SC_CORE_EXPORT BOOLEANS * create_BOOLEANS();

 /**
 * * \class EnumNode
- ** This is a minimal representions for node in lists of SDAI_Enum
+ ** This is a minimal representation for node in lists of SDAI_Enum
 */
 class SC_CORE_EXPORT EnumNode  : public STEPnode {
 public:
@@ -1,7 +1,7 @@
 #ifndef STEPAGGRGENERIC_H
 #define STEPAGGRGENERIC_H

-#include "STEPaggregate.h"
+#include "clstepcore/STEPaggregate.h"
 #include <sc_export.h>

 /** \file STEPaggrGeneric.h
@@ -1,7 +1,7 @@
 #ifndef STEPAGGRINT_H
 #define STEPAGGRINT_H

-#include "STEPaggregate.h"
+#include "clstepcore/STEPaggregate.h"
 #include <sc_export.h>

 class SC_CORE_EXPORT IntAggregate  : public STEPaggregate  {
@@ -1,7 +1,7 @@
 #ifndef STEPAGGRREAL_H
 #define STEPAGGRREAL_H

-#include "STEPaggregate.h"
+#include "clstepcore/STEPaggregate.h"
 #include <sc_export.h>

 class SC_CORE_EXPORT RealAggregate  : public STEPaggregate  {
@@ -1,7 +1,7 @@
 #ifndef STEPAGGRSELECT_H
 #define STEPAGGRSELECT_H

-#include "STEPaggregate.h"
+#include "clstepcore/STEPaggregate.h"
 #include <sc_export.h>

 /** \file STEPaggrSelect.h
@@ -11,7 +11,7 @@

 /**
 * * \class SelectAggregate
- ** This is a minimal represention for a collection of SDAI_Select
+ ** This is a minimal representation for a collection of SDAI_Select
 */
 class SC_CORE_EXPORT SelectAggregate  :  public STEPaggregate {
 public:
@@ -35,7 +35,7 @@ typedef        SelectAggregate_ptr  SelectAggregate_var;

 /**
 * * \class SelectNode
- ** This is a minimal representions for node in lists of SDAI_Select
+ ** This is a minimal representation for node in lists of SDAI_Select
 */
 class SC_CORE_EXPORT SelectNode  : public STEPnode {
 public:
@@ -1,7 +1,7 @@
 #ifndef STEPAGGRSTRING_H
 #define STEPAGGRSTRING_H

-#include "STEPaggregate.h"
+#include "clstepcore/STEPaggregate.h"
 #include <sc_export.h>

 /** \file STEPaggrString.h
@@ -17,11 +17,11 @@ class STEPaggregate;
 class TypeDescriptor;

 #include <sc_export.h>
-#include <errordesc.h>
-#include <SingleLinkList.h>
-#include <baseType.h>
-#include <sdai.h>
-#include <STEPundefined.h>
+#include "clutils/errordesc.h"
+#include "clstepcore/SingleLinkList.h"
+#include "clstepcore/baseType.h"
+#include "clstepcore/sdai.h"
+#include "clstepcore/STEPundefined.h"
 #include <string>

 #define     AGGR_NULL   &NilSTEPaggregate
@@ -110,14 +110,14 @@ public:
 };
 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 "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
@@ -15,10 +15,10 @@

 #include <sc_export.h>
 #include <stdio.h>
-#include <errordesc.h>
-#include <baseType.h>
+#include "clutils/errordesc.h"
+#include "clstepcore/baseType.h"

-#include <sdai.h>
+#include "clstepcore/sdai.h"

 /** \def REAL_NUM_PRECISION
 * this is used to set a const int Real_Num_Precision
@@ -208,7 +208,7 @@ class SC_CORE_EXPORT STEPattribute {
        }

        const char  *  Name() const;
-        const char  *  TypeName() const;
+	std::string TypeName() const;
        BASE_TYPE   Type() const;
        BASE_TYPE   NonRefType() const;
        BASE_TYPE   BaseType() const;
@@ -16,7 +16,7 @@
 class STEPattribute;

 #include <sc_export.h>
-#include <SingleLinkList.h>
+#include "clstepcore/SingleLinkList.h"

 class STEPattributeList;

@@ -2,11 +2,11 @@
 #define STEPCOMPLEX_H

 #include <sc_export.h>
-#include <errordesc.h>
-#include <sdai.h>
-#include <baseType.h>
-#include <ExpDict.h>
-#include <Registry.h>
+#include "clutils/errordesc.h"
+#include "clstepcore/sdai.h"
+#include "clstepcore/baseType.h"
+#include "clstepcore/ExpDict.h"
+#include "clstepcore/Registry.h"

 #include <list>

@@ -15,7 +15,7 @@
 class Inverse_attribute;

 #include <sc_export.h>
-#include <SingleLinkList.h>
+#include "clstepcore/SingleLinkList.h"

 class STEPinvAttrList;
 class EntityAggregate;
@@ -13,9 +13,9 @@
 */

 #include <sc_export.h>
-#include <errordesc.h>
+#include "clutils/errordesc.h"
 #include <string>
-#include <read_func.h>
+#include "clstepcore/read_func.h"

 class SC_CORE_EXPORT SCLundefined  {
    protected:
@@ -1,8 +1,8 @@
 #ifndef SUB_SUPER_ITERATORS
 #define SUB_SUPER_ITERATORS

-#include "ExpDict.h"
-#include "ExpDict.h"
+#include "clstepcore/ExpDict.h"
+#include "clstepcore/ExpDict.h"
 #include <queue>
 #include <assert.h>

@@ -2,7 +2,7 @@
 #define AGGRTYPEDESCRIPTOR_H

 #include "typeDescriptor.h"
-#include "create_Aggr.h"
+#include "clstepcore/create_Aggr.h"

 #include "assert.h"

@@ -57,7 +57,7 @@ public:
    AggrTypeDescriptor( const char * nm, PrimitiveType ft,
                        Schema * origSchema, const char * d,
                        AggregateCreator f = 0 )
-    : TypeDescriptor( nm, ft, origSchema, d ), _bound1( 0 ), _bound2( 0 ), _uniqueElements( 0 ), _aggrDomainType( NULL ), CreateNewAggr( f ) { }
+    : TypeDescriptor( nm, ft, origSchema, d ), _bound1( 0 ), _bound2( 0 ), _uniqueElements( 0 ), _aggrDomainType( NULL ), CreateNewAggr( f ), _bound1_type( bound_unset ), _bound2_type( bound_unset ), _bound1_callback( NULL ), _bound2_callback( NULL ) { }
    virtual ~AggrTypeDescriptor();


@@ -3,7 +3,7 @@

 #include "typeDescriptor.h"

-#include "sdaiEnum.h"
+#include "cldai/sdaiEnum.h"

 #include "sc_export.h"

@@ -18,7 +18,7 @@
 #include <iostream>
 #include <fstream>
 using namespace std;
-#include "Str.h"
+#include "clutils/Str.h"

 #define LISTEND 999
 /** \def LISTEND
@@ -132,7 +132,7 @@ class SC_CORE_EXPORT EntNode {

    private:
        MarkType mark;
-        char name[BUFSIZ];
+        char name[BUFSIZ+1];
        bool multSupers;  ///< do I correspond to an entity with >1 supertype?
        EntNode * lastSmaller( EntNode * ); ///< used by ::sort()
 };
@@ -238,7 +238,7 @@ class SC_CORE_EXPORT SimpleList : public EntList {
        }

    private:
-        char name[BUFSIZ];    ///< Name of entity we correspond to.
+        char name[BUFSIZ+1];    ///< Name of entity we correspond to.
        MarkType I_marked; ///< Did I mark, and with what type of mark.
 };

@@ -3,7 +3,7 @@

 //typedef's for aggregate creators

-#include "sdai.h"
+#include "clstepcore/sdai.h"
 #include "sc_export.h"


@@ -1,7 +1,7 @@
 #ifndef DERIVEDATTRIBUTE_H
 #define DERIVEDATTRIBUTE_H

-#include "attrDescriptor.h"
+#include "clstepcore/attrDescriptor.h"

 #include "sc_export.h"

@@ -17,14 +17,14 @@

 #include <sc_export.h>

-/*#include <STEPattribute.h>*/
+/*#include "clstepcore/STEPattribute.h"*/
 /*#include <STEPentity.h>*/
-#include <sdai.h>
+#include "clstepcore/sdai.h"

-#include <gennode.h>
-#include <gennodelist.h>
+#include "clutils/gennode.h"
+#include "clutils/gennodelist.h"
 //#include <gennode.inline.h>
-#include <editordefines.h>
+#include "cleditor/editordefines.h"
 //#include <mgrnode.h>
 class MgrNode;

@@ -17,12 +17,12 @@

 #include <sc_export.h>

-#include <gennode.h>
+#include "clutils/gennode.h"
 //#include <gennode.inline.h>
-#include <editordefines.h>
-#include <mgrnode.h>
-#include <dispnode.h>
-#include <gennodelist.h>
+#include "cleditor/editordefines.h"
+#include "clstepcore/mgrnode.h"
+#include "clstepcore/dispnode.h"
+#include "clutils/gennodelist.h"

 ///////////////////////////////////////////////////////////////////////////////
 // class DisplayNodeList
@@ -2,9 +2,9 @@
 #define ENTITYDESCRIPTOR_H

 #include "typeDescriptor.h"
-#include "attrDescriptor.h"
+#include "clstepcore/attrDescriptor.h"
 #include "uniquenessRule.h"
-#include "attrDescriptorList.h"
+#include "clstepcore/attrDescriptorList.h"
 #include "inverseAttributeList.h"

 #include "sc_export.h"
@@ -1,7 +1,7 @@
 #ifndef GLOBALRULE_H
 #define GLOBALRULE_H

-#include "dictionaryInstance.h"
+#include "clstepcore/dictionaryInstance.h"
 #include "whereRule.h"
 #include "entityDescriptorList.h"

@@ -27,17 +27,17 @@
 // IT IS VERY IMPORTANT THAT THE ORDER OF THE FOLLOWING INCLUDE FILES
 // BE PRESERVED

-#include <gennode.h>
-#include <gennodelist.h>
-#include <gennodearray.h>
+#include "clutils/gennode.h"
+#include "clutils/gennodelist.h"
+#include "clutils/gennodearray.h"

-#include <mgrnode.h>
-#include <mgrnodelist.h>
+#include "clstepcore/mgrnode.h"
+#include "clstepcore/mgrnodelist.h"

-#include <dispnode.h>
-#include <dispnodelist.h>
+#include "clstepcore/dispnode.h"
+#include "clstepcore/dispnodelist.h"

-#include <mgrnodearray.h>
+#include "clstepcore/mgrnodearray.h"

 class SC_CORE_EXPORT InstMgrBase {
    public:
@@ -1,8 +1,8 @@
 #ifndef INTERFACESPEC_H
 #define INTERFACESPEC_H

-#include "dictionaryInstance.h"
-#include "explicitItemId.h"
+#include "clstepcore/dictionaryInstance.h"
+#include "clstepcore/explicitItemId.h"
 #include "implicitItemId.h"

 #include "sc_export.h"
@@ -1,9 +1,9 @@
 #ifndef INTERFACEDITEM_H
 #define INTERFACEDITEM_H

-#include "dictionaryInstance.h"
+#include "clstepcore/dictionaryInstance.h"

-#include "sdai.h"
+#include "clstepcore/sdai.h"

 #include "sc_export.h"

@@ -1,7 +1,7 @@
 #ifndef INVERSEATTRIBUTE_H
 #define INVERSEATTRIBUTE_H

-#include "attrDescriptor.h"
+#include "clstepcore/attrDescriptor.h"

 class SC_CORE_EXPORT Inverse_attribute  :    public AttrDescriptor  {

@@ -18,12 +18,12 @@

 class GenericNode;
 class DisplayNode;
-#include <sdai.h>
+#include "clstepcore/sdai.h"

-#include <gennode.h>
-#include <gennodelist.h>
+#include "clutils/gennode.h"
+#include "clutils/gennodelist.h"

-#include <editordefines.h>
+#include "cleditor/editordefines.h"

 class InstMgr;

@@ -19,14 +19,14 @@

 #include <string.h>

-#include <gennode.h>
-#include <gennodelist.h>
+#include "clutils/gennode.h"
+#include "clutils/gennodelist.h"
 //#include <gennode.inline.h>

-#include <mgrnode.h>
-#include <mgrnodelist.h>
+#include "clstepcore/mgrnode.h"
+#include "clstepcore/mgrnodelist.h"

-#include <gennodearray.h>
+#include "clutils/gennodearray.h"

 #define ARRAY_DEFAULT_SIZE (1024)

@@ -17,10 +17,10 @@

 #include <sc_export.h>

-#include <gennode.h>
+#include "clutils/gennode.h"
 //#include <gennode.inline.h>
-#include <gennodelist.h>
-#include <editordefines.h>
+#include "clutils/gennodelist.h"
+#include "cleditor/editordefines.h"

 //////////////////////////////////////////////////////////////////////////////
 // class MgrNodeList
@@ -2,7 +2,7 @@
 #define READ_FUNC_H

 #include <sc_export.h>
-#include <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
@@ -4,7 +4,7 @@
 #include <cstdio>
 #include <cstring>

-#include "Str.h"
+#include "clutils/Str.h"

 #include "sc_export.h"

@@ -22,8 +22,10 @@
 class SC_CORE_EXPORT SchRename {
 public:
    SchRename( const char * sch = "\0", const char * newnm = "\0" ) : next( 0 ) {
-        strcpy( schName, sch );
-        strcpy( newName, newnm );
+        strncpy( schName, sch, BUFSIZ );
+	schName[BUFSIZ] = '\0';
+        strncpy( newName, newnm, BUFSIZ );
+	newName[BUFSIZ] = '\0';
    }
    ~SchRename() {
        delete next;
@@ -41,8 +43,8 @@ public:
    SchRename * next;

 private:
-    char schName[BUFSIZ];
-    char newName[BUFSIZ];
+    char schName[BUFSIZ+1];
+    char newName[BUFSIZ+1];
 };


@@ -18,7 +18,7 @@
 * values for the EXPRESS base types.
 */

-#include "sc_cf.h"
+#include "config.h"
 #include <sc_export.h>

 extern const char * SCLversion;
@@ -27,11 +27,11 @@ extern const char * SCLversion;
 #include <string>


-#include "dictdefs.h"
+#include "clstepcore/dictdefs.h"

-#include "baseType.h"
-#include "Str.h"
-#include "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 "STEPattributeList.h"
-#include "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 <sdaiString.h>
+#include "cldai/sdaiString.h"

-#include <sdaiBinary.h>
+#include "cldai/sdaiBinary.h"

 // define Object which I am calling sdaiObject for now - DAS
-#include <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 <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 <sdaiDaObject.h>
+#include "cldai/sdaiDaObject.h"


-#include <sdaiApplication_instance.h>
-#include <sdaiApplication_instance_set.h>
+#include "clstepcore/sdaiApplication_instance.h"
+#include "cldai/sdaiApplication_instance_set.h"

 /******************************************************************************
 SELECT
@@ -198,18 +198,18 @@ SELECT
    sdaiSelect.h

 ******************************************************************************/
-#include <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 <sdaiModel_contents_list.h>
+#include "cldai/sdaiModel_contents_list.h"

-#include <sdaiSession_instance.h>
-#include <sdaiEntity_extent.h>
-#include <sdaiEntity_extent_set.h>
-#include <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;
@@ -16,7 +16,7 @@
 #include <iostream>

 #include <sc_export.h>
-#include <sdaiDaObject.h>
+#include "cldai/sdaiDaObject.h"

 class EntityAggregate;
 class Inverse_attribute;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Clifford Yapp	5cf8fc1a89	Merge branch 'develop' v0.8.2	2023-09-17 12:07:49 -04:00
Clifford Yapp	c0d3fac5f7	Merge pull request #452 from starseeker/headers Relocate headers to include, add explicit directory prefixes	2023-09-03 23:32:12 -04:00
Clifford Yapp	56da4ab614	Update ap203min example for new header setup.	2023-09-02 20:26:58 -04:00
Clifford Yapp	111d7e94b0	Merge pull request #456 from starseeker/develop Fixes for newer clang compilers and more robust parallel building	2023-09-02 20:15:42 -04:00
Clifford Yapp	db2c3d8e5b	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.	2023-08-23 14:57:10 -04:00
Clifford Yapp	592823b64b	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.	2023-08-23 14:54:33 -04:00
Clifford Yapp	ed8390a0b4	Merge pull request #453 from starseeker/develop Make expparse explicitly depend on scanner header	2022-10-19 18:13:14 -04:00
Clifford Yapp	6fd22a1e0a	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.	2022-10-17 10:02:16 -04:00
Clifford Yapp	f35d25d93d	Missed a header conversion	2022-10-03 21:41:17 -04:00
Clifford Yapp	d824fc0c4e	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.	2022-10-02 17:57:57 -04:00
Clifford Yapp	1bd7ad942b	Remove includes of other lib src directories	2022-10-02 17:57:57 -04:00
Clifford Yapp	bc96f29d6b	Move utils headers	2022-10-02 17:57:57 -04:00
Clifford Yapp	820ca86159	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.	2022-10-02 17:57:57 -04:00
Clifford Yapp	f9f5c71204	Move editor headers	2022-10-02 17:57:57 -04:00
Clifford Yapp	84d939baa7	Missed sdaiString.h	2022-10-02 17:57:57 -04:00
Clifford Yapp	04a5404e60	Move cldai headers	2022-10-02 17:57:57 -04:00
Clifford Yapp	c85720fbb4	Stub in CMake logic for other header dirs	2022-10-02 17:57:57 -04:00
Clifford Yapp	ac19698fde	Move remaining stepcore headers	2022-10-02 17:57:57 -04:00
Clifford Yapp	b36b78ffce	Need to process a few more directories	2022-10-02 17:57:57 -04:00
Clifford Yapp	77a43bc3f2	Move all non STEP* headers in stepcore	2022-10-02 17:57:57 -04:00
Clifford Yapp	fc4edb9b06	Move stepcore headers through r*	2022-10-02 17:57:57 -04:00
Clifford Yapp	6e53c8f833	Relocate i* stepcore headers	2022-10-02 17:57:56 -04:00
Clifford Yapp	9d1583be63	Move the e* clstepcore headers	2022-10-02 17:57:56 -04:00
Clifford Yapp	94c978359d	Move d* headers in clstepcore	2022-10-02 17:57:56 -04:00
Clifford Yapp	8a7e0af3b5	See if we can script some of the move process	2022-10-02 17:57:56 -04:00
Clifford Yapp	840d57c2f1	Move a few more headers	2022-10-02 17:57:56 -04:00
Clifford Yapp	33102ee9e3	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.	2022-10-02 17:57:56 -04:00
Chris HORLER	131fe6e7b4	Merge branch 'develop' v0.8.1	2022-10-02 20:54:53 +01:00
Chris HORLER	627c0935a8	Merge branch 'master' into develop v0.8.1 prep	2022-10-02 20:42:36 +01:00
Chris HORLER	c2842f884a	exp2py: bump package version number and replace SCL references in README and setup.cfg	2022-10-02 16:49:06 +01:00
Chris HORLER	80b4588f6a	exp2py: tests SCL -> stepcode	2022-10-02 16:49:06 +01:00
Chris HORLER	e05bfc7bd4	exp2py: change file header StepClassLibrary (SCL) to STEPCODE project	2022-10-02 16:49:06 +01:00
Chris HORLER	f83e0abc74	exp2py: change SCL package to stepcode package	2022-10-02 16:49:06 +01:00
luz paz	0978cfcd00	Fix typos in src/clstepcore subdir	2022-10-01 17:08:39 +01:00
bitbybit3d	28783de62b	fix target_compile_definitions misspelling	2022-09-26 23:05:39 +01:00
Clifford Yapp	7dbda20be0	Remove base library from stepcode Move specific pieces of logic still in use next to the individual parts of the code that use them, and eliminate base from the code.	2022-09-26 20:52:17 +01:00
Clifford Yapp	fdf271c888	Merge pull request #448 from stepcode/update_dev_guidelines update contributing guidelines to allow more flexibility when accepti…	2022-09-25 15:21:15 -04:00
John Smith	8e9a68968c	Changed Python SCL setup.cfg name to "stepcode-scl" so the package can be deployed to pypi. The current package name, SCL, is too similar to existing pypi package names that the repository will not allow it to be committed. This change does not affect internal package name, which remains "SCL", just the name used to fetch the package from the pypi repository. After this change is committed and posted to pypi, users will be able to fetch the package with `pip install stepcode-scl`.	2022-09-25 16:43:00 +01:00
Clifford Yapp	4bab26918d	strcpy -> strncpy	2022-06-11 20:14:25 +01:00
Clifford Yapp	efd353858e	Use strncpy to transfer nm to name	2022-06-11 20:14:25 +01:00
Clifford Yapp	9b15e1c697	Make a variety of adjustments to string printing, free temporary copy of EXPRto_String output.	2022-06-11 20:14:25 +01:00
Clifford Yapp	64873b4dd7	Use strncat to copy name to buf	2022-06-11 20:14:25 +01:00
Clifford Yapp	28c5d26429	As with BUFSIZ, make sure MAX_LEN buffers have room to null terminate.	2022-06-11 20:14:25 +01:00
Clifford Yapp	43231cdbc9	Set default types, note a bad problem with how sc_hash is set up.	2022-06-11 20:14:25 +01:00
Clifford Yapp	7209a3e75d	Use free on fileList[index]	2022-06-11 20:14:25 +01:00
Clifford Yapp	88e512c92c	Use strncpy to copy path to buf	2022-06-11 20:14:25 +01:00
Clifford Yapp	09deafbe23	Use strncpy to initialize schName and newName	2022-06-11 20:14:25 +01:00
Clifford Yapp	830e29fb80	Add more initializers	2022-06-11 20:14:25 +01:00
Clifford Yapp	3c17e71b63	Make sure we have item, and don't continue after we delete it.	2022-06-11 20:14:25 +01:00
Clifford Yapp	1d46986e80	Passing back the internal pointer to a std::string is evidently a Bad Idea - just send back a std::string.	2022-06-11 20:14:25 +01:00
Clifford Yapp	ca1d62719a	If we need to allocate an EntityNode, clean it up.	2022-06-11 20:14:25 +01:00
Clifford Yapp	a6bea3572e	Delete temporary element after use	2022-06-11 20:14:25 +01:00
Clifford Yapp	ae933edba5	Add destructor, use array delete	2022-06-11 20:14:25 +01:00
Clifford Yapp	93c79df2df	Initialize, fix variable types.	2022-06-11 20:14:25 +01:00
Clifford Yapp	3e9fe17fcd	Delete _headerInstances in destructor	2022-06-11 20:14:25 +01:00
Clifford Yapp	874dca8499	Add destructor for CmdMgr	2022-06-11 20:14:25 +01:00
Clifford Yapp	c7bd9fa995	Use array deletes, clean up temporary objects.	2022-06-11 20:14:25 +01:00
Clifford Yapp	4446d02063	Adjust name of example header as well	2022-06-11 17:41:58 +01:00
Clifford Yapp	97c3d193a1	sc_cf.h -> config.h Remove unused sc_cf_cmake.h.in, rename sc_cf.h to the more standard name "config.h", don't call the generator twice	2022-06-11 17:41:58 +01:00
Clifford Yapp	65e0f704fd	Using newer standards, remove sc_stdbool.h	2022-06-11 17:41:13 +01:00
Clifford Yapp	d36c0dde5b	Add initializers for TYPEis entities	2022-06-11 17:40:25 +01:00
Clifford Yapp	8ed3d2fe33	Fix output for SC_TRACE_FPRINTF option (used for debugging - reports where generated code in exp2cxx output comes from.)	2022-06-11 17:40:25 +01:00
Clifford Yapp	61d34a352c	Add some default initializers in the generated C++ code.	2022-06-11 17:40:25 +01:00
Clifford Yapp	6c9a2582c6	Use calloc to initialize the names array.	2022-06-11 17:33:24 +01:00
Clifford Yapp	0fd354cb39	Make sure BUFSIZ buffers have room for NULL In case we do end up with buffers with contents at the BUFSIZ limit, make sure we leave room to set a null termination char. Not always clear where these buffers might get used or re-used, so just bump their size across the board.	2022-06-11 17:33:24 +01:00
Chris HORLER	fd8b7e3a6b	exp2py: reduce TYPE output to class level pass statement for simple types	2022-06-11 14:18:23 +01:00
Chris HORLER	0be8f439ef	exp2py: add initial OP_GROUP support	2022-06-11 14:18:23 +01:00
Chris HORLER	8a8ea3e23a	exp2py: fix comparisons with None	2022-06-11 14:18:23 +01:00
Chris HORLER	70b5d0d0af	exp2py: expressions are held in a 2-tree, processed recursively * set OP_UNKNOWN on LHS * test for OP_DOT and OP_GROUP when processing identifier_	2022-06-11 14:18:23 +01:00
Chris HORLER	06ee050fb2	exp2py: add "property" to reserved words	2022-06-11 14:18:23 +01:00
Chris HORLER	472bd4cb12	exp2py: fix some indentation errors found in for and while loops	2022-06-11 14:18:23 +01:00
Chris HORLER	fed696dc63	exp2py: raise NotImplementedError when appropriate	2022-06-11 14:18:23 +01:00
Chris HORLER	35da61660b	exp2py: update repo gitignore to ignore all __pycache__ folders	2022-06-11 14:18:23 +01:00
Chris HORLER	0ef7755151	exp2py: first steps to fix output order and dependency logic	2022-06-11 14:18:23 +01:00
Chris HORLER	7aa4309848	exp2py: use relative imports for SCL library	2022-06-11 14:18:23 +01:00
Chris HORLER	3c21bf00ac	Part21 Legacy Parser * optimisations - remove list copy and try clauses - stop using token iterator - tab modules (for ply optimised mode) - add missing t_error function (for ply optimised mode) * useability - add option to only parse the header then exit * fixes - fix ComplexEntity creation, and simpify / correct AST creation	2022-06-11 14:18:23 +01:00
Chris HORLER	0f303d5c06	Part21 alternative Lexer / Parser specification populates an sqlite database	2022-06-11 14:18:23 +01:00
Chris HORLER	cfbd07306d	prototype re2c based LL(3) Part21 parser	2022-06-11 14:18:23 +01:00
Chris HORLER	cd8efa604f	exploration of sqlite3 plugin (based on json1.c) for allowing high performance predicates, intended as a layer between ORM and direct database manipulation	2022-06-11 14:18:23 +01:00
Clifford Yapp	7456652b67	Still getting appveyor in checks list (??)	2021-09-06 19:56:51 -04:00
Clifford Yapp	29f87a6d58	Reverting back to state at commit `548fd82ad7` Subsequent changes caused problems for development, and will need to be merged in more carefully from develop	2021-08-04 15:54:49 -04:00
Cliff Yapp	880a42bb90	Fix example build (Issue #404 ) by adding the sc_cf.h.in file (making a copy rather than a symlink for the sake of Windows.)	2021-01-09 21:17:44 -05:00