Revision: 77958
http://sourceforge.net/p/brlcad/code/77958
Author: starseeker
Date: 2020-12-10 18:32:48 +0000 (Thu, 10 Dec 2020)
Log Message:
-----------
Merge from trunk - r77945 through r77956 and update stepcode to latest
upstream. This should bring extbuild up to date with the equivalent changes in
stepsync.
Modified Paths:
--------------
brlcad/branches/extbuild/NEWS
brlcad/branches/extbuild/TODO
brlcad/branches/extbuild/misc/repoconv/github_ci_actions.yml
brlcad/branches/extbuild/src/conv/step/STEPWrapper.cpp
brlcad/branches/extbuild/src/conv/step/g-step/Assembly_Product.cpp
brlcad/branches/extbuild/src/conv/step/g-step/Default_Geometric_Context.cpp
brlcad/branches/extbuild/src/conv/step/g-step/ON_NurbsCurve.cpp
brlcad/branches/extbuild/src/conv/step/g-step/ON_NurbsSurface.cpp
brlcad/branches/extbuild/src/conv/step/step-g/BSplineCurveWithKnots.cpp
brlcad/branches/extbuild/src/conv/step/step-g/BSplineSurfaceWithKnots.cpp
brlcad/branches/extbuild/src/conv/step/step-g/CartesianPoint.cpp
brlcad/branches/extbuild/src/conv/step/step-g/Direction.cpp
brlcad/branches/extbuild/src/conv/step/step-g/RationalBSplineCurve.cpp
brlcad/branches/extbuild/src/conv/step/step-g/RationalBSplineSurface.cpp
brlcad/branches/extbuild/src/conv/step/step-g/ShellBasedSurfaceModel.cpp
brlcad/branches/extbuild/src/conv/step/step-g/SurfaceCurve.cpp
brlcad/branches/extbuild/src/conv/step/step-g/TrimmedCurve.cpp
brlcad/branches/extbuild/src/conv/step/util/list_elements.cpp
brlcad/branches/extbuild/src/libbrep/cdt/fast.cpp
brlcad/branches/extbuild/src/other/ext/stepcode/CMakeLists.txt
brlcad/branches/extbuild/src/other/ext/stepcode/README.md
brlcad/branches/extbuild/src/other/ext/stepcode/include/exppp/exppp.h
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/alg.h
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/alloc.h
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/basic.h
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/caseitem.h
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/dict.h
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/entity.h
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/error.h
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/exp_kw.h
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/expbasic.h
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/expr.h
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/express.h
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/factory.h
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/hash.h
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/info.h
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/lexact.h
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/linklist.h
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/memory.h
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/object.h
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/resolve.h
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/schema.h
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/scope.h
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/stmt.h
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/symbol.h
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/type.h
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/variable.h
brlcad/branches/extbuild/src/other/ext/stepcode/include/ordered_attrs.h
brlcad/branches/extbuild/src/other/ext/stepcode/misc/astyle.cfg
brlcad/branches/extbuild/src/other/ext/stepcode/src/base/judy/misc/judy64n.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/base/judy/src/judy.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/base/judy/src/judy.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/base/judy/src/judyL2Array.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/base/judy/src/judyLArray.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/base/judy/src/judyS2Array.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/base/judy/src/judySArray.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/base/judy/test/hexSort.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/base/judy/test/judyL2test.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/base/judy/test/judyLtest.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/base/judy/test/judyS2test.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/base/judy/test/judyStest.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/base/judy/test/pennySort.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/base/judy/test/sort.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/base/judy/test/sort.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/base/path2str.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/base/path2str.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/base/sc_benchmark.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/base/sc_benchmark.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/base/sc_getopt.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/base/sc_getopt.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/base/sc_memmgr.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/base/sc_memmgr.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/base/sc_mkdir.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/base/sc_mkdir.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/base/sc_stdio.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/base/sc_trace_fprintf.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/base/sc_trace_fprintf.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/cldai/sdaiApplication_instance_set.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/cldai/sdaiApplication_instance_set.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/cldai/sdaiBinary.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/cldai/sdaiBinary.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/cldai/sdaiDaObject.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/cldai/sdaiDaObject.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/cldai/sdaiEntity_extent.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/cldai/sdaiEntity_extent.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/cldai/sdaiEntity_extent_set.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/cldai/sdaiEntity_extent_set.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/cldai/sdaiEnum.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/cldai/sdaiEnum.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/cldai/sdaiModel_contents.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/cldai/sdaiModel_contents.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/cldai/sdaiModel_contents_list.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/cldai/sdaiModel_contents_list.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/cldai/sdaiObject.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/cldai/sdaiObject.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/cldai/sdaiSession_instance.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/cldai/sdaiSession_instance.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/cldai/sdaiString.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/cldai/sdaiString.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/cleditor/STEPfile.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/cleditor/STEPfile.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/cleditor/STEPfile.inline.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/cleditor/SdaiHeaderSchema.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/cleditor/SdaiHeaderSchema.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/cleditor/SdaiHeaderSchemaAll.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/cleditor/SdaiHeaderSchemaClasses.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/cleditor/SdaiHeaderSchemaInit.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/cleditor/SdaiSchemaInit.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/cleditor/SdaiSchemaInit.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/cleditor/cmdmgr.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/cleditor/cmdmgr.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/cleditor/seeinfodefault.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/cllazyfile/headerSectionReader.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/cllazyfile/instMgrHelper.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/cllazyfile/lazyDataSectionReader.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/cllazyfile/lazyDataSectionReader.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/cllazyfile/lazyFileReader.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/cllazyfile/lazyFileReader.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/cllazyfile/lazyInstMgr.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/cllazyfile/lazyInstMgr.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/cllazyfile/lazyP21DataSectionReader.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/cllazyfile/lazyP21DataSectionReader.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/cllazyfile/lazyRefs.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/cllazyfile/lazyTypes.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/cllazyfile/lazy_test.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/cllazyfile/p21HeaderSectionReader.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/cllazyfile/p21HeaderSectionReader.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/cllazyfile/sectionReader.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/cllazyfile/sectionReader.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/Registry.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/Registry.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/STEPaggrBinary.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/STEPaggrBinary.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/STEPaggrEntity.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/STEPaggrEntity.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/STEPaggrEnum.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/STEPaggrEnum.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/STEPaggrGeneric.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/STEPaggrGeneric.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/STEPaggrInt.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/STEPaggrInt.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/STEPaggrReal.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/STEPaggrReal.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/STEPaggrSelect.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/STEPaggrSelect.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/STEPaggrString.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/STEPaggrString.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/STEPaggregate.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/STEPaggregate.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/STEPattribute.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/STEPattribute.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/STEPattributeList.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/STEPattributeList.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/STEPcomplex.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/STEPcomplex.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/STEPinvAttrList.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/STEPinvAttrList.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/STEPundefined.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/STEPundefined.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/SingleLinkList.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/SingleLinkList.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/SubSuperIterators.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/aggrTypeDescriptor.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/aggrTypeDescriptor.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/attrDescriptor.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/attrDescriptor.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/attrDescriptorList.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/attrDescriptorList.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/collect.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/complexSupport.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/complexlist.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/create_Aggr.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/create_Aggr.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/derivedAttribute.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/derivedAttribute.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/dictSchema.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/dictSchema.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/dictdefs.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/dictionaryInstance.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/dispnode.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/dispnode.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/dispnodelist.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/dispnodelist.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/entityDescriptor.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/entityDescriptor.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/entityDescriptorList.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/entityDescriptorList.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/entlist.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/entnode.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/enumTypeDescriptor.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/enumTypeDescriptor.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/explicitItemId.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/explicitItemId.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/globalRule.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/globalRule.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/implicitItemId.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/implicitItemId.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/instmgr.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/instmgr.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/interfaceSpec.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/interfaceSpec.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/interfacedItem.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/interfacedItem.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/inverseAttribute.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/inverseAttribute.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/inverseAttributeList.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/inverseAttributeList.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/match-ors.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/mgrnode.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/mgrnode.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/mgrnodearray.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/mgrnodearray.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/mgrnodelist.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/mgrnodelist.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/multlist.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/needFunc.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/needFunc.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/non-ors.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/orlist.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/print.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/read_func.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/read_func.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/realTypeDescriptor.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/schRename.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/schRename.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/sdai.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/sdai.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/sdaiApplication_instance.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/sdaiApplication_instance.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/sdaiSelect.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/sdaiSelect.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/selectTypeDescriptor.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/selectTypeDescriptor.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/stringTypeDescriptor.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/superInvAttrIter.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/test/CMakeLists.txt
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/test/test_SupertypesIterator.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/test/test_null_attr.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/test/test_operators_SDAI_Select.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/test/test_operators_STEPattribute.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/trynext.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/typeDescriptor.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/typeDescriptor.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/typeDescriptorList.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/typeDescriptorList.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/typeOrRuleVar.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/typeOrRuleVar.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/uniquenessRule.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/uniquenessRule.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/whereRule.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clstepcore/whereRule.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clutils/Str.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clutils/Str.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clutils/dirobj.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clutils/dirobj.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clutils/errordesc.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clutils/errordesc.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clutils/gennode.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clutils/gennode.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clutils/gennodearray.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clutils/gennodearray.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clutils/gennodelist.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clutils/gennodelist.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/clutils/sc_hash.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/clutils/sc_hash.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2cxx/class_strings.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2cxx/class_strings.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2cxx/classes.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2cxx/classes.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2cxx/classes_attribute.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2cxx/classes_attribute.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2cxx/classes_entity.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2cxx/classes_entity.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2cxx/classes_misc.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2cxx/classes_type.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2cxx/classes_type.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2cxx/classes_wrapper.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2cxx/collect.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2cxx/complexSupport.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2cxx/complexlist.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2cxx/entlist.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2cxx/entnode.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2cxx/expressbuild.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2cxx/fedex_main.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2cxx/genCxxFilenames.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2cxx/genCxxFilenames.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2cxx/match-ors.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2cxx/multlist.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2cxx/multpass.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2cxx/non-ors.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2cxx/orlist.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2cxx/print.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2cxx/rules.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2cxx/rules.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2cxx/selects.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2cxx/trynext.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2cxx/write.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2python/src/classes.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2python/src/classes_misc_python.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2python/src/classes_python.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2python/src/classes_wrapper_python.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2python/src/complexSupport.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2python/src/fedex_main_python.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2python/src/multpass_python.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/exp2python/src/selects_python.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/exppp-main.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/exppp.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/pp.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/pretty_alg.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/pretty_alg.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/pretty_case.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/pretty_case.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/pretty_entity.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/pretty_entity.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/pretty_expr.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/pretty_expr.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/pretty_express.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/pretty_express.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/pretty_func.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/pretty_func.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/pretty_loop.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/pretty_loop.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/pretty_proc.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/pretty_proc.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/pretty_ref.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/pretty_ref.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/pretty_rule.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/pretty_rule.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/pretty_schema.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/pretty_schema.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/pretty_scope.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/pretty_scope.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/pretty_stmt.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/pretty_stmt.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/pretty_subtype.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/pretty_subtype.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/pretty_type.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/pretty_type.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/pretty_where.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/pretty_where.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/test/test_breakLongStr.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/alg.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/alloc.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/caseitem.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/dict.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/entity.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/error.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/exp_kw.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/expr.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/express.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/factory.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/fedex.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/generated/expparse.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/generated/expscan.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/generated/expscan.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/hash.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/info.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/inithook.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/lexact.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/linklist.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/memory.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/object.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/ordered_attrs.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/resolve.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/resolve2.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/schema.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/scope.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/stmt.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/symbol.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/test/CMakeLists.txt
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/test/driver.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/test/driver.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/test/fff.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/test/print_attrs.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/test/print_schemas.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/test/test_expr.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/test/test_express.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/test/test_resolve.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/test/test_resolve2.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/test/test_schema.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/test/test_scope.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/test/test_type.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/token_type.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/type.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/variable.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/test/SEarritr.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/test/generate_express/generate_express.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/test/needFunc.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/test/needFunc.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/test/p21read/p21read.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/test/scl2html/scl2html.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/test/tests.h
brlcad/branches/extbuild/src/other/ext/stepcode/src/test/tio/tio.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/test/treg/treg.cc
brlcad/branches/extbuild/src/other/ext/stepcode/src/test/tstatic/tstatic.cc
brlcad/branches/extbuild/src/other/ext/stepcode/test/cpp/CMakeLists.txt
brlcad/branches/extbuild/src/other/ext/stepcode/test/cpp/schema_specific/CMakeLists.txt
brlcad/branches/extbuild/src/other/ext/stepcode/test/cpp/schema_specific/aggregate_bound_runtime.cc
brlcad/branches/extbuild/src/other/ext/stepcode/test/cpp/schema_specific/attribute.cc
brlcad/branches/extbuild/src/other/ext/stepcode/test/cpp/schema_specific/inverse_attr1.cc
brlcad/branches/extbuild/src/other/ext/stepcode/test/cpp/schema_specific/inverse_attr2.cc
brlcad/branches/extbuild/src/other/ext/stepcode/test/cpp/schema_specific/inverse_attr3.cc
brlcad/branches/extbuild/src/other/ext/stepcode/test/cpp/schema_specific/stepfile_rw_progress.cc
brlcad/branches/extbuild/src/other/ext/stepcode/test/p21/CMakeLists.txt
brlcad/branches/extbuild/src/other/ext/stepcode.dist
brlcad/branches/extbuild/src/tclscripts/CMakeLists.txt
Removed Paths:
-------------
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/generated/CMakeLists.txt
Property Changed:
----------------
brlcad/branches/extbuild/
brlcad/branches/extbuild/NEWS
brlcad/branches/extbuild/src/other/
Index: brlcad/branches/extbuild
===================================================================
--- brlcad/branches/extbuild 2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild 2020-12-10 18:32:48 UTC (rev 77958)
Property changes on: brlcad/branches/extbuild
___________________________________________________________________
Modified: svn:mergeinfo
## -11,4 +11,4 ##
/brlcad/branches/osg:62110-62113
/brlcad/branches/prep-cache:68236-68933
/brlcad/branches/tcltk86:68300-75257
-/brlcad/trunk:77547-77945
\ No newline at end of property
+/brlcad/trunk:77547-77956
\ No newline at end of property
Modified: brlcad/branches/extbuild/NEWS
===================================================================
--- brlcad/branches/extbuild/NEWS 2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/NEWS 2020-12-10 18:32:48 UTC (rev 77958)
@@ -13,6 +13,7 @@
--- 2020-xx-xx Release 7.32.2 ---
----------------------------------------------------------------------
+* fixed crash when trying to shade invalid breps - Cliff Yapp
* changed 'mvall' to rename all refs even w/ no object - Sean Morrison
* fixed MGED search command crash on empty database - Sean Morrison
* improved performance calculating BoT bounding boxes - Vikram Atreya
Property changes on: brlcad/branches/extbuild/NEWS
___________________________________________________________________
Modified: svn:mergeinfo
## -9,4 +9,4 ##
/brlcad/branches/osg/NEWS:62110-62113
/brlcad/branches/prep-cache/NEWS:68236-68933
/brlcad/branches/tcltk86/NEWS:68300-75257
-/brlcad/trunk/NEWS:77547-77657,77660-77689,77700-77770
\ No newline at end of property
+/brlcad/trunk/NEWS:77547-77657,77660-77689,77700-77770,77946-77956
\ No newline at end of property
Modified: brlcad/branches/extbuild/TODO
===================================================================
--- brlcad/branches/extbuild/TODO 2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/TODO 2020-12-10 18:32:48 UTC (rev 77958)
@@ -196,7 +196,6 @@
* make rtarea display a cross-hair and perhaps coordinates for the
center of area if run from within mged.
-=======
* add an option to rtarea for onehit. this is probably best as an
option that reports the requested objects only and then has a
verbose option for the more detailed hiearchical report that is
Modified: brlcad/branches/extbuild/misc/repoconv/github_ci_actions.yml
===================================================================
--- brlcad/branches/extbuild/misc/repoconv/github_ci_actions.yml
2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/misc/repoconv/github_ci_actions.yml
2020-12-10 18:32:48 UTC (rev 77958)
@@ -35,7 +35,7 @@
- name: Configure
run: |
cmake -S . -B build -G Ninja -D CMAKE_C_COMPILER="cl.exe" -D
CMAKE_CXX_COMPILER="cl.exe" -D ENABLE_ALL=ON -D CMAKE_BUILD_TYPE=Release
- #cmake -S . -B build -D CMAKE_C_COMPILER="cl.exe" -D
CMAKE_CXX_COMPILER="cl.exe" -D ENABLE_ALL=ON
+ #cmake -S . -B build -D ENABLE_ALL=ON
powershell Write-VolumeCache C
powershell Write-VolumeCache D
@@ -42,13 +42,14 @@
- name: Build
#run: cd build && ninja -j1 -v STEPCODE_BLD && cd
src/other/ext/STEPCODE_BLD-prefix/src/STEPCODE_BLD-build && ninja clean &&
ninja -j1 -v
#run: cmake --build build --config Release --target STEPCODE_BLD && cd
build/src/other/ext/STEPCODE_BLD-prefix/src/STEPCODE_BLD-build && msbuild
ALL_BUILD.vcxproj -t:clean && msbuild ALL_BUILD.vcxproj -v:diag
- run: cmake --build build --config Release --target package
+ run: cd build && ninja -j1 -v
+ #run: cmake --build build --config Release --target package
- - name: Upload Package
- uses: actions/upload-artifact@v2
- with:
- name: BRLCAD_Windows
- path: ${{ github.workspace }}/build/BRL-CAD*exe
+# - name: Upload Package
+# uses: actions/upload-artifact@v2
+# with:
+# name: BRLCAD_Windows
+# path: ${{ github.workspace }}/build/BRL-CAD*exe
linux:
name: Ubuntu Latest GCC
@@ -75,11 +76,11 @@
export PATH=$ENV{GITHUB_WORKSPACE}:$PATH
cmake --build build --config Release --target package
- - name: Upload Package
- uses: actions/upload-artifact@v2
- with:
- name: BRLCAD_Linux
- path: ${{ github.workspace }}/build/BRL-CAD*gz
+# - name: Upload Package
+# uses: actions/upload-artifact@v2
+# with:
+# name: BRLCAD_Linux
+# path: ${{ github.workspace }}/build/BRL-CAD*gz
osx:
name: macOS Latest Clang
@@ -108,10 +109,10 @@
export PATH=$ENV{GITHUB_WORKSPACE}:$PATH
cmake --build build --config Release --target package
- - name: Upload Package
- uses: actions/upload-artifact@v2
- with:
- name: BRLCAD_OSX
- path: ${{ github.workspace }}/build/BRL-CAD*gz
+# - name: Upload Package
+# uses: actions/upload-artifact@v2
+# with:
+# name: BRLCAD_OSX
+# path: ${{ github.workspace }}/build/BRL-CAD*gz
Modified: brlcad/branches/extbuild/src/conv/step/STEPWrapper.cpp
===================================================================
--- brlcad/branches/extbuild/src/conv/step/STEPWrapper.cpp 2020-12-10
18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/conv/step/STEPWrapper.cpp 2020-12-10
18:32:48 UTC (rev 77958)
@@ -763,7 +763,7 @@
std::string attrname = attr->Name();
if (attrname.compare(name) == 0) {
- retValue = (Boolean)(*attr->Raw()->e).asInt();
+ retValue = (Boolean)(*attr->ptr.e).asInt();
if (retValue > BUnset) {
retValue = BUnset;
}
@@ -787,7 +787,7 @@
std::string attrname = attr->Name();
if (attrname.compare(name) == 0) {
- retValue = (*attr->Raw()->e).asInt();
+ retValue = (*attr->ptr.e).asInt();
break;
}
}
@@ -808,7 +808,7 @@
std::string attrname = attr->Name();
if (attrname.compare(name) == 0) {
- retValue = (Logical)(*attr->Raw()->e).asInt();
+ retValue = (Logical)(*attr->ptr.e).asInt();
if (retValue > LUnknown) {
retValue = LUnknown;
}
@@ -875,7 +875,7 @@
std::string attrname = attr->Name();
if (attrname.compare(name) == 0) {
- retValue = (SDAI_Application_instance *)*attr->Raw()->c;
+ retValue = (SDAI_Application_instance *)*attr->ptr.c;
break;
}
}
@@ -896,7 +896,7 @@
std::string attrname = attr->Name();
if (attrname.compare(name) == 0) {
- retValue = *attr->Raw()->i;
+ retValue = *attr->ptr.i;
break;
}
}
@@ -917,7 +917,7 @@
std::string attrname = attr->Name();
if (attrname.compare(name) == 0) {
- retValue = *attr->Raw()->r;
+ retValue = *attr->ptr.r;
break;
}
}
@@ -939,7 +939,7 @@
std::string attrname = attr->Name();
if (attrname.compare(name) == 0) {
- STEPaggregate *sa = (STEPaggregate *)attr->Raw()->a;
+ STEPaggregate *sa = (STEPaggregate *)attr->ptr.a;
EntityNode *sn = (EntityNode *)sa->GetHead();
SDAI_Application_instance *se;
@@ -977,7 +977,7 @@
//std::cout << attr->TypeName() << std::endl;
- GenericAggregate_ptr gp = (GenericAggregate_ptr)attr->Raw()->a;
+ GenericAggregate_ptr gp = (GenericAggregate_ptr)attr->ptr.a;
STEPnode *sn = (STEPnode *)gp->GetHead();
//EntityAggregate *ag = new EntityAggregate();
@@ -1113,7 +1113,7 @@
std::string attrname = attr->Name();
if (attrname.compare(name) == 0) {
- retValue = (Boolean)(*attr->Raw()->e).asInt();
+ retValue = (Boolean)(*attr->ptr.e).asInt();
if (retValue > BUnset) {
retValue = BUnset;
}
@@ -1137,8 +1137,8 @@
std::string attrname = attr->Name();
if (attrname.compare(name) == 0) {
- retValue = (*attr->Raw()->e).asInt();
- //std::cout << "debug enum: " << (*attr->Raw()->e).asStr(attrval)
<< std::endl;
+ retValue = (*attr->ptr.e).asInt();
+ //std::cout << "debug enum: " << (*attr->ptr.e).asStr(attrval) <<
std::endl;
break;
}
}
@@ -1164,7 +1164,7 @@
std::string attrval;
//std::cout << "attr:" << name << ":" << attr->TypeName() << ":" <<
attr->Name() << std::endl;
//std::cout << "attr:" << attr->asStr(attrval) << std::endl;
- retValue = (SDAI_Application_instance *)*attr->Raw()->c;
+ retValue = (SDAI_Application_instance *)*attr->ptr.c;
break;
}
}
@@ -1184,7 +1184,7 @@
std::string attrname = attr->Name();
if (attrname.compare(name) == 0) {
- retValue = (Logical)(*attr->Raw()->e).asInt();
+ retValue = (Logical)(*attr->ptr.e).asInt();
if (retValue > LUnknown) {
retValue = LUnknown;
}
@@ -1207,7 +1207,7 @@
std::string attrname = attr->Name();
if (attrname.compare(name) == 0) {
- retValue = *attr->Raw()->i;
+ retValue = *attr->ptr.i;
break;
}
}
@@ -1227,7 +1227,7 @@
std::string attrname = attr->Name();
if (attrname.compare(name) == 0) {
- retValue = *attr->Raw()->r;
+ retValue = *attr->ptr.r;
break;
}
}
@@ -1247,7 +1247,7 @@
std::string attrname = attr->Name();
if (attrname.compare(name) == 0) {
- retValue = (SDAI_Select *)attr->Raw()->sh;
+ retValue = (SDAI_Select *)attr->ptr.sh;
break;
}
}
@@ -1268,7 +1268,7 @@
std::string attrname = attr->Name();
if (attrname.compare(name) == 0) {
- STEPaggregate *sa = (STEPaggregate *)attr->Raw()->a;
+ STEPaggregate *sa = (STEPaggregate *)attr->ptr.a;
EntityNode *sn = (EntityNode *)sa->GetHead();
SDAI_Application_instance *se;
@@ -1300,7 +1300,7 @@
if (attrname.compare(name) == 0) {
- SelectAggregate *sa = (SelectAggregate *)attr->Raw()->a;
+ SelectAggregate *sa = (SelectAggregate *)attr->ptr.a;
SelectNode *sn = (SelectNode *)sa->GetHead();
while (sn) {
l->push_back(sn->node);
@@ -1333,7 +1333,7 @@
//std::cout << attr->TypeName() << std::endl;
- GenericAggregate_ptr gp = (GenericAggregate_ptr)attr->Raw()->a;
+ GenericAggregate_ptr gp = (GenericAggregate_ptr)attr->ptr.a;
STEPnode *sn = (STEPnode *)gp->GetHead();
//EntityAggregate *ag = new EntityAggregate();
@@ -1377,7 +1377,7 @@
//std::cout << attr->TypeName() << std::endl;
- GenericAggregate_ptr gp = (GenericAggregate_ptr)attr->Raw()->a;
+ GenericAggregate_ptr gp = (GenericAggregate_ptr)attr->ptr.a;
STEPnode *sn = (STEPnode *)gp->GetHead();
//EntityAggregate *ag = new EntityAggregate();
@@ -1463,7 +1463,10 @@
std::string attrname = attr->Name();
if (attrname.compare(name) == 0) {
- retValue = attr->asStr(attrval.c_str());
+ const char *str = attr->asStr(attrval);
+ if (str != NULL) {
+ retValue = str;
+ }
break;
}
}
@@ -1589,11 +1592,11 @@
for (int i = 0; i < level; i++) {
std::cout << " ";
}
- std::cout << "Description:" << se->getEDesc()->Description() << std::endl;
+ std::cout << "Description:" << se->eDesc->Description() << std::endl;
for (int i = 0; i < level; i++) {
std::cout << " ";
}
- std::cout << "Entity Type:" << se->getEDesc()->Type() << std::endl;
+ std::cout << "Entity Type:" << se->eDesc->Type() << std::endl;
for (int i = 0; i < level; i++) {
std::cout << " ";
}
@@ -1607,7 +1610,7 @@
for (int i = 0; i <= level; i++) {
std::cout << " ";
}
- std::cout << attr->Name() << ": " << attr->asStr(attrval.c_str()) << "
TypeName: " << attr->TypeName() << " Type: " << attr->Type() << std::endl;
+ std::cout << attr->Name() << ": " << attr->asStr(attrval) << "
TypeName: " << attr->TypeName() << " Type: " << attr->Type() << std::endl;
if (attr->Type() == 256) {
if (attr->IsDerived()) {
for (int i = 0; i <= level; i++) {
@@ -1615,10 +1618,10 @@
}
std::cout << " ********* DERIVED *********" << std::endl;
} else {
- printEntity(*(attr->Raw()->c), level + 2);
+ printEntity(*(attr->ptr.c), level + 2);
}
} else if ((attr->Type() == SET_TYPE) || (attr->Type() == LIST_TYPE)) {
- STEPaggregate *sa = (STEPaggregate *)(attr->Raw()->a);
+ STEPaggregate *sa = (STEPaggregate *)(attr->ptr.a);
// std::cout << "aggr:" << sa->asStr(attrval) << " BaseType:" <<
attr->BaseType() << std::endl;
@@ -1647,9 +1650,9 @@
while (sn != NULL) {
sse = (SDAI_Application_instance *)sn->node;
- if (((sse->getEDesc()->Type() == SET_TYPE) || (sse->getEDesc()->Type()
== LIST_TYPE)) && (sse->getEDesc()->BaseType() == ENTITY_TYPE)) {
+ if (((sse->eDesc->Type() == SET_TYPE) || (sse->eDesc->Type() ==
LIST_TYPE)) && (sse->eDesc->BaseType() == ENTITY_TYPE)) {
printEntityAggregate((STEPaggregate *)sse, level + 2);
- } else if (sse->getEDesc()->Type() == ENTITY_TYPE) {
+ } else if (sse->eDesc->Type() == ENTITY_TYPE) {
printEntity(sse, level + 2);
} else {
std::cout << "Instance Type not handled:" << std::endl;
Modified: brlcad/branches/extbuild/src/conv/step/g-step/Assembly_Product.cpp
===================================================================
--- brlcad/branches/extbuild/src/conv/step/g-step/Assembly_Product.cpp
2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/conv/step/g-step/Assembly_Product.cpp
2020-12-10 18:32:48 UTC (rev 77958)
@@ -267,12 +267,12 @@
if (!bu_strcmp(attr->Name(), "name")) attr->StrToVal("''");
if (!bu_strcmp(attr->Name(), "description")) attr->StrToVal("''");
if (!bu_strcmp(attr->Name(), "rep_1")) {
- attr->Raw()->c = new (STEPentity *);
- *(attr->Raw()->c) = parent;
+ attr->ptr.c = new (STEPentity *);
+ *(attr->ptr.c) = parent;
}
if (!bu_strcmp(attr->Name(), "rep_2")) {
- attr->Raw()->c = new (STEPentity *);
- *(attr->Raw()->c) = child;
+ attr->ptr.c = new (STEPentity *);
+ *(attr->ptr.c) = child;
}
}
@@ -282,7 +282,7 @@
while ((attr = stepcomplex->NextAttribute()) != NULL) {
if (!bu_strcmp(attr->Name(), "transformation_operator")) {
SdaiTransformation *transformation = new
SdaiTransformation((SdaiItem_defined_transformation *)input_transformation);
- attr->Raw()->sh = transformation;
+ attr->ptr.sh = transformation;
}
}
Modified:
brlcad/branches/extbuild/src/conv/step/g-step/Default_Geometric_Context.cpp
===================================================================
--- brlcad/branches/extbuild/src/conv/step/g-step/Default_Geometric_Context.cpp
2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/conv/step/g-step/Default_Geometric_Context.cpp
2020-12-10 18:32:48 UTC (rev 77958)
@@ -50,8 +50,8 @@
if (!bu_strcmp(stepcomplex->EntityName(), "Si_Unit")) {
stepcomplex->ResetAttributes();
while ((attr = stepcomplex->NextAttribute()) != NULL) {
- if (!bu_strcmp(attr->Name(), "prefix")) attr->Raw()->e = new
SdaiSi_prefix_var(Si_prefix__milli);
- if (!bu_strcmp(attr->Name(), "name")) attr->Raw()->e = new
SdaiSi_unit_name_var(Si_unit_name__metre);
+ if (!bu_strcmp(attr->Name(), "prefix")) attr->ptr.e = new
SdaiSi_prefix_var(Si_prefix__milli);
+ if (!bu_strcmp(attr->Name(), "name")) attr->ptr.e = new
SdaiSi_unit_name_var(Si_unit_name__metre);
}
}
stepcomplex = stepcomplex->sc;
@@ -61,7 +61,7 @@
uncertainty->ResetAttributes();
{
while ((attr = uncertainty->NextAttribute()) != NULL) {
- if (!bu_strcmp(attr->Name(), "unit_component")) attr->Raw()->sh =
new_unit;
+ if (!bu_strcmp(attr->Name(), "unit_component")) attr->ptr.sh =
new_unit;
if (!bu_strcmp(attr->Name(), "value_component"))
attr->StrToVal("0.05");
}
}
@@ -74,7 +74,7 @@
if (!bu_strcmp(stepcomplex->EntityName(), "Si_Unit")) {
stepcomplex->ResetAttributes();
while ((attr = stepcomplex->NextAttribute()) != NULL) {
- if (!bu_strcmp(attr->Name(), "name")) attr->Raw()->e = new
SdaiSi_unit_name_var(Si_unit_name__steradian);
+ if (!bu_strcmp(attr->Name(), "name")) attr->ptr.e = new
SdaiSi_unit_name_var(Si_unit_name__steradian);
}
}
stepcomplex = stepcomplex->sc;
@@ -89,7 +89,7 @@
if (!bu_strcmp(stepcomplex->EntityName(), "Si_Unit")) {
stepcomplex->ResetAttributes();
while ((attr = stepcomplex->NextAttribute()) != NULL) {
- if (!bu_strcmp(attr->Name(), "name")) attr->Raw()->e = new
SdaiSi_unit_name_var(Si_unit_name__radian);
+ if (!bu_strcmp(attr->Name(), "name")) attr->ptr.e = new
SdaiSi_unit_name_var(Si_unit_name__radian);
}
}
stepcomplex = stepcomplex->sc;
@@ -129,8 +129,8 @@
while ((attr = stepcomplex->NextAttribute()) != NULL) {
if (!bu_strcmp(attr->Name(), "name"))
attr->StrToVal("'DEGREES'");
if (!bu_strcmp(attr->Name(), "conversion_factor")) {
- attr->Raw()->c = new (STEPentity *);
- *(attr->Raw()->c) = (STEPentity *)(p_ang_measure_with_unit);
+ attr->ptr.c = new (STEPentity *);
+ *(attr->ptr.c) = (STEPentity *)(p_ang_measure_with_unit);
}
}
}
@@ -138,8 +138,8 @@
stepcomplex->ResetAttributes();
while ((attr = stepcomplex->NextAttribute()) != NULL) {
if (!bu_strcmp(attr->Name(), "dimensions")) {
- attr->Raw()->c = new (STEPentity *);
- *(attr->Raw()->c) = (STEPentity *)(dimensional_exp);
+ attr->ptr.c = new (STEPentity *);
+ *(attr->ptr.c) = (STEPentity *)(dimensional_exp);
}
}
}
@@ -172,7 +172,7 @@
if (!bu_strcmp(attr->Name(), "uncertainty")) {
EntityAggregate *unc_agg = new EntityAggregate();
unc_agg->AddNode(new EntityNode((SDAI_Application_instance
*)uncertainty));
- attr->Raw()->a = unc_agg;
+ attr->ptr.a = unc_agg;
}
}
@@ -187,7 +187,7 @@
unit_assigned_agg->AddNode(new
EntityNode((SDAI_Application_instance *)unit_complex));
unit_assigned_agg->AddNode(new
EntityNode((SDAI_Application_instance *)ua_entry_2));
unit_assigned_agg->AddNode(new
EntityNode((SDAI_Application_instance *)ua_entry_1));
- attr->Raw()->a = unit_assigned_agg;
+ attr->ptr.a = unit_assigned_agg;
}
}
}
Modified: brlcad/branches/extbuild/src/conv/step/g-step/ON_NurbsCurve.cpp
===================================================================
--- brlcad/branches/extbuild/src/conv/step/g-step/ON_NurbsCurve.cpp
2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/conv/step/g-step/ON_NurbsCurve.cpp
2020-12-10 18:32:48 UTC (rev 77958)
@@ -81,16 +81,16 @@
stepcomplex->ResetAttributes();
while ((attr = stepcomplex->NextAttribute()) != NULL) {
if (!bu_strcmp(attr->Name(), "degree")) {
- attr->Raw()->i = new SDAI_Integer(ncurve->Degree());
+ attr->ptr.i = new SDAI_Integer(ncurve->Degree());
}
if (!bu_strcmp(attr->Name(), "control_points_list")) {
EntityAggregate *control_pnts= new EntityAggregate();
ON_NurbsCurveCV_to_EntityAggregate(control_pnts, ncurve, info);
- attr->Raw()->a = control_pnts;
+ attr->ptr.a = control_pnts;
}
- if (!bu_strcmp(attr->Name(), "curve_form")) attr->Raw()->e = new
SdaiB_spline_curve_form_var(B_spline_curve_form__unspecified);
- if (!bu_strcmp(attr->Name(), "closed_curve")) attr->Raw()->e = new
SDAI_LOGICAL((Logical)(ncurve->IsClosed()));
- if (!bu_strcmp(attr->Name(), "self_intersect")) attr->Raw()->e = new
SDAI_LOGICAL(LFalse);
+ if (!bu_strcmp(attr->Name(), "curve_form")) attr->ptr.e = new
SdaiB_spline_curve_form_var(B_spline_curve_form__unspecified);
+ if (!bu_strcmp(attr->Name(), "closed_curve")) attr->ptr.e = new
SDAI_LOGICAL((Logical)(ncurve->IsClosed()));
+ if (!bu_strcmp(attr->Name(), "self_intersect")) attr->ptr.e = new
SDAI_LOGICAL(LFalse);
}
/* Set knots */
@@ -101,12 +101,12 @@
ON_NurbsCurveKnots_to_Aggregates(knot_multiplicities, knots, ncurve);
while ((attr = stepcomplex->NextAttribute()) != NULL) {
if (!bu_strcmp(attr->Name(), "knot_multiplicities")) {
- attr->Raw()->a = knot_multiplicities;
+ attr->ptr.a = knot_multiplicities;
}
if (!bu_strcmp(attr->Name(), "knots")) {
- attr->Raw()->a = knots;
+ attr->ptr.a = knots;
}
- if (!bu_strcmp(attr->Name(), "knot_spec")) attr->Raw()->e = new
SdaiKnot_type_var(Knot_type__unspecified);
+ if (!bu_strcmp(attr->Name(), "knot_spec")) attr->ptr.e = new
SdaiKnot_type_var(Knot_type__unspecified);
}
/* Set weights */
@@ -120,7 +120,7 @@
wnode->value = ncurve->Weight(i);
weights->AddNode(wnode);
}
- attr->Raw()->a = weights;
+ attr->ptr.a = weights;
}
/* Representation item */
Modified: brlcad/branches/extbuild/src/conv/step/g-step/ON_NurbsSurface.cpp
===================================================================
--- brlcad/branches/extbuild/src/conv/step/g-step/ON_NurbsSurface.cpp
2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/conv/step/g-step/ON_NurbsSurface.cpp
2020-12-10 18:32:48 UTC (rev 77958)
@@ -127,19 +127,19 @@
stepcomplex = complex_entity->EntityPart("b_spline_surface");
stepcomplex->ResetAttributes();
while ((attr = stepcomplex->NextAttribute()) != NULL) {
- if (!bu_strcmp(attr->Name(), "u_degree")) attr->Raw()->i = new
SDAI_Integer(nsurface->Degree(0));
- if (!bu_strcmp(attr->Name(), "v_degree")) attr->Raw()->i = new
SDAI_Integer(nsurface->Degree(1));
+ if (!bu_strcmp(attr->Name(), "u_degree")) attr->ptr.i = new
SDAI_Integer(nsurface->Degree(0));
+ if (!bu_strcmp(attr->Name(), "v_degree")) attr->ptr.i = new
SDAI_Integer(nsurface->Degree(1));
if (!bu_strcmp(attr->Name(), "control_points_list")) {
GenericAggregate *control_pnts= new GenericAggregate();
ON_NurbsSurfaceCV_Initialize(nsurface, complex_entity, info);
- attr->Raw()->a = control_pnts;
+ attr->ptr.a = control_pnts;
info->surf_genagg[(STEPentity*)complex_entity] = control_pnts;
}
- if (!bu_strcmp(attr->Name(), "surface_form")) attr->Raw()->e = new
SdaiB_spline_surface_form_var(B_spline_surface_form__unspecified);
- if (!bu_strcmp(attr->Name(), "u_closed")) attr->Raw()->e = new
SDAI_LOGICAL((Logical)(nsurface->IsClosed(0)));
- if (!bu_strcmp(attr->Name(), "v_closed")) attr->Raw()->e = new
SDAI_LOGICAL((Logical)(nsurface->IsClosed(1)));
- if (!bu_strcmp(attr->Name(), "self_intersect")) attr->Raw()->e = new
SDAI_LOGICAL(LFalse);
+ if (!bu_strcmp(attr->Name(), "surface_form")) attr->ptr.e = new
SdaiB_spline_surface_form_var(B_spline_surface_form__unspecified);
+ if (!bu_strcmp(attr->Name(), "u_closed")) attr->ptr.e = new
SDAI_LOGICAL((Logical)(nsurface->IsClosed(0)));
+ if (!bu_strcmp(attr->Name(), "v_closed")) attr->ptr.e = new
SDAI_LOGICAL((Logical)(nsurface->IsClosed(1)));
+ if (!bu_strcmp(attr->Name(), "self_intersect")) attr->ptr.e = new
SDAI_LOGICAL(LFalse);
}
/* Set knots */
@@ -154,13 +154,13 @@
while ((attr = stepcomplex->NextAttribute()) != NULL) {
- if (!bu_strcmp(attr->Name(), "u_multiplicities")) attr->Raw()->a =
u_multiplicities;
- if (!bu_strcmp(attr->Name(), "v_multiplicities")) attr->Raw()->a =
v_multiplicities;
+ if (!bu_strcmp(attr->Name(), "u_multiplicities")) attr->ptr.a =
u_multiplicities;
+ if (!bu_strcmp(attr->Name(), "v_multiplicities")) attr->ptr.a =
v_multiplicities;
- if (!bu_strcmp(attr->Name(), "u_knots")) attr->Raw()->a = u_knots;
- if (!bu_strcmp(attr->Name(), "v_knots")) attr->Raw()->a = v_knots;
+ if (!bu_strcmp(attr->Name(), "u_knots")) attr->ptr.a = u_knots;
+ if (!bu_strcmp(attr->Name(), "v_knots")) attr->ptr.a = v_knots;
- if (!bu_strcmp(attr->Name(), "knot_spec")) attr->Raw()->e = new
SdaiKnot_type_var(Knot_type__unspecified);
+ if (!bu_strcmp(attr->Name(), "knot_spec")) attr->ptr.e = new
SdaiKnot_type_var(Knot_type__unspecified);
}
/* Set weights */
@@ -181,7 +181,7 @@
weights->AddNode(new GenericAggrNode(str.c_str()));
}
- attr->Raw()->a = weights;
+ attr->ptr.a = weights;
}
}
Modified:
brlcad/branches/extbuild/src/conv/step/step-g/BSplineCurveWithKnots.cpp
===================================================================
--- brlcad/branches/extbuild/src/conv/step/step-g/BSplineCurveWithKnots.cpp
2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/conv/step/step-g/BSplineCurveWithKnots.cpp
2020-12-10 18:32:48 UTC (rev 77958)
@@ -80,7 +80,7 @@
STEPattribute *attr = step->getAttribute(sse, "knot_multiplicities");
if (attr) {
- STEPaggregate *sa = (STEPaggregate *)(attr->Raw()->a);
+ STEPaggregate *sa = (STEPaggregate *)(attr->ptr.a);
if (!sa) goto step_error;
IntNode *in = (IntNode *)sa->GetHead();
if (!in) goto step_error;
@@ -98,7 +98,7 @@
if (knots.empty()) {
STEPattribute *attr = step->getAttribute(sse, "knots");
if (attr) {
- STEPaggregate *sa = (STEPaggregate *)(attr->Raw()->a);
+ STEPaggregate *sa = (STEPaggregate *)(attr->ptr.a);
if (!sa) goto step_error;
RealNode *rn = (RealNode *)sa->GetHead();
if (!rn) goto step_error;
Modified:
brlcad/branches/extbuild/src/conv/step/step-g/BSplineSurfaceWithKnots.cpp
===================================================================
--- brlcad/branches/extbuild/src/conv/step/step-g/BSplineSurfaceWithKnots.cpp
2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/conv/step/step-g/BSplineSurfaceWithKnots.cpp
2020-12-10 18:32:48 UTC (rev 77958)
@@ -79,7 +79,7 @@
if (u_multiplicities.empty()) {
STEPattribute *attr = step->getAttribute(sse, "u_multiplicities");
if (attr) {
- STEPaggregate *sa = (STEPaggregate *)(attr->Raw()->a);
+ STEPaggregate *sa = (STEPaggregate *)(attr->ptr.a);
if (!sa) goto step_error;
IntNode *in = (IntNode *)sa->GetHead();
@@ -95,7 +95,7 @@
if (v_multiplicities.empty()) {
STEPattribute *attr = step->getAttribute(sse, "v_multiplicities");
if (attr) {
- STEPaggregate *sa = (STEPaggregate *)(attr->Raw()->a);
+ STEPaggregate *sa = (STEPaggregate *)(attr->ptr.a);
if (!sa) goto step_error;
IntNode *in = (IntNode *)sa->GetHead();
@@ -111,7 +111,7 @@
if (u_knots.empty()) {
STEPattribute *attr = step->getAttribute(sse, "u_knots");
if (attr) {
- STEPaggregate *sa = (STEPaggregate *)(attr->Raw()->a);
+ STEPaggregate *sa = (STEPaggregate *)(attr->ptr.a);
if (!sa) goto step_error;
RealNode *rn = (RealNode *)sa->GetHead();
@@ -127,7 +127,7 @@
if (v_knots.empty()) {
STEPattribute *attr = step->getAttribute(sse, "v_knots");
if (attr) {
- STEPaggregate *sa = (STEPaggregate *)(attr->Raw()->a);
+ STEPaggregate *sa = (STEPaggregate *)(attr->ptr.a);
if (!sa) goto step_error;
RealNode *rn = (RealNode *)sa->GetHead();
Modified: brlcad/branches/extbuild/src/conv/step/step-g/CartesianPoint.cpp
===================================================================
--- brlcad/branches/extbuild/src/conv/step/step-g/CartesianPoint.cpp
2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/conv/step/step-g/CartesianPoint.cpp
2020-12-10 18:32:48 UTC (rev 77958)
@@ -73,7 +73,7 @@
attr = step->getAttribute(sse, "coordinates");
if (attr != NULL) {
- sa = (STEPaggregate *)(attr->Raw()->a);
+ sa = (STEPaggregate *)(attr->ptr.a);
if (!sa) goto step_error;
RealNode *rn = (RealNode *)sa->GetHead();
if (!rn) goto step_error;
Modified: brlcad/branches/extbuild/src/conv/step/step-g/Direction.cpp
===================================================================
--- brlcad/branches/extbuild/src/conv/step/step-g/Direction.cpp 2020-12-10
18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/conv/step/step-g/Direction.cpp 2020-12-10
18:32:48 UTC (rev 77958)
@@ -71,7 +71,7 @@
STEPattribute *attr = step->getAttribute(sse, "direction_ratios");
if (attr != NULL) {
- STEPaggregate *sa = (STEPaggregate *)(attr->Raw()->a);
+ STEPaggregate *sa = (STEPaggregate *)(attr->ptr.a);
RealNode *rn = (RealNode *)sa->GetHead();
int index = 0;
while (rn != NULL) {
Modified: brlcad/branches/extbuild/src/conv/step/step-g/RationalBSplineCurve.cpp
===================================================================
--- brlcad/branches/extbuild/src/conv/step/step-g/RationalBSplineCurve.cpp
2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/conv/step/step-g/RationalBSplineCurve.cpp
2020-12-10 18:32:48 UTC (rev 77958)
@@ -71,7 +71,7 @@
STEPattribute *attr = step->getAttribute(sse, "weights_data");
if (attr) {
- STEPaggregate *sa = (STEPaggregate *)(attr->Raw()->a);
+ STEPaggregate *sa = (STEPaggregate *)(attr->ptr.a);
if (!sa) goto step_error;
RealNode *rn = (RealNode *)sa->GetHead();
Modified:
brlcad/branches/extbuild/src/conv/step/step-g/RationalBSplineSurface.cpp
===================================================================
--- brlcad/branches/extbuild/src/conv/step/step-g/RationalBSplineSurface.cpp
2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/conv/step/step-g/RationalBSplineSurface.cpp
2020-12-10 18:32:48 UTC (rev 77958)
@@ -77,7 +77,7 @@
STEPattribute *attr = step->getAttribute(sse, "weights_data");
if (attr) {
- GenericAggregate_ptr gp = (GenericAggregate_ptr)attr->Raw()->a;
+ GenericAggregate_ptr gp = (GenericAggregate_ptr)attr->ptr.a;
if (!gp) goto step_error;
STEPnode *sn = (STEPnode *)gp->GetHead();
const char *eaStr;
Modified:
brlcad/branches/extbuild/src/conv/step/step-g/ShellBasedSurfaceModel.cpp
===================================================================
--- brlcad/branches/extbuild/src/conv/step/step-g/ShellBasedSurfaceModel.cpp
2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/conv/step/step-g/ShellBasedSurfaceModel.cpp
2020-12-10 18:32:48 UTC (rev 77958)
@@ -68,7 +68,7 @@
if (sbsm_boundary.empty()) {
STEPattribute *attr = step->getAttribute(sse, "sbsm_boundary");
if (attr) {
- SelectAggregate *sa = static_cast<SelectAggregate
*>(attr->Raw()->a);
+ SelectAggregate *sa = static_cast<SelectAggregate *>(attr->ptr.a);
if (!sa) goto step_error;
SelectNode *sn = static_cast<SelectNode *>(sa->GetHead());
Modified: brlcad/branches/extbuild/src/conv/step/step-g/SurfaceCurve.cpp
===================================================================
--- brlcad/branches/extbuild/src/conv/step/step-g/SurfaceCurve.cpp
2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/conv/step/step-g/SurfaceCurve.cpp
2020-12-10 18:32:48 UTC (rev 77958)
@@ -118,7 +118,7 @@
if (associated_geometry.empty()) {
STEPattribute *attr = step->getAttribute(sse, "associated_geometry");
if (attr) {
- SelectAggregate *sa = static_cast<SelectAggregate
*>(attr->Raw()->a);
+ SelectAggregate *sa = static_cast<SelectAggregate *>(attr->ptr.a);
if (!sa) goto step_error;
SelectNode *sn = static_cast<SelectNode *>(sa->GetHead());
Modified: brlcad/branches/extbuild/src/conv/step/step-g/TrimmedCurve.cpp
===================================================================
--- brlcad/branches/extbuild/src/conv/step/step-g/TrimmedCurve.cpp
2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/conv/step/step-g/TrimmedCurve.cpp
2020-12-10 18:32:48 UTC (rev 77958)
@@ -106,7 +106,7 @@
if (trim_1.empty()) {
STEPattribute *attr = step->getAttribute(sse, "trim_1");
if (attr) {
- SelectAggregate *sa = static_cast<SelectAggregate
*>(attr->Raw()->a);
+ SelectAggregate *sa = static_cast<SelectAggregate *>(attr->ptr.a);
if (!sa) goto step_error;
SelectNode *sn = static_cast<SelectNode *>(sa->GetHead());
SDAI_Select *p;
@@ -127,7 +127,7 @@
if (trim_2.empty()) {
STEPattribute *attr = step->getAttribute(sse, "trim_2");
if (attr) {
- SelectAggregate *sa = static_cast<SelectAggregate
*>(attr->Raw()->a);
+ SelectAggregate *sa = static_cast<SelectAggregate *>(attr->ptr.a);
if (!sa) goto step_error;
SelectNode *sn = static_cast<SelectNode *>(sa->GetHead());
SDAI_Select *p;
Modified: brlcad/branches/extbuild/src/conv/step/util/list_elements.cpp
===================================================================
--- brlcad/branches/extbuild/src/conv/step/util/list_elements.cpp
2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/conv/step/util/list_elements.cpp
2020-12-10 18:32:48 UTC (rev 77958)
@@ -79,7 +79,7 @@
//cout << attrCount << " attributes." << endl;
- const EntityDescriptorList * supertypeList =
&(ent->getEDesc()->Supertypes());
+ const EntityDescriptorList * supertypeList = &(ent->eDesc->Supertypes());
EntityDescLinkNode * supertypePtr = (EntityDescLinkNode
*)supertypeList->GetHead();
entDesc = 0;
while (supertypePtr != 0) {
@@ -92,7 +92,7 @@
}
- const EntityDescriptorList * subtypeList = &(ent->getEDesc()->Subtypes());
+ const EntityDescriptorList * subtypeList = &(ent->eDesc->Subtypes());
EntityDescLinkNode * subtypePtr = (EntityDescLinkNode
*)subtypeList->GetHead();
entDesc = 0;
while (subtypePtr != 0) {
@@ -108,7 +108,7 @@
STEPattribute * attr = ent->NextAttribute();
while (attr != 0) {
- const AttrDescriptor * attrDesc = attr->getADesc();
+ const AttrDescriptor * attrDesc = attr->aDesc;
cout << " " << attrDesc->Name() << "[" << attrDesc->TypeName() <<
"]\n";
attr = ent->NextAttribute();
}
Modified: brlcad/branches/extbuild/src/libbrep/cdt/fast.cpp
===================================================================
--- brlcad/branches/extbuild/src/libbrep/cdt/fast.cpp 2020-12-10 18:21:22 UTC
(rev 77957)
+++ brlcad/branches/extbuild/src/libbrep/cdt/fast.cpp 2020-12-10 18:32:48 UTC
(rev 77958)
@@ -1944,17 +1944,19 @@
if (!brep->IsValid(&tl)) {
//for now try to draw even if it's invalid, but report if the
//user is listening
- if (vls && wstr.Length() > 0) {
- ON_String onstr = ON_String(wstr);
- const char *isvalidinfo = onstr.Array();
- bu_vls_strcat(vls, "brep (");
- bu_vls_strcat(vls, solid_name);
- bu_vls_strcat(vls, ") is NOT valid:");
- bu_vls_strcat(vls, isvalidinfo);
- } else {
- bu_vls_strcat(vls, "brep (");
- bu_vls_strcat(vls, solid_name);
- bu_vls_strcat(vls, ") is NOT valid.");
+ if (vls) {
+ if (wstr.Length() > 0) {
+ ON_String onstr = ON_String(wstr);
+ const char *isvalidinfo = onstr.Array();
+ bu_vls_strcat(vls, "brep (");
+ bu_vls_strcat(vls, solid_name);
+ bu_vls_strcat(vls, ") is NOT valid:");
+ bu_vls_strcat(vls, isvalidinfo);
+ } else {
+ bu_vls_strcat(vls, "brep (");
+ bu_vls_strcat(vls, solid_name);
+ bu_vls_strcat(vls, ") is NOT valid.");
+ }
}
}
Index: brlcad/branches/extbuild/src/other
===================================================================
--- brlcad/branches/extbuild/src/other 2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/other 2020-12-10 18:32:48 UTC (rev 77958)
Property changes on: brlcad/branches/extbuild/src/other
___________________________________________________________________
Modified: svn:mergeinfo
## -9,4 +9,4 ##
/brlcad/branches/osg/src/other:62110-62113
/brlcad/branches/prep-cache/src/other:68236-68933
/brlcad/branches/tcltk86/src/other:68300-75257
-/brlcad/trunk/src/other:77547-77657,77836-77857,77870-77920,77924-77945
\ No newline at end of property
+/brlcad/trunk/src/other:77547-77657,77836-77857,77870-77920,77924-77956
\ No newline at end of property
Modified: brlcad/branches/extbuild/src/other/ext/stepcode/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode/CMakeLists.txt
2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/other/ext/stepcode/CMakeLists.txt
2020-12-10 18:32:48 UTC (rev 77958)
@@ -49,7 +49,9 @@
# Minimum required version of CMake
cmake_minimum_required(VERSION 3.12)
-cmake_policy(SET CMP0077 OLD)
+if (POLICY CMP0077)
+ cmake_policy(SET CMP0077 OLD)
+endif (POLICY CMP0077)
# CMake derives much of its functionality from modules, typically
# stored in one directory - let CMake know where to find them.
Modified: brlcad/branches/extbuild/src/other/ext/stepcode/README.md
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode/README.md 2020-12-10
18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/other/ext/stepcode/README.md 2020-12-10
18:32:48 UTC (rev 77958)
@@ -4,7 +4,7 @@
[](https://travis-ci.org/stepcode/stepcode)
| [](https://ci.appveyor.com/project/mpictor/stepcode)
***********************************************************************
-STEPcode v0.8 -- stepcode.org, github.com/stepcode/stepcode
+STEPcode v0.9 -- stepcode.org, github.com/stepcode/stepcode
* What is STEPcode? SC reads ISO10303-11 EXPRESS schemas and generates
C++ source code that can read and write Part 21 files conforming
@@ -36,14 +36,16 @@
SC's source has been reformatted with astyle. When making changes, try
to match the current formatting. The main points are:
- - compact (java-style) brackets:
+ - K&R (Kernighan & Ritchie) brackets:
```C
- if( a == 3 ) {
- c = 5;
- function( a, b );
- } else {
- somefunc( );
- }
+ int Foo(bool isBar)
+ {
+ if (isBar) {
+ bar();
+ return 1;
+ } else
+ return 0;
+ }
```
- indents are 4 spaces
- no tab characters
Modified: brlcad/branches/extbuild/src/other/ext/stepcode/include/exppp/exppp.h
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode/include/exppp/exppp.h
2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/other/ext/stepcode/include/exppp/exppp.h
2020-12-10 18:32:48 UTC (rev 77958)
@@ -15,56 +15,56 @@
extern SC_EXPPP_EXPORT bool exppp_alphabetize; /**< if true,
alphabetize */
extern SC_EXPPP_EXPORT bool exppp_terse; /**< don't
describe action to stdout */
extern SC_EXPPP_EXPORT bool exppp_reference_info; /**< if true, add
commentary about where things came from */
-extern SC_EXPPP_EXPORT char * exppp_output_filename; /**< force output
filename */
+extern SC_EXPPP_EXPORT char *exppp_output_filename; /**< force output
filename */
extern SC_EXPPP_EXPORT bool exppp_output_filename_reset; /**< if true,
force output filename */
extern SC_EXPPP_EXPORT bool exppp_print_to_stdout; /**< if true,
print to stdout */
extern SC_EXPPP_EXPORT bool exppp_aggressively_wrap_consts; /**< for
constants, print one item per line */
extern SC_EXPPP_EXPORT bool exppp_tail_comment; /**< print tail
comment, such as END_ENTITY; --entity_name */
-SC_EXPPP_EXPORT void EXPRESSout( Express e );
+SC_EXPPP_EXPORT void EXPRESSout(Express e);
-SC_EXPPP_EXPORT void ENTITYout( Entity e );
-SC_EXPPP_EXPORT void EXPRout( Expression expr );
-SC_EXPPP_EXPORT void FUNCout( Function f );
-SC_EXPPP_EXPORT void PROCout( Procedure p );
-SC_EXPPP_EXPORT void RULEout( Rule r );
-SC_EXPPP_EXPORT char * SCHEMAout( Schema s );
-SC_EXPPP_EXPORT void SCHEMAref_out( Schema s );
-SC_EXPPP_EXPORT void STMTout( Statement s );
-SC_EXPPP_EXPORT void TYPEout( Type t );
-SC_EXPPP_EXPORT void TYPEhead_out( Type t );
-SC_EXPPP_EXPORT void TYPEbody_out( Type t );
-SC_EXPPP_EXPORT void WHEREout( Linked_List w );
+SC_EXPPP_EXPORT void ENTITYout(Entity e);
+SC_EXPPP_EXPORT void EXPRout(Expression expr);
+SC_EXPPP_EXPORT void FUNCout(Function f);
+SC_EXPPP_EXPORT void PROCout(Procedure p);
+SC_EXPPP_EXPORT void RULEout(Rule r);
+SC_EXPPP_EXPORT char *SCHEMAout(Schema s);
+SC_EXPPP_EXPORT void SCHEMAref_out(Schema s);
+SC_EXPPP_EXPORT void STMTout(Statement s);
+SC_EXPPP_EXPORT void TYPEout(Type t);
+SC_EXPPP_EXPORT void TYPEhead_out(Type t);
+SC_EXPPP_EXPORT void TYPEbody_out(Type t);
+SC_EXPPP_EXPORT void WHEREout(Linked_List w);
-SC_EXPPP_EXPORT char * REFto_string( Dictionary refdict, Linked_List reflist,
char * type, int level );
-SC_EXPPP_EXPORT char * ENTITYto_string( Entity e );
-SC_EXPPP_EXPORT char * SUBTYPEto_string( Expression e );
-SC_EXPPP_EXPORT char * EXPRto_string( Expression expr );
-SC_EXPPP_EXPORT char * FUNCto_string( Function f );
-SC_EXPPP_EXPORT char * PROCto_string( Procedure p );
-SC_EXPPP_EXPORT char * RULEto_string( Rule r );
-SC_EXPPP_EXPORT char * SCHEMAref_to_string( Schema s );
-SC_EXPPP_EXPORT char * STMTto_string( Statement s );
-SC_EXPPP_EXPORT char * TYPEto_string( Type t );
-SC_EXPPP_EXPORT char * TYPEhead_to_string( Type t );
-SC_EXPPP_EXPORT char * TYPEbody_to_string( Type t );
-SC_EXPPP_EXPORT char * WHEREto_string( Linked_List w );
+SC_EXPPP_EXPORT char *REFto_string(Dictionary refdict, Linked_List reflist,
char *type, int level);
+SC_EXPPP_EXPORT char *ENTITYto_string(Entity e);
+SC_EXPPP_EXPORT char *SUBTYPEto_string(Expression e);
+SC_EXPPP_EXPORT char *EXPRto_string(Expression expr);
+SC_EXPPP_EXPORT char *FUNCto_string(Function f);
+SC_EXPPP_EXPORT char *PROCto_string(Procedure p);
+SC_EXPPP_EXPORT char *RULEto_string(Rule r);
+SC_EXPPP_EXPORT char *SCHEMAref_to_string(Schema s);
+SC_EXPPP_EXPORT char *STMTto_string(Statement s);
+SC_EXPPP_EXPORT char *TYPEto_string(Type t);
+SC_EXPPP_EXPORT char *TYPEhead_to_string(Type t);
+SC_EXPPP_EXPORT char *TYPEbody_to_string(Type t);
+SC_EXPPP_EXPORT char *WHEREto_string(Linked_List w);
-SC_EXPPP_EXPORT int REFto_buffer( Dictionary refdict, Linked_List reflist,
char * type, int level, char * buffer, int length );
-SC_EXPPP_EXPORT int ENTITYto_buffer( Entity e, char * buffer, int length );
-SC_EXPPP_EXPORT int EXPRto_buffer( Expression e, char * buffer, int length );
-SC_EXPPP_EXPORT int FUNCto_buffer( Function e, char * buffer, int length );
-SC_EXPPP_EXPORT int PROCto_buffer( Procedure e, char * buffer, int length );
-SC_EXPPP_EXPORT int RULEto_buffer( Rule e, char * buffer, int length );
-SC_EXPPP_EXPORT int SCHEMAref_to_buffer( Schema s, char * buffer, int length );
-SC_EXPPP_EXPORT int STMTto_buffer( Statement s, char * buffer, int length );
-SC_EXPPP_EXPORT int TYPEto_buffer( Type t, char * buffer, int length );
-SC_EXPPP_EXPORT int TYPEhead_to_buffer( Type t, char * buffer, int length );
-SC_EXPPP_EXPORT int TYPEbody_to_buffer( Type t, char * buffer, int length );
-SC_EXPPP_EXPORT int WHEREto_buffer( Linked_List w, char * buffer, int length );
+SC_EXPPP_EXPORT int REFto_buffer(Dictionary refdict, Linked_List reflist, char
*type, int level, char *buffer, int length);
+SC_EXPPP_EXPORT int ENTITYto_buffer(Entity e, char *buffer, int length);
+SC_EXPPP_EXPORT int EXPRto_buffer(Expression e, char *buffer, int length);
+SC_EXPPP_EXPORT int FUNCto_buffer(Function e, char *buffer, int length);
+SC_EXPPP_EXPORT int PROCto_buffer(Procedure e, char *buffer, int length);
+SC_EXPPP_EXPORT int RULEto_buffer(Rule e, char *buffer, int length);
+SC_EXPPP_EXPORT int SCHEMAref_to_buffer(Schema s, char *buffer, int length);
+SC_EXPPP_EXPORT int STMTto_buffer(Statement s, char *buffer, int length);
+SC_EXPPP_EXPORT int TYPEto_buffer(Type t, char *buffer, int length);
+SC_EXPPP_EXPORT int TYPEhead_to_buffer(Type t, char *buffer, int length);
+SC_EXPPP_EXPORT int TYPEbody_to_buffer(Type t, char *buffer, int length);
+SC_EXPPP_EXPORT int WHEREto_buffer(Linked_List w, char *buffer, int length);
-SC_EXPPP_EXPORT int EXPRlength( Expression e );
-extern SC_EXPPP_EXPORT void tail_comment( const char * name );
-extern SC_EXPPP_EXPORT int count_newlines( char * s );
+SC_EXPPP_EXPORT int EXPRlength(Expression e);
+extern SC_EXPPP_EXPORT void tail_comment(const char *name);
+extern SC_EXPPP_EXPORT int count_newlines(char *s);
#endif
Modified: brlcad/branches/extbuild/src/other/ext/stepcode/include/express/alg.h
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode/include/express/alg.h
2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/other/ext/stepcode/include/express/alg.h
2020-12-10 18:32:48 UTC (rev 77958)
@@ -50,10 +50,10 @@
/* typedefs */
/************/
-typedef struct Scope_ * Procedure;
-typedef struct Scope_ * Function;
-typedef struct Scope_ * Rule;
-typedef struct Where_ * Where;
+typedef struct Scope_ *Procedure;
+typedef struct Scope_ *Function;
+typedef struct Scope_ *Rule;
+typedef struct Where_ *Where;
/***************************/
/* hidden type definitions */
@@ -63,13 +63,13 @@
* As each (real) call is resolved, the tag->type is temporarily borrowed
*/
struct tag {
- char * name;
+ char *name;
Type type;
};
/** location of fulltext of algorithm in source file */
struct FullText {
- const char * filename;
+ const char *filename;
unsigned int start, end;
};
@@ -101,7 +101,7 @@
/** define a where clause */
struct Where_ {
- Symbol * label;
+ Symbol *label;
Expression expr;
};
@@ -161,8 +161,8 @@
/* function prototypes */
/***********************/
-extern SC_EXPRESS_EXPORT Scope ALGcreate( char );
-extern SC_EXPRESS_EXPORT void ALGinitialize( void );
-extern SC_EXPRESS_EXPORT void ALGput_full_text( Scope, int, int );
+extern SC_EXPRESS_EXPORT Scope ALGcreate(char);
+extern SC_EXPRESS_EXPORT void ALGinitialize(void);
+extern SC_EXPRESS_EXPORT void ALGput_full_text(Scope, int, int);
#endif /* ALGORITHM_H */
Modified:
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/alloc.h
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode/include/express/alloc.h
2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/other/ext/stepcode/include/express/alloc.h
2020-12-10 18:32:48 UTC (rev 77958)
@@ -35,7 +35,7 @@
typedef long Align;
union freelist {
- union freelist * next; /**< next block on freelist */
+ union freelist *next; /**< next block on freelist */
char memory; /**< user data */
Align aligner; /**< force alignment of blocks */
};
@@ -52,13 +52,13 @@
#endif
int size; /**< size of a single elt incl. next ptr */
int bytes; /**< if we run out, allocate memory by this many bytes
*/
- Freelist * freelist;
+ Freelist *freelist;
#ifdef SPACE_PROFILE
int count;
#endif
};
-char * nnew();
+char *nnew();
#include "error.h"
@@ -75,10 +75,10 @@
fprintf(stderr,"fedex: out of space");\
} else {}
-SC_EXPRESS_EXPORT void _ALLOCinitialize( void );
-SC_EXPRESS_EXPORT void ALLOCinitialize( struct freelist_head * flh,
unsigned int size, int alloc1, int alloc2 );
-SC_EXPRESS_EXPORT void ALLOC_destroy( struct freelist_head *, Freelist * );
-SC_EXPRESS_EXPORT void * ALLOC_new( struct freelist_head * );
+SC_EXPRESS_EXPORT void _ALLOCinitialize(void);
+SC_EXPRESS_EXPORT void ALLOCinitialize(struct freelist_head *flh, unsigned
int size, int alloc1, int alloc2);
+SC_EXPRESS_EXPORT void ALLOC_destroy(struct freelist_head *, Freelist *);
+SC_EXPRESS_EXPORT void *ALLOC_new(struct freelist_head *);
#endif /* ALLOC_H */
Modified:
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/basic.h
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode/include/express/basic.h
2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/other/ext/stepcode/include/express/basic.h
2020-12-10 18:32:48 UTC (rev 77958)
@@ -93,8 +93,8 @@
/* function pointer types */
/**************************/
-typedef void ( *voidFuncptr )();
-typedef int ( *intFuncptr )();
+typedef void (*voidFuncptr)();
+typedef int (*intFuncptr)();
#endif /* BASIC_H */
Modified:
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/caseitem.h
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode/include/express/caseitem.h
2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/other/ext/stepcode/include/express/caseitem.h
2020-12-10 18:32:48 UTC (rev 77958)
@@ -48,7 +48,7 @@
/* typedefs */
/************/
-typedef struct Case_Item_ * Case_Item;
+typedef struct Case_Item_ *Case_Item;
/****************/
/* modules used */
@@ -63,7 +63,7 @@
struct Case_Item_ {
Symbol symbol;
Linked_List labels;
- struct Statement_ * action;
+ struct Statement_ *action;
};
/********************/
@@ -86,7 +86,7 @@
#define CASE_IT_new() (struct Case_Item_ *)ALLOC_new(&CASE_IT_fl)
#define CASE_IT_destroy(x) ALLOC_destroy(&CASE_IT_fl,(Freelist *)x)
-extern SC_EXPRESS_EXPORT Case_Item CASE_ITcreate( Linked_List, struct
Statement_ * );
-extern SC_EXPRESS_EXPORT void CASE_ITinitialize( void );
+extern SC_EXPRESS_EXPORT Case_Item CASE_ITcreate(Linked_List, struct
Statement_ *);
+extern SC_EXPRESS_EXPORT void CASE_ITinitialize(void);
#endif /*CASE_ITEM_H*/
Modified: brlcad/branches/extbuild/src/other/ext/stepcode/include/express/dict.h
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode/include/express/dict.h
2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/other/ext/stepcode/include/express/dict.h
2020-12-10 18:32:48 UTC (rev 77958)
@@ -55,7 +55,7 @@
/* typedefs */
/************/
-typedef struct Hash_Table_ * Dictionary;
+typedef struct Hash_Table_ *Dictionary;
typedef HashEntry DictionaryEntry;
/****************/
@@ -97,14 +97,14 @@
/* function prototypes */
/***********************/
-extern SC_EXPRESS_EXPORT void DICTinitialize( void );
-extern SC_EXPRESS_EXPORT void DICTcleanup( void );
-extern SC_EXPRESS_EXPORT int DICTdefine( Dictionary, char *, void *,
Symbol *, char );
-extern SC_EXPRESS_EXPORT int DICT_define( Dictionary, char *, void *,
Symbol *, char );
-extern SC_EXPRESS_EXPORT void DICTundefine( Dictionary, char * );
-extern SC_EXPRESS_EXPORT void * DICTlookup( Dictionary, char * );
-extern SC_EXPRESS_EXPORT void * DICTlookup_symbol( Dictionary, char *,
Symbol ** );
-extern SC_EXPRESS_EXPORT void * DICTdo( DictionaryEntry * );
-extern SC_EXPRESS_EXPORT void DICTprint( Dictionary );
+extern SC_EXPRESS_EXPORT void DICTinitialize(void);
+extern SC_EXPRESS_EXPORT void DICTcleanup(void);
+extern SC_EXPRESS_EXPORT int DICTdefine(Dictionary, char *, void *,
Symbol *, char);
+extern SC_EXPRESS_EXPORT int DICT_define(Dictionary, char *, void *,
Symbol *, char);
+extern SC_EXPRESS_EXPORT void DICTundefine(Dictionary, char *);
+extern SC_EXPRESS_EXPORT void *DICTlookup(Dictionary, char *);
+extern SC_EXPRESS_EXPORT void *DICTlookup_symbol(Dictionary, char *, Symbol
**);
+extern SC_EXPRESS_EXPORT void *DICTdo(DictionaryEntry *);
+extern SC_EXPRESS_EXPORT void DICTprint(Dictionary);
#endif /*DICTIONARY_H*/
Modified:
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/entity.h
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode/include/express/entity.h
2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/other/ext/stepcode/include/express/entity.h
2020-12-10 18:32:48 UTC (rev 77958)
@@ -69,7 +69,7 @@
/* typedefs */
/************/
-typedef struct Scope_ * Entity;
+typedef struct Scope_ *Entity;
/****************/
/* modules used */
@@ -140,19 +140,19 @@
/* function prototypes */
/***********************/
-extern SC_EXPRESS_EXPORT struct Scope_ * ENTITYcreate( struct Symbol_ * );
-extern SC_EXPRESS_EXPORT void ENTITYinitialize( void );
-extern SC_EXPRESS_EXPORT void ENTITYadd_attribute( struct Scope_ *, struct
Variable_ * );
-extern SC_EXPRESS_EXPORT struct Scope_ * ENTITYcopy( struct Scope_ * );
-extern SC_EXPRESS_EXPORT Entity ENTITYfind_inherited_entity( struct
Scope_ *, char *, int );
-extern SC_EXPRESS_EXPORT Variable ENTITYfind_inherited_attribute( struct
Scope_ *, char *, struct Symbol_ ** );
-extern SC_EXPRESS_EXPORT Variable ENTITYresolve_attr_ref( Entity, Symbol
*, Symbol * );
-extern SC_EXPRESS_EXPORT bool ENTITYhas_immediate_supertype( Entity,
Entity );
-extern SC_EXPRESS_EXPORT Variable ENTITYget_named_attribute( Entity, char
* );
-extern SC_EXPRESS_EXPORT Linked_List ENTITYget_all_attributes( Entity );
-extern SC_EXPRESS_EXPORT bool ENTITYhas_supertype( Entity, Entity );
-extern SC_EXPRESS_EXPORT void ENTITYadd_instance( Entity, void *);
-extern SC_EXPRESS_EXPORT int ENTITYget_initial_offset( Entity );
-extern SC_EXPRESS_EXPORT int ENTITYdeclares_variable( Entity, struct
Variable_ * );
+extern SC_EXPRESS_EXPORT struct Scope_ *ENTITYcreate(struct Symbol_ *);
+extern SC_EXPRESS_EXPORT void ENTITYinitialize(void);
+extern SC_EXPRESS_EXPORT void ENTITYadd_attribute(struct Scope_ *, struct
Variable_ *);
+extern SC_EXPRESS_EXPORT struct Scope_ *ENTITYcopy(struct Scope_ *);
+extern SC_EXPRESS_EXPORT Entity ENTITYfind_inherited_entity(struct
Scope_ *, char *, int);
+extern SC_EXPRESS_EXPORT Variable ENTITYfind_inherited_attribute(struct
Scope_ *, char *, struct Symbol_ **);
+extern SC_EXPRESS_EXPORT Variable ENTITYresolve_attr_ref(Entity, Symbol *,
Symbol *);
+extern SC_EXPRESS_EXPORT bool ENTITYhas_immediate_supertype(Entity,
Entity);
+extern SC_EXPRESS_EXPORT Variable ENTITYget_named_attribute(Entity, char
*);
+extern SC_EXPRESS_EXPORT Linked_List ENTITYget_all_attributes(Entity);
+extern SC_EXPRESS_EXPORT bool ENTITYhas_supertype(Entity, Entity);
+extern SC_EXPRESS_EXPORT void ENTITYadd_instance(Entity, void *);
+extern SC_EXPRESS_EXPORT int ENTITYget_initial_offset(Entity);
+extern SC_EXPRESS_EXPORT int ENTITYdeclares_variable(Entity, struct
Variable_ *);
#endif /* ENTITY_H */
Modified:
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/error.h
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode/include/express/error.h
2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/other/ext/stepcode/include/express/error.h
2020-12-10 18:32:48 UTC (rev 77958)
@@ -166,7 +166,7 @@
/********************/
extern SC_EXPRESS_EXPORT bool __ERROR_buffer_errors;
-extern SC_EXPRESS_EXPORT const char * current_filename;
+extern SC_EXPRESS_EXPORT const char *current_filename;
/* flag to remember whether non-warning errors have occurred */
extern SC_EXPRESS_EXPORT bool ERRORoccurred;
@@ -180,18 +180,19 @@
/* for debugging yacc/lex */
extern SC_EXPRESS_EXPORT int debug;
-extern SC_EXPRESS_EXPORT void ( *ERRORusage_function )( void );
+extern SC_EXPRESS_EXPORT void (*ERRORusage_function)(void);
/***********************/
/* function prototypes */
/***********************/
-extern SC_EXPRESS_EXPORT void ERROR_start_message_buffer( void );
-extern SC_EXPRESS_EXPORT void ERROR_flush_message_buffer( void );
+extern SC_EXPRESS_EXPORT void ERROR_start_message_buffer(void);
+extern SC_EXPRESS_EXPORT void ERROR_flush_message_buffer(void);
-static inline void ERRORbuffer_messages( bool flag ) {
+static inline void ERRORbuffer_messages(bool flag)
+{
__ERROR_buffer_errors = flag;
- if( __ERROR_buffer_errors ) {
+ if(__ERROR_buffer_errors) {
ERROR_start_message_buffer();
} else {
ERROR_flush_message_buffer();
@@ -198,8 +199,9 @@
}
}
-static inline void ERRORflush_messages( void ) {
- if( __ERROR_buffer_errors ) {
+static inline void ERRORflush_messages(void)
+{
+ if(__ERROR_buffer_errors) {
ERROR_flush_message_buffer();
ERROR_start_message_buffer();
}
@@ -210,22 +212,22 @@
/* function prototypes */
/***********************/
-extern SC_EXPRESS_EXPORT void ERRORinitialize( void );
-extern SC_EXPRESS_EXPORT void ERRORcleanup( void );
-extern SC_EXPRESS_EXPORT void ERRORnospace( void );
-extern SC_EXPRESS_EXPORT void ERRORabort( int );
-extern SC_EXPRESS_EXPORT void ERRORreport( enum ErrorCode, ... );
+extern SC_EXPRESS_EXPORT void ERRORinitialize(void);
+extern SC_EXPRESS_EXPORT void ERRORcleanup(void);
+extern SC_EXPRESS_EXPORT void ERRORnospace(void);
+extern SC_EXPRESS_EXPORT void ERRORabort(int);
+extern SC_EXPRESS_EXPORT void ERRORreport(enum ErrorCode, ...);
struct Symbol_; /* mention Symbol to avoid warning on following line */
-extern SC_EXPRESS_EXPORT void ERRORreport_with_symbol( enum ErrorCode, struct
Symbol_ *, ... );
-extern SC_EXPRESS_EXPORT void ERRORreport_with_line( enum ErrorCode, int, ...
);
+extern SC_EXPRESS_EXPORT void ERRORreport_with_symbol(enum ErrorCode, struct
Symbol_ *, ...);
+extern SC_EXPRESS_EXPORT void ERRORreport_with_line(enum ErrorCode, int, ...);
-extern SC_EXPRESS_EXPORT void ERRORset_warning( char *, bool );
-extern SC_EXPRESS_EXPORT void ERRORset_all_warnings( bool );
-extern SC_EXPRESS_EXPORT void ERRORsafe( jmp_buf env );
-extern SC_EXPRESS_EXPORT void ERRORunsafe( void );
+extern SC_EXPRESS_EXPORT void ERRORset_warning(char *, bool);
+extern SC_EXPRESS_EXPORT void ERRORset_all_warnings(bool);
+extern SC_EXPRESS_EXPORT void ERRORsafe(jmp_buf env);
+extern SC_EXPRESS_EXPORT void ERRORunsafe(void);
-extern SC_EXPRESS_EXPORT char * ERRORget_warnings_help(const char* prefix,
const char *eol);
+extern SC_EXPRESS_EXPORT char *ERRORget_warnings_help(const char *prefix,
const char *eol);
extern bool ERRORis_enabled(enum ErrorCode errnum);
#endif /* ERROR_H */
Modified:
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/exp_kw.h
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode/include/express/exp_kw.h
2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/other/ext/stepcode/include/express/exp_kw.h
2020-12-10 18:32:48 UTC (rev 77958)
@@ -3,125 +3,125 @@
#include "sc_export.h"
-extern SC_EXPRESS_EXPORT char * KW_ABS;
-extern SC_EXPRESS_EXPORT char * KW_ABSTRACT;
-extern SC_EXPRESS_EXPORT char * KW_ACOS;
-extern SC_EXPRESS_EXPORT char * KW_AGGREGATE;
-extern SC_EXPRESS_EXPORT char * KW_ALIAS;
-extern SC_EXPRESS_EXPORT char * KW_AND;
-extern SC_EXPRESS_EXPORT char * KW_ANDOR;
-extern SC_EXPRESS_EXPORT char * KW_ARRAY;
-extern SC_EXPRESS_EXPORT char * KW_AS;
-extern SC_EXPRESS_EXPORT char * KW_ASIN;
-extern SC_EXPRESS_EXPORT char * KW_ATAN;
-extern SC_EXPRESS_EXPORT char * KW_BAG;
-extern SC_EXPRESS_EXPORT char * KW_BEGIN;
-extern SC_EXPRESS_EXPORT char * KW_BINARY;
-extern SC_EXPRESS_EXPORT char * KW_BLENGTH;
-extern SC_EXPRESS_EXPORT char * KW_BOOLEAN;
-extern SC_EXPRESS_EXPORT char * KW_BY;
-extern SC_EXPRESS_EXPORT char * KW_CASE;
-extern SC_EXPRESS_EXPORT char * KW_CONST_E;
-extern SC_EXPRESS_EXPORT char * KW_CONSTANT;
-extern SC_EXPRESS_EXPORT char * KW_CONTEXT;
-extern SC_EXPRESS_EXPORT char * KW_COS;
-extern SC_EXPRESS_EXPORT char * KW_DERIVE;
-extern SC_EXPRESS_EXPORT char * KW_DIV;
-extern SC_EXPRESS_EXPORT char * KW_ELSE;
-extern SC_EXPRESS_EXPORT char * KW_END;
-extern SC_EXPRESS_EXPORT char * KW_END_ALIAS;
-extern SC_EXPRESS_EXPORT char * KW_END_CASE;
-extern SC_EXPRESS_EXPORT char * KW_END_CONSTANT;
-extern SC_EXPRESS_EXPORT char * KW_END_CONTEXT;
-extern SC_EXPRESS_EXPORT char * KW_END_ENTITY;
-extern SC_EXPRESS_EXPORT char * KW_END_FUNCTION;
-extern SC_EXPRESS_EXPORT char * KW_END_IF;
-extern SC_EXPRESS_EXPORT char * KW_END_LOCAL;
-extern SC_EXPRESS_EXPORT char * KW_END_MODEL;
-extern SC_EXPRESS_EXPORT char * KW_END_PROCEDURE;
-extern SC_EXPRESS_EXPORT char * KW_END_REPEAT;
-extern SC_EXPRESS_EXPORT char * KW_END_RULE;
-extern SC_EXPRESS_EXPORT char * KW_END_SCHEMA;
-extern SC_EXPRESS_EXPORT char * KW_END_TYPE;
-extern SC_EXPRESS_EXPORT char * KW_ENTITY;
-extern SC_EXPRESS_EXPORT char * KW_ENUMERATION;
-extern SC_EXPRESS_EXPORT char * KW_ESCAPE;
-extern SC_EXPRESS_EXPORT char * KW_EXISTS;
-extern SC_EXPRESS_EXPORT char * KW_EXP;
-extern SC_EXPRESS_EXPORT char * KW_FALSE;
-extern SC_EXPRESS_EXPORT char * KW_FIXED;
-extern SC_EXPRESS_EXPORT char * KW_FOR;
-extern SC_EXPRESS_EXPORT char * KW_FORMAT;
-extern SC_EXPRESS_EXPORT char * KW_FROM;
-extern SC_EXPRESS_EXPORT char * KW_FUNCTION;
-extern SC_EXPRESS_EXPORT char * KW_GENERIC;
-extern SC_EXPRESS_EXPORT char * KW_HIBOUND;
-extern SC_EXPRESS_EXPORT char * KW_HIINDEX;
-extern SC_EXPRESS_EXPORT char * KW_IF;
-extern SC_EXPRESS_EXPORT char * KW_IN;
-extern SC_EXPRESS_EXPORT char * KW_INCLUDE;
-extern SC_EXPRESS_EXPORT char * KW_INSERT;
-extern SC_EXPRESS_EXPORT char * KW_INTEGER;
-extern SC_EXPRESS_EXPORT char * KW_INVERSE;
-extern SC_EXPRESS_EXPORT char * KW_LENGTH;
-extern SC_EXPRESS_EXPORT char * KW_LIKE;
-extern SC_EXPRESS_EXPORT char * KW_LIST;
-extern SC_EXPRESS_EXPORT char * KW_LOBOUND;
-extern SC_EXPRESS_EXPORT char * KW_LOCAL;
-extern SC_EXPRESS_EXPORT char * KW_LOG;
-extern SC_EXPRESS_EXPORT char * KW_LOG10;
-extern SC_EXPRESS_EXPORT char * KW_LOG2;
-extern SC_EXPRESS_EXPORT char * KW_LOGICAL;
-extern SC_EXPRESS_EXPORT char * KW_LOINDEX;
-extern SC_EXPRESS_EXPORT char * KW_MOD;
-extern SC_EXPRESS_EXPORT char * KW_MODEL;
-extern SC_EXPRESS_EXPORT char * KW_NOT;
-extern SC_EXPRESS_EXPORT char * KW_NUMBER;
-extern SC_EXPRESS_EXPORT char * KW_NVL;
-extern SC_EXPRESS_EXPORT char * KW_ODD;
-extern SC_EXPRESS_EXPORT char * KW_OF;
-extern SC_EXPRESS_EXPORT char * KW_ONEOF;
-extern SC_EXPRESS_EXPORT char * KW_OPTIONAL;
-extern SC_EXPRESS_EXPORT char * KW_OR;
-extern SC_EXPRESS_EXPORT char * KW_OTHERWISE;
-extern SC_EXPRESS_EXPORT char * KW_PI;
-extern SC_EXPRESS_EXPORT char * KW_PROCEDURE;
-extern SC_EXPRESS_EXPORT char * KW_QUERY;
-extern SC_EXPRESS_EXPORT char * KW_REAL;
-extern SC_EXPRESS_EXPORT char * KW_REFERENCE;
-extern SC_EXPRESS_EXPORT char * KW_REMOVE;
-extern SC_EXPRESS_EXPORT char * KW_REPEAT;
-extern SC_EXPRESS_EXPORT char * KW_RETURN;
-extern SC_EXPRESS_EXPORT char * KW_ROLESOF;
-extern SC_EXPRESS_EXPORT char * KW_RULE;
-extern SC_EXPRESS_EXPORT char * KW_SCHEMA;
-extern SC_EXPRESS_EXPORT char * KW_SELECT;
-extern SC_EXPRESS_EXPORT char * KW_SELF;
-extern SC_EXPRESS_EXPORT char * KW_SET;
-extern SC_EXPRESS_EXPORT char * KW_SIN;
-extern SC_EXPRESS_EXPORT char * KW_SIZEOF;
-extern SC_EXPRESS_EXPORT char * KW_SKIP;
-extern SC_EXPRESS_EXPORT char * KW_SQRT;
-extern SC_EXPRESS_EXPORT char * KW_STRING;
-extern SC_EXPRESS_EXPORT char * KW_SUBTYPE;
-extern SC_EXPRESS_EXPORT char * KW_SUPERTYPE;
-extern SC_EXPRESS_EXPORT char * KW_TAN;
-extern SC_EXPRESS_EXPORT char * KW_THEN;
-extern SC_EXPRESS_EXPORT char * KW_TO;
-extern SC_EXPRESS_EXPORT char * KW_TRUE;
-extern SC_EXPRESS_EXPORT char * KW_TYPE;
-extern SC_EXPRESS_EXPORT char * KW_TYPEOF;
-extern SC_EXPRESS_EXPORT char * KW_UNIQUE;
-extern SC_EXPRESS_EXPORT char * KW_UNKNOWN;
-extern SC_EXPRESS_EXPORT char * KW_UNTIL;
-extern SC_EXPRESS_EXPORT char * KW_USE;
-extern SC_EXPRESS_EXPORT char * KW_USEDIN;
-extern SC_EXPRESS_EXPORT char * KW_VALUE;
-extern SC_EXPRESS_EXPORT char * KW_VALUE_IN;
-extern SC_EXPRESS_EXPORT char * KW_VALUE_UNIQUE;
-extern SC_EXPRESS_EXPORT char * KW_VAR;
-extern SC_EXPRESS_EXPORT char * KW_WHERE;
-extern SC_EXPRESS_EXPORT char * KW_WHILE;
-extern SC_EXPRESS_EXPORT char * KW_XOR;
+extern SC_EXPRESS_EXPORT char *KW_ABS;
+extern SC_EXPRESS_EXPORT char *KW_ABSTRACT;
+extern SC_EXPRESS_EXPORT char *KW_ACOS;
+extern SC_EXPRESS_EXPORT char *KW_AGGREGATE;
+extern SC_EXPRESS_EXPORT char *KW_ALIAS;
+extern SC_EXPRESS_EXPORT char *KW_AND;
+extern SC_EXPRESS_EXPORT char *KW_ANDOR;
+extern SC_EXPRESS_EXPORT char *KW_ARRAY;
+extern SC_EXPRESS_EXPORT char *KW_AS;
+extern SC_EXPRESS_EXPORT char *KW_ASIN;
+extern SC_EXPRESS_EXPORT char *KW_ATAN;
+extern SC_EXPRESS_EXPORT char *KW_BAG;
+extern SC_EXPRESS_EXPORT char *KW_BEGIN;
+extern SC_EXPRESS_EXPORT char *KW_BINARY;
+extern SC_EXPRESS_EXPORT char *KW_BLENGTH;
+extern SC_EXPRESS_EXPORT char *KW_BOOLEAN;
+extern SC_EXPRESS_EXPORT char *KW_BY;
+extern SC_EXPRESS_EXPORT char *KW_CASE;
+extern SC_EXPRESS_EXPORT char *KW_CONST_E;
+extern SC_EXPRESS_EXPORT char *KW_CONSTANT;
+extern SC_EXPRESS_EXPORT char *KW_CONTEXT;
+extern SC_EXPRESS_EXPORT char *KW_COS;
+extern SC_EXPRESS_EXPORT char *KW_DERIVE;
+extern SC_EXPRESS_EXPORT char *KW_DIV;
+extern SC_EXPRESS_EXPORT char *KW_ELSE;
+extern SC_EXPRESS_EXPORT char *KW_END;
+extern SC_EXPRESS_EXPORT char *KW_END_ALIAS;
+extern SC_EXPRESS_EXPORT char *KW_END_CASE;
+extern SC_EXPRESS_EXPORT char *KW_END_CONSTANT;
+extern SC_EXPRESS_EXPORT char *KW_END_CONTEXT;
+extern SC_EXPRESS_EXPORT char *KW_END_ENTITY;
+extern SC_EXPRESS_EXPORT char *KW_END_FUNCTION;
+extern SC_EXPRESS_EXPORT char *KW_END_IF;
+extern SC_EXPRESS_EXPORT char *KW_END_LOCAL;
+extern SC_EXPRESS_EXPORT char *KW_END_MODEL;
+extern SC_EXPRESS_EXPORT char *KW_END_PROCEDURE;
+extern SC_EXPRESS_EXPORT char *KW_END_REPEAT;
+extern SC_EXPRESS_EXPORT char *KW_END_RULE;
+extern SC_EXPRESS_EXPORT char *KW_END_SCHEMA;
+extern SC_EXPRESS_EXPORT char *KW_END_TYPE;
+extern SC_EXPRESS_EXPORT char *KW_ENTITY;
+extern SC_EXPRESS_EXPORT char *KW_ENUMERATION;
+extern SC_EXPRESS_EXPORT char *KW_ESCAPE;
+extern SC_EXPRESS_EXPORT char *KW_EXISTS;
+extern SC_EXPRESS_EXPORT char *KW_EXP;
+extern SC_EXPRESS_EXPORT char *KW_FALSE;
+extern SC_EXPRESS_EXPORT char *KW_FIXED;
+extern SC_EXPRESS_EXPORT char *KW_FOR;
+extern SC_EXPRESS_EXPORT char *KW_FORMAT;
+extern SC_EXPRESS_EXPORT char *KW_FROM;
+extern SC_EXPRESS_EXPORT char *KW_FUNCTION;
+extern SC_EXPRESS_EXPORT char *KW_GENERIC;
+extern SC_EXPRESS_EXPORT char *KW_HIBOUND;
+extern SC_EXPRESS_EXPORT char *KW_HIINDEX;
+extern SC_EXPRESS_EXPORT char *KW_IF;
+extern SC_EXPRESS_EXPORT char *KW_IN;
+extern SC_EXPRESS_EXPORT char *KW_INCLUDE;
+extern SC_EXPRESS_EXPORT char *KW_INSERT;
+extern SC_EXPRESS_EXPORT char *KW_INTEGER;
+extern SC_EXPRESS_EXPORT char *KW_INVERSE;
+extern SC_EXPRESS_EXPORT char *KW_LENGTH;
+extern SC_EXPRESS_EXPORT char *KW_LIKE;
+extern SC_EXPRESS_EXPORT char *KW_LIST;
+extern SC_EXPRESS_EXPORT char *KW_LOBOUND;
+extern SC_EXPRESS_EXPORT char *KW_LOCAL;
+extern SC_EXPRESS_EXPORT char *KW_LOG;
+extern SC_EXPRESS_EXPORT char *KW_LOG10;
+extern SC_EXPRESS_EXPORT char *KW_LOG2;
+extern SC_EXPRESS_EXPORT char *KW_LOGICAL;
+extern SC_EXPRESS_EXPORT char *KW_LOINDEX;
+extern SC_EXPRESS_EXPORT char *KW_MOD;
+extern SC_EXPRESS_EXPORT char *KW_MODEL;
+extern SC_EXPRESS_EXPORT char *KW_NOT;
+extern SC_EXPRESS_EXPORT char *KW_NUMBER;
+extern SC_EXPRESS_EXPORT char *KW_NVL;
+extern SC_EXPRESS_EXPORT char *KW_ODD;
+extern SC_EXPRESS_EXPORT char *KW_OF;
+extern SC_EXPRESS_EXPORT char *KW_ONEOF;
+extern SC_EXPRESS_EXPORT char *KW_OPTIONAL;
+extern SC_EXPRESS_EXPORT char *KW_OR;
+extern SC_EXPRESS_EXPORT char *KW_OTHERWISE;
+extern SC_EXPRESS_EXPORT char *KW_PI;
+extern SC_EXPRESS_EXPORT char *KW_PROCEDURE;
+extern SC_EXPRESS_EXPORT char *KW_QUERY;
+extern SC_EXPRESS_EXPORT char *KW_REAL;
+extern SC_EXPRESS_EXPORT char *KW_REFERENCE;
+extern SC_EXPRESS_EXPORT char *KW_REMOVE;
+extern SC_EXPRESS_EXPORT char *KW_REPEAT;
+extern SC_EXPRESS_EXPORT char *KW_RETURN;
+extern SC_EXPRESS_EXPORT char *KW_ROLESOF;
+extern SC_EXPRESS_EXPORT char *KW_RULE;
+extern SC_EXPRESS_EXPORT char *KW_SCHEMA;
+extern SC_EXPRESS_EXPORT char *KW_SELECT;
+extern SC_EXPRESS_EXPORT char *KW_SELF;
+extern SC_EXPRESS_EXPORT char *KW_SET;
+extern SC_EXPRESS_EXPORT char *KW_SIN;
+extern SC_EXPRESS_EXPORT char *KW_SIZEOF;
+extern SC_EXPRESS_EXPORT char *KW_SKIP;
+extern SC_EXPRESS_EXPORT char *KW_SQRT;
+extern SC_EXPRESS_EXPORT char *KW_STRING;
+extern SC_EXPRESS_EXPORT char *KW_SUBTYPE;
+extern SC_EXPRESS_EXPORT char *KW_SUPERTYPE;
+extern SC_EXPRESS_EXPORT char *KW_TAN;
+extern SC_EXPRESS_EXPORT char *KW_THEN;
+extern SC_EXPRESS_EXPORT char *KW_TO;
+extern SC_EXPRESS_EXPORT char *KW_TRUE;
+extern SC_EXPRESS_EXPORT char *KW_TYPE;
+extern SC_EXPRESS_EXPORT char *KW_TYPEOF;
+extern SC_EXPRESS_EXPORT char *KW_UNIQUE;
+extern SC_EXPRESS_EXPORT char *KW_UNKNOWN;
+extern SC_EXPRESS_EXPORT char *KW_UNTIL;
+extern SC_EXPRESS_EXPORT char *KW_USE;
+extern SC_EXPRESS_EXPORT char *KW_USEDIN;
+extern SC_EXPRESS_EXPORT char *KW_VALUE;
+extern SC_EXPRESS_EXPORT char *KW_VALUE_IN;
+extern SC_EXPRESS_EXPORT char *KW_VALUE_UNIQUE;
+extern SC_EXPRESS_EXPORT char *KW_VAR;
+extern SC_EXPRESS_EXPORT char *KW_WHERE;
+extern SC_EXPRESS_EXPORT char *KW_WHILE;
+extern SC_EXPRESS_EXPORT char *KW_XOR;
#endif /* EXP_KW_H */
Modified:
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/expbasic.h
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode/include/express/expbasic.h
2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/other/ext/stepcode/include/express/expbasic.h
2020-12-10 18:32:48 UTC (rev 77958)
@@ -46,7 +46,7 @@
/* typedef ... Binary; done below because String not defined yet */
#ifndef _CLIENTDATA
-typedef void * ClientData;
+typedef void *ClientData;
#define _CLIENTDATA
#endif
@@ -56,11 +56,11 @@
#include "alloc.h"
-typedef struct Scope_ * Type;
-typedef struct Scope_ * Scope;
-typedef struct Scope_ * Schema;
+typedef struct Scope_ *Type;
+typedef struct Scope_ *Scope;
+typedef struct Scope_ *Schema;
-typedef char * Binary;
+typedef char *Binary;
#include "linklist.h"
#define UNRESOLVED 0x0
Modified: brlcad/branches/extbuild/src/other/ext/stepcode/include/express/expr.h
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode/include/express/expr.h
2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/other/ext/stepcode/include/express/expr.h
2020-12-10 18:32:48 UTC (rev 77958)
@@ -88,10 +88,10 @@
} Op_Code;
typedef struct Qualified_Attr Qualified_Attr;
-typedef struct Expression_ * Expression;
+typedef struct Expression_ *Expression;
typedef Expression Ary_Expression, One_Of_Expression, Identifier,
Literal;
-typedef struct Query_ * Query;
+typedef struct Query_ *Query;
typedef One_Of_Expression Function_Call;
typedef Ary_Expression Ternary_Expression, Binary_Expression,
Unary_Expression;
@@ -116,9 +116,9 @@
/* expression types */
struct Qualified_Attr {
- struct Expression_ * complex; /**< complex entity instance */
- Symbol * entity;
- Symbol * attribute;
+ struct Expression_ *complex; /**< complex entity instance */
+ Symbol *entity;
+ Symbol *attribute;
};
struct Op_Subexpression {
@@ -132,11 +132,11 @@
Variable local;
Expression aggregate; /**< set from which to test */
Expression expression; /**< logical expression */
- struct Scope_ * scope;
+ struct Scope_ *scope;
};
struct Funcall {
- struct Scope_ * function; /**< can also be an entity because entities can
be called as functions */
+ struct Scope_ *function; /**< can also be an entity because entities can
be called as functions */
Linked_List list;
};
@@ -143,11 +143,11 @@
union expr_union {
int integer;
double real;
- char * attribute; /**< inverse .... for 'attr' */
- char * binary;
+ char *attribute; /**< inverse .... for 'attr' */
+ char *binary;
int logical;
bool boolean;
- struct Query_ * query;
+ struct Query_ *query;
struct Funcall funcall;
/* if etype == aggregate, list of expressions */
@@ -158,7 +158,7 @@
* initializer in local vars, or
* enumeration tags
* or oneof value */
- struct Scope_ * entity; /**< used by subtype exp, group expr
+ struct Scope_ *entity; /**< used by subtype exp, group expr
* and self expr, some funcall's and any
* expr that results in an entity */
Variable variable; /**< attribute reference */
@@ -177,8 +177,8 @@
/** indexed by the op enumeration values */
struct EXPop_entry {
- char * token; /**< literal token, e.g., "<>" */
- Type( *resolve )( Expression, struct Scope_ * );
+ char *token; /**< literal token, e.g., "<>" */
+ Type(*resolve)(Expression, struct Scope_ *);
};
/********************/
@@ -249,18 +249,18 @@
/* function prototypes */
/***********************/
-extern SC_EXPRESS_EXPORT Expression EXPcreate( Type );
-extern SC_EXPRESS_EXPORT Expression EXPcreate_simple( Type );
-extern SC_EXPRESS_EXPORT Expression EXPcreate_from_symbol( Type, Symbol * );
-extern SC_EXPRESS_EXPORT Expression UN_EXPcreate( Op_Code, Expression );
-extern SC_EXPRESS_EXPORT Expression BIN_EXPcreate( Op_Code, Expression,
Expression );
-extern SC_EXPRESS_EXPORT Expression TERN_EXPcreate( Op_Code, Expression,
Expression, Expression );
-extern SC_EXPRESS_EXPORT Expression QUERYcreate( Symbol *, Expression );
-extern SC_EXPRESS_EXPORT void EXPinitialize( void );
-extern SC_EXPRESS_EXPORT void EXPcleanup( void );
-extern SC_EXPRESS_EXPORT Type EXPtype( Expression, struct Scope_ * );
-extern SC_EXPRESS_EXPORT int EXPget_integer_value( Expression );
+extern SC_EXPRESS_EXPORT Expression EXPcreate(Type);
+extern SC_EXPRESS_EXPORT Expression EXPcreate_simple(Type);
+extern SC_EXPRESS_EXPORT Expression EXPcreate_from_symbol(Type, Symbol *);
+extern SC_EXPRESS_EXPORT Expression UN_EXPcreate(Op_Code, Expression);
+extern SC_EXPRESS_EXPORT Expression BIN_EXPcreate(Op_Code, Expression,
Expression);
+extern SC_EXPRESS_EXPORT Expression TERN_EXPcreate(Op_Code, Expression,
Expression, Expression);
+extern SC_EXPRESS_EXPORT Expression QUERYcreate(Symbol *, Expression);
+extern SC_EXPRESS_EXPORT void EXPinitialize(void);
+extern SC_EXPRESS_EXPORT void EXPcleanup(void);
+extern SC_EXPRESS_EXPORT Type EXPtype(Expression, struct Scope_ *);
+extern SC_EXPRESS_EXPORT int EXPget_integer_value(Expression);
-Type EXPresolve_op_dot( Expression, Scope );
+Type EXPresolve_op_dot(Expression, Scope);
#endif /*EXPRESSION_H*/
Modified:
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/express.h
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode/include/express/express.h
2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/other/ext/stepcode/include/express/express.h
2020-12-10 18:32:48 UTC (rev 77958)
@@ -68,7 +68,7 @@
/* typedefs */
/************/
-typedef struct Scope_ * Express;
+typedef struct Scope_ *Express;
/****************/
/* modules used */
@@ -79,9 +79,9 @@
/***************************/
struct Express_ {
- FILE * file;
- char * filename;
- char * basename; /**< name of file but without directory or .exp suffix */
+ FILE *file;
+ char *filename;
+ char *basename; /**< name of file but without directory or .exp suffix */
};
/********************/
@@ -88,24 +88,24 @@
/* global variables */
/********************/
-extern SC_EXPRESS_EXPORT char * input_filename;
+extern SC_EXPRESS_EXPORT char *input_filename;
extern SC_EXPRESS_EXPORT Linked_List EXPRESS_path;
extern SC_EXPRESS_EXPORT int EXPRESSpass;
-extern SC_EXPRESS_EXPORT void ( *EXPRESSinit_args )( int, char ** );
-extern SC_EXPRESS_EXPORT void ( *EXPRESSinit_parse )( void );
-extern SC_EXPRESS_EXPORT int ( *EXPRESSfail )( Express );
-extern SC_EXPRESS_EXPORT int ( *EXPRESSsucceed )( Express );
-extern SC_EXPRESS_EXPORT void ( *EXPRESSbackend )( Express );
-extern SC_EXPRESS_EXPORT char * EXPRESSprogram_name;
+extern SC_EXPRESS_EXPORT void (*EXPRESSinit_args)(int, char **);
+extern SC_EXPRESS_EXPORT void (*EXPRESSinit_parse)(void);
+extern SC_EXPRESS_EXPORT int (*EXPRESSfail)(Express);
+extern SC_EXPRESS_EXPORT int (*EXPRESSsucceed)(Express);
+extern SC_EXPRESS_EXPORT void (*EXPRESSbackend)(Express);
+extern SC_EXPRESS_EXPORT char *EXPRESSprogram_name;
extern char EXPRESSgetopt_options[]; /* initialized elsewhere */
-extern SC_EXPRESS_EXPORT int ( *EXPRESSgetopt )( int, char * );
+extern SC_EXPRESS_EXPORT int (*EXPRESSgetopt)(int, char *);
extern SC_EXPRESS_EXPORT bool EXPRESSignore_duplicate_schemas;
extern SC_EXPRESS_EXPORT Dictionary EXPRESSbuiltins; /* procedures/functions
*/
-extern SC_EXPRESS_EXPORT struct Scope_ * FUNC_NVL;
-extern SC_EXPRESS_EXPORT struct Scope_ * FUNC_USEDIN;
+extern SC_EXPRESS_EXPORT struct Scope_ *FUNC_NVL;
+extern SC_EXPRESS_EXPORT struct Scope_ *FUNC_USEDIN;
/******************************/
/* macro function definitions */
@@ -120,15 +120,15 @@
/* function prototypes */
/***********************/
-extern SC_EXPRESS_EXPORT Express EXPRESScreate( void );
-extern SC_EXPRESS_EXPORT void EXPRESSdestroy( Express );
-extern SC_EXPRESS_EXPORT void EXPRESSparse( Express, FILE *, char * );
-extern SC_EXPRESS_EXPORT void EXPRESSinitialize( void );
-extern SC_EXPRESS_EXPORT void EXPRESScleanup( void );
-extern SC_EXPRESS_EXPORT void EXPRESSresolve( Express );
-extern SC_EXPRESS_EXPORT int EXPRESS_fail( Express model );
-extern SC_EXPRESS_EXPORT int EXPRESS_succeed( Express model );
-extern void EXPRESSinit_init( void );
-extern SC_EXPRESS_EXPORT void build_complex( Express );
+extern SC_EXPRESS_EXPORT Express EXPRESScreate(void);
+extern SC_EXPRESS_EXPORT void EXPRESSdestroy(Express);
+extern SC_EXPRESS_EXPORT void EXPRESSparse(Express, FILE *, char *);
+extern SC_EXPRESS_EXPORT void EXPRESSinitialize(void);
+extern SC_EXPRESS_EXPORT void EXPRESScleanup(void);
+extern SC_EXPRESS_EXPORT void EXPRESSresolve(Express);
+extern SC_EXPRESS_EXPORT int EXPRESS_fail(Express model);
+extern SC_EXPRESS_EXPORT int EXPRESS_succeed(Express model);
+extern void EXPRESSinit_init(void);
+extern SC_EXPRESS_EXPORT void build_complex(Express);
#endif /*EXPRESS_H*/
Modified:
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/factory.h
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode/include/express/factory.h
2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/other/ext/stepcode/include/express/factory.h
2020-12-10 18:32:48 UTC (rev 77958)
@@ -1,6 +1,8 @@
#ifndef __FACTORY_H_
#define __FACTORY_H_
-void FACTORYinitialize();
+#include "sc_export.h"
+SC_EXPRESS_EXPORT void FACTORYinitialize();
+
#endif /* __FACTORY_H_ */
Modified: brlcad/branches/extbuild/src/other/ext/stepcode/include/express/hash.h
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode/include/express/hash.h
2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/other/ext/stepcode/include/express/hash.h
2020-12-10 18:32:48 UTC (rev 77958)
@@ -116,14 +116,14 @@
/****************/
typedef struct Element_ {
- char * key;
- char * data;
- struct Element_ * next;
- Symbol * symbol; /**< for debugging hash conflicts */
+ char *key;
+ char *data;
+ struct Element_ *next;
+ Symbol *symbol; /**< for debugging hash conflicts */
char type; /**< user-supplied type */
-} * Element;
+} *Element;
-typedef Element * Segment;
+typedef Element *Segment;
typedef struct Hash_Table_ {
#if 0
@@ -136,7 +136,7 @@
unsigned int MinLoadFactor;
unsigned int MaxLoadFactor;
Segment Directory[DIRECTORY_SIZE];
-} * Hash_Table;
+} *Hash_Table;
typedef struct {
unsigned int i; /**< segment index (i think) */
@@ -192,13 +192,13 @@
/* function prototypes */
/***********************/
-extern SC_EXPRESS_EXPORT void HASHinitialize( void );
-extern SC_EXPRESS_EXPORT Hash_Table HASHcreate( unsigned );
-extern SC_EXPRESS_EXPORT Hash_Table HASHcopy( Hash_Table );
-extern SC_EXPRESS_EXPORT void HASHdestroy( Hash_Table );
-extern SC_EXPRESS_EXPORT Element HASHsearch( Hash_Table, Element, Action );
-extern SC_EXPRESS_EXPORT void HASHlistinit( Hash_Table, HashEntry * );
-extern SC_EXPRESS_EXPORT void HASHlistinit_by_type( Hash_Table, HashEntry *,
char );
-extern SC_EXPRESS_EXPORT Element HASHlist( HashEntry * );
+extern SC_EXPRESS_EXPORT void HASHinitialize(void);
+extern SC_EXPRESS_EXPORT Hash_Table HASHcreate(unsigned);
+extern SC_EXPRESS_EXPORT Hash_Table HASHcopy(Hash_Table);
+extern SC_EXPRESS_EXPORT void HASHdestroy(Hash_Table);
+extern SC_EXPRESS_EXPORT Element HASHsearch(Hash_Table, Element, Action);
+extern SC_EXPRESS_EXPORT void HASHlistinit(Hash_Table, HashEntry *);
+extern SC_EXPRESS_EXPORT void HASHlistinit_by_type(Hash_Table, HashEntry *,
char);
+extern SC_EXPRESS_EXPORT Element HASHlist(HashEntry *);
#endif /*HASH_H*/
Modified: brlcad/branches/extbuild/src/other/ext/stepcode/include/express/info.h
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode/include/express/info.h
2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/other/ext/stepcode/include/express/info.h
2020-12-10 18:32:48 UTC (rev 77958)
@@ -6,9 +6,9 @@
* informative functions that were in express.c/express.h
*/
-extern SC_EXPRESS_EXPORT char * EXPRESSversion( void );
+extern SC_EXPRESS_EXPORT char *EXPRESSversion(void);
/** print usage message, then exit if _exit is non-zero */
-extern SC_EXPRESS_EXPORT void EXPRESSusage( int _exit );
+extern SC_EXPRESS_EXPORT void EXPRESSusage(int _exit);
#endif /* INFO_H */
Modified:
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/lexact.h
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode/include/express/lexact.h
2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/other/ext/stepcode/include/express/lexact.h
2020-12-10 18:32:48 UTC (rev 77958)
@@ -56,9 +56,9 @@
#ifdef keep_nul
int numRead;
#endif
- char * savedPos;
- FILE * file;
- const char * filename;
+ char *savedPos;
+ FILE *file;
+ const char *filename;
bool readEof;
int lineno;
int bol;
@@ -70,7 +70,7 @@
extern SC_EXPRESS_EXPORT Scan_Buffer SCAN_buffers[SCAN_NESTING_DEPTH];
extern SC_EXPRESS_EXPORT int SCAN_current_buffer;
-extern SC_EXPRESS_EXPORT char * SCANcurrent;
+extern SC_EXPRESS_EXPORT char *SCANcurrent;
/******************************/
/* macro function definitions */
@@ -93,22 +93,22 @@
/* function prototypes */
/***********************/
-extern SC_EXPRESS_EXPORT void SCANinitialize( void );
-extern SC_EXPRESS_EXPORT void SCANcleanup( void );
-extern SC_EXPRESS_EXPORT int SCANprocess_real_literal( const char * );
-extern SC_EXPRESS_EXPORT int SCANprocess_integer_literal( const char * );
-extern SC_EXPRESS_EXPORT int SCANprocess_binary_literal( const char * );
-extern SC_EXPRESS_EXPORT int SCANprocess_logical_literal( char * );
-extern SC_EXPRESS_EXPORT int SCANprocess_identifier_or_keyword( const char *
);
-extern SC_EXPRESS_EXPORT int SCANprocess_string( const char * );
-extern SC_EXPRESS_EXPORT int SCANprocess_encoded_string( const char * );
-extern SC_EXPRESS_EXPORT int SCANprocess_semicolon( const char *, int );
-extern SC_EXPRESS_EXPORT void SCANsave_comment( const char * );
-extern SC_EXPRESS_EXPORT bool SCANread( void );
-extern SC_EXPRESS_EXPORT void SCANinclude_file( char * );
- SC_EXPRESS_EXPORT void SCANlowerize( char * );
- SC_EXPRESS_EXPORT void SCANupperize( char * );
-extern SC_EXPRESS_EXPORT char * SCANstrdup( const char * );
-extern SC_EXPRESS_EXPORT long SCANtell( void );
+extern SC_EXPRESS_EXPORT void SCANinitialize(void);
+extern SC_EXPRESS_EXPORT void SCANcleanup(void);
+extern SC_EXPRESS_EXPORT int SCANprocess_real_literal(const char *);
+extern SC_EXPRESS_EXPORT int SCANprocess_integer_literal(const char *);
+extern SC_EXPRESS_EXPORT int SCANprocess_binary_literal(const char *);
+extern SC_EXPRESS_EXPORT int SCANprocess_logical_literal(char *);
+extern SC_EXPRESS_EXPORT int SCANprocess_identifier_or_keyword(const char *);
+extern SC_EXPRESS_EXPORT int SCANprocess_string(const char *);
+extern SC_EXPRESS_EXPORT int SCANprocess_encoded_string(const char *);
+extern SC_EXPRESS_EXPORT int SCANprocess_semicolon(const char *, int);
+extern SC_EXPRESS_EXPORT void SCANsave_comment(const char *);
+extern SC_EXPRESS_EXPORT bool SCANread(void);
+extern SC_EXPRESS_EXPORT void SCANinclude_file(char *);
+SC_EXPRESS_EXPORT void SCANlowerize(char *);
+SC_EXPRESS_EXPORT void SCANupperize(char *);
+extern SC_EXPRESS_EXPORT char *SCANstrdup(const char *);
+extern SC_EXPRESS_EXPORT long SCANtell(void);
#endif /* LEX_ACTIONS_H */
Modified:
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/linklist.h
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode/include/express/linklist.h
2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/other/ext/stepcode/include/express/linklist.h
2020-12-10 18:32:48 UTC (rev 77958)
@@ -44,7 +44,7 @@
/* typedefs */
/************/
-typedef struct Linked_List_ * Linked_List;
+typedef struct Linked_List_ *Linked_List;
/****************/
/* modules used */
@@ -57,10 +57,10 @@
/***************************/
typedef struct Link_ {
- struct Link_ * next;
- struct Link_ * prev;
+ struct Link_ *next;
+ struct Link_ *prev;
void *data;
-} * Link;
+} *Link;
struct Linked_List_ {
Link mark;
@@ -124,22 +124,22 @@
/* function prototypes */
/***********************/
-extern SC_EXPRESS_EXPORT void LISTinitialize( void );
-extern SC_EXPRESS_EXPORT void LISTcleanup( void );
-extern SC_EXPRESS_EXPORT Linked_List LISTcreate( void );
-extern SC_EXPRESS_EXPORT Linked_List LISTcopy( Linked_List );
-extern SC_EXPRESS_EXPORT void LISTsort( Linked_List, int (*comp)(void*, void*)
);
-extern SC_EXPRESS_EXPORT void LISTswap( Link, Link );
-extern SC_EXPRESS_EXPORT void * LISTadd_first( Linked_List, void * );
-extern SC_EXPRESS_EXPORT void * LISTadd_last( Linked_List, void * );
-extern SC_EXPRESS_EXPORT void * LISTadd_after( Linked_List, Link, void * );
-extern SC_EXPRESS_EXPORT void * LISTadd_before( Linked_List, Link, void * );
-extern SC_EXPRESS_EXPORT void * LISTremove_first( Linked_List );
-extern SC_EXPRESS_EXPORT void * LISTget_first( Linked_List );
-extern SC_EXPRESS_EXPORT void * LISTget_second( Linked_List );
-extern SC_EXPRESS_EXPORT void * LISTget_nth( Linked_List, int );
-extern SC_EXPRESS_EXPORT void LISTfree( Linked_List );
-extern SC_EXPRESS_EXPORT int LISTget_length( Linked_List );
-extern SC_EXPRESS_EXPORT bool LISTempty( Linked_List list );
+extern SC_EXPRESS_EXPORT void LISTinitialize(void);
+extern SC_EXPRESS_EXPORT void LISTcleanup(void);
+extern SC_EXPRESS_EXPORT Linked_List LISTcreate(void);
+extern SC_EXPRESS_EXPORT Linked_List LISTcopy(Linked_List);
+extern SC_EXPRESS_EXPORT void LISTsort(Linked_List, int (*comp)(void *, void
*));
+extern SC_EXPRESS_EXPORT void LISTswap(Link, Link);
+extern SC_EXPRESS_EXPORT void *LISTadd_first(Linked_List, void *);
+extern SC_EXPRESS_EXPORT void *LISTadd_last(Linked_List, void *);
+extern SC_EXPRESS_EXPORT void *LISTadd_after(Linked_List, Link, void *);
+extern SC_EXPRESS_EXPORT void *LISTadd_before(Linked_List, Link, void *);
+extern SC_EXPRESS_EXPORT void *LISTremove_first(Linked_List);
+extern SC_EXPRESS_EXPORT void *LISTget_first(Linked_List);
+extern SC_EXPRESS_EXPORT void *LISTget_second(Linked_List);
+extern SC_EXPRESS_EXPORT void *LISTget_nth(Linked_List, int);
+extern SC_EXPRESS_EXPORT void LISTfree(Linked_List);
+extern SC_EXPRESS_EXPORT int LISTget_length(Linked_List);
+extern SC_EXPRESS_EXPORT bool LISTempty(Linked_List list);
#endif /*LINKED_LIST_H*/
Modified:
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/memory.h
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode/include/express/memory.h
2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/other/ext/stepcode/include/express/memory.h
2020-12-10 18:32:48 UTC (rev 77958)
@@ -1,6 +1,8 @@
#ifndef __MEMORY_H
#define __MEMORY_H
-void MEMORYinitialize();
+#include "sc_export.h"
+SC_EXPRESS_EXPORT void MEMORYinitialize();
+
#endif // __MEMORY_H
Modified:
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/object.h
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode/include/express/object.h
2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/other/ext/stepcode/include/express/object.h
2020-12-10 18:32:48 UTC (rev 77958)
@@ -68,8 +68,8 @@
/***************************/
struct Object {
- struct Symbol_ * ( *get_symbol )();
- char * type; /**< should complete the phrase "X is ..." - i.e., "an
entity", "a type", "of unknown type" */
+ struct Symbol_ *(*get_symbol)();
+ 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 */
};
Modified:
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/resolve.h
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode/include/express/resolve.h
2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/other/ext/stepcode/include/express/resolve.h
2020-12-10 18:32:48 UTC (rev 77958)
@@ -60,29 +60,29 @@
/* function prototypes */
/***********************/
-extern SC_EXPRESS_EXPORT void RESOLVEinitialize( void );
-extern SC_EXPRESS_EXPORT void RESOLVEcleanup( void );
-extern SC_EXPRESS_EXPORT void SCOPEresolve_expressions_statements( Scope );
-extern SC_EXPRESS_EXPORT void SCOPEresolve_subsupers( Scope );
-extern SC_EXPRESS_EXPORT void SCOPEresolve_types( Scope );
-extern SC_EXPRESS_EXPORT void TYPE_resolve( Type * );
-extern SC_EXPRESS_EXPORT void EXP_resolve( Expression, Scope, Type );
-extern SC_EXPRESS_EXPORT void ALGresolve( Scope );
-extern SC_EXPRESS_EXPORT void SCHEMAresolve( Scope );
-extern SC_EXPRESS_EXPORT void RENAMEresolve( Rename *, Schema );
+extern SC_EXPRESS_EXPORT void RESOLVEinitialize(void);
+extern SC_EXPRESS_EXPORT void RESOLVEcleanup(void);
+extern SC_EXPRESS_EXPORT void SCOPEresolve_expressions_statements(Scope);
+extern SC_EXPRESS_EXPORT void SCOPEresolve_subsupers(Scope);
+extern SC_EXPRESS_EXPORT void SCOPEresolve_types(Scope);
+extern SC_EXPRESS_EXPORT void TYPE_resolve(Type *);
+extern SC_EXPRESS_EXPORT void EXP_resolve(Expression, Scope, Type);
+extern SC_EXPRESS_EXPORT void ALGresolve(Scope);
+extern SC_EXPRESS_EXPORT void SCHEMAresolve(Scope);
+extern SC_EXPRESS_EXPORT void RENAMEresolve(Rename *, Schema);
/*
* for unit tests, no extern / export
*/
-void VAR_resolve_expressions( Variable, Entity );
-void ENTITYresolve_subtypes( Schema );
-void ENTITYresolve_supertypes( Entity );
-void ENTITYresolve_expressions( Entity e );
-void ALGresolve_expressions_statements( Scope, Linked_List );
-int WHEREresolve( Linked_List, Scope, int );
-void TYPEresolve_expressions( Type, Scope );
-void STMTresolve( Statement, Scope );
-void STMTlist_resolve( Linked_List, Scope );
-int ENTITYresolve_subtype_expression( Expression, Entity, Linked_List * );
+void VAR_resolve_expressions(Variable, Entity);
+void ENTITYresolve_subtypes(Schema);
+void ENTITYresolve_supertypes(Entity);
+void ENTITYresolve_expressions(Entity e);
+void ALGresolve_expressions_statements(Scope, Linked_List);
+int WHEREresolve(Linked_List, Scope, int);
+void TYPEresolve_expressions(Type, Scope);
+void STMTresolve(Statement, Scope);
+void STMTlist_resolve(Linked_List, Scope);
+int ENTITYresolve_subtype_expression(Expression, Entity, Linked_List *);
#endif /*RESOLVE_H*/
Modified:
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/schema.h
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode/include/express/schema.h
2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/other/ext/stepcode/include/express/schema.h
2020-12-10 18:32:48 UTC (rev 77958)
@@ -72,10 +72,10 @@
enum rename_type { use, ref };
typedef struct Rename {
- struct Symbol_ * schema_sym;
+ struct Symbol_ *schema_sym;
Schema schema;
- struct Symbol_ * old;
- struct Symbol_ * nnew;
+ struct Symbol_ *old;
+ struct Symbol_ *nnew;
void *object; /**< once object has been looked up */
char type; /**< drat, need to remember this once renames have been
* resolved to avoid looking them up in the dictionary
again */
@@ -133,22 +133,22 @@
/* function prototypes */
/***********************/
-extern SC_EXPRESS_EXPORT Variable VARfind( Scope, char *, int );
-extern SC_EXPRESS_EXPORT Schema SCHEMAcreate( void );
-extern SC_EXPRESS_EXPORT void SCHEMAinitialize( void );
-extern SC_EXPRESS_EXPORT void SCHEMAadd_use( Schema, Symbol *, Symbol *,
Symbol * );
-extern SC_EXPRESS_EXPORT void SCHEMAadd_reference( Schema, Symbol *,
Symbol *, Symbol * );
-extern SC_EXPRESS_EXPORT void SCHEMAdefine_use( Schema, Rename * );
-extern SC_EXPRESS_EXPORT void SCHEMAdefine_reference( Schema, Rename * );
-extern SC_EXPRESS_EXPORT void * SCHEMAfind( Schema, char * name, int
search_refs );
-extern SC_EXPRESS_EXPORT Scope SCOPEcreate( char );
-extern SC_EXPRESS_EXPORT Scope SCOPEcreate_tiny( char );
-extern SC_EXPRESS_EXPORT Scope SCOPEcreate_nostab( char );
-extern SC_EXPRESS_EXPORT void SCOPEdestroy( Scope );
-extern SC_EXPRESS_EXPORT Linked_List SCHEMAget_entities_use( Scope );
-extern SC_EXPRESS_EXPORT Linked_List SCHEMAget_entities_ref( Scope );
+extern SC_EXPRESS_EXPORT Variable VARfind(Scope, char *, int);
+extern SC_EXPRESS_EXPORT Schema SCHEMAcreate(void);
+extern SC_EXPRESS_EXPORT void SCHEMAinitialize(void);
+extern SC_EXPRESS_EXPORT void SCHEMAadd_use(Schema, Symbol *, Symbol *,
Symbol *);
+extern SC_EXPRESS_EXPORT void SCHEMAadd_reference(Schema, Symbol *, Symbol
*, Symbol *);
+extern SC_EXPRESS_EXPORT void SCHEMAdefine_use(Schema, Rename *);
+extern SC_EXPRESS_EXPORT void SCHEMAdefine_reference(Schema, Rename *);
+extern SC_EXPRESS_EXPORT void *SCHEMAfind(Schema, char *name, int
search_refs);
+extern SC_EXPRESS_EXPORT Scope SCOPEcreate(char);
+extern SC_EXPRESS_EXPORT Scope SCOPEcreate_tiny(char);
+extern SC_EXPRESS_EXPORT Scope SCOPEcreate_nostab(char);
+extern SC_EXPRESS_EXPORT void SCOPEdestroy(Scope);
+extern SC_EXPRESS_EXPORT Linked_List SCHEMAget_entities_use(Scope);
+extern SC_EXPRESS_EXPORT Linked_List SCHEMAget_entities_ref(Scope);
-void SCHEMA_get_entities_ref( Scope, Linked_List );
+void SCHEMA_get_entities_ref(Scope, Linked_List);
#endif /* SCHEMA_H */
Modified:
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/scope.h
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode/include/express/scope.h
2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/other/ext/stepcode/include/express/scope.h
2020-12-10 18:32:48 UTC (rev 77958)
@@ -83,16 +83,16 @@
ClientData clientData; /**< user may use this for any purpose */
int search_id; /**< key to avoid searching this scope twice */
Dictionary symbol_table, enum_table;
- struct Scope_ * superscope;
+ struct Scope_ *superscope;
union {
- struct Procedure_ * proc;
- struct Function_ * func;
- struct Rule_ * rule;
- struct Entity_ * entity;
- struct Schema_ * schema;
- struct Express_ * express;
- struct Increment_ * incr;
- struct TypeHead_ * type;
+ struct Procedure_ *proc;
+ struct Function_ *func;
+ struct Rule_ *rule;
+ struct Entity_ *entity;
+ struct Schema_ *schema;
+ struct Express_ *express;
+ struct Increment_ *incr;
+ struct TypeHead_ *type;
/* no, query owns a scope rather than scope owning a query
* struct Query *query; */
} u;
@@ -134,16 +134,16 @@
/* function prototypes */
/***********************/
-extern SC_EXPRESS_EXPORT struct Symbol_ * SCOPE_get_symbol( void * );
-extern SC_EXPRESS_EXPORT void SCOPE_get_entities( Scope, Linked_List );
-extern SC_EXPRESS_EXPORT Linked_List SCOPEget_entities( Scope );
-extern SC_EXPRESS_EXPORT Linked_List SCOPEget_entities_superclass_order(
Scope );
-extern SC_EXPRESS_EXPORT void * SCOPEfind( Scope, char *, int );
-extern SC_EXPRESS_EXPORT void SCOPE_get_functions( Scope, Linked_List );
-extern SC_EXPRESS_EXPORT Linked_List SCOPEget_functions( Scope );
-extern SC_EXPRESS_EXPORT void SCOPE_get_rules( Scope, Linked_List );
-extern SC_EXPRESS_EXPORT Linked_List SCOPEget_rules( Scope );
+extern SC_EXPRESS_EXPORT struct Symbol_ *SCOPE_get_symbol(void *);
+extern SC_EXPRESS_EXPORT void SCOPE_get_entities(Scope, Linked_List);
+extern SC_EXPRESS_EXPORT Linked_List SCOPEget_entities(Scope);
+extern SC_EXPRESS_EXPORT Linked_List
SCOPEget_entities_superclass_order(Scope);
+extern SC_EXPRESS_EXPORT void *SCOPEfind(Scope, char *, int);
+extern SC_EXPRESS_EXPORT void SCOPE_get_functions(Scope, Linked_List);
+extern SC_EXPRESS_EXPORT Linked_List SCOPEget_functions(Scope);
+extern SC_EXPRESS_EXPORT void SCOPE_get_rules(Scope, Linked_List);
+extern SC_EXPRESS_EXPORT Linked_List SCOPEget_rules(Scope);
-void * SCOPE_find( Scope, char *, int );
+void *SCOPE_find(Scope, char *, int);
#endif /* SCOPE_H */
Modified: brlcad/branches/extbuild/src/other/ext/stepcode/include/express/stmt.h
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode/include/express/stmt.h
2020-12-10 18:21:22 UTC (rev 77957)
+++ brlcad/branches/extbuild/src/other/ext/stepcode/include/express/stmt.h
2020-12-10 18:32:48 UTC (rev 77958)
@@ -56,17 +56,17 @@
/* typedefs */
/************/
-typedef struct Statement_ * Statement,
- *Alias,
- *Assignment,
- *Case_Statement,
- *Compound_Statement,
- *Conditional,
- *Loop,
- *Procedure_Call,
- *Return_Statement;
+typedef struct Statement_ *Statement,
+ *Alias,
+ *Assignment,
+ *Case_Statement,
+ *Compound_Statement,
+ *Conditional,
+ *Loop,
+ *Procedure_Call,
+ *Return_Statement;
-typedef struct Scope_ * Increment;
+typedef struct Scope_ *Increment;
/****************/
/* modules used */
@@ -97,21 +97,21 @@
int type; /**< one of STMT_XXX above */
/* hey, is there nothing in common beside symbol and private data?? */
union u_statement {
- struct Alias_ * alias;
- struct Assignment_ * assign;
- struct Case_Statement_ * Case;
- struct Compound_Statement_ * compound;
- struct Conditional_ * cond;
- struct Loop_ * loop;
- struct Procedure_Call_ * proc;
- struct Return_Statement_ * ret;
+ struct Alias_ *alias;
+ struct Assignment_ *assign;
+ struct Case_Statement_ *Case;
+ struct Compound_Statement_ *compound;
+ struct Conditional_ *cond;
+ struct Loop_ *loop;
+ struct Procedure_Call_ *proc;
+ struct Return_Statement_ *ret;
/* skip & escape have no data */
} u;
};
struct Alias_ {
- struct Scope_ * scope;
- struct Variable_ * variable;
+ struct Scope_ *scope;
+ struct Variable_ *variable;
Linked_List statements; /**< list of statements */
};
@@ -136,7 +136,7 @@
};
struct Loop_ {
- struct Scope_ * scope; /**< scope for increment control */
+ struct Scope_ *scope; /**< scope for increment control */
Expression while_expr;
Expression until_expr;
Linked_List statements; /**< list of statements */
@@ -150,7 +150,7 @@
};
struct Procedure_Call_ {
- struct Scope_ * procedure;
+ struct Scope_ *procedure;
Linked_List parameters; /**< list of expressions */
};
@@ -225,17 +225,17 @@
/* function prototypes */
/***********************/
-extern SC_EXPRESS_EXPORT Statement STMTcreate( int );
-extern SC_EXPRESS_EXPORT Statement ALIAScreate( struct Scope_ *, Variable,
Linked_List );
-extern SC_EXPRESS_EXPORT Statement CASEcreate( Expression , Linked_List );
-extern SC_EXPRESS_EXPORT Statement ASSIGNcreate( Expression , Expression );
-extern SC_EXPRESS_EXPORT Statement COMP_STMTcreate( Linked_List );
-extern SC_EXPRESS_EXPORT Statement CONDcreate( Expression, Linked_List,
Linked_List );
-extern SC_EXPRESS_EXPORT Statement LOOPcreate( struct Scope_ *, Expression,
Expression, Linked_List );
-extern SC_EXPRESS_EXPORT Statement PCALLcreate( Linked_List );
-extern SC_EXPRESS_EXPORT Statement RETcreate( Expression );
-extern SC_EXPRESS_EXPORT void STMTinitialize( void );
-extern SC_EXPRESS_EXPORT struct Scope_ * INCR_CTLcreate( Symbol *, Expression
start,
- Expression end, Expression increment );
+extern SC_EXPRESS_EXPORT Statement STMTcreate(int);
+extern SC_EXPRESS_EXPORT Statement ALIAScreate(struct Scope_ *, Variable,
Linked_List);
+extern SC_EXPRESS_EXPORT Statement CASEcreate(Expression, Linked_List);
+extern SC_EXPRESS_EXPORT Statement ASSIGNcreate(Expression, Expression);
+extern SC_EXPRESS_EXPORT Statement COMP_STMTcreate(Linked_List);
+extern SC_EXPRESS_EXPORT Statement CONDcreate(Expression, Linked_List,
Linked_List);
+extern SC_EXPRESS_EXPORT Statement LOOPcreate(struct Scope_ *, Expression,
Expression, Linked_List);
+extern SC_EXPRESS_EXPORT Statement PCALLcreate(Linked_List);
+extern SC_EXPRESS_EXPORT Statement RETcreate(Expression);
+extern SC_EXPRESS_EXPORT void STMTinitialize(void);
+extern SC_EXPRESS_EXPORT struct Scope_ *INCR_CTLcreate(Symbol *, Expression
start,
+ Expression end, Expression increment);
#endif /*STATEMENT_H*/
Modified:
brlcad/branches/extbuild/src/other/ext/stepcode/include/express/symbol.h
===================================================================
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
