update contributing guidelines to allow more flexibility when accepting PRs

Github has disabled git:// protocol support, so we need to switch:
https://github.blog/2021-09-01-improving-git-protocol-security-github/

.appveyor.yml

@@ -1,65 +0,0 @@
-version: '{build}'
-
-# for Appveyor CI (windows)
-
-branches:
-  only:
-    - master
-
-os: Windows Server 2012 R2
-
-clone_folder: c:\projects\STEPcode
-
-#grab zip instead of git clone
-shallow_clone: true
-platform: x64
-configuration: Debug
-
-# errors or couldn't be found by cmake
-#   - GENERATOR: "Visual Studio 9 2008"
-#     ARCH: 32
-#   - GENERATOR: "Visual Studio 10"
-#     ARCH: 32
-
-#no point in these without artifact support...
-#  - GENERATOR: "Visual Studio 11"
-    #ARCH: 32
-  #- GENERATOR: "Visual Studio 12"
-    #ARCH: 32
-
-environment:
-  matrix:
-  - GENERATOR: "Visual Studio 12 Win64"
-    ARCH: 64
-
-# build:
-#   parallel: true
-#   project: ALL_BUILD.vcxproj
-
-#appveyor limits compile/test to 30 minutes
-# to reduce time, only test schemas with files: ifc2x3, ap214e3, ap209
-
-build_script:
-- ps: |
-    cd c:\projects\STEPcode
-    mkdir build
-    cd build
-    cmake -version
-    grep --version
-    cmake .. -DSC_ENABLE_TESTING=ON -G"$env:GENERATOR" -DSC_BUILD_SCHEMAS="ifc2x3;ap214e3;ap209"
-    echo "filtering build output with grep"
-    cmake --build . --config Debug | grep -ve "CMake does not need to re-run because" -e "ZERO_CHECK.ZERO_CHECK" -e "^  Creating directory"
-
-#msbuld seems to provide no benefits, and I can't filter its output...
-#msbuild SC.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:Configuration=Debug /p:Platform=x64
-# /toolsversion:14.0 /p:PlatformToolset=v140
-
-test_script:
-  - cmd: echo Running CTest...
-  - cmd: cd c:\projects\STEPcode\build
-  - cmd: echo excluding test_inverse_attr3, which hangs
-  - cmd: ctest -j1 . -C Debug -E test_inverse_attr3 --output-on-failure
-
-# - cmd: grep -niB20 "Test Failed" Testing/Temporary/LastTest.log
-
-# we could upload a compiled zip somewhere (see Appveyor artifact documentation)

.github/workflows/build.yml

@@ -0,0 +1,277 @@
+name: STEPCODE
+
+on:
+  workflow_dispatch:
+  pull_request:
+
+jobs:
+  windows:
+    name: Windows Latest MSVC
+    runs-on: windows-latest
+    strategy:
+      fail-fast: true
+    steps:
+      - name: Setup - CMake
+        uses: lukka/get-cmake@latest
+
+      - name: Setup - Ninja
+        uses: seanmiddleditch/gha-setup-ninja@master
+
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Add github workspace to path
+        # https://github.community/t/deprecated-add-path/136621
+        run: echo "$ENV{GITHUB_WORKSPACE}" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
+
+      - name: Add msbuild to PATH
+        uses: microsoft/setup-msbuild@v1.0.2
+
+      - name: Add cl.exe to PATH
+        uses: ilammy/msvc-dev-cmd@v1
+
+      - name: Configure
+        run: |
+          cmake -S . -B build -G Ninja -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_CXX_COMPILER="cl.exe" -DSC_ENABLE_TESTING=ON
+          # We do the following in order to help ensure files are "flushed"
+          # to disk before compilation is attempted
+          # https://superuser.com/a/1553374/1286142
+          powershell Write-VolumeCache C
+          powershell Write-VolumeCache D
+
+      - name: Build
+        run: cd build && ninja -j1 -v
+
+      - name: Test
+        run: |
+          cd build && ctest -j1 .
+
+  linux:
+    name: Ubuntu Latest GCC
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: true
+    steps:
+      - name: Setup - CMake
+        uses: lukka/get-cmake@latest
+
+      - name: Setup - Ninja
+        uses: seanmiddleditch/gha-setup-ninja@master
+
+        # TODO - we will want this when the new parser work comes in,
+        # as we won't need perplex and the system tools should suffice
+        # to exercise the generator logic:
+        #
+        #  - name: Setup - System
+        #    env:
+        #      DEBIAN_FRONTEND: noninteractive
+        #    run: |
+        #      sudo apt-get update
+        #      # Install dev tools
+        #      sudo apt-get install re2c lemon
+        #      sudo apt-get clean
+
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Configure
+        run: |
+          export PATH=$ENV{GITHUB_WORKSPACE}:$PATH
+          cmake -S . -G Ninja -B build -D ENABLE_ALL=ON -D CMAKE_BUILD_TYPE=Release -DSC_ENABLE_TESTING=ON
+
+      - name: Build
+        run: |
+          export PATH=$ENV{GITHUB_WORKSPACE}:$PATH
+          cmake --build build --config Release
+
+      - name: Test
+        run: |
+          cd build && ctest -j1 . -C Release
+
+  linux_clang:
+    name: Ubuntu Latest Clang
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: true
+    steps:
+      - name: Setup - CMake
+        uses: lukka/get-cmake@latest
+
+      - name: Setup - Ninja
+        uses: seanmiddleditch/gha-setup-ninja@master
+
+        # TODO - we will want this when the new parser work comes in,
+        # as we won't need perplex and the system tools should suffice
+        # to exercise the generator logic:
+        #
+        #  - name: Setup - System
+        #    env:
+        #      DEBIAN_FRONTEND: noninteractive
+        #    run: |
+        #      sudo apt-get update
+        #      # Install dev tools
+        #      sudo apt-get install re2c lemon
+        #      sudo apt-get clean
+
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Configure
+        run: |
+          export PATH=$ENV{GITHUB_WORKSPACE}:$PATH
+          CC=clang CXX=clang++ cmake -S . -G Ninja -B build -D ENABLE_ALL=ON -D CMAKE_BUILD_TYPE=Release -DSC_ENABLE_TESTING=ON
+
+      - name: Build
+        run: |
+          export PATH=$ENV{GITHUB_WORKSPACE}:$PATH
+          CC=clang CXX=clang++ cmake --build build --config Release
+
+      - name: Test
+        run: |
+          cd build && ctest -j1 . -C Release
+
+
+  osx:
+    name: macOS Latest Clang
+    runs-on: macos-latest
+    strategy:
+      fail-fast: true
+    steps:
+      - name: Setup - CMake
+        uses: lukka/get-cmake@latest
+
+      - name: Setup - Ninja
+        uses: seanmiddleditch/gha-setup-ninja@master
+
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Configure
+        run: |
+          export PATH=$ENV{GITHUB_WORKSPACE}:$PATH
+          export CC=clang
+          export CXX=clang++
+          cmake -S . -G Ninja -B build -D CMAKE_BUILD_TYPE=Release -DSC_ENABLE_TESTING=ON
+
+      - name: Build
+        run: |
+          export PATH=$ENV{GITHUB_WORKSPACE}:$PATH
+          cd build && ninja -j1
+
+      - name: Test
+        run: |
+          cd build && ctest -j1 . -C Release
+
+  brlcad_linux:
+    name: BRL-CAD Linux step-g Test
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: true
+    steps:
+      - name: Setup - CMake
+        uses: lukka/get-cmake@latest
+
+      - name: Setup - Ninja
+        uses: seanmiddleditch/gha-setup-ninja@master
+
+      - name: Setup - System
+        env:
+          DEBIAN_FRONTEND: noninteractive
+        run: |
+          sudo apt-get update
+          # Install dev tools
+          sudo apt-get install re2c lemon
+          sudo apt-get clean
+
+      - name: Checkout
+        run: |
+          git clone --depth 1 https://github.com/BRL-CAD/brlcad.git -b main
+          cd brlcad/src/other/ext && rm -rf stepcode
+          git clone --depth 1 https://github.com/stepcode/stepcode.git -b develop
+          # Ordinarily BRL-CAD keeps track of what files are supposed to be
+          # present in the repository.  In this case we're not interested in
+          # updating the list to the working stepcode filelist, so use an empty
+          # list instead
+          echo "set(stepcode_ignore_files)" > stepcode.dist
+          cd ../../../../
+
+
+      - name: Configure
+        run: |
+          export PATH=$ENV{GITHUB_WORKSPACE}:$PATH
+          cd brlcad
+          cmake -S . -G Ninja -B build -DENABLE_ALL=ON -DCMAKE_BUILD_TYPE=Release -DEXT_BUILD_VERBOSE=ON
+          cd ..
+
+      - name: Build
+        run: |
+          export PATH=$ENV{GITHUB_WORKSPACE}:$PATH
+          cd brlcad
+          cmake --build build --config Release --target step-g
+          cd ..
+
+      - name: Test
+        run: |
+          export PATH=$ENV{GITHUB_WORKSPACE}:$PATH
+          cd brlcad/build
+          ./bin/step-g ../db/nist/NIST_MBE_PMI_3.stp -o nist3.g
+          cd ../..
+
+
+  brlcad_windows:
+    name: BRL-CAD Windows step-g Test
+    runs-on: windows-latest
+    strategy:
+      fail-fast: true
+    steps:
+      - name: Setup - CMake
+        uses: lukka/get-cmake@latest
+
+      - name: Setup - Ninja
+        uses: seanmiddleditch/gha-setup-ninja@master
+
+      - name: Add github workspace to path
+        # https://github.community/t/deprecated-add-path/136621
+        run: echo "$ENV{GITHUB_WORKSPACE}" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
+
+      - name: Add msbuild to PATH
+        uses: microsoft/setup-msbuild@v1.0.2
+
+      - name: Add cl.exe to PATH
+        uses: ilammy/msvc-dev-cmd@v1
+
+      - name: Checkout
+        run: |
+          git clone --depth 1 https://github.com/BRL-CAD/brlcad.git -b main
+          cd brlcad/src/other/ext
+          cmake -E rm -r stepcode
+          git clone --depth 1 https://github.com/stepcode/stepcode.git -b develop
+          # Ordinarily BRL-CAD keeps track of what files are supposed to be
+          # present in the repository.  In this case we're not interested in
+          # updating the list to the working stepcode filelist, so use an empty
+          # list instead
+          echo "set(stepcode_ignore_files)" > stepcode.dist
+          cd ../../../../
+
+      - name: Configure
+        run: |
+          cd brlcad && cmake -S . -B build -G Ninja -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_CXX_COMPILER="cl.exe" -DSC_ENABLE_TESTING=ON
+          cd ..
+          # We do the following in order to help ensure files are "flushed"
+          # to disk before compilation is attempted
+          # https://superuser.com/a/1553374/1286142
+          powershell Write-VolumeCache C
+          powershell Write-VolumeCache D
+
+      - name: Build
+        run: |
+          cd brlcad/build
+          ninja -j1 -v step-g
+          cd ../..
+
+      - name: Test
+        run: |
+          cd brlcad/build
+          ./bin/step-g.exe ../db/nist/NIST_MBE_PMI_3.stp -o nist3.g
+          cd ../..
+

.gitignore

@@ -1,3 +1,20 @@
+# Common build directories used in the source tree
 /build
+/.build
+
+# Temporary files
+*~
+\#*\#
+.\#*
+[._]*.s[a-v][a-z]
+[._]*.sw[a-p]
+[._]s[a-v][a-z]
+[._]sw[a-p]
+
+# OS specific files
+.DS_Store
+.DS_Store?
+
+# Tool specific patterns
 *.kdev4
 .kdev_include_paths

.travis.yml

@@ -1,19 +0,0 @@
-sudo: false
-language: cpp
-compiler:
-  - clang
-script: mkdir build && cd build && cmake .. -DSC_ENABLE_TESTING=ON && make -j3 && ctest -j2 --output-on-failure
-branches:
-  only:
-    - master
-notifications:
-  irc: "chat.freenode.net#stepcode"
-  email: scl-dev@groups.google.com
-  on_success: change
-  on_failure: always
-os:
-  - linux
-  - osx
-matrix:
-  allow_failures:
-    - os: osx

AUTHORS

@@ -19,6 +19,7 @@ Paviot, Thomas (tpaviot)
 Pictor, Mark (mpictor)
 Reed, Nick (nickreed)
 Shah, Kesha (kesha, keshashah)
+Sparks, Devon (devonsparks)
 Thomas, Dawn (homovulgaris, madant)
 Wouters, Dave (davyw)
 Yapp, Clifford (starseeker)

CMakeLists.txt

@@ -40,60 +40,132 @@
 
 project(SC)
 
+# Minimum required version of CMake
+cmake_minimum_required(VERSION 3.12)
+if (POLICY CMP0077)
+  cmake_policy(SET CMP0077 OLD)
+endif (POLICY CMP0077)
+
 # SC version
 set(SC_VERSION_MAJOR 0)
-set(SC_VERSION_MINOR 7-dev)
-set(SC_VERSION ${SC_VERSION_MAJOR}.${SC_VERSION_MINOR})
+set(SC_VERSION_MINOR 9)
+set(SC_VERSION_PATCH 1)
+set(SC_VERSION ${SC_VERSION_MAJOR}.${SC_VERSION_MINOR}.${SC_VERSION_PATCH})
 
-# SC ABI version. SC_ABI_SOVERSION should be incremented
-# for each release introducing API incompatibilities
-set(SC_ABI_SOVERSION 2)
-set(SC_ABI_VERSION ${SC_ABI_SOVERSION}.0.0)
-
-# Minimum required version of CMake
-cmake_minimum_required(VERSION 2.8.7)
-if(COMMAND CMAKE_POLICY)
-  CMAKE_POLICY(SET CMP0003 NEW)
-  if ("${CMAKE_VERSION}" VERSION_GREATER 2.99)
-    CMAKE_POLICY(SET CMP0026 OLD)
-  endif ("${CMAKE_VERSION}" VERSION_GREATER 2.99)
-endif(COMMAND CMAKE_POLICY)
+# Set language standards
+set(CMAKE_C_EXTENSIONS OFF)
+set(CMAKE_C_STANDARD 11)
+set(CMAKE_C_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # CMake derives much of its functionality from modules, typically
 # stored in one directory - let CMake know where to find them.
 set(SC_CMAKE_DIR "${SC_SOURCE_DIR}/cmake")
-if(NOT SC_IS_SUBBUILD)
-  set(CMAKE_MODULE_PATH "${SC_CMAKE_DIR};${CMAKE_MODULE_PATH}")
-else(NOT SC_IS_SUBBUILD)
-  set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${SC_CMAKE_DIR}")
-endif(NOT SC_IS_SUBBUILD)
+list(APPEND CMAKE_MODULE_PATH "${SC_CMAKE_DIR}")
 
-# testing and compilation options, build output dirs, install dirs, uninstall, package creation, etc
-include(${SC_CMAKE_DIR}/SC_Build_opts.cmake)
+# OpenBSD has its own naming conventions.  Set a platform variable based on
+# the OS name so we can test for it succinctly.
+if ("${CMAKE_SYSTEM}" MATCHES ".*OpenBSD.*")
+  set(OPENBSD ON)
+endif ("${CMAKE_SYSTEM}" MATCHES ".*OpenBSD.*")
+
+#---------------------------------------------------------------------
+# Set up various relative path variables and build output directories
+include(Path_Setup)
+
+#---------------------------------------------------------------------
+# The following logic is what allows binaries to run successfully in
+# the build directory AND install directory.  Thanks to plplot for
+# identifying the necessity of setting CMAKE_INSTALL_NAME_DIR on OSX.
+# Documentation of these options is available at
+# http://www.cmake.org/Wiki/CMake_RPATH_handling
+
+# use, i.e. don't skip the full RPATH for the build tree
+if(NOT DEFINED CMAKE_SKIP_BUILD_RPATH)
+  set(CMAKE_SKIP_BUILD_RPATH  FALSE)
+endif()
+
+# when building, don't use the install RPATH already
+# (but later on when installing)
+if(NOT DEFINED CMAKE_BUILD_WITH_INSTALL_RPATH)
+  set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+endif()
+
+# the RPATH/INSTALL_NAME_DIR to be used when installing
+if (NOT APPLE)
+  if(NOT DEFINED CMAKE_INSTALL_RPATH)
+    set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib:\$ORIGIN/../lib")
+  endif()
+endif(NOT APPLE)
+# On OSX, we need to set INSTALL_NAME_DIR instead of RPATH
+# http://www.cmake.org/cmake/help/cmake-2-8-docs.html#variable:CMAKE_INSTALL_NAME_DIR
+if(NOT DEFINED CMAKE_INSTALL_NAME_DIR)
+  set(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
+endif()
+
+# add the automatically determined parts of the RPATH which point to
+# directories outside the build tree to the install RPATH
+if(NOT DEFINED CMAKE_INSTALL_RPATH_USE_LINK_PATH)
+  set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+endif()
+
+
+#---------------------------------------------------------------------
+# Build options
+option(BUILD_SHARED_LIBS "Build shared libraries" ON)
+option(BUILD_STATIC_LIBS "Build static libraries" OFF)
+
+option(SC_PYTHON_GENERATOR "Compile exp2python" ON)
+option(SC_CPP_GENERATOR "Compile exp2cxx" ON)
+
+option(SC_MEMMGR_ENABLE_CHECKS "Enable sc_memmgr's memory leak detection" OFF)
+option(SC_TRACE_FPRINTF "Enable extra comments in generated code so the code's source in exp2cxx may be located" OFF)
+
+option(SC_ENABLE_COVERAGE "Enable code coverage test" OFF)
+if (SC_ENABLE_COVERAGE AND ${CMAKE_C_COMPILER_ID} STREQUAL "GNU")
+  set(CMAKE_C_FLAGS_DEBUG "-O0 -g -fprofile-arcs -ftest-coverage" CACHE STRING "Extra compile flags required by code coverage" FORCE)
+  set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -fprofile-arcs -ftest-coverage" CACHE STRING "Extra compile flags required by code coverage" FORCE)
+  set(CMAKE_MODULE_LINKER_FLAGS_DEBUG "-fprofile-arcs -ftest-coverage" CACHE STRING "Extra linker flags required by code coverage" FORCE)
+endif (SC_ENABLE_COVERAGE AND ${CMAKE_C_COMPILER_ID} STREQUAL "GNU")
+
+option(SC_BUILD_EXPRESS_ONLY "Only build express parser." OFF)
+mark_as_advanced(SC_BUILD_EXPRESS_ONLY)
+
+option(SC_ENABLE_TESTING "Enable unittesting framework" OFF)
+if(SC_ENABLE_TESTING)
+  if(NOT "${SC_BUILD_EXPRESS_ONLY}" AND NOT DEFINED SC_BUILD_SCHEMAS)
+    set(SC_BUILD_SCHEMAS "ALL") #test all schemas, unless otherwise specified
+  endif()
+  include(CTest)
+endif(SC_ENABLE_TESTING)
 
 # SC_ADDEXEC and SC_ADDLIB macros, dllimport/export, etc
-include(${SC_CMAKE_DIR}/SC_Targets.cmake)
+include(SC_Targets)
 
 # Macros related to paths
-include(${SC_CMAKE_DIR}/SC_Paths.cmake)
+include(SC_Paths)
 
 # locale stuff
-include(${SC_CMAKE_DIR}/SC_Locale.cmake)
+include(SC_Locale)
 
 # logic related to regenerating the lexer and parser source code
-include(${SC_CMAKE_DIR}/SC_Regenerate.cmake)
+include(SC_Regenerate)
+
+# create config header sc_cf.h
+include(SC_Config_Headers)
 
 if(NOT DEFINED SC_SDAI_ADDITIONAL_EXES_SRCS)
   set(SC_SDAI_ADDITIONAL_EXES_SRCS "" CACHE STRING "Source files for additional executables to be linked with SDAI libs")
 endif(NOT DEFINED SC_SDAI_ADDITIONAL_EXES_SRCS)
 
-if(NOT DEFINED SC_BUILD_SCHEMAS)
+if(NOT "${SC_BUILD_EXPRESS_ONLY}" AND NOT DEFINED SC_BUILD_SCHEMAS)
   list(APPEND CONFIG_END_MESSAGES
-    "** CMake variable SC_BUILD_SCHEMAS was not set. Defaults to building ALL schemas, which will take a"
-    "     while; see http://stepcode.org/mw/index.php?title=STEPcode_CMake_variables#SC_BUILD_SCHEMAS")
-  #this makes SC_BUILD_SCHEMAS show up in cmake-gui
-  set(SC_BUILD_SCHEMAS "ALL" CACHE string "Semicolon-separated list of paths to EXPRESS schemas to be built")
-endif(NOT DEFINED SC_BUILD_SCHEMAS)
+    "** Note: CMake variable SC_BUILD_SCHEMAS was not set - defaults to building ALL schemas")
+# this makes SC_BUILD_SCHEMAS show up in cmake-gui
+  set(SC_BUILD_SCHEMAS "ALL" CACHE STRING "Semicolon-separated list of paths to EXPRESS schemas to be built")
+endif()
 
 if(NOT SC_IS_SUBBUILD)
   list(APPEND CONFIG_END_MESSAGES
@@ -102,23 +174,18 @@ if(NOT SC_IS_SUBBUILD)
     ".. Generating step can take a while if you are building several schemas.")
 endif(NOT SC_IS_SUBBUILD)
 
-# create config headers sc_cf.h and sc_version_string.h
-include(${SC_CMAKE_DIR}/SC_Config_Headers.cmake)
+# create config headers sc_cf.h
+include(SC_Config_Headers)
 
 
 ################
 
 if(MSVC)
-  add_definitions(-D__MSVC__ -D__WIN32__)
   # Disable warning for preferred usage of secure functions (example strcpy should be strcpy_s, ...)
   add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS)
-elseif(BORLAND)
-  add_definitions(-D__BORLAND__ -D__WIN32__)
-else()
+endif()
+if (${CMAKE_C_COMPILER_ID} STREQUAL "GNU" OR ${CMAKE_C_COMPILER_ID} STREQUAL "Clang")
   add_definitions(-pedantic -W -Wall -Wundef -Wfloat-equal -Wshadow -Winline -Wno-long-long)
-  if(HAVE_NULLPTR)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-  endif(HAVE_NULLPTR)
 endif()
 
 include_directories(
@@ -143,9 +210,19 @@ if(SC_ENABLE_TESTING)
 endif(SC_ENABLE_TESTING)
 add_subdirectory(doc)
 
-# 'make core' builds everything that isn't generated. for devs.
-add_custom_target(core)
-add_dependencies(core stepdai check-express stepeditor exp2cxx)
+if(NOT SC_IS_SUBBUILD)
+    #-----------------------------------------------------------------------------
+  # SC Packaging
+  # $make package
+  set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "STEPcode")
+  set(CPACK_SET_DESTDIR "ON")
+  set(CPACK_PACKAGE_VERSION_MAJOR ${SC_VERSION_MAJOR})
+  set(CPACK_PACKAGE_VERSION_MINOR ${SC_VERSION_MINOR})
+  set(CPACK_PACKAGE_NAME SC)
+  set(CPACK_PACKAGE_CONTACT "SC Developers <scl-dev@googlegroups.com>")
+  include(CPack)
+endif(NOT SC_IS_SUBBUILD)
+
 
 # CONFIG_END_MESSAGES - list of messages to be printed after everything else is done.
 # THIS MUST BE LAST to ensure that they are visible to the user without scrolling.

CONTRIBUTING.md

@@ -11,9 +11,12 @@ We love contributions!
   * Encouraged but not enforced: each commit should stand alone, in the sense that the code should compile and run at that point.
 * One major topic per pull request. Commits that fix small things (typos, formatting) are perfectly acceptable in a PR fixing a bug or adding a feature.
   * Tests are good. Tests are required unless you're fixing something simple or that was obviously broken.
+  * Do not change EXPRESS schema definition without reference to an upstream change.
 * Make your changes and push them to your GitHub repo
 * Once your branch is pushed, submit a pull request.
-* We'll look at the PR and either merge or add feedback. If there isn't any activity within several days, send a message to the mailing list - `scl-dev` AT `groups.google.com`.
+  - enable github option on each PR 'Allow edits from maintainers', refer to github help if necessary
+* We'll look at the PR and either merge (possibly after rebase) or add feedback.
+  - If there isn't any activity within several days send a message to the mailing list - `scl-dev` AT `groups.google.com`.
 
 ## Coding Standards
 

COPYING

@@ -1,108 +1,47 @@
-Modifications to the original NIST code are (C)opyright by their 
-respective authors. Unless otherwise specified, they are copyright
-on the date those changes were committed to whichever repository 
-they were committed to first (i.e. BRL-CAD on SourceForge.net, 
-mpictor/StepClassLibrary or stepcode/stepcode on github).
+STEPcode is provided as a collective work under the 3-clause BSD
+license.  As some portions are not subject to copyright in some
+jurisdictions, see INTENT.md for additional details regarding intent
+and history.  See the AUTHORS file for a list of contributors and
+copyright holders.
+
+Code generated by STEPcode containing substantial parts of STEPcode
+complex enough to have copyright protection are subject to the terms
+of this license.
+
+STEPcode acknowledgement and/or attribution is appreciated regardless
+of license or copyright status.
 
-Modifications which were first commited to the repository on github
-are licensed under the 3-clause BSD license below. Changes committed
-to BRL-CAD either contain license information mentioning BRL-CAD 
-near the top of the file, or are licensed under the same terms that
-NIST used.
 
 ********************************************************************
-3-clause BSD license:
+                        3-Clause BSD License
+********************************************************************
 
-Copyright (c) <date committed>, <copyright holder>
+Copyright (c) 2009-2019 STEPcode AUTHORS
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of the <organization> nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
+modification, are permitted provided that the following conditions are
+met:
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-********************************************************************
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
 
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
 
-********************************************************************
-                    ORIGINAL NIST TEXT FOLLOWS
-********************************************************************
-
-This software was produced by the National Institute of Standards and 
-Technology (NIST), an agency of the U.S. government, and by statute is 
-not subject to copyright in the United States. Recipients of this 
-software assume all responsibility associated with its operation, 
-modification, maintenance, and subsequent redistribution.
-
-Acknowledgements:
-The STEP Class Library (SCL) was developed by the Manufacturing 
-Systems Integration Division at NIST to support testing of the 
-Standard for the Exchange of Product Model Data (a.k.a STEP) and 
-validation of STEP's emerging implementation specifications. Funding 
-for the project has come from the Department of Commerce and the 
-Department of Defense agencies including the Office of the Defense 
-CALS (Continuous Acquisition and Life-Cycle Support) Executive and 
-the Defense Advanced Research Projects Agency (DARPA). Recent 
-enhancements were sponsored by the National Information Infrastructure 
-Protocols Consortium and NIST's Systems Integration for Manufacturing 
-Applications (SIMA) program.
-
-
-/* ********************************************************************
- *                            D I S C L A I M E R
- *                              (February 6, 1992)
- *  
- * There is no warranty for the NIST PDES Toolkit.
- * If the NIST PDES Toolkit
- * is modified by someone else and passed on, NIST wants
- * the Toolkit's recipients to know that what they have is not what NIST
- * distributed.
- * 
- * Policies
- * 
- * 1. Anyone may copy and distribute verbatim copies of the NIST PDES Toolkit 
- *    source code as received in any medium.
- * 
- * 2. Anyone may modify your copy or copies of the NIST PDES Toolkit source
- *    code or any portion of it, and copy and distribute such modifications
- *    provided that all modifications are clearly associated with the entity
- *    that performs the modifications.
- * 
- * NO WARRANTY
- * ===========
- * 
- * NIST PROVIDES ABSOLUTELY NO WARRANTY.  THE NIST PDES TOOLKIT
- * IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- * THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS
- * WITH YOU.  SHOULD ANY PORTION OF THE NIST PDES TOOLKIT PROVE DEFECTIVE,
- * YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
- * 
- * IN NO EVENT WILL NIST BE LIABLE FOR DAMAGES,
- * INCLUDING ANY LOST PROFITS, LOST MONIES, OR OTHER SPECIAL,
- * INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
- * INABILITY TO USE (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA
- * BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY THIRD PARTIES OR A
- * FAILURE OF THE PROGRAM TO OPERATE WITH PROGRAMS NOT DISTRIBUTED BY
- * NIST) THE PROGRAMS, EVEN IF YOU HAVE BEEN ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY.
- */
-
+3. Neither the name of the copyright holder nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
 
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

INTENT.md

@@ -0,0 +1,102 @@
+## Licensing Intent 
+
+The intent is that this software and documentation ("Project") should
+be treated as if it is licensed under the license(s) associated with
+the Project ("License") in the `COPYING` file.  However, because some
+contributors work for the United States (U.S.) Federal Government, it
+is not that simple.
+
+The portions of this Project written by United States (U.S.) federal
+government employees within the scope of their federal employment are
+ineligible for copyright protection in the U.S.; this is generally
+understood to mean that these portions of the Project are placed in
+the public domain.
+
+In countries where copyright protection is available (which does not
+include the U.S.), contributions made by U.S. Federal government
+employees are released under the License. Merged contributions from
+private contributors are released under the License.
+
+## Background History
+
+STEPcode was originally developed as the STEP Class Libraries (SCL) by
+the U.S. National Institute of Standards and Technology (NIST).  Prior
+to 2009, the U.S. Army Research Laboratory and members of the BRL-CAD
+open source community researched freely available open source options
+for ISO 10303 STEP support.  Development had ceased, no open source
+community existed, the code was out of date in many regards, and
+additional work was needed to become production-ready, but SCL was
+found to be a usable reference implementation.
+
+Consulting with NIST and others circa 2009, the BRL-CAD community
+began efforts to take over SCL development, modernization, and code
+enhancements.  The BRL-CAD community purchased licenses for the ISO
+10303 standard and began working to bring SCL up-to-date with the
+latest specification.  By 2011, significant progress had been made,
+the project had garnered attention from others, and STEPcode was
+establishd as an independent project.
+
+## Original NIST License Text
+
+This software was [originally] produced by the National Institute of
+Standards and Technology (NIST), an agency of the U.S. government, and
+by statute is not subject to copyright in the United
+States. Recipients of this software assume all responsibility
+associated with its operation, modification, maintenance, and
+subsequent redistribution.
+
+Acknowledgements:
+The STEP Class Library (SCL) was developed by the Manufacturing 
+Systems Integration Division at NIST to support testing of the 
+Standard for the Exchange of Product Model Data (a.k.a STEP) and 
+validation of STEP's emerging implementation specifications. Funding 
+for the project has come from the Department of Commerce and the 
+Department of Defense agencies including the Office of the Defense 
+CALS (Continuous Acquisition and Life-Cycle Support) Executive and 
+the Defense Advanced Research Projects Agency (DARPA). Recent 
+enhancements [circa 1992] were sponsored by the National Information Infrastructure 
+Protocols Consortium and NIST's Systems Integration for Manufacturing 
+Applications (SIMA) program.
+
+~~~~
+/* ********************************************************************
+ *                            D I S C L A I M E R
+ *                              (February 6, 1992)
+ *  
+ * There is no warranty for the NIST PDES Toolkit.
+ * If the NIST PDES Toolkit
+ * is modified by someone else and passed on, NIST wants
+ * the Toolkit's recipients to know that what they have is not what NIST
+ * distributed.
+ * 
+ * Policies
+ * 
+ * 1. Anyone may copy and distribute verbatim copies of the NIST PDES Toolkit 
+ *    source code as received in any medium.
+ * 
+ * 2. Anyone may modify your copy or copies of the NIST PDES Toolkit source
+ *    code or any portion of it, and copy and distribute such modifications
+ *    provided that all modifications are clearly associated with the entity
+ *    that performs the modifications.
+ * 
+ * NO WARRANTY
+ * ===========
+ * 
+ * NIST PROVIDES ABSOLUTELY NO WARRANTY.  THE NIST PDES TOOLKIT
+ * IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS
+ * WITH YOU.  SHOULD ANY PORTION OF THE NIST PDES TOOLKIT PROVE DEFECTIVE,
+ * YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+ * 
+ * IN NO EVENT WILL NIST BE LIABLE FOR DAMAGES,
+ * INCLUDING ANY LOST PROFITS, LOST MONIES, OR OTHER SPECIAL,
+ * INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
+ * INABILITY TO USE (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA
+ * BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY THIRD PARTIES OR A
+ * FAILURE OF THE PROGRAM TO OPERATE WITH PROGRAMS NOT DISTRIBUTED BY
+ * NIST) THE PROGRAMS, EVEN IF YOU HAVE BEEN ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY.
+ */
+ ~~~~

NEWS

@@ -1,5 +1,8 @@
-STEPcode -- http://github.com/stepcode/stepcode -- http://stepcode.org
 ************************************************************************
+                             STEPcode
+               http://github.com/stepcode/stepcode
+************************************************************************
+
 Release 0.8 (December, 2014)
 
 New since v0.7:
@@ -176,7 +179,7 @@ There were also some issues with the configure script and some
 makefiles which are addressed, as well as a new macro that is at 
 least required for gcc.
 
-Remaing problem: The p21 file scanner of SCL currently 
+Remaining problem: The p21 file scanner of SCL currently 
 does not allow for comments within the parameter list of 
 data records. Only comments outside of data records are 
 accepted.
@@ -252,7 +255,7 @@ the TD for label.
 
 - Fixed the casting operator for the class representing EXPRESS
 enumeration types. It was returning the last element of the enum type
-as the the default when the enum was unset. This choice predated enums
+as the default when the enum was unset. This choice predated enums
 having an unset enum value. It now returns <enum_name>_unset as the
 default when the enum is unset.
 
@@ -794,7 +797,7 @@ When this case of multiple inheritance is encountered attributes are
 duplicated.  This case of multiple inheritance may possibly be
 avoided by modifying the EXPRESS schema by breaking some links in the 
 inheritance hierarchy.  This will not have an adverse affect on the
-implemementation.  The user may choose to use the current or previous
+implementation.  The user may choose to use the current or previous
 method of handling multiple inheritance.  The current method is the
 default behavior.  The previous method is obtained by supplying the 
 -s (or -S) option with the exp2cxx code generator or the mkProbe
@@ -987,7 +990,7 @@ the attribute value field in the entity editor.
 If there wasn't a value in the attribute previously, then the field will 
 contain just the type specifier, e.g., Str1() if Str1 is the type selected.
 
-If a value exists in the field, it is modified to accomodate the new 
+If a value exists in the field, it is modified to accommodate the new 
 specifier.  This means the following:
  o  If the value in the field starts with a single-quote ('), it is 
         assumed to be a string literal, and is completely wrapped in the new 

README.md

@@ -1,10 +1,7 @@
-   Travis-CI   |   AppVeyor CI
-:-------------:|:---------------:
-Linux, OSX (LLVM) | Windows (MSVC)
-[![Build Status](https://travis-ci.org/stepcode/stepcode.svg?branch=master)](https://travis-ci.org/stepcode/stepcode) | [![Build status](https://ci.appveyor.com/api/projects/status/3fbr9t9gfa812oqu?svg=true)](https://ci.appveyor.com/project/mpictor/stepcode)
+![Build Status](https://github.com/stepcode/stepcode/actions/workflows/build.yml/badge.svg?branch=develop)
 
 ***********************************************************************
-STEPcode v0.8 -- stepcode.org, github.com/stepcode/stepcode
+STEPcode v0.8 -- 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

SC_VERSION.txt

@@ -1 +0,0 @@
-0.8

cmake/FindLEMON.cmake

@@ -47,158 +47,136 @@
 find_program(LEMON_EXECUTABLE lemon DOC "path to the lemon executable")
 mark_as_advanced(LEMON_EXECUTABLE)
 
-if (LEMON_EXECUTABLE AND NOT LEMON_TEMPLATE)
-  # look for the template in share
-  if (DATA_DIR AND EXISTS "${DATA_DIR}/lemon/lempar.c")
-    set (LEMON_TEMPLATE "${DATA_DIR}/lemon/lempar.c")
-  elseif (EXISTS "share/lemon/lempar.c")
-    set (LEMON_TEMPLATE "share/lemon/lempar.c")
-  elseif (EXISTS "/usr/share/lemon/lempar.c")
-    set (LEMON_TEMPLATE "/usr/share/lemon/lempar.c")
-  endif (DATA_DIR AND EXISTS "${DATA_DIR}/lemon/lempar.c")
-endif (LEMON_EXECUTABLE AND NOT LEMON_TEMPLATE)
+if (LEMON_EXECUTABLE)
+  if(NOT LEMON_TEMPLATE)
+    # look for the template, if we've not already been told where it is
+    if (DATA_DIR AND EXISTS "${DATA_DIR}/lemon/lempar.c")
+      find_file(LEMON_TEMPLATE lempar.c
+	PATHS "${DATA_DIR}/lemon/lempar.c"
+	NO_DEFAULT_PATH)
+    endif ()
 
-if (LEMON_EXECUTABLE AND NOT LEMON_TEMPLATE)
-  # look for the template in bin dir
-  get_filename_component(lemon_path ${LEMON_EXECUTABLE} PATH)
-  if (lemon_path)
-    if (EXISTS ${lemon_path}/lempar.c)
-      set (LEMON_TEMPLATE "${lemon_path}/lempar.c")
-    endif (EXISTS ${lemon_path}/lempar.c)
-    if (EXISTS /usr/share/lemon/lempar.c)
-      set (LEMON_TEMPLATE "/usr/share/lemon/lempar.c")
-    endif (EXISTS /usr/share/lemon/lempar.c)
-  endif (lemon_path)
-endif(LEMON_EXECUTABLE AND NOT LEMON_TEMPLATE)
+    # If the above did not succeed, check standard locations
+    get_filename_component(lemon_dir ${LEMON_EXECUTABLE} DIRECTORY)
+    find_file(LEMON_TEMPLATE lempar.c
+      PATHS "${lemon_dir}" "/usr/share/lemon"
+      NO_DEFAULT_PATH)
+    mark_as_advanced(LEMON_TEMPLATE)
+  endif()
 
-if (LEMON_EXECUTABLE AND NOT LEMON_TEMPLATE)
-  # fallback
-  set (LEMON_TEMPLATE "lempar.c")
-  if (NOT EXISTS ${LEMON_TEMPLATE})
-    message(WARNING "Lemon's lempar.c template file could not be found automatically, set LEMON_TEMPLATE")
-  endif (NOT EXISTS ${LEMON_TEMPLATE})
-endif (LEMON_EXECUTABLE AND NOT LEMON_TEMPLATE)
+  # We need a template to be able to use lemon correctly
+  if(NOT LEMON_TEMPLATE)
+    message(FATAL_ERROR "Failed to find lemon template file (lempar.c) - need to set LEMON_TEMPLATE")
+  endif()
 
-mark_as_advanced(LEMON_TEMPLATE)
+  # Define the function
+  #  LEMON_TARGET(<Name> <LemonInput> <LemonSource> <LemonHeader>
+  #		[<ArgString>])
+  # which will create a custom rule to generate a parser. <LemonInput> is
+  # the path to a lemon file. <LemonSource> is the desired name for the
+  # generated source file. <LemonHeader> is the desired name for the
+  # generated header which contains the token list. Anything in the optional
+  # <ArgString> parameter is appended to the lemon command line.
+  #
+  #  ====================================================================
+  #  Example:
+  #
+  #   find_package(LEMON)
+  #   LEMON_TARGET(MyParser parser.y parser.c parser.h)
+  #   add_executable(Foo main.cpp ${LEMON_MyParser_OUTPUTS})
+  #  ====================================================================
+
+  include(CMakeParseArguments)
+
+  if(NOT COMMAND LEMON_TARGET)
+    function(LEMON_TARGET Name LemonInput LemonOutput)
+      set(LT_ARGS DEFINES_FILE COMPILE_FLAGS)
+      cmake_parse_arguments(LEMON_TARGET_ARG "" "${LT_ARGS}" "" ${ARGN})
+
+      if(NOT "${LEMON_TARGET_ARG_COMPILE_FLAGS}" STREQUAL "")
+	set(LEMON_EXECUTABLE_opts "${LEMON_TARGET_ARG_COMPILE_FLAGS}")
+	separate_arguments(LEMON_EXECUTABLE_opts)
+      else()
+	set(LEMON_EXECUTABLE_opts "")
+      endif()
+
+      # check for LemonOutput
+      get_filename_component(_basename ${LemonOutput} NAME_WE)
+      get_filename_component(_out_src_file ${LemonOutput} NAME)
+      get_filename_component(_out_dir ${LemonOutput} PATH)
+      if(NOT "${_out_dir}" STREQUAL "")
+	message(WARNING "Full path specified for LemonOutput - should be filename only")
+      endif()
+
+      # set report file
+      set(_out_rpt_file "${_basename}.out")
+
+      # check for DEFINES_FILE
+      if ("${LEMON_TARGET_ARG_DEFINES_FILE}" STREQUAL "")
+	set(_out_hdr_file "${_basename}.h")
+      else()
+	get_filename_component(_out_dir ${LEMON_TARGET_ARG_DEFINES_FILE} PATH)
+	get_filename_component(_out_hdr_file ${LEMON_TARGET_ARG_DEFINES_FILE} NAME)
+	if(NOT "${_out_dir}" STREQUAL "")
+	  message(WARNING "Full path specified for DEFINES_FILE - should be filename only")
+	endif()
+      endif()
+
+      # input file
+      get_filename_component(_in_y_path ${LemonInput} ABSOLUTE)
+      get_filename_component(_in_y_file ${LemonInput} NAME)
+
+      # Stage the source file in the binary directory for lemon.  We need to make
+      # sure it's fully copied, so use a sentinel guard
+      add_custom_command(
+	OUTPUT ${_in_y_file}
+	COMMAND ${CMAKE_COMMAND} -E copy ${_in_y_path} ${CMAKE_CURRENT_BINARY_DIR}
+	)
+      add_custom_command(
+	OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_in_y_file}.sentinel
+	COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/${_in_y_file}.sentinel
+	DEPENDS ${_in_y_file}
+	)
+      add_custom_target(${Name}_input_cpy DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_in_y_file}.sentinel)
+
+      # execute lemon
+      add_custom_command(
+	OUTPUT ${_out_src_file}
+	COMMAND ${LEMON_EXECUTABLE} -T${LEMON_TEMPLATE} ${LEMON_EXECUTABLE_opts} ${_in_y_file}
+	DEPENDS ${Name}_input_cpy
+	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+	COMMENT "[LEMON][${Name}] Building parser with ${LEMON_EXECUTABLE}"
+	)
+
+      # rename the header
+      add_custom_command(
+	OUTPUT ${_out_hdr_file}
+	COMMAND ${CMAKE_COMMAND} ARGS -E rename ${_basename}.h ${_out_hdr_file}
+	DEPENDS ${_out_src_file}
+	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+	)
+
+      # set the return values
+      # TODO: for generated sources even headers should be target dependencies
+      set(LEMON_${Name}_DEFINED TRUE PARENT_SCOPE)
+      set(LEMON_${Name}_OUTPUT_HEADER "${CMAKE_CURRENT_BINARY_DIR}/${_out_hdr_file}" PARENT_SCOPE)
+      set(LEMON_${Name}_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}" PARENT_SCOPE)
+      set(LEMON_${Name}_OUTPUTS "${_out_src_file}" PARENT_SCOPE)
+
+      # TODO - remove once perplex goes away...
+      add_custom_target(${Name} DEPENDS ${_out_hdr_file})
+
+      # make sure we clean up generated output and copied input
+      set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${_out_src_file}")
+      set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${CMAKE_CURRENT_BINARY_DIR}/${_in_y_file}")
+
+    endfunction(LEMON_TARGET)
+  endif(NOT COMMAND LEMON_TARGET)
+
+endif(LEMON_EXECUTABLE)
 
 include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(LEMON DEFAULT_MSG LEMON_EXECUTABLE LEMON_TEMPLATE)
-
-# Define the macro
-#  LEMON_TARGET(<Name> <LemonInput> <LemonSource> <LemonHeader>
-#		[<ArgString>])
-# which will create a custom rule to generate a parser. <LemonInput> is
-# the path to a lemon file. <LemonSource> is the desired name for the
-# generated source file. <LemonHeader> is the desired name for the
-# generated header which contains the token list. Anything in the optional
-# <ArgString> parameter is appended to the lemon command line.
-#
-#  ====================================================================
-#  Example:
-#
-#   find_package(LEMON)
-#   LEMON_TARGET(MyParser parser.y parser.c parser.h)
-#   add_executable(Foo main.cpp ${LEMON_MyParser_OUTPUTS})
-#  ====================================================================
-
-include(CMakeParseArguments)
-
-if(NOT COMMAND LEMON_TARGET)
-  macro(LEMON_TARGET Name Input)
-
-    get_filename_component(IN_FILE_WE ${Input} NAME_WE)
-    set(LVAR_PREFIX ${Name}_${IN_FILE_WE})
-
-    if(${ARGC} GREATER 3)
-      CMAKE_PARSE_ARGUMENTS(${LVAR_PREFIX} "" "OUT_SRC_FILE;OUT_HDR_FILE;WORKING_DIR;EXTRA_ARGS" "" ${ARGN})
-    endif(${ARGC} GREATER 3)
-
-    # Need a working directory
-    if("${${LVAR_PREFIX}_WORKING_DIR}" STREQUAL "")
-      set(${LVAR_PREFIX}_WORKING_DIR "${CMAKE_CURRENT_BINARY_DIR}/${LVAR_PREFIX}")
-    endif("${${LVAR_PREFIX}_WORKING_DIR}" STREQUAL "")
-    file(MAKE_DIRECTORY ${${LVAR_PREFIX}_WORKING_DIR})
-
-    # Output source file
-    if ("${${LVAR_PREFIX}_OUT_SRC_FILE}" STREQUAL "")
-      set(${LVAR_PREFIX}_OUT_SRC_FILE ${${LVAR_PREFIX}_WORKING_DIR}/${IN_FILE_WE}.c)
-    else ("${${LVAR_PREFIX}_OUT_SRC_FILE}" STREQUAL "")
-      get_filename_component(specified_out_dir ${${LVAR_PREFIX}_OUT_SRC_FILE} PATH)
-      if(NOT "${specified_out_dir}" STREQUAL "")
-	message(FATAL_ERROR "\nFull path specified for OUT_SRC_FILE - should be filename only.\n")
-      endif(NOT "${specified_out_dir}" STREQUAL "")
-      set(${LVAR_PREFIX}_OUT_SRC_FILE ${${LVAR_PREFIX}_WORKING_DIR}/${${LVAR_PREFIX}_OUT_SRC_FILE})
-    endif ("${${LVAR_PREFIX}_OUT_SRC_FILE}" STREQUAL "")
-
-    # Output header file
-    if ("${${LVAR_PREFIX}_OUT_HDR_FILE}" STREQUAL "")
-      set(${LVAR_PREFIX}_OUT_HDR_FILE ${${LVAR_PREFIX}_WORKING_DIR}/${IN_FILE_WE}.h)
-    else ("${${LVAR_PREFIX}_OUT_HDR_FILE}" STREQUAL "")
-      get_filename_component(specified_out_dir ${${LVAR_PREFIX}_OUT_HDR_FILE} PATH)
-      if(NOT "${specified_out_dir}" STREQUAL "")
-	message(FATAL_ERROR "\nFull path specified for OUT_HDR_FILE - should be filename only.\n")
-      endif(NOT "${specified_out_dir}" STREQUAL "")
-      set(${LVAR_PREFIX}_OUT_HDR_FILE ${${LVAR_PREFIX}_WORKING_DIR}/${${LVAR_PREFIX}_OUT_HDR_FILE})
-    endif ("${${LVAR_PREFIX}_OUT_HDR_FILE}" STREQUAL "")
-
-    # input file
-    get_filename_component(in_full ${Input} ABSOLUTE)
-    if("${in_full}" STREQUAL "${Input}")
-      set(lemon_in_file ${Input})
-    else("${in_full}" STREQUAL "${Input}")
-      set(lemon_in_file "${CMAKE_CURRENT_SOURCE_DIR}/${Input}")
-    endif("${in_full}" STREQUAL "${Input}")
-
-
-    # names of lemon output files will be based on the name of the input file
-    set(LEMON_GEN_SOURCE ${${LVAR_PREFIX}_WORKING_DIR}/${IN_FILE_WE}.c)
-    set(LEMON_GEN_HEADER ${${LVAR_PREFIX}_WORKING_DIR}/${IN_FILE_WE}.h)
-    set(LEMON_GEN_OUT ${${LVAR_PREFIX}_WORKING_DIR}/${IN_FILE_WE}.out)
-
-    # copy input to bin directory and run lemon
-    get_filename_component(INPUT_NAME ${Input} NAME)
-    add_custom_command(
-      OUTPUT ${LEMON_GEN_OUT} ${LEMON_GEN_SOURCE} ${LEMON_GEN_HEADER}
-      COMMAND ${CMAKE_COMMAND} -E copy ${lemon_in_file} ${${LVAR_PREFIX}_WORKING_DIR}/${INPUT_NAME}
-      COMMAND ${LEMON_EXECUTABLE} -T${LEMON_TEMPLATE} ${${LVAR_PREFIX}_WORKING_DIR}/${INPUT_NAME} ${${LVAR_PREFIX}__EXTRA_ARGS}
-      DEPENDS ${Input} ${LEMON_TEMPLATE} ${LEMON_EXECUTABLE_TARGET}
-      WORKING_DIRECTORY ${${LVAR_PREFIX}_WORKING_DIR}
-      COMMENT "[LEMON][${Name}] Building parser with ${LEMON_EXECUTABLE}"
-      )
-
-    # rename generated outputs
-    if(NOT "${${LVAR_PREFIX}_OUT_SRC_FILE}" STREQUAL "${LEMON_GEN_SOURCE}")
-      add_custom_command(
-	OUTPUT ${${LVAR_PREFIX}_OUT_SRC_FILE}
-	COMMAND ${CMAKE_COMMAND} -E copy ${LEMON_GEN_SOURCE} ${${LVAR_PREFIX}_OUT_SRC_FILE}
-	DEPENDS ${LemonInput} ${LEMON_EXECUTABLE_TARGET} ${LEMON_GEN_SOURCE}
-	)
-      set(LEMON_${Name}_OUTPUTS ${${LVAR_PREFIX}_OUT_SRC_FILE} ${LEMON_${Name}_OUTPUTS})
-    endif(NOT "${${LVAR_PREFIX}_OUT_SRC_FILE}" STREQUAL "${LEMON_GEN_SOURCE}")
-    if(NOT "${${LVAR_PREFIX}_OUT_HDR_FILE}" STREQUAL "${LEMON_GEN_HEADER}")
-      add_custom_command(
-	OUTPUT ${${LVAR_PREFIX}_OUT_HDR_FILE}
-	COMMAND ${CMAKE_COMMAND} -E copy ${LEMON_GEN_HEADER} ${${LVAR_PREFIX}_OUT_HDR_FILE}
-	DEPENDS ${LemonInput} ${LEMON_EXECUTABLE_TARGET} ${LEMON_GEN_HEADER}
-	)
-      set(LEMON_${Name}_OUTPUTS ${${LVAR_PREFIX}_OUT_HDR_FILE} ${LEMON_${Name}_OUTPUTS})
-    endif(NOT "${${LVAR_PREFIX}_OUT_HDR_FILE}" STREQUAL "${LEMON_GEN_HEADER}")
-
-    set(LEMON_${Name}_OUTPUTS ${LEMON_${Name}_OUTPUTS} ${LEMON_GEN_OUT})
-
-    # make sure we clean up generated output and copied input
-    set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${LEMON_${Name}_OUTPUTS}")
-    set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${${LVAR_PREFIX}_WORKING_DIR}/${INPUT_NAME}")
-
-    # macro ran successfully
-    set(LEMON_${Name}_DEFINED TRUE)
-
-    set(LEMON_${Name}_SRC ${${LVAR_PREFIX}_OUT_SRC_FILE})
-    set(LEMON_${Name}_HDR ${${LVAR_PREFIX}_OUT_HDR_FILE})
-    set(LEMON_${Name}_INCLUDE_DIR ${${LVAR_PREFIX}_WORKING_DIR})
-
-  endmacro(LEMON_TARGET)
-endif(NOT COMMAND LEMON_TARGET)
+find_package_handle_standard_args(LEMON REQUIRED_VARS LEMON_EXECUTABLE LEMON_TEMPLATE)
 
 #============================================================
 # FindLEMON.cmake ends here

cmake/FindPERPLEX.cmake

@@ -227,6 +227,14 @@ if(NOT COMMAND PERPLEX_TARGET)
     set(PERPLEX_${Name}_SRC ${${PVAR_PREFIX}_OUT_SRC_FILE})
     set(PERPLEX_${Name}_HDR ${${PVAR_PREFIX}_OUT_HDR_FILE})
     set(PERPLEX_${Name}_INCLUDE_DIR ${${PVAR_PREFIX}_WORKING_DIR})
+
+    add_custom_command(
+      OUTPUT ${${PVAR_PREFIX}_WORKING_DIR}/${Name}.sentinel
+      COMMAND ${CMAKE_COMMAND} -E touch ${${PVAR_PREFIX}_WORKING_DIR}/${Name}.sentinel
+      DEPENDS ${${PVAR_PREFIX}_OUT_SRC_FILE} ${${PVAR_PREFIX}_OUT_HDR_FILE}
+      )
+    add_custom_target(${Name} DEPENDS ${${PVAR_PREFIX}_WORKING_DIR}/${Name}.sentinel)
+
   endmacro(PERPLEX_TARGET)
 endif(NOT COMMAND PERPLEX_TARGET)
 
@@ -240,12 +248,12 @@ if(NOT COMMAND ADD_PERPLEX_LEMON_DEPENDENCY)
       message(SEND_ERROR "PERPLEX target `${PERPLEXTarget}' does not exists.")
     endif()
 
-    if(NOT LEMON_${LemonTarget}_HDR)
+    if(NOT TARGET ${LemonTarget})
       message(SEND_ERROR "Lemon target `${LemonTarget}' does not exists.")
     endif()
 
     set_source_files_properties(${PERPLEX_${PERPLEXTarget}_SRC}
-      PROPERTIES OBJECT_DEPENDS ${LEMON_${LemonTarget}_HDR})
+      PROPERTIES OBJECT_DEPENDS ${LEMON_${LemonTarget}_OUTPUT_HEADER})
   endmacro(ADD_PERPLEX_LEMON_DEPENDENCY)
 endif(NOT COMMAND ADD_PERPLEX_LEMON_DEPENDENCY)
 

cmake/FindRE2C.cmake

@@ -6,134 +6,163 @@
 find_program(RE2C_EXECUTABLE re2c DOC "path to the re2c executable")
 mark_as_advanced(RE2C_EXECUTABLE)
 
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(RE2C DEFAULT_MSG RE2C_EXECUTABLE)
+if(RE2C_EXECUTABLE)
 
-# Provide a macro to generate custom build rules:
+  execute_process(COMMAND ${RE2C_EXECUTABLE} -v
+    OUTPUT_VARIABLE RE2C_version_output
+    ERROR_VARIABLE  RE2C_version_error
+    RESULT_VARIABLE RE2C_version_result
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-# RE2C_TARGET(Name RE2CInput RE2COutput [COMPILE_FLAGS <string>])
-# which creates a custom command  to generate the <RE2COutput> file from
-# the <RE2CInput> file.  If  COMPILE_FLAGS option is specified, the next
-# parameter is added to the re2c  command line. Name is an alias used to
-# get  details of  this custom  command.
+  if(NOT ${RE2C_version_result} EQUAL 0)
+    message(SEND_ERROR
+      "Command \"${RE2C_EXECUTABLE} -v\" failed with output:\n${RE2C_version_output}\n${RE2C_version_error}")
+  else()
+    string(REGEX REPLACE "^re2c ([0-9]+[^ ]*)( .*)?$" "\\1" RE2C_VERSION "${RE2C_version_output}")
+  endif()
 
-# This module also defines a macro:
-#  ADD_RE2C_LEMON_DEPENDENCY(RE2CTarget LemonTarget)
-# which  adds the  required dependency  between a  scanner and  a parser
-# where  <RE2CTarget>  and <LemonTarget>  are  the  first parameters  of
-# respectively RE2C_TARGET and LEMON_TARGET macros.
-#
-#  ====================================================================
-#  Example:
-#
-#   find_package(LEMON)
-#   find_package(RE2C)
-#
-#   LEMON_TARGET(MyParser parser.y "${CMAKE_CURRENT_BINARY_DIR}/parser.cpp")
-#   RE2C_TARGET(MyScanner scanner.re  "${CMAKE_CURRENT_BINARY_DIR}/scanner.cpp")
-#   ADD_RE2C_LEMON_DEPENDENCY(MyScanner MyParser)
-#
-#   include_directories("${CMAKE_CURRENT_BINARY_DIR}")
-#   add_executable(Foo
-#      Foo.cc
-#      ${LEMON_MyParser_OUTPUTS}
-#      ${RE2C_MyScanner_OUTPUTS}
-#   )
-#  ====================================================================
-#
-#=============================================================================
-# Copyright (c) 2010-2016 United States Government as represented by
-#                the U.S. Army Research Laboratory.
-# Copyright 2009 Kitware, Inc.
-# Copyright 2006 Tristan Carel
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# * Redistributions of source code must retain the above copyright
-#   notice, this list of conditions and the following disclaimer.
-#
-# * Redistributions in binary form must reproduce the above copyright
-#   notice, this list of conditions and the following disclaimer in the
-#   documentation and/or other materials provided with the distribution.
-#
-# * The names of the authors may not be used to endorse or promote
-#   products derived from this software without specific prior written
-#   permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#=============================================================================
+  # Provide a macro to generate custom build rules:
 
-#============================================================
-# RE2C_TARGET (public macro)
-#============================================================
-#
-# TODO - rework this macro to make use of CMakeParseArguments, see
-# http://www.cmake.org/pipermail/cmake/2012-July/051309.html
-if(NOT COMMAND RE2C_TARGET)
-  macro(RE2C_TARGET Name Input Output)
-    set(RE2C_TARGET_usage "RE2C_TARGET(<Name> <Input> <Output> [COMPILE_FLAGS <string>]")
-    if(${ARGC} GREATER 3)
-      if(${ARGC} EQUAL 5)
-	if("${ARGV3}" STREQUAL "COMPILE_FLAGS")
-	  set(RE2C_EXECUTABLE_opts  "${ARGV4}")
-	  SEPARATE_ARGUMENTS(RE2C_EXECUTABLE_opts)
-	else()
-	  message(SEND_ERROR ${RE2C_TARGET_usage})
-	endif()
+  # RE2C_TARGET(Name RE2CInput RE2COutput [COMPILE_FLAGS <string>])
+  # which creates a custom command  to generate the <RE2COutput> file from
+  # the <RE2CInput> file.  If COMPILE_FLAGS option is specified, the next
+  # parameter is added to the re2c  command line. Name is an alias used to
+  # get  details of  this custom  command.
+
+  # This module also defines a macro:
+  #  ADD_RE2C_LEMON_DEPENDENCY(RE2CTarget LemonTarget)
+  # which  adds the  required dependency  between a  scanner and  a parser
+  # where  <RE2CTarget>  and <LemonTarget>  are  the  first parameters  of
+  # respectively RE2C_TARGET and LEMON_TARGET macros.
+  #
+  #  ====================================================================
+  #  Example:
+  #
+  #   find_package(LEMON)
+  #   find_package(RE2C)
+  #
+  #   LEMON_TARGET(MyParser parser.y "${CMAKE_CURRENT_BINARY_DIR}/parser.cpp")
+  #   RE2C_TARGET(MyScanner scanner.re  "${CMAKE_CURRENT_BINARY_DIR}/scanner.cpp")
+  #   ADD_RE2C_LEMON_DEPENDENCY(MyScanner MyParser)
+  #
+  #   include_directories("${CMAKE_CURRENT_BINARY_DIR}")
+  #   add_executable(Foo
+  #      Foo.cc
+  #      ${LEMON_MyParser_OUTPUTS}
+  #      ${RE2C_MyScanner_OUTPUTS}
+  #   )
+  #  ====================================================================
+  #
+  #=============================================================================
+  # Copyright (c) 2010-2016 United States Government as represented by
+  #                the U.S. Army Research Laboratory.
+  # Copyright 2009 Kitware, Inc.
+  # Copyright 2006 Tristan Carel
+  # All rights reserved.
+  #
+  # Redistribution and use in source and binary forms, with or without
+  # modification, are permitted provided that the following conditions
+  # are met:
+  #
+  # * Redistributions of source code must retain the above copyright
+  #   notice, this list of conditions and the following disclaimer.
+  #
+  # * Redistributions in binary form must reproduce the above copyright
+  #   notice, this list of conditions and the following disclaimer in the
+  #   documentation and/or other materials provided with the distribution.
+  #
+  # * The names of the authors may not be used to endorse or promote
+  #   products derived from this software without specific prior written
+  #   permission.
+  #
+  # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  # HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  #=============================================================================
+
+  #============================================================
+  # RE2C_TARGET (public macro)
+  #============================================================
+  #
+  if(NOT COMMAND RE2C_TARGET)
+    function(RE2C_TARGET Name RE2CInput RE2COutput)
+      set(_re2c_args COMPILE_FLAGS DEFINES_FILE)
+      cmake_parse_arguments(RE2C_TARGET_ARG "" "${_re2c_args}" "" ${ARGN})
+
+      if(NOT "${RE2C_TARGET_ARG_UNPARSED_ARGUMENTS}" STREQUAL "")
+	message(SEND_ERROR "RE2C_TARGET(<Name> <RE2CInput> <RE2COutput>
+	[COMPILE_FLAGS <string>]
+	[DEFINES_FILE <string>])")
       else()
-	message(SEND_ERROR ${RE2C_TARGET_usage})
+	if(NOT "${RE2C_TARGET_ARG_COMPILE_FLAGS}" STREQUAL "")
+	  set(RE2C_EXECUTABLE_opts "${RE2C_TARGET_ARG_COMPILE_FLAGS}")
+	  separate_arguments(RE2C_EXECUTABLE_opts)
+	else()
+	  set(RE2C_EXECUTABLE_opts "")
+	endif()
+
+	if(NOT "${RE2C_TARGET_ARG_DEFINES_FILE}" STREQUAL "")
+	  list(APPEND RE2C_EXECUTABLE_opts -t ${RE2C_TARGET_ARG_DEFINES_FILE})
+	endif()
+
+	add_custom_command(
+	  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${RE2COutput}
+	  COMMAND ${RE2C_EXECUTABLE}
+	  ARGS ${RE2C_EXECUTABLE_opts} -o ${RE2COutput} ${CMAKE_CURRENT_SOURCE_DIR}/${RE2CInput}
+	  DEPENDS ${RE2CInput}
+	  COMMENT "[RE2C][${Name}] Building scanner with ${RE2C_EXECUTABLE}"
+	  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+	  )
+
+	# TODO: check, for generated sources headers should be included in outputs
+	set(RE2C_${Name}_DEFINED TRUE PARENT_SCOPE)
+	set(RE2C_${Name}_OUTPUTS ${RE2COutput} PARENT_SCOPE)
+	if("${RE2C_TARGET_ARG_DEFINES_FILE}" STREQUAL "")
+	  set(RE2C_${Name}_OUTPUT_HEADER "" PARENT_SCOPE)
+	else()
+	  set(RE2C_${Name}_OUTPUT_HEADER "${RE2C_TARGET_ARG_DEFINES_FILE}" PARENT_SCOPE)
+	endif()
+	set(RE2C_${Name}_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}" PARENT_SCOPE)
       endif()
-    endif()
 
-    add_custom_command(OUTPUT ${Output}
-      COMMAND ${RE2C_EXECUTABLE}
-      ARGS ${RE2C_EXECUTABLE_opts} -o${Output} ${Input}
-      DEPENDS ${Input} ${RE2C_EXECUTABLE_TARGET}
-      COMMENT "[RE2C][${Name}] Building scanner with ${RE2C_EXECUTABLE}"
-      WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
+    endfunction(RE2C_TARGET)
+  endif(NOT COMMAND RE2C_TARGET)
+  #============================================================
 
-    set(RE2C_${Name}_DEFINED TRUE)
-    set(RE2C_${Name}_OUTPUTS ${Output})
-    set(RE2C_${Name}_INPUT ${Input})
-    set(RE2C_${Name}_COMPILE_FLAGS ${RE2C_EXECUTABLE_opts})
-    set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${Output}")
-  endmacro(RE2C_TARGET)
-endif(NOT COMMAND RE2C_TARGET)
-#============================================================
+  #============================================================
+  # ADD_RE2C_LEMON_DEPENDENCY (public macro)
+  #============================================================
+  #
+  if(NOT COMMAND ADD_RE2C_LEMON_DEPENDENCY)
+    function(ADD_RE2C_LEMON_DEPENDENCY RE2CTarget LemonTarget)
 
-#============================================================
-# ADD_RE2C_LEMON_DEPENDENCY (public macro)
-#============================================================
-#
-if(NOT COMMAND ADD_RE2C_LEMON_DEPENDENCY)
-  macro(ADD_RE2C_LEMON_DEPENDENCY RE2CTarget LemonTarget)
+      if(NOT RE2C_${RE2CTarget}_OUTPUTS)
+	message(SEND_ERROR "RE2C target `${RE2CTarget}' does not exists.")
+      endif()
 
-    if(NOT RE2C_${RE2CTarget}_OUTPUTS)
-      message(SEND_ERROR "RE2C target `${RE2CTarget}' does not exists.")
-    endif()
+      if(NOT LEMON_${LemonTarget}_OUTPUT_HEADER)
+	message(SEND_ERROR "Lemon target `${LemonTarget}' does not exists.")
+      endif()
 
-    if(NOT LEMON_${LemonTarget}_HDR)
-      message(SEND_ERROR "Lemon target `${LemonTarget}' does not exists.")
-    endif()
+      set_source_files_properties(${RE2C_${RE2CTarget}_OUTPUTS}
+	PROPERTIES OBJECT_DEPENDS ${LEMON_${LemonTarget}_OUTPUT_HEADER})
+    endfunction(ADD_RE2C_LEMON_DEPENDENCY)
+  endif(NOT COMMAND ADD_RE2C_LEMON_DEPENDENCY)
+  #============================================================
 
-    set_source_files_properties(${RE2C_${RE2CTarget}_OUTPUTS}
-      PROPERTIES OBJECT_DEPENDS ${LEMON_${LemonTarget}_HDR})
-  endmacro(ADD_RE2C_LEMON_DEPENDENCY)
-endif(NOT COMMAND ADD_RE2C_LEMON_DEPENDENCY)
-#============================================================
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(RE2C REQUIRED_VARS RE2C_EXECUTABLE
+  VERSION_VAR RE2C_VERSION)
 
 # RE2C_Util.cmake ends here
 

cmake/Generated_Source_Utils.cmake

@@ -1,67 +0,0 @@
-# Utility routines for managing generated files with CMake
-
-macro(MD5 filename md5sum)
-  file(READ "${filename}" RAW_MD5_FILE)
-  string(REGEX REPLACE "\r" "" STRIPPED_MD5_FILE "${RAW_MD5_FILE}")
-  string(MD5 ${md5sum} "${STRIPPED_MD5_FILE}")
-endmacro(MD5)
-
-macro(FILEVAR filename var)
-  string(REGEX REPLACE "[^a-zA-Z0-9]" "_" ${var} ${filename})
-endmacro(FILEVAR)
-
-macro(VERIFY_FILES filelist warn resultvar)
-  set(${resultvar} 1)
-  foreach(fileitem ${filelist})
-    # Deal with absolute and relative paths a bit differently
-    get_filename_component(ITEM_ABS_PATH "${fileitem}" ABSOLUTE)
-    if("${fileitem}" STREQUAL "${ITEM_ABS_PATH}")
-      set(filefullname "${fileitem}")
-    else("${fileitem}" STREQUAL "${ITEM_ABS_PATH}")
-      set(filefullname "${CURRENT_SOURCE_DIR}/${fileitem}")
-    endif("${fileitem}" STREQUAL "${ITEM_ABS_PATH}")
-    get_filename_component(filename "${fileitem}" NAME)
-    # Got filename components sorted - proceed
-    if(NOT EXISTS ${filefullname})
-      message(FATAL_ERROR "Attempted to verify non-existant file ${filefullname}")
-    endif(NOT EXISTS ${filefullname})
-    FILEVAR(${filename} filevar)
-    if(NOT baseline_${filevar}_md5)
-      message(FATAL_ERROR "No baseline MD5 available for ${filename} - baseline_${filevar}_md5 is not defined")
-    endif(NOT baseline_${filevar}_md5)
-    MD5(${filefullname} ${filevar}_md5)
-    if(NOT "${${filevar}_md5}" STREQUAL "${baseline_${filevar}_md5}")
-      if("${warn}" STREQUAL "1")
-	message("\n${filename} differs from baseline: baseline md5 hash is ${baseline_${filevar}_md5} and current hash is ${${filevar}_md5}\n")
-      endif("${warn}" STREQUAL "1")
-      set(${resultvar} 0)
-    endif(NOT "${${filevar}_md5}" STREQUAL "${baseline_${filevar}_md5}")
-  endforeach(fileitem ${filelist})
-endmacro(VERIFY_FILES filelist resultvar)
-
-macro(WRITE_MD5_SUMS filelist outfile)
-  foreach(fileitem ${filelist})
-    # Deal with absolute and relative paths a bit differently
-    get_filename_component(ITEM_ABS_PATH "${fileitem}" ABSOLUTE)
-    if("${fileitem}" STREQUAL "${ITEM_ABS_PATH}")
-      set(filefullname "${fileitem}")
-    else("${fileitem}" STREQUAL "${ITEM_ABS_PATH}")
-      set(filefullname "${CURRENT_SOURCE_DIR}/${fileitem}")
-    endif("${fileitem}" STREQUAL "${ITEM_ABS_PATH}")
-    get_filename_component(filename "${fileitem}" NAME)
-    # Got filename components sorted - proceed
-    if(NOT EXISTS ${filefullname})
-      message(FATAL_ERROR "Attempted to get MD5 sum of non-existant file ${filefullname}")
-    endif(NOT EXISTS ${filefullname})
-    FILEVAR(${filename} filevar)
-    MD5(${filefullname} ${filevar}_md5)
-    file(APPEND ${outfile} "set(baseline_${filevar}_md5 ${${filevar}_md5})\n")
-  endforeach(fileitem ${filelist})
-endmacro(WRITE_MD5_SUMS)
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8

cmake/Path_Setup.cmake

@@ -0,0 +1,164 @@
+# Copyright (c) 2010-2020 United States Government as represented by
+# the U.S. Army Research Laboratory.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following
+# disclaimer in the documentation and/or other materials provided
+# with the distribution.
+#
+# 3. The name of the author may not be used to endorse or promote
+# products derived from this software without specific prior written
+# permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+#---------------------------------------------------------------------
+# Define relative install locations.  Don't set these if they have already
+# been set by some other means (like a higher level CMakeLists.txt file
+# including this one).
+
+# The location in which to install BRL-CAD executables.
+if(NOT BIN_DIR)
+  set(BIN_DIR bin)
+endif(NOT BIN_DIR)
+
+# Define a relative path that will "reset" a path back to
+# the point before BIN_DIR was appended.  This is primarily
+# useful when working with generator expressions
+unset(RBIN_DIR CACHE)
+set(LBIN_DIR "${BIN_DIR}")
+while (NOT "${LBIN_DIR}" STREQUAL "")
+  get_filename_component(LBDIR "${LBIN_DIR}" DIRECTORY)
+  set(LBIN_DIR "${LBDIR}")
+  if ("${RBIN_DIR}" STREQUAL "")
+    set(RBIN_DIR "..")
+  else ("${RBIN_DIR}" STREQUAL "")
+    set(RBIN_DIR "../${RBIN_DIR}")
+  endif ("${RBIN_DIR}" STREQUAL "")
+endwhile (NOT "${LBIN_DIR}" STREQUAL "")
+
+# The location in which to install BRL-CAD libraries.
+if(NOT LIB_DIR)
+  set(LIB_DIR lib)
+endif(NOT LIB_DIR)
+if(NOT LIBEXEC_DIR)
+  set(LIBEXEC_DIR libexec)
+endif(NOT LIBEXEC_DIR)
+
+# The location in which to install BRL-CAD header files.
+if(NOT INCLUDE_DIR)
+  set(INCLUDE_DIR include)
+endif(NOT INCLUDE_DIR)
+
+# The location in which to install BRL-CAD data files
+if(NOT DATA_DIR)
+  set(DATA_DIR share)
+endif(NOT DATA_DIR)
+
+# The location in which to install BRL-CAD documentation files
+if(NOT DOC_DIR)
+  set(DOC_DIR ${DATA_DIR}/doc)
+endif(NOT DOC_DIR)
+
+# The location in which to install BRL-CAD Manual pages
+if(NOT MAN_DIR)
+  set(MAN_DIR ${DATA_DIR}/man)
+endif(NOT MAN_DIR)
+
+# Make sure no absolute paths have been supplied to these variables
+set(INSTALL_DIRS BIN INCLUDE LIB LIBEXEC DATA MAN DOC)
+foreach(instdir ${INSTALL_DIRS})
+  get_filename_component(instdir_full ${${instdir}_DIR} ABSOLUTE)
+  if("${${instdir}_DIR}" STREQUAL "${instdir_full}")
+    message(FATAL_ERROR "Error - absolute path supplied for ${instdir}_DIR.  This path must be relative - e.g. \"bin\" instead of \"/usr/bin\"")
+    set(HAVE_INSTALL_DIR_FULL_PATH 1)
+  endif("${${instdir}_DIR}" STREQUAL "${instdir_full}")
+endforeach(instdir ${INSTALL_DIRS})
+
+#---------------------------------------------------------------------
+# Output directories - this is where built library and executable
+# files will be placed after building but prior to install.  The
+# necessary variables change between single and multi configuration
+# build systems, so it is necessary to handle both cases on a
+# conditional basis.
+
+if(NOT CMAKE_CONFIGURATION_TYPES)
+  # If we're not doing multi-configuration, just set the three main
+  # variables to the correct values.
+  if(NOT DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY)
+    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${${PROJECT_NAME}_BINARY_DIR}/${LIB_DIR} CACHE INTERNAL "Single output directory for building all libraries.")
+  endif(NOT DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY)
+  if(NOT DEFINED CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
+    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${${PROJECT_NAME}_BINARY_DIR}/${LIB_DIR} CACHE INTERNAL "Single output directory for building all archives.")
+  endif(NOT DEFINED CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
+  if(NOT DEFINED CMAKE_RUNTIME_OUTPUT_DIRECTORY)
+    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${${PROJECT_NAME}_BINARY_DIR}/${BIN_DIR} CACHE INTERNAL "Single output directory for building all executables.")
+  endif(NOT DEFINED CMAKE_RUNTIME_OUTPUT_DIRECTORY)
+else(NOT CMAKE_CONFIGURATION_TYPES)
+  # Multi-configuration is more difficult.  Not only do we need to
+  # properly set the output directories, but we also need to
+  # identify the "toplevel" directory for each configuration so
+  # we can place files, documentation, etc. in the correct
+  # relative positions.  Because files may be placed by CMake
+  # without a build target to put them in their proper relative build
+  # directory position using these paths, we must fully qualify them
+  # without using CMAKE_CFG_INTDIR.
+  #
+  # We define directories that may not be quite "standard"
+  # for a particular build tool - for example, native VS2010 projects use
+  # another directory to denote CPU type being compiled for - but CMake only
+  # supports multi-configuration setups having multiple configurations,
+  # not multiple compilers.
+  #
+  # One additional wrinkle we must watch for here is the case where
+  # a multi-configuration setup uses "." for its internal directory -
+  # if that's the case, we need to just set the various config output
+  # directories to the same value.
+  set(CFG_ROOT ${${PROJECT_NAME}_BINARY_DIR})
+  foreach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
+    if(NOT "${CMAKE_CFG_INTDIR}" STREQUAL ".")
+      set(CFG_ROOT ${${PROJECT_NAME}_BINARY_DIR}/${CFG_TYPE})
+    endif(NOT "${CMAKE_CFG_INTDIR}" STREQUAL ".")
+    string(TOUPPER "${CFG_TYPE}" CFG_TYPE_UPPER)
+    if(NOT DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER})
+      set("CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER}" ${CFG_ROOT}/${LIB_DIR} CACHE INTERNAL "Single output directory for building ${CFG_TYPE} libraries.")
+    endif(NOT DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER})
+    if(NOT DEFINED CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER})
+      set("CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER}" ${CFG_ROOT}/${LIB_DIR} CACHE INTERNAL "Single output directory for building ${CFG_TYPE} archives.")
+    endif(NOT DEFINED CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER})
+    if(NOT DEFINED CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER})
+      set("CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER}" ${CFG_ROOT}/${BIN_DIR} CACHE INTERNAL "Single output directory for building ${CFG_TYPE} executables.")
+    endif(NOT DEFINED CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER})
+    if(NOT DEFINED CMAKE_BINARY_DIR_${CFG_TYPE_UPPER})
+      set("CMAKE_BINARY_DIR_${CFG_TYPE_UPPER}" ${CFG_ROOT} CACHE INTERNAL "Toplevel binary dir for ${CFG_TYPE} building.")
+    endif(NOT DEFINED CMAKE_BINARY_DIR_${CFG_TYPE_UPPER})
+    if(NOT DEFINED ${PROJECT_NAME}_BINARY_DIR_${CFG_TYPE_UPPER})
+      set("${PROJECT_NAME}_BINARY_DIR_${CFG_TYPE_UPPER}" ${CFG_ROOT} CACHE INTERNAL "Toplevel binary dir for ${CFG_TYPE} building.")
+    endif(NOT DEFINED ${PROJECT_NAME}_BINARY_DIR_${CFG_TYPE_UPPER})
+  endforeach()
+endif(NOT CMAKE_CONFIGURATION_TYPES)
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8

cmake/SC_Build_opts.cmake

@@ -1,174 +0,0 @@
-# BIN and LIB directories
-if(NOT DEFINED BIN_DIR)
-  set(BIN_DIR bin)
-endif(NOT DEFINED BIN_DIR)
-
-if(NOT DEFINED LIB_DIR)
-  set(LIB_DIR lib)
-endif(NOT DEFINED LIB_DIR)
-
-# testing and compilation options, build output dirs, install dirs, etc
-# included by root CMakeLists
-
-if(NOT DEFINED INCLUDE_INSTALL_DIR)
-  set(INCLUDE_INSTALL_DIR include)
-endif(NOT DEFINED INCLUDE_INSTALL_DIR)
-
-if(NOT DEFINED LIB_INSTALL_DIR)
-  set(LIB_INSTALL_DIR lib)
-endif(NOT DEFINED LIB_INSTALL_DIR)
-
-if(NOT DEFINED BIN_INSTALL_DIR)
-  set(BIN_INSTALL_DIR bin)
-endif(NOT DEFINED BIN_INSTALL_DIR)
-
-if(NOT DEFINED SC_BUILD_TYPE)
-  set(SC_BUILD_TYPE "Debug" CACHE STRING "Build type") # By default set debug build
-endif(NOT DEFINED SC_BUILD_TYPE)
-if(NOT SC_IS_SUBBUILD)
-  set(CMAKE_BUILD_TYPE ${SC_BUILD_TYPE} CACHE INTERNAL "Build type, immutable" FORCE)
-else(NOT SC_IS_SUBBUILD)
-  set(CMAKE_BUILD_TYPE ${SC_BUILD_TYPE})
-endif(NOT SC_IS_SUBBUILD)
-
-# Define helper macro OPTION_WITH_DEFAULT
-macro(OPTION_WITH_DEFAULT OPTION_NAME OPTION_STRING OPTION_DEFAULT)
-  if(NOT DEFINED ${OPTION_NAME})
-    set(${OPTION_NAME} ${OPTION_DEFAULT})
-  endif(NOT DEFINED ${OPTION_NAME})
-  option(${OPTION_NAME} "${OPTION_STRING}" ${${OPTION_NAME}})
-endmacro(OPTION_WITH_DEFAULT OPTION_NAME OPTION_STRING OPTION_DEFAULT)
-
-# build shared libs by default
-OPTION_WITH_DEFAULT(SC_BUILD_SHARED_LIBS "Build shared libs" ON)
-
-# don't build static libs by default
-OPTION_WITH_DEFAULT(SC_BUILD_STATIC_LIBS "Build static libs" OFF)
-
-OPTION_WITH_DEFAULT(SC_PYTHON_GENERATOR "Compile exp2python" ON)
-OPTION_WITH_DEFAULT(SC_CPP_GENERATOR "Compile exp2cxx" ON)
-
-OPTION_WITH_DEFAULT(SC_MEMMGR_ENABLE_CHECKS "Enable sc_memmgr's memory leak detection" OFF)
-OPTION_WITH_DEFAULT(SC_TRACE_FPRINTF "Enable extra comments in generated code so the code's source in exp2cxx may be located" OFF)
-
-# Should we use C++11?
-OPTION_WITH_DEFAULT(SC_ENABLE_CXX11 "Build with C++ 11 features" ON)
-
-# Get version from git
-OPTION_WITH_DEFAULT(SC_GIT_VERSION "Build using version from git" ON)
-
-option(SC_BUILD_EXPRESS_ONLY "Only build express parser." OFF)
-mark_as_advanced(SC_BUILD_EXPRESS_ONLY)
-
-#---------------------------------------------------------------------
-# Coverage option
-OPTION_WITH_DEFAULT(SC_ENABLE_COVERAGE "Enable code coverage test" OFF)
-if(SC_ENABLE_COVERAGE)
-  set(SC_ENABLE_TESTING ON CACHE BOOL "Testing enabled by coverage option" FORCE)
-  # build static libs, better coverage report
-  set(SC_BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libs" FORCE)
-  set(SC_BUILD_STATIC_LIBS ON CACHE BOOL "Build static libs" FORCE)
-  set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -fprofile-arcs -ftest-coverage" CACHE STRING "Extra compile flags required by code coverage" FORCE)
-  set(CMAKE_C_FLAGS_DEBUG "-O0 -g -fprofile-arcs -ftest-coverage" CACHE STRING "Extra compile flags required by code coverage" FORCE)
-  set(CMAKE_MODULE_LINKER_FLAGS_DEBUG "-fprofile-arcs -ftest-coverage" CACHE STRING "Extra linker flags required by code coverage" FORCE)
-  set(SC_BUILD_TYPE "Debug" CACHE STRING "Build type required by testing framework" FORCE)
-  set(SC_PYTHON_GENERATOR OFF) #won't build with static libs
-endif(SC_ENABLE_COVERAGE)
-
-#---------------------------------------------------------------------
-# Testing option
-OPTION_WITH_DEFAULT(SC_ENABLE_TESTING "Enable unittesting framework" OFF)
-if(SC_ENABLE_TESTING)
-  if(NOT DEFINED SC_BUILD_SCHEMAS)
-    set(SC_BUILD_SCHEMAS "ALL") #test all schemas, unless otherwise specified
-  endif()
-  include(CTest)
-  ENABLE_TESTING()
-endif(SC_ENABLE_TESTING)
-
-#---------------------------------------------------------------------
-# Executable install option
-OPTION_WITH_DEFAULT(SC_SKIP_EXEC_INSTALL "Skip installing executables" OFF)
-if(SC_SKIP_EXEC_INSTALL)
-  set(SC_EXEC_NOINSTALL "NO_INSTALL")
-endif(SC_SKIP_EXEC_INSTALL)
-
-#---------------------------------------------------------------------
-# The following logic is what allows binaries to run successfully in
-# the build directory AND install directory.  Thanks to plplot for
-# identifying the necessity of setting CMAKE_INSTALL_NAME_DIR on OSX.
-# Documentation of these options is available at
-# http://www.cmake.org/Wiki/CMake_RPATH_handling
-
-# use, i.e. don't skip the full RPATH for the build tree
-set(CMAKE_SKIP_BUILD_RPATH  FALSE)
-
-# when building, don't use the install RPATH already
-# (but later on when installing)
-set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-
-# the RPATH/INSTALL_NAME_DIR to be used when installing
-if (NOT APPLE)
-  set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib:\$ORIGIN/../lib")
-endif(NOT APPLE)
-# On OSX, we need to set INSTALL_NAME_DIR instead of RPATH
-# http://www.cmake.org/cmake/help/cmake-2-8-docs.html#variable:CMAKE_INSTALL_NAME_DIR
-set(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
-
-# add the automatically determined parts of the RPATH which point to
-# directories outside the build tree to the install RPATH
-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-
-# When this is a subbuild, assume that the parent project controls all of the following
-#======================================================================================
-if(NOT SC_IS_SUBBUILD)
-
-  # Output directories. In a separate file so it can be used by the schema scanner CMake as well.
-  include(${SC_CMAKE_DIR}/SC_Outdirs.cmake)
-
-  #-----------------------------------------------------------------------------
-  # Configure install locations. Only do this if CMAKE_INSTALL_PREFIX hasn't
-  # been set already, to try and allow parent builds (if any) some control.
-  #
-  # Need a good Debug location for Windows.
-  if(NOT WIN32)
-    if(${CMAKE_BUILD_TYPE} MATCHES "Debug")
-      set(SC_INSTALL_PREFIX "${SC_SOURCE_DIR}/../sc-install")
-    else()
-      set(SC_INSTALL_PREFIX "/usr/local")
-    endif()
-  endif(NOT WIN32)
-  set(SC_INSTALL_PREFIX ${SC_INSTALL_PREFIX} CACHE
-    PATH "Install prefix prepended to target to create install location")
-  set(CMAKE_INSTALL_PREFIX ${SC_INSTALL_PREFIX} CACHE INTERNAL "Prefix prepended to install directories if target destination is not absolute, immutable" FORCE)
-
-  #-----------------------------------------------------------------------------
-  # SC Packaging
-  # $make package
-  set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "STEPcode")
-  set(CPACK_SET_DESTDIR "ON")
-  set(CPACK_PACKAGE_VERSION_MAJOR ${SC_VERSION_MAJOR})
-  set(CPACK_PACKAGE_VERSION_MINOR ${SC_VERSION_MINOR})
-  set(CPACK_PACKAGE_NAME SC)
-  set(CPACK_PACKAGE_CONTACT "SC Developers <scl-dev@googlegroups.com>")
-  include(CPack)
-
-  #-----------------------------------------------------------------------------
-  # Uninstall target
-  # From http://www.cmake.org/Wiki/CMake_FAQ#Can_I_do_.22make_uninstall.22_with_CMake.3F
-  configure_file(
-    "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-    IMMEDIATE @ONLY)
-  add_custom_target(uninstall
-    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
-
-endif(NOT SC_IS_SUBBUILD)
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
-

cmake/SC_CXX_schema_macros.cmake

@@ -27,19 +27,16 @@ endmacro(P21_TESTS sfile)
 # create p21read_sdai_*, lazy_sdai_*, any exes listed in SC_SDAI_ADDITIONAL_EXES_SRCS
 macro(SCHEMA_EXES)
   RELATIVE_PATH_TO_TOPLEVEL(${CMAKE_CURRENT_SOURCE_DIR} RELATIVE_PATH_COMPONENT)
-  SC_ADDEXEC(p21read_${PROJECT_NAME} "${RELATIVE_PATH_COMPONENT}/src/test/p21read/p21read.cc" "${PROJECT_NAME};stepdai;stepcore;stepeditor;steputils;base" "TESTABLE")
-  #add_dependencies(p21read_${PROJECT_NAME} version_string)
+  SC_ADDEXEC(p21read_${PROJECT_NAME} SOURCES "${RELATIVE_PATH_COMPONENT}/src/test/p21read/p21read.cc" LINK_LIBRARIES ${PROJECT_NAME} stepdai stepcore stepeditor steputils base TESTABLE)
   if(NOT WIN32)
-    SC_ADDEXEC(lazy_${PROJECT_NAME} "${RELATIVE_PATH_COMPONENT}/src/cllazyfile/lazy_test.cc" "${PROJECT_NAME};steplazyfile;stepdai;stepcore;stepeditor;steputils;base" "TESTABLE")
-    #add_dependencies(lazy_${PROJECT_NAME} version_string)
+    SC_ADDEXEC(lazy_${PROJECT_NAME} SOURCES "${RELATIVE_PATH_COMPONENT}/src/cllazyfile/lazy_test.cc" LINK_LIBRARIES ${PROJECT_NAME} steplazyfile stepdai stepcore stepeditor steputils base TESTABLE)
   endif(NOT WIN32)
 
   #add user-defined executables
   foreach(src ${SC_SDAI_ADDITIONAL_EXES_SRCS})
     get_filename_component(name ${src} NAME_WE)
     get_filename_component(path ${src} ABSOLUTE)
-    SC_ADDEXEC(${name}_${PROJECT_NAME} "${src}" "${PROJECT_NAME};stepdai;stepcore;stepeditor;steputils;base" "TESTABLE")
-    add_dependencies(${name}_${PROJECT_NAME} version_string)
+    SC_ADDEXEC(${name}_${PROJECT_NAME} SOURCES ${src} LINK_LIBRARIES ${PROJECT_NAME} stepdai stepcore stepeditor steputils base TESTABLE)
     #set_target_properties(${name}_${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "${${PROJECT_NAME}_COMPILE_FLAGS} -I${path}")
   endforeach(src ${SC_SDAI_ADDITIONAL_EXES_SRCS})
 ENDMACRO(SCHEMA_EXES)
@@ -96,8 +93,32 @@ macro(SCHEMA_TARGETS expFile schemaName sourceFiles)
     ${SC_SOURCE_DIR}/src/base/judy/src
   )
   # if testing is enabled, "TESTABLE" sets property EXCLUDE_FROM_ALL and prevents installation
-  SC_ADDLIB(${PROJECT_NAME} "${sourceFiles}" "stepdai;stepcore;stepeditor;steputils;base" "TESTABLE")
-  add_dependencies(${PROJECT_NAME} generate_cpp_${PROJECT_NAME})
+  if(BUILD_SHARED_LIBS)
+    SC_ADDLIB(${PROJECT_NAME} SHARED SOURCES ${sourceFiles} LINK_LIBRARIES stepdai stepcore stepeditor steputils base TESTABLE)
+    add_dependencies(${PROJECT_NAME} generate_cpp_${PROJECT_NAME})
+    if(WIN32)
+      target_compile_definitions("${PROJECT_NAME}" PRIVATE SC_SCHEMA_DLL_EXPORTS)
+      if(MSVC)
+        target_compile_options("${PROJECT_NAME}" PRIVATE "/bigobj")
+      endif()
+    endif()
+    # TODO - ideally we would avoid generating code that triggers this warning, but figuring out
+    # how to do so is a non-trivial exercise.  In the meantime, suppress the (very verbose) warnings
+    # we get due to this issue so it doesn't mask other problems.
+    if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU")
+      target_compile_options("${PROJECT_NAME}" PRIVATE "-Wno-ignored-qualifiers")
+    endif()
+  endif()
+
+  if($CACHE{SC_BUILD_STATIC_LIBS})
+    SC_ADDLIB(${PROJECT_NAME}-static STATIC SOURCES ${sourceFiles} LINK_LIBRARIES stepdai-static stepcore-static stepeditor-static steputils-static base-static TESTABLE)
+    add_dependencies(${PROJECT_NAME}-static generate_cpp_${PROJECT_NAME})
+    target_compile_defines("${PROJECT_NAME}-static" PRIVATE SC_STATIC)
+    if(MSVC)
+      target_compile_options("${PROJECT_NAME}-static" PRIVATE "/bigobj")
+    endif()
+  endif()
+
 
   SCHEMA_EXES()
   SCHEMA_TESTS()

cmake/SC_Config_Headers.cmake

@@ -1,29 +1,11 @@
-# create sc_cf.h and sc_version_string.h
-
-# Take the sc config file template as the starting point for
-# sc_cf.h.in - scripts may need to append to the template, so
-# it is read into memory initially.
-set(CONFIG_H_FILE ${SC_BINARY_DIR}/include/sc_cf.h.in)
-set_source_files_properties(${CONFIG_H_FILE} PROPERTIES GENERATED TRUE)
-set(CMAKE_CURRENT_PROJECT SC)
-define_property(GLOBAL PROPERTY SC_CONFIG_H_CONTENTS BRIEF_DOCS "config.h.in contents" FULL_DOCS "config.h.in contents for SC project")
-if(NOT COMMAND CONFIG_H_APPEND)
-  macro(CONFIG_H_APPEND PROJECT_NAME NEW_CONTENTS)
-    if(PROJECT_NAME)
-      get_property(${PROJECT_NAME}_CONFIG_H_CONTENTS GLOBAL PROPERTY ${PROJECT_NAME}_CONFIG_H_CONTENTS)
-      set(${PROJECT_NAME}_CONFIG_H_FILE_CONTENTS "${${PROJECT_NAME}_CONFIG_H_CONTENTS}${NEW_CONTENTS}")
-      set_property(GLOBAL PROPERTY ${PROJECT_NAME}_CONFIG_H_CONTENTS "${${PROJECT_NAME}_CONFIG_H_FILE_CONTENTS}")
-    endif(PROJECT_NAME)
-  endmacro(CONFIG_H_APPEND NEW_CONTENTS)
-endif(NOT COMMAND CONFIG_H_APPEND)
-file(READ ${SC_SOURCE_DIR}/include/sc_cf_cmake.h.in CONFIG_H_FILE_CONTENTS)
-CONFIG_H_APPEND(SC "${CONFIG_H_FILE_CONTENTS}")
+# create sc_cf.h
 
 include(CheckLibraryExists)
 include(CheckIncludeFile)
-include(CheckFunctionExists)
+include(CheckSymbolExists)
 include(CheckTypeSize)
 include(CMakePushCheckState)
+include(CheckCSourceCompiles)
 include(CheckCXXSourceRuns)
 
 CHECK_INCLUDE_FILE(ndir.h HAVE_NDIR_H)
@@ -37,10 +19,13 @@ CHECK_INCLUDE_FILE(stdbool.h HAVE_STDBOOL_H)
 CHECK_INCLUDE_FILE(process.h HAVE_PROCESS_H)
 CHECK_INCLUDE_FILE(io.h HAVE_IO_H)
 
-CHECK_FUNCTION_EXISTS(abs HAVE_ABS)
-CHECK_FUNCTION_EXISTS(memcpy HAVE_MEMCPY)
-CHECK_FUNCTION_EXISTS(memmove HAVE_MEMMOVE)
-CHECK_FUNCTION_EXISTS(getopt HAVE_GETOPT)
+# ensure macro functions are captured
+CHECK_SYMBOL_EXISTS(abs "stdlib.h" HAVE_ABS)
+CHECK_SYMBOL_EXISTS(memcpy "string.h" HAVE_MEMCPY)
+CHECK_SYMBOL_EXISTS(memmove "string.h" HAVE_MEMMOVE)
+CHECK_SYMBOL_EXISTS(getopt "getopt.h" HAVE_GETOPT)
+CHECK_SYMBOL_EXISTS(snprintf "stdio.h" HAVE_SNPRINTF)
+CHECK_SYMBOL_EXISTS(vsnprintf "stdio.h" HAVE_VSNPRINTF)
 
 CHECK_TYPE_SIZE("ssize_t" SSIZE_T)
 
@@ -93,36 +78,8 @@ int main() {return !(f() == f());}
 endif(SC_ENABLE_CXX11)
 
 # Now that all the tests are done, configure the sc_cf.h file:
-get_property(CONFIG_H_FILE_CONTENTS GLOBAL PROPERTY SC_CONFIG_H_CONTENTS)
-file(WRITE ${CONFIG_H_FILE} "${CONFIG_H_FILE_CONTENTS}")
-configure_file(${CONFIG_H_FILE} ${SC_BINARY_DIR}/${INCLUDE_INSTALL_DIR}/sc_cf.h)
-
-# ------------------------
-
-# create sc_version_string.h, http://stackoverflow.com/questions/3780667
-# Using 'ver_string' instead of 'sc_version_string.h' is a trick to force the
-# command to always execute when the custom target is built. It works because
-# a file by that name never exists.
-if(SC_GIT_VERSION)
-  configure_file(${SC_CMAKE_DIR}/sc_version_string.cmake ${SC_BINARY_DIR}/sc_version_string.cmake @ONLY)
-  add_custom_target(version_string ALL DEPENDS ver_string)
-  # creates sc_version_string.h using cmake script
-  add_custom_command(OUTPUT ver_string
-    COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${SC_SOURCE_DIR} -DBINARY_DIR=${SC_BINARY_DIR} -P ${SC_BINARY_DIR}/sc_version_string.cmake
-    )
-  # sc_version_string.h is a generated file
-else(SC_GIT_VERSION)
-  set(VER_HDR "
-  #ifndef SC_VERSION_STRING
-  #define SC_VERSION_STRING
-  static char sc_version[512] = {\"${SC_VERSION}\"};
-  #endif"
-  )
-  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${INCLUDE_INSTALL_DIR}/sc_version_string.h "${VER_HDR}")
-endif(SC_GIT_VERSION)
-set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${INCLUDE_INSTALL_DIR}/sc_version_string.h
-  PROPERTIES GENERATED TRUE
-  HEADER_FILE_ONLY TRUE )
+configure_file(${CMAKE_SOURCE_DIR}/include/sc_cf.h.in ${SC_BINARY_DIR}/${INCLUDE_DIR}/sc_cf.h.gen)
+execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SC_BINARY_DIR}/${INCLUDE_DIR}/sc_cf.h.gen ${SC_BINARY_DIR}/${INCLUDE_DIR}/sc_cf.h)
 
 # Local Variables:
 # tab-width: 8

cmake/SC_Regenerate.cmake

@@ -1,4 +1,4 @@
-# The Express parser uses the tools Perplex, RE2C and Lemon to generate code
+# The Express parser uses the tools RE2C and Lemon to generate code
 # from higher level inputs.  Depending on available tools and options, the
 # SC build can either re-generate code as part of the build, or use cached
 # files that are ready for compilation.
@@ -10,45 +10,38 @@
 # this option is set to ON and the necessary tools are not found, the
 # configure step will fail.  If it is set to OFF, SC will not even try to use
 # the generators and will instead use the cached sources.
-if(NOT DEFINED SC_GENERATE_LEXER_PARSER)
-  set(SC_GENERATE_LEXER_PARSER "AUTO" CACHE STRING "Use Perplex, RE2C and Lemon to generate C source code.")
-  set(_verbosity "QUIET")
-else(NOT DEFINED SC_GENERATE_LEXER_PARSER)
-  string(TOUPPER "${SC_GENERATE_LEXER_PARSER}" SC_GENERATE_LEXER_PARSER)
-endif(NOT DEFINED SC_GENERATE_LEXER_PARSER)
-set_property(CACHE SC_GENERATE_LEXER_PARSER PROPERTY STRINGS AUTO ON OFF)
-if (NOT "${SC_GENERATE_LEXER_PARSER}" STREQUAL "AUTO" AND NOT "${SC_GENERATE_LEXER_PARSER}" STREQUAL "ON" AND NOT "${SC_GENERATE_LEXER_PARSER}" STREQUAL "OFF")
+
+set(_valid_gen_states AUTO ON OFF)
+set(_verbosity "QUIET")
+
+set(SC_GENERATE_LEXER_PARSER "AUTO" CACHE
+    STRING "Use Perplex, RE2C and Lemon to generate C source code.")
+set_property(CACHE SC_GENERATE_LEXER_PARSER PROPERTY STRINGS ${_valid_gen_states})
+string(TOUPPER "${SC_GENERATE_LEXER_PARSER}" SC_GENERATE_LEXER_PARSER)
+
+if(NOT "${SC_GENERATE_LEXER_PARSER}" IN_LIST _valid_gen_states)
   message(WARNING "Unknown value ${SC_GENERATE_LEXER_PARSER} supplied for SC_GENERATE_LEXER_PARSER - defaulting to AUTO")
   message(WARNING "Valid options are AUTO, ON and OFF")
   set(SC_GENERATE_LEXER_PARSER "AUTO" CACHE STRING "Use Perplex, RE2C and Lemon to generate C source code.")
-endif (NOT "${SC_GENERATE_LEXER_PARSER}" STREQUAL "AUTO" AND NOT "${SC_GENERATE_LEXER_PARSER}" STREQUAL "ON" AND NOT "${SC_GENERATE_LEXER_PARSER}" STREQUAL "OFF")
+endif()
 
 # If the generators have not been turned off, we need to check for them
 if(NOT "${SC_GENERATE_LEXER_PARSER}" STREQUAL "OFF")
+  # NOTE: lemon doesn't have a stable versioning system (it's always 1)
   find_package(LEMON ${_verbosity})
   find_package(RE2C ${_verbosity})
   find_package(PERPLEX ${_verbosity})
-  if(LEMON_EXECUTABLE AND LEMON_TEMPLATE AND PERPLEX_EXECUTABLE AND PERPLEX_TEMPLATE AND RE2C_EXECUTABLE)
-    # Templates may be anywhere - make sure we have a stable path if a relative
-    # path was specified at CMake time
-    get_filename_component(lemon_template_fpath "${LEMON_TEMPLATE}" ABSOLUTE)
-    if(NOT "${lemon_template_fpath}" STREQUAL "${LEMON_TEMPLATE}")
-      get_filename_component(LEMON_TEMPLATE "${CMAKE_BINARY_DIR}/${LEMON_TEMPLATE}" ABSOLUTE)
-    endif(NOT "${lemon_template_fpath}" STREQUAL "${LEMON_TEMPLATE}")
-    get_filename_component(perplex_template_fpath "${PERPLEX_TEMPLATE}" ABSOLUTE)
-    if(NOT "${perplex_template_fpath}" STREQUAL "${PERPLEX_TEMPLATE}")
-      get_filename_component(PERPLEX_TEMPLATE "${CMAKE_BINARY_DIR}/${PERPLEX_TEMPLATE}" ABSOLUTE)
-    endif(NOT "${perplex_template_fpath}" STREQUAL "${PERPLEX_TEMPLATE}")
 
+  if(LEMON_FOUND AND RE2C_FOUND)
     set(SC_GENERATE_LP_SOURCES 1)
-    message(".. Found perplex, re2c, and lemon - can regenerate lexer/parser if necessary")
-  else(LEMON_EXECUTABLE AND LEMON_TEMPLATE AND PERPLEX_EXECUTABLE AND PERPLEX_TEMPLATE AND RE2C_EXECUTABLE)
+    message(".. Found re2c, and lemon - can regenerate lexer/parser if necessary")
+  else()
     if("${SC_GENERATE_LEXER_PARSER}" STREQUAL "ON")
-      message(FATAL_ERROR "\nSC_GENERATE_LEXER_PARSER set to ON, but one or more components of the Perplex/RE2C/Lemon toolchain were not found.\n")
+      message(FATAL_ERROR "\nSC_GENERATE_LEXER_PARSER set to ON, but couldn't find lemon/re2c")
     else("${SC_GENERATE_LEXER_PARSER}" STREQUAL "ON")
       set(SC_GENERATE_LP_SOURCES 0)
     endif("${SC_GENERATE_LEXER_PARSER}" STREQUAL "ON")
-  endif(LEMON_EXECUTABLE AND LEMON_TEMPLATE AND PERPLEX_EXECUTABLE AND PERPLEX_TEMPLATE AND RE2C_EXECUTABLE)
+  endif()
 else(NOT "${SC_GENERATE_LEXER_PARSER}" STREQUAL "OFF")
   set(SC_GENERATE_LP_SOURCES 0)
 endif(NOT "${SC_GENERATE_LEXER_PARSER}" STREQUAL "OFF")

cmake/SC_Targets.cmake

@@ -1,150 +1,86 @@
+macro(SC_ADDEXEC execname)
+  set(_addexec_opts NO_INSTALL TESTABLE)
+  set(_addexec_multikw SOURCES LINK_LIBRARIES)
+  string(TOUPPER "SC_ADDEXEC_${execname}_ARG" _arg_prefix)
+  cmake_parse_arguments(${_arg_prefix} "${_addexec_opts}" "" "${_addexec_multikw}" ${ARGN})
 
-# set compile definitions for dll exports on windows
-macro(DEFINE_DLL_EXPORTS libname)
-  if(MSVC OR BORLAND)
-    if(${libname} MATCHES "sdai_.*")
-      set(export "SC_SCHEMA_DLL_EXPORTS")
-    else()
-      string(REGEX REPLACE "lib" "" shortname "${libname}")
-      string(REGEX REPLACE "step" "" LOWERCORE "${shortname}")
-      string(TOUPPER ${LOWERCORE} UPPER_CORE)
-      set(export "SC_${UPPER_CORE}_DLL_EXPORTS")
-    endif()
-    set_property(TARGET ${libname} APPEND PROPERTY COMPILE_DEFINITIONS "${export}")
-  endif(MSVC OR BORLAND)
-endmacro(DEFINE_DLL_EXPORTS libname)
+  if(NOT DEFINED "${_arg_prefix}_SOURCES")
+    message(SEND_ERROR "SC_ADDEXEC usage error!")
+  endif()
 
-# set compile definitions for dll imports on windows
-macro(DEFINE_DLL_IMPORTS tgt libs)
-  if(MSVC OR BORLAND)
-    set(imports "")
-    foreach(lib ${libs})
-      string(REGEX REPLACE "lib" "" shortname "${lib}")
-      string(REGEX REPLACE "step" "" LOWERCORE "${shortname}")
-      string(TOUPPER ${LOWERCORE} UPPER_CORE)
-      list(APPEND imports "SC_${UPPER_CORE}_DLL_IMPORTS")
-    endforeach(lib ${libs})
-    set_property(TARGET ${tgt} APPEND PROPERTY COMPILE_DEFINITIONS "${imports}")
-  endif(MSVC OR BORLAND)
-endmacro(DEFINE_DLL_IMPORTS tgt libs)
+  add_executable(${execname} ${${_arg_prefix}_SOURCES})
 
-#SC_ADDEXEC(execname "source files" "linked libs" ["TESTABLE"] ["NO_INSTALL"])
-macro(SC_ADDEXEC execname srcslist libslist)
+  if(DEFINED "${_arg_prefix}_LINK_LIBRARIES")
+    foreach(_lib ${${_arg_prefix}_LINK_LIBRARIES})
+        if($CACHE{SC_STATIC_UTILS})
+            if(NOT $<TARGET_PROPERTY:${_lib},TYPE> STREQUAL "STATIC_LIBRARY")
+                message(SEND_ERROR "SC_ADDEXEC usage error - expected STATIC LINK_LIBRARIES targets (${_lib})")
+            endif()
+        endif()
+        target_link_libraries(${execname} ${_lib})
+    endforeach()
+  endif()
 
-  string(TOUPPER "${execname}" EXECNAME_UPPER)
-  if(${ARGC} GREATER 3)
-    CMAKE_PARSE_ARGUMENTS(${EXECNAME_UPPER} "NO_INSTALL;TESTABLE" "" "" ${ARGN})
-  endif(${ARGC} GREATER 3)
-
-  add_executable(${execname} ${srcslist})
-  target_link_libraries(${execname} ${libslist})
-  DEFINE_DLL_IMPORTS(${execname} "${libslist}")  #add import definitions for all libs that the executable is linked to
-  if(NOT ${EXECNAME_UPPER}_NO_INSTALL AND NOT ${EXECNAME_UPPER}_TESTABLE)
+  if(NOT ${_arg_prefix}_NO_INSTALL AND NOT ${_arg_prefix}_TESTABLE)
     install(TARGETS ${execname}
       RUNTIME DESTINATION ${BIN_DIR}
       LIBRARY DESTINATION ${LIB_DIR}
-      ARCHIVE DESTINATION ${LIB_DIR}
-      )
-  endif(NOT ${EXECNAME_UPPER}_NO_INSTALL AND NOT ${EXECNAME_UPPER}_TESTABLE)
-  if(NOT SC_ENABLE_TESTING AND ${EXECNAME_UPPER}_TESTABLE)
-    set_target_properties( ${execname} PROPERTIES EXCLUDE_FROM_ALL ON )
-  endif(NOT SC_ENABLE_TESTING AND ${EXECNAME_UPPER}_TESTABLE)
+      ARCHIVE DESTINATION ${LIB_DIR}	
+     )
+  endif()
 
-  # Enable extra compiler flags if local executables and/or global options dictate
-  set(LOCAL_COMPILE_FLAGS "")
-  foreach(extraarg ${ARGN})
-    if(${extraarg} MATCHES "STRICT" AND SC-ENABLE_STRICT)
-      set(LOCAL_COMPILE_FLAGS "${LOCAL_COMPILE_FLAGS} ${STRICT_FLAGS}")
-    endif(${extraarg} MATCHES "STRICT" AND SC-ENABLE_STRICT)
-  endforeach(extraarg ${ARGN})
-  if(LOCAL_COMPILE_FLAGS)
-    set_target_properties(${execname} PROPERTIES COMPILE_FLAGS ${LOCAL_COMPILE_FLAGS})
-  endif(LOCAL_COMPILE_FLAGS)
+  if(NOT SC_ENABLE_TESTING AND ${_arg_prefix}_TESTABLE)
+    set_target_properties(${execname} PROPERTIES EXCLUDE_FROM_ALL ON)
+  endif()
+endmacro()
 
-endmacro(SC_ADDEXEC execname srcslist libslist)
+macro(SC_ADDLIB _addlib_target)
+  set(_addlib_opts SHARED STATIC NO_INSTALL TESTABLE)
+  set(_addlib_multikw SOURCES LINK_LIBRARIES)
+  string(TOUPPER "SC_ADDLIB_${libname}_ARG" _arg_prefix)
+  cmake_parse_arguments(${_arg_prefix} "${_addlib_opts}" "" "${_addlib_multikw}" ${ARGN})
 
-#SC_ADDLIB(libname "source files" "linked libs" ["TESTABLE"] ["NO_INSTALL"] ["SO_SRCS ..."] ["STATIC_SRCS ..."])
-macro(SC_ADDLIB libname srcslist libslist)
+  if(NOT DEFINED ${_arg_prefix}_SOURCES)
+    message(SEND_ERROR "SC_ADDLIB usage error!")
+  endif()
 
-  string(TOUPPER "${libname}" LIBNAME_UPPER)
-  if(${ARGC} GREATER 3)
-    CMAKE_PARSE_ARGUMENTS(${LIBNAME_UPPER} "NO_INSTALL;TESTABLE" "" "SO_SRCS;STATIC_SRCS" ${ARGN})
-  endif(${ARGC} GREATER 3)
-
-  string(REGEX REPLACE "-framework;" "-framework " libslist "${libslist1}")
-  if(SC_BUILD_SHARED_LIBS)
-    add_library(${libname} SHARED ${srcslist} ${${LIBNAME_UPPER}_SO_SRCS})
-    DEFINE_DLL_EXPORTS(${libname})
-    if(NOT "${libs}" MATCHES "NONE")
-      target_link_libraries(${libname} ${libslist})
-      DEFINE_DLL_IMPORTS(${libname} "${libslist}")
-    endif(NOT "${libs}" MATCHES "NONE")
-    set_target_properties(${libname} PROPERTIES VERSION ${SC_ABI_VERSION} SOVERSION ${SC_ABI_SOVERSION})
-    if(NOT ${LIBNAME_UPPER}_NO_INSTALL AND NOT ${LIBNAME_UPPER}_TESTABLE)
-      install(TARGETS ${libname}
-	RUNTIME DESTINATION ${BIN_DIR}
-	LIBRARY DESTINATION ${LIB_DIR}
-	ARCHIVE DESTINATION ${LIB_DIR}
-	)
-    endif(NOT ${LIBNAME_UPPER}_NO_INSTALL AND NOT ${LIBNAME_UPPER}_TESTABLE)
-    if(NOT SC_ENABLE_TESTING AND ${LIBNAME_UPPER}_TESTABLE)
-      set_target_properties( ${libname} PROPERTIES EXCLUDE_FROM_ALL ON )
-    endif(NOT SC_ENABLE_TESTING AND ${LIBNAME_UPPER}_TESTABLE)
+  if(${_arg_prefix}_SHARED)
+    add_library(${_addlib_target} SHARED ${${_arg_prefix}_SOURCES})
+    if(OPENBSD)
+      set_target_properties(${_addlib_target} PROPERTIES VERSION ${SC_VERSION_MAJOR}.${SC_VERSION_MINOR})
+    else(OPENBSD)
+      set_target_properties(${_addlib_target} PROPERTIES VERSION ${SC_VERSION} SOVERSION ${SC_VERSION_MAJOR})
+    endif(OPENBSD)
     if(APPLE)
-      set_target_properties(${libname} PROPERTIES LINK_FLAGS "-flat_namespace -undefined suppress")
+      set_target_properties(${_addlib_target} PROPERTIES LINK_FLAGS "-flat_namespace -undefined suppress")
     endif(APPLE)
-  endif(SC_BUILD_SHARED_LIBS)
-  if(SC_BUILD_STATIC_LIBS)
-    if(NOT SC_BUILD_SHARED_LIBS)
-      set(staticlibname "${libname}")
-    else()
-      set(staticlibname "${libname}-static")
-    endif(NOT SC_BUILD_SHARED_LIBS)
-    add_library(${staticlibname} STATIC ${srcslist} ${${LIBNAME_UPPER}_STATIC_SRCS})
-    DEFINE_DLL_EXPORTS(${staticlibname})
-    if(NOT ${libs} MATCHES "NONE")
-      target_link_libraries(${staticlibname} "${libslist}")
-      DEFINE_DLL_IMPORTS(${staticlibname} ${libslist})
-    endif(NOT ${libs} MATCHES "NONE")
-    if(NOT WIN32)
-      set_target_properties(${staticlibname} PROPERTIES OUTPUT_NAME "${libname}")
-    endif(NOT WIN32)
-    if(WIN32)
-      # We need the lib prefix on win32, so add it even if our add_library
-      # wrapper function has removed it due to the target name - see
-      # http://www.cmake.org/Wiki/CMake_FAQ#How_do_I_make_my_shared_and_static_libraries_have_the_same_root_name.2C_but_different_suffixes.3F
-      set_target_properties(${staticlibname} PROPERTIES PREFIX "lib")
-    endif(WIN32)
-    if(NOT ${LIBNAME_UPPER}_NO_INSTALL AND NOT ${LIBNAME_UPPER}_TESTABLE)
-      install(TARGETS ${libname}-static
-	RUNTIME DESTINATION ${BIN_DIR}
-	LIBRARY DESTINATION ${LIB_DIR}
-	ARCHIVE DESTINATION ${LIB_DIR}
-	)
-    endif(NOT ${LIBNAME_UPPER}_NO_INSTALL AND NOT ${LIBNAME_UPPER}_TESTABLE)
-    if(NOT SC_ENABLE_TESTING AND ${LIBNAME_UPPER}_TESTABLE)
-      set_target_properties( ${libname}-static PROPERTIES EXCLUDE_FROM_ALL ON )
-    endif(NOT SC_ENABLE_TESTING AND ${LIBNAME_UPPER}_TESTABLE)
-    if(APPLE)
-      set_target_properties(${staticlibname} PROPERTIES LINK_FLAGS "-flat_namespace -undefined suppress")
-    endif(APPLE)
-  endif(SC_BUILD_STATIC_LIBS)
-  # Enable extra compiler flags if local libraries and/or global options dictate
-  set(LOCAL_COMPILE_FLAGS "")
-  foreach(extraarg ${ARGN})
-    if(${extraarg} MATCHES "STRICT" AND SC-ENABLE_STRICT)
-      set(LOCAL_COMPILE_FLAGS "${LOCAL_COMPILE_FLAGS} ${STRICT_FLAGS}")
-    endif(${extraarg} MATCHES "STRICT" AND SC-ENABLE_STRICT)
-  endforeach(extraarg ${ARGN})
-  if(LOCAL_COMPILE_FLAGS)
-    if(BUILD_SHARED_LIBS)
-      set_target_properties(${libname} PROPERTIES COMPILE_FLAGS ${LOCAL_COMPILE_FLAGS})
-    endif(BUILD_SHARED_LIBS)
-    if(BUILD_STATIC_LIBS)
-      set_target_properties(${staticlibname} PROPERTIES COMPILE_FLAGS ${LOCAL_COMPILE_FLAGS})
-    endif(BUILD_STATIC_LIBS)
-  endif(LOCAL_COMPILE_FLAGS)
-endmacro(SC_ADDLIB libname srcslist libslist)
+  elseif(${_arg_prefix}_STATIC)
+    add_library(${_addlib_target} STATIC ${${_arg_prefix}_SOURCES})
+    target_compile_definitions(${_addlib_target} PRIVATE SC_STATIC)
+  else()
+    message(SEND_ERROR "SC_ADDLIB usage error!")
+  endif()
+
+  if(DEFINED ${_arg_prefix}_LINK_LIBRARIES)
+    foreach(_lib ${${_arg_prefix}_LINK_LIBRARIES})
+        if(${_arg_prefix}_STATIC AND TARGET ${_lib})
+	  get_property(_libtype TARGET ${_lib} PROPERTY TYPE)
+	  if(NOT ${_libtype} STREQUAL "STATIC_LIBRARY")
+	      message(SEND_ERROR "SC_ADDLIB usage error - expected (static) LINK_LIBRARIES targets (${_lib})")
+            endif()
+        endif()
+        target_link_libraries(${_addlib_target} ${_lib})
+    endforeach()
+  endif()
+
+  if(NOT ${_arg_prefix}_NO_INSTALL AND NOT ${_arg_prefix}_TESTABLE)
+    install(TARGETS ${_addlib_target}
+      RUNTIME DESTINATION ${BIN_DIR}
+      LIBRARY DESTINATION ${LIB_DIR}
+      ARCHIVE DESTINATION ${LIB_DIR}	
+    )
+  endif()
+endmacro()
 
 # Local Variables:
 # tab-width: 8

cmake/md5_gen.cmake.in

@@ -1,35 +0,0 @@
-# Inherit the parent CMake setting
-set(CURRENT_SOURCE_DIR @CMAKE_CURRENT_SOURCE_DIR@)
-set(CURRENT_BINARY_DIR @CMAKE_CURRENT_BINARY_DIR@)
-
-# Define a variety of convenience routines
-include(@PROJECT_CMAKE_DIR@/Generated_Source_Utils.cmake)
-
-# The following steps are executed to sync generated sources:
-#
-# 1.  Create a new verification_info.cmake file and populate
-#     it with the MD5 sums for current files.
-#
-# 2.  Overwrite the original cached verification_info.cmake
-#     and generated files with the new ones.  If LOCKED_SOURCE_DIR
-#     is ON, this step will not be carried out - instead, an
-#     informational message with manual updating instructions
-#     will be printed.
-
-set(new_info_file "${CURRENT_BINARY_DIR}/verification_info.cmake")
-
-
-file(WRITE ${new_info_file} "# Autogenerated verification information\n")
-
-# Handle input files
-set(input_files "@MD5_FILELIST@")
-WRITE_MD5_SUMS("${input_files}" "${new_info_file}")
-
-message("New verification file created: ${new_info_file}")
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8

cmake/md5_verify.cmake.in

@@ -1,30 +0,0 @@
-# Inherit the parent CMake setting
-set(DEBUGGING_GENERATED_SOURCES @DEBUGGING_GENERATED_SOURCES@)
-set(CURRENT_SOURCE_DIR "@CMAKE_CURRENT_SOURCE_DIR@")
-
-# Include the file the provides the baseline against which
-# current files will be compared
-
-  include("@BASELINE_INFORMATION_FILE@")
-
-  # Define a variety of convenience routines
-  include("@PROJECT_CMAKE_DIR@/Generated_Source_Utils.cmake")
-
-  # Individually verify all of the files in question.
-  set(filelist "@MD5_FILELIST@")
-  VERIFY_FILES("${filelist}" 1 srcs_pass)
-  if(NOT srcs_pass)
-    if(NOT DEBUGGING_GENERATED_SOURCES)
-      message(FATAL_ERROR "Sources have been modified and md5 sums have not been updated.  This generally indicates either\n   a) an input file has been modified but generated files have not been updated, or\n   b) genenerated files have been edited directly.\nTo clear the error:\n  a) Copy the new generated sources from the build directory to the generated/ sources directory, use the <target>_md5gen build target to create a new verifictation_info.cmake file, and copy verfication_info.cmake to generated/ as well.\n  b) install Perplex/Re2C/LEMON and make the changes to the input file rather than the generated file.\nNote:\n  If this is a debugging situation where multiple sequential tests must be conducted, temporarily set the variable DEBUGGING_GENERATED_SOURCES to ON during the CMake configure to disable this check.\nThis measure is necessary to ensure that compilations using either Perplex/Re2C/LEMON generation or the cached outputs of those tools produce consistent results.")
-    else(NOT DEBUGGING_GENERATED_SOURCES)
-      message(WARNING "Note: Sources have been modified and md5 sums have not been updated - build failure condition temporarily overridden by DEBUGGING_GENERATED_SOURCES setting.")
-    endif(NOT DEBUGGING_GENERATED_SOURCES)
-  endif(NOT srcs_pass)
-
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8

cmake/sc_version_string.cmake

@@ -1,96 +0,0 @@
-# creates sc_version_string.h, which defines sc_version()
-# sc_version() returns a pretty commit description and a build timestamp.
-
-# only update the file if the git commit has changed, because whenever the file is updated files including the header must rebuild
-# parallel rebuilds can result in race conditions and failures, particularly when running ctest in parallel
-
-# http://stackoverflow.com/questions/3780667
-# http://www.cmake.org/pipermail/cmake/2009-February/027014.html
-
-set(SC_IS_SUBBUILD "@SC_IS_SUBBUILD@")
-set(SC_ENABLE_TESTING "@SC_ENABLE_TESTING@")
-
-set(SC_VERSION_HEADER "${BINARY_DIR}/include/sc_version_string.h")
-
-#---------- find commit id ------------------
-#use git for a pretty commit id
-#uses 'git describe --tags', so tags are required in the repo
-#create a tag with 'git tag <name>' and 'git push --tags'
-#if git can't be found, uses contents of SC_VERSION.txt
-
-set(VERS_FILE ${SOURCE_DIR}/SC_VERSION.txt)
-if(EXISTS ${SOURCE_DIR}/.git)
-  find_package(Git QUIET)
-  if(GIT_FOUND)
-    execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags WORKING_DIRECTORY ${SOURCE_DIR}
-      RESULT_VARIABLE res_var OUTPUT_VARIABLE GIT_COMMIT_ID)
-    if(NOT ${res_var} EQUAL 0)
-      file(READ ${VERS_FILE} GIT_COMMIT_ID LIMIT 255)
-      if(NOT SC_IS_SUBBUILD)
-	message(WARNING "Git failed (probably no tags in repo). Build will contain revision info from ${VERS_FILE}.")
-      endif(NOT SC_IS_SUBBUILD)
-    endif()
-  else(GIT_FOUND)
-    file(READ ${VERS_FILE} GIT_COMMIT_ID LIMIT 255)
-    if(NOT SC_IS_SUBBUILD)
-      message(WARNING "Git not found. Build will contain revision info from ${VERS_FILE}.")
-    endif(NOT SC_IS_SUBBUILD)
-  endif(GIT_FOUND)
-else()
-  file(READ ${VERS_FILE} GIT_COMMIT_ID LIMIT 255)
-  if(NOT SC_IS_SUBBUILD)
-    message(WARNING "Git failed ('.git' not found). Build will contain revision info from ${VERS_FILE}.")
-  endif(NOT SC_IS_SUBBUILD)
-endif()
-string(REPLACE "\n" "" GIT_COMMIT_ID ${GIT_COMMIT_ID})
-
-#-------------- date and time ---------------
-#once cmake_minimum_required is >= 2.8.11, we can use TIMESTAMP:
-#string(TIMESTAMP date_time_string)
-
-if(SC_ENABLE_TESTING)
-  set (date_time_string "NA - disabled for testing")
-elseif(UNIX)
-  execute_process(COMMAND date "+%d %b %Y %H:%M" OUTPUT_VARIABLE date_time_string OUTPUT_STRIP_TRAILING_WHITESPACE)
-elseif(WIN32)
-  execute_process(COMMAND cmd /c date /t OUTPUT_VARIABLE currentDate OUTPUT_STRIP_TRAILING_WHITESPACE)
-  execute_process(COMMAND cmd /c time /t OUTPUT_VARIABLE currentTime OUTPUT_STRIP_TRAILING_WHITESPACE)
-  set (date_time_string "${currentDate} ${currentTime}")
-else()
-  set(date_time_string "\" __DATE__ \" \" __TIME__ \" ")
-  if(NOT SC_IS_SUBBUILD)
-    message(STATUS "Unknown platform - using date from preprocessor")
-  endif(NOT SC_IS_SUBBUILD)
-endif()
-
-set(header_string "/* sc_version_string.h - written by cmake. Changes will be lost! */\n"
-  "#ifndef SC_VERSION_STRING\n"
-  "#define SC_VERSION_STRING\n\n"
-  "/*\n** The git commit id looks like \"test-1-g5e1fb47\", where test is the\n"
-  "** name of the last tagged git revision, 1 is the number of commits since that tag,\n"
-  "** 'g' is unknown, and 5e1fb47 is the first 7 chars of the git sha1 commit id.\n"
-  "** timestamp is created from date/time commands on known platforms, and uses\n"
-  "** preprocessor macros elsewhere.\n*/\n\n"
-  "static char sc_version[512] = {\n"
-  "    \"git commit id: ${GIT_COMMIT_ID}, build timestamp ${date_time_string}\"\n"
-  "}\;\n\n"
-  "#endif\n"
- )
-
-#don't update the file unless somethig changed
-string(RANDOM tmpsuffix)
-file(WRITE ${SC_VERSION_HEADER}.${tmpsuffix} ${header_string})
-execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SC_VERSION_HEADER}.${tmpsuffix} ${SC_VERSION_HEADER})
-execute_process(COMMAND ${CMAKE_COMMAND} -E remove ${SC_VERSION_HEADER}.${tmpsuffix})
-
-if(NOT SC_IS_SUBBUILD)
-  message("-- sc_version_string.h is up-to-date.")
-endif(NOT SC_IS_SUBBUILD)
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
-

cmake/schema_scanner/CMakeLists.txt

@@ -1,5 +1,5 @@
 project(SC_SUBPROJECT_SCHEMA_SCANNER)
-cmake_minimum_required(VERSION 2.8.7)
+cmake_minimum_required(VERSION 3.12)
 
 if(NOT ("${CALLED_FROM}" STREQUAL "STEPCODE_CMAKELISTS" AND DEFINED SC_ROOT AND DEFINED SC_BUILDDIR))
   message(" ${CALLED_FROM}  ${SC_ROOT} ${SC_BUILDDIR}")
@@ -22,6 +22,7 @@ set(schema_scanner_src
   ${SC_ROOT}/src/express/generated/expparse.c
   ${SC_ROOT}/src/express/generated/expscan.c
   ${SC_ROOT}/src/express/alg.c
+  ${SC_ROOT}/src/express/alloc.c
   ${SC_ROOT}/src/express/caseitem.c
   ${SC_ROOT}/src/express/dict.c
   ${SC_ROOT}/src/express/entity.c
@@ -29,6 +30,7 @@ set(schema_scanner_src
   ${SC_ROOT}/src/express/exp_kw.c
   ${SC_ROOT}/src/express/expr.c
   ${SC_ROOT}/src/express/express.c
+  ${SC_ROOT}/src/express/factory.c
   ${SC_ROOT}/src/express/hash.c
   ${SC_ROOT}/src/express/lexact.c
   ${SC_ROOT}/src/express/linklist.c
@@ -36,6 +38,7 @@ set(schema_scanner_src
   ${SC_ROOT}/src/express/object.c
   ${SC_ROOT}/src/express/info.c
   ${SC_ROOT}/src/express/resolve.c
+  ${SC_ROOT}/src/express/resolve2.c
   ${SC_ROOT}/src/express/schema.c
   ${SC_ROOT}/src/express/scope.c
   ${SC_ROOT}/src/express/stmt.c
@@ -54,19 +57,16 @@ include_directories(
   ${SC_BUILDDIR}/include
  )
 
+add_executable(schema_scanner ${schema_scanner_src})
+
 if(MSVC)
-  add_definitions(-D__MSVC__ -D__WIN32__)
   # Disable warning for preferred usage of secure functions (example strcpy should be strcpy_s, ...)
-  add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS)
-elseif(BORLAND)
-  add_definitions(-D__BORLAND__ -D__WIN32__)
+  target_compile_definitions(schema_scanner PUBLIC _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS)
 else()
-  add_definitions(-pedantic -W -Wall -Wundef -Wfloat-equal -Wshadow -Winline -Wno-long-long)
+  target_compile_options(schema_scanner PUBLIC -pedantic -W -Wall -Wundef -Wfloat-equal -Wshadow -Winline -Wno-long-long)
 endif()
 
-add_definitions(-DSCHEMA_SCANNER)
-
-add_executable(schema_scanner ${schema_scanner_src})
+target_compile_definitions(schema_scanner PUBLIC SC_STATIC SCHEMA_SCANNER)
 
 # Local Variables:
 # tab-width: 8

cmake/schema_scanner/schemaScanner.cc

@@ -22,7 +22,7 @@ extern "C" {
 
 #  include <string.h>
 
-#  if defined( _WIN32 ) || defined ( __WIN32__ )
+#  ifdef _WIN32
 #    include <direct.h>
 #    define getcwd _getcwd
 #  else
@@ -244,7 +244,7 @@ void printSchemaFilenames( Schema sch ){
     int ecount = 0, tcount = 0;
 
     DictionaryEntry de;
-    Generic x;
+    void *x;
     filenames_t fn;
     DICTdo_init( sch->symbol_table, &de );
     while( 0 != ( x = DICTdo( &de ) ) ) {

cmake/schema_scanner/schemaScanner.cmake

@@ -11,13 +11,8 @@
 # in a unity build, many small .cc files are #included to create a few large translation units
 # this makes compilation faster, but sometimes runs into compiler limitations
 if(NOT DEFINED SC_UNITY_BUILD)
-  if(BORLAND)
-    message( STATUS "Will not do unity build for this compiler. (SC_UNITY_BUILD=FALSE)")
-    set(SC_UNITY_BUILD FALSE)
-  else()
-    message( STATUS "Assuming compiler is capable of unity build. (SC_UNITY_BUILD=TRUE)")
-    set(SC_UNITY_BUILD TRUE)
-  endif(BORLAND)
+  message( STATUS "Assuming compiler is capable of unity build. (SC_UNITY_BUILD=TRUE)")
+  set(SC_UNITY_BUILD TRUE)
   message( STATUS "Override by setting SC_UNITY_BUILD; TRUE will result in faster build times but *huge* translation units and higher memory use in compilation.")
 else(NOT DEFINED SC_UNITY_BUILD)
   message( STATUS "Respecting user-defined SC_UNITY_BUILD value of ${SC_UNITY_BUILD}.")
@@ -76,9 +71,9 @@ message( STATUS "Schema scanner built. Running it...")
 
 # not sure if it makes sense to install this or not...
 if(WIN32)
-	install(PROGRAMS ${SCANNER_OUT_DIR}/schema_scanner.exe DESTINATION ${BIN_INSTALL_DIR})
+	install(PROGRAMS ${SCANNER_OUT_DIR}/schema_scanner.exe DESTINATION ${BIN_DIR})
 else(WIN32)
-	install(PROGRAMS ${SCANNER_OUT_DIR}/schema_scanner DESTINATION ${BIN_INSTALL_DIR})
+	install(PROGRAMS ${SCANNER_OUT_DIR}/schema_scanner DESTINATION ${BIN_DIR})
 endif(WIN32)
 
 # macro SCHEMA_CMLIST
@@ -106,5 +101,6 @@ macro(SCHEMA_CMLIST SCHEMA_FILE)
   endforeach(_dir ${_ss_out})
   # configure_file forces cmake to run again if the schema has been modified
   #if multiple schemas in one file, _schema is the last one printed.
+  # 2e6ee669 removed _schema, does this still work?
   configure_file(${SCHEMA_FILE} ${SCANNER_BUILD_DIR}/${_schema})
 endmacro(SCHEMA_CMLIST SCHEMA_FILE)

cmake/sync_generated.cmake.in

@@ -1,83 +0,0 @@
-# Inherit the parent CMake setting
-set(CURRENT_SOURCE_DIR @CMAKE_CURRENT_SOURCE_DIR@)
-set(CURRENT_BINARY_DIR @CMAKE_CURRENT_BINARY_DIR@)
-set(CACHED_FILES_DIR @CACHED_FILES_DIR@)
-set(LEMON_EXECUTABLE @LEMON_EXECUTABLE@)
-set(RE2C_EXECUTABLE @RE2C_EXECUTABLE@)
-set(PERPLEX_EXECUTABLE @PERPLEX_EXECUTABLE@)
-set(LOCKED_SOURCE_DIR @LOCKED_SOURCE_DIR@)
-set(DEBUGGING_GENERATED_SOURCES @DEBUGGING_GENERATED_SOURCES@)
-
-if(NOT DEBUGGING_GENERATED_SOURCES)
-  # Define a variety of convenience routines
-  include(@PROJECT_CMAKE_DIR@/Generated_Source_Utils.cmake)
-
-  # The following steps are executed to sync generated sources:
-  #
-  # 1.  Create a new verification_info.cmake file and populate
-  #     it with the current versions of perplex, re2c and lemon.
-  #     Also add the MD5 sums for current template files.
-  #
-  # 2.  For all files that need to be updated in the cache,
-  #     calculate new MD5 sums and add them to the new
-  #     verification_info.cmake - this is usually the input
-  #     files and the generated outputs.
-  #
-  # 3.  Overwrite the original cached verification_info.cmake
-  #     and generated files with the new ones.  If LOCKED_SOURCE_DIR
-  #     is ON, this step will not be carried out - instead, an
-  #     informational message with manual updating instructions
-  #     will be printed.
-
-  set(new_info_file "${CURRENT_BINARY_DIR}/verification_info.cmake.new")
-
-
-  file(WRITE ${new_info_file} "# Autogenerated verification information\n")
-
-  # Handle generator version numbers
-  GET_GENERATOR_EXEC_VERSIONS()
-  file(APPEND ${new_info_file} "set(baseline_lemon_version \"${lemon_version}\")\n")
-  file(APPEND ${new_info_file} "set(baseline_re2c_version \"${re2c_version}\")\n")
-  file(APPEND ${new_info_file} "set(baseline_perplex_version \"${perplex_version}\")\n")
-
-  # Handle template files
-  set(template_files "@TEMPLATE_FILELIST@")
-  WRITE_MD5_SUMS("${template_files}" "${new_info_file}")
-
-  # Handle input files
-  set(input_files "@INPUT_FILELIST@")
-  WRITE_MD5_SUMS("${input_files}" "${new_info_file}")
-
-  # Handle generated files
-  set(output_files "@BUILD_OUTPUT_FILELIST@")
-  WRITE_MD5_SUMS("${output_files}" "${new_info_file}")
-
-  # Copy files into their final locations
-  if(NOT LOCKED_SOURCE_DIR)
-    configure_file(${new_info_file} "${CACHED_FILES_DIR}/verification_info.cmake" COPYONLY)
-    foreach(outf ${output_files})
-      get_filename_component(filecorename ${outf} NAME)
-      message("copying ${outf} to ${CACHED_FILES_DIR}/${filecorename}")
-      configure_file(${outf} "${CACHED_FILES_DIR}/${filecorename}" COPYONLY)
-    endforeach(outf ${output_files})
-  else(NOT LOCKED_SOURCE_DIR)
-    message("Source directory writing is locked - LOCKED_SOURCE_DIR is set.")
-    message("To update the generated files, manually copy the following to ${CACHED_FILES_DIR}:")
-    message("   ${new_info_file} (rename to verification_info.cmake)")
-    foreach(outf ${output_files})
-      message("   ${outf}")
-    endforeach(outf ${output_files})
-  endif(NOT LOCKED_SOURCE_DIR)
-
-else(NOT DEBUGGING_GENERATED_SOURCES)
-
-  message("\nNote: DEBUGGING_GENERATED_SOURCES is enabled - generated outputs will contain configuration-specific debugging information, so syncing cached output files is not possible.  To restore normal behavior, disable DEBUGGING_GENERATED_SOURCES.\n") 
-
-endif(NOT DEBUGGING_GENERATED_SOURCES)
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8

data/CMakeLists.txt

@@ -10,7 +10,7 @@
 # .exp file inside, which it uses. otherwise, ${path} is assumed to
 # be an express file.
 
-if(NOT "${SC_BUILD_SCHEMAS}" STREQUAL "")
+if(NOT "${SC_BUILD_EXPRESS_ONLY}" AND NOT "${SC_BUILD_SCHEMAS}" STREQUAL "")
   include(${SC_CMAKE_DIR}/schema_scanner/schemaScanner.cmake)
   foreach(src ${SC_SDAI_ADDITIONAL_EXES_SRCS})
     get_filename_component(name ${src} NAME_WE)
@@ -25,7 +25,7 @@ if(NOT "${SC_BUILD_SCHEMAS}" STREQUAL "")
     LOCATE_SCHEMA(${FILE} abspath)
     SCHEMA_CMLIST(${abspath})
   endforeach()
-endif(NOT "${SC_BUILD_SCHEMAS}" STREQUAL "")
+endif()
 
 # Local Variables:
 # tab-width: 8

data/ap238/ap238-aim-long.exp

@@ -3891,11 +3891,11 @@ ENTITY grooving_turning_operation
   WR3:  (verify_optional_action_property        (SELF, 'allowance')) AND
         (verify_length_measure_action_property  (SELF, 'allowance'));
 
-  -- allowance propery required for roughing
+  -- allowance property required for roughing
   WR4:  NOT (SELF.description = 'roughing') OR
         (verify_required_action_property (SELF, 'allowance'));
 
-  -- allowance propery forbidden for cutting in
+  -- allowance property forbidden for cutting in
   WR5:  NOT (SELF.description = 'cutting in') OR
         (0 = SIZEOF (get_action_property (SELF, 'allowance')));
 END_ENTITY; -- 10303-238: integrated_cnc_schema

doc/doxyassist.xml

@@ -36,7 +36,7 @@
     <!-- This is a single string setting. When writing this out to the doxyfile,
          it will be quoted and treated as a whole. -->
     <string name="OUTPUT_LANGUAGE">English</string>
-    <!-- A list setting contains multiple elements, seperated by whitespace. Each
+    <!-- A list setting contains multiple elements, separated by whitespace. Each
          individual item will be quoted and treated as a whole for Doxygen. By
          default a list replaces the existing setting. If the append attribute is
          set to true, then the items will be added to the existing set. -->

doc/man/man1/exp2cxx.1

@@ -5,7 +5,7 @@
 .\" $Id: exp2cxx.1,v 2.1.0.2 1998/02/27 23:54:30 sauderd Exp $
 .TH FEDEX_PLUS 1 "19 November 1997"
 .SH NAME
-exp2cxx - EXPRESS compiler and translater
+exp2cxx - EXPRESS compiler and translator
 .SH SYNOPSIS
 exp2cxx [ options ] [ express-file ]
 .nf

example/ap203min/CMakeLists.txt

@@ -6,7 +6,7 @@
 # for the use of this file.
 #
 project(AP203Minimum)
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.12)
 
 # Set STEPCODE_ROOT_DIR to point to the root of the STEPcode source tree.
 if(NOT DEFINED STEPCODE_ROOT_DIR)
@@ -14,14 +14,14 @@ if(NOT DEFINED STEPCODE_ROOT_DIR)
 endif(NOT DEFINED STEPCODE_ROOT_DIR)
 
 # STEPCODE_ROOT_DIR is relative or absolute path?
-if(EXISTS "${CMAKE_BINARY_DIR}/${STEPCODE_ROOT_DIR}/SC_VERSION.txt")
+if(EXISTS "${CMAKE_BINARY_DIR}/${STEPCODE_ROOT_DIR}/src/express/express.c")
   set(STEPCODE_ROOT_DIR "${CMAKE_BINARY_DIR}/${STEPCODE_ROOT_DIR}")
   message("** STEPCODE_ROOT_DIR is a relative path; converted to absolute path: ${STEPCODE_ROOT_DIR}.")
 else()
-  if(NOT EXISTS "${STEPCODE_ROOT_DIR}/SC_VERSION.txt")
+  if(NOT EXISTS "${STEPCODE_ROOT_DIR}/src/express/express.c")
     message(FATAL_ERROR "****  Cannot locate STEPCODE_ROOT_DIR - try an absolute path.")
-  endif(NOT EXISTS "${STEPCODE_ROOT_DIR}/SC_VERSION.txt")
-endif(EXISTS "${CMAKE_BINARY_DIR}/${STEPCODE_ROOT_DIR}/SC_VERSION.txt")
+  endif(NOT EXISTS "${STEPCODE_ROOT_DIR}/src/express/express.c")
+endif(EXISTS "${CMAKE_BINARY_DIR}/${STEPCODE_ROOT_DIR}/src/express/express.c")
 
 
 # Use STEPcode as library, but build from this build process.

example/ap203min/ExternalProjectBuild/CMakeLists.txt

@@ -6,7 +6,7 @@
 # for the use of this file.
 #
 project(AP203Minimum)
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.12)
 
 INCLUDE( ExternalProject )
 
@@ -77,4 +77,4 @@ target_link_libraries( ${PROJECT_NAME}
 # mode: cmake
 # indent-tabs-mode: t
 # End:
-# ex: shiftwidth=2 tabstop=8
+# ex: shiftwidth=2 tabstop=8

example/ap203min/ExternalProjectBuild/cmake/External_STEPCode.cmake

@@ -22,8 +22,3 @@ ENDIF()
 
 SET( STEPCODE_BINARY_DIR ${BINARY_DIR} )
 
-# SC CMake does not honor -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-# Consequently, force Debug so it installs in ../sc-install directory
-# instead of /usr/local/lib.
-#
-# SC's own programs fail to build with -DSC_BUILD_SHARED_LIBS=OFF

example/ap203min/include/sc_cf.h.in

@@ -0,0 +1,32 @@
+#ifndef SCL_CF_H
+#define SCL_CF_H
+
+/**** Define statements for CMake ****/
+#cmakedefine SC_VERSION "@SC_VERSION@"
+#cmakedefine HAVE_NDIR_H 1
+#cmakedefine HAVE_STDINT_H 1
+#cmakedefine HAVE_SYS_STAT_H 1
+#cmakedefine HAVE_SYS_PARAM_H 1
+#cmakedefine HAVE_SYSENT_H 1
+#cmakedefine HAVE_UNISTD_H 1
+#cmakedefine HAVE_DIRENT_H 1
+#cmakedefine HAVE_STDBOOL_H 1
+#cmakedefine HAVE_PROCESS_H 1
+#cmakedefine HAVE_IO_H 1
+
+#cmakedefine SC_TRACE_FPRINTF 1
+#cmakedefine SC_MEMMGR_ENABLE_CHECKS 1
+
+#cmakedefine HAVE_ABS 1
+#cmakedefine HAVE_MEMCPY 1
+#cmakedefine HAVE_MEMMOVE 1
+#cmakedefine HAVE_GETOPT 1
+#cmakedefine HAVE_VSNPRINTF 1
+
+#cmakedefine HAVE_SSIZE_T 1
+
+#cmakedefine HAVE_STD_THREAD 1
+#cmakedefine HAVE_STD_CHRONO 1
+#cmakedefine HAVE_NULLPTR 1
+
+#endif /* SCL_CF_H */

include/CMakeLists.txt

@@ -22,22 +22,21 @@ set(express_HDRS
   express/variable.h
   )
 install(FILES ${express_HDRS}
-  DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/express)
+  DESTINATION ${INCLUDE_DIR}/stepcode/express)
 
 set(exppp_HDRS
   exppp/exppp.h
   )
 install(FILES ${exppp_HDRS}
-  DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/exppp)
+  DESTINATION ${INCLUDE_DIR}/stepcode/exppp)
 
 install(FILES ordered_attrs.h
   sc_export.h
   sc_stdbool.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode)
+  DESTINATION ${INCLUDE_DIR}/stepcode)
 
-install(FILES ${SC_BINARY_DIR}/${INCLUDE_INSTALL_DIR}/sc_cf.h
-  ${SC_BINARY_DIR}/${INCLUDE_INSTALL_DIR}/sc_version_string.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode)
+install(FILES ${SC_BINARY_DIR}/${INCLUDE_DIR}/sc_cf.h
+  DESTINATION ${INCLUDE_DIR}/stepcode)
 
 # Local Variables:
 # tab-width: 8

include/express/alg.h

@@ -119,16 +119,16 @@ extern SC_EXPRESS_EXPORT struct freelist_head WHERE_fl;
 /* macro function definitions */
 /******************************/
 
-#define ALG_new()   (struct Algorithm *)MEM_new(&ALG_fl);
-#define ALG_destroy(x)  MEM_destroy(&ALG_fl,(Freelist *)(Generic)x)
-#define FUNC_new()  (struct Function_ *)MEM_new(&FUNC_fl)
-#define FUNC_destroy(x) MEM_destroy(&FUNC_fl,(Freelist *)(Generic)x)
-#define RULE_new()  (struct Rule_ *)MEM_new(&RULE_fl)
-#define RULE_destroy(x) MEM_destroy(&RULE_fl,(Freelist *)(Generic)x)
-#define PROC_new()  (struct Procedure_ *)MEM_new(&PROC_fl)
-#define PROC_destroy(x) MEM_destroy(&PROC_fl,(Freelist *)(Generic)x)
-#define WHERE_new() (struct Where_ *)MEM_new(&WHERE_fl)
-#define WHERE_destroy(x) MEM_destroy(&WHERE_fl,(Freelist *)(Generic)x)
+#define ALG_new()   (struct Algorithm *)ALLOC_new(&ALG_fl);
+#define ALG_destroy(x)  ALLOC_destroy(&ALG_fl,(Freelist *)x)
+#define FUNC_new()  (struct Function_ *)ALLOC_new(&FUNC_fl)
+#define FUNC_destroy(x) ALLOC_destroy(&FUNC_fl,(Freelist *)x)
+#define RULE_new()  (struct Rule_ *)ALLOC_new(&RULE_fl)
+#define RULE_destroy(x) ALLOC_destroy(&RULE_fl,(Freelist *)x)
+#define PROC_new()  (struct Procedure_ *)ALLOC_new(&PROC_fl)
+#define PROC_destroy(x) ALLOC_destroy(&PROC_fl,(Freelist *)x)
+#define WHERE_new() (struct Where_ *)ALLOC_new(&WHERE_fl)
+#define WHERE_destroy(x) ALLOC_destroy(&WHERE_fl,(Freelist *)x)
 
 #define ALGput_name(algorithm, name)    SCOPEput_name(algorithm,name)
 #define ALGget_name(algorithm)      SCOPEget_name(algorithm)
@@ -161,8 +161,8 @@ extern SC_EXPRESS_EXPORT struct freelist_head WHERE_fl;
 /* function prototypes */
 /***********************/
 
-extern SC_EXPRESS_EXPORT Scope    ALGcreate PROTO( ( char ) );
-extern SC_EXPRESS_EXPORT void     ALGinitialize PROTO( ( void ) );
-extern SC_EXPRESS_EXPORT void     ALGput_full_text PROTO( ( 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 */

include/express/alloc.h

@@ -0,0 +1,85 @@
+#ifndef ALLOC_H
+#define ALLOC_H
+
+/*
+ * This work was supported by the United States Government, and is
+ * not subject to copyright.
+ *
+ * $Log: memory.h,v $
+ * Revision 1.5  1997/01/21 19:17:11  dar
+ * made C++ compatible
+ *
+ * Revision 1.4  1993/10/15  18:49:23  libes
+ * CADDETC certified
+ *
+ * Revision 1.3  1993/02/22  21:41:13  libes
+ * ANSI compat
+ *
+ * Revision 1.2  1992/08/18  17:15:40  libes
+ * rm'd extraneous error messages
+ *
+ * Revision 1.1  1992/05/28  03:56:02  libes
+ * Initial revision
+ */
+
+#include "basic.h"
+
+/*****************/
+/* packages used */
+/*****************/
+
+#include <sc_export.h>
+
+/** \file alloc.h - defs for fixed size block memory allocator */
+
+typedef long Align;
+
+union freelist {
+    union freelist * next;  /**< next block on freelist */
+    char memory;        /**< user data */
+    Align aligner;      /**< force alignment of blocks */
+};
+
+typedef union freelist Freelist;
+
+struct freelist_head {
+    int size_elt;       /**< size of a single elt */
+#ifndef NOSTAT
+    int alloc;          /**< # of allocations */
+    int dealloc;
+    int create;         /**< number of calls to create a new freelist */
+    void *max;        /**< end of freelist */
+#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;
+#ifdef SPACE_PROFILE
+    int count;
+#endif
+};
+
+char * nnew();
+
+#include "error.h"
+
+/***********************************************/
+/* space allocation macros with error package: */
+/***********************************************/
+
+extern SC_EXPRESS_EXPORT int yylineno;
+
+/** CALLOC grabs and initializes to all 0s space for the indicated
+ * number of instances of the indicated type */
+#define CALLOC(ptr, num, type)                  \
+    if (((ptr) = (type*)calloc((num), (unsigned)sizeof(type)))==NULL) { \
+        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 * );
+
+#endif /* ALLOC_H */
+
+

include/express/basic.h

@@ -85,19 +85,9 @@
 # include <sc_stdbool.h>
 #endif
 
-/************************/
-/* Generic pointer type */
-/************************/
-
-#ifdef __STDC__
-typedef void * Generic;
-#else
-typedef char * Generic;
-#endif    /*    */
-
-/* other handy macros */
-#define streq(x,y)  (!strcmp((x),(y)))
-
+#if defined(_MSC_VER) && (_MSC_VER < 1900) && !defined(__cplusplus)
+#define inline __inline
+#endif
 
 /**************************/
 /* function pointer types */
@@ -106,45 +96,5 @@ typedef char * Generic;
 typedef void ( *voidFuncptr )();
 typedef int ( *intFuncptr )();
 
-/******************************/
-/* deal with inline functions */
-/******************************/
-
-#if !defined(static_inline)
-#if (!defined(__GNUC__) && !defined(__MSVC__)) || defined(__STRICT_ANSI)
-#define static_inline
-#undef supports_inline_functions
-#else
-#define static_inline static __inline
-#define supports_inline_functions   1L
-#endif    /*    */
-#endif /* !defined(static_inline) */
-
-/* allow same declarations to suffice for both Standard and Classic C */
-/* ... at least in header files ... */
-
-#ifndef CONST
-# ifdef __STDC__
-#  define CONST     const
-# else
-#  define CONST
-# endif
-#endif
-
-#ifndef PROTO
-# ifdef __STDC__
-#  define PROTO(x)  x
-# else
-
-# if defined(__CLCC__) || defined(__MSVC__) || defined(__BORLAND__)
-# define PROTO(x)   x
-#else
-# define PROTO(x)   ()
-# endif
-
-# endif
-#endif
-
-#endif    /*    */
-
+#endif    /* BASIC_H */
 

include/express/caseitem.h

@@ -83,10 +83,10 @@ extern SC_EXPRESS_EXPORT struct freelist_head CASE_IT_fl;
 /* function prototypes */
 /***********************/
 
-#define CASE_IT_new()       (struct Case_Item_ *)MEM_new(&CASE_IT_fl)
-#define CASE_IT_destroy(x)  MEM_destroy(&CASE_IT_fl,(Freelist *)(Generic)x)
+#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 PROTO( ( Linked_List, struct Statement_ * ) );
-extern SC_EXPRESS_EXPORT void     CASE_ITinitialize PROTO( ( 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*/

include/express/dict.h

@@ -97,14 +97,14 @@ extern SC_EXPRESS_EXPORT char DICT_type;  /**< set as a side-effect of DICT look
 /* function prototypes */
 /***********************/
 
-extern SC_EXPRESS_EXPORT void     DICTinitialize PROTO( ( void ) );
-extern SC_EXPRESS_EXPORT void     DICTcleanup PROTO( ( void ) );
-extern SC_EXPRESS_EXPORT int      DICTdefine PROTO( ( Dictionary, char *, Generic, Symbol *, char ) );
-extern SC_EXPRESS_EXPORT int      DICT_define PROTO( ( Dictionary, char *, Generic, Symbol *, char ) );
-extern SC_EXPRESS_EXPORT void     DICTundefine PROTO( ( Dictionary, char * ) );
-extern SC_EXPRESS_EXPORT Generic      DICTlookup PROTO( ( Dictionary, char * ) );
-extern SC_EXPRESS_EXPORT Generic      DICTlookup_symbol PROTO( ( Dictionary, char *, Symbol ** ) );
-extern SC_EXPRESS_EXPORT Generic      DICTdo PROTO( ( DictionaryEntry * ) );
-extern SC_EXPRESS_EXPORT void     DICTprint PROTO( ( 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*/

include/express/entity.h

@@ -109,8 +109,8 @@ extern SC_EXPRESS_EXPORT int ENTITY_MARK;
 /* macro function definitions */
 /******************************/
 
-#define ENTITY_new()        (struct Entity_ *)MEM_new(&ENTITY_fl)
-#define ENTITY_destroy(x)   MEM_destroy(&ENTITY_fl,(Freelist *)(char *)x)
+#define ENTITY_new()        (struct Entity_ *)ALLOC_new(&ENTITY_fl)
+#define ENTITY_destroy(x)   ALLOC_destroy(&ENTITY_fl,(Freelist *)(char *)x)
 
 #define ENTITYget_symbol(e) SCOPEget_symbol(e)
 /* returns a function (i.e., which can be passed to other functions) */
@@ -140,19 +140,19 @@ extern SC_EXPRESS_EXPORT int ENTITY_MARK;
 /* function prototypes */
 /***********************/
 
-extern SC_EXPRESS_EXPORT struct Scope_  * ENTITYcreate PROTO( ( struct Symbol_ * ) );
-extern SC_EXPRESS_EXPORT void     ENTITYinitialize PROTO( ( void ) );
-extern SC_EXPRESS_EXPORT void     ENTITYadd_attribute PROTO( ( struct Scope_ *, struct Variable_ * ) );
-extern SC_EXPRESS_EXPORT struct Scope_  * ENTITYcopy PROTO( ( struct Scope_ * ) );
-extern SC_EXPRESS_EXPORT Entity       ENTITYfind_inherited_entity PROTO( ( struct Scope_ *, char *, int ) );
-extern SC_EXPRESS_EXPORT Variable     ENTITYfind_inherited_attribute PROTO( ( struct Scope_ *, char *, struct Symbol_ ** ) );
-extern SC_EXPRESS_EXPORT Variable     ENTITYresolve_attr_ref PROTO( ( Entity, Symbol *, Symbol * ) );
-extern SC_EXPRESS_EXPORT bool      ENTITYhas_immediate_supertype PROTO( ( Entity, Entity ) );
-extern SC_EXPRESS_EXPORT Variable     ENTITYget_named_attribute PROTO( ( Entity, char * ) );
-extern SC_EXPRESS_EXPORT Linked_List  ENTITYget_all_attributes PROTO( ( Entity ) );
-extern SC_EXPRESS_EXPORT bool      ENTITYhas_supertype PROTO( ( Entity, Entity ) );
-extern SC_EXPRESS_EXPORT void     ENTITYadd_instance PROTO( ( Entity, Generic ) );
-extern SC_EXPRESS_EXPORT int      ENTITYget_initial_offset PROTO( ( Entity ) );
-extern SC_EXPRESS_EXPORT int      ENTITYdeclares_variable PROTO( ( 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  */

include/express/error.h

@@ -28,10 +28,103 @@
  * prettied up interface to print_objects_when_running
  */
 
-#include <sc_export.h>
-#include "basic.h"  /* get basic definitions */
 #include <setjmp.h>
 
+#include "sc_export.h"
+#include "basic.h"  /* get basic definitions */
+
+/*****************/
+/* packages used */
+/*****************/
+
+#include "alloc.h"
+#include "symbol.h"
+
+enum ErrorCode {
+    /* dict.c */
+    DUPLICATE_DECL = 1,
+    DUPLICATE_DECL_DIFF_FILE,
+    /* error.c */
+    SUBORDINATE_FAILED,
+    SYNTAX_EXPECTING,
+    /* expr.c */
+    INTEGER_EXPRESSION_EXPECTED,
+    INTERNAL_UNRECOGNISED_OP_IN_EXPRESOLVE,
+    ATTRIBUTE_REF_ON_AGGREGATE,
+    ATTRIBUTE_REF_FROM_NON_ENTITY,
+    INDEXING_ILLEGAL,
+    WARN_INDEXING_MIXED,
+    ENUM_NO_SUCH_ITEM,
+    GROUP_REF_NO_SUCH_ENTITY,
+    GROUP_REF_UNEXPECTED_TYPE,
+    IMPLICIT_DOWNCAST,
+    AMBIG_IMPLICIT_DOWNCAST,
+    /* express.c */
+    BAIL_OUT,
+    SYNTAX,
+    REF_NONEXISTENT,
+    TILDE_EXPANSION_FAILED,
+    SCHEMA_NOT_IN_OWN_SCHEMA_FILE,
+    UNLABELLED_PARAM_TYPE,
+    FILE_UNREADABLE,
+    FILE_UNWRITABLE,
+    WARN_UNSUPPORTED_LANG_FEAT,
+    WARN_SMALL_REAL,
+    /* lexact.c */
+    INCLUDE_FILE,
+    UNMATCHED_CLOSE_COMMENT,
+    UNMATCHED_OPEN_COMMENT,
+    UNTERMINATED_STRING,
+    ENCODED_STRING_BAD_DIGIT,
+    ENCODED_STRING_BAD_COUNT,
+    BAD_IDENTIFIER,
+    UNEXPECTED_CHARACTER,
+    NONASCII_CHAR,
+    /* linklist.c */
+    EMPTY_LIST,
+    /* resolve.c */
+    UNDEFINED,
+    UNDEFINED_ATTR,
+    UNDEFINED_TYPE,
+    UNDEFINED_SCHEMA,
+    UNKNOWN_ATTR_IN_ENTITY,
+    UNKNOWN_SUBTYPE,
+    UNKNOWN_SUPERTYPE,
+    CIRCULAR_REFERENCE,
+    SUBSUPER_LOOP,
+    SUBSUPER_CONTINUATION,
+    SELECT_LOOP,
+    SELECT_CONTINUATION,
+    SUPERTYPE_RESOLVE,
+    SUBTYPE_RESOLVE,
+    NOT_A_TYPE,
+    FUNCALL_NOT_A_FUNCTION,
+    UNDEFINED_FUNC,
+    EXPECTED_PROC,
+    NO_SUCH_PROCEDURE,
+    WRONG_ARG_COUNT,
+    QUERY_REQUIRES_AGGREGATE,
+    SELF_IS_UNKNOWN,
+    INVERSE_BAD_ENTITY,
+    INVERSE_BAD_ATTR,
+    MISSING_SUPERTYPE,
+    TYPE_IS_ENTITY,
+    AMBIGUOUS_ATTR,
+    AMBIGUOUS_GROUP,
+    OVERLOADED_ATTR,
+    REDECL_NO_SUCH_ATTR,
+    REDECL_NO_SUCH_SUPERTYPE,
+    MISSING_SELF,
+    FN_SKIP_BRANCH,
+    CASE_SKIP_LABEL,
+    UNIQUE_QUAL_REDECL,
+    /* type.c */
+    CORRUPTED_TYPE,
+    UNDEFINED_TAG,
+    /* exppp.c */
+    SELECT_EMPTY,
+};
+
 /*************/
 /* constants */
 /*************/
@@ -39,40 +132,30 @@
 #define ERROR_none      (Error)NULL
 #define ERROR_MAX       100
 
-/*****************/
-/* packages used */
-/*****************/
-
-#include "memory.h"
-#include "symbol.h"
-
 /************/
 /* typedefs */
 /************/
 
-typedef enum {
-    SEVERITY_WARNING    = 0,
-    SEVERITY_ERROR  = 1,
-    SEVERITY_EXIT   = 2,
-    SEVERITY_DUMP   = 3,
-    SEVERITY_MAX    = 4
-} Severity;
+enum Severity {
+    SEVERITY_WARNING = 0,
+    SEVERITY_ERROR,
+    SEVERITY_EXIT,
+    SEVERITY_DUMP,
+    SEVERITY_MAX
+};
 
 /***************************/
 /* hidden type definitions */
 /***************************/
 
-typedef struct Error_ {
-    bool enabled;
-    Severity    severity;
-    char  * message;
-    int serial; /* used to give each type of error a unique identifier */
-} * Error;
+struct Error_ {
+    enum Severity severity;
+    const char *message;
+    const char *name;
+    bool override;
+};
 
-typedef struct Error_Warning_ {
-    char  * name;
-    struct Linked_List_ * errors;
-} * Error_Warning;
+typedef struct Error_ *Error;
 
 /****************/
 /* modules used */
@@ -89,10 +172,6 @@ extern SC_EXPRESS_EXPORT const char * current_filename;
 extern SC_EXPRESS_EXPORT bool ERRORoccurred;
 
 
-extern SC_EXPRESS_EXPORT Error experrc;
-extern SC_EXPRESS_EXPORT Error ERROR_subordinate_failed;
-extern SC_EXPRESS_EXPORT Error ERROR_syntax_expecting;
-
 /* all of these are 1 if true, 0 if false switches */
 /* for debugging fedex */
 extern SC_EXPRESS_EXPORT int ERRORdebugging;
@@ -101,52 +180,16 @@ extern SC_EXPRESS_EXPORT int malloc_debug_resolve;
 /* for debugging yacc/lex */
 extern SC_EXPRESS_EXPORT int debug;
 
-extern SC_EXPRESS_EXPORT struct Linked_List_ * ERRORwarnings;
-extern SC_EXPRESS_EXPORT struct freelist_head ERROR_OPT_fl;
-
 extern SC_EXPRESS_EXPORT void ( *ERRORusage_function )( void );
 
-/******************************/
-/* macro function definitions */
-/******************************/
-
-#define ERROR_OPT_new() (struct Error_Warning_ *)MEM_new(&ERROR_OPT_fl)
-#define ERROR_OPT_destroy(x)    MEM_destroy(&ERROR_OPT_fl,(Freelist *)(Generic)x)
-
 /***********************/
 /* function prototypes */
 /***********************/
 
-#if defined(__MSVC__) || defined(__BORLAND__)
-extern SC_EXPRESS_EXPORT void ERROR_start_message_buffer PROTO( ( void ) );
-extern SC_EXPRESS_EXPORT void ERROR_flush_message_buffer PROTO( ( void ) );
-#endif
+extern SC_EXPRESS_EXPORT void ERROR_start_message_buffer( void );
+extern SC_EXPRESS_EXPORT void ERROR_flush_message_buffer( void );
 
-/********************/
-/* Inline functions */
-/********************/
-
-static_inline void ERRORdisable( Error error ) {
-    if( error != ERROR_none ) {
-        error->enabled = false;
-    }
-}
-
-static_inline void ERRORenable( Error error ) {
-    if( error != ERROR_none ) {
-        error->enabled = true;
-    }
-}
-
-static_inline bool ERRORis_enabled( Error error ) {
-    return error->enabled;
-}
-
-static_inline void ERRORbuffer_messages( bool flag ) {
-#if !defined(__MSVC__) && !defined(__BORLAND__)
-    extern void ERROR_start_message_buffer( void ),
-           ERROR_flush_message_buffer( void );
-#endif
+static inline void ERRORbuffer_messages( bool flag ) {
     __ERROR_buffer_errors = flag;
     if( __ERROR_buffer_errors ) {
         ERROR_start_message_buffer();
@@ -155,44 +198,34 @@ static_inline void ERRORbuffer_messages( bool flag ) {
     }
 }
 
-static_inline void ERRORflush_messages( void ) {
-#if !defined(__MSVC__) && !defined(__BORLAND__)
-    extern void ERROR_start_message_buffer( void ),
-           ERROR_flush_message_buffer( void );
-#endif
-
+static inline void ERRORflush_messages( void ) {
     if( __ERROR_buffer_errors ) {
         ERROR_flush_message_buffer();
         ERROR_start_message_buffer();
     }
 }
 
+
 /***********************/
 /* function prototypes */
 /***********************/
 
-extern SC_EXPRESS_EXPORT void ERRORinitialize PROTO( ( void ) );
-extern SC_EXPRESS_EXPORT void ERRORinitialize_after_LIST PROTO( ( void ) );
-extern SC_EXPRESS_EXPORT void ERRORcleanup PROTO( ( void ) );
-extern SC_EXPRESS_EXPORT void ERRORnospace PROTO( ( void ) );
-extern SC_EXPRESS_EXPORT void ERRORabort PROTO( ( int ) );
-extern SC_EXPRESS_EXPORT Error    ERRORcreate PROTO( ( char *, Severity ) );
-extern SC_EXPRESS_EXPORT void ERRORreport PROTO( ( Error, ... ) );
-extern SC_EXPRESS_EXPORT void ERRORdestroy PROTO( ( Error ) );
+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 PROTO( ( Error, struct Symbol_ *, ... ) );
-extern SC_EXPRESS_EXPORT void ERRORreport_with_line PROTO( ( Error, int, ... ) );
+extern SC_EXPRESS_EXPORT void ERRORreport_with_symbol( enum ErrorCode, struct Symbol_ *, ... );
+extern SC_EXPRESS_EXPORT void ERRORreport_with_line( enum ErrorCode, int, ... );
 
-#if !defined(__MSVC__) && !defined(__BORLAND__)
-extern SC_EXPRESS_EXPORT void ERROR_start_message_buffer PROTO( ( void ) );
-extern SC_EXPRESS_EXPORT void ERROR_flush_message_buffer PROTO( ( void ) );
-#endif
+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 ERRORcreate_warning PROTO( ( char *, Error ) );
-extern SC_EXPRESS_EXPORT void ERRORset_warning PROTO( ( char *, int ) );
-extern SC_EXPRESS_EXPORT void ERRORset_all_warnings PROTO( ( int ) );
-extern SC_EXPRESS_EXPORT void ERRORsafe PROTO( ( jmp_buf env ) );
-extern SC_EXPRESS_EXPORT void ERRORunsafe PROTO( ( void ) );
+extern SC_EXPRESS_EXPORT char * ERRORget_warnings_help(const char* prefix, const char *eol);
+extern SC_EXPRESS_EXPORT bool ERRORis_enabled(enum ErrorCode errnum);
 
 #endif /* ERROR_H */

include/express/expbasic.h

@@ -46,11 +46,7 @@ typedef enum { Lfalse, Lunknown, Ltrue } Logical;
 /* typedef ... Binary; done below because String not defined yet */
 
 #ifndef _CLIENTDATA
-#   ifdef __STDC__
 typedef void * ClientData;
-#   else
-typedef int * ClientData;
-#   endif /* __STDC__ */
 #define _CLIENTDATA
 #endif
 
@@ -58,7 +54,7 @@ typedef int * ClientData;
 /* packages used throughout */
 /****************************/
 
-#include "memory.h"
+#include "alloc.h"
 
 typedef struct Scope_ * Type;
 typedef struct Scope_ * Scope;

include/express/expr.h

@@ -178,7 +178,7 @@ struct Expression_ {
 /** indexed by the op enumeration values */
 struct EXPop_entry {
     char * token;       /**< literal token, e.g., "<>" */
-    Type( *resolve ) PROTO( ( Expression, struct Scope_ * ) );
+    Type( *resolve )( Expression, struct Scope_ * );
 };
 
 /********************/
@@ -193,11 +193,6 @@ extern SC_EXPRESS_EXPORT Expression  LITERAL_PI;
 extern SC_EXPRESS_EXPORT Expression  LITERAL_ZERO;
 extern SC_EXPRESS_EXPORT Expression  LITERAL_ONE;
 
-extern SC_EXPRESS_EXPORT Error ERROR_bad_qualification;
-extern SC_EXPRESS_EXPORT Error ERROR_integer_expression_expected;
-extern SC_EXPRESS_EXPORT Error ERROR_implicit_downcast;
-extern SC_EXPRESS_EXPORT Error ERROR_ambig_implicit_downcast;
-
 extern SC_EXPRESS_EXPORT struct freelist_head EXP_fl;
 extern SC_EXPRESS_EXPORT struct freelist_head OP_fl;
 extern SC_EXPRESS_EXPORT struct freelist_head QUERY_fl;
@@ -207,14 +202,14 @@ extern SC_EXPRESS_EXPORT struct freelist_head QUAL_ATTR_fl;
 /* macro function definitions */
 /******************************/
 
-#define EXP_new()   (struct Expression_ *)MEM_new(&EXP_fl)
-#define EXP_destroy(x)  MEM_destroy(&EXP_fl,(Freelist *)(Generic)x)
-#define OP_new()    (struct Op_Subexpression *)MEM_new(&OP_fl)
-#define OP_destroy(x)   MEM_destroy(&OP_fl,(Freelist *)(Generic)x)
-#define QUERY_new() (struct Query_ *)MEM_new(&QUERY_fl)
-#define QUERY_destroy(x) MEM_destroy(&QUERY_fl,(Freelist *)(Generic)x)
-#define QUAL_ATTR_new() (struct Qualified_Attr *)MEM_new(&QUAL_ATTR_fl)
-#define QUAL_ATTR_destroy(x) MEM_destroy(&QUAL_ATTR_fl,(Freelist *)(Generic)x)
+#define EXP_new()   (struct Expression_ *)ALLOC_new(&EXP_fl)
+#define EXP_destroy(x)  ALLOC_destroy(&EXP_fl,(Freelist *)x)
+#define OP_new()    (struct Op_Subexpression *)ALLOC_new(&OP_fl)
+#define OP_destroy(x)   ALLOC_destroy(&OP_fl,(Freelist *)x)
+#define QUERY_new() (struct Query_ *)ALLOC_new(&QUERY_fl)
+#define QUERY_destroy(x) ALLOC_destroy(&QUERY_fl,(Freelist *)x)
+#define QUAL_ATTR_new() (struct Qualified_Attr *)ALLOC_new(&QUAL_ATTR_fl)
+#define QUAL_ATTR_destroy(x) ALLOC_destroy(&QUAL_ATTR_fl,(Freelist *)x)
 
 #define EXPget_name(e)          ((e)->symbol.name)
 #define ENUMget_name(e)         ((e)->symbol.name)
@@ -254,16 +249,18 @@ extern SC_EXPRESS_EXPORT struct freelist_head QUAL_ATTR_fl;
 /* function prototypes */
 /***********************/
 
-extern SC_EXPRESS_EXPORT Expression   EXPcreate PROTO( ( Type ) );
-extern SC_EXPRESS_EXPORT Expression   EXPcreate_simple PROTO( ( Type ) );
-extern SC_EXPRESS_EXPORT Expression   EXPcreate_from_symbol PROTO( ( Type, Symbol * ) );
-extern SC_EXPRESS_EXPORT Expression   UN_EXPcreate PROTO( ( Op_Code, Expression ) );
-extern SC_EXPRESS_EXPORT Expression   BIN_EXPcreate PROTO( ( Op_Code, Expression, Expression ) );
-extern SC_EXPRESS_EXPORT Expression   TERN_EXPcreate PROTO( ( Op_Code, Expression, Expression, Expression ) );
-extern SC_EXPRESS_EXPORT Expression   QUERYcreate PROTO( ( Symbol *, Expression ) );
-extern SC_EXPRESS_EXPORT void     EXPinitialize PROTO( ( void ) );
-extern SC_EXPRESS_EXPORT void     EXPcleanup PROTO( ( void ) );
-extern SC_EXPRESS_EXPORT Type     EXPtype PROTO( ( Expression, struct Scope_ * ) );
-extern SC_EXPRESS_EXPORT int      EXPget_integer_value PROTO( ( 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 );
 
 #endif /*EXPRESSION_H*/

include/express/express.h

@@ -92,26 +92,18 @@ 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 ) PROTO( ( int, char ** ) );
-extern SC_EXPRESS_EXPORT void ( *EXPRESSinit_parse ) PROTO( ( void ) );
-extern SC_EXPRESS_EXPORT int ( *EXPRESSfail ) PROTO( ( Express ) );
-extern SC_EXPRESS_EXPORT int ( *EXPRESSsucceed ) PROTO( ( Express ) );
-extern SC_EXPRESS_EXPORT void ( *EXPRESSbackend ) PROTO( ( Express ) );
+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 ) PROTO( ( 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 Error ERROR_bail_out;
-extern SC_EXPRESS_EXPORT Error ERROR_syntax;
-extern SC_EXPRESS_EXPORT Error ERROR_unlabelled_param_type;
-extern SC_EXPRESS_EXPORT Error ERROR_file_unreadable;
-extern SC_EXPRESS_EXPORT Error ERROR_file_unwriteable;
-extern SC_EXPRESS_EXPORT Error ERROR_warn_unsupported_lang_feat;
-extern SC_EXPRESS_EXPORT Error ERROR_warn_small_real;
-
 extern SC_EXPRESS_EXPORT struct Scope_ * FUNC_NVL;
 extern SC_EXPRESS_EXPORT struct Scope_ * FUNC_USEDIN;
 
@@ -128,15 +120,15 @@ extern SC_EXPRESS_EXPORT struct Scope_ * FUNC_USEDIN;
 /* function prototypes */
 /***********************/
 
-extern SC_EXPRESS_EXPORT Express  EXPRESScreate     PROTO( ( void ) );
-extern SC_EXPRESS_EXPORT void     EXPRESSdestroy    PROTO( ( Express ) );
-extern SC_EXPRESS_EXPORT void     EXPRESSparse      PROTO( ( Express, FILE *, char * ) );
-extern SC_EXPRESS_EXPORT void     EXPRESSinitialize PROTO( ( void ) );
-extern SC_EXPRESS_EXPORT void     EXPRESScleanup    PROTO( ( void ) );
-extern SC_EXPRESS_EXPORT void     EXPRESSresolve    PROTO( ( 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  PROTO( ( void ) );
+extern                   void     EXPRESSinit_init( void );
 extern SC_EXPRESS_EXPORT void     build_complex( Express );
 
 #endif /*EXPRESS_H*/

include/express/factory.h

@@ -0,0 +1,8 @@
+#ifndef __FACTORY_H_
+#define __FACTORY_H_
+
+#include "sc_export.h"
+
+SC_EXPRESS_EXPORT void FACTORYinitialize();
+
+#endif /* __FACTORY_H_ */

include/express/hash.h

@@ -101,7 +101,7 @@
 /*****************/
 
 #include <sc_export.h>
-#include "memory.h"
+#include "alloc.h"
 
 /************/
 /* typedefs */
@@ -183,23 +183,22 @@ This change only seems to have affected hash.h and hash.c
 #define DIV(x,y)        ((x) >> (y))
 #define MOD(x,y)        ((x) & ((y)-1))
 
-#define HASH_Table_new()    (struct Hash_Table_ *)MEM_new(&HASH_Table_fl)
-#define HASH_Table_destroy(x)   MEM_destroy(&HASH_Table_fl,(Freelist *)(Generic)x)
-#define HASH_Element_new()  (struct Element_ *)MEM_new(&HASH_Element_fl)
-#define HASH_Element_destroy(x) MEM_destroy(&HASH_Element_fl,(Freelist *)(char *)x)
-
+#define HASH_Table_new()    (struct Hash_Table_ *)ALLOC_new(&HASH_Table_fl)
+#define HASH_Table_destroy(x)   ALLOC_destroy(&HASH_Table_fl,(Freelist *)x)
+#define HASH_Element_new()  (struct Element_ *)ALLOC_new(&HASH_Element_fl)
+#define HASH_Element_destroy(x) ALLOC_destroy(&HASH_Element_fl,(Freelist *)(char *)x)
 
 /***********************/
 /* function prototypes */
 /***********************/
 
-extern SC_EXPRESS_EXPORT void HASHinitialize PROTO( ( void ) );
-extern SC_EXPRESS_EXPORT Hash_Table   HASHcreate PROTO( ( unsigned ) );
-extern SC_EXPRESS_EXPORT Hash_Table   HASHcopy PROTO( ( Hash_Table ) );
-extern SC_EXPRESS_EXPORT void HASHdestroy PROTO( ( Hash_Table ) );
-extern SC_EXPRESS_EXPORT Element  HASHsearch PROTO( ( Hash_Table, Element, Action ) );
-extern SC_EXPRESS_EXPORT void HASHlistinit PROTO( ( Hash_Table, HashEntry * ) );
-extern SC_EXPRESS_EXPORT void HASHlistinit_by_type PROTO( ( Hash_Table, HashEntry *, char ) );
-extern SC_EXPRESS_EXPORT Element  HASHlist PROTO( ( 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*/

include/express/lexact.h

@@ -72,16 +72,6 @@ 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 Error        ERROR_include_file;
-extern SC_EXPRESS_EXPORT Error        ERROR_unmatched_close_comment;
-extern SC_EXPRESS_EXPORT Error        ERROR_unmatched_open_comment;
-extern SC_EXPRESS_EXPORT Error        ERROR_unterminated_string;
-extern SC_EXPRESS_EXPORT Error        ERROR_encoded_string_bad_digit;
-extern SC_EXPRESS_EXPORT Error        ERROR_encoded_string_bad_count;
-extern SC_EXPRESS_EXPORT Error        ERROR_bad_identifier;
-extern SC_EXPRESS_EXPORT Error        ERROR_unexpected_character;
-extern SC_EXPRESS_EXPORT Error        ERROR_nonascii_char;
-
 /******************************/
 /* macro function definitions */
 /******************************/
@@ -95,26 +85,30 @@ extern SC_EXPRESS_EXPORT Error        ERROR_nonascii_char;
 # define SCANtext_ready (*SCANcurrent != '\0')
 #endif
 
+#ifndef static_inline
+# define static_inline static inline
+#endif
+
 /***********************/
 /* function prototypes */
 /***********************/
 
-extern SC_EXPRESS_EXPORT void SCANinitialize PROTO( ( void ) );
+extern SC_EXPRESS_EXPORT void SCANinitialize( void );
 extern SC_EXPRESS_EXPORT void SCANcleanup( void );
-extern SC_EXPRESS_EXPORT int  SCANprocess_real_literal PROTO( ( const char * ) );
-extern SC_EXPRESS_EXPORT int  SCANprocess_integer_literal PROTO( ( const char * ) );
-extern SC_EXPRESS_EXPORT int  SCANprocess_binary_literal PROTO( ( const char * ) );
-extern SC_EXPRESS_EXPORT int  SCANprocess_logical_literal PROTO( ( char * ) );
-extern SC_EXPRESS_EXPORT int  SCANprocess_identifier_or_keyword PROTO( ( const char * ) );
-extern SC_EXPRESS_EXPORT int  SCANprocess_string PROTO( ( const char * ) );
-extern SC_EXPRESS_EXPORT int  SCANprocess_encoded_string PROTO( ( const char * ) );
-extern SC_EXPRESS_EXPORT int  SCANprocess_semicolon PROTO( ( const char *, int ) );
-extern SC_EXPRESS_EXPORT void SCANsave_comment PROTO( ( const char * ) );
-extern SC_EXPRESS_EXPORT bool SCANread PROTO( ( void ) );
-extern SC_EXPRESS_EXPORT void SCANinclude_file PROTO( ( char * ) );
-       SC_EXPRESS_EXPORT void SCANlowerize PROTO( ( char * ) );
-       SC_EXPRESS_EXPORT void SCANupperize PROTO( ( char * ) );
-extern SC_EXPRESS_EXPORT char  *  SCANstrdup PROTO( ( const char * ) );
-extern SC_EXPRESS_EXPORT long SCANtell PROTO( ( 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 */

include/express/linklist.h

@@ -38,7 +38,7 @@
 
 #include <sc_export.h>
 #include "basic.h"
-#include "memory.h"
+#include "alloc.h"
 
 /************/
 /* typedefs */
@@ -59,7 +59,7 @@ typedef struct Linked_List_ * Linked_List;
 typedef struct Link_ {
     struct Link_  * next;
     struct Link_  * prev;
-    Generic     data;
+    void *data;
 } * Link;
 
 struct Linked_List_ {
@@ -70,7 +70,6 @@ struct Linked_List_ {
 /* global variables */
 /********************/
 
-extern SC_EXPRESS_EXPORT Error ERROR_empty_list;
 extern SC_EXPRESS_EXPORT struct freelist_head LINK_fl;
 extern SC_EXPRESS_EXPORT struct freelist_head LIST_fl;
 
@@ -78,10 +77,10 @@ extern SC_EXPRESS_EXPORT struct freelist_head LIST_fl;
 /* macro function definitions */
 /******************************/
 
-#define LINK_new()  (struct Link_ *)MEM_new(&LINK_fl)
-#define LINK_destroy(x) MEM_destroy(&LINK_fl,(Freelist *)(Generic)x)
-#define LIST_new()  (struct Linked_List_ *)MEM_new(&LIST_fl)
-#define LIST_destroy(x) MEM_destroy(&LIST_fl,(Freelist *)(Generic)x)
+#define LINK_new()  (struct Link_ *)ALLOC_new(&LINK_fl)
+#define LINK_destroy(x) ALLOC_destroy(&LINK_fl,(Freelist *)x)
+#define LIST_new()  (struct Linked_List_ *)ALLOC_new(&LIST_fl)
+#define LIST_destroy(x) ALLOC_destroy(&LIST_fl,(Freelist *)x)
 
 /** accessing links */
 #define LINKdata(link)  (link)->data
@@ -125,22 +124,22 @@ extern SC_EXPRESS_EXPORT struct freelist_head LIST_fl;
 /* function prototypes */
 /***********************/
 
-extern SC_EXPRESS_EXPORT void LISTinitialize PROTO( ( void ) );
-extern SC_EXPRESS_EXPORT void LISTcleanup PROTO( ( void ) );
-extern SC_EXPRESS_EXPORT Linked_List LISTcreate PROTO( ( void ) );
-extern SC_EXPRESS_EXPORT Linked_List LISTcopy PROTO( ( Linked_List ) );
-extern SC_EXPRESS_EXPORT void LISTsort PROTO( ( Linked_List, int (*comp)(void*, void*) ) );
-extern SC_EXPRESS_EXPORT void LISTswap PROTO( ( Link, Link ) );
-extern SC_EXPRESS_EXPORT Generic  LISTadd_first PROTO( ( Linked_List, Generic ) );
-extern SC_EXPRESS_EXPORT Generic  LISTadd_last PROTO( ( Linked_List, Generic ) );
-extern SC_EXPRESS_EXPORT Generic  LISTadd_after PROTO( ( Linked_List, Link, Generic ) );
-extern SC_EXPRESS_EXPORT Generic  LISTadd_before PROTO( ( Linked_List, Link, Generic ) );
-extern SC_EXPRESS_EXPORT Generic  LISTremove_first PROTO( ( Linked_List ) );
-extern SC_EXPRESS_EXPORT Generic  LISTget_first PROTO( ( Linked_List ) );
-extern SC_EXPRESS_EXPORT Generic  LISTget_second PROTO( ( Linked_List ) );
-extern SC_EXPRESS_EXPORT Generic  LISTget_nth PROTO( ( Linked_List, int ) );
-extern SC_EXPRESS_EXPORT void LISTfree PROTO( ( Linked_List ) );
-extern SC_EXPRESS_EXPORT int  LISTget_length PROTO( ( Linked_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*/

include/express/memory.h

@@ -1,85 +1,8 @@
-#ifndef MEMORY_H
-#define MEMORY_H
+#ifndef __MEMORY_H
+#define __MEMORY_H
 
-/*
- * This work was supported by the United States Government, and is
- * not subject to copyright.
- *
- * $Log: memory.h,v $
- * Revision 1.5  1997/01/21 19:17:11  dar
- * made C++ compatible
- *
- * Revision 1.4  1993/10/15  18:49:23  libes
- * CADDETC certified
- *
- * Revision 1.3  1993/02/22  21:41:13  libes
- * ANSI compat
- *
- * Revision 1.2  1992/08/18  17:15:40  libes
- * rm'd extraneous error messages
- *
- * Revision 1.1  1992/05/28  03:56:02  libes
- * Initial revision
- */
-
-#include "basic.h"
-
-/*****************/
-/* packages used */
-/*****************/
-
-#include <sc_export.h>
-
-/** \file memory.h - defs for fixed size block memory allocator */
-
-typedef long Align;
-
-union freelist {
-    union freelist * next;  /**< next block on freelist */
-    char memory;        /**< user data */
-    Align aligner;      /**< force alignment of blocks */
-};
-
-typedef union freelist Freelist;
-
-struct freelist_head {
-    int size_elt;       /**< size of a single elt */
-#ifndef NOSTAT
-    int alloc;          /**< # of allocations */
-    int dealloc;
-    int create;         /**< number of calls to create a new freelist */
-    Generic max;        /**< end of freelist */
-#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;
-#ifdef SPACE_PROFILE
-    int count;
-#endif
-};
-
-char * nnew();
-
-#include "error.h"
-
-/***********************************************/
-/* space allocation macros with error package: */
-/***********************************************/
-
-extern SC_EXPRESS_EXPORT int yylineno;
-
-/** CALLOC grabs and initializes to all 0s space for the indicated
- * number of instances of the indicated type */
-#define CALLOC(ptr, num, type)                  \
-    if (((ptr) = (type*)calloc((num), (unsigned)sizeof(type)))==NULL) { \
-        fprintf(stderr,"fedex: out of space");\
-    } else {}
-
-SC_EXPRESS_EXPORT void    _MEMinitialize PROTO( ( void ) );
-SC_EXPRESS_EXPORT void    MEMinitialize PROTO( ( struct freelist_head * flh, unsigned int size, int alloc1, int alloc2 ) );
-SC_EXPRESS_EXPORT void    MEM_destroy PROTO( ( struct freelist_head *, Freelist * ) );
-SC_EXPRESS_EXPORT Generic MEM_new PROTO( ( struct freelist_head * ) );
-
-#endif /* MEMORY_H */
+#include "sc_export.h"
 
+SC_EXPRESS_EXPORT void MEMORYinitialize();
 
+#endif // __MEMORY_H

include/express/object.h

@@ -81,7 +81,7 @@ struct Object {
 /* global variables */
 /********************/
 
-extern SC_EXPRESS_EXPORT struct Object * OBJ;
+extern SC_EXPRESS_EXPORT struct Object OBJ[];
 
 /******************************/
 /* macro function definitions */
@@ -97,9 +97,4 @@ extern SC_EXPRESS_EXPORT struct Object * OBJ;
 /* function prototypes */
 /***********************/
 
-extern SC_EXPRESS_EXPORT void OBJinitialize PROTO( ( void ) );
-extern SC_EXPRESS_EXPORT void OBJcleanup PROTO( ( void ) );
-extern SC_EXPRESS_EXPORT void OBJcreate PROTO( ( char, struct Symbol_ * ( * )( Generic ), char *, int ) );
-extern SC_EXPRESS_EXPORT Symbol * UNK_get_symbol PROTO( ( Generic x ) );
-
 #endif /*OBJECT_H*/

include/express/resolve.h

@@ -47,19 +47,6 @@
 
 extern SC_EXPRESS_EXPORT int print_objects_while_running;
 
-extern SC_EXPRESS_EXPORT Error ERROR_undefined_attribute;
-extern SC_EXPRESS_EXPORT Error ERROR_undefined_type;
-extern SC_EXPRESS_EXPORT Error ERROR_undefined_schema;
-extern SC_EXPRESS_EXPORT Error ERROR_unknown_attr_in_entity;
-extern SC_EXPRESS_EXPORT Error ERROR_unknown_subtype;
-extern SC_EXPRESS_EXPORT Error ERROR_unknown_supertype;
-extern SC_EXPRESS_EXPORT Error ERROR_circular_reference;
-extern SC_EXPRESS_EXPORT Error ERROR_ambiguous_attribute;
-extern SC_EXPRESS_EXPORT Error ERROR_ambiguous_group;
-
-extern SC_EXPRESS_EXPORT Error WARNING_case_skip_label;
-extern SC_EXPRESS_EXPORT Error WARNING_fn_skip_branch;
-
 /* macros */
 
 /* cheaper doing the check here, then inside the function call.  Return */
@@ -73,14 +60,29 @@ extern SC_EXPRESS_EXPORT Error WARNING_fn_skip_branch;
 /* function prototypes */
 /***********************/
 
-extern SC_EXPRESS_EXPORT void RESOLVEinitialize PROTO( ( void ) );
-extern SC_EXPRESS_EXPORT void RESOLVEcleanup PROTO( ( void ) );
-extern SC_EXPRESS_EXPORT void SCOPEresolve_expressions_statements PROTO( ( Scope ) );
-extern SC_EXPRESS_EXPORT void SCOPEresolve_subsupers PROTO( ( Scope ) );
-extern SC_EXPRESS_EXPORT void SCOPEresolve_types PROTO( ( Scope ) );
-extern SC_EXPRESS_EXPORT void TYPE_resolve PROTO( ( Type * ) );
-extern SC_EXPRESS_EXPORT void EXP_resolve PROTO( ( Expression, Scope, Type ) );
-extern SC_EXPRESS_EXPORT void ALGresolve PROTO( ( Scope ) );
-extern SC_EXPRESS_EXPORT void SCHEMAresolve PROTO( ( Scope ) );
+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 * );
 
 #endif /*RESOLVE_H*/

include/express/schema.h

@@ -76,7 +76,7 @@ typedef struct Rename {
     Schema schema;
     struct Symbol_ * old;
     struct Symbol_ * nnew;
-    Generic object;     /**< once object has been looked up */
+    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 */
     enum rename_type rename_type;
@@ -88,7 +88,7 @@ struct Schema_ {
     Linked_List reflist;
     Linked_List uselist;
     /** \var refdict, usedict
-     * dictionarys into which are entered renames for each specific
+     * dictionaries into which are entered renames for each specific
      * object specified in a rename clause (even if it uses the same
      * name */
     Dictionary refdict;
@@ -117,12 +117,12 @@ extern SC_EXPRESS_EXPORT int __SCOPE_search_id;
 #define SCHEMAget_name(schema)      SCOPEget_name(schema)
 #define SCHEMAget_symbol(schema)    SCOPEget_symbol(schema)
 
-#define REN_new()   (struct Rename *)MEM_new(&REN_fl)
-#define REN_destroy(x)  MEM_destroy(&REN_fl,(Freelist *)(Generic)x)
-#define SCOPE_new() (struct Scope_ *)MEM_new(&SCOPE_fl)
-#define SCOPE_destroy(x)    MEM_destroy(&SCOPE_fl,(Freelist *)(Generic)x)
-#define SCHEMA_new()    (struct Schema_ *)MEM_new(&SCHEMA_fl)
-#define SCHEMA_destroy(x)   MEM_destroy(&SCHEMA_fl,(Freelist *)(Generic)x)
+#define REN_new()   (struct Rename *)ALLOC_new(&REN_fl)
+#define REN_destroy(x)  ALLOC_destroy(&REN_fl,(Freelist *)x)
+#define SCOPE_new() (struct Scope_ *)ALLOC_new(&SCOPE_fl)
+#define SCOPE_destroy(x)    ALLOC_destroy(&SCOPE_fl,(Freelist *)x)
+#define SCHEMA_new()    (struct Schema_ *)ALLOC_new(&SCHEMA_fl)
+#define SCHEMA_destroy(x)   ALLOC_destroy(&SCHEMA_fl,(Freelist *)x)
 
 /* the following is simply to make the resulting code easier to read */
 /* otherwise, you'd see "entity->superscope" even when you KNOW */
@@ -133,20 +133,22 @@ extern SC_EXPRESS_EXPORT int __SCOPE_search_id;
 /* function prototypes */
 /***********************/
 
-extern SC_EXPRESS_EXPORT Variable VARfind PROTO( ( Scope, char *, int ) );
-extern SC_EXPRESS_EXPORT Schema   SCHEMAcreate PROTO( ( void ) );
-extern SC_EXPRESS_EXPORT void     SCHEMAinitialize PROTO( ( void ) );
-extern SC_EXPRESS_EXPORT void     SCHEMAadd_use PROTO( ( Schema, Symbol *, Symbol *, Symbol * ) );
-extern SC_EXPRESS_EXPORT void     SCHEMAadd_reference PROTO( ( Schema, Symbol *, Symbol *, Symbol * ) );
-extern SC_EXPRESS_EXPORT void     SCHEMAdefine_use PROTO( ( Schema, Rename * ) );
-extern SC_EXPRESS_EXPORT void     SCHEMAdefine_reference PROTO( ( Schema, Rename * ) );
-extern SC_EXPRESS_EXPORT Generic  SCHEMAfind PROTO( ( Schema, char * name, int search_refs ) );
-extern SC_EXPRESS_EXPORT Scope    SCOPEcreate PROTO( ( char ) );
-extern SC_EXPRESS_EXPORT Scope    SCOPEcreate_tiny PROTO( ( char ) );
-extern SC_EXPRESS_EXPORT Scope    SCOPEcreate_nostab PROTO( ( char ) );
-extern SC_EXPRESS_EXPORT void     SCOPEdestroy PROTO( ( Scope ) );
-extern SC_EXPRESS_EXPORT Linked_List SCHEMAget_entities_use PROTO( ( Scope ) );
-extern SC_EXPRESS_EXPORT Linked_List SCHEMAget_entities_ref PROTO( ( 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 );
 
 #endif /*  SCHEMA_H */
 

include/express/scope.h

@@ -134,14 +134,16 @@ struct Scope_ {
 /* function prototypes */
 /***********************/
 
-extern SC_EXPRESS_EXPORT struct Symbol_ * SCOPE_get_symbol PROTO( ( Generic ) );
-extern SC_EXPRESS_EXPORT void     SCOPE_get_entities PROTO( ( Scope, Linked_List ) );
-extern SC_EXPRESS_EXPORT Linked_List  SCOPEget_entities PROTO( ( Scope ) );
-extern SC_EXPRESS_EXPORT Linked_List  SCOPEget_entities_superclass_order PROTO( ( Scope ) );
-extern SC_EXPRESS_EXPORT Generic      SCOPEfind PROTO( ( Scope, char *, int ) );
-extern SC_EXPRESS_EXPORT void     SCOPE_get_functions PROTO( ( Scope, Linked_List ) );
-extern SC_EXPRESS_EXPORT Linked_List  SCOPEget_functions PROTO( ( Scope ) );
-extern SC_EXPRESS_EXPORT void     SCOPE_get_rules PROTO( ( Scope, Linked_List ) );
-extern SC_EXPRESS_EXPORT Linked_List  SCOPEget_rules PROTO( ( 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 );
 
 #endif /* SCOPE_H */

include/express/stmt.h

@@ -27,7 +27,7 @@
  * CADDETC certified
  *
  * Revision 1.5  1993/02/16  03:27:02  libes
- * removed artifical begin/end nesting for improved reconstruction (printing)
+ * removed artificial begin/end nesting for improved reconstruction (printing)
  * of original Express file
  *
  * Revision 1.4  1992/08/18  17:12:41  libes
@@ -183,28 +183,28 @@ extern SC_EXPRESS_EXPORT Statement STATEMENT_SKIP;
 /* macro function definitions */
 /******************************/
 
-#define STMT_new()  (struct Statement_ *)MEM_new(&STMT_fl)
-#define STMT_destroy(x) MEM_destroy(&STMT_fl,(Freelist *)(Generic)x)
+#define STMT_new()  (struct Statement_ *)ALLOC_new(&STMT_fl)
+#define STMT_destroy(x) ALLOC_destroy(&STMT_fl,(Freelist *)x)
 
-#define ALIAS_new()     (struct Alias_ *)MEM_new(&ALIAS_fl)
-#define ALIAS_destroy(x)        MEM_destroy(&ALIAS_fl,(Freelist *)(Generic)x)
-#define ASSIGN_new()        (struct Assignment_ *)MEM_new(&ASSIGN_fl)
-#define ASSIGN_destroy(x)       MEM_destroy(&ASSIGN_fl,(Freelist *)(Generic)x)
-#define CASE_new()      (struct Case_Statement_ *)MEM_new(&CASE_fl)
-#define CASE_destroy(x)     MEM_destroy(&CASE_fl,(Freelist *)(Generic)x)
-#define COMP_STMT_new()     (struct Compound_Statement_ *)MEM_new(&COMP_STMT_fl)
-#define COMP_STMT_destroy(x)        MEM_destroy(&COMP_STMT_fl,(Freelist *)(Generic)x)
-#define COND_new()      (struct Conditional_ *)MEM_new(&COND_fl)
-#define COND_destroy(x)     MEM_destroy(&COND_fl,(Freelist *)(Generic)x)
-#define LOOP_new()      (struct Loop_ *)MEM_new(&LOOP_fl)
-#define LOOP_destroy(x)     MEM_destroy(&LOOP_fl,(Freelist *)(Generic)x)
-#define PCALL_new()     (struct Procedure_Call_ *)MEM_new(&PCALL_fl)
-#define PCALL_destroy(x)    MEM_destroy(&PCALL_fl,(Freelist *)(Generic)x)
-#define RET_new()       (struct Return_Statement_ *)MEM_new(&RET_fl)
-#define RET_destroy(x)      MEM_destroy(&RET_fl,(Freelist *)(Generic)x)
+#define ALIAS_new()     (struct Alias_ *)ALLOC_new(&ALIAS_fl)
+#define ALIAS_destroy(x)        ALLOC_destroy(&ALIAS_fl,(Freelist *)x)
+#define ASSIGN_new()        (struct Assignment_ *)ALLOC_new(&ASSIGN_fl)
+#define ASSIGN_destroy(x)       ALLOC_destroy(&ASSIGN_fl,(Freelist *)x)
+#define CASE_new()      (struct Case_Statement_ *)ALLOC_new(&CASE_fl)
+#define CASE_destroy(x)     ALLOC_destroy(&CASE_fl,(Freelist *)x)
+#define COMP_STMT_new()     (struct Compound_Statement_ *)ALLOC_new(&COMP_STMT_fl)
+#define COMP_STMT_destroy(x)        ALLOC_destroy(&COMP_STMT_fl,(Freelist *)x)
+#define COND_new()      (struct Conditional_ *)ALLOC_new(&COND_fl)
+#define COND_destroy(x)     ALLOC_destroy(&COND_fl,(Freelist *)x)
+#define LOOP_new()      (struct Loop_ *)ALLOC_new(&LOOP_fl)
+#define LOOP_destroy(x)     ALLOC_destroy(&LOOP_fl,(Freelist *)x)
+#define PCALL_new()     (struct Procedure_Call_ *)ALLOC_new(&PCALL_fl)
+#define PCALL_destroy(x)    ALLOC_destroy(&PCALL_fl,(Freelist *)x)
+#define RET_new()       (struct Return_Statement_ *)ALLOC_new(&RET_fl)
+#define RET_destroy(x)      ALLOC_destroy(&RET_fl,(Freelist *)x)
 
-#define INCR_new()      (struct Increment_ *)MEM_new(&INCR_fl)
-#define INCR_destroy(x)     MEM_destroy(&INCR_fl,(Freelist *)(char *)x)
+#define INCR_new()      (struct Increment_ *)ALLOC_new(&INCR_fl)
+#define INCR_destroy(x)     ALLOC_destroy(&INCR_fl,(Freelist *)(char *)x)
 
 #define ASSIGNget_lhs(s)    ((s)->u.assign->lhs)
 #define ASSIGNget_rhs(s)    ((s)->u.assign->rhs)
@@ -225,17 +225,17 @@ extern SC_EXPRESS_EXPORT Statement STATEMENT_SKIP;
 /* function prototypes */
 /***********************/
 
-extern SC_EXPRESS_EXPORT Statement    STMTcreate PROTO( ( int ) );
-extern SC_EXPRESS_EXPORT Statement    ALIAScreate PROTO( ( struct Scope_ *, Variable, Linked_List ) );
-extern SC_EXPRESS_EXPORT Statement    CASEcreate PROTO( ( Expression , Linked_List ) );
-extern SC_EXPRESS_EXPORT Statement    ASSIGNcreate PROTO( ( Expression , Expression ) );
-extern SC_EXPRESS_EXPORT Statement    COMP_STMTcreate PROTO( ( Linked_List ) );
-extern SC_EXPRESS_EXPORT Statement    CONDcreate PROTO( ( Expression, Linked_List, Linked_List ) );
-extern SC_EXPRESS_EXPORT Statement    LOOPcreate PROTO( ( struct Scope_ *, Expression, Expression, Linked_List ) );
-extern SC_EXPRESS_EXPORT Statement    PCALLcreate PROTO( ( Linked_List ) );
-extern SC_EXPRESS_EXPORT Statement    RETcreate PROTO( ( Expression ) );
-extern SC_EXPRESS_EXPORT void     STMTinitialize PROTO( ( void ) );
-extern SC_EXPRESS_EXPORT struct Scope_ * INCR_CTLcreate PROTO( ( 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*/

include/express/symbol.h

@@ -45,7 +45,7 @@
 
 #include <sc_export.h>
 #include "basic.h"  /* get basic definitions */
-#include "memory.h"
+#include "alloc.h"
 
 /************/
 /* typedefs */
@@ -78,8 +78,8 @@ extern SC_EXPRESS_EXPORT struct freelist_head SYMBOL_fl;
 /* macro function definitions */
 /******************************/
 
-#define SYMBOL_new()        (struct Symbol_ *)MEM_new(&SYMBOL_fl)
-#define SYMBOL_destroy(x)   MEM_destroy(&SYMBOL_fl,(Freelist *)(Generic)x)
+#define SYMBOL_new()        (struct Symbol_ *)ALLOC_new(&SYMBOL_fl)
+#define SYMBOL_destroy(x)   ALLOC_destroy(&SYMBOL_fl,(Freelist *)x)
 
 #define SYMBOLset(obj)      obj->symbol.line = yylineno; \
                 obj->symbol.filename = current_filename
@@ -88,7 +88,7 @@ extern SC_EXPRESS_EXPORT struct freelist_head SYMBOL_fl;
 /* function prototypes */
 /***********************/
 
-extern SC_EXPRESS_EXPORT void SYMBOLinitialize PROTO( ( void ) );
+extern SC_EXPRESS_EXPORT void SYMBOLinitialize( void );
 SC_EXPRESS_EXPORT Symbol * SYMBOLcreate( char * name, int line, const char * filename );
 
 #endif    /*  SYMBOL_H  */

include/express/type.h

@@ -217,16 +217,14 @@ extern SC_EXPRESS_EXPORT Type Type_Bag_Of_Generic;
 extern SC_EXPRESS_EXPORT struct freelist_head TYPEHEAD_fl;
 extern SC_EXPRESS_EXPORT struct freelist_head TYPEBODY_fl;
 
-extern SC_EXPRESS_EXPORT Error ERROR_corrupted_type;
-
 /******************************/
 /* macro function definitions */
 /******************************/
 
-#define TYPEHEAD_new()      (struct TypeHead_ *)MEM_new(&TYPEHEAD_fl)
-#define TYPEHEAD_destroy(x) MEM_destroy(&TYPEHEAD_fl,(Freelist *)(Generic)x)
-#define TYPEBODY_new()      (struct TypeBody_ *)MEM_new(&TYPEBODY_fl)
-#define TYPEBODY_destroy(x) MEM_destroy(&TYPEBODY_fl,(Freelist *)(Generic)x)
+#define TYPEHEAD_new()      (struct TypeHead_ *)ALLOC_new(&TYPEHEAD_fl)
+#define TYPEHEAD_destroy(x) ALLOC_destroy(&TYPEHEAD_fl,(Freelist *)x)
+#define TYPEBODY_new()      (struct TypeBody_ *)ALLOC_new(&TYPEBODY_fl)
+#define TYPEBODY_destroy(x) ALLOC_destroy(&TYPEBODY_fl,(Freelist *)x)
 
 #define TYPEis(t)       ((t)->u.type->body->type)
 #define TYPEis_identifier(t)    ((t)->u.type->body->type == identifier_)
@@ -293,20 +291,20 @@ extern SC_EXPRESS_EXPORT Error ERROR_corrupted_type;
 /* function prototypes */
 /***********************/
 
-extern SC_EXPRESS_EXPORT Type TYPEcreate_partial PROTO( ( struct Symbol_ *, Scope ) );
+extern SC_EXPRESS_EXPORT Type TYPEcreate_partial( struct Symbol_ *, Scope );
 
-extern SC_EXPRESS_EXPORT Type TYPEcreate PROTO( ( enum type_enum ) );
-extern SC_EXPRESS_EXPORT Type TYPEcreate_from_body_anonymously PROTO( ( TypeBody ) );
-extern SC_EXPRESS_EXPORT Type TYPEcreate_name PROTO( ( struct Symbol_ * ) );
-extern SC_EXPRESS_EXPORT Type TYPEcreate_nostab PROTO( ( struct Symbol_ *, Scope, char ) );
-extern SC_EXPRESS_EXPORT TypeBody TYPEBODYcreate PROTO( ( enum type_enum ) );
-extern SC_EXPRESS_EXPORT void TYPEinitialize PROTO( ( void ) );
-extern SC_EXPRESS_EXPORT void TYPEcleanup PROTO( ( 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 PROTO( ( Type, enum type_enum ) );
-extern SC_EXPRESS_EXPORT Type TYPEget_nonaggregate_base_type PROTO( ( 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 PROTO( ( Type, Scope, struct Symbol_ * ) );
-extern SC_EXPRESS_EXPORT Type TYPEcreate_user_defined_tag PROTO( ( 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  */

include/express/variable.h

@@ -105,8 +105,8 @@ extern SC_EXPRESS_EXPORT struct freelist_head VAR_fl;
 /* macro function definitions */
 /******************************/
 
-#define VAR_new()   (struct Variable_ *)MEM_new(&VAR_fl)
-#define VAR_destroy(x)  MEM_destroy(&VAR_fl,(Freelist *)(Generic)x)
+#define VAR_new()   (struct Variable_ *)ALLOC_new(&VAR_fl)
+#define VAR_destroy(x)  ALLOC_destroy(&VAR_fl,(Freelist *)x)
 
 #define VARget_name(v)          ((v)->name)
 #define VARput_name(v,n)        ((v)->name = (n))
@@ -125,8 +125,8 @@ extern SC_EXPRESS_EXPORT struct freelist_head VAR_fl;
 /* function prototypes */
 /***********************/
 
-extern SC_EXPRESS_EXPORT Variable VARcreate PROTO( ( Expression, Type ) );
-extern SC_EXPRESS_EXPORT void VARinitialize PROTO( ( void ) );
-extern SC_EXPRESS_EXPORT char * VARget_simple_name PROTO( ( 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  */

include/sc_cf.h.in

@@ -0,0 +1,32 @@
+#ifndef SCL_CF_H
+#define SCL_CF_H
+
+/**** Define statements for CMake ****/
+#cmakedefine SC_VERSION "@SC_VERSION@"
+#cmakedefine HAVE_NDIR_H 1
+#cmakedefine HAVE_STDINT_H 1
+#cmakedefine HAVE_SYS_STAT_H 1
+#cmakedefine HAVE_SYS_PARAM_H 1
+#cmakedefine HAVE_SYSENT_H 1
+#cmakedefine HAVE_UNISTD_H 1
+#cmakedefine HAVE_DIRENT_H 1
+#cmakedefine HAVE_STDBOOL_H 1
+#cmakedefine HAVE_PROCESS_H 1
+#cmakedefine HAVE_IO_H 1
+
+#cmakedefine SC_TRACE_FPRINTF 1
+#cmakedefine SC_MEMMGR_ENABLE_CHECKS 1
+
+#cmakedefine HAVE_ABS 1
+#cmakedefine HAVE_MEMCPY 1
+#cmakedefine HAVE_MEMMOVE 1
+#cmakedefine HAVE_GETOPT 1
+#cmakedefine HAVE_VSNPRINTF 1
+
+#cmakedefine HAVE_SSIZE_T 1
+
+#cmakedefine HAVE_STD_THREAD 1
+#cmakedefine HAVE_STD_CHRONO 1
+#cmakedefine HAVE_NULLPTR 1
+
+#endif /* SCL_CF_H */

include/sc_cf_cmake.h.in

@@ -3,7 +3,7 @@
 
 /**** Define statements for CMake ****/
 #cmakedefine HAVE_NDIR_H 1
-#cmakedefine HAVE_STDARG_H 1
+#cmakedefine HAVE_STDINT_H 1
 #cmakedefine HAVE_SYS_STAT_H 1
 #cmakedefine HAVE_SYS_PARAM_H 1
 #cmakedefine HAVE_SYSENT_H 1
@@ -20,11 +20,11 @@
 #cmakedefine HAVE_MEMCPY 1
 #cmakedefine HAVE_MEMMOVE 1
 #cmakedefine HAVE_GETOPT 1
+#cmakedefine HAVE_VSNPRINTF 1
 
 #cmakedefine HAVE_SSIZE_T 1
 
 #cmakedefine HAVE_STD_THREAD 1
 #cmakedefine HAVE_STD_CHRONO 1
-#cmakedefine HAVE_NULLPTR 1
 
 #endif /* SCL_CF_H */

include/sc_export.h

@@ -2,107 +2,91 @@
 #define SC_EXPORT_H
 
 /* Import/Export flags for base. */
-#ifndef SC_BASE_EXPORT
-# if defined(SC_BASE_DLL_EXPORTS) && defined(SC_BASE_DLL_IMPORTS)
-#  error "Only SC_BASE_DLL_EXPORTS or SC_BASE_DLL_IMPORTS can be defined, not both."
-# elif defined(SC_BASE_DLL_EXPORTS)
+#if !defined(SC_STATIC) && defined(_WIN32)
+# if defined(SC_BASE_DLL_EXPORTS)
 #  define SC_BASE_EXPORT __declspec(dllexport)
-# elif defined(SC_BASE_DLL_IMPORTS)
-#  define SC_BASE_EXPORT __declspec(dllimport)
 # else
-#  define SC_BASE_EXPORT
+#  define SC_BASE_EXPORT __declspec(dllimport)
 # endif
+#else
+#  define SC_BASE_EXPORT
 #endif
 
 /* Import/Export flags for express. */
-#ifndef SC_EXPRESS_EXPORT
-#  if defined(SC_EXPRESS_DLL_EXPORTS) && defined(SC_EXPRESS_DLL_IMPORTS)
-#    error "Only SC_EXPRESS_DLL_EXPORTS or SC_EXPRESS_DLL_IMPORTS can be defined, not both."
-#  elif defined(SC_EXPRESS_DLL_EXPORTS)
-#    define SC_EXPRESS_EXPORT __declspec(dllexport)
-#  elif defined(SC_EXPRESS_DLL_IMPORTS)
-#    define SC_EXPRESS_EXPORT __declspec(dllimport)
-#  else
-#    define SC_EXPRESS_EXPORT
-#  endif
+#if !defined(SC_STATIC) && defined(_WIN32)
+# if defined(SC_EXPRESS_DLL_EXPORTS)
+#  define SC_EXPRESS_EXPORT __declspec(dllexport)
+# else
+#  define SC_EXPRESS_EXPORT __declspec(dllimport)
+# endif
+#else
+# define SC_EXPRESS_EXPORT
 #endif
 
 /* Import/Export flags for exppp. */
-#ifndef SC_EXPPP_EXPORT
-#  if defined(SC_EXPPP_DLL_EXPORTS) && defined(SC_EXPPP_DLL_IMPORTS)
-#    error "Only SC_EXPPP_DLL_EXPORTS or SC_EXPPP_DLL_IMPORTS can be defined, not both."
-#  elif defined(SC_EXPPP_DLL_EXPORTS)
-#    define SC_EXPPP_EXPORT __declspec(dllexport)
-#  elif defined(SC_EXPPP_DLL_IMPORTS)
-#    define SC_EXPPP_EXPORT __declspec(dllimport)
-#  else
-#    define SC_EXPPP_EXPORT
-#  endif
+#if !defined(SC_STATIC) && defined(_WIN32)
+# if defined(SC_EXPPP_DLL_EXPORTS)
+#  define SC_EXPPP_EXPORT __declspec(dllexport)
+# else
+#  define SC_EXPPP_EXPORT __declspec(dllimport)
+# endif
+#else
+# define SC_EXPPP_EXPORT
 #endif
 
 /* Import/Export flags for utils. */
-#ifndef SC_UTILS_EXPORT
-#  if defined(SC_UTILS_DLL_EXPORTS) && defined(SC_UTILS_DLL_IMPORTS)
-#    error "Only SC_UTILS_DLL_EXPORTS or SC_UTILS_DLL_IMPORTS can be defined, not both."
-#  elif defined(SC_UTILS_DLL_EXPORTS)
-#    define SC_UTILS_EXPORT __declspec(dllexport)
-#  elif defined(SC_UTILS_DLL_IMPORTS)
-#    define SC_UTILS_EXPORT __declspec(dllimport)
-#  else
-#    define SC_UTILS_EXPORT
-#  endif
+#if !defined(SC_STATIC) && defined(_WIN32)
+# if defined(SC_UTILS_DLL_EXPORTS)
+#  define SC_UTILS_EXPORT __declspec(dllexport)
+# else
+#  define SC_UTILS_EXPORT __declspec(dllimport)
+# endif
+#else
+# define SC_UTILS_EXPORT
 #endif
 
 /* Import/Export flags for dai. */
-#ifndef SC_DAI_EXPORT
-#  if defined(SC_DAI_DLL_EXPORTS) && defined(SC_DAI_DLL_IMPORTS)
-#    error "Only SC_DAI_DLL_EXPORTS or SC_DAI_DLL_IMPORTS can be defined, not both."
-#  elif defined(SC_DAI_DLL_EXPORTS)
-#    define SC_DAI_EXPORT __declspec(dllexport)
-#  elif defined(SC_DAI_DLL_IMPORTS)
-#    define SC_DAI_EXPORT __declspec(dllimport)
-#  else
-#    define SC_DAI_EXPORT
-#  endif
+#if !defined(SC_STATIC) && defined(_WIN32)
+# if defined(SC_DAI_DLL_EXPORTS)
+#  define SC_DAI_EXPORT __declspec(dllexport)
+# else
+#  define SC_DAI_EXPORT __declspec(dllimport)
+# endif
+#else
+# define SC_DAI_EXPORT
 #endif
 
 /* Import/Export flags for core. */
-#ifndef SC_CORE_EXPORT
-#  if defined(SC_CORE_DLL_EXPORTS) && defined(SC_CORE_DLL_IMPORTS)
-#    error "Only SC_CORE_DLL_EXPORTS or SC_CORE_DLL_IMPORTS can be defined, not both."
-#  elif defined(SC_CORE_DLL_EXPORTS)
-#    define SC_CORE_EXPORT __declspec(dllexport)
-#  elif defined(SC_CORE_DLL_IMPORTS)
-#    define SC_CORE_EXPORT __declspec(dllimport)
-#  else
-#    define SC_CORE_EXPORT
-#  endif
+#if !defined(SC_STATIC) && defined(_WIN32)
+# if defined(SC_CORE_DLL_EXPORTS)
+#  define SC_CORE_EXPORT __declspec(dllexport)
+# else
+#  define SC_CORE_EXPORT __declspec(dllimport)
+# endif
+#else
+# define SC_CORE_EXPORT
 #endif
 
 /* Import/Export flags for editor. */
-#ifndef SC_EDITOR_EXPORT
-#  if defined(SC_EDITOR_DLL_EXPORTS) && defined(SC_EDITOR_DLL_IMPORTS)
-#    error "Only SC_EDITOR_DLL_EXPORTS or SC_EDITOR_DLL_IMPORTS can be defined, not both."
-#  elif defined(SC_EDITOR_DLL_EXPORTS)
-#    define SC_EDITOR_EXPORT __declspec(dllexport)
-#  elif defined(SC_EDITOR_DLL_IMPORTS)
-#    define SC_EDITOR_EXPORT __declspec(dllimport)
-#  else
-#    define SC_EDITOR_EXPORT
-#  endif
+#if !defined(SC_STATIC) && defined(_WIN32)
+# if defined(SC_EDITOR_DLL_EXPORTS)
+#  define SC_EDITOR_EXPORT __declspec(dllexport)
+# else
+#  define SC_EDITOR_EXPORT __declspec(dllimport)
+# endif
+#else
+# define SC_EDITOR_EXPORT
 #endif
 
 /* Import/Export flags for lazyfile. */
-#ifndef SC_LAZYFILE_EXPORT
-#  if defined(SC_LAZYFILE_DLL_EXPORTS) && defined(SC_LAZYFILE_DLL_IMPORTS)
-#    error "Only SC_LAZYFILE_DLL_EXPORTS or SC_LAZYFILE_DLL_IMPORTS can be defined, not both."
-#  elif defined(SC_LAZYFILE_DLL_EXPORTS)
-#    define SC_LAZYFILE_EXPORT __declspec(dllexport)
-#  elif defined(SC_LAZYFILE_DLL_IMPORTS)
-#    define SC_LAZYFILE_EXPORT __declspec(dllimport)
-#  else
-#    define SC_LAZYFILE_EXPORT
-#  endif
+#if !defined(SC_STATIC) && defined(_WIN32)
+# if defined(SC_LAZYFILE_DLL_EXPORTS)
+#  define SC_LAZYFILE_EXPORT __declspec(dllexport)
+# else
+#  define SC_LAZYFILE_EXPORT __declspec(dllimport)
+# endif
+#else
+#  define SC_LAZYFILE_EXPORT
 #endif
 
 #endif /* SC_EXPORT_H */

include/sc_stdbool.h

@@ -14,21 +14,11 @@
  * for various compiler versions and defines things that are missing in
  * those versions.
  *
- * The GNU and Watcom compilers include a stdbool.h, but the Borland
- * C/C++ 5.5.1 compiler and the Microsoft compilers do not.
- *
  * See http://predef.sourceforge.net/precomp.html for compile macros.
  */
 
 #ifndef __cplusplus
 
-/**
- * Borland C++ 5.5.1 does not define _Bool.
- */
-#if defined(__BORLANDC__) && __BORLANDC__ < 0x630
-typedef int _Bool;
-#endif
-
 /**
  * Microsoft C/C++ version 14.00.50727.762, which comes with Visual C++ 2005,
  * and version 15.00.30729.01, which comes with Visual C++ 2008, do not

misc/flawfinder

@@ -102,7 +102,7 @@ blank_line     = re.compile( r'(?m)^\s+$' )
 #    --- OLDFILENAME OLDTIMESTAMP
 #    +++ NEWFILENAME NEWTIMESTAMP
 #    @@ -OLDSTART,OLDLENGTH +NEWSTART,NEWLENGTH @@
-#    ... Changes where preceeding "+" is add, "-" is remove, " " is unchanged.
+#    ... Changes where preceding "+" is add, "-" is remove, " " is unchanged.
 #
 #    ",OLDLENGTH" and ",NEWLENGTH" are optional  (they default to 1).
 #    GNU unified diff format doesn't normally output "Index:"; you use
@@ -451,7 +451,7 @@ def extract_c_parameters(text, pos=0):
 # so will get confused by patterns like  gettext("hi") + function("bye")
 # In practice, this doesn't seem to be a problem; gettext() is usually
 # wrapped around the entire parameter.
-# The ?s makes it posible to match multi-line strings.
+# The ?s makes it possible to match multi-line strings.
 gettext_pattern = re.compile(r'(?s)^\s*' + 'gettext' + r'\s*\((.*)\)\s*$')
 undersc_pattern = re.compile(r'(?s)^\s*' + '_(T(EXT)?)?' + r'\s*\((.*)\)\s*$')
 
@@ -703,7 +703,7 @@ c_ruleset = {
   "lstrcpyn|wcsncpy|_tcsncpy|_mbsnbcpy" :
      (c_buffer,
       1, # Low risk level, because this is often used correctly when FIXING security
-      # problems, and raising it to a higher risk levle would cause many false positives.
+      # problems, and raising it to a higher risk level would cause many false positives.
       "Easily used incorrectly; doesn't always \\0-terminate or " +
          "check for invalid pointers",
       "",

misc/summarize-appveyor-log.go

@@ -1,330 +0,0 @@
-//summarize MSVC errors from an appveyor log
-// compile with 'go build summarize-appveyor-log.go'
-// takes 0 or 1 args; with 0, gets log from latest
-// build. with 1, uses that file as raw json-like log
-package main
-
-import (
-	"bufio"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"os"
-	"regexp"
-	"sort"
-	"strings"
-)
-
-const (
-	headerKey = "Authorization"
-	headerVal = "Bearer %s"
-	projUrl   = "https://ci.appveyor.com/api/projects/mpictor/stepcode"
-	//"https://ci.appveyor.com/api/buildjobs/2rjxdv1rnb8jcg8y/log"
-	logUrl     = "https://ci.appveyor.com/api/buildjobs/%s/log"
-	consoleUrl = "https://ci.appveyor.com/api/buildjobs/%s/console"
-)
-
-func main() {
-	var rawlog io.ReadCloser
-	var build string
-	var err error
-	if len(os.Args) == 2 {
-		rawlog, build, err = processArgv()
-	} else {
-		rawlog, build, err = getLog()
-	}
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "ERROR: %s\n", err)
-		return
-	}
-	defer rawlog.Close()
-	log := decodeConsole(rawlog)
-	warns, errs := countMessages(log)
-	fi, err := os.Create(fmt.Sprintf("appveyor-%s.smy", build))
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "ERROR: %s\n", err)
-		return
-	}
-	printMessages("error", errs, fi)
-	printMessages("warning", warns, fi)
-
-	fmt.Printf("done\n")
-
-}
-
-/* categorizes warnings and errors based upon the MSVC message number (i.e. C4244)
- * the regex will match lines like
-c:\projects\stepcode\src\base\sc_benchmark.h(45): warning C4251: 'benchmark::descr' : class 'std::basic_string<char,std::char_traits<char>,std::allocator<char>>' needs to have dll-interface to be used by clients of class 'benchmark' [C:\projects\STEPcode\build\src\base\base.vcxproj]
-[00:03:48] C:\projects\STEPcode\src\base\sc_benchmark.cc(61): warning C4244: '=' : conversion from 'SIZE_T' to 'long', possible loss of data [C:\projects\STEPcode\build\src\base\base.vcxproj]*
-*/
-func countMessages(log []string) (warns, errs map[string][]string) {
-	warns = make(map[string][]string)
-	errs = make(map[string][]string)
-	fname := " *(.*)"            // $1
-	fline := `(?:\((\d+)\)| ): ` // $2 - either line number in parenthesis or a space, followed by a colon
-	msgNr := `([A-Z]+\d+): `     // $3 - C4251, LNK2005, etc
-	msgTxt := `([^\[]*) `        // $4
-	tail := `\[[^\[\]]*\]`
-	warnRe := regexp.MustCompile(fname + fline + `warning ` + msgNr + msgTxt + tail)
-	errRe := regexp.MustCompile(fname + fline + `(?:fatal )?error ` + msgNr + msgTxt + tail)
-	for _, line := range log {
-		if warnRe.MatchString(line) {
-			key := warnRe.ReplaceAllString(line, "$3")
-			path := strings.ToLower(warnRe.ReplaceAllString(line, "$1:$2"))
-			arr := warns[key]
-			if arr == nil {
-				arr = make([]string, 5)
-				//detailed text as first string in array
-				text := warnRe.ReplaceAllString(line, "$4")
-				arr[0] = fmt.Sprintf("%s", text)
-			}
-			//eliminate duplicates
-			match := false
-			for _, l := range arr {
-				if l == path {
-					match = true
-				}
-			}
-			if !match {
-				warns[key] = append(arr, path)
-			}
-		} else if errRe.MatchString(line) {
-			key := errRe.ReplaceAllString(line, "$3")
-			path := strings.ToLower(errRe.ReplaceAllString(line, "$1:$2"))
-			arr := errs[key]
-			if arr == nil {
-				arr = make([]string, 5)
-				//detailed text as first string in array
-				text := errRe.ReplaceAllString(line, "$4")
-				arr[0] = fmt.Sprintf("%s", text)
-			}
-			//eliminate duplicates
-			match := false
-			for _, l := range arr {
-				if l == path {
-					match = true
-				}
-			}
-			if !match {
-				errs[key] = append(arr, path)
-			}
-		}
-	}
-	return
-}
-
-func printMessages(typ string, m map[string][]string, w io.Writer) {
-	//sort keys
-	keys := make([]string, 0, len(m))
-	for key := range m {
-		keys = append(keys, key)
-	}
-	sort.Strings(keys)
-	for _, k := range keys {
-		for i, l := range m[k] {
-			//first string is an example,  not a location
-			if i == 0 {
-				fmt.Fprintf(w, "%s %s (i.e. \"%s\")\n", typ, k, l)
-			} else if len(l) > 1 { //not sure where blank lines are coming from...
-				fmt.Fprintf(w, "  >> %s\n", l)
-			}
-		}
-	}
-}
-
-//structs from http://json2struct.mervine.net/
-
-//{"values":[{"i":0,"t":"Specify a project or solution file. The directory does not contain a project or solution file.\r\n","dt":"00:00:04","bg":12,"fg":15}]}
-type AppVeyorConsoleLines struct {
-	Values []struct {
-		I        int    `json:"i"`
-		Text     string `json:"t"`
-		DateTime string `json:"dt"`
-		BgColor  int    `json:"bg"`
-		FgColor  int    `json:"fg"`
-	}
-}
-type AppVeyorBuild struct {
-	Build struct {
-		/*BuildNumber int `json:"buildNumber"`*/
-		Version string `json:"version"`
-		Jobs    []struct {
-			JobID string `json:"jobId"`
-		} `json:"jobs"`
-	} `json:"build"`
-}
-
-func splitAppend(log *[]string, blob string) {
-	//blob = strings.Replace(blob,"\r\n", "\n",-1)
-	blob = strings.Replace(blob, "\\", "/", -1)
-	r := strings.NewReader(blob)
-	unwrapScanner := bufio.NewScanner(r)
-	for unwrapScanner.Scan() {
-		txt := unwrapScanner.Text()
-		//fmt.Printf("%s\n", txt)
-		*log = append(*log, txt)
-	}
-}
-
-//calculate length of string without escape chars
-// func escapeLen(s string)(l int) {
-// 	//s = strings.Replace(s,"\\\\", "/",-1)
-// 	s = strings.Replace(s,"\\\"", "",-1)
-// 	s = strings.Replace(s,"\r\n", "RN",-1)
-// 	return len(s)
-// }
-
-
-//decode the almost-JSON console data from appveyor
-func decodeConsole(r io.Reader) (log []string) {
-	wrapper := Wrap(r)
-	dec := json.NewDecoder(wrapper)
-	var consoleLines AppVeyorConsoleLines
-	var err error
-	var txtBlob string
-	err = dec.Decode(&consoleLines)
-	if err == io.EOF {
-		err = nil
-	}
-	if err == nil {
-		for _, l := range consoleLines.Values {
-			txtBlob += l.Text
-			//el := escapeLen(l.Text)
-			//something inserts newlines at 229 chars (+\n\r == 231) (found in CMake output)
-			lenTwoThreeOne := len(l.Text) == 231
-			if lenTwoThreeOne {
-				txtBlob = strings.TrimSuffix(txtBlob, "\r\n")
-			}
-			//something else starts new log lines at 1024 chars without inserting newlines (found in CTest error output)
-			if len(l.Text) != 1024 && !lenTwoThreeOne {
-				//fmt.Printf("sa for l %d, el %d\n", len(l.Text),el)
-				splitAppend(&log, txtBlob)
-				txtBlob = ""
-			}
-		}
-	} else {
-		fmt.Printf("decode err %s\n", err)
-	}
-	if len(txtBlob) > 0 {
-		splitAppend(&log, txtBlob)
-	}
-	return
-}
-
-func processArgv() (log io.ReadCloser, build string, err error) {
-	fname := os.Args[1]
-	if len(fname) < 14 {
-		err = fmt.Errorf("Name arg '%s' too short. Run as '%s appveyor-NNN.log'", fname, os.Args[0])
-		return
-	}
-	buildRe := regexp.MustCompile(`appveyor-(.+).log`)
-	build = buildRe.ReplaceAllString(fname, "$1")
-	if len(build) == 0 {
-		err = fmt.Errorf("No build id in %s", fname)
-		return
-	}
-	log, err = os.Open(fname)
-	return
-}
-
-func getLog() (log io.ReadCloser, build string, err error) {
-	client := &http.Client{}
-	req, err := http.NewRequest("GET", projUrl, nil)
-	if err != nil {
-		return
-	}
-	apikey := os.Getenv("APPVEYOR_API_KEY")
-	//api key isn't necessary for read-only queries on public projects
-	if len(apikey) > 0 {
-		req.Header.Add(headerKey, fmt.Sprintf(headerVal, apikey))
-	} //else {
-	//	fmt.Printf("Env var APPVEYOR_API_KEY is not set.")
-	//}
-	resp, err := client.Do(req)
-	if err != nil {
-		return
-	}
-
-	build, job := decodeProjInfo(resp.Body)
-	fmt.Printf("build #%s, jobId %s\n", build, job)
-	resp, err = http.Get(fmt.Sprintf(consoleUrl, job))
-	if err != nil {
-		return
-	}
-	logName := fmt.Sprintf("appveyor-%s.log", build)
-	fi, err := os.Create(logName)
-	if err != nil {
-		return
-	}
-	_, err = io.Copy(fi, resp.Body)
-	if err != nil {
-		return
-	}
-	log, err = os.Open(logName)
-	if err != nil {
-		log = nil
-	}
-	return
-}
-
-func decodeProjInfo(r io.Reader) (vers string, job string) {
-	dec := json.NewDecoder(r)
-	var av AppVeyorBuild
-	err := dec.Decode(&av)
-	if err != io.EOF && err != nil {
-		fmt.Printf("err %s\n", err)
-		return
-	}
-	if len(av.Build.Jobs) != 1 {
-		return
-	}
-	vers = av.Build.Version
-	job = av.Build.Jobs[0].JobID
-	return
-}
-
-//wrap a reader, modifying content to make the json decoder happy
-//only tested with data from appveyor console
-type jsonWrapper struct {
-	source io.Reader
-	begin  bool
-	end    bool
-}
-
-func Wrap(r io.Reader) *jsonWrapper {
-	return &jsonWrapper{
-		source: r,
-		begin:  true,
-	}
-}
-
-// func nonNeg(n int) (int) {
-// 	if n < 0 {
-// 		return 0
-// 	}
-// 	return n
-// }
-
-func (w *jsonWrapper) Read(p []byte) (n int, err error) {
-	if w.end {
-		return 0, io.EOF
-	}
-	if w.begin {
-		w.begin = false
-		n = copy(p, []byte(`{"values":[`))
-	}
-	m, err := w.source.Read(p[n:])
-	n += m
-	if err == io.EOF {
-		w.end = true
-		if n < len(p) {
-			n = copy(p, []byte(`{"dummy":"data"}]}`))
-		} else {
-			err = fmt.Errorf("No room to terminate JSON struct with '}'\n")
-		}
-	}
-	return
-}
-
-// kate: indent-width 8; space-indent off; replace-tabs off; replace-tabs-save off; replace-trailing-space-save on; remove-trailing-space on; tab-intent on; tab-width 8; show-tabs off;

misc/wiki-scripts/update-matrix.py

@@ -5,6 +5,7 @@
 
 #must be ran from scl/build_matrix
 
+from __future__ import print_function
 from xml.etree import ElementTree as ET
 import os
 from datetime import date
@@ -49,7 +50,7 @@ def find_xml():
         if str(date.today().year) in dirname:
             i += 1
             if i > 1:
-                print "Too many directories, exiting"
+                print("Too many directories, exiting")
                 exit(1)
             xml = os.path.join("Testing", dirname, "Test.xml")
     return xml
@@ -58,31 +59,31 @@ def find_wiki():
     #find wiki and matrix file, issue 'git pull'
     wikipath = os.path.abspath("../../wiki-scl")
     if not os.path.isdir(os.path.join(wikipath,".git")):
-        print "Can't find wiki or not a git repo"
+        print("Can't find wiki or not a git repo")
         exit(1)
     p = subprocess.call(["git", "pull", "origin"], cwd=wikipath)
     if not p == 0:
-        print "'git pull' exited with error"
+        print("'git pull' exited with error")
         exit(1)
     matrix = os.path.join(wikipath, "Schema-build-matrix.md")
     if not os.path.isfile(matrix):
-        print "Matrix file doesn't exist or isn't a file"
+        print("Matrix file doesn't exist or isn't a file")
         exit(1)
     return wikipath,matrix
 
 def git_push(path,f):
     p = subprocess.call(["git", "add", f], cwd=path)
     if not p == 0:
-        print "'git add' exited with error"
+        print("'git add' exited with error")
         exit(1)
     msg = date.today().__str__() + " - schema matrix updated by update-matrix.py"
     p = subprocess.call(["git", "commit", "-m", msg ], cwd=path)
     if not p == 0:
-        print "'git commit' exited with error"
+        print("'git commit' exited with error")
         exit(1)
     p = subprocess.call(["git", "push", "origin"], cwd=path)
     if not p == 0:
-        print "'git push' exited with error"
+        print("'git push' exited with error")
         exit(1)
 
 
@@ -98,8 +99,8 @@ def read_tests(xml):
     # read all <Test>s in xml, create mixed html/markdown
     try:
         tree = ET.parse(xml)
-    except Exception, inst:
-        print "Unexpected error opening %s: %s" % (xml, inst)
+    except Exception as inst:
+        print("Unexpected error opening %s: %s" % (xml, inst))
         return
 
     root = tree.getroot()

run_ctest.cmake

@@ -3,8 +3,8 @@
 
 set(CTEST_SOURCE_DIRECTORY .)
 set(CTEST_BINARY_DIRECTORY build_ctest)
-set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
-set(CTEST_MEMORYCHECK_COMMAND /usr/bin/valgrind)
+set(CTEST_CMAKE_GENERATOR "Visual Studio 14 2015 Win64")
+#set(CTEST_MEMORYCHECK_COMMAND /usr/bin/valgrind)
 set(CTEST_INITIAL_CACHE "
 SITE:STRING=${CTEST_SITE}
 BUILDNAME:STRING=${CTEST_BUILD_NAME}

src/base/CMakeLists.txt

@@ -15,7 +15,6 @@ set(SC_BASE_HDRS
   sc_getopt.h
   sc_trace_fprintf.h
   sc_mkdir.h
-  sc_nullptr.h
   path2str.h
   judy/src/judy.h
   judy/src/judyLArray.h
@@ -29,18 +28,23 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}/judy/src
   )
 
-if(MINGW OR MSVC OR BORLAND)
-  add_definitions(-DSC_BASE_DLL_EXPORTS)
-endif()
-
-if (${SC_MEMMGR_ENABLE_CHECKS})
+if($CACHE{SC_MEMMGR_ENABLE_CHECKS})
   add_definitions(-DSC_MEMMGR_ENABLE_CHECKS)
 endif()
 
-SC_ADDLIB(base "${SC_BASE_SOURCES}" "")
+if(BUILD_SHARED_LIBS)
+  SC_ADDLIB(base SHARED SOURCES ${SC_BASE_SOURCES})
+  if(WIN32)
+    target_link_libraries(base psapi)
+    target_compile_definitions(base PRIVATE SC_BASE_DLL_EXPORTS)
+  endif()
+endif()
 
-if(MINGW OR MSVC OR BORLAND)
-  target_link_libraries(base psapi.lib)
+if(BUILD_STATIC_LIBS)
+  SC_ADDLIB(base-static STATIC SOURCES ${SC_BASE_SOURCES})
+  if(WIN32)
+    target_link_libraries(base-static psapi)
+  endif()
 endif()
 
 if(NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/judy/src")
@@ -57,7 +61,7 @@ if(NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/judy/src")
 endif(NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/judy/src")
 
 install(FILES ${SC_BASE_HDRS}
-  DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/base)
+  DESTINATION ${INCLUDE_DIR}/stepcode/base)
 
 # Local Variables:
 # tab-width: 8

src/base/judy/CMakeLists.txt

@@ -1,5 +1,5 @@
 
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.12)
 project( JudyTemplates )
 
 if( NOT DEFINED CMAKE_BUILD_TYPE )

src/base/judy/src/judy.c

@@ -193,7 +193,7 @@ void * judy_alloc( Judy * judy, unsigned int type ) {
 
     if( type >= JUDY_1 )
         for( idx = type; idx++ < JUDY_max; )
-            if( block = judy->reuse[idx] ) {
+            if( (block = judy->reuse[idx]) ) {
                 judy->reuse[idx] = *block;
                 while( idx-- > type ) {
                     judy->reuse[idx] = block + JudySize[idx] / sizeof( void * );
@@ -366,7 +366,7 @@ unsigned int judy_key( Judy * judy, unsigned char * buff, unsigned int max ) {
                 off = keysize;
 
                 while( off-- && len < max )
-                    if( buff[len] = base[slot * keysize + off] ) {
+                    if( (buff[len] = base[slot * keysize + off]) ) {
                         len++;
                     } else {
                         break;
@@ -495,7 +495,7 @@ JudySlot * judy_slot( Judy * judy, const unsigned char * buff, unsigned int max
 
                     // is this a leaf?
 
-                    if( !judy->depth && !( value & 0xFF ) || judy->depth && depth == judy->depth ) {
+                    if( (!judy->depth && !( value & 0xFF )) || (judy->depth && depth == judy->depth) ) {
                         return &node[-slot - 1];
                     }
 
@@ -509,7 +509,7 @@ JudySlot * judy_slot( Judy * judy, const unsigned char * buff, unsigned int max
                 table = ( JudySlot * )( next & JUDY_mask ); // outer radix
 
                 if( judy->depth ) {
-                    slot = ( src[depth] >> ( ( JUDY_key_size - ++off & JUDY_key_mask ) * 8 ) ) & 0xff;
+                    slot = ( src[depth] >> ( (( JUDY_key_size - ++off) & JUDY_key_mask ) * 8 ) ) & 0xff;
                 } else if( off < max ) {
                     slot = buff[off++];
                 } else {
@@ -531,12 +531,13 @@ JudySlot * judy_slot( Judy * judy, const unsigned char * buff, unsigned int max
                         depth++;
                     }
 
-                if( !judy->depth && !slot || judy->depth && depth == judy->depth )    // leaf?
+                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;
@@ -650,7 +651,7 @@ void judy_radix( Judy * judy, JudySlot * radix, unsigned char * old, int start,
 
     // is this slot a leaf?
 
-    if( !judy->depth && ( !key || !keysize ) || judy->depth && !keysize && depth == judy->depth ) {
+    if( (!judy->depth && ( !key || !keysize )) || (judy->depth && !keysize && depth == judy->depth) ) {
         table[key & 0x0F] = oldnode[-start - 1];
         return;
     }
@@ -763,7 +764,7 @@ JudySlot * judy_first( Judy * judy, JudySlot next, unsigned int off, unsigned in
 
                 judy->stack[judy->level].slot = slot;
 #if BYTE_ORDER != BIG_ENDIAN
-                if( !judy->depth && !base[slot * keysize] || judy->depth && ++depth == judy->depth ) {
+                if( (!judy->depth && !base[slot * keysize]) || (judy->depth && ++depth == judy->depth) ) {
                     return &node[-slot - 1];
                 }
 #else
@@ -787,7 +788,7 @@ JudySlot * judy_first( Judy * judy, JudySlot next, unsigned int off, unsigned in
                     if( ( inner = ( JudySlot * )( table[slot >> 4] & JUDY_mask ) ) ) {
                         if( ( next = inner[slot & 0x0F] ) ) {
                             judy->stack[judy->level].slot = slot;
-                            if( !judy->depth && !slot || judy->depth && depth == judy->depth ) {
+                            if( (!judy->depth && !slot) || (judy->depth && depth == judy->depth) ) {
                                 return &inner[slot & 0x0F];
                             } else {
                                 break;
@@ -848,9 +849,9 @@ JudySlot * judy_last( Judy * judy, JudySlot next, unsigned int off, unsigned int
                 judy->stack[judy->level].slot = --slot;
 
 #if BYTE_ORDER != BIG_ENDIAN
-                if( !judy->depth && !base[slot * keysize] || judy->depth && ++depth == judy->depth )
+                if( (!judy->depth && !base[slot * keysize]) || (judy->depth && ++depth == judy->depth) )
 #else
-                if( !judy->depth && !base[slot * keysize + keysize - 1] || judy->depth && ++depth == judy->depth )
+                if( (!judy->depth && !base[slot * keysize + keysize - 1]) || judy->depth && ++depth == judy->depth )
 #endif
                     return &node[-slot - 1];
 
@@ -870,12 +871,13 @@ JudySlot * judy_last( Judy * judy, JudySlot next, unsigned int off, unsigned int
                 for( slot = 256; slot--; ) {
                     judy->stack[judy->level].slot = slot;
                     if( ( inner = ( JudySlot * )( table[slot >> 4] & JUDY_mask ) ) ) {
-                        if( ( next = inner[slot & 0x0F] ) )
-                            if( !judy->depth && !slot || judy->depth && depth == judy->depth ) {
+                        if( ( next = inner[slot & 0x0F] ) ) {
+                            if( (!judy->depth && !slot) || (judy->depth && depth == judy->depth) ) {
                                 return &inner[0];
                             } else {
                                 break;
                             }
+                        }
                     } else {
                         slot &= 0xF0;
                     }
@@ -942,11 +944,11 @@ JudySlot * judy_nxt( Judy * judy ) {
                 cnt = size / ( sizeof( JudySlot ) + keysize );
                 node = ( JudySlot * )( ( next & JUDY_mask ) + size );
                 base = ( unsigned char * )( next & JUDY_mask );
-                if( ++slot < cnt )
+                if( ++slot < cnt ) {
 #if BYTE_ORDER != BIG_ENDIAN
-                    if( !judy->depth && !base[slot * keysize] || judy->depth && ++depth == judy->depth )
+                    if( (!judy->depth && !base[slot * keysize]) || (judy->depth && ++depth == judy->depth) )
 #else
-                    if( !judy->depth && !base[slot * keysize + keysize - 1] || judy->depth && ++depth == judy->depth )
+                    if( (!judy->depth && !base[slot * keysize + keysize - 1]) || (judy->depth && ++depth == judy->depth) )
 #endif
                     {
                         judy->stack[judy->level].slot = slot;
@@ -955,6 +957,7 @@ JudySlot * judy_nxt( Judy * judy ) {
                         judy->stack[judy->level].slot = slot;
                         return judy_first( judy, node[-slot - 1], ( off | JUDY_key_mask ) + 1, depth );
                     }
+                }
                 judy->level--;
                 continue;
 
@@ -1033,9 +1036,9 @@ JudySlot * judy_prv( Judy * judy ) {
                 keysize = JUDY_key_size - ( off & JUDY_key_mask );
 
 #if BYTE_ORDER != BIG_ENDIAN
-                if( !judy->depth && !base[( slot - 1 ) * keysize] || judy->depth && ++depth == judy->depth )
+                if( (!judy->depth && !base[( slot - 1 ) * keysize]) || (judy->depth && ++depth == judy->depth) )
 #else
-                if( !judy->depth && !base[( slot - 1 ) * keysize + keysize - 1] || judy->depth && ++depth == judy->depth )
+                if( (!judy->depth && !base[( slot - 1 ) * keysize + keysize - 1]) || (judy->depth && ++depth == judy->depth) )
 #endif
                     return &node[-slot];
                 return judy_last( judy, node[-slot], ( off | JUDY_key_mask ) + 1, depth );
@@ -1051,12 +1054,13 @@ JudySlot * judy_prv( Judy * judy ) {
                 while( slot-- ) {
                     judy->stack[judy->level].slot--;
                     if( ( inner = ( JudySlot * )( table[slot >> 4] & JUDY_mask ) ) )
-                        if( inner[slot & 0x0F] )
-                            if( !judy->depth && !slot || judy->depth && depth == judy->depth ) {
+                        if( inner[slot & 0x0F] ) {
+                            if( (!judy->depth && !slot) || (judy->depth && depth == judy->depth) ) {
                                 return &inner[0];
                             } else {
                                 return judy_last( judy, inner[slot & 0x0F], off + 1, depth );
                             }
+                        }
                 }
 
                 judy->level--;
@@ -1076,7 +1080,7 @@ JudySlot * judy_prv( Judy * judy ) {
 //        returning previous entry.
 
 JudySlot * judy_del( Judy * judy ) {
-    int slot, off, size, type, high;
+    int slot, off, size, type;
     JudySlot * table, *inner;
     JudySlot next, *node;
     int keysize, cnt;
@@ -1129,7 +1133,6 @@ JudySlot * judy_del( Judy * judy ) {
                 table = ( JudySlot * )( next & JUDY_mask );
                 inner = ( JudySlot * )( table[slot >> 4] & JUDY_mask );
                 inner[slot & 0x0F] = 0;
-                high = slot & 0xF0;
 
                 for( cnt = 16; cnt--; )
                     if( inner[cnt] ) {
@@ -1291,7 +1294,7 @@ JudySlot * judy_cell( Judy * judy, const unsigned char * buff, unsigned int max
 
                     // is this a leaf?
 
-                    if( !judy->depth && !( value & 0xFF ) || judy->depth && depth == judy->depth ) {
+                    if( (!judy->depth && !( value & 0xFF )) || (judy->depth && depth == judy->depth) ) {
 #ifdef ASKITIS
                         if( *next ) {
                             Found++;
@@ -1327,7 +1330,7 @@ JudySlot * judy_cell( Judy * judy, const unsigned char * buff, unsigned int max
                     node[-slot - 1] = 0;          // set new tree ptr/cell
                     next = &node[-slot - 1];
 
-                    if( !judy->depth && !( value & 0xFF ) || judy->depth && depth == judy->depth ) {
+                    if( (!judy->depth && !( value & 0xFF )) || (judy->depth && depth == judy->depth) ) {
 #ifdef ASKITIS
                         if( *next ) {
                             Found++;
@@ -1344,7 +1347,7 @@ JudySlot * judy_cell( Judy * judy, const unsigned char * buff, unsigned int max
                 if( size < JudySize[JUDY_max] ) {
                     next = judy_promote( judy, next, slot + 1, value, keysize );
 
-                    if( !judy->depth && !( value & 0xFF ) || judy->depth && depth == judy->depth ) {
+                    if( (!judy->depth && !( value & 0xFF )) || (judy->depth && depth == judy->depth) ) {
 #ifdef ASKITIS
                         if( *next ) {
                             Found++;
@@ -1375,7 +1378,7 @@ JudySlot * judy_cell( Judy * judy, const unsigned char * buff, unsigned int max
                 table = ( JudySlot * )( *next & JUDY_mask ); // outer radix
 
                 if( judy->depth ) {
-                    slot = ( src[depth] >> ( ( JUDY_key_size - ++off & JUDY_key_mask ) * 8 ) ) & 0xff;
+                    slot = ( src[depth] >> ( ( (JUDY_key_size - ++off) & JUDY_key_mask ) * 8 ) ) & 0xff;
                 } else if( off < max ) {
                     slot = buff[off++];
                 } else {
@@ -1399,7 +1402,7 @@ JudySlot * judy_cell( Judy * judy, const unsigned char * buff, unsigned int max
 #endif
                 next = &table[slot & 0x0F];
 
-                if( !judy->depth && !slot || judy->depth && depth == judy->depth ) { // leaf?
+                if( (!judy->depth && !slot) || (judy->depth && depth == judy->depth) ) { // leaf?
 #ifdef ASKITIS
                     if( *next ) {
                         Found++;

src/base/judy/src/judy.h

@@ -32,18 +32,7 @@
 //  judy_prv:   retrieve the cell pointer for the prev string in the array.
 //  judy_del:   delete the key and cell for the current stack entry.
 
-/* Import/Export flags for base. */
-#ifndef SC_BASE_EXPORT
-# if defined(SC_BASE_DLL_EXPORTS) && defined(SC_BASE_DLL_IMPORTS)
-#  error "Only SC_BASE_DLL_EXPORTS or SC_BASE_DLL_IMPORTS can be defined, not both."
-# elif defined(SC_BASE_DLL_EXPORTS)
-#  define SC_BASE_EXPORT __declspec(dllexport)
-# elif defined(SC_BASE_DLL_IMPORTS)
-#  define SC_BASE_EXPORT __declspec(dllimport)
-# else
-#  define SC_BASE_EXPORT
-# endif
-#endif
+#include "sc_export.h"
 
 #if defined(__LP64__)      || \
     defined(__x86_64__)    || \

src/base/path2str.h

@@ -11,10 +11,10 @@
  */
 SC_BASE_EXPORT const char * path2str_fn( const char * fileMacro );
 
-#if defined( _WIN32 ) || defined ( __WIN32__ )
+#ifdef _WIN32
 #  define path2str(path) path2str_fn(path)
 #else
 #  define path2str(path) path
-#endif /* defined( _WIN32 ) || defined ( __WIN32__ ) */
+#endif
 
 #endif /* PATH2STR_H */

src/base/sc_benchmark.cc

@@ -3,7 +3,7 @@
 #include "sc_benchmark.h"
 #include "sc_memmgr.h"
 
-#ifdef __WIN32__
+#ifdef _WIN32
 #include <windows.h>
 #include <psapi.h>
 #else
@@ -49,7 +49,7 @@ benchVals getMemAndTime( ) {
     vals.sysMilliseconds  = ( stime * 1000 ) / sysconf( _SC_CLK_TCK );
 #elif defined(__APPLE__)
     // http://stackoverflow.com/a/1911863/382458
-#elif defined(__WIN32__)
+#elif defined(_WIN32)
     // http://stackoverflow.com/a/282220/382458 and http://stackoverflow.com/a/64166/382458
     PROCESS_MEMORY_COUNTERS MemoryCntrs;
     FILETIME CreationTime, ExitTime, KernelTime, UserTime;

src/base/sc_benchmark.h

@@ -42,8 +42,15 @@ extern "C" {
 class SC_BASE_EXPORT benchmark {
     protected:
         benchVals initialVals, laterVals;
+#ifdef _MSC_VER
+#pragma warning( push )
+#pragma warning( disable: 4251 )
+#endif
         std::ostream & ostr;
         std::string descr;
+#ifdef _MSC_VER
+#pragma warning( pop )
+#endif
         bool debug, stopped;
     public:
         benchmark( std::string description = "", bool debugMessages = true, std::ostream & o_stream = std::cout );

src/base/sc_memmgr.h

@@ -6,17 +6,6 @@
 
 #if defined(SC_MEMMGR_ENABLE_CHECKS)
 
-/**
-    Platform specific defines
-*/
-#if defined(__MSVC__) || defined(__BORLAND__)
-#define THROW_STD_BAD_ALLOC
-#define THROW_EMPTY
-#else
-#define THROW_STD_BAD_ALLOC     throw (std::bad_alloc)
-#define THROW_EMPTY             throw ()
-#endif
-
 #ifdef  __cplusplus
 #include <stddef.h>
 extern "C" {
@@ -50,27 +39,27 @@ SC_BASE_EXPORT void   sc_operator_delete( void * addr );
 
 #include <new>
 
-inline void * operator new( size_t size, const char * file, const int line ) THROW_STD_BAD_ALLOC {
+inline void * operator new( size_t size, const char * file, const int line ) throw (std::bad_alloc) {
     return sc_operator_new( size, file, line );
 }
 
-inline void * operator new[]( size_t size, const char * file, const int line ) THROW_STD_BAD_ALLOC {
+inline void * operator new[]( size_t size, const char * file, const int line ) throw (std::bad_alloc) {
     return sc_operator_new( size, file, line );
 }
 
-inline void operator delete( void * addr, const char * file, const int line ) THROW_STD_BAD_ALLOC {
+inline void operator delete( void * addr, const char * file, const int line ) throw (std::bad_alloc) {
     sc_operator_delete( addr, file, line );
 }
 
-inline void operator delete[]( void * addr, const char * file, const int line ) THROW_STD_BAD_ALLOC {
+inline void operator delete[]( void * addr, const char * file, const int line ) throw (std::bad_alloc) {
     sc_operator_delete( addr, file, line );
 }
 
-inline void operator delete( void * addr ) THROW_EMPTY {
+inline void operator delete( void * addr ) throw () {
     sc_operator_delete( addr );
 }
 
-inline void operator delete[]( void * addr ) THROW_EMPTY {
+inline void operator delete[]( void * addr ) throw () {
     sc_operator_delete( addr );
 }
 

src/base/sc_mkdir.c

@@ -1,4 +1,4 @@
-
+#define _XOPEN_SOURCE /* for S_IFDIR */
 #include "sc_mkdir.h"
 
 #include <sys/stat.h>

src/base/sc_nullptr.h

@@ -1,13 +0,0 @@
-#ifndef NULLPTR_H
-#define NULLPTR_H
-
-#include <sc_cf.h>
-
-#ifdef HAVE_NULLPTR
-#include <cstddef>
-#else
-#  define nullptr_t void*
-#  define nullptr NULL
-#endif //HAVE_NULLPTR
-
-#endif //NULLPTR_H

src/base/sc_stdio.h

@@ -0,0 +1,39 @@
+#ifndef __SC_STDIO_H
+#define __SC_STDIO_H
+
+/*
+ * https://stackoverflow.com/questions/2915672/snprintf-and-visual-studio-2010
+ * (NOTE: MSVC defines va_list as a char*, so this should be safe)
+ */
+#if defined(_MSC_VER) && _MSC_VER < 1900
+
+#include <stdarg.h>
+
+static __inline int
+c99_vsnprintf(char *buffer, size_t sz, const char *format, va_list ap) {
+    int count = -1;
+
+    if (sz != 0)
+        count = _vsnprintf_s(buffer, sz, _TRUNCATE, format, ap);
+    if (count == -1)
+        count = _vscprintf(format, ap);
+
+    return count;
+}
+
+static __inline int
+c99_snprintf(char *buffer, size_t sz, const char *format, ...) {
+    int count;
+    va_list ap;
+
+    va_start(ap, format);
+    count = c99_vsnprintf(buffer, sz, format, ap);
+    va_end(ap);
+
+    return count;
+}
+
+#endif
+
+#endif /* __SC_STDIO_H */
+

src/cldai/CMakeLists.txt

@@ -34,10 +34,21 @@ include_directories(
   ${SC_SOURCE_DIR}/src/clutils
   )
 
-SC_ADDLIB(stepdai "${LIBSTEPDAI_SRCS}" "steputils;base")
+set(_libdeps steputils base)
+
+if(BUILD_SHARED_LIBS)
+  SC_ADDLIB(stepdai SHARED SOURCES ${LIBSTEPDAI_SRCS} LINK_LIBRARIES ${_libdeps})
+  if(WIN32)
+    target_compile_definitions(stepdai PRIVATE SC_DAI_DLL_EXPORTS)
+  endif()
+endif()
+
+if(BUILD_STATIC_LIBS)
+  SC_ADDLIB(stepdai-static STATIC SOURCES ${LIBSTEPDAI_SRCS} LINK_LIBRARIES $<JOIN:${_libdeps},-static >-static)
+endif()
 
 install(FILES ${SC_CLDAI_HDRS}
-  DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/cldai)
+  DESTINATION ${INCLUDE_DIR}/stepcode/cldai)
 
 # Local Variables:
 # tab-width: 8

src/cldai/sdaiBinary.h

@@ -15,7 +15,15 @@
 
 class SC_DAI_EXPORT SDAI_Binary {
     private:
+#ifdef _MSC_VER
+#pragma warning( push )
+#pragma warning( disable: 4251 )
+#endif
         std::string content;
+#ifdef _MSC_VER
+#pragma warning( pop )
+#endif
+
     public:
 
         //constructor(s) & destructor

src/cldai/sdaiDaObject.h

@@ -65,7 +65,7 @@ typedef SDAI_PID_ptr SDAI_PID_var;
 // The Direct Access Protocol supports direct access to persistent data
 // through typed attributes organized in data objects that are defined
 // in a Data Definition Language (DDL). An object using this protocol
-// whould represent its persistent data as one or more interconnected
+// would represent its persistent data as one or more interconnected
 // data objects, For uniformity, the persistent data of an object is
 // described as a single data object; however, that data object might be
 // the root of a graph of data objects interconnected by stored data

src/cldai/sdaiEntity_extent.cc

@@ -56,7 +56,7 @@ void SDAI_Entity_extent::owned_by_( SDAI_Model_contents__list_var& mclv ) {
 }
 
 SDAI_Model_contents__list_var SDAI_Entity_extent ::owned_by_() const {
-    return ( const SDAI_Model_contents__list_var ) &_owned_by;
+    return ( SDAI_Model_contents__list_var ) &_owned_by;
 }
 
 /*

src/cldai/sdaiEntity_extent.h

@@ -56,7 +56,7 @@ class SC_DAI_EXPORT SDAI_Entity_extent : public SDAI_Session_instance {
             return &_instances;
         }
         SDAI_DAObject__set_var instances_() const {
-            return ( const SDAI_DAObject__set_var )&_instances;
+            return ( SDAI_DAObject__set_var )&_instances;
         }
 
 // need to implement Model_contents__list

src/cldai/sdaiEnum.cc

@@ -313,6 +313,11 @@ SDAI_BOOLEAN & SDAI_BOOLEAN::operator= ( const SDAI_LOGICAL & t ) {
     return *this;
 }
 
+SDAI_BOOLEAN & SDAI_BOOLEAN::operator= ( const SDAI_BOOLEAN & t ) {
+    v = t;
+    return *this;
+}
+
 SDAI_BOOLEAN & SDAI_BOOLEAN::operator= ( const  Boolean t ) {
     v = t;
     return *this;

src/cldai/sdaiEnum.h

@@ -138,6 +138,7 @@ class SC_DAI_EXPORT SDAI_BOOLEAN :
 
         operator ::Boolean() const;
         SDAI_BOOLEAN & operator=( const SDAI_LOGICAL & t );
+        SDAI_BOOLEAN & operator=( const SDAI_BOOLEAN & t );
 
         SDAI_BOOLEAN & operator=( const ::Boolean t );
         SDAI_LOGICAL operator==( const SDAI_LOGICAL & t ) const;

src/cldai/sdaiModel_contents.cc

@@ -27,7 +27,7 @@ SDAI_Model_contents::instances_() {
 
 SDAI_Model_contents_instances_ptr
 SDAI_Model_contents::instances_() const {
-    return ( const SDAI_Model_contents_instances_ptr ) &_instances;
+    return ( SDAI_Model_contents_instances_ptr ) &_instances;
 }
 
 SDAI_Entity_extent__set_var
@@ -37,7 +37,7 @@ SDAI_Model_contents::folders_() {
 
 SDAI_Entity_extent__set_var
 SDAI_Model_contents::folders_() const {
-    return ( const SDAI_Entity_extent__set_var )&_folders;
+    return ( SDAI_Entity_extent__set_var )&_folders;
 }
 
 SDAI_Entity_extent__set_var
@@ -47,7 +47,7 @@ SDAI_Model_contents::populated_folders_() {
 
 SDAI_Entity_extent__set_var
 SDAI_Model_contents::populated_folders_() const {
-    return ( const SDAI_Entity_extent__set_var )&_populated_folders;
+    return ( SDAI_Entity_extent__set_var )&_populated_folders;
 }
 
 SDAI_PID_DA_ptr SDAI_Model_contents::get_object_pid( const SDAI_DAObject_ptr & d ) const {

src/cldai/sdaiModel_contents.h

@@ -40,7 +40,7 @@ class SC_DAI_EXPORT SDAI_Model_contents_instances : public SDAI_DAObject {
             return &_instances;
         }
         SDAI_DAObject__set_var contents_() const {
-            return ( const SDAI_DAObject__set_var ) &_instances;
+            return ( SDAI_DAObject__set_var ) &_instances;
         }
 
 };

src/cldai/sdaiString.cc

@@ -41,6 +41,11 @@ SDAI_String & SDAI_String::operator= ( const char * s ) {
     return *this;
 }
 
+SDAI_String & SDAI_String::operator= ( const SDAI_String & s ) {
+    content = s.content;
+    return *this;
+}
+
 bool SDAI_String::operator== ( const char * s ) const {
     return ( content == s );
 }

src/cldai/sdaiString.h

@@ -12,12 +12,21 @@
 */
 
 #include <sc_export.h>
+#include <string>
 #include <limits>
 
 
 class SC_DAI_EXPORT SDAI_String {
     private:
+#ifdef _MSC_VER
+#pragma warning( push )
+#pragma warning( disable: 4251 )
+#endif
         std::string content;
+#ifdef _MSC_VER
+#pragma warning( pop )
+#endif
+
     public:
 
         //constructor(s) & destructor
@@ -28,6 +37,7 @@ class SC_DAI_EXPORT SDAI_String {
 
 //  operators
         SDAI_String & operator= ( const char * s );
+        SDAI_String & operator= ( const SDAI_String & s );
         bool operator== ( const char * s ) const;
 
         void clear( void );

src/cleditor/CMakeLists.txt

@@ -27,10 +27,19 @@ include_directories(
   ${SC_SOURCE_DIR}/src/clutils
   )
 
-SC_ADDLIB(stepeditor "${LIBSTEPEDITOR_SRCS}" "stepcore;stepdai;steputils;base")
+if(BUILD_SHARED_LIBS)
+  SC_ADDLIB(stepeditor SHARED SOURCES ${LIBSTEPEDITOR_SRCS} LINK_LIBRARIES stepcore stepdai steputils base)
+  if(WIN32)
+    target_compile_definitions(stepeditor PRIVATE SC_EDITOR_DLL_EXPORTS)
+  endif()
+endif()
+
+if(BUILD_STATIC_LIBS)
+  SC_ADDLIB(stepeditor-static STATIC SOURCES ${LIBSTEPEDITOR_SRCS} LINK_LIBRARIES stepcore-static stepdai-static steputils-static base-static)
+endif()
 
 install(FILES ${SC_CLEDITOR_HDRS}
-  DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/cleditor)
+  DESTINATION ${INCLUDE_DIR}/stepcode/cleditor)
 
 # Local Variables:
 # tab-width: 8

src/cleditor/README

@@ -1,6 +1,6 @@
 This directory contains source code defining a collection of
 application independent classes supporting the editing of STEP
-instance data.  This library includes functions  for editing
+instance data.  This library includes functions for editing
 individual instances and for manipulating groups of instances.
 The editor library acts as an intermediary between the core library
 and a graphical user interface library.

src/cleditor/STEPfile.cc

@@ -101,7 +101,7 @@ float STEPfile::GetWriteProgress() const {
  * returns an error descriptor.
  * It expects to find the "HEADER;" symbol at the beginning of the istream.
  *
- * side effects: The function  gobbles all characters up to and including the
+ * side effects: The function gobbles all characters up to and including the
  * next "ENDSEC;" from in.
  * The STEPfile::_headerInstances may change.
  */
@@ -341,7 +341,7 @@ SDAI_Application_instance * STEPfile::HeaderDefaultFileSchema() {
  * If the _headerInstances contain no instances, then copy the instances
  * from im onto the _headerInstances.
  * This only works for an instance manager which contains the following
- * header section entites. The file id numbers are important.
+ * header section entities. The file id numbers are important.
  *
  * #1 = FILE_DESCRIPTION
  * #2 = FILE_NAME

src/cleditor/STEPfile.h

@@ -58,11 +58,18 @@ class SC_EDITOR_EXPORT STEPfile {
 
 //file information
         DirObj * _currentDir;
+#ifdef _MSC_VER
+#pragma warning( push )
+#pragma warning( disable: 4251 )
+#endif
         std::string _fileName;
 
         //the following are used to compute read/write progress
         std::ifstream::pos_type _iFileSize; ///< input file size
         std::ifstream::pos_type _iFileCurrentPosition; ///< input file position (from ifstream::tellg())
+#ifdef _MSC_VER
+#pragma warning( pop )
+#endif
         bool _iFileStage1Done; ///< set immediately before ReadData1() returns
         int _oFileInstsWritten; ///< number of instances that have been written
 
@@ -92,8 +99,15 @@ class SC_EDITOR_EXPORT STEPfile {
 //file type information
         FileTypeCode _fileType;
         char ENTITY_NAME_DELIM;
+#ifdef _MSC_VER
+#pragma warning( push )
+#pragma warning( disable: 4251 )
+#endif
         std::string FILE_DELIM;
         std::string END_FILE_DELIM;
+#ifdef _MSC_VER
+#pragma warning( pop )
+#endif
 
 //public member functions
     public:

src/cleditor/STEPfile.inline.cc

@@ -85,7 +85,7 @@ int STEPfile::SetFileType( FileTypeCode ft ) {
 ** from filename
 */
 std::string STEPfile::TruncFileName( const std::string filename ) const {
-#if defined(__WIN32__) && !defined(__mingw32__)
+#if defined(_WIN32) && !defined(__mingw32__)
     char slash = '\\';
 #else
     char slash = '/';

src/cleditor/SdaiHeaderSchema.cc

@@ -62,7 +62,7 @@ SdaiSection_language::SdaiSection_language( SDAI_Application_instance * se, int
     /*access functions still work. */
     attributes.push( a );
     /* Put attribute on the attributes list for the */
-    /* main inheritance heirarchy. */
+    /* main inheritance hierarchy. */
     if( !addAttrs || addAttrs[0] ) {
         se->attributes.push( a );
     }
@@ -72,7 +72,7 @@ SdaiSection_language::SdaiSection_language( SDAI_Application_instance * se, int
     /*access functions still work. */
     attributes.push( a );
     /* Put attribute on the attributes list for the */
-    /* main inheritance heirarchy. */
+    /* main inheritance hierarchy. */
     if( !addAttrs || addAttrs[0] ) {
         se->attributes.push( a );
     }
@@ -144,7 +144,7 @@ SdaiFile_population::SdaiFile_population( SDAI_Application_instance * se, int *
     /*access functions still work. */
     attributes.push( a );
     /* Put attribute on the attributes list for the */
-    /* main inheritance heirarchy. */
+    /* main inheritance hierarchy. */
     if( !addAttrs || addAttrs[0] ) {
         se->attributes.push( a );
     }
@@ -154,7 +154,7 @@ SdaiFile_population::SdaiFile_population( SDAI_Application_instance * se, int *
     /*access functions still work. */
     attributes.push( a );
     /* Put attribute on the attributes list for the */
-    /* main inheritance heirarchy. */
+    /* main inheritance hierarchy. */
     if( !addAttrs || addAttrs[0] ) {
         se->attributes.push( a );
     }
@@ -164,7 +164,7 @@ SdaiFile_population::SdaiFile_population( SDAI_Application_instance * se, int *
     /*access functions still work. */
     attributes.push( a );
     /* Put attribute on the attributes list for the */
-    /* main inheritance heirarchy. */
+    /* main inheritance hierarchy. */
     if( !addAttrs || addAttrs[0] ) {
         se->attributes.push( a );
     }
@@ -264,7 +264,7 @@ SdaiFile_name::SdaiFile_name( SDAI_Application_instance * se, int * addAttrs ) {
     /*access functions still work. */
     attributes.push( a );
     /* Put attribute on the attributes list for the */
-    /* main inheritance heirarchy. */
+    /* main inheritance hierarchy. */
     if( !addAttrs || addAttrs[0] ) {
         se->attributes.push( a );
     }
@@ -274,7 +274,7 @@ SdaiFile_name::SdaiFile_name( SDAI_Application_instance * se, int * addAttrs ) {
     /*access functions still work. */
     attributes.push( a );
     /* Put attribute on the attributes list for the */
-    /* main inheritance heirarchy. */
+    /* main inheritance hierarchy. */
     if( !addAttrs || addAttrs[0] ) {
         se->attributes.push( a );
     }
@@ -284,7 +284,7 @@ SdaiFile_name::SdaiFile_name( SDAI_Application_instance * se, int * addAttrs ) {
     /*access functions still work. */
     attributes.push( a );
     /* Put attribute on the attributes list for the */
-    /* main inheritance heirarchy. */
+    /* main inheritance hierarchy. */
     if( !addAttrs || addAttrs[0] ) {
         se->attributes.push( a );
     }
@@ -294,7 +294,7 @@ SdaiFile_name::SdaiFile_name( SDAI_Application_instance * se, int * addAttrs ) {
     /*access functions still work. */
     attributes.push( a );
     /* Put attribute on the attributes list for the */
-    /* main inheritance heirarchy. */
+    /* main inheritance hierarchy. */
     if( !addAttrs || addAttrs[0] ) {
         se->attributes.push( a );
     }
@@ -304,7 +304,7 @@ SdaiFile_name::SdaiFile_name( SDAI_Application_instance * se, int * addAttrs ) {
     /*access functions still work. */
     attributes.push( a );
     /* Put attribute on the attributes list for the */
-    /* main inheritance heirarchy. */
+    /* main inheritance hierarchy. */
     if( !addAttrs || addAttrs[0] ) {
         se->attributes.push( a );
     }
@@ -314,7 +314,7 @@ SdaiFile_name::SdaiFile_name( SDAI_Application_instance * se, int * addAttrs ) {
     /*access functions still work. */
     attributes.push( a );
     /* Put attribute on the attributes list for the */
-    /* main inheritance heirarchy. */
+    /* main inheritance hierarchy. */
     if( !addAttrs || addAttrs[0] ) {
         se->attributes.push( a );
     }
@@ -324,7 +324,7 @@ SdaiFile_name::SdaiFile_name( SDAI_Application_instance * se, int * addAttrs ) {
     /*access functions still work. */
     attributes.push( a );
     /* Put attribute on the attributes list for the */
-    /* main inheritance heirarchy. */
+    /* main inheritance hierarchy. */
     if( !addAttrs || addAttrs[0] ) {
         se->attributes.push( a );
     }
@@ -452,7 +452,7 @@ SdaiSection_context::SdaiSection_context( SDAI_Application_instance * se, int *
     /*access functions still work. */
     attributes.push( a );
     /* Put attribute on the attributes list for the */
-    /* main inheritance heirarchy. */
+    /* main inheritance hierarchy. */
     if( !addAttrs || addAttrs[0] ) {
         se->attributes.push( a );
     }
@@ -462,7 +462,7 @@ SdaiSection_context::SdaiSection_context( SDAI_Application_instance * se, int *
     /*access functions still work. */
     attributes.push( a );
     /* Put attribute on the attributes list for the */
-    /* main inheritance heirarchy. */
+    /* main inheritance hierarchy. */
     if( !addAttrs || addAttrs[0] ) {
         se->attributes.push( a );
     }
@@ -530,7 +530,7 @@ SdaiFile_description::SdaiFile_description( SDAI_Application_instance * se, int
     /*access functions still work. */
     attributes.push( a );
     /* Put attribute on the attributes list for the */
-    /* main inheritance heirarchy. */
+    /* main inheritance hierarchy. */
     if( !addAttrs || addAttrs[0] ) {
         se->attributes.push( a );
     }
@@ -540,7 +540,7 @@ SdaiFile_description::SdaiFile_description( SDAI_Application_instance * se, int
     /*access functions still work. */
     attributes.push( a );
     /* Put attribute on the attributes list for the */
-    /* main inheritance heirarchy. */
+    /* main inheritance hierarchy. */
     if( !addAttrs || addAttrs[0] ) {
         se->attributes.push( a );
     }
@@ -604,7 +604,7 @@ SdaiFile_schema::SdaiFile_schema( SDAI_Application_instance * se, int * addAttrs
     /*access functions still work. */
     attributes.push( a );
     /* Put attribute on the attributes list for the */
-    /* main inheritance heirarchy. */
+    /* main inheritance hierarchy. */
     if( !addAttrs || addAttrs[0] ) {
         se->attributes.push( a );
     }

src/cllazyfile/CMakeLists.txt

@@ -30,15 +30,25 @@ include_directories(
   ${SC_SOURCE_DIR}/src/base/judy/src
   )
 
-SC_ADDLIB(steplazyfile "${clLazyFile_SRCS};${clLazyFile_HDRS}" "stepcore;stepdai;steputils;base;stepeditor")
-SC_ADDEXEC(lazy_test "lazy_test.cc" "steplazyfile;stepeditor" NO_INSTALL)
-set_property(TARGET lazy_test APPEND PROPERTY COMPILE_DEFINITIONS "NO_REGISTRY")
-if(TARGET lazy_test-static)
-  set_property(TARGET lazy_test-static APPEND PROPERTY COMPILE_DEFINITIONS "NO_REGISTRY")
-endif(TARGET lazy_test-static)
+set(_libdeps stepcore stepdai steputils base stepeditor)
+
+if(BUILD_SHARED_LIBS)
+  SC_ADDLIB(steplazyfile SHARED SOURCES ${clLazyFile_SRCS} LINK_LIBRARIES ${_libdeps})
+  if(WIN32)
+    target_compile_definitions(steplazyfile PRIVATE SC_LAZYFILE_DLL_EXPORTS)
+  endif()
+endif()
+
+if(BUILD_STATIC_LIBS)
+  set(_libdeps stepcore-static stepdai-static steputils-static base-static stepeditor-static)
+  SC_ADDLIB(steplazyfile-static STATIC SOURCES ${clLazyFile_SRCS} LINK_LIBRARIES ${_libdeps})
+endif()
+
+SC_ADDEXEC(lazy_test SOURCES lazy_test.cc LINK_LIBRARIES steplazyfile stepeditor NO_INSTALL)
+target_compile_definitions(lazy_test PRIVATE NO_REGISTRY)
 
 install(FILES ${SC_CLLAZYFILE_HDRS}
-  DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/cllazyfile)
+  DESTINATION ${INCLUDE_DIR}/stepcode/cllazyfile)
 
 # Local Variables:
 # tab-width: 8

src/cllazyfile/current_function.hpp

@@ -28,26 +28,18 @@
 
 # define SC_CURRENT_FUNCTION __PRETTY_FUNCTION__
 
-#elif defined(__FUNCSIG__)
+#elif defined(_MSC_VER) && _MSC_VER < 1900
 
-# define SC_CURRENT_FUNCTION __FUNCSIG__
+# define SC_CURRENT_FUNCTION __FUNCTION__
 
 #elif (defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 600)) || (defined(__IBMCPP__) && (__IBMCPP__ >= 500))
 
 # define SC_CURRENT_FUNCTION __FUNCTION__
 
-#elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x550)
-
-# define SC_CURRENT_FUNCTION __FUNC__
-
-#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901)
+#else // STDC
 
 # define SC_CURRENT_FUNCTION __func__
 
-#else
-
-# define SC_CURRENT_FUNCTION "(unknown)"
-
 #endif
 
 #endif // #ifndef CURRENT_FUNCTION_HPP_INCLUDED

src/cllazyfile/lazyDataSectionReader.h

@@ -16,7 +16,14 @@
 class SC_LAZYFILE_EXPORT lazyDataSectionReader: public sectionReader {
     protected:
         bool _error, _completelyLoaded;
+#ifdef _MSC_VER
+#pragma warning( push )
+#pragma warning( disable: 4251 )
+#endif
         std::string _sectionIdentifier;
+#ifdef _MSC_VER
+#pragma warning( pop )
+#endif
 
         /// only makes sense to call the ctor from derived class ctors
         lazyDataSectionReader( lazyFileReader * parent, std::ifstream & file, std::streampos start, sectionID sid );