view build-aux/check-subst-vars.in.sh @ 32047:e3de59065cf1

inputParser.m: Re-architect internal data structures for 60% speed improvement. Key idea is to replace Parameter and Switch structs with name field containing a nested struct (def, val fields) with a struct array that has fields "name", "def", and "val". This makes it possible to eliminate for loops. * NEWS.9.md: Announce performance improvement. * inputParser.m: Declare "Parameter" and "Switch" properties as struct arrays. Add new private property "last_idx" which caches the last Parameter or Switch lookup. * inputParser.m (addRequired): Adjust input validation to use numel() now rather than numfields(). * inputParser.m (addOptional): Adjust input validation to use numel() now rather than numfields(). * inputParser.m (addParameter): Change code to add new Parameter to a struct array. * inputParser.m (addSwitch): Change code to add new Switch to a struct array. * inputParser.m (parse): Adjust initialization of internal variables ParameterNames and SwitchNames to match new data structure. Use last_idx to simplify call to validate_arg() for Parameters. * inputParser.m (validate_arg): Move creation of error message to code path when error has been found---No need to do it for every function call. Don't capture "exception" variable in try/catch as it is no longer used. * inputParser.m (is_argname): Cache "last_idx" if match was found. * inputParser.m (add_missing): Replace call to setdiff() with in-place code which can take advantage of implicit knowledge to eliminate calls to unique and input validation. Replace for loop with cell2struct/struct2cell combination.
author Rik <rik@octave.org>
date Fri, 21 Apr 2023 11:01:40 -0700
parents 597f3ee61a48
children 2e484f9f1f18
line wrap: on
line source

#! /bin/sh

########################################################################
##
## Copyright (C) 2016-2023 The Octave Project Developers
##
## See the file COPYRIGHT.md in the top-level directory of this
## distribution or <https://octave.org/copyright/>.
##
## This file is part of Octave.
##
## Octave is free software: you can redistribute it and/or modify it
## under the terms of the GNU General Public License as published by
## the Free Software Foundation, either version 3 of the License, or
## (at your option) any later version.
##
## Octave is distributed in the hope that it will be useful, but
## WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
## GNU General Public License for more details.
##
## You should have received a copy of the GNU General Public License
## along with Octave; see the file COPYING.  If not, see
## <https://www.gnu.org/licenses/>.
##
########################################################################

: ${AWK=@AWK@}
: ${SED=@SED@}

if test $# -ne 2; then
  echo "usage: check-subst-vars.sh make-vars-file config-vars-file" 2>&1
  exit 1
fi

awk_script="check-subst-vars-$$.awk"

trap "rm -f $awk_script; exit 1" 1 2 15

make_vars="$1"
config_vars="$2"

## Generate awk script to check variable consistency.

cat << EOF > $awk_script
BEGIN {
  status = 0;
EOF

while read var val; do
  val=`echo "$val" | $SED 's/"/\\\\"/g'`
  echo "make_vars[\"$var\"] = \"$val\";" >> $awk_script
done < $make_vars

cat << EOF >> $awk_script
} {
  line = \$0;
  idx = index (line, " ");
  var = substr (line, 1, idx-1);
  val = substr (line, idx+1);
  if (val != make_vars[var])
    {
      printf ("error: mismatch for configuration variable '%s'\n", var);
      printf ("  value set in configuration files: %s\n", val);
      printf ("  value set in Make: %s\n", make_vars[var]);
      status = 1;
    }
} END {
  exit status;
}
EOF

## Execute it.

$AWK -f $awk_script $config_vars 1>&2

rm -f $awk_script