Revision: 77953
http://sourceforge.net/p/brlcad/code/77953
Author: starseeker
Date: 2020-12-09 14:41:41 +0000 (Wed, 09 Dec 2020)
Log Message:
-----------
Pull in the latest stepcode as of Wed 09 Dec 2020 02:40:29 PM UTC
Modified Paths:
--------------
brlcad/branches/stepsync/src/other/stepcode/CMakeLists.txt
brlcad/branches/stepsync/src/other/stepcode/README.md
brlcad/branches/stepsync/src/other/stepcode/include/exppp/exppp.h
brlcad/branches/stepsync/src/other/stepcode/include/express/alg.h
brlcad/branches/stepsync/src/other/stepcode/include/express/alloc.h
brlcad/branches/stepsync/src/other/stepcode/include/express/basic.h
brlcad/branches/stepsync/src/other/stepcode/include/express/caseitem.h
brlcad/branches/stepsync/src/other/stepcode/include/express/dict.h
brlcad/branches/stepsync/src/other/stepcode/include/express/entity.h
brlcad/branches/stepsync/src/other/stepcode/include/express/error.h
brlcad/branches/stepsync/src/other/stepcode/include/express/exp_kw.h
brlcad/branches/stepsync/src/other/stepcode/include/express/expbasic.h
brlcad/branches/stepsync/src/other/stepcode/include/express/expr.h
brlcad/branches/stepsync/src/other/stepcode/include/express/express.h
brlcad/branches/stepsync/src/other/stepcode/include/express/factory.h
brlcad/branches/stepsync/src/other/stepcode/include/express/hash.h
brlcad/branches/stepsync/src/other/stepcode/include/express/info.h
brlcad/branches/stepsync/src/other/stepcode/include/express/lexact.h
brlcad/branches/stepsync/src/other/stepcode/include/express/linklist.h
brlcad/branches/stepsync/src/other/stepcode/include/express/memory.h
brlcad/branches/stepsync/src/other/stepcode/include/express/object.h
brlcad/branches/stepsync/src/other/stepcode/include/express/resolve.h
brlcad/branches/stepsync/src/other/stepcode/include/express/schema.h
brlcad/branches/stepsync/src/other/stepcode/include/express/scope.h
brlcad/branches/stepsync/src/other/stepcode/include/express/stmt.h
brlcad/branches/stepsync/src/other/stepcode/include/express/symbol.h
brlcad/branches/stepsync/src/other/stepcode/include/express/type.h
brlcad/branches/stepsync/src/other/stepcode/include/express/variable.h
brlcad/branches/stepsync/src/other/stepcode/include/ordered_attrs.h
brlcad/branches/stepsync/src/other/stepcode/misc/astyle.cfg
brlcad/branches/stepsync/src/other/stepcode/src/base/judy/misc/judy64n.c
brlcad/branches/stepsync/src/other/stepcode/src/base/judy/src/judy.c
brlcad/branches/stepsync/src/other/stepcode/src/base/judy/src/judy.h
brlcad/branches/stepsync/src/other/stepcode/src/base/judy/src/judyL2Array.h
brlcad/branches/stepsync/src/other/stepcode/src/base/judy/src/judyLArray.h
brlcad/branches/stepsync/src/other/stepcode/src/base/judy/src/judyS2Array.h
brlcad/branches/stepsync/src/other/stepcode/src/base/judy/src/judySArray.h
brlcad/branches/stepsync/src/other/stepcode/src/base/judy/test/hexSort.c
brlcad/branches/stepsync/src/other/stepcode/src/base/judy/test/judyL2test.cc
brlcad/branches/stepsync/src/other/stepcode/src/base/judy/test/judyLtest.cc
brlcad/branches/stepsync/src/other/stepcode/src/base/judy/test/judyS2test.cc
brlcad/branches/stepsync/src/other/stepcode/src/base/judy/test/judyStest.cc
brlcad/branches/stepsync/src/other/stepcode/src/base/judy/test/pennySort.c
brlcad/branches/stepsync/src/other/stepcode/src/base/judy/test/sort.c
brlcad/branches/stepsync/src/other/stepcode/src/base/judy/test/sort.h
brlcad/branches/stepsync/src/other/stepcode/src/base/path2str.c
brlcad/branches/stepsync/src/other/stepcode/src/base/path2str.h
brlcad/branches/stepsync/src/other/stepcode/src/base/sc_benchmark.cc
brlcad/branches/stepsync/src/other/stepcode/src/base/sc_benchmark.h
brlcad/branches/stepsync/src/other/stepcode/src/base/sc_getopt.cc
brlcad/branches/stepsync/src/other/stepcode/src/base/sc_getopt.h
brlcad/branches/stepsync/src/other/stepcode/src/base/sc_memmgr.cc
brlcad/branches/stepsync/src/other/stepcode/src/base/sc_memmgr.h
brlcad/branches/stepsync/src/other/stepcode/src/base/sc_mkdir.c
brlcad/branches/stepsync/src/other/stepcode/src/base/sc_mkdir.h
brlcad/branches/stepsync/src/other/stepcode/src/base/sc_stdio.h
brlcad/branches/stepsync/src/other/stepcode/src/base/sc_trace_fprintf.c
brlcad/branches/stepsync/src/other/stepcode/src/base/sc_trace_fprintf.h
brlcad/branches/stepsync/src/other/stepcode/src/cldai/sdaiApplication_instance_set.cc
brlcad/branches/stepsync/src/other/stepcode/src/cldai/sdaiApplication_instance_set.h
brlcad/branches/stepsync/src/other/stepcode/src/cldai/sdaiBinary.cc
brlcad/branches/stepsync/src/other/stepcode/src/cldai/sdaiBinary.h
brlcad/branches/stepsync/src/other/stepcode/src/cldai/sdaiDaObject.cc
brlcad/branches/stepsync/src/other/stepcode/src/cldai/sdaiDaObject.h
brlcad/branches/stepsync/src/other/stepcode/src/cldai/sdaiEntity_extent.cc
brlcad/branches/stepsync/src/other/stepcode/src/cldai/sdaiEntity_extent.h
brlcad/branches/stepsync/src/other/stepcode/src/cldai/sdaiEntity_extent_set.cc
brlcad/branches/stepsync/src/other/stepcode/src/cldai/sdaiEntity_extent_set.h
brlcad/branches/stepsync/src/other/stepcode/src/cldai/sdaiEnum.cc
brlcad/branches/stepsync/src/other/stepcode/src/cldai/sdaiEnum.h
brlcad/branches/stepsync/src/other/stepcode/src/cldai/sdaiModel_contents.cc
brlcad/branches/stepsync/src/other/stepcode/src/cldai/sdaiModel_contents.h
brlcad/branches/stepsync/src/other/stepcode/src/cldai/sdaiModel_contents_list.cc
brlcad/branches/stepsync/src/other/stepcode/src/cldai/sdaiModel_contents_list.h
brlcad/branches/stepsync/src/other/stepcode/src/cldai/sdaiObject.cc
brlcad/branches/stepsync/src/other/stepcode/src/cldai/sdaiObject.h
brlcad/branches/stepsync/src/other/stepcode/src/cldai/sdaiSession_instance.cc
brlcad/branches/stepsync/src/other/stepcode/src/cldai/sdaiSession_instance.h
brlcad/branches/stepsync/src/other/stepcode/src/cldai/sdaiString.cc
brlcad/branches/stepsync/src/other/stepcode/src/cldai/sdaiString.h
brlcad/branches/stepsync/src/other/stepcode/src/cleditor/STEPfile.cc
brlcad/branches/stepsync/src/other/stepcode/src/cleditor/STEPfile.h
brlcad/branches/stepsync/src/other/stepcode/src/cleditor/STEPfile.inline.cc
brlcad/branches/stepsync/src/other/stepcode/src/cleditor/SdaiHeaderSchema.cc
brlcad/branches/stepsync/src/other/stepcode/src/cleditor/SdaiHeaderSchema.h
brlcad/branches/stepsync/src/other/stepcode/src/cleditor/SdaiHeaderSchemaAll.cc
brlcad/branches/stepsync/src/other/stepcode/src/cleditor/SdaiHeaderSchemaClasses.h
brlcad/branches/stepsync/src/other/stepcode/src/cleditor/SdaiHeaderSchemaInit.cc
brlcad/branches/stepsync/src/other/stepcode/src/cleditor/SdaiSchemaInit.cc
brlcad/branches/stepsync/src/other/stepcode/src/cleditor/SdaiSchemaInit.h
brlcad/branches/stepsync/src/other/stepcode/src/cleditor/cmdmgr.cc
brlcad/branches/stepsync/src/other/stepcode/src/cleditor/cmdmgr.h
brlcad/branches/stepsync/src/other/stepcode/src/cleditor/seeinfodefault.h
brlcad/branches/stepsync/src/other/stepcode/src/cllazyfile/headerSectionReader.h
brlcad/branches/stepsync/src/other/stepcode/src/cllazyfile/instMgrHelper.h
brlcad/branches/stepsync/src/other/stepcode/src/cllazyfile/lazyDataSectionReader.cc
brlcad/branches/stepsync/src/other/stepcode/src/cllazyfile/lazyDataSectionReader.h
brlcad/branches/stepsync/src/other/stepcode/src/cllazyfile/lazyFileReader.cc
brlcad/branches/stepsync/src/other/stepcode/src/cllazyfile/lazyFileReader.h
brlcad/branches/stepsync/src/other/stepcode/src/cllazyfile/lazyInstMgr.cc
brlcad/branches/stepsync/src/other/stepcode/src/cllazyfile/lazyInstMgr.h
brlcad/branches/stepsync/src/other/stepcode/src/cllazyfile/lazyP21DataSectionReader.cc
brlcad/branches/stepsync/src/other/stepcode/src/cllazyfile/lazyP21DataSectionReader.h
brlcad/branches/stepsync/src/other/stepcode/src/cllazyfile/lazyRefs.h
brlcad/branches/stepsync/src/other/stepcode/src/cllazyfile/lazyTypes.h
brlcad/branches/stepsync/src/other/stepcode/src/cllazyfile/lazy_test.cc
brlcad/branches/stepsync/src/other/stepcode/src/cllazyfile/p21HeaderSectionReader.cc
brlcad/branches/stepsync/src/other/stepcode/src/cllazyfile/p21HeaderSectionReader.h
brlcad/branches/stepsync/src/other/stepcode/src/cllazyfile/sectionReader.cc
brlcad/branches/stepsync/src/other/stepcode/src/cllazyfile/sectionReader.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/Registry.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/Registry.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/STEPaggrBinary.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/STEPaggrBinary.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/STEPaggrEntity.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/STEPaggrEntity.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/STEPaggrEnum.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/STEPaggrEnum.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/STEPaggrGeneric.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/STEPaggrGeneric.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/STEPaggrInt.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/STEPaggrInt.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/STEPaggrReal.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/STEPaggrReal.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/STEPaggrSelect.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/STEPaggrSelect.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/STEPaggrString.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/STEPaggrString.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/STEPaggregate.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/STEPaggregate.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/STEPattribute.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/STEPattribute.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/STEPattributeList.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/STEPattributeList.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/STEPcomplex.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/STEPcomplex.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/STEPinvAttrList.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/STEPinvAttrList.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/STEPundefined.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/STEPundefined.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/SingleLinkList.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/SingleLinkList.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/SubSuperIterators.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/aggrTypeDescriptor.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/aggrTypeDescriptor.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/attrDescriptor.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/attrDescriptor.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/attrDescriptorList.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/attrDescriptorList.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/collect.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/complexSupport.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/complexlist.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/create_Aggr.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/create_Aggr.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/derivedAttribute.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/derivedAttribute.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/dictSchema.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/dictSchema.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/dictdefs.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/dictionaryInstance.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/dispnode.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/dispnode.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/dispnodelist.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/dispnodelist.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/entityDescriptor.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/entityDescriptor.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/entityDescriptorList.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/entityDescriptorList.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/entlist.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/entnode.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/enumTypeDescriptor.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/enumTypeDescriptor.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/explicitItemId.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/explicitItemId.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/globalRule.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/globalRule.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/implicitItemId.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/implicitItemId.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/instmgr.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/instmgr.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/interfaceSpec.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/interfaceSpec.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/interfacedItem.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/interfacedItem.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/inverseAttribute.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/inverseAttribute.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/inverseAttributeList.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/inverseAttributeList.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/match-ors.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/mgrnode.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/mgrnode.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/mgrnodearray.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/mgrnodearray.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/mgrnodelist.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/mgrnodelist.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/multlist.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/needFunc.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/needFunc.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/non-ors.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/orlist.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/print.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/read_func.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/read_func.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/realTypeDescriptor.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/schRename.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/schRename.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/sdai.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/sdai.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/sdaiApplication_instance.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/sdaiApplication_instance.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/sdaiSelect.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/sdaiSelect.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/selectTypeDescriptor.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/selectTypeDescriptor.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/stringTypeDescriptor.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/superInvAttrIter.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/test/CMakeLists.txt
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/test/test_SupertypesIterator.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/test/test_null_attr.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/test/test_operators_SDAI_Select.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/test/test_operators_STEPattribute.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/trynext.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/typeDescriptor.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/typeDescriptor.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/typeDescriptorList.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/typeDescriptorList.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/typeOrRuleVar.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/typeOrRuleVar.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/uniquenessRule.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/uniquenessRule.h
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/whereRule.cc
brlcad/branches/stepsync/src/other/stepcode/src/clstepcore/whereRule.h
brlcad/branches/stepsync/src/other/stepcode/src/clutils/Str.cc
brlcad/branches/stepsync/src/other/stepcode/src/clutils/Str.h
brlcad/branches/stepsync/src/other/stepcode/src/clutils/dirobj.cc
brlcad/branches/stepsync/src/other/stepcode/src/clutils/dirobj.h
brlcad/branches/stepsync/src/other/stepcode/src/clutils/errordesc.cc
brlcad/branches/stepsync/src/other/stepcode/src/clutils/errordesc.h
brlcad/branches/stepsync/src/other/stepcode/src/clutils/gennode.cc
brlcad/branches/stepsync/src/other/stepcode/src/clutils/gennode.h
brlcad/branches/stepsync/src/other/stepcode/src/clutils/gennodearray.cc
brlcad/branches/stepsync/src/other/stepcode/src/clutils/gennodearray.h
brlcad/branches/stepsync/src/other/stepcode/src/clutils/gennodelist.cc
brlcad/branches/stepsync/src/other/stepcode/src/clutils/gennodelist.h
brlcad/branches/stepsync/src/other/stepcode/src/clutils/sc_hash.cc
brlcad/branches/stepsync/src/other/stepcode/src/clutils/sc_hash.h
brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/class_strings.c
brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/class_strings.h
brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/classes.c
brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/classes.h
brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/classes_attribute.c
brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/classes_attribute.h
brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/classes_entity.c
brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/classes_entity.h
brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/classes_misc.c
brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/classes_type.c
brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/classes_type.h
brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/classes_wrapper.cc
brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/collect.cc
brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/complexSupport.h
brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/complexlist.cc
brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/entlist.cc
brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/entnode.cc
brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/expressbuild.cc
brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/fedex_main.c
brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/genCxxFilenames.c
brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/genCxxFilenames.h
brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/match-ors.cc
brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/multlist.cc
brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/multpass.c
brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/non-ors.cc
brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/orlist.cc
brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/print.cc
brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/rules.c
brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/rules.h
brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/selects.c
brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/trynext.cc
brlcad/branches/stepsync/src/other/stepcode/src/exp2cxx/write.cc
brlcad/branches/stepsync/src/other/stepcode/src/exp2python/src/classes.h
brlcad/branches/stepsync/src/other/stepcode/src/exp2python/src/classes_misc_python.c
brlcad/branches/stepsync/src/other/stepcode/src/exp2python/src/classes_python.c
brlcad/branches/stepsync/src/other/stepcode/src/exp2python/src/classes_wrapper_python.cc
brlcad/branches/stepsync/src/other/stepcode/src/exp2python/src/complexSupport.h
brlcad/branches/stepsync/src/other/stepcode/src/exp2python/src/fedex_main_python.c
brlcad/branches/stepsync/src/other/stepcode/src/exp2python/src/multpass_python.c
brlcad/branches/stepsync/src/other/stepcode/src/exp2python/src/selects_python.c
brlcad/branches/stepsync/src/other/stepcode/src/exppp/exppp-main.c
brlcad/branches/stepsync/src/other/stepcode/src/exppp/exppp.c
brlcad/branches/stepsync/src/other/stepcode/src/exppp/pp.h
brlcad/branches/stepsync/src/other/stepcode/src/exppp/pretty_alg.c
brlcad/branches/stepsync/src/other/stepcode/src/exppp/pretty_alg.h
brlcad/branches/stepsync/src/other/stepcode/src/exppp/pretty_case.c
brlcad/branches/stepsync/src/other/stepcode/src/exppp/pretty_case.h
brlcad/branches/stepsync/src/other/stepcode/src/exppp/pretty_entity.c
brlcad/branches/stepsync/src/other/stepcode/src/exppp/pretty_entity.h
brlcad/branches/stepsync/src/other/stepcode/src/exppp/pretty_expr.c
brlcad/branches/stepsync/src/other/stepcode/src/exppp/pretty_expr.h
brlcad/branches/stepsync/src/other/stepcode/src/exppp/pretty_express.c
brlcad/branches/stepsync/src/other/stepcode/src/exppp/pretty_express.h
brlcad/branches/stepsync/src/other/stepcode/src/exppp/pretty_func.c
brlcad/branches/stepsync/src/other/stepcode/src/exppp/pretty_func.h
brlcad/branches/stepsync/src/other/stepcode/src/exppp/pretty_loop.c
brlcad/branches/stepsync/src/other/stepcode/src/exppp/pretty_loop.h
brlcad/branches/stepsync/src/other/stepcode/src/exppp/pretty_proc.c
brlcad/branches/stepsync/src/other/stepcode/src/exppp/pretty_proc.h
brlcad/branches/stepsync/src/other/stepcode/src/exppp/pretty_ref.c
brlcad/branches/stepsync/src/other/stepcode/src/exppp/pretty_ref.h
brlcad/branches/stepsync/src/other/stepcode/src/exppp/pretty_rule.c
brlcad/branches/stepsync/src/other/stepcode/src/exppp/pretty_rule.h
brlcad/branches/stepsync/src/other/stepcode/src/exppp/pretty_schema.c
brlcad/branches/stepsync/src/other/stepcode/src/exppp/pretty_schema.h
brlcad/branches/stepsync/src/other/stepcode/src/exppp/pretty_scope.c
brlcad/branches/stepsync/src/other/stepcode/src/exppp/pretty_scope.h
brlcad/branches/stepsync/src/other/stepcode/src/exppp/pretty_stmt.c
brlcad/branches/stepsync/src/other/stepcode/src/exppp/pretty_stmt.h
brlcad/branches/stepsync/src/other/stepcode/src/exppp/pretty_subtype.c
brlcad/branches/stepsync/src/other/stepcode/src/exppp/pretty_subtype.h
brlcad/branches/stepsync/src/other/stepcode/src/exppp/pretty_type.c
brlcad/branches/stepsync/src/other/stepcode/src/exppp/pretty_type.h
brlcad/branches/stepsync/src/other/stepcode/src/exppp/pretty_where.c
brlcad/branches/stepsync/src/other/stepcode/src/exppp/pretty_where.h
brlcad/branches/stepsync/src/other/stepcode/src/exppp/test/test_breakLongStr.c
brlcad/branches/stepsync/src/other/stepcode/src/express/alg.c
brlcad/branches/stepsync/src/other/stepcode/src/express/alloc.c
brlcad/branches/stepsync/src/other/stepcode/src/express/caseitem.c
brlcad/branches/stepsync/src/other/stepcode/src/express/dict.c
brlcad/branches/stepsync/src/other/stepcode/src/express/entity.c
brlcad/branches/stepsync/src/other/stepcode/src/express/error.c
brlcad/branches/stepsync/src/other/stepcode/src/express/exp_kw.c
brlcad/branches/stepsync/src/other/stepcode/src/express/expr.c
brlcad/branches/stepsync/src/other/stepcode/src/express/express.c
brlcad/branches/stepsync/src/other/stepcode/src/express/factory.c
brlcad/branches/stepsync/src/other/stepcode/src/express/fedex.c
brlcad/branches/stepsync/src/other/stepcode/src/express/generated/expparse.c
brlcad/branches/stepsync/src/other/stepcode/src/express/generated/expscan.c
brlcad/branches/stepsync/src/other/stepcode/src/express/generated/expscan.h
brlcad/branches/stepsync/src/other/stepcode/src/express/hash.c
brlcad/branches/stepsync/src/other/stepcode/src/express/info.c
brlcad/branches/stepsync/src/other/stepcode/src/express/inithook.c
brlcad/branches/stepsync/src/other/stepcode/src/express/lexact.c
brlcad/branches/stepsync/src/other/stepcode/src/express/linklist.c
brlcad/branches/stepsync/src/other/stepcode/src/express/memory.c
brlcad/branches/stepsync/src/other/stepcode/src/express/object.c
brlcad/branches/stepsync/src/other/stepcode/src/express/ordered_attrs.cc
brlcad/branches/stepsync/src/other/stepcode/src/express/resolve.c
brlcad/branches/stepsync/src/other/stepcode/src/express/resolve2.c
brlcad/branches/stepsync/src/other/stepcode/src/express/schema.c
brlcad/branches/stepsync/src/other/stepcode/src/express/scope.c
brlcad/branches/stepsync/src/other/stepcode/src/express/stmt.c
brlcad/branches/stepsync/src/other/stepcode/src/express/symbol.c
brlcad/branches/stepsync/src/other/stepcode/src/express/test/CMakeLists.txt
brlcad/branches/stepsync/src/other/stepcode/src/express/test/driver.c
brlcad/branches/stepsync/src/other/stepcode/src/express/test/driver.h
brlcad/branches/stepsync/src/other/stepcode/src/express/test/fff.h
brlcad/branches/stepsync/src/other/stepcode/src/express/test/print_attrs.c
brlcad/branches/stepsync/src/other/stepcode/src/express/test/print_schemas.c
brlcad/branches/stepsync/src/other/stepcode/src/express/test/test_expr.c
brlcad/branches/stepsync/src/other/stepcode/src/express/test/test_express.c
brlcad/branches/stepsync/src/other/stepcode/src/express/test/test_resolve.c
brlcad/branches/stepsync/src/other/stepcode/src/express/test/test_resolve2.c
brlcad/branches/stepsync/src/other/stepcode/src/express/test/test_schema.c
brlcad/branches/stepsync/src/other/stepcode/src/express/test/test_scope.c
brlcad/branches/stepsync/src/other/stepcode/src/express/test/test_type.c
brlcad/branches/stepsync/src/other/stepcode/src/express/token_type.h
brlcad/branches/stepsync/src/other/stepcode/src/express/type.c
brlcad/branches/stepsync/src/other/stepcode/src/express/variable.c
brlcad/branches/stepsync/src/other/stepcode/src/test/SEarritr.h
brlcad/branches/stepsync/src/other/stepcode/src/test/generate_express/generate_express.cc
brlcad/branches/stepsync/src/other/stepcode/src/test/needFunc.cc
brlcad/branches/stepsync/src/other/stepcode/src/test/needFunc.h
brlcad/branches/stepsync/src/other/stepcode/src/test/p21read/p21read.cc
brlcad/branches/stepsync/src/other/stepcode/src/test/scl2html/scl2html.cc
brlcad/branches/stepsync/src/other/stepcode/src/test/tests.h
brlcad/branches/stepsync/src/other/stepcode/src/test/tio/tio.cc
brlcad/branches/stepsync/src/other/stepcode/src/test/treg/treg.cc
brlcad/branches/stepsync/src/other/stepcode/src/test/tstatic/tstatic.cc
brlcad/branches/stepsync/src/other/stepcode/test/cpp/CMakeLists.txt
brlcad/branches/stepsync/src/other/stepcode/test/cpp/schema_specific/CMakeLists.txt
brlcad/branches/stepsync/src/other/stepcode/test/cpp/schema_specific/aggregate_bound_runtime.cc
brlcad/branches/stepsync/src/other/stepcode/test/cpp/schema_specific/attribute.cc
brlcad/branches/stepsync/src/other/stepcode/test/cpp/schema_specific/inverse_attr1.cc
brlcad/branches/stepsync/src/other/stepcode/test/cpp/schema_specific/inverse_attr2.cc
brlcad/branches/stepsync/src/other/stepcode/test/cpp/schema_specific/inverse_attr3.cc
brlcad/branches/stepsync/src/other/stepcode/test/cpp/schema_specific/stepfile_rw_progress.cc
brlcad/branches/stepsync/src/other/stepcode/test/p21/CMakeLists.txt
Modified: brlcad/branches/stepsync/src/other/stepcode/CMakeLists.txt
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/CMakeLists.txt 2020-12-09
00:34:53 UTC (rev 77952)
+++ brlcad/branches/stepsync/src/other/stepcode/CMakeLists.txt 2020-12-09
14:41:41 UTC (rev 77953)
@@ -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/stepsync/src/other/stepcode/README.md
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/README.md 2020-12-09
00:34:53 UTC (rev 77952)
+++ brlcad/branches/stepsync/src/other/stepcode/README.md 2020-12-09
14:41:41 UTC (rev 77953)
@@ -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/stepsync/src/other/stepcode/include/exppp/exppp.h
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/include/exppp/exppp.h
2020-12-09 00:34:53 UTC (rev 77952)
+++ brlcad/branches/stepsync/src/other/stepcode/include/exppp/exppp.h
2020-12-09 14:41:41 UTC (rev 77953)
@@ -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/stepsync/src/other/stepcode/include/express/alg.h
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/include/express/alg.h
2020-12-09 00:34:53 UTC (rev 77952)
+++ brlcad/branches/stepsync/src/other/stepcode/include/express/alg.h
2020-12-09 14:41:41 UTC (rev 77953)
@@ -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/stepsync/src/other/stepcode/include/express/alloc.h
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/include/express/alloc.h
2020-12-09 00:34:53 UTC (rev 77952)
+++ brlcad/branches/stepsync/src/other/stepcode/include/express/alloc.h
2020-12-09 14:41:41 UTC (rev 77953)
@@ -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/stepsync/src/other/stepcode/include/express/basic.h
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/include/express/basic.h
2020-12-09 00:34:53 UTC (rev 77952)
+++ brlcad/branches/stepsync/src/other/stepcode/include/express/basic.h
2020-12-09 14:41:41 UTC (rev 77953)
@@ -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/stepsync/src/other/stepcode/include/express/caseitem.h
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/include/express/caseitem.h
2020-12-09 00:34:53 UTC (rev 77952)
+++ brlcad/branches/stepsync/src/other/stepcode/include/express/caseitem.h
2020-12-09 14:41:41 UTC (rev 77953)
@@ -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/stepsync/src/other/stepcode/include/express/dict.h
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/include/express/dict.h
2020-12-09 00:34:53 UTC (rev 77952)
+++ brlcad/branches/stepsync/src/other/stepcode/include/express/dict.h
2020-12-09 14:41:41 UTC (rev 77953)
@@ -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/stepsync/src/other/stepcode/include/express/entity.h
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/include/express/entity.h
2020-12-09 00:34:53 UTC (rev 77952)
+++ brlcad/branches/stepsync/src/other/stepcode/include/express/entity.h
2020-12-09 14:41:41 UTC (rev 77953)
@@ -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/stepsync/src/other/stepcode/include/express/error.h
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/include/express/error.h
2020-12-09 00:34:53 UTC (rev 77952)
+++ brlcad/branches/stepsync/src/other/stepcode/include/express/error.h
2020-12-09 14:41:41 UTC (rev 77953)
@@ -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/stepsync/src/other/stepcode/include/express/exp_kw.h
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/include/express/exp_kw.h
2020-12-09 00:34:53 UTC (rev 77952)
+++ brlcad/branches/stepsync/src/other/stepcode/include/express/exp_kw.h
2020-12-09 14:41:41 UTC (rev 77953)
@@ -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/stepsync/src/other/stepcode/include/express/expbasic.h
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/include/express/expbasic.h
2020-12-09 00:34:53 UTC (rev 77952)
+++ brlcad/branches/stepsync/src/other/stepcode/include/express/expbasic.h
2020-12-09 14:41:41 UTC (rev 77953)
@@ -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/stepsync/src/other/stepcode/include/express/expr.h
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/include/express/expr.h
2020-12-09 00:34:53 UTC (rev 77952)
+++ brlcad/branches/stepsync/src/other/stepcode/include/express/expr.h
2020-12-09 14:41:41 UTC (rev 77953)
@@ -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/stepsync/src/other/stepcode/include/express/express.h
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/include/express/express.h
2020-12-09 00:34:53 UTC (rev 77952)
+++ brlcad/branches/stepsync/src/other/stepcode/include/express/express.h
2020-12-09 14:41:41 UTC (rev 77953)
@@ -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/stepsync/src/other/stepcode/include/express/factory.h
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/include/express/factory.h
2020-12-09 00:34:53 UTC (rev 77952)
+++ brlcad/branches/stepsync/src/other/stepcode/include/express/factory.h
2020-12-09 14:41:41 UTC (rev 77953)
@@ -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/stepsync/src/other/stepcode/include/express/hash.h
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/include/express/hash.h
2020-12-09 00:34:53 UTC (rev 77952)
+++ brlcad/branches/stepsync/src/other/stepcode/include/express/hash.h
2020-12-09 14:41:41 UTC (rev 77953)
@@ -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/stepsync/src/other/stepcode/include/express/info.h
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/include/express/info.h
2020-12-09 00:34:53 UTC (rev 77952)
+++ brlcad/branches/stepsync/src/other/stepcode/include/express/info.h
2020-12-09 14:41:41 UTC (rev 77953)
@@ -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/stepsync/src/other/stepcode/include/express/lexact.h
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/include/express/lexact.h
2020-12-09 00:34:53 UTC (rev 77952)
+++ brlcad/branches/stepsync/src/other/stepcode/include/express/lexact.h
2020-12-09 14:41:41 UTC (rev 77953)
@@ -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/stepsync/src/other/stepcode/include/express/linklist.h
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/include/express/linklist.h
2020-12-09 00:34:53 UTC (rev 77952)
+++ brlcad/branches/stepsync/src/other/stepcode/include/express/linklist.h
2020-12-09 14:41:41 UTC (rev 77953)
@@ -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/stepsync/src/other/stepcode/include/express/memory.h
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/include/express/memory.h
2020-12-09 00:34:53 UTC (rev 77952)
+++ brlcad/branches/stepsync/src/other/stepcode/include/express/memory.h
2020-12-09 14:41:41 UTC (rev 77953)
@@ -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/stepsync/src/other/stepcode/include/express/object.h
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/include/express/object.h
2020-12-09 00:34:53 UTC (rev 77952)
+++ brlcad/branches/stepsync/src/other/stepcode/include/express/object.h
2020-12-09 14:41:41 UTC (rev 77953)
@@ -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/stepsync/src/other/stepcode/include/express/resolve.h
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/include/express/resolve.h
2020-12-09 00:34:53 UTC (rev 77952)
+++ brlcad/branches/stepsync/src/other/stepcode/include/express/resolve.h
2020-12-09 14:41:41 UTC (rev 77953)
@@ -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/stepsync/src/other/stepcode/include/express/schema.h
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/include/express/schema.h
2020-12-09 00:34:53 UTC (rev 77952)
+++ brlcad/branches/stepsync/src/other/stepcode/include/express/schema.h
2020-12-09 14:41:41 UTC (rev 77953)
@@ -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/stepsync/src/other/stepcode/include/express/scope.h
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/include/express/scope.h
2020-12-09 00:34:53 UTC (rev 77952)
+++ brlcad/branches/stepsync/src/other/stepcode/include/express/scope.h
2020-12-09 14:41:41 UTC (rev 77953)
@@ -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/stepsync/src/other/stepcode/include/express/stmt.h
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/include/express/stmt.h
2020-12-09 00:34:53 UTC (rev 77952)
+++ brlcad/branches/stepsync/src/other/stepcode/include/express/stmt.h
2020-12-09 14:41:41 UTC (rev 77953)
@@ -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/stepsync/src/other/stepcode/include/express/symbol.h
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/include/express/symbol.h
2020-12-09 00:34:53 UTC (rev 77952)
+++ brlcad/branches/stepsync/src/other/stepcode/include/express/symbol.h
2020-12-09 14:41:41 UTC (rev 77953)
@@ -58,8 +58,8 @@
/***************************/
struct Symbol_ {
- char * name;
- const char * filename;
+ char *name;
+ const char *filename;
int line;
char resolved;
};
@@ -88,7 +88,7 @@
/* function prototypes */
/***********************/
-extern SC_EXPRESS_EXPORT void SYMBOLinitialize( void );
-SC_EXPRESS_EXPORT Symbol * SYMBOLcreate( char * name, int line, const char *
filename );
+extern SC_EXPRESS_EXPORT void SYMBOLinitialize(void);
+SC_EXPRESS_EXPORT Symbol *SYMBOLcreate(char *name, int line, const char
*filename);
#endif /* SYMBOL_H */
Modified: brlcad/branches/stepsync/src/other/stepcode/include/express/type.h
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/include/express/type.h
2020-12-09 00:34:53 UTC (rev 77952)
+++ brlcad/branches/stepsync/src/other/stepcode/include/express/type.h
2020-12-09 14:41:41 UTC (rev 77953)
@@ -115,8 +115,8 @@
/* typedefs */
/************/
-typedef struct TypeHead_ * TypeHead;
-typedef struct TypeBody_ * TypeBody;
+typedef struct TypeHead_ *TypeHead;
+typedef struct TypeBody_ *TypeBody;
typedef enum type_enum TypeType;
/* provide a replacement for Class */
@@ -140,7 +140,7 @@
struct TypeHead_ {
Type head; /**< if we are a defined type this is who we point to
*/
- struct TypeBody_ * body; /**< true type, ignoring defined types */
+ struct TypeBody_ *body; /**< true type, ignoring defined types */
#if 0
/* if we are concerned about memory (over time) uncomment this and */
/* other references to refcount in parser and TYPEresolve. It is */
@@ -151,7 +151,7 @@
struct TypeBody_ {
#if 1
- struct TypeHead_ * head; /**< for debugging only */
+ struct TypeHead_ *head; /**< for debugging only */
#endif
enum type_enum type; /**< bits describing this type, int, real, etc
*/
struct {
@@ -174,7 +174,7 @@
Linked_List list; /**< used by select_types and composed types, such as
for a list of entities in an instance */
Expression upper;
Expression lower;
- struct Scope_ * entity; /**< only used by entity types */
+ struct Scope_ *entity; /**< only used by entity types */
};
/********************/
@@ -291,20 +291,20 @@
/* function prototypes */
/***********************/
-extern SC_EXPRESS_EXPORT Type TYPEcreate_partial( struct Symbol_ *, Scope );
+extern SC_EXPRESS_EXPORT Type TYPEcreate_partial(struct Symbol_ *, Scope);
-extern SC_EXPRESS_EXPORT Type TYPEcreate( enum type_enum );
-extern SC_EXPRESS_EXPORT Type TYPEcreate_from_body_anonymously( TypeBody );
-extern SC_EXPRESS_EXPORT Type TYPEcreate_name( struct Symbol_ * );
-extern SC_EXPRESS_EXPORT Type TYPEcreate_nostab( struct Symbol_ *, Scope, char
);
-extern SC_EXPRESS_EXPORT TypeBody TYPEBODYcreate( enum type_enum );
-extern SC_EXPRESS_EXPORT void TYPEinitialize( void );
-extern SC_EXPRESS_EXPORT void TYPEcleanup( void );
+extern SC_EXPRESS_EXPORT Type TYPEcreate(enum type_enum);
+extern SC_EXPRESS_EXPORT Type TYPEcreate_from_body_anonymously(TypeBody);
+extern SC_EXPRESS_EXPORT Type TYPEcreate_name(struct Symbol_ *);
+extern SC_EXPRESS_EXPORT Type TYPEcreate_nostab(struct Symbol_ *, Scope, char);
+extern SC_EXPRESS_EXPORT TypeBody TYPEBODYcreate(enum type_enum);
+extern SC_EXPRESS_EXPORT void TYPEinitialize(void);
+extern SC_EXPRESS_EXPORT void TYPEcleanup(void);
-extern SC_EXPRESS_EXPORT bool TYPEinherits_from( Type, enum type_enum );
-extern SC_EXPRESS_EXPORT Type TYPEget_nonaggregate_base_type( Type );
+extern SC_EXPRESS_EXPORT bool TYPEinherits_from(Type, enum type_enum);
+extern SC_EXPRESS_EXPORT Type TYPEget_nonaggregate_base_type(Type);
-extern SC_EXPRESS_EXPORT Type TYPEcreate_user_defined_type( Type, Scope,
struct Symbol_ * );
-extern SC_EXPRESS_EXPORT Type TYPEcreate_user_defined_tag( Type, Scope, struct
Symbol_ * );
+extern SC_EXPRESS_EXPORT Type TYPEcreate_user_defined_type(Type, Scope, struct
Symbol_ *);
+extern SC_EXPRESS_EXPORT Type TYPEcreate_user_defined_tag(Type, Scope, struct
Symbol_ *);
#endif /* TYPE_H */
Modified: brlcad/branches/stepsync/src/other/stepcode/include/express/variable.h
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/include/express/variable.h
2020-12-09 00:34:53 UTC (rev 77952)
+++ brlcad/branches/stepsync/src/other/stepcode/include/express/variable.h
2020-12-09 14:41:41 UTC (rev 77953)
@@ -62,7 +62,7 @@
/* typedefs */
/************/
-typedef struct Variable_ * Variable;
+typedef struct Variable_ *Variable;
/****************/
/* modules used */
@@ -91,7 +91,7 @@
unsigned int attribute : 1; /**< is an attribute (rule parameters
are marked this way, too) */
} flags;
- Symbol * inverse_symbol; /**< entity symbol */
+ Symbol *inverse_symbol; /**< entity symbol */
Variable inverse_attribute; /**< attribute related by inverse
relationship */
};
@@ -125,8 +125,8 @@
/* function prototypes */
/***********************/
-extern SC_EXPRESS_EXPORT Variable VARcreate( Expression, Type );
-extern SC_EXPRESS_EXPORT void VARinitialize( void );
-extern SC_EXPRESS_EXPORT char * VARget_simple_name( Variable );
+extern SC_EXPRESS_EXPORT Variable VARcreate(Expression, Type);
+extern SC_EXPRESS_EXPORT void VARinitialize(void);
+extern SC_EXPRESS_EXPORT char *VARget_simple_name(Variable);
#endif /* VARIABLE_H */
Modified: brlcad/branches/stepsync/src/other/stepcode/include/ordered_attrs.h
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/include/ordered_attrs.h
2020-12-09 00:34:53 UTC (rev 77952)
+++ brlcad/branches/stepsync/src/other/stepcode/include/ordered_attrs.h
2020-12-09 14:41:41 UTC (rev 77953)
@@ -16,13 +16,13 @@
} orderedAttr;
/**set the entity we're working on, init working variables */
-extern SC_EXPRESS_EXPORT void orderedAttrsInit( Entity e );
+extern SC_EXPRESS_EXPORT void orderedAttrsInit(Entity e);
/**free memory */
extern SC_EXPRESS_EXPORT void orderedAttrsCleanup();
/**get next attr; not thread safe (as if the rest of libexpress is) */
-extern SC_EXPRESS_EXPORT const orderedAttr * nextAttr();
+extern SC_EXPRESS_EXPORT const orderedAttr *nextAttr();
#ifdef __cplusplus
}
Modified: brlcad/branches/stepsync/src/other/stepcode/misc/astyle.cfg
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/misc/astyle.cfg 2020-12-09
00:34:53 UTC (rev 77952)
+++ brlcad/branches/stepsync/src/other/stepcode/misc/astyle.cfg 2020-12-09
14:41:41 UTC (rev 77953)
@@ -11,7 +11,7 @@
suffix=none #don't create backup files
-style=java #compact bracket style
+style=kr #Kernighan & Ritchie style
indent=spaces=4
@@ -19,11 +19,10 @@
indent-switches
indent-namespaces
pad-oper #pad (space) around operators
-pad-paren-in #pad inside parenthesis
unpad-paren #remove parenthesis padding other than requested above
add-brackets #add brackets on one-line conditionals
convert-tabs #convert all tabs to spaces
-align-pointer=middle #char * foo
+align-pointer=name #char *foo
lineend=linux #lines end with LF (linux), not CRLF (windows)
Modified:
brlcad/branches/stepsync/src/other/stepcode/src/base/judy/misc/judy64n.c
===================================================================
--- brlcad/branches/stepsync/src/other/stepcode/src/base/judy/misc/judy64n.c
2020-12-09 00:34:53 UTC (rev 77952)
+++ brlcad/branches/stepsync/src/other/stepcode/src/base/judy/misc/judy64n.c
2020-12-09 14:41:41 UTC (rev 77953)
@@ -40,25 +40,25 @@
#include <string.h>
#ifdef linux
- #define _FILE_OFFSET_BITS 64
- #define _LARGEFILE_SOURCE
- #define __USE_FILE_OFFSET64
+#define _FILE_OFFSET_BITS 64
+#define _LARGEFILE_SOURCE
+#define __USE_FILE_OFFSET64
- #include <endian.h>
+#include <endian.h>
#else
- #ifdef __BIG_ENDIAN__
- #ifndef BYTE_ORDER
- #define BYTE_ORDER 4321
- #endif
- #else
- #ifndef BYTE_ORDER
- #define BYTE_ORDER 1234
- #endif
- #endif
- #ifndef BIG_ENDIAN
- #define BIG_ENDIAN 4321
- #endif
+#ifdef __BIG_ENDIAN__
+#ifndef BYTE_ORDER
+#define BYTE_ORDER 4321
#endif
+#else
+#ifndef BYTE_ORDER
+#define BYTE_ORDER 1234
+#endif
+#endif
+#ifndef BIG_ENDIAN
+#define BIG_ENDIAN 4321
+#endif
+#endif
@@ -72,32 +72,32 @@
defined(__arch64__) || \
defined(__powerpc64__) || \
defined (__s390x__)
- // defines for 64 bit
+// defines for 64 bit
- typedef unsigned long long judyvalue;
- typedef unsigned long long JudySlot;
- #define JUDY_key_mask (0x07)
- #define JUDY_key_size 8
- #define JUDY_slot_size 8
- #define JUDY_span_bytes (3 * JUDY_key_size)
- #define JUDY_span_equiv JUDY_2
- #define JUDY_radix_equiv JUDY_8
+typedef unsigned long long judyvalue;
+typedef unsigned long long JudySlot;
+#define JUDY_key_mask (0x07)
+#define JUDY_key_size 8
+#define JUDY_slot_size 8
+#define JUDY_span_bytes (3 * JUDY_key_size)
+#define JUDY_span_equiv JUDY_2
+#define JUDY_radix_equiv JUDY_8
- #define PRIjudyvalue "llu"
+#define PRIjudyvalue "llu"
#else
- // defines for 32 bit
+// defines for 32 bit
- typedef unsigned int judyvalue;
- typedef unsigned int JudySlot;
- #define JUDY_key_mask (0x03)
- #define JUDY_key_size 4
- #define JUDY_slot_size 4
- #define JUDY_span_bytes (7 * JUDY_key_size)
- #define JUDY_span_equiv JUDY_4
- #define JUDY_radix_equiv JUDY_8
+typedef unsigned int judyvalue;
+typedef unsigned int JudySlot;
+#define JUDY_key_mask (0x03)
+#define JUDY_key_size 4
+#define JUDY_slot_size 4
+#define JUDY_span_bytes (7 * JUDY_key_size)
+#define JUDY_span_equiv JUDY_4
+#define JUDY_radix_equiv JUDY_8
- #define PRIjudyvalue "u"
+#define PRIjudyvalue "u"
#endif
@@ -115,7 +115,7 @@
unsigned int MaxMem = 0;
// void judy_abort (char *msg) __attribute__ ((noreturn)); // Tell static
analyser that this function will not return
-void judy_abort (char *msg)
+void judy_abort(char *msg)
{
fprintf(stderr, "%s\n", msg);
exit(1);
@@ -155,9 +155,9 @@
};
judyvalue JudyMask[9] = {
-0, 0xff, 0xffff, 0xffffff, 0xffffffff,
+ 0, 0xff, 0xffff, 0xffffff, 0xffffffff,
#if JUDY_key_size > 4
-0xffffffffffULL, 0xffffffffffffULL, 0xffffffffffffffULL, 0xffffffffffffffffULL
+ 0xffffffffffULL, 0xffffffffffffULL, 0xffffffffffffffULL,
0xffffffffffffffffULL
#endif
};
@@ -200,20 +200,20 @@
// call with max key size
// and Integer tree depth.
-void *judy_open (unsigned int max, unsigned int depth)
+void *judy_open(unsigned int max, unsigned int depth)
{
-JudySeg *seg;
-Judy *judy;
-unsigned int amt;
+ JudySeg *seg;
+ Judy *judy;
+ unsigned int amt;
max++; // allow for zero terminator on keys
- if( (seg = malloc(JUDY_seg)) ) {
+ if((seg = malloc(JUDY_seg))) {
seg->seg = NULL;
seg->next = JUDY_seg;
} else {
#if defined(STANDALONE) || defined(ASKITIS)
- judy_abort ("No virtual memory");
+ judy_abort("No virtual memory");
#else
return NULL;
#endif
@@ -221,8 +221,9 @@
amt = sizeof(Judy) + max * sizeof(JudyStack);
- if( amt & (JUDY_cache_line - 1) )
+ if(amt & (JUDY_cache_line - 1)) {
amt |= JUDY_cache_line - 1, amt++;
+ }
#if defined(STANDALONE) || defined(ASKITIS)
MaxMem += JUDY_seg;
@@ -234,53 +235,57 @@
judy = (Judy *)((unsigned char *)seg + seg->next);
memset(judy, 0, amt);
judy->depth = depth;
- judy->seg = seg;
+ judy->seg = seg;
judy->max = max;
return judy;
}
-void judy_close (Judy *judy)
+void judy_close(Judy *judy)
{
-JudySeg *seg, *nxt = judy->seg;
+ JudySeg *seg, *nxt = judy->seg;
- while( (seg = nxt) )
- nxt = seg->seg, free (seg);
+ while((seg = nxt)) {
+ nxt = seg->seg, free(seg);
+ }
}
// allocate judy node
-void *judy_alloc (Judy *judy, unsigned int type)
+void *judy_alloc(Judy *judy, unsigned int type)
{
-unsigned int amt, idx, min;
-JudySeg *seg;
-void **block;
-void **rtn;
+ unsigned int amt, idx, min;
+ JudySeg *seg;
+ void **block;
+ void **rtn;
- if( !judy->seg )
+ if(!judy->seg)
#if defined(STANDALONE) || defined(ASKITIS)
- judy_abort("illegal allocation from judy clone");
+ judy_abort("illegal allocation from judy clone");
#else
- return NULL;
+ return NULL;
#endif
- if( type == JUDY_radix )
+ if(type == JUDY_radix) {
type = JUDY_radix_equiv;
+ }
#ifndef ASKITIS
- if( type == JUDY_span )
+ if(type == JUDY_span) {
type = JUDY_span_equiv;
+ }
#endif
amt = JudySize[type];
- if( amt & 0x07 )
+ if(amt & 0x07) {
amt |= 0x07, amt += 1;
+ }
// see if free block is already available
- if( (block = judy->reuse[type]) ) {
+ if((block = judy->reuse[type])) {
judy->reuse[type] = *block;
- memset (block, 0, amt);
+ memset(block, 0, amt);
return (void *)block;
}
@@ -287,22 +292,22 @@
// break down available larger block
// for reuse into smaller blocks
- if( type >= JUDY_1 )
- for( idx = type; idx++ < JUDY_max; )
- if( block = judy->reuse[idx] ) {
- judy->reuse[idx] = *block;
- while( idx-- > type) {
- judy->reuse[idx] = block + JudySize[idx] / sizeof(void *);
- block[JudySize[idx] / sizeof(void *)] = 0;
- }
- memset (block, 0, amt);
- return (void *)block;
- }
+ if(type >= JUDY_1)
+ for(idx = type; idx++ < JUDY_max;)
+ if(block = judy->reuse[idx]) {
+ judy->reuse[idx] = *block;
+ while(idx-- > type) {
+ judy->reuse[idx] = block + JudySize[idx] / sizeof(void *);
+ block[JudySize[idx] / sizeof(void *)] = 0;
+ }
+ memset(block, 0, amt);
+ return (void *)block;
+ }
min = amt < JUDY_cache_line ? JUDY_cache_line : amt;
- if( judy->seg->next < min + sizeof(*seg) ) {
- if( (seg = malloc (JUDY_seg)) ) {
+ if(judy->seg->next < min + sizeof(*seg)) {
+ if((seg = malloc(JUDY_seg))) {
seg->next = JUDY_seg;
seg->seg = judy->seg;
judy->seg = seg;
@@ -325,7 +330,7 @@
rtn = (void **)((unsigned char *)judy->seg + judy->seg->next - amt);
- for( idx = type; amt & (JUDY_cache_line - 1); amt <<= 1 ) {
+ for(idx = type; amt & (JUDY_cache_line - 1); amt <<= 1) {
block = (void **)((unsigned char *)judy->seg + judy->seg->next - 2 *
amt);
judy->reuse[idx++] = block;
*block = 0;
@@ -332,28 +337,29 @@
}
judy->seg->next -= amt;
- memset (rtn, 0, JudySize[type]);
+ memset(rtn, 0, JudySize[type]);
return (void *)rtn;
}
-void *judy_data (Judy *judy, unsigned int amt)
+void *judy_data(Judy *judy, unsigned int amt)
{
-JudySeg *seg;
-void *block;
+ JudySeg *seg;
+ void *block;
- if( !judy->seg )
+ if(!judy->seg)
#if defined(STANDALONE) || defined(ASKITIS)
- judy_abort("illegal allocation from judy clone");
+ judy_abort("illegal allocation from judy clone");
#else
- return NULL;
+ return NULL;
#endif
- if( amt & (JUDY_cache_line - 1))
+ if(amt & (JUDY_cache_line - 1)) {
amt |= (JUDY_cache_line - 1), amt += 1;
+ }
- if( judy->seg->next < amt + sizeof(*seg) ) {
- if( (seg = malloc (JUDY_seg)) ) {
+ if(judy->seg->next < amt + sizeof(*seg)) {
+ if((seg = malloc(JUDY_seg))) {
seg->next = JUDY_seg;
seg->seg = judy->seg;
judy->seg = seg;
@@ -374,30 +380,32 @@
judy->seg->next -= amt;
block = (void *)((unsigned char *)judy->seg + judy->seg->next);
- memset (block, 0, amt);
+ memset(block, 0, amt);
return block;
}
-void *judy_clone (Judy *judy)
+void *judy_clone(Judy *judy)
{
-Judy *clone;
-unsigned int amt;
+ Judy *clone;
+ unsigned int amt;
amt = sizeof(Judy) + judy->max * sizeof(JudyStack);
- clone = judy_data (judy, amt);
- memcpy (clone, judy, amt);
+ clone = judy_data(judy, amt);
+ memcpy(clone, judy, amt);
clone->seg = NULL; // stop allocations from cloned array
return clone;
}
-void judy_free (Judy *judy, void *block, int type)
+void judy_free(Judy *judy, void *block, int type)
{
- if( type == JUDY_radix )
+ if(type == JUDY_radix) {
type = JUDY_radix_equiv;
+ }
#ifndef ASKITIS
- if( type == JUDY_span )
+ if(type == JUDY_span) {
type = JUDY_span_equiv;
+ }
#endif
*((void **)(block)) = judy->reuse[type];
@@ -407,95 +415,104 @@
// assemble key from current path
-unsigned int judy_key (Judy *judy, unsigned char *buff, unsigned int max)
+unsigned int judy_key(Judy *judy, unsigned char *buff, unsigned int max)
{
-judyvalue *dest = (judyvalue *)buff;
-unsigned int len = 0, idx = 0, depth;
-int slot, off, type;
-judyvalue value;
-unsigned char *base;
-int keysize;
+ judyvalue *dest = (judyvalue *)buff;
+ unsigned int len = 0, idx = 0, depth;
+ int slot, off, type;
+ judyvalue value;
+ unsigned char *base;
+ int keysize;
- if( judy->depth )
+ if(judy->depth) {
max = judy->depth * JUDY_key_size;
- else
- max--; // leave room for zero terminator
+ } else {
+ max--; // leave room for zero terminator
+ }
- while( len < max && ++idx <= judy->level ) {
+ while(len < max && ++idx <= judy->level) {
type = judy->stack[idx].next & 0x07;
slot = judy->stack[idx].slot;
depth = len / JUDY_key_size;
- if( judy->depth )
- if( !(len & JUDY_key_mask) )
- dest[depth] = 0;
+ if(judy->depth)
+ if(!(len & JUDY_key_mask)) {
+ dest[depth] = 0;
+ }
- switch( type ) {
- case JUDY_1:
- case JUDY_2:
- case JUDY_4:
- case JUDY_8:
- case JUDY_16:
- case JUDY_32:
+ switch(type) {
+ case JUDY_1:
+ case JUDY_2:
+ case JUDY_4:
+ case JUDY_8:
+ case JUDY_16:
+ case JUDY_32:
#ifdef ASKITIS
- case JUDY_64:
+ case JUDY_64:
#endif
- keysize = JUDY_key_size - (judy->stack[idx].off & JUDY_key_mask);
- base = (unsigned char *)(judy->stack[idx].next & JUDY_mask);
+ keysize = JUDY_key_size - (judy->stack[idx].off &
JUDY_key_mask);
+ base = (unsigned char *)(judy->stack[idx].next & JUDY_mask);
- if( judy->depth ) {
- value = *(judyvalue *)(base + slot * keysize);
- value &= JudyMask[keysize];
- dest[depth++] |= value;
- len += keysize;
+ if(judy->depth) {
+ value = *(judyvalue *)(base + slot * keysize);
+ value &= JudyMask[keysize];
+ dest[depth++] |= value;
+ len += keysize;
- if( depth < judy->depth )
- continue;
+ if(depth < judy->depth) {
+ continue;
+ }
- return len;
- }
+ return len;
+ }
#if BYTE_ORDER != BIG_ENDIAN
- off = keysize;
+ off = keysize;
- while( off-- && len < max )
- if( buff[len] = base[slot * keysize + off] )
- len++;
- else
- break;
+ while(off-- && len < max)
+ if(buff[len] = base[slot * keysize + off]) {
+ len++;
+ } else {
+ break;
+ }
#else
- for( off = 0; off < keysize && len < max; off++ )
- if( buff[len] = base[slot * keysize + off] )
- len++;
- else
- break;
+ for(off = 0; off < keysize && len < max; off++)
+ if(buff[len] = base[slot * keysize + off]) {
+ len++;
+ } else {
+ break;
+ }
#endif
- continue;
+ continue;
- case JUDY_radix:
- if( judy->depth ) {
- dest[depth] |= (judyvalue)slot << (JUDY_key_size - (++len &
JUDY_key_mask)) * 8;
- if( !(len & JUDY_key_mask) )
- depth++;
- if( depth < judy->depth )
- continue;
+ case JUDY_radix:
+ if(judy->depth) {
+ dest[depth] |= (judyvalue)slot << (JUDY_key_size - (++len
& JUDY_key_mask)) * 8;
+ if(!(len & JUDY_key_mask)) {
+ depth++;
+ }
+ if(depth < judy->depth) {
+ continue;
+ }
- return len;
- }
+ return len;
+ }
- if( !slot )
- break;
- buff[len++] = (unsigned char)slot;
- continue;
+ if(!slot) {
+ break;
+ }
+ buff[len++] = (unsigned char)slot;
+ continue;
#ifndef ASKITIS
- case JUDY_span:
- base = (unsigned char *)(judy->stack[idx].next & JUDY_mask);
+ case JUDY_span:
+ base = (unsigned char *)(judy->stack[idx].next & JUDY_mask);
- for( slot = 0; slot < JUDY_span_bytes && base[slot]; slot++ )
- if( len < max )
- buff[len++] = base[slot];
- continue;
+ for(slot = 0; slot < JUDY_span_bytes && base[slot]; slot++)
+ if(len < max) {
+ buff[len++] = base[slot];
+ }
+ continue;
#endif
}
}
@@ -505,26 +522,27 @@
// find slot & setup cursor
-JudySlot *judy_slot (Judy *judy, unsigned char *buff, unsigned int max)
+JudySlot *judy_slot(Judy *judy, unsigned char *buff, unsigned int max)
{
-judyvalue *src = (judyvalue *)buff;
-int slot, size, keysize, tst, cnt;
-JudySlot next = *judy->root;
-judyvalue value, test = 0;
-JudySlot *table;
-JudySlot *node;
-unsigned int depth = 0;
-unsigned int off = 0;
-unsigned char *base;
+ judyvalue *src = (judyvalue *)buff;
+ int slot, size, keysize, tst, cnt;
+ JudySlot next = *judy->root;
+ judyvalue value, test = 0;
+ JudySlot *table;
+ JudySlot *node;
+ unsigned int depth = 0;
+ unsigned int off = 0;
+ unsigned char *base;
#ifndef ASKITIS
judy->level = 0;
#endif
- while( next ) {
+ while(next) {
#ifndef ASKITIS
- if( judy->level < judy->max )
+ if(judy->level < judy->max) {
judy->level++;
+ }
judy->stack[judy->level].next = next;
judy->stack[judy->level].off = off;
@@ -531,113 +549,122 @@
#endif
size = JudySize[next & 0x07];
- switch( next & 0x07 ) {
+ switch(next & 0x07) {
- case JUDY_1:
- case JUDY_2:
- case JUDY_4:
- case JUDY_8:
- case JUDY_16:
- case JUDY_32:
+ case JUDY_1:
+ case JUDY_2:
+ case JUDY_4:
+ case JUDY_8:
+ case JUDY_16:
+ case JUDY_32:
#ifdef ASKITIS
- case JUDY_64:
+ case JUDY_64:
#endif
- base = (unsigned char *)(next & JUDY_mask);
- node = (JudySlot *)((next & JUDY_mask) + size);
- keysize = JUDY_key_size - (off & JUDY_key_mask);
- cnt = size / (sizeof(JudySlot) + keysize);
- slot = cnt;
- value = 0;
+ base = (unsigned char *)(next & JUDY_mask);
+ node = (JudySlot *)((next & JUDY_mask) + size);
+ keysize = JUDY_key_size - (off & JUDY_key_mask);
+ cnt = size / (sizeof(JudySlot) + keysize);
+ slot = cnt;
+ value = 0;
- if( judy->depth ) {
- value = src[depth++];
- off |= JUDY_key_mask;
- off++;
- value &= JudyMask[keysize];
- } else
- do {
- value <<= 8;
- if( off < max )
- value |= buff[off];
- } while( ++off & JUDY_key_mask );
+ if(judy->depth) {
+ value = src[depth++];
+ off |= JUDY_key_mask;
+ off++;
+ value &= JudyMask[keysize];
+ } else
+ do {
+ value <<= 8;
+ if(off < max) {
+ value |= buff[off];
+ }
+ } while(++off & JUDY_key_mask);
- // find slot > key
+ // find slot > key
- while( slot-- ) {
- test = *(judyvalue *)(base + slot * keysize);
+ while(slot--) {
+ test = *(judyvalue *)(base + slot * keysize);
#if BYTE_ORDER == BIG_ENDIAN
- test >>= 8 * (JUDY_key_size - keysize);
+ test >>= 8 * (JUDY_key_size - keysize);
#else
- test &= JudyMask[keysize];
+ test &= JudyMask[keysize];
#endif
- if( test <= value )
- break;
- }
+ if(test <= value) {
+ break;
+ }
+ }
#ifndef ASKITIS
- judy->stack[judy->level].slot = slot;
+ judy->stack[judy->level].slot = slot;
#endif
- if( test == value ) {
+ if(test == value) {
- // is this a leaf?
+ // is this a leaf?
- if( !judy->depth && !(value & 0xFF) || judy->depth && depth ==
judy->depth )
- return &node[-slot-1];
+ if(!judy->depth && !(value & 0xFF) || judy->depth && depth
== judy->depth) {
+ return &node[-slot - 1];
+ }
- next = node[-slot-1];
- continue;
- }
+ next = node[-slot - 1];
+ continue;
+ }
- return NULL;
+ return NULL;
- case JUDY_radix:
- table = (JudySlot *)(next & JUDY_mask); // outer radix
+ case JUDY_radix:
+ table = (JudySlot *)(next & JUDY_mask); // outer radix
- if( judy->depth )
- slot = (src[depth] >> ((JUDY_key_size - off++ & JUDY_key_mask)
* 8)) & 0xff;
- else if( off < max )
- slot = buff[off++];
- else
- slot = 0;
+ if(judy->depth) {
+ slot = (src[depth] >> ((JUDY_key_size - off++ &
JUDY_key_mask) * 8)) & 0xff;
+ } else if(off < max) {
+ slot = buff[off++];
+ } else {
+ slot = 0;
+ }
#ifndef ASKITIS
- // put radix slot on judy stack
+ // put radix slot on judy stack
- judy->stack[judy->level].slot = slot;
+ judy->stack[judy->level].slot = slot;
#endif
- if( (next = table[slot >> 4]) )
- table = (JudySlot *)(next & JUDY_mask); // inner radix
- else
- return NULL;
+ if((next = table[slot >> 4])) {
+ table = (JudySlot *)(next & JUDY_mask); // inner radix
+ } else {
+ return NULL;
+ }
- if( judy->depth )
- if( !(off & JUDY_key_mask) )
- depth++;
+ if(judy->depth)
+ if(!(off & JUDY_key_mask)) {
+ depth++;
+ }
- if( !judy->depth && !slot || judy->depth && depth == judy->depth )
// leaf?
- if( table[slot & 0x0F] ) // occupied?
- return &table[slot & 0x0F];
- else
- return NULL;
+ if(!judy->depth && !slot || judy->depth && depth ==
judy->depth) // leaf?
+ if(table[slot & 0x0F]) { // occupied?
+ return &table[slot & 0x0F];
+ } else {
+ return NULL;
+ }
- next = table[slot & 0x0F];
- continue;
+ next = table[slot & 0x0F];
+ continue;
#ifndef ASKITIS
- case JUDY_span:
- node = (JudySlot *)((next & JUDY_mask) + JudySize[JUDY_span]);
- base = (unsigned char *)(next & JUDY_mask);
- cnt = tst = JUDY_span_bytes;
- if( tst > (int)(max - off) )
- tst = max - off;
- value = strncmp((const char *)base, (const char *)(buff + off),
tst);
- if( !value && tst < cnt && !base[tst] ) // leaf?
- return &node[-1];
+ case JUDY_span:
+ node = (JudySlot *)((next & JUDY_mask) + JudySize[JUDY_span]);
+ base = (unsigned char *)(next & JUDY_mask);
+ cnt = tst = JUDY_span_bytes;
+ if(tst > (int)(max - off)) {
+ tst = max - off;
+ }
+ value = strncmp((const char *)base, (const char *)(buff +
off), tst);
+ if(!value && tst < cnt && !base[tst]) { // leaf?
+ return &node[-1];
+ }
- if( !value && tst == cnt ) {
- next = node[-1];
- off += cnt;
- continue;
- }
- return NULL;
+ if(!value && tst == cnt) {
+ next = node[-1];
+ off += cnt;
+ continue;
+ }
+ return NULL;
#endif
}
}
@@ -647,26 +674,26 @@
// promote full nodes to next larger size
-JudySlot *judy_promote (Judy *judy, JudySlot *next, int idx, judyvalue value,
int keysize)
+JudySlot *judy_promote(Judy *judy, JudySlot *next, int idx, judyvalue value,
int keysize)
{
-unsigned char *base = (unsigned char *)(*next & JUDY_mask);
-int oldcnt, newcnt, slot;
+ unsigned char *base = (unsigned char *)(*next & JUDY_mask);
+ int oldcnt, newcnt, slot;
#if BYTE_ORDER == BIG_ENDIAN
int i;
#endif
-JudySlot *newnode, *node;
-JudySlot *result;
-unsigned char *newbase;
-unsigned int type;
+ JudySlot *newnode, *node;
+ JudySlot *result;
+ unsigned char *newbase;
+ unsigned int type;
type = (*next & 0x07) + 1;
- node = (JudySlot *)((*next & JUDY_mask) + JudySize[type-1]);
- oldcnt = JudySize[type-1] / (sizeof(JudySlot) + keysize);
+ node = (JudySlot *)((*next & JUDY_mask) + JudySize[type - 1]);
+ oldcnt = JudySize[type - 1] / (sizeof(JudySlot) + keysize);
newcnt = JudySize[type] / (sizeof(JudySlot) + keysize);
// promote node to next larger size
- newbase = judy_alloc (judy, type);
+ newbase = judy_alloc(judy, type);
newnode = (JudySlot *)(newbase + JudySize[type]);
*next = (JudySlot)newbase | type;
@@ -674,8 +701,9 @@
memcpy(newbase + (newcnt - oldcnt - 1) * keysize, base, idx * keysize);
// copy keys
- for( slot = 0; slot < idx; slot++ )
+ for(slot = 0; slot < idx; slot++) {
newnode[-(slot + newcnt - oldcnt)] = node[-(slot + 1)]; // copy ptr
+ }
// fill in new node
@@ -684,8 +712,9 @@
#else
i = keysize;
- while( i-- )
- newbase[(idx + newcnt - oldcnt - 1) * keysize + i] = value, value >>= 8;
+ while(i--) {
+ newbase[(idx + newcnt - oldcnt - 1) * keysize + i] = value, value >>=
8;
+ }
#endif
result = &newnode[-(idx + newcnt - oldcnt)];
@@ -693,14 +722,15 @@
memcpy(newbase + (idx + newcnt - oldcnt) * keysize, base + (idx *
keysize), (oldcnt - slot) * keysize); // copy keys
- for( ; slot < oldcnt; slot++ )
+ for(; slot < oldcnt; slot++) {
newnode[-(slot + newcnt - oldcnt + 1)] = node[-(slot + 1)]; // copy
ptr
+ }
#ifndef ASKITIS
judy->stack[judy->level].next = *next;
judy->stack[judy->level].slot = idx + newcnt - oldcnt - 1;
#endif
- judy_free (judy, (void **)base, type - 1);
+ judy_free(judy, (void **)base, type - 1);
return result;
}
@@ -708,18 +738,18 @@
// make node with slot - start entries
// moving key over one offset
-void judy_radix (Judy *judy, JudySlot *radix, unsigned char *old, int start,
int slot, int keysize, unsigned char key, unsigned int depth)
+void judy_radix(Judy *judy, JudySlot *radix, unsigned char *old, int start,
int slot, int keysize, unsigned char key, unsigned int depth)
{
-int size, idx, cnt = slot - start, newcnt;
-JudySlot *node, *oldnode;
-unsigned int type = JUDY_1 - 1;
-JudySlot *table;
-unsigned char *base;
+ int size, idx, cnt = slot - start, newcnt;
+ JudySlot *node, *oldnode;
+ unsigned int type = JUDY_1 - 1;
+ JudySlot *table;
+ unsigned char *base;
// if necessary, setup inner radix node
- if( !(table = (JudySlot *)(radix[key >> 4] & JUDY_mask)) ) {
- table = judy_alloc (judy, JUDY_radix);
+ if(!(table = (JudySlot *)(radix[key >> 4] & JUDY_mask))) {
+ table = judy_alloc(judy, JUDY_radix);
radix[key >> 4] = (JudySlot)table | JUDY_radix;
}
@@ -727,8 +757,8 @@
// is this slot a leaf?
- if( !judy->depth && (!key || !keysize) || judy->depth && !keysize && depth
== judy->depth) {
- table[key & 0x0F] = oldnode[-start-1];
+ if(!judy->depth && (!key || !keysize) || judy->depth && !keysize && depth
== judy->depth) {
+ table[key & 0x0F] = oldnode[-start - 1];
return;
}
@@ -738,11 +768,11 @@
type++;
size = JudySize[type];
newcnt = size / (sizeof(JudySlot) + keysize);
- } while( cnt > newcnt && type < JUDY_max );
+ } while(cnt > newcnt && type < JUDY_max);
// store new node pointer in inner table
- base = judy_alloc (judy, type);
+ base = judy_alloc(judy, type);
node = (JudySlot *)(base + size);
table[key & 0x0F] = (JudySlot)base | type;
@@ -749,11 +779,11 @@
// allocate node and copy old contents
// shorten keys by 1 byte during copy
- for( idx = 0; idx < cnt; idx++ ) {
+ for(idx = 0; idx < cnt; idx++) {
#if BYTE_ORDER != BIG_ENDIAN
- memcpy (base + (newcnt - idx - 1) * keysize, old + (start + cnt - idx
- 1) * (keysize + 1), keysize);
+ memcpy(base + (newcnt - idx - 1) * keysize, old + (start + cnt - idx -
1) * (keysize + 1), keysize);
#else
- memcpy (base + (newcnt - idx - 1) * keysize, old + (start + cnt - idx
- 1) * (keysize + 1) + 1, keysize);
+ memcpy(base + (newcnt - idx - 1) * keysize, old + (start + cnt - idx -
1) * (keysize + 1) + 1, keysize);
#endif
node[-(newcnt - idx)] = oldnode[-(start + cnt - idx)];
}
@@ -761,22 +791,22 @@
// decompose full node to radix nodes
@@ 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
