ivtools-patch

more NetBSD config touchups

[<ivt...@li...>]

Patch:	ivtools-000107-johnston-005
For:	ivtools-0.7.10
Author:	joh...@us...

This is an intermediate patch to ivtools-0.7.10.  To apply, cd to the
top-level directory of the ivtools source tree (the directory with src
and config subdirs), and apply like this:

	patch -s <ThisFile

Summary of Changes:

- more touchups for NetBSD support.

Index: top_ivtools/MANIFEST
diff -c top_ivtools/MANIFEST:1.2 top_ivtools/MANIFEST:1.3
*** top_ivtools/MANIFEST:1.2	Fri Jan  7 16:07:48 2000
--- ./MANIFEST	Fri Jan  7 16:07:48 2000
***************
*** 40,45 ****
--- 40,46 ----
  ivtools-0.7/config/InterViews/iv-m4330.cf
  ivtools-0.7/config/InterViews/iv-macII.cf
  ivtools-0.7/config/InterViews/iv-moto.cf
+ ivtools-0.7/config/InterViews/iv-netbsd.cf
  ivtools-0.7/config/InterViews/iv-pegasus.cf
  ivtools-0.7/config/InterViews/iv-sgi.cf
  ivtools-0.7/config/InterViews/iv-sony.cf
***************
*** 71,76 ****
--- 72,78 ----
  ivtools-0.7/config/m88k-sysv3-gcc.mk
  ivtools-0.7/config/m88k-sysv4-gcc.mk
  ivtools-0.7/config/makevars.def
+ ivtools-0.7/config/netbsd-gcc.mk
  ivtools-0.7/config/params.def
  ivtools-0.7/config/rules.def
  ivtools-0.7/config/sco3.2.4-gcc.mk
***************
*** 78,83 ****
--- 80,86 ----
  ivtools-0.7/config/site.def.CYGWIN
  ivtools-0.7/config/site.def.HP800
  ivtools-0.7/config/site.def.LINUX
+ ivtools-0.7/config/site.def.NETBSD
  ivtools-0.7/config/site.def.SGI
  ivtools-0.7/config/site.def.SUN4
  ivtools-0.7/config/solaris-gcc.mk
Index: top_ivtools/MANIFEST.comterp
diff -c top_ivtools/MANIFEST.comterp:1.1 top_ivtools/MANIFEST.comterp:1.2
*** top_ivtools/MANIFEST.comterp:1.1	Fri Jan  7 16:07:48 2000
--- ./MANIFEST.comterp	Fri Jan  7 16:07:48 2000
***************
*** 24,29 ****
--- 24,30 ----
  config/InterViews/iv-m4330.cf
  config/InterViews/iv-macII.cf
  config/InterViews/iv-moto.cf
+ config/InterViews/iv-netbsd.cf
  config/InterViews/iv-pegasus.cf
  config/InterViews/iv-sgi.cf
  config/InterViews/iv-sony.cf
***************
*** 54,65 ****
--- 55,68 ----
  config/m88k-sysv3-gcc.mk
  config/m88k-sysv4-gcc.mk
  config/makevars.def
+ config/netbsd-gcc.mk
  config/params.def
  config/rules.def
  config/sco3.2.4-gcc.mk
  config/site.def.ALPHA
  config/site.def.HP800
  config/site.def.LINUX
+ config/site.def.NETBSD
  config/site.def.SGI
  config/site.def.SUN4
  config/solaris-gcc.mk
Index: config_ivtools/params.def
diff -c config_ivtools/params.def:1.2 config_ivtools/params.def:1.3
*** config_ivtools/params.def:1.2	Fri Jan  7 16:08:19 2000
--- config/params.def	Fri Jan  7 16:08:19 2000
***************
*** 51,57 ****
  *.sed comutil.arg comterp.err comutil.ci comterp.arg comterp.ci \
  site.def.SUN4 site.def.LINUX site.def.SGI site.def.HP800 site.def.ALPHA site.def.CYGWIN site.def.NETBSD \
  WishList *.defaults *.cf HOWTO Copyright *.sh CHANGES CHANGES-0.? *.cpp ivmkmf *.bash *.1  *.3 \
! config.guess config.sub configure configure.in MANIFEST.perceps MANIFEST.comterp *.mk config.mk.in *.tmpl *.flt *.m4
  #endif
  
     REPOSITORY_FILES = RepositoryFiles
--- 51,57 ----
  *.sed comutil.arg comterp.err comutil.ci comterp.arg comterp.ci \
  site.def.SUN4 site.def.LINUX site.def.SGI site.def.HP800 site.def.ALPHA site.def.CYGWIN site.def.NETBSD \
  WishList *.defaults *.cf HOWTO Copyright *.sh CHANGES CHANGES-0.? *.cpp ivmkmf *.bash *.1  *.3 \
! config.guess config.sub configure configure.in MANIFEST.perceps MANIFEST.comterp *.mk config.mk.in *.tmpl *.flt *.m4 config.defs.in
  #endif
  
     REPOSITORY_FILES = RepositoryFiles

add NetBSD to config files

[<ivt...@li...>]

Patch:	ivtools-000105-johnston-004
For:	ivtools-0.7.10
Author:	joh...@us...

This is an intermediate patch to ivtools-0.7.10.  To apply, cd to the
top-level directory of the ivtools source tree (the directory with src
and config subdirs), and apply like this:

	patch -s <ThisFile

Summary of Changes:

- attempt to add support for NetBSD to the configuration files.

Index: top_ivtools/configure
diff -c top_ivtools/configure:1.1 top_ivtools/configure:1.2
*** top_ivtools/configure:1.1	Wed Jan  5 10:40:16 2000
--- ./configure	Wed Jan  5 10:40:16 2000
***************
*** 1,7 ****
  #! /bin/sh
  
  # Guess values for system-dependent variables and create Makefiles.
! # Generated automatically using autoconf version 2.13 
  # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
  #
  # This configure script is free software; the Free Software Foundation
--- 1,7 ----
  #! /bin/sh
  
  # Guess values for system-dependent variables and create Makefiles.
! # Generated automatically using autoconf version 2.12 
  # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
  #
  # This configure script is free software; the Free Software Foundation
***************
*** 69,75 ****
  # Initialize some other variables.
  subdirs=
  MFLAGS= MAKEFLAGS=
- SHELL=${CONFIG_SHELL-/bin/sh}
  # Maximum number of lines to put in a shell here document.
  ac_max_here_lines=12
  
--- 69,74 ----
***************
*** 326,332 ****
      verbose=yes ;;
  
    -version | --version | --versio | --versi | --vers)
!     echo "configure generated by autoconf version 2.13"
      exit 0 ;;
  
    -with-* | --with-*)
--- 325,331 ----
      verbose=yes ;;
  
    -version | --version | --versio | --versi | --vers)
!     echo "configure generated by autoconf version 2.12"
      exit 0 ;;
  
    -with-* | --with-*)
***************
*** 496,506 ****
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  cross_compiling=$ac_cv_prog_cc_cross
  
- ac_exeext=
- ac_objext=o
  if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
    # Stardent Vistra SVR4 grep lacks -e, says gh...@ca....
    if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
--- 495,503 ----
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  cross_compiling=$ac_cv_prog_cc_cross
  
  if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
    # Stardent Vistra SVR4 grep lacks -e, says gh...@ca....
    if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
***************
*** 536,561 ****
  # set the canonical host vars
  
  # Make sure we can run config.sub.
! if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
  else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
  fi
  
  echo $ac_n "checking host system type""... $ac_c" 1>&6
! echo "configure:574: checking host system type" >&5
  
  host_alias=$host
  case "$host_alias" in
  NONE)
    case $nonopt in
    NONE)
!     if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
      else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
      fi ;;
    *) host_alias=$nonopt ;;
    esac ;;
  esac
  
! host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
  host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
  host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
  host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
--- 533,558 ----
  # set the canonical host vars
  
  # Make sure we can run config.sub.
! if $ac_config_sub sun4 >/dev/null 2>&1; then :
  else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
  fi
  
  echo $ac_n "checking host system type""... $ac_c" 1>&6
! echo "configure:571: checking host system type" >&5
  
  host_alias=$host
  case "$host_alias" in
  NONE)
    case $nonopt in
    NONE)
!     if host_alias=`$ac_config_guess`; then :
      else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
      fi ;;
    *) host_alias=$nonopt ;;
    esac ;;
  esac
  
! host=`$ac_config_sub $host_alias`
  host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
  host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
  host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
***************
*** 566,571 ****
--- 563,569 ----
      *freebsd2.1.* ) platform_part=freebsd2.1 ;;
      *hpux*10*20) platform_part=hpux10.20 ;;
      *hpux* ) platform_part=hpux ;;
+     *netbsd* ) platform_part=netbsd ;;
      *linux* ) platform_part=linux ;;
      m88k-*-sysv4 ) platform_part=m88k-sysv4 ;;
      m88k-*-sysv3 ) platform_part=m88k-sysv3 ;;
***************
*** 799,819 ****
  
  
  # check of the c++ compiler
! for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
  do
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:837: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    if test -n "$CXX"; then
    ac_cv_prog_CXX="$CXX" # Let the user override the test.
  else
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
!   ac_dummy="$PATH"
!   for ac_dir in $ac_dummy; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_prog_CXX="$ac_prog"
--- 797,816 ----
  
  
  # check of the c++ compiler
! for ac_prog in $CCC c++ g++ gcc CC cxx cc++
  do
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:835: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    if test -n "$CXX"; then
    ac_cv_prog_CXX="$CXX" # Let the user override the test.
  else
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
!   for ac_dir in $PATH; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_prog_CXX="$ac_prog"
***************
*** 836,858 ****
  
  
  echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
! echo "configure:869: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
  
  ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
! ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  cross_compiling=$ac_cv_prog_cxx_cross
  
! cat > conftest.$ac_ext << EOF
! 
! #line 880 "configure"
  #include "confdefs.h"
! 
! int main(){return(0);}
  EOF
! if { (eval echo configure:885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    ac_cv_prog_cxx_works=yes
    # If we can't run a trivial program, we are probably using a cross compiler.
    if (./conftest; exit) 2>/dev/null; then
--- 833,853 ----
  
  
  echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
! echo "configure:866: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
  
  ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  cross_compiling=$ac_cv_prog_cxx_cross
  
! cat > conftest.$ac_ext <<EOF
! #line 876 "configure"
  #include "confdefs.h"
! main(){return(0);}
  EOF
! if { (eval echo configure:880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    ac_cv_prog_cxx_works=yes
    # If we can't run a trivial program, we are probably using a cross compiler.
    if (./conftest; exit) 2>/dev/null; then
***************
*** 870,876 ****
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  cross_compiling=$ac_cv_prog_cc_cross
  
  echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6
--- 865,871 ----
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  cross_compiling=$ac_cv_prog_cc_cross
  
  echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6
***************
*** 878,889 ****
    { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
  fi
  echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
! echo "configure:911: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
  echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
  cross_compiling=$ac_cv_prog_cxx_cross
  
  echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
! echo "configure:916: checking whether we are using GNU C++" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 873,884 ----
    { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
  fi
  echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
! echo "configure:906: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
  echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
  cross_compiling=$ac_cv_prog_cxx_cross
  
  echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
! echo "configure:911: checking whether we are using GNU C++" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 892,898 ****
    yes;
  #endif
  EOF
! if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:925: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    ac_cv_prog_gxx=yes
  else
    ac_cv_prog_gxx=no
--- 887,893 ----
    yes;
  #endif
  EOF
! if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:920: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    ac_cv_prog_gxx=yes
  else
    ac_cv_prog_gxx=no
***************
*** 903,917 ****
  
  if test $ac_cv_prog_gxx = yes; then
    GXX=yes
! else
!   GXX=
! fi
! 
! ac_test_CXXFLAGS="${CXXFLAGS+set}"
! ac_save_CXXFLAGS="$CXXFLAGS"
! CXXFLAGS=
! echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
! echo "configure:944: checking whether ${CXX-g++} accepts -g" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 898,908 ----
  
  if test $ac_cv_prog_gxx = yes; then
    GXX=yes
!   ac_test_CXXFLAGS="${CXXFLAGS+set}"
!   ac_save_CXXFLAGS="$CXXFLAGS"
!   CXXFLAGS=
!   echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
! echo "configure:935: checking whether ${CXX-g++} accepts -g" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 926,961 ****
  fi
  
  echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6
! if test "$ac_test_CXXFLAGS" = set; then
!   CXXFLAGS="$ac_save_CXXFLAGS"
! elif test $ac_cv_prog_cxx_g = yes; then
!   if test "$GXX" = yes; then
      CXXFLAGS="-g -O2"
    else
-     CXXFLAGS="-g"
-   fi
- else
-   if test "$GXX" = yes; then
      CXXFLAGS="-O2"
-   else
-     CXXFLAGS=
    fi
  fi
  
  # check for the c compiler
  # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:979: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
  else
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
!   ac_dummy="$PATH"
!   for ac_dir in $ac_dummy; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_prog_CC="gcc"
--- 917,947 ----
  fi
  
  echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6
!   if test "$ac_test_CXXFLAGS" = set; then
!     CXXFLAGS="$ac_save_CXXFLAGS"
!   elif test $ac_cv_prog_cxx_g = yes; then
      CXXFLAGS="-g -O2"
    else
      CXXFLAGS="-O2"
    fi
+ else
+   GXX=
+   test "${CXXFLAGS+set}" = set || CXXFLAGS="-g"
  fi
  
  # check for the c compiler
  # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:966: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
  else
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
!   for ac_dir in $PATH; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_prog_CC="gcc"
***************
*** 976,992 ****
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1009: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
  else
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
    ac_prog_rejected=no
!   ac_dummy="$PATH"
!   for ac_dir in $ac_dummy; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
--- 962,977 ----
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:995: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
  else
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
    ac_prog_rejected=no
!   for ac_dir in $PATH; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
***************
*** 1021,1081 ****
    echo "$ac_t""no" 1>&6
  fi
  
-   if test -z "$CC"; then
-     case "`uname -s`" in
-     *win32* | *WIN32*)
-       # Extract the first word of "cl", so it can be a program name with args.
- set dummy cl; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
- echo "configure:1060: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
- else
-   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-   ac_dummy="$PATH"
-   for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-       ac_cv_prog_CC="cl"
-       break
-     fi
-   done
-   IFS="$ac_save_ifs"
- fi
- fi
- CC="$ac_cv_prog_CC"
- if test -n "$CC"; then
-   echo "$ac_t""$CC" 1>&6
- else
-   echo "$ac_t""no" 1>&6
- fi
-  ;;
-     esac
-   fi
    test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
  fi
  
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
! echo "configure:1092: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
  
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  cross_compiling=$ac_cv_prog_cc_cross
  
! cat > conftest.$ac_ext << EOF
! 
! #line 1103 "configure"
  #include "confdefs.h"
- 
  main(){return(0);}
  EOF
! if { (eval echo configure:1108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    ac_cv_prog_cc_works=yes
    # If we can't run a trivial program, we are probably using a cross compiler.
    if (./conftest; exit) 2>/dev/null; then
--- 1006,1030 ----
    echo "$ac_t""no" 1>&6
  fi
  
    test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
  fi
  
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
! echo "configure:1043: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
  
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  cross_compiling=$ac_cv_prog_cc_cross
  
! cat > conftest.$ac_ext <<EOF
! #line 1053 "configure"
  #include "confdefs.h"
  main(){return(0);}
  EOF
! if { (eval echo configure:1057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    ac_cv_prog_cc_works=yes
    # If we can't run a trivial program, we are probably using a cross compiler.
    if (./conftest; exit) 2>/dev/null; then
***************
*** 1089,1112 ****
    ac_cv_prog_cc_works=no
  fi
  rm -fr conftest*
- ac_ext=c
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
- ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- cross_compiling=$ac_cv_prog_cc_cross
  
  echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
  if test $ac_cv_prog_cc_works = no; then
    { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
  fi
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
! echo "configure:1134: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
  echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
  cross_compiling=$ac_cv_prog_cc_cross
  
  echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
! echo "configure:1139: checking whether we are using GNU C" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 1038,1055 ----
    ac_cv_prog_cc_works=no
  fi
  rm -fr conftest*
  
  echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
  if test $ac_cv_prog_cc_works = no; then
    { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
  fi
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
! echo "configure:1077: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
  echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
  cross_compiling=$ac_cv_prog_cc_cross
  
  echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
! echo "configure:1082: checking whether we are using GNU C" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 1115,1121 ****
    yes;
  #endif
  EOF
! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1148: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    ac_cv_prog_gcc=yes
  else
    ac_cv_prog_gcc=no
--- 1058,1064 ----
    yes;
  #endif
  EOF
! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1091: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    ac_cv_prog_gcc=yes
  else
    ac_cv_prog_gcc=no
***************
*** 1126,1140 ****
  
  if test $ac_cv_prog_gcc = yes; then
    GCC=yes
! else
!   GCC=
! fi
! 
! ac_test_CFLAGS="${CFLAGS+set}"
! ac_save_CFLAGS="$CFLAGS"
! CFLAGS=
! echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
! echo "configure:1167: checking whether ${CC-cc} accepts -g" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 1069,1079 ----
  
  if test $ac_cv_prog_gcc = yes; then
    GCC=yes
!   ac_test_CFLAGS="${CFLAGS+set}"
!   ac_save_CFLAGS="$CFLAGS"
!   CFLAGS=
!   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
! echo "configure:1106: checking whether ${CC-cc} accepts -g" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 1149,1173 ****
  fi
  
  echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
! if test "$ac_test_CFLAGS" = set; then
!   CFLAGS="$ac_save_CFLAGS"
! elif test $ac_cv_prog_cc_g = yes; then
!   if test "$GCC" = yes; then
      CFLAGS="-g -O2"
    else
-     CFLAGS="-g"
-   fi
- else
-   if test "$GCC" = yes; then
      CFLAGS="-O2"
-   else
-     CFLAGS=
    fi
  fi
  
  # check for CPP
  echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
! echo "configure:1200: checking how to run the C++ preprocessor" >&5
  if test -z "$CXXCPP"; then
  if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1088,1108 ----
  fi
  
  echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
!   if test "$ac_test_CFLAGS" = set; then
!     CFLAGS="$ac_save_CFLAGS"
!   elif test $ac_cv_prog_cc_g = yes; then
      CFLAGS="-g -O2"
    else
      CFLAGS="-O2"
    fi
+ else
+   GCC=
+   test "${CFLAGS+set}" = set || CFLAGS="-g"
  fi
  
  # check for CPP
  echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
! echo "configure:1135: checking how to run the C++ preprocessor" >&5
  if test -z "$CXXCPP"; then
  if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1176,1192 ****
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
! ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  cross_compiling=$ac_cv_prog_cxx_cross
    CXXCPP="${CXX-g++} -E"
    cat > conftest.$ac_ext <<EOF
! #line 1213 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1218: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    :
  else
--- 1111,1127 ----
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  cross_compiling=$ac_cv_prog_cxx_cross
    CXXCPP="${CXX-g++} -E"
    cat > conftest.$ac_ext <<EOF
! #line 1148 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1153: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    :
  else
***************
*** 1202,1208 ****
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  cross_compiling=$ac_cv_prog_cc_cross
  fi
  fi
--- 1137,1143 ----
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  cross_compiling=$ac_cv_prog_cc_cross
  fi
  fi
***************
*** 1213,1228 ****
  # Extract the first word of "ranlib", so it can be a program name with args.
  set dummy ranlib; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1246: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    if test -n "$RANLIB"; then
    ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
  else
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
!   ac_dummy="$PATH"
!   for ac_dir in $ac_dummy; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_prog_RANLIB="ranlib"
--- 1148,1162 ----
  # Extract the first word of "ranlib", so it can be a program name with args.
  set dummy ranlib; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1181: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    if test -n "$RANLIB"; then
    ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
  else
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
!   for ac_dir in $PATH; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_prog_RANLIB="ranlib"
***************
*** 1242,1248 ****
  
  # check for X paths
  echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
! echo "configure:1275: checking how to run the C preprocessor" >&5
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
--- 1176,1182 ----
  
  # check for X paths
  echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
! echo "configure:1209: checking how to run the C preprocessor" >&5
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
***************
*** 1257,1270 ****
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp.
    cat > conftest.$ac_ext <<EOF
! #line 1290 "configure"
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1296: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    :
  else
--- 1191,1204 ----
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp.
    cat > conftest.$ac_ext <<EOF
! #line 1224 "configure"
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1230: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    :
  else
***************
*** 1274,1304 ****
    rm -rf conftest*
    CPP="${CC-cc} -E -traditional-cpp"
    cat > conftest.$ac_ext <<EOF
! #line 1307 "configure"
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
! if test -z "$ac_err"; then
!   :
! else
!   echo "$ac_err" >&5
!   echo "configure: failed program was:" >&5
!   cat conftest.$ac_ext >&5
!   rm -rf conftest*
!   CPP="${CC-cc} -nologo -E"
!   cat > conftest.$ac_ext <<EOF
! #line 1324 "configure"
! #include "confdefs.h"
! #include <assert.h>
! Syntax Error
! EOF
! ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1330: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    :
  else
--- 1208,1221 ----
    rm -rf conftest*
    CPP="${CC-cc} -E -traditional-cpp"
    cat > conftest.$ac_ext <<EOF
! #line 1241 "configure"
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1247: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    :
  else
***************
*** 1311,1318 ****
  rm -f conftest*
  fi
  rm -f conftest*
- fi
- rm -f conftest*
    ac_cv_prog_CPP="$CPP"
  fi
    CPP="$ac_cv_prog_CPP"
--- 1228,1233 ----
***************
*** 1326,1332 ****
  # Uses ac_ vars as temps to allow command line to override cache and checks.
  # --without-x overrides everything else, but does not touch the cache.
  echo $ac_n "checking for X""... $ac_c" 1>&6
! echo "configure:1359: checking for X" >&5
  
  # Check whether --with-x or --without-x was given.
  if test "${with_x+set}" = set; then
--- 1241,1247 ----
  # Uses ac_ vars as temps to allow command line to override cache and checks.
  # --without-x overrides everything else, but does not touch the cache.
  echo $ac_n "checking for X""... $ac_c" 1>&6
! echo "configure:1274: checking for X" >&5
  
  # Check whether --with-x or --without-x was given.
  if test "${with_x+set}" = set; then
***************
*** 1388,1400 ****
  
    # First, try using that file with no special directory specified.
  cat > conftest.$ac_ext <<EOF
! #line 1421 "configure"
  #include "confdefs.h"
  #include <$x_direct_test_include>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1426: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
    # We can compile using X headers with no special include directory.
--- 1303,1315 ----
  
    # First, try using that file with no special directory specified.
  cat > conftest.$ac_ext <<EOF
! #line 1336 "configure"
  #include "confdefs.h"
  #include <$x_direct_test_include>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1341: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    rm -rf conftest*
    # We can compile using X headers with no special include directory.
***************
*** 1462,1475 ****
    ac_save_LIBS="$LIBS"
    LIBS="-l$x_direct_test_library $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1495 "configure"
  #include "confdefs.h"
  
  int main() {
  ${x_direct_test_function}()
  ; return 0; }
  EOF
! if { (eval echo configure:1502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    LIBS="$ac_save_LIBS"
  # We can link X programs with no special library path.
--- 1377,1390 ----
    ac_save_LIBS="$LIBS"
    LIBS="-l$x_direct_test_library $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1410 "configure"
  #include "confdefs.h"
  
  int main() {
  ${x_direct_test_function}()
  ; return 0; }
  EOF
! if { (eval echo configure:1417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    LIBS="$ac_save_LIBS"
  # We can link X programs with no special library path.
***************
*** 1561,1567 ****
  #AC_CXX_HEADERS
  
  echo $ac_n "checking for directory to install c++ include files""... $ac_c" 1>&6
! echo "configure:1594: checking for directory to install c++ include files" >&5
  if eval "test \"`echo '$''{'ice_cv_cxx_include_dir'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 1476,1482 ----
  #AC_CXX_HEADERS
  
  echo $ac_n "checking for directory to install c++ include files""... $ac_c" 1>&6
! echo "configure:1509: checking for directory to install c++ include files" >&5
  if eval "test \"`echo '$''{'ice_cv_cxx_include_dir'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 1725,1731 ****
  # Ultrix sh set writes to stderr and can't be redirected directly,
  # and sets the high bit in the cache file unless we assign to the vars.
  (set) 2>&1 |
!   case `(ac_space=' '; set | grep ac_space) 2>&1` in
    *ac_space=\ *)
      # `set' does not quote correctly, so add quotes (double-quote substitution
      # turns \\\\ into \\, and sed turns \\ into \).
--- 1640,1646 ----
  # Ultrix sh set writes to stderr and can't be redirected directly,
  # and sets the high bit in the cache file unless we assign to the vars.
  (set) 2>&1 |
!   case `(ac_space=' '; set) 2>&1` in
    *ac_space=\ *)
      # `set' does not quote correctly, so add quotes (double-quote substitution
      # turns \\\\ into \\, and sed turns \\ into \).
***************
*** 1804,1810 ****
      echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
      exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
    -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
!     echo "$CONFIG_STATUS generated by autoconf version 2.13"
      exit 0 ;;
    -help | --help | --hel | --he | --h)
      echo "\$ac_cs_usage"; exit 0 ;;
--- 1719,1725 ----
      echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
      exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
    -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
!     echo "$CONFIG_STATUS generated by autoconf version 2.12"
      exit 0 ;;
    -help | --help | --hel | --he | --h)
      echo "\$ac_cs_usage"; exit 0 ;;
***************
*** 1823,1833 ****
   s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
  $ac_vpsub
  $extrasub
- s%@SHELL@%$SHELL%g
  s%@CFLAGS@%$CFLAGS%g
  s%@CPPFLAGS@%$CPPFLAGS%g
  s%@CXXFLAGS@%$CXXFLAGS%g
- s%@FFLAGS@%$FFLAGS%g
  s%@DEFS@%$DEFS%g
  s%@LDFLAGS@%$LDFLAGS%g
  s%@LIBS@%$LIBS%g
--- 1738,1746 ----
Index: top_ivtools/configure.in
diff -c top_ivtools/configure.in:1.1 top_ivtools/configure.in:1.2
*** top_ivtools/configure.in:1.1	Wed Jan  5 10:40:16 2000
--- ./configure.in	Wed Jan  5 10:40:16 2000
***************
*** 10,15 ****
--- 10,16 ----
      *freebsd2.1.* ) platform_part=freebsd2.1 ;;
      *hpux*10*20) platform_part=hpux10.20 ;;
      *hpux* ) platform_part=hpux ;;
+     *netbsd* ) platform_part=netbsd ;;
      *linux* ) platform_part=linux ;;
      m88k-*-sysv4 ) platform_part=m88k-sysv4 ;;
      m88k-*-sysv3 ) platform_part=m88k-sysv3 ;;
Index: config_ivtools/arch.def
diff -c config_ivtools/arch.def:1.1 config_ivtools/arch.def:1.2
*** config_ivtools/arch.def:1.1	Wed Jan  5 10:40:46 2000
--- config/arch.def	Wed Jan  5 10:40:46 2000
***************
*** 452,457 ****
--- 452,468 ----
  #define MacroFile InterViews/iv-cygwin.cf
  #endif /* __CYGWIN__ */
  
+ #if defined(__NetBSD__)
+ #undef NETBSD
+ #undef netbsd
+ #define NetBSDArchitecture
+ #define ArchitectureName NETBSD
+ #define architectureName netbsd
+ #define SiteDefCpu <site.def.NETBSD>
+ #define MacroIncludeFile <InterViews/iv-netbsd.cf>
+ #define MacroFile InterViews/iv-netbsd.cf
+ #endif /* __NetBSD__ */
+ 
  #ifndef ArchitectureName
  XCOMM WARNING: Imakefile not configured; guessing at definitions!!!
  XCOMM This might mean that BOOTSTRAPCFLAGS was not set when building imake.
Index: config_ivtools/params.def
diff -c config_ivtools/params.def:1.1 config_ivtools/params.def:1.2
*** config_ivtools/params.def:1.1	Wed Jan  5 10:40:46 2000
--- config/params.def	Wed Jan  5 10:40:46 2000
***************
*** 48,55 ****
  #ifndef RepositoryFiles
  #define RepositoryFiles *.c *.cc *.cxx *.C *.h Imakefile *.def template \
  README INSTALL VERSION MANIFEST COPYRIGHT ANNOUNCE README.ivmkcm *.patch *.bugfix.? *.script \
! *.sed comutil.arg comterp.err comutil.ci comterp.arg comterp.ci site.def.SUN4 \
! site.def.LINUX site.def.SGI site.def.HP800 site.def.ALPHA WishList *.defaults *.cf HOWTO Copyright *.sh CHANGES CHANGES-0.? *.cpp ivmkmf *.bash *.1  *.3 \
  config.guess config.sub configure configure.in MANIFEST.perceps MANIFEST.comterp *.mk config.mk.in *.tmpl *.flt *.m4
  #endif
  
--- 48,56 ----
  #ifndef RepositoryFiles
  #define RepositoryFiles *.c *.cc *.cxx *.C *.h Imakefile *.def template \
  README INSTALL VERSION MANIFEST COPYRIGHT ANNOUNCE README.ivmkcm *.patch *.bugfix.? *.script \
! *.sed comutil.arg comterp.err comutil.ci comterp.arg comterp.ci \
! site.def.SUN4 site.def.LINUX site.def.SGI site.def.HP800 site.def.ALPHA site.def.CYGWIN site.def.NETBSD \
! WishList *.defaults *.cf HOWTO Copyright *.sh CHANGES CHANGES-0.? *.cpp ivmkmf *.bash *.1  *.3 \
  config.guess config.sub configure configure.in MANIFEST.perceps MANIFEST.comterp *.mk config.mk.in *.tmpl *.flt *.m4
  #endif
  
Index: config_ivtools/site.def.NETBSD
diff -c /dev/null config_ivtools/site.def.NETBSD:1.1
*** /dev/null	Wed Jan  5 10:40:46 2000
--- config/site.def.NETBSD	Wed Jan  5 10:40:46 2000
***************
*** 0 ****
--- 1,67 ----
+ /* base directory for software projects */
+ #define ProjectDir /proj
+ 
+ /* gcc command line with -V for version and -O for optimize */
+ #define CCDriver g++
+ 
+ #undef HasDynamicSharedLibraries
+ #define HasDynamicSharedLibraries YES
+ 
+ #undef SharedCCFlags
+ #define SharedCCFlags -fPIC
+ 
+ #undef SharedCCLdFlags
+ #define SharedCCLdFlags
+ 
+ #undef TroffCmd
+ #define TroffCmd groff
+ 
+ /* 
+  * build RPC classes -- requires iostreams & TCP sockets
+  */
+ #undef BuildRPCClasses
+ #define BuildRPCClasses YES 
+ #define SOMAXCONN 5
+ 
+ /* override -ansi -pedantic from xfree86.cf */
+ #undef DefaultCCOptions
+ #define DefaultCCOptions /**/
+ 
+ /* machine-specific gcc include directory -- does not change with each new version of gcc */
+ #define ToolIncludeDir /usr/local/include
+ 
+ /* link libraries for the above */
+ #undef ExtraCCLdLibs
+ #define ExtraCCLdLibs -lstdc++ -lm
+ 
+ /* command to create shared libraries */
+ #define SharedLibraryCmd(ldobjs,extra_flags) gcc -shared extra_flags -o $@ ldobjs
+ 
+ /* use -rpath instead of -L to get slack developers shared libraries */
+ #define UseRpath YES
+ 
+ /*
+  * Install a shared library on NetBSD.
+  */
+ #ifndef InstallDynamicSharedLibrary
+ #define InstallDynamicSharedLibrary(libname,rev,dest)			@@\
+ install:: Concat(lib,libname.so.rev)					@@\
+ 	MakeDir(dest)                                                   @@\
+ 	$(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.so.rev) dest   @@\
+ 	-@$(RM) dest/Concat(lib,libname.so)		                @@\
+ 	-@(cd dest;$(LN) Concat(lib,libname.so.rev) \			@@\
+ 	Concat(lib,libname.so))					        @@\
+ 									@@\
+ uninstall::								@@\
+ 	$(RM) dest/Concat(lib,libname.so.rev)				@@\
+ 	$(RM) dest/Concat(lib,libname.so)	
+ #endif
+ 
+ 
+ /* --------------- autconf way of configuring --------------- */
+ 
+ /* file output by configure script */
+ #include "config-netbsd-gcc.defs"
+ 
+ 
+ 
Index: config_iv/iv-netbsd.cf
diff -c /dev/null config_iv/iv-netbsd.cf:1.1
*** /dev/null	Wed Jan  5 10:40:48 2000
--- config/InterViews/iv-netbsd.cf	Wed Jan  5 10:40:48 2000
***************
*** 0 ****
--- 1,13 ----
+ /* 
+  * This is the NetBSD configuration file for Interviews 3.1
+  * Set up to use gcc in local.def
+  */
+ 
+ #define OptimizeCCFlags -O6
+ #define TIFFOptimizeCFlags -O
+ 
+ #ifndef ExtraCCLdFlags
+ #define ExtraCCLdFlags /**/
+ #endif
+ 
+ #include <InterViews/xparams.cf>

fixup posteval((1))

[<ivt...@li...>]

Patch:	ivtools-000105-johnston-003
For:	ivtools-0.7.10
Author:	joh...@us...

This is an intermediate patch to ivtools-0.7.10.  To apply, cd to the
top-level directory of the ivtools source tree (the directory with src
and config subdirs), and apply like this:

	patch -s <ThisFile

Summary of Changes:

- make posteval((1)) work, by improved handling of the token generated
for the extra nested parens.  Problem still remain with the handling
of some forms of nested parens in post-evaluated expressions, but this
is a start at fixing them.  This is the last outstanding known bug in
the comterp language, though many features remain to be added.

Index: ComTerp/comterp.c
diff -c ComTerp/comterp.c:1.2 ComTerp/comterp.c:1.3
*** ComTerp/comterp.c:1.2	Wed Jan  5 10:09:27 2000
--- src/ComTerp/comterp.c	Wed Jan  5 10:09:27 2000
***************
*** 243,249 ****
  	push_stack(argoffval);
        }
      }
!     if (!_pfcomvals[_pfoff].is_null())
        push_stack(_pfcomvals[_pfoff]);
      _pfoff++;
      if (stack_top().type() == ComValue::CommandType && 
--- 243,249 ----
  	push_stack(argoffval);
        }
      }
!     if (!_pfcomvals[_pfoff].is_blank())
        push_stack(_pfcomvals[_pfoff]);
      _pfoff++;
      if (stack_top().type() == ComValue::CommandType && 
***************
*** 376,382 ****
--- 376,388 ----
      return false;
    } else {
      offset--;
+     if (curr.is_type(ComValue::BlankType)) {
+       boolean status = skip_arg(topval, offset, tokcnt);
+       tokcnt++;
+       return status;
+     }
      tokcnt++;
+ 
      if (curr.narg() || curr.nkey()) {
        int count = 0;
        while (count<(curr.narg() + curr.nkey())) {
Index: ComTerp/comvalue.c
diff -c ComTerp/comvalue.c:1.1 ComTerp/comvalue.c:1.2
*** ComTerp/comvalue.c:1.1	Wed Jan  5 10:09:27 2000
--- src/ComTerp/comvalue.c	Wed Jan  5 10:09:27 2000
***************
*** 103,108 ****
--- 103,109 ----
      case TOK_EOF:     type(EofType); break;
      case TOK_COMMAND: type(SymbolType); break;
      case TOK_KEYWORD: type(KeywordType); break;
+     case TOK_BLANK:   type(BlankType); break;
      default:          type(UnknownType); break;
      }
      _narg = token->narg;
Index: ComTerp/postfunc.c
diff -c ComTerp/postfunc.c:1.2 ComTerp/postfunc.c:1.3
*** ComTerp/postfunc.c:1.2	Wed Jan  5 10:09:27 2000
--- src/ComTerp/postfunc.c	Wed Jan  5 10:09:27 2000
***************
*** 68,74 ****
        out << "{" << val.narg() << "|" << val.nkey() << "}";
      else if (val.is_type(AttributeValue::KeywordType))
        out << "(" << val.keynarg_val() << ")";
!     out << " ";
    }
    comterp()->brief(oldbrief);
    reset_stack();
--- 68,74 ----
        out << "{" << val.narg() << "|" << val.nkey() << "}";
      else if (val.is_type(AttributeValue::KeywordType))
        out << "(" << val.keynarg_val() << ")";
!     out << ((i+1>topptr) ? "\n" : " ");
    }
    comterp()->brief(oldbrief);
    reset_stack();

more diffs

[<ivt...@li...>]

		  Patch: ivtools-000103-johnston-002
			 For: ivtools-0.7.10
			Author: Scott Johnston

This is an intermediate patch to ivtools-0.7.10.  To apply, cd to the
top-level directory of the ivtools source tree (the directory with src
and config subdirs), and apply like this:

	patch -s <ThisFile

Summary of Changes:

- revised README and COPYRIGHT files.

- more diffs that should have been in the previous patch 

Index: top_ivtools/COPYRIGHT
diff -c top_ivtools/COPYRIGHT:1.1 top_ivtools/COPYRIGHT:1.2
*** top_ivtools/COPYRIGHT:1.1	Mon Jan  3 15:57:05 2000
--- ./COPYRIGHT	Mon Jan  3 15:57:05 2000
***************
*** 1,10 ****
--- 1,15 ----
  /*
+  * Copyright (c) 2000  Vectaport Inc., I.E.T. Inc
   * Copyright (c) 1999  Vectaport Inc., I.E.T. Inc, R.B. Kissh and Associates
   * Copyright (c) 1998  Vectaport Inc., R.B. Kissh and Associates, Eric F. Kahler
   * Copyright (c) 1997  Vectaport Inc., R.B. Kissh and Associates
   * Copyright (c) 1996  Vectaport Inc., R.B. Kissh and Associates, Cider Press
   * Copyright (c) 1994, 1995  Vectaport Inc., Cartoactive Systems, Cider Press
+  * Copyright (c) 1993 David B. Hollenbeck
+  * Copyright (c) 1993 Ellemtel Telecommunication Systems Labratories
+  * Copyright (c) 1991, 1992 Sam Leffler
   * Copyright (c) 1991 Silicon Graphics, Inc.
+  * Copyright (c) 1989 Triple Vision Inc.
   * Copyright (c) 1987, 1988, 1989, 1990, 1991 Stanford University
   *
   * Permission to use, copy, modify, distribute, and sell this software and its
Index: top_ivtools/README
diff -c top_ivtools/README:1.2 top_ivtools/README:1.3
*** top_ivtools/README:1.2	Mon Jan  3 15:57:05 2000
--- ./README	Mon Jan  3 15:57:05 2000
***************
*** 6,43 ****
  Inc..  You should read the rest of this file for information on what
  ivtools is and the INSTALL file for instructions on how to build it.
  
- ivtools is known to build with many versions of gcc (<= gcc-2.7.2, >=
- gcc-2.8.1, >= egcs-1.0.1) and on a variety of Unix'es: SunOS 4.1
- (MIT's X11R5), Solaris 2.6 (X11R6), Irix 5.2 (SGI's X11R5), Linux 1.2
- (Slackware 3.0, XFree86 3.1) and Linux 2.* (RedHat 4.0 thru 5.2,
- Debian 2.*).  There are contributed configs for HPUX and Dec
- Alpha. Recently it has been built on Windows NT 4.0 using Cygwin from
- Cygnus Solutions (see README.cygwin).  You can pick up Linux-ELF
- binaries from the ivtools web page (http://www.vectaport.com/ivtools/).
- 
  The overall copyright and permission notice for ivtools can be found
  in the COPYRIGHT file in this directory.  It is similar to the X11
! copyright, otherwise known as non-copylefted freeware.  If you have a
! question about this software, desire to add code, found a bug, want to
! request a feature, or wonder how to get further assistance, please
! send e-mail to ivt...@ve....  To subcribe to the mailing
! list, send an informal request to ivt...@ve....
! 
! **NOTE** The COPYRIGHT might be changing slightly with ivtools-0.8, to
! acquire some of the protection of an LGPL style open-source license
! without adding restrictions to purely binary forms of redistribution.
! Take a look at the COPYRIGHT.proposed file and forward comments to
! ivt...@ve....  See an on-line discussion of this
! proposal at http://www.vectaport.com/ivtools/caveats.html
! 
! Online documentation (including an FAQ) is available for ivtools at:
! 
! 	http://www.vectaport.com/ivtools/doc/
! 
! Read about finding and generating inline documentation below.  A copy
! of the ivtools html documentation is available for download as well:
! 
! 	http://www.vectaport.com/pub/src/ivtools-0.7.10-html.tgz
  
  * What is ivtools?:
  
--- 6,14 ----
  Inc..  You should read the rest of this file for information on what
  ivtools is and the INSTALL file for instructions on how to build it.
  
  The overall copyright and permission notice for ivtools can be found
  in the COPYRIGHT file in this directory.  It is similar to the X11
! copyright, otherwise known as non-copylefted freeware.  
  
  * What is ivtools?:
  
***************
*** 140,145 ****
--- 111,162 ----
  a copy of cvs available from the Free Software Foundation and
  ivmkcm-0.7.2 available through http://www.vectaport.com/ivmkcm/
  
+ * More ivtools details
+ 
+ ivtools is known to build with many versions of gcc (<= gcc-2.7.2, >=
+ gcc-2.8.1, >= egcs-1.0.1) and on a variety of Unix'es: SunOS 4.1
+ (MIT's X11R5), Solaris 2.6 (X11R6), Irix 5.2 (SGI's X11R5), Linux 1.2
+ (Slackware 3.0, XFree86 3.1) and Linux 2.* (RedHat 4.0 thru 5.2,
+ Debian 2.*).  There are contributed configs for HPUX and Dec
+ Alpha. Recently it has been built on Windows NT 4.0 using Cygwin from
+ Cygnus Solutions (see README.cygwin).  You can pick up Linux-ELF
+ binaries from the ivtools web page (http://www.vectaport.com/ivtools/).
+ 
+ If you have a question about this software, desire to add code, found
+ a bug, want to request a feature, or wonder how to get further
+ assistance, please send e-mail to the general purpose ivtools mailing
+ list, ivt...@li..., or this Vectaport e-mail
+ address: ivt...@ve....  To subcribe to the mailing list,
+ visit http://lists.sourceforge.net/mailman/listinfo/ivtools-discuss or
+ send an informal request to ivt...@ve....  Other
+ ivtools related mailing lists can be found at:
+ 
+ 	http://www.vectaport.com/ivtools/mailinglists.html
+ 
+ **NOTE** A new term might be added to the COPYRIGHT in the future, to
+ acquire some of the protection of an LGPL style open-source license
+ without adding restrictions to purely binary forms of redistribution.
+ Take a look at the COPYRIGHT.proposed file and forward comments to
+ ivt...@ve....  See an on-line discussion of this
+ proposal at http://www.vectaport.com/ivtools/caveats.html.  Vote your
+ preference in a survey at:
+ 
+ 	http://sourceforge.net/survey/survey.php?group_id=275&survey_id=10018
+ 
+ Online documentation (including an FAQ) is available for ivtools at:
+ 
+ 	http://www.vectaport.com/ivtools/doc/
+ 
+ Read about finding and generating all this from inline documentation
+ below.  A copy of the ivtools html documentation is available for
+ download as well:
+ 
+ 	http://www.vectaport.com/pub/src/ivtools-0.7.10-html.tgz
+ 
+ A SourceForge project page for ivtools can be found at:
+ 
+ 	http://sourceforge.net/project/?form_grp=275
+ 
  * Finding and Generating Inline Documentation
  
  Extensive documentation is embedded within the ivtools source tree,
***************
*** 223,231 ****
  
  ivtools programmers at large:
  
  	Rick Kissh
  	Eric Kahler
- 	Brian Hogencamp
  
  InterViews 3.1 programmers that we know of:
  
--- 240,248 ----
  
  ivtools programmers at large:
  
+ 	Brian Hogencamp
  	Rick Kissh
  	Eric Kahler
  
  InterViews 3.1 programmers that we know of:
  
Index: Attribute/attrvalue.h
diff -c Attribute/attrvalue.h:1.2 Attribute/attrvalue.h:1.3
*** Attribute/attrvalue.h:1.2	Mon Jan  3 15:57:07 2000
--- src/Attribute/attrvalue.h	Mon Jan  3 15:57:07 2000
***************
*** 58,70 ****
    unsigned int keynarg;
  } keyval_struct;
  
- //: void* pointer plus object classid (see macro in OverlayUnidraw/ovcomps.h)
- // used in attr_value.
- typedef struct {
-        unsigned int symbolid;
-        unsigned int type;
- } command_struct;
- 
  //: union for AttributeValue typed data storage.
  typedef union attr_value_union
  {
--- 58,63 ----
Index: UniIdraw/idcatalog.c
diff -c UniIdraw/idcatalog.c:1.2 UniIdraw/idcatalog.c:1.3
*** UniIdraw/idcatalog.c:1.2	Mon Jan  3 15:57:22 2000
--- src/UniIdraw/idcatalog.c	Mon Jan  3 15:57:22 2000
***************
*** 970,976 ****
      }
  
      Raster* raster = new Raster(w, h);
!     cerr << "w,h " << w << "," << h << "\n";
      ReadRasterData(raster, in);
  
      return new RasterComp(new RasterRect(raster, &gs));
--- 970,976 ----
      }
  
      Raster* raster = new Raster(w, h);
!     // cerr << "w,h " << w << "," << h << "\n";
      ReadRasterData(raster, in);
  
      return new RasterComp(new RasterRect(raster, &gs));
Index: OverlayUnidraw/ovkit.c
diff -c OverlayUnidraw/ovkit.c:1.1 OverlayUnidraw/ovkit.c:1.2
*** OverlayUnidraw/ovkit.c:1.1	Mon Jan  3 15:57:26 2000
--- src/OverlayUnidraw/ovkit.c	Mon Jan  3 15:57:26 2000
***************
*** 1,5 ****
  /*
!  * Copyright (c) 1998-1999 Vectaport Inc.
   * Copyright (c) 1994-1995 Vectaport Inc., Cartoactive Systems
   * Copyright (c) 1994 Cartoactive Systems
   * Copyright (c) 1993 David B. Hollenbeck
--- 1,5 ----
  /*
!  * Copyright (c) 1998-2000 Vectaport Inc.
   * Copyright (c) 1994-1995 Vectaport Inc., Cartoactive Systems
   * Copyright (c) 1994 Cartoactive Systems
   * Copyright (c) 1993 David B. Hollenbeck
***************
*** 266,275 ****
  }
  
  void OverlayKit::InitLayout(const char* name) {
      if (_ed->GetWindow() == nil) {
!         TextObserver* mousedoc_observer = new TextObserver(_ed->MouseDocObservable(), "");
! 	const LayoutKit& lk = *LayoutKit::instance();
! 	WidgetKit& wk = *WidgetKit::instance();
  	Glyph* menus = MakeMenus();
  	Glyph* states = MakeStates();
  	Glyph* toolbar = MakeToolbar();
--- 266,290 ----
  }
  
  void OverlayKit::InitLayout(const char* name) {
+     Catalog* catalog = unidraw->GetCatalog();
+     const char* stripped_string = catalog->GetAttribute("stripped");
+     boolean stripped_flag = stripped_string ? strcmp(stripped_string, "true")==0 : false;
      if (_ed->GetWindow() == nil) {
! 
!       TextObserver* mousedoc_observer = new TextObserver(_ed->MouseDocObservable(), "");
!       const LayoutKit& lk = *LayoutKit::instance();
!       WidgetKit& wk = *WidgetKit::instance();
!       PolyGlyph* topbox = lk.vbox();
! 
!       if (stripped_flag) {
! 
! 	Target* viewer = 
! 	    new Target(new Frame(Interior()), TargetPrimitiveHit);
! 	_ed->body(viewer);
! 	topbox->append(_ed);
! 
!       } else {
! 
  	Glyph* menus = MakeMenus();
  	Glyph* states = MakeStates();
  	Glyph* toolbar = MakeToolbar();
***************
*** 277,283 ****
  	    menus->append(states);
  	Target* viewer = 
  	    new Target(new Frame(Interior()), TargetPrimitiveHit);
- 	Catalog* catalog = unidraw->GetCatalog();
  	if (const char* toolbarloca = catalog->GetAttribute("toolbarloc")) {
  	  if (strcmp(toolbarloca, "r") == 0) 
  	    toolbar->prepend(lk.vcenter(viewer));
--- 292,297 ----
***************
*** 287,295 ****
  	  toolbar->append(lk.vcenter(viewer));
  	menus->append(toolbar);
  
- 	PolyGlyph* topbox = lk.vbox();
  	_ed->body(menus);
- 	_ed->GetKeyMap()->Execute(CODE_SELECT);
  	topbox->append(_ed);
  	topbox->append(
  		wk.outset_frame(
--- 301,307 ----
***************
*** 298,309 ****
  		    )
  		)
  	    );
  
- 	ManagedWindow* w = new ApplicationWindow(topbox, _otherdisplay);
- 	_ed->SetWindow(w);
- 	Style* s = new Style(Session::instance()->style());
- 	s->alias(name);
- 	w->style(s);
      }
  }
  
--- 310,324 ----
  		    )
  		)
  	    );
+       }
+ 
+       _ed->GetKeyMap()->Execute(CODE_SELECT);
+       ManagedWindow* w = new ApplicationWindow(topbox, _otherdisplay);
+       _ed->SetWindow(w);
+       Style* s = new Style(Session::instance()->style());
+       s->alias(name);
+       w->style(s);
  
      }
  }
  
Index: ComUnidraw/grstatfunc.h
diff -c ComUnidraw/grstatfunc.h:1.1 ComUnidraw/grstatfunc.h:1.2
*** ComUnidraw/grstatfunc.h:1.1	Mon Jan  3 15:57:28 2000
--- src/ComUnidraw/grstatfunc.h	Mon Jan  3 15:57:28 2000
***************
*** 27,59 ****
  #include <ComUnidraw/unifunc.h>
  
  //: command to return center of graphics in comdraw.
! // center(compview :xy :yx :x :y) -- center of compview (dflt :xy)
  class CenterFunc : public UnidrawFunc {
  public:
      CenterFunc(ComTerp*,Editor*);
      virtual void execute();
      virtual const char* docstring() { 
!       return "%s(compview :xy :yx :x :y) -- center of compview (dflt :xy)"; }
  };
  
  //: command to return minimum-bounding rectangle of graphics in comdraw.
! // mbr(compview :lbrt :lrbt) -- minimum-bounding rectangle of compview (dflt :lbrt)
  class MbrFunc : public UnidrawFunc {
  public:
      MbrFunc(ComTerp*,Editor*);
      virtual void execute();
      virtual const char* docstring() { 
!       return "%s(compview :lbrt :lrbt) -- minimum-bounding rectangle of compview (dflt :lbrt :lrbt)"; }
  };
  
  //: command to return point list associated with a graphic
! // points(compview) -- return point list from compview graphic
  class PointsFunc : public UnidrawFunc {
  public:
      PointsFunc(ComTerp*,Editor*);
      virtual void execute();
      virtual const char* docstring() { 
!       return "%s(compview) -- return point list from compview graphic"; }
  };
  
  #endif /* !defined(_grstatfunc_h) */
--- 27,59 ----
  #include <ComUnidraw/unifunc.h>
  
  //: command to return center of graphics in comdraw.
! // xylist=center(compview :xy :yx :x :y) -- center of compview (dflt :xy)
  class CenterFunc : public UnidrawFunc {
  public:
      CenterFunc(ComTerp*,Editor*);
      virtual void execute();
      virtual const char* docstring() { 
!       return "xylist=%s(compview :xy :yx :x :y) -- center of compview (dflt :xy)"; }
  };
  
  //: command to return minimum-bounding rectangle of graphics in comdraw.
! // rectlist=mbr(compview :lbrt :lrbt) -- minimum-bounding rectangle of compview (dflt :lbrt)
  class MbrFunc : public UnidrawFunc {
  public:
      MbrFunc(ComTerp*,Editor*);
      virtual void execute();
      virtual const char* docstring() { 
!       return "rectlist=%s(compview :lbrt :lrbt) -- minimum-bounding rectangle of compview (dflt :lbrt :lrbt)"; }
  };
  
  //: command to return point list associated with a graphic
! // ptlist=points(compview) -- return point list from compview graphic
  class PointsFunc : public UnidrawFunc {
  public:
      PointsFunc(ComTerp*,Editor*);
      virtual void execute();
      virtual const char* docstring() { 
!       return "ptlist=%s(compview) -- return point list from compview graphic"; }
  };
  
  #endif /* !defined(_grstatfunc_h) */
Index: comdraw/README
diff -c comdraw/README:1.2 comdraw/README:1.3
*** comdraw/README:1.2	Mon Jan  3 15:57:30 2000
--- src/comdraw/README	Mon Jan  3 15:57:30 2000
***************
*** 40,47 ****
  
  GRAPHIC STATS COMMANDS
  
! val=center(compview :xy :yx :x :y) -- center of compview (dflt :xy)
! val=mbr(compview :lbrt :lrbt) -- minimum bounding rectangle of compview (dflt :lbrt)
  
  GRAPHIC STATE COMMANDS
  
--- 40,48 ----
  
  GRAPHIC STATS COMMANDS
  
! xylist=center(compview :xy :yx :x :y) -- center of compview (dflt :xy)
! rectlist=mbr(compview :lbrt :lrbt) -- minimum bounding rectangle of compview (dflt :lbrt)
! ptlist=points(compview) -- return point list from compview graphic
  
  GRAPHIC STATE COMMANDS
  
Index: man1_ivtools/comdraw.1
diff -c man1_ivtools/comdraw.1:1.2 man1_ivtools/comdraw.1:1.3
*** man1_ivtools/comdraw.1:1.2	Mon Jan  3 15:57:43 2000
--- src/man/man1/comdraw.1	Mon Jan  3 15:57:43 2000
***************
*** 45,52 ****
  
  .SH GRAPHIC STATS COMMANDS
  
!  val=center(compview :xy :yx :x :y) -- center of compview (dflt :xy)
!  val=mbr(compview :lbrt :lrbt) -- minimum bounding rectangle of compview (dflt :lbrt)
  
  .SH GRAPHIC STATE COMMANDS
  
--- 45,53 ----
  
  .SH GRAPHIC STATS COMMANDS
  
!  xylist=center(compview :xy :yx :x :y) -- center of compview (dflt :xy)
!  rectlist=mbr(compview :lbrt :lrbt) -- minimum bounding rectangle of compview (dflt :lbrt)
!  ptlist=points(compview) -- return point list from compview graphic
  
  .SH GRAPHIC STATE COMMANDS
  

comterp and comdraw extensions

[<ivt...@li...>]

		  Patch: ivtools-000103-johnston-001
			 For: ivtools-0.7.10
			Author: Scott Johnston

This is an intermediate patch to ivtools-0.7.10.  To apply, cd to the
top-level directory of the ivtools source tree (the directory with src
and config subdirs), and apply like this:

	patch -s <ThisFile

Summary of Changes:

comterp changes

- add LISP-like symbol assignment semantics to comterp.  Now
expressions that return a symbol can appear on the right hand or left
hand side of an assigment operator.  See new command "symvar", and
"symbol" has been renamed "symval".

- add support for command aliases to comterp, to allow multiple
symbols to point to a command without having them listed via help.

comdraw changes

- add "center" and "mbr" commands to comdraw, to return the center and
minimum-bounding rectangle of a graphic.

- make select-all the default behavior of the comdraw "select" command.

- add -stripped argument to comdraw, to remove menubar and toolbar.
Use a -geometry as well to specify size of canvas.  Control resultant
program via stdin or telnet using the builtin command interpreter.

Index: top_ivtools/MANIFEST
diff -c top_ivtools/MANIFEST:1.1 top_ivtools/MANIFEST:1.2
*** top_ivtools/MANIFEST:1.1	Mon Jan  3 13:20:23 2000
--- ./MANIFEST	Mon Jan  3 13:20:23 2000
***************
*** 168,173 ****
--- 168,175 ----
  ivtools-0.7/src/ComTerp/statfunc.h
  ivtools-0.7/src/ComTerp/strmfunc.c
  ivtools-0.7/src/ComTerp/strmfunc.h
+ ivtools-0.7/src/ComTerp/symbolfunc.c
+ ivtools-0.7/src/ComTerp/symbolfunc.h
  ivtools-0.7/src/ComTerp/xformfunc.c
  ivtools-0.7/src/ComTerp/xformfunc.h
  ivtools-0.7/src/ComUnidraw/Imakefile
***************
*** 180,185 ****
--- 182,189 ----
  ivtools-0.7/src/ComUnidraw/comterp-iohandler.h
  ivtools-0.7/src/ComUnidraw/grfunc.c
  ivtools-0.7/src/ComUnidraw/grfunc.h
+ ivtools-0.7/src/ComUnidraw/grstatfunc.c
+ ivtools-0.7/src/ComUnidraw/grstatfunc.h
  ivtools-0.7/src/ComUnidraw/nfunc.c
  ivtools-0.7/src/ComUnidraw/nfunc.h
  ivtools-0.7/src/ComUnidraw/plotfunc.c
Index: top_ivtools/MANIFEST.perceps
diff -c top_ivtools/MANIFEST.perceps:1.1 top_ivtools/MANIFEST.perceps:1.2
*** top_ivtools/MANIFEST.perceps:1.1	Mon Jan  3 13:20:23 2000
--- ./MANIFEST.perceps	Mon Jan  3 13:20:23 2000
***************
*** 38,48 ****
--- 38,50 ----
  ComTerp/scanner.h
  ComTerp/statfunc.h
  ComTerp/strmfunc.h
+ ComTerp/symbolfunc.h
  ComTerp/xformfunc.h
  ComUnidraw/comeditor.h
  ComUnidraw/comterp-acehandler.h
  ComUnidraw/comterp-iohandler.h
  ComUnidraw/grfunc.h
+ ComUnidraw/grstatfunc.h
  ComUnidraw/nfunc.h
  ComUnidraw/plotfunc.h
  ComUnidraw/unifunc.h
Index: top_ivtools/README
diff -c top_ivtools/README:1.1 top_ivtools/README:1.2
*** top_ivtools/README:1.1	Mon Jan  3 13:20:23 2000
--- ./README	Mon Jan  3 13:20:23 2000
***************
*** 162,168 ****
  	Many of the C++ class libraries of ivtools are documented 
  	using comments in the header files (the .h files) that can
  	be extracted using PERCEPS, a Perl documentation generator for
! 	C++ (http://friga.mer.utexas.edu/mark/perl/perceps/).
  
  	See src/html/README for instructions on auto-generating these
  	web pages yourself, or see the result on-line at:
--- 162,168 ----
  	Many of the C++ class libraries of ivtools are documented 
  	using comments in the header files (the .h files) that can
  	be extracted using PERCEPS, a Perl documentation generator for
! 	C++ (http://starship.python.net/crew/tbryan/PERCEPS/).
  
  	See src/html/README for instructions on auto-generating these
  	web pages yourself, or see the result on-line at:
***************
*** 211,217 ****
  an equivalent source tree (i.e. vhclmaps) and change or rename all
  directories or files as appropriate. 
  
! ** read more on vhclmaps at http://www.vectaport.com/ivmaps/ **
  
  
  * Acknowledgements:
--- 211,217 ----
  an equivalent source tree (i.e. vhclmaps) and change or rename all
  directories or files as appropriate. 
  
! ** read more on vhclmaps at http://www.vectaport.com/vhclmaps/ **
  
  
  * Acknowledgements:
Index: Attribute/attrvalue.c
diff -c Attribute/attrvalue.c:1.1 Attribute/attrvalue.c:1.2
*** Attribute/attrvalue.c:1.1	Mon Jan  3 13:20:27 2000
--- src/Attribute/attrvalue.c	Mon Jan  3 13:20:27 2000
***************
*** 571,577 ****
  }
  
  unsigned int AttributeValue::command_symid() { return _command_symid; }
! void AttributeValue::command_symid(unsigned int id) { _command_symid = id; }
  
  ostream& operator<< (ostream& out, const AttributeValue& sv) {
      AttributeValue* svp = (AttributeValue*)&sv;
--- 571,578 ----
  }
  
  unsigned int AttributeValue::command_symid() { return _command_symid; }
! void AttributeValue::command_symid(unsigned int id, boolean alias) { 
!   _command_symid = (alias ? -1 : 1) * id; }
  
  ostream& operator<< (ostream& out, const AttributeValue& sv) {
      AttributeValue* svp = (AttributeValue*)&sv;
Index: Attribute/attrvalue.h
diff -c Attribute/attrvalue.h:1.1 Attribute/attrvalue.h:1.2
*** Attribute/attrvalue.h:1.1	Mon Jan  3 13:20:27 2000
--- src/Attribute/attrvalue.h	Mon Jan  3 13:20:27 2000
***************
*** 58,63 ****
--- 58,70 ----
    unsigned int keynarg;
  } keyval_struct;
  
+ //: void* pointer plus object classid (see macro in OverlayUnidraw/ovcomps.h)
+ // used in attr_value.
+ typedef struct {
+        unsigned int symbolid;
+        unsigned int type;
+ } command_struct;
+ 
  //: union for AttributeValue typed data storage.
  typedef union attr_value_union
  {
***************
*** 192,199 ****
  
      unsigned int command_symid();
      // symbol id of associated command name, for use with ComTerp.
!     void command_symid(unsigned int);
      // set symbol id of associated command name, for use with ComTerp.
  
      void negate();
      // negate numeric values.
--- 199,208 ----
  
      unsigned int command_symid();
      // symbol id of associated command name, for use with ComTerp.
!     void command_symid(unsigned int, boolean alias=false);
      // set symbol id of associated command name, for use with ComTerp.
+     boolean command_alias();
+     // returns true if command is an alias, not the first name.
  
      void negate();
      // negate numeric values.
***************
*** 239,244 ****
--- 248,255 ----
      // returns true if !UnknownType.
      boolean is_string() { return is_type(StringType) || is_type(SymbolType); }
      // returns true if StringType || SymbolType.
+     boolean is_symbol() { return is_type(SymbolType); }
+     // returns true if SymbolType.
      boolean is_command() { return is_type(CommandType); }
      // returns true if CommandType (for use of ComTerp).
      boolean is_object() { return is_type(ObjectType); }
Index: ComTerp/Imakefile
diff -c ComTerp/Imakefile:1.1 ComTerp/Imakefile:1.2
*** ComTerp/Imakefile:1.1	Mon Jan  3 13:20:29 2000
--- src/ComTerp/Imakefile	Mon Jan  3 13:20:29 2000
***************
*** 35,40 ****
--- 35,41 ----
  Obj(scanner)	
  Obj(statfunc)
  Obj(strmfunc)
+ Obj(symbolfunc)
  Obj(xformfunc)
  
  #ifdef AceDir
Index: ComTerp/assignfunc.c
diff -c ComTerp/assignfunc.c:1.1 ComTerp/assignfunc.c:1.2
*** ComTerp/assignfunc.c:1.1	Mon Jan  3 13:20:29 2000
--- src/ComTerp/assignfunc.c	Mon Jan  3 13:20:29 2000
***************
*** 38,68 ****
  
  void AssignFunc::execute() {
      ComValue operand1(stack_arg(0, true));
!     ComValue* operand2 = new ComValue(stack_arg(1));
      reset_stack();
      if (operand1.type() == ComValue::SymbolType) {
          AttributeList* attrlist = comterp()->get_attributes();
  	if (attrlist) {
  	    Resource::ref(attrlist);
  	    Attribute* attr = new Attribute(operand1.symbol_val(), 
! 					    new AttributeValue(*operand2));
  	    attrlist->add_attribute(attr);
  	    Unref(attrlist);
  	} else 
  	    comterp()->localtable()->insert(operand1.symbol_val(), operand2);
      } else {
          cerr << "assignment to something other than a symbol ignored\n";
      }
      push_stack(*operand2);
  }
  
! ModAssignFunc::ModAssignFunc(ComTerp* comterp) : ModFunc(comterp) {
  }
  
  
  void ModAssignFunc::execute() {
      ComValue operand1(stack_arg(0, true));
!     ComValue operand2(stack_arg(1));
      reset_stack();
      if (operand1.type() == ComValue::SymbolType) {
          void* op1val = nil;
--- 38,75 ----
  
  void AssignFunc::execute() {
      ComValue operand1(stack_arg(0, true));
!     if (operand1.type() != ComValue::SymbolType) {
!       operand1.assignval(stack_arg_post_eval(0, true /* no symbol lookup */));
!     }
!     ComValue* operand2 = new ComValue(stack_arg_post_eval(1, true));
      reset_stack();
      if (operand1.type() == ComValue::SymbolType) {
          AttributeList* attrlist = comterp()->get_attributes();
  	if (attrlist) {
  	    Resource::ref(attrlist);
  	    Attribute* attr = new Attribute(operand1.symbol_val(), 
! 					    operand2);
  	    attrlist->add_attribute(attr);
  	    Unref(attrlist);
  	} else 
  	    comterp()->localtable()->insert(operand1.symbol_val(), operand2);
      } else {
          cerr << "assignment to something other than a symbol ignored\n";
+ 	// should say something about assignment from something other than a symbol as well.
      }
      push_stack(*operand2);
  }
  
! ModAssignFunc::ModAssignFunc(ComTerp* comterp) : AssignFunc(comterp) {
  }
  
  
  void ModAssignFunc::execute() {
      ComValue operand1(stack_arg(0, true));
!     if (operand1.type() != ComValue::SymbolType) {
!       operand1.assignval(stack_arg_post_eval(0, true /* no symbol lookup */));
!     }
!     ComValue operand2(stack_arg_post_eval(1, true));
      reset_stack();
      if (operand1.type() == ComValue::SymbolType) {
          void* op1val = nil;
***************
*** 75,81 ****
  	delete (ComValue*)op1val;
  	push_stack(operand2);
          push_funcstate(2,0);
! 	ModFunc::execute();
  	pop_funcstate();
  	ComValue* result = new ComValue(pop_stack());
          _comterp->localtable()->insert(operand1.symbol_val(), result);
--- 82,89 ----
  	delete (ComValue*)op1val;
  	push_stack(operand2);
          push_funcstate(2,0);
! 	static ModFunc* subfunc = new ModFunc(comterp());
! 	subfunc->execute();
  	pop_funcstate();
  	ComValue* result = new ComValue(pop_stack());
          _comterp->localtable()->insert(operand1.symbol_val(), result);
***************
*** 84,96 ****
  
  }
  
! MpyAssignFunc::MpyAssignFunc(ComTerp* comterp) : MpyFunc(comterp) {
  }
  
  
  void MpyAssignFunc::execute() {
      ComValue operand1(stack_arg(0, true));
!     ComValue operand2(stack_arg(1));
      reset_stack();
      if (operand1.type() == ComValue::SymbolType) {
          void* op1val = nil;
--- 92,107 ----
  
  }
  
! MpyAssignFunc::MpyAssignFunc(ComTerp* comterp) : AssignFunc(comterp) {
  }
  
  
  void MpyAssignFunc::execute() {
      ComValue operand1(stack_arg(0, true));
!     if (operand1.type() != ComValue::SymbolType) {
!       operand1.assignval(stack_arg_post_eval(0, true /* no symbol lookup */));
!     }
!     ComValue operand2(stack_arg_post_eval(1, true));
      reset_stack();
      if (operand1.type() == ComValue::SymbolType) {
          void* op1val = nil;
***************
*** 103,109 ****
  	delete (ComValue*)op1val;
  	push_stack(operand2);
          push_funcstate(2,0);
! 	MpyFunc::execute();
  	pop_funcstate();
  	ComValue* result = new ComValue(pop_stack());
          _comterp->localtable()->insert(operand1.symbol_val(), result);
--- 114,121 ----
  	delete (ComValue*)op1val;
  	push_stack(operand2);
          push_funcstate(2,0);
! 	static MpyFunc* subfunc = new MpyFunc(comterp());
! 	subfunc->execute();
  	pop_funcstate();
  	ComValue* result = new ComValue(pop_stack());
          _comterp->localtable()->insert(operand1.symbol_val(), result);
***************
*** 112,124 ****
  
  }
  
! AddAssignFunc::AddAssignFunc(ComTerp* comterp) : AddFunc(comterp) {
  }
  
  
  void AddAssignFunc::execute() {
      ComValue operand1(stack_arg(0, true));
!     ComValue operand2(stack_arg(1));
      reset_stack();
      if (operand1.type() == ComValue::SymbolType) {
          void* op1val = nil;
--- 124,139 ----
  
  }
  
! AddAssignFunc::AddAssignFunc(ComTerp* comterp) : AssignFunc(comterp) {
  }
  
  
  void AddAssignFunc::execute() {
      ComValue operand1(stack_arg(0, true));
!     if (operand1.type() != ComValue::SymbolType) {
!       operand1.assignval(stack_arg_post_eval(0, true /* no symbol lookup */));
!     }
!     ComValue operand2(stack_arg_post_eval(1, true));
      reset_stack();
      if (operand1.type() == ComValue::SymbolType) {
          void* op1val = nil;
***************
*** 131,137 ****
  	delete (ComValue*)op1val;
  	push_stack(operand2);
          push_funcstate(2,0);
! 	AddFunc::execute();
  	pop_funcstate();
  	ComValue* result = new ComValue(pop_stack());
          _comterp->localtable()->insert(operand1.symbol_val(), result);
--- 146,153 ----
  	delete (ComValue*)op1val;
  	push_stack(operand2);
          push_funcstate(2,0);
! 	static AddFunc* subfunc = new AddFunc(comterp());
! 	subfunc->execute();
  	pop_funcstate();
  	ComValue* result = new ComValue(pop_stack());
          _comterp->localtable()->insert(operand1.symbol_val(), result);
***************
*** 140,152 ****
  
  }
  
! SubAssignFunc::SubAssignFunc(ComTerp* comterp) : SubFunc(comterp) {
  }
  
  
  void SubAssignFunc::execute() {
      ComValue operand1(stack_arg(0, true));
!     ComValue operand2(stack_arg(1));
      reset_stack();
      if (operand1.type() == ComValue::SymbolType) {
          void* op1val = nil;
--- 156,171 ----
  
  }
  
! SubAssignFunc::SubAssignFunc(ComTerp* comterp) : AssignFunc(comterp) {
  }
  
  
  void SubAssignFunc::execute() {
      ComValue operand1(stack_arg(0, true));
!     if (operand1.type() != ComValue::SymbolType) {
!       operand1.assignval(stack_arg_post_eval(0, true /* no symbol lookup */));
!     }
!     ComValue operand2(stack_arg_post_eval(1, true));
      reset_stack();
      if (operand1.type() == ComValue::SymbolType) {
          void* op1val = nil;
***************
*** 159,165 ****
  	delete (ComValue*)op1val;
  	push_stack(operand2);
          push_funcstate(2,0);
! 	SubFunc::execute();
          pop_funcstate();
  	ComValue* result = new ComValue(pop_stack());
          _comterp->localtable()->insert(operand1.symbol_val(), result);
--- 178,185 ----
  	delete (ComValue*)op1val;
  	push_stack(operand2);
          push_funcstate(2,0);
! 	static SubFunc* subfunc = new SubFunc(comterp());
! 	subfunc->execute();
          pop_funcstate();
  	ComValue* result = new ComValue(pop_stack());
          _comterp->localtable()->insert(operand1.symbol_val(), result);
***************
*** 168,180 ****
  
  }
  
! DivAssignFunc::DivAssignFunc(ComTerp* comterp) : DivFunc(comterp) {
  }
  
  
  void DivAssignFunc::execute() {
      ComValue operand1(stack_arg(0, true));
!     ComValue operand2(stack_arg(1));
      reset_stack();
      if (operand1.type() == ComValue::SymbolType) {
          void* op1val = nil;
--- 188,203 ----
  
  }
  
! DivAssignFunc::DivAssignFunc(ComTerp* comterp) : AssignFunc(comterp) {
  }
  
  
  void DivAssignFunc::execute() {
      ComValue operand1(stack_arg(0, true));
!     if (operand1.type() != ComValue::SymbolType) {
!       operand1.assignval(stack_arg_post_eval(0, true /* no symbol lookup */));
!     }
!     ComValue operand2(stack_arg_post_eval(1, true));
      reset_stack();
      if (operand1.type() == ComValue::SymbolType) {
          void* op1val = nil;
***************
*** 187,193 ****
  	delete (ComValue*)op1val;
  	push_stack(operand2);
          push_funcstate(2,0);
! 	DivFunc::execute();
  	pop_funcstate();
  	ComValue* result = new ComValue(pop_stack());
          _comterp->localtable()->insert(operand1.symbol_val(), result);
--- 210,217 ----
  	delete (ComValue*)op1val;
  	push_stack(operand2);
          push_funcstate(2,0);
! 	static DivFunc* subfunc = new DivFunc(comterp());
! 	subfunc->execute();
  	pop_funcstate();
  	ComValue* result = new ComValue(pop_stack());
          _comterp->localtable()->insert(operand1.symbol_val(), result);
***************
*** 196,206 ****
  
  }
  
! IncrFunc::IncrFunc(ComTerp* comterp) : AddFunc(comterp) {
  }
  
  void IncrFunc::execute() {
      ComValue operand1(stack_arg(0, true));
      reset_stack();
      if (operand1.type() == ComValue::SymbolType) {
          void* op1val = nil;
--- 220,233 ----
  
  }
  
! IncrFunc::IncrFunc(ComTerp* comterp) : AssignFunc(comterp) {
  }
  
  void IncrFunc::execute() {
      ComValue operand1(stack_arg(0, true));
+     if (operand1.type() != ComValue::SymbolType) {
+       operand1.assignval(stack_arg_post_eval(0, true /* no symbol lookup */));
+     }
      reset_stack();
      if (operand1.type() == ComValue::SymbolType) {
          void* op1val = nil;
***************
*** 215,221 ****
  	    one.int_ref() = 1;
  	    push_stack(one);
  	    push_funcstate(2,0);
!   	    AddFunc::execute();
  	    pop_funcstate();
  	    ComValue* result = new ComValue(pop_stack());
              _comterp->localtable()->insert(operand1.symbol_val(), result);
--- 242,249 ----
  	    one.int_ref() = 1;
  	    push_stack(one);
  	    push_funcstate(2,0);
! 	    static AddFunc* subfunc = new AddFunc(comterp());
! 	    subfunc->execute();
  	    pop_funcstate();
  	    ComValue* result = new ComValue(pop_stack());
              _comterp->localtable()->insert(operand1.symbol_val(), result);
***************
*** 226,236 ****
  
  }
  
! IncrAfterFunc::IncrAfterFunc(ComTerp* comterp) : AddFunc(comterp) {
  }
  
  void IncrAfterFunc::execute() {
      ComValue operand1(stack_arg(0, true));
      reset_stack();
      if (operand1.type() == ComValue::SymbolType) {
          void* op1val = nil;
--- 254,267 ----
  
  }
  
! IncrAfterFunc::IncrAfterFunc(ComTerp* comterp) : AssignFunc(comterp) {
  }
  
  void IncrAfterFunc::execute() {
      ComValue operand1(stack_arg(0, true));
+     if (operand1.type() != ComValue::SymbolType) {
+       operand1.assignval(stack_arg_post_eval(0, true /* no symbol lookup */));
+     }
      reset_stack();
      if (operand1.type() == ComValue::SymbolType) {
          void* op1val = nil;
***************
*** 244,250 ****
  	    one.int_ref() = 1;
  	    push_stack(one);
  	    push_funcstate(2,0);
!   	    AddFunc::execute();
  	    pop_funcstate();
  	    ComValue* result = new ComValue(pop_stack());
              _comterp->localtable()->insert(operand1.symbol_val(), result);
--- 275,282 ----
  	    one.int_ref() = 1;
  	    push_stack(one);
  	    push_funcstate(2,0);
! 	    static AddFunc* subfunc = new AddFunc(comterp());
! 	    subfunc->execute();
  	    pop_funcstate();
  	    ComValue* result = new ComValue(pop_stack());
              _comterp->localtable()->insert(operand1.symbol_val(), result);
***************
*** 256,266 ****
  
  }
  
! DecrFunc::DecrFunc(ComTerp* comterp) : SubFunc(comterp) {
  }
  
  void DecrFunc::execute() {
      ComValue operand1(stack_arg(0,true));
      reset_stack();
      if (operand1.type() == ComValue::SymbolType) {
          void* op1val = nil;
--- 288,301 ----
  
  }
  
! DecrFunc::DecrFunc(ComTerp* comterp) : AssignFunc(comterp) {
  }
  
  void DecrFunc::execute() {
      ComValue operand1(stack_arg(0,true));
+     if (operand1.type() != ComValue::SymbolType) {
+       operand1.assignval(stack_arg_post_eval(0, true /* no symbol lookup */));
+     }
      reset_stack();
      if (operand1.type() == ComValue::SymbolType) {
          void* op1val = nil;
***************
*** 275,281 ****
  	    one.int_ref() = 1;
  	    push_stack(one);
  	    push_funcstate(2,0);
!   	    SubFunc::execute();
  	    pop_funcstate();
  	    ComValue* result = new ComValue(pop_stack());
              _comterp->localtable()->insert(operand1.symbol_val(), result);
--- 310,317 ----
  	    one.int_ref() = 1;
  	    push_stack(one);
  	    push_funcstate(2,0);
! 	    static SubFunc* subfunc = new SubFunc(comterp());
! 	    subfunc->execute();
  	    pop_funcstate();
  	    ComValue* result = new ComValue(pop_stack());
              _comterp->localtable()->insert(operand1.symbol_val(), result);
***************
*** 286,296 ****
  
  }
  
! DecrAfterFunc::DecrAfterFunc(ComTerp* comterp) : SubFunc(comterp) {
  }
  
  void DecrAfterFunc::execute() {
      ComValue operand1(stack_arg(0,true));
      reset_stack();
      if (operand1.type() == ComValue::SymbolType) {
          void* op1val = nil;
--- 322,335 ----
  
  }
  
! DecrAfterFunc::DecrAfterFunc(ComTerp* comterp) : AssignFunc(comterp) {
  }
  
  void DecrAfterFunc::execute() {
      ComValue operand1(stack_arg(0,true));
+     if (operand1.type() != ComValue::SymbolType) {
+       operand1.assignval(stack_arg_post_eval(0, true /* no symbol lookup */));
+     }
      reset_stack();
      if (operand1.type() == ComValue::SymbolType) {
          void* op1val = nil;
***************
*** 304,310 ****
  	    one.int_ref() = 1;
  	    push_stack(one);
  	    push_funcstate(2,0);
!   	    SubFunc::execute();
  	    pop_funcstate();
  	    ComValue* result = new ComValue(pop_stack());
              _comterp->localtable()->insert(operand1.symbol_val(), result);
--- 343,350 ----
  	    one.int_ref() = 1;
  	    push_stack(one);
  	    push_funcstate(2,0);
! 	    static SubFunc* subfunc = new SubFunc(comterp());
! 	    subfunc->execute();
  	    pop_funcstate();
  	    ComValue* result = new ComValue(pop_stack());
              _comterp->localtable()->insert(operand1.symbol_val(), result);
Index: ComTerp/assignfunc.h
diff -c ComTerp/assignfunc.h:1.1 ComTerp/assignfunc.h:1.2
*** ComTerp/assignfunc.h:1.1	Mon Jan  3 13:20:29 2000
--- src/ComTerp/assignfunc.h	Mon Jan  3 13:20:29 2000
***************
*** 34,46 ****
  public:
      AssignFunc(ComTerp*);
  
      virtual void execute();
      virtual const char* docstring() { 
        return "= is the assigment operator"; }
  };
  
  //: %= (mod assign) operator .
! class ModAssignFunc : public ModFunc {
  public:
      ModAssignFunc(ComTerp*);
  
--- 34,47 ----
  public:
      AssignFunc(ComTerp*);
  
+     virtual boolean post_eval() { return true; }
      virtual void execute();
      virtual const char* docstring() { 
        return "= is the assigment operator"; }
  };
  
  //: %= (mod assign) operator .
! class ModAssignFunc : public AssignFunc {
  public:
      ModAssignFunc(ComTerp*);
  
***************
*** 50,56 ****
  };
  
  //: *= (multiply assign) operator .
! class MpyAssignFunc : public MpyFunc {
  public:
      MpyAssignFunc(ComTerp*);
  
--- 51,57 ----
  };
  
  //: *= (multiply assign) operator .
! class MpyAssignFunc : public AssignFunc {
  public:
      MpyAssignFunc(ComTerp*);
  
***************
*** 60,66 ****
  };
  
  //: *= (add assign) operator .
! class AddAssignFunc : public AddFunc {
  public:
      AddAssignFunc(ComTerp*);
  
--- 61,67 ----
  };
  
  //: *= (add assign) operator .
! class AddAssignFunc : public AssignFunc {
  public:
      AddAssignFunc(ComTerp*);
  
***************
*** 70,76 ****
  };
  
  //: += (subtract assign) operator .
! class SubAssignFunc : public SubFunc {
  public:
      SubAssignFunc(ComTerp*);
  
--- 71,77 ----
  };
  
  //: += (subtract assign) operator .
! class SubAssignFunc : public AssignFunc {
  public:
      SubAssignFunc(ComTerp*);
  
***************
*** 80,86 ****
  };
  
  //: /= (divide assign) operator .
! class DivAssignFunc : public DivFunc {
  public:
      DivAssignFunc(ComTerp*);
  
--- 81,87 ----
  };
  
  //: /= (divide assign) operator .
! class DivAssignFunc : public AssignFunc {
  public:
      DivAssignFunc(ComTerp*);
  
***************
*** 90,96 ****
  };
  
  //: ++(increment before) operator.
! class IncrFunc : public AddFunc {
  public:
      IncrFunc(ComTerp*);
  
--- 91,97 ----
  };
  
  //: ++(increment before) operator.
! class IncrFunc : public AssignFunc {
  public:
      IncrFunc(ComTerp*);
  
***************
*** 100,106 ****
  };
  
  //: (increment after)++  operator.
! class IncrAfterFunc : public AddFunc {
  public:
      IncrAfterFunc(ComTerp*);
  
--- 101,107 ----
  };
  
  //: (increment after)++  operator.
! class IncrAfterFunc : public AssignFunc {
  public:
      IncrAfterFunc(ComTerp*);
  
***************
*** 110,116 ****
  };
  
  //: --(decrement before)  operator.
! class DecrFunc : public SubFunc {
  public:
      DecrFunc(ComTerp*);
  
--- 111,117 ----
  };
  
  //: --(decrement before)  operator.
! class DecrFunc : public AssignFunc {
  public:
      DecrFunc(ComTerp*);
  
***************
*** 120,126 ****
  };
  
  //: (decrement after)--  operator.
! class DecrAfterFunc : public SubFunc {
  public:
      DecrAfterFunc(ComTerp*);
  
--- 121,127 ----
  };
  
  //: (decrement after)--  operator.
! class DecrAfterFunc : public AssignFunc {
  public:
      DecrAfterFunc(ComTerp*);
  
Index: ComTerp/comfunc.c
diff -c ComTerp/comfunc.c:1.1 ComTerp/comfunc.c:1.2
*** ComTerp/comfunc.c:1.1	Mon Jan  3 13:20:29 2000
--- src/ComTerp/comfunc.c	Mon Jan  3 13:20:29 2000
***************
*** 127,132 ****
--- 127,133 ----
    }
  
    comterp()->post_eval_expr(argcnt, offtop, pedepth()+1);
+ 
    return comterp()->pop_stack(!symbol);
  }
  
Index: ComTerp/comterp.c
diff -c ComTerp/comterp.c:1.1 ComTerp/comterp.c:1.2
*** ComTerp/comterp.c:1.1	Mon Jan  3 13:20:29 2000
--- src/ComTerp/comterp.c	Mon Jan  3 13:20:29 2000
***************
*** 40,45 ****
--- 40,46 ----
  #include <ComTerp/randfunc.h>
  #include <ComTerp/statfunc.h>
  #include <ComTerp/strmfunc.h>
+ #include <ComTerp/symbolfunc.h>
  #include <ComTerp/xformfunc.h>
  #include <Attribute/attrlist.h>
  
***************
*** 162,168 ****
  }
  
  void ComTerp::eval_expr_internals(int pedepth) {
!   ComValue& sv = pop_stack();
    
    if (sv.type() == ComValue::CommandType) {
      
--- 163,169 ----
  }
  
  void ComTerp::eval_expr_internals(int pedepth) {
!   ComValue& sv = pop_stack(false);
    
    if (sv.type() == ComValue::CommandType) {
      
***************
*** 186,192 ****
        } else
  	push_stack(ComValue::nullval());
      } else 
!       push_stack(sv);
      
    } else if (sv.type() == ComValue::BlankType) {
  
--- 187,193 ----
        } else
  	push_stack(ComValue::nullval());
      } else 
!       push_stack(lookup_symval(sv));
      
    } else if (sv.type() == ComValue::BlankType) {
  
***************
*** 242,248 ****
  	push_stack(argoffval);
        }
      }
!     push_stack(_pfcomvals[_pfoff]);
      _pfoff++;
      if (stack_top().type() == ComValue::CommandType && 
  	!_pfcomvals[_pfoff-1].pedepth()) break;
--- 243,250 ----
  	push_stack(argoffval);
        }
      }
!     if (!_pfcomvals[_pfoff].is_null())
!       push_stack(_pfcomvals[_pfoff]);
      _pfoff++;
      if (stack_top().type() == ComValue::CommandType && 
  	!_pfcomvals[_pfoff-1].pedepth()) break;
***************
*** 566,578 ****
          return ComValue::nullval();
  }
  
! int ComTerp::add_command(const char* name, ComFunc* func) {
      int symid = symbol_add((char *)name);
      ComValue* comval = new ComValue();
      comval->type(ComValue::CommandType);
      comval->obj_ref() = (void*)func;
      comval->command_symid(symid);
      localtable()->insert(symid, comval);
      return symid;
  }
  
--- 568,588 ----
          return ComValue::nullval();
  }
  
! int ComTerp::add_command(const char* name, ComFunc* func, const char* alias) {
      int symid = symbol_add((char *)name);
      ComValue* comval = new ComValue();
      comval->type(ComValue::CommandType);
      comval->obj_ref() = (void*)func;
      comval->command_symid(symid);
      localtable()->insert(symid, comval);
+     if (alias) {
+       int alias_symid = symbol_add((char *)alias);
+       ComValue* aliasval = new ComValue();
+       aliasval->type(ComValue::CommandType);
+       aliasval->obj_ref() = (void*)func;
+       aliasval->command_symid(alias_symid, true /* alias */);
+       localtable()->insert(symid, aliasval);
+     }
      return symid;
  }
  
***************
*** 723,729 ****
  
      add_command("help", new HelpFunc(this));
      add_command("symid", new SymIdFunc(this));
!     add_command("symval", new SymValFunc(this));
      add_command("postfix", new PostFixFunc(this));
      add_command("posteval", new PostEvalFunc(this));
  
--- 733,740 ----
  
      add_command("help", new HelpFunc(this));
      add_command("symid", new SymIdFunc(this));
!     add_command("symbol", new SymbolFunc(this), "symval");
!     add_command("symvar", new SymVarFunc(this));
      add_command("postfix", new PostFixFunc(this));
      add_command("posteval", new PostEvalFunc(this));
  
Index: ComTerp/comterp.h
diff -c ComTerp/comterp.h:1.1 ComTerp/comterp.h:1.2
*** ComTerp/comterp.h:1.1	Mon Jan  3 13:20:29 2000
--- src/ComTerp/comterp.h	Mon Jan  3 13:20:29 2000
***************
*** 47,53 ****
  // ComTerp is an extendable command interpreter with a simple C-like expression
  // syntax and support for commands with fixed-location and keyword-prefixed 
  // arguments.  The underlying architecture of this interpreter is patterned
! // after Fischer and LeBlanc's "Crafting a Compiler in C", with their pipeline
  // of scanner --> parser --> code_conversion --> code_generation retrofitted into 
  // one of scanner --> parser --> code_conversion --> interpreter.
  // <p>
--- 47,53 ----
  // ComTerp is an extendable command interpreter with a simple C-like expression
  // syntax and support for commands with fixed-location and keyword-prefixed 
  // arguments.  The underlying architecture of this interpreter is patterned
! // after Fischer and LeBlanc's "Crafting a Compiler with C", with their pipeline
  // of scanner --> parser --> code_conversion --> code_generation retrofitted into 
  // one of scanner --> parser --> code_conversion --> interpreter.
  // <p>
***************
*** 99,105 ****
      void brief(boolean flag) { _brief = flag; }
      // set brief mode flag.
  
!     int add_command(const char* name, ComFunc*);
      // add a derived ComFunc to be known by 'name'.
      void list_commands(ostream& out, boolean sorted = false);
      // print an optionally sorted list of commands to an ostream.
--- 99,105 ----
      void brief(boolean flag) { _brief = flag; }
      // set brief mode flag.
  
!     int add_command(const char* name, ComFunc*, const char* alias = nil);
      // add a derived ComFunc to be known by 'name'.
      void list_commands(ostream& out, boolean sorted = false);
      // print an optionally sorted list of commands to an ostream.
***************
*** 216,238 ****
      boolean _quitflag;
      char* _errbuf;
      int _pfoff;
!     boolean _brief;
      boolean _just_reset;
!     boolean _defaults_added;
  
!     ComValueTable* _localtable;
!     static ComValueTable* _globaltable;
!     AttributeList* _alist;
  
!     ComFuncState* _fsstack;
      int _fsstack_top;
      unsigned int _fsstack_siz;
  
!     ComValue* _pfcomvals;
  
      static ComTerp* _instance;
  
      ComterpHandler* _handler;
  
      friend class ComFunc;
      friend class ComterpHandler;
--- 216,241 ----
      boolean _quitflag;
      char* _errbuf;
      int _pfoff;
!     boolean _brief; // when used to produce ComValue output
      boolean _just_reset;
!     boolean _defaults_added; // flag for base set of commands added 
  
!     ComValueTable* _localtable; // per interpreter symbol table
!     static ComValueTable* _globaltable; // interpreter shared symbol table
!     AttributeList* _alist; // extends symbol tables with names in an AttributeList
  
!     ComFuncState* _fsstack;  // stack of func-status (nargs/nkeys/...) 
      int _fsstack_top;
      unsigned int _fsstack_siz;
  
!     ComValue* _pfcomvals; 
!     // postfix buffer of ComValue's converted from postfix_token
  
      static ComTerp* _instance;
+     // default instance of a ComTerp
  
      ComterpHandler* _handler;
+     // I/O handler for this ComTerp.
  
      friend class ComFunc;
      friend class ComterpHandler;
Index: ComTerp/ctrlfunc.c
diff -c ComTerp/ctrlfunc.c:1.1 ComTerp/ctrlfunc.c:1.2
*** ComTerp/ctrlfunc.c:1.1	Mon Jan  3 13:20:29 2000
--- src/ComTerp/ctrlfunc.c	Mon Jan  3 13:20:29 2000
***************
*** 187,192 ****
--- 187,195 ----
  }
  
  void EvalFunc::execute() {
+   static int symret_sym = symbol_add("symret");
+   ComValue symretv(stack_key(symret_sym));
+ 
    // evaluate every string fixed argument on the stack and return in array
    int numargs = nargsfixed();
    if (numargs) {
***************
*** 197,202 ****
--- 200,209 ----
        if (argstrv.is_string()) {
  	if (comterp()->is_serv()) {
  	  ComValue* val = new ComValue(comterpserv()->run(argstrv.symbol_ptr(), true /* nested */));
+ 	  if (val->is_nil() && symretv.is_true()) {
+ 	    delete val;
+ 	    val = new ComValue(argstrv.symbol_val(), AttributeValue::SymbolType);
+ 	  }
  	  if (!avl) avl = new AttributeValueList();
  	  avl->Append(val);
  	} else 
Index: ComTerp/ctrlfunc.h
diff -c ComTerp/ctrlfunc.h:1.1 ComTerp/ctrlfunc.h:1.2
*** ComTerp/ctrlfunc.h:1.1	Mon Jan  3 13:20:29 2000
--- src/ComTerp/ctrlfunc.h	Mon Jan  3 13:20:29 2000
***************
*** 110,123 ****
  };
  
  //: eval string command for ComTerp.
! // eval(cmdstr) -- evaluate string as commands.
  class EvalFunc : public ComFunc {
  public:
      EvalFunc(ComTerp*);
  
      virtual void execute();
      virtual const char* docstring() { 
!       return "%s(cmdstr) -- evaluate string as commands"; }
  
  };
  
--- 110,123 ----
  };
  
  //: eval string command for ComTerp.
! // eval(cmdstr [cmdstr ...] :symret) -- evaluate string as commands, optionally returning symbol instead of nil.
  class EvalFunc : public ComFunc {
  public:
      EvalFunc(ComTerp*);
  
      virtual void execute();
      virtual const char* docstring() { 
!       return "%s(cmdstr) -- evaluate string as commands, optionally return symbol instead of nil"; }
  
  };
  
Index: ComTerp/helpfunc.c
diff -c ComTerp/helpfunc.c:1.1 ComTerp/helpfunc.c:1.2
*** ComTerp/helpfunc.c:1.1	Mon Jan  3 13:20:29 2000
--- src/ComTerp/helpfunc.c	Mon Jan  3 13:20:29 2000
***************
*** 46,51 ****
--- 46,54 ----
    // because that is what it would be (an operator)
    static int all_symid = symbol_add("all");
    ComValue allflag(stack_key(all_symid));
+ 
+   static int aliases_symid = symbol_add("aliases");
+   ComValue aliasesflag(stack_key(aliases_symid));
  		   
    boolean noargs = !nargs() && !nkeys();
    ComFunc** comfuncs= nil;
***************
*** 90,97 ****
      comfuncs = new ComFunc*[nfuncs];
      str_flags = new boolean[nfuncs];
      for (int j=0; j<nfuncs; j++) {
        void* vptr;
!       comterp()->localtable()->find(vptr, command_ids[j]);
        if (vptr) {
  	comfuncs[j] = (ComFunc*)((ComValue*)vptr)->obj_val();
        } else
--- 93,109 ----
      comfuncs = new ComFunc*[nfuncs];
      str_flags = new boolean[nfuncs];
      for (int j=0; j<nfuncs; j++) {
+ 
+       /* check for aliases, and negate the symbol id if needed */
+       int command_id;
+       if (command_ids[j]<0) {
+ 	if (aliasesflag.is_false()) continue;
+ 	command_id = -command_ids[j];
+       } else 
+ 	command_id = command_ids[j];
+ 
        void* vptr;
!       comterp()->localtable()->find(vptr, command_id);
        if (vptr) {
  	comfuncs[j] = (ComFunc*)((ComValue*)vptr)->obj_val();
        } else
***************
*** 175,232 ****
  
  }
  
- /*****************************************************************************/
- 
- SymIdFunc::SymIdFunc(ComTerp* comterp) : ComFunc(comterp) {
- }
- 
- void SymIdFunc::execute() {
-   // print symbol id of arguments
-   boolean noargs = !nargs() && !nkeys();
-   int numargs = nargs();
-   int symbol_ids[numargs];
-   for (int i=0; i<numargs; i++) {
-     ComValue& val = stack_arg(i, true);
-     if (val.is_type(AttributeValue::CommandType))
-       symbol_ids[i] = val.command_symid();
-     else if (val.is_type(AttributeValue::StringType))
-       symbol_ids[i] = val.string_val();
-     else if (val.is_type(AttributeValue::SymbolType))
-       symbol_ids[i] = val.symbol_val();
-     else 
-       symbol_ids[i] = -1;
-   }
-   reset_stack();
- 
-   AttributeValueList* avl = new AttributeValueList();
-   ComValue retval(avl);
-   for (int i=0; i<numargs; i++)
-     avl->Append(new AttributeValue(symbol_ids[i], AttributeValue::IntType));
-   push_stack(retval);
- }
- 
- /*****************************************************************************/
- 
- SymValFunc::SymValFunc(ComTerp* comterp) : ComFunc(comterp) {
- }
- 
- void SymValFunc::execute() {
-   // print symbol id of arguments
-   boolean noargs = !nargs() && !nkeys();
-   int numargs = nargs();
-   int symbol_ids[numargs];
-   for (int i=0; i<numargs; i++) {
-     ComValue& val = stack_arg(i, true);
-     if (val.is_char() || val.is_short() || val.is_int())
-       symbol_ids[i] = val.int_val();
-     else 
-       symbol_ids[i] = -1;
-   }
-   reset_stack();
- 
-   AttributeValueList* avl = new AttributeValueList();
-   ComValue retval(avl);
-   for (int i=0; i<numargs; i++)
-     avl->Append(new AttributeValue(symbol_ids[i], AttributeValue::StringType));
-   push_stack(retval);
- }
--- 187,189 ----
Index: ComTerp/helpfunc.h
diff -c ComTerp/helpfunc.h:1.1 ComTerp/helpfunc.h:1.2
*** ComTerp/helpfunc.h:1.1	Mon Jan  3 13:20:29 2000
--- src/ComTerp/helpfunc.h	Mon Jan  3 13:20:29 2000
***************
*** 44,71 ****
        return "%s([command] [command...] :all) -- help for commands"; }
  };
  
- //: symbol id command for ComTerp.
- // symid(symbol [symbol...]) -- return id associated with symbol
- class SymIdFunc : public ComFunc {
- public:
-     SymIdFunc(ComTerp*);
-     virtual void execute();
- 
-     virtual boolean post_eval() { return true; }
-     virtual const char* docstring() { 
-       return "%s(symbol [symbol...]) -- return id associated with symbol"; }
- };
- 
- //: symbol value command for ComTerp.
- // symval(symid [symid...]) -- return symbol associated with id.
- class SymValFunc : public ComFunc {
- public:
-     SymValFunc(ComTerp*);
-     virtual void execute();
- 
-     virtual boolean post_eval() { return true; }
-     virtual const char* docstring() { 
-       return "%s(symid [symid...]) -- return symbol associated with id"; }
- };
- 
  #endif /* !defined(_helpfunc_h) */
--- 44,47 ----
Index: ComTerp/postfunc.c
diff -c ComTerp/postfunc.c:1.1 ComTerp/postfunc.c:1.2
*** ComTerp/postfunc.c:1.1	Mon Jan  3 13:20:29 2000
--- src/ComTerp/postfunc.c	Mon Jan  3 13:20:29 2000
***************
*** 164,170 ****
      delete bodyexpr;
      ComValue keybody(stack_key_post_eval(body_symid, false, ComValue::unkval(), true));
      if (keybody.is_unknown() && nargsfixed()>= 2)
!       bodyexpr = new ComValue(stack_arg_post_eval(3));
      else
        bodyexpr = new ComValue(keybody);
      if (untilflag.is_true()) {
--- 164,170 ----
      delete bodyexpr;
      ComValue keybody(stack_key_post_eval(body_symid, false, ComValue::unkval(), true));
      if (keybody.is_unknown() && nargsfixed()>= 2)
!       bodyexpr = new ComValue(stack_arg_post_eval(1));
      else
        bodyexpr = new ComValue(keybody);
      if (untilflag.is_true()) {
Index: comterp/README
diff -c comterp/README:1.1 comterp/README:1.2
*** comterp/README:1.1	Mon Jan  3 13:20:32 2000
--- src/comterp_/README	Mon Jan  3 13:20:32 2000
***************
*** 175,187 ****
  
  [str]=print(fmtstr val :string|:str :err) -- print value with format string
  
! symid(symbol [symbol...]) -- return id associated with symbol
  
! symval(symid [symid...]) -- return symbol associated with id
  
  postfix(arg1 [arg2 [arg3 ... [argn]]]) -- echo unevaluated postfix arguments
  (with [narg|nkey] after defined commands, {narg|nkey} after undefined commands,
! (narg) after keys)
  
  arr=posteval(arg1 [arg2 [arg3 ... [argn]]]) -- post-evaluate every fixed 
  argument (until nil) and return array
--- 175,189 ----
  
  [str]=print(fmtstr val :string|:str :err) -- print value with format string
  
! symid(symbol [symbol...]) -- return integer id(s) associated with symbol(s)
  
! symbol(symid [symid...]) -- return symbol(s) associated with integer id(s)
! 
! symvar(symbol_var [symbol_var...]) -- return value(s) associated with symbol variable(s)
  
  postfix(arg1 [arg2 [arg3 ... [argn]]]) -- echo unevaluated postfix arguments
  (with [narg|nkey] after defined commands, {narg|nkey} after undefined commands,
! (narg) after keys, and a * following post-evaluation commands)
  
  arr=posteval(arg1 [arg2 [arg3 ... [argn]]]) -- post-evaluate every fixed 
  argument (until nil) and return array
***************
*** 195,201 ****
  val=remote(hoststr portnum cmdstr :nowait) -- remotely evaluate command string then 
  locally evaluate result string
  
! val=eval(cmdstr) -- evaluate string as commands
  
  val=shell(cmdstr) -- evaluate command in shell
  
--- 197,204 ----
  val=remote(hoststr portnum cmdstr :nowait) -- remotely evaluate command string then 
  locally evaluate result string
  
! val=eval(cmdstr [cmdstr ...] :symret ) -- evaluate string as commands, 
! optionally return symbol instead of nil
  
  val=shell(cmdstr) -- evaluate command in shell
  
Index: UniIdraw/idcatalog.c
diff -c UniIdraw/idcatalog.c:1.1 UniIdraw/idcatalog.c:1.2
*** UniIdraw/idcatalog.c:1.1	Mon Jan  3 13:20:46 2000
--- src/UniIdraw/idcatalog.c	Mon Jan  3 13:20:46 2000
***************
*** 970,975 ****
--- 970,976 ----
      }
  
      Raster* raster = new Raster(w, h);
+     cerr << "w,h " << w << "," << h << "\n";
      ReadRasterData(raster, in);
  
      return new RasterComp(new RasterRect(raster, &gs));
Index: ComUnidraw/Imakefile
diff -c ComUnidraw/Imakefile:1.1 ComUnidraw/Imakefile:1.2
*** ComUnidraw/Imakefile:1.1	Mon Jan  3 13:20:48 2000
--- src/ComUnidraw/Imakefile	Mon Jan  3 13:20:48 2000
***************
*** 18,23 ****
--- 18,24 ----
  #define Obj26(file) MakeObjectFromSrcFlags(file,)
  
  Obj26(grfunc)
+ Obj26(grstatfunc)
  Obj26(comeditor)
  Obj26(comterp-iohandler)
  Obj26(nfunc)
Index: ComUnidraw/comeditor.c
diff -c ComUnidraw/comeditor.c:1.1 ComUnidraw/comeditor.c:1.2
*** ComUnidraw/comeditor.c:1.1	Mon Jan  3 13:20:48 2000
--- src/ComUnidraw/comeditor.c	Mon Jan  3 13:20:48 2000
***************
*** 22,27 ****
--- 22,28 ----
   */
  
  #include <ComUnidraw/grfunc.h>
+ #include <ComUnidraw/grstatfunc.h>
  #include <ComUnidraw/comeditor.h>
  #include <ComUnidraw/comterp-iohandler.h>
  #include <ComUnidraw/nfunc.h>
***************
*** 125,130 ****
--- 126,135 ----
      comterp->add_command("arrowspline", new CreateOpenSplineFunc(comterp, this));
      comterp->add_command("polygon", new CreatePolygonFunc(comterp, this));
      comterp->add_command("closedspline", new CreateClosedSplineFunc(comterp, this));
+ 
+     comterp->add_command("center", new CenterFunc(comterp, this));
+     comterp->add_command("mbr", new MbrFunc(comterp, this));
+     comterp->add_command("points", new PointsFunc(comterp, this));
  
      comterp->add_command("font", new FontFunc(comterp, this));
      comterp->add_command("brush", new BrushFunc(comterp, this));
Index: ComUnidraw/grfunc.c
diff -c ComUnidraw/grfunc.c:1.1 ComUnidraw/grfunc.c:1.2
*** ComUnidraw/grfunc.c:1.1	Mon Jan  3 13:20:48 2000
--- src/ComUnidraw/grfunc.c	Mon Jan  3 13:20:48 2000
***************
*** 652,670 ****
  }
  
  void SelectFunc::execute() {
!     Selection* sel = _ed->GetSelection();
!     sel->Clear();
      
!     for (int i=0; i<nargs(); i++) {
          ComValue& obj = stack_arg(i);
  	if (obj.obj_type_val() == _compview_id) {
! 	    ComponentView* comview = (ComponentView*)obj.obj_val();
! 	    OverlayComp* comp = (OverlayComp*)comview->GetSubject();
! 	    if (comp) 
!                 sel->Append(comp->FindView(_ed->GetViewer()));
  	}
      }
      reset_stack();
  }
  
  /*****************************************************************************/
--- 652,698 ----
  }
  
  void SelectFunc::execute() {
!     Selection* s = _ed->GetSelection();
!     delete s;
!     OverlaySelection* newSel = new OverlaySelection();
      
!     Viewer* viewer = _ed->GetViewer();
!     AttributeValueList* avl = new AttributeValueList();
!     if (nargs()==0) {
! 
!       GraphicView* gv = viewer->GetGraphicView();
!       Iterator i;
!       int count=0;
!       for (gv->First(i); !gv->Done(i); gv->Next(i)) {
! 	GraphicView* subgv = gv->GetView(i);
! 	newSel->Append(subgv);
! 	GraphicComp* comp = subgv->GetGraphicComp();
! 	ComValue* compval = new ComValue(_compview_id, new ComponentView(comp));
! 	avl->Append(compval);
!       }
! 
!     } else {
! 
!       for (int i=0; i<nargsfixed(); i++) {
          ComValue& obj = stack_arg(i);
  	if (obj.obj_type_val() == _compview_id) {
! 	  ComponentView* comview = (ComponentView*)obj.obj_val();
! 	  OverlayComp* comp = (OverlayComp*)comview->GetSubject();
! 	  if (comp) {
! 	    newSel->Append(comp->FindView(viewer));
! 	    ComValue* compval = new ComValue(_compview_id, new ComponentView(comp));
! 	    avl->Append(compval);
! 	  }
  	}
+       }
      }
+ 
+     _ed->SetSelection(newSel);
+     newSel->Update();
+     unidraw->Update();
      reset_stack();
+     ComValue retval(avl);
+     push_stack(retval);
  }
  
  /*****************************************************************************/
Index: ComUnidraw/grfunc.h
diff -c ComUnidraw/grfunc.h:1.1 ComUnidraw/grfunc.h:1.2
*** ComUnidraw/grfunc.h:1.1	Mon Jan  3 13:20:48 2000
--- src/ComUnidraw/grfunc.h	Mon Jan  3 13:20:48 2000
***************
*** 60,66 ****
  
  //: text drawing command for comdraw.
  // compview=text(x0,y0 textstr) -- create a text string
! class CreateTextFunc : public UnidrawFunc {  // doesn\'t work
  public:
      CreateTextFunc(ComTerp*,Editor*);
      virtual void execute();
--- 60,66 ----
  
  //: text drawing command for comdraw.
  // compview=text(x0,y0 textstr) -- create a text string
! class CreateTextFunc : public UnidrawFunc { 
  public:
      CreateTextFunc(ComTerp*,Editor*);
      virtual void execute();
***************
*** 151,163 ****
  };
  
  //: command to select graphics in comdraw.
! // select(compview [compview ...]) -- make these graphics the current selection
  class SelectFunc : public UnidrawFunc {
  public:
      SelectFunc(ComTerp*,Editor*);
      virtual void execute();
      virtual const char* docstring() { 
! 	return "%s(compview [compview ...]) -- make these graphics the current selection"; }
  };
  
  //: command to move current selection in comdraw
--- 151,163 ----
  };
  
  //: command to select graphics in comdraw.
! // select([compview ...]) -- make these graphics the current selection (dflt is all)
  class SelectFunc : public UnidrawFunc {
  public:
      SelectFunc(ComTerp*,Editor*);
      virtual void execute();
      virtual const char* docstring() { 
! 	return "%s([compview ...]) -- make these graphics the current selection (dflt is all)"; }
  };
  
  //: command to move current selection in comdraw
Index: comdraw/README
diff -c comdraw/README:1.1 comdraw/README:1.2
*** comdraw/README:1.1	Mon Jan  3 13:20:50 2000
--- src/comdraw/README	Mon Jan  3 13:20:50 2000
***************
*** 38,43 ****
--- 38,48 ----
  compview=polygon(x0,y0[,x1,y1,...]) -- create a polygon
  compview=closedspline(x0,y0[,x1,y1,...]) -- create a closed spline
  
+ GRAPHIC STATS COMMANDS
+ 
+ val=center(compview :xy :yx :x :y) -- center of compview (dflt :xy)
+ val=mbr(compview :lbrt :lrbt) -- minimum bounding rectangle of compview (dflt :lbrt)
+ 
  GRAPHIC STATE COMMANDS
  
  font(fontnum) -- set current font from menu
***************
*** 52,58 ****
  
  DIRECT MANIPULATION COMMANDS
  
! select(compview [compview ...]) -- make these graphics the current selection
  move(dx dy) -- move current selection
  scale(xflt yflt) -- scale current selection
  rotate(degflt) -- rotate current selection
--- 57,63 ----
  
  DIRECT MANIPULATION COMMANDS
  
! select(compview [compview ...] :all) -- make these graphics the current selection
  move(dx dy) -- move current selection
  scale(xflt yflt) -- scale current selection
  rotate(degflt) -- rotate current selection
***************
*** 110,115 ****
--- 115,124 ----
  "-import n" specifies the port number run the import service on.  The
  import service accepts connections over the net and reads drawtool
  format data.
+ 
+ "-stripped" brings up a comdraw without any menubar, toolbar, panner,
+ slider, or zoomer.  It can be controlled via stdin or telnet if built
+ with ACE.
  
  SEE ALSO  
  	comterp, drawtool, idraw
Index: comdraw/main.c
diff -c comdraw/main.c:1.1 comdraw/main.c:1.2
*** comdraw/main.c:1.1	Mon Jan  3 13:20:50 2000
--- src/comdraw/main.c	Mon Jan  3 13:20:50 2000
***************
*** 1,5 ****
  /*
!  * Copyright (c) 1994-1999 Vectaport, Inc.
   * Copyright (c) 1990, 1991 Stanford University
   *
   * Permission to use, copy, modify, distribute, and sell this software and
--- 1,5 ----
  /*
!  * Copyright (c) 1994-2000 Vectaport, Inc.
   * Copyright (c) 1990, 1991 Stanford University
   *
   * Permission to use, copy, modify, distribute, and sell this software and
***************
*** 161,166 ****
--- 161,167 ----
      { "*twidth",        "512" },
      { "*zoomer_off",    "false"  },
      { "*opaque_off",    "false"  },
+     { "*stripped",        "false"  },
  #ifdef HAVE_ACE
      { "*import",        "20001" },
      { "*comdraw",       "20002" },
***************
*** 204,209 ****
--- 205,211 ----
      { "-zoomer_off", "*zoomer_off", OptionValueImplicit, "true" },
      { "-opaque_off", "*opaque_off", OptionValueImplicit, "true" },
      { "-opoff", "*opaque_off", OptionValueImplicit, "true" },
+     { "-stripped", "*stripped", OptionValueImplicit, "true" },
  #ifdef HAVE_ACE
      { "-import", "*import", OptionValueNext },
      { "-comdraw", "*comdraw", OptionValueNext },
***************
*** 223,229 ****
  [-color6] [-import portnum] [-gray5] [-gray6] [-gray7] [-opaque_off|-opoff] \n\
  [-pagecols|-ncols] [-pagerows|-nrows] [-panner_off|-poff] \n\
  [-panner_align|-pal tl|tc|tr|cl|c|cr|cl|bl|br|l|r|t|b|hc|vc] \n\
! [-rampsize n ] [-scribble_pointer|-scrpt ] [-slider_off|-soff] \n\
  [-toolbarloc|-tbl r|l ] [-theight|-th n] [-tile] [-twidth|-tw n] \n\
  [-wbhost host] [-wbmaster] [-wbslave] [-wbport port] [-zoomer_off|-zoff] [file]";
  #else
--- 225,231 ----
  [-color6] [-import portnum] [-gray5] [-gray6] [-gray7] [-opaque_off|-opoff] \n\
  [-pagecols|-ncols] [-pagerows|-nrows] [-panner_off|-poff] \n\
  [-panner_align|-pal tl|tc|tr|cl|c|cr|cl|bl|br|l|r|t|b|hc|vc] \n\
! [-rampsize n ] [-scribble_pointer|-scrpt ] [-slider_off|-soff] [-stripped]\n\
  [-toolbarloc|-tbl r|l ] [-theight|-th n] [-tile] [-twidth|-tw n] \n\
  [-wbhost host] [-wbmaster] [-wbslave] [-wbport port] [-zoomer_off|-zoff] [file]";
  #else
***************
*** 232,238 ****
  [-color6] [-gray5] [-gray6] [-gray7] [-opaque_off|-opoff] \n\
  [-pagecols|-ncols] [-pagerows|-nrows] [-panner_off|-poff] \n\
  [-panner_align|-pal tl|tc|tr|cl|c|cr|cl|bl|br|l|r|t|b|hc|vc] \n\
! [-rampsize n ] [-scribble_pointer|-scrpt ] [-slider_off|-soff] \n\
  [-toolbarloc|-tbl r|l ] [-theight|-th n] [-tile] [-twidth|-tw n] \n\
  [-zoomer_off|-zoff] [file]";
  #endif
--- 234,240 ----
  [-color6] [-gray5] [-gray6] [-gray7] [-opaque_off|-opoff] \n\
  [-pagecols|-ncols] [-pagerows|-nrows] [-panner_off|-poff] \n\
  [-panner_align|-pal tl|tc|tr|cl|c|cr|cl|bl|br|l|r|t|b|hc|vc] \n\
! [-rampsize n ] [-scribble_pointer|-scrpt ] [-slider_off|-soff] [-stripped]\n\
  [-toolbarloc|-tbl r|l ] [-theight|-th n] [-tile] [-twidth|-tw n] \n\
  [-zoomer_off|-zoff] [file]";
  #endif
Index: flipbook/Imakefile
diff -c flipbook/Imakefile:1.1 flipbook/Imakefile:1.2
*** flipbook/Imakefile:1.1	Mon Jan  3 13:20:52 2000
--- src/flipbook/Imakefile	Mon Jan  3 13:20:52 2000
***************
*** 47,52 ****
--- 47,53 ----
  #define Obj(file) MakeObjectFromSrcFlags(file,)
  
  Obj(main)
+ Obj(malloc)
  
  IncludeDependencies()
  
Index: include_interviews/transformer.h
diff -c include_interviews/transformer.h:1.1 include_interviews/transformer.h:1.2
*** include_interviews/transformer.h:1.1	Mon Jan  3 13:20:58 2000
--- src/include/InterViews/transformer.h	Mon Jan  3 13:20:58 2000
***************
*** 29,43 ****
  #ifndef iv_transformer_h
  #define iv_transformer_h
  
  #include <InterViews/coord.h>
  #include <InterViews/resource.h>
  
  #include <InterViews/_enter.h>
  
  //: a 3x2 matrix for use in translating 2d coordinates.
  // <a href=../refman3.1/refman.html#PAGE40>in reference manual</a>
  // <p><a href=../man3.1/Transformer.html>man page</a>
! class Transformer : public Resource {
  public:
      Transformer();	/* identity */
      Transformer(const Transformer&);
--- 29,51 ----
  #ifndef iv_transformer_h
  #define iv_transformer_h
  
+ #if defined(PSTOEDIT)
+ typedef IntCoord int;
+ #else
  #include <InterViews/coord.h>
  #include <InterViews/resource.h>
  
  #include <InterViews/_enter.h>
+ #endif
  
  //: a 3x2 matrix for use in translating 2d coordinates.
  // <a href=../refman3.1/refman.html#PAGE40>in reference manual</a>
  // <p><a href=../man3.1/Transformer.html>man page</a>
! class Transformer 
! #if !defined(PSTOEDIT) 
! : public Resource 
! #endif
! {
  public:
      Transformer();	/* identity */
      Transformer(const Transformer&);
***************
*** 166,171 ****
--- 174,181 ----
  inline void Transformer::Postmultiply(Transformer* t) { postmultiply(*t); }
  inline void Transformer::Invert() { invert(); }
  
+ #if !defined(PSTOEDIT)
  #include <InterViews/_leave.h>
+ #endif
  
  #endif
Index: man1_ivtools/comdraw.1
diff -c man1_ivtools/comdraw.1:1.1 man1_ivtools/comdraw.1:1.2
*** man1_ivtools/comdraw.1:1.1	Mon Jan  3 13:21:03 2000
--- src/man/man1/comdraw.1	Mon Jan  3 13:21:03 2000
***************
*** 43,48 ****
--- 43,53 ----
   compview=closedspline(x0,y0[,x1,y1,...]) -- 
      create a closed spline
  
+ .SH GRAPHIC STATS COMMANDS
+ 
+  val=center(compview :xy :yx :x :y) -- center of compview (dflt :xy)
+  val=mbr(compview :lbrt :lrbt) -- minimum bounding rectangle of compview (dflt :lbrt)
+ 
  .SH GRAPHIC STATE COMMANDS
  
   font(fontnum) -- set current font from menu
***************
*** 59,65 ****
  
  .SH DIRECT MANIPULATION COMMANDS
  
!  select(compview [compview ...]) -- 
      make these graphics the current selection
   move(dx dy) -- move current selection
   scale(xflt yflt) -- scale current selection
--- 64,70 ----
  
  .SH DIRECT MANIPULATION COMMANDS
  
!  select(compview [compview ...] :all) -- 
      make these graphics the current selection
   move(dx dy) -- move current selection
   scale(xflt yflt) -- scale current selection
***************
*** 122,127 ****
--- 127,137 ----
  specifies the port number run the import service on.  The
  import service accepts connections over the net and reads drawtool
  format data.
+ 
+ .B \-stripped n,
+ brings up a comdraw without any menubar, toolbar, panner,
+ slider, or zoomer.  It can be controlled via stdin or telnet if built
+ with ACE.
  
  .SH SEE ALSO  
         comterp, drawtool, idraw
Index: man1_ivtools/comterp.1
diff -c man1_ivtools/comterp.1:1.1 man1_ivtools/comterp.1:1.2
*** man1_ivtools/comterp.1:1.1	Mon Jan  3 13:21:03 2000
--- src/man/man1/comterp.1	Mon Jan  3 13:21:03 2000
***************
*** 181,193 ****
  
   help(cmdname [cmdname ...]) -- help for commands
  
! [str]=print(fmtstr val :string|:str :err) -- print value with format string
  
!  symid(symbol [symbol...]) -- return id associated with symbol
  
!  symval(symid [symid...]) -- return symbol associated with id
  
!  postfix(arg1 [arg2 [arg3 ... [argn]]]) -- echo unevaluated postfix arguments (with [narg|nkey] after defined commands, {narg|nkey} after undefined commands, (narg) after keys)
  
   arr=posteval(arg1 [arg2 [arg3 ... [argn]]]) -- post-evaluate every fixed argument (until nil) and return array
  				 
--- 181,195 ----
  
   help(cmdname [cmdname ...]) -- help for commands
  
!  [str]=print(fmtstr val :string|:str :err) -- print value with format string
  
!  symid(symbol [symbol...]) -- return integer id(s) associated with symbol(s)
  
!  symbol(symid [symid...]) -- return symbol(s) associated with integer id(s)
  
!  symvar(symbol_var [symbol_var...]) -- return value(s) associated with symbol variable(s)
! 
!  postfix(arg1 [arg2 [arg3 ... [argn]]]) -- echo unevaluated postfix arguments (with [narg|nkey] after defined commands, {narg|nkey} after undefined commands, (narg) after keys, and a * following post-evaluation commands)
  
   arr=posteval(arg1 [arg2 [arg3 ... [argn]]]) -- post-evaluate every fixed argument (until nil) and return array
  				 
***************
*** 200,206 ****
  
   val=remote(hoststr portnum cmdstr :nowait) -- remotely evaluate command string then locally evaluate result string
  
!  val=eval(cmdstr) -- evaluate string as commands
  
   val=shell(cmdstr) -- evaluate command in shell
  
--- 202,208 ----
  
   val=remote(hoststr portnum cmdstr :nowait) -- remotely evaluate command string then locally evaluate result string
  
!  val=eval(cmdstr [cmdstr ...] :symret ) -- evaluate string as commands, optionally return symbol instead of nil
  
   val=shell(cmdstr) -- evaluate command in shell
  
Index: config_iv/TIFF.def
diff -c config_iv/TIFF.def:1.1 config_iv/TIFF.def:1.2
*** config_iv/TIFF.def:1.1	Mon Jan  3 13:21:07 2000
--- config/InterViews/TIFF.def	Mon Jan  3 13:21:07 2000
***************
*** 233,236 ****
  	$(TIFF_CDRIVER) $(TIFF_CFLAGS) flags -c src.c
  #endif
  
- 
--- 233,235 ----
Index: ComTerp/symbolfunc.c
diff -c /dev/null ComTerp/symbolfunc.c:1.1
*** /dev/null	Mon Jan  3 13:32:56 2000
--- src/ComTerp/symbolfunc.c	Mon Jan  3 13:32:56 2000
***************
*** 0 ****
--- 1,117 ----
+ /*
+  * Copyright (c) 1998,1999 Vectaport Inc.
+  *
+  * Permission to use, copy, modify, distribute, and sell this software and
+  * its documentation for any purpose is hereby granted without fee, provided
+  * that the above copyright notice appear in all copies and that both that
+  * copyright notice and this permission notice appear in supporting
+  * documentation, and that the names of the copyright holders not be used in
+  * advertising or publicity pertaining to distribution of the software
+  * without specific, written prior permission.  The copyright holders make
+  * no representations about the suitability of this software for any purpose.
+  * It is provided "as is" without express or implied warranty.
+  *
+  * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+  * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
+  * IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL,
+  * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+  * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+  * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  * 
+  */
+ 
+ #include <ComTerp/symbolfunc.h>
+ #include <ComTerp/comhandler.h>
+ #include <ComTerp/comvalue.h>
+ #include <ComTerp/comterp.h>
+ 
+ #include <Attribute/attrlist.h>
+ #include <Attribute/attrvalue.h>
+ 
+ #include <iostream.h>
+ 
+ #define TITLE "SymbolFunc"
+ 
+ /*****************************************************************************/
+ 
+ SymIdFunc::SymIdFunc(ComTerp* comterp) : ComFunc(comterp) {
+ }
+ 
+ void SymIdFunc::execute() {
+   // return id of each symbol in the arguments
+   boolean noargs = !nargs() && !nkeys();
+   int numargs = nargs();
+   int symbol_ids[numargs];
+   for (int i=0; i<numargs; i++) {
+     ComValue& val = stack_arg(i, true);
+     if (val.is_type(AttributeValue::CommandType))
+       symbol_ids[i] = val.command_symid();
+     else if (val.is_type(AttributeValue::StringType))
+       symbol_ids[i] = val.string_val();
+     else if (val.is_type(AttributeValue::SymbolType))
+       symbol_ids[i] = val.symbol_val();
+     else 
+       symbol_ids[i] = -1;
+   }
+   reset_stack();
+ 
+   AttributeValueList* avl = new AttributeValueList();
+   ComValue retval(avl);
+   for (int i=0; i<numargs; i++)
+     avl->Append(new AttributeValue(symbol_ids[i], AttributeValue::IntType));
+   push_stack(retval);
+ }
+ 
+ /*****************************************************************************/
+ 
+ SymbolFunc::SymbolFunc(ComTerp* comterp) : ComFunc(comterp) {
+ }
+ 
+ void SymbolFunc::execute() {
+   // return symbol for each id argument
+   boolean noargs = !nargs() && !nkeys();
+   int numargs = nargs();
+   int symbol_ids[numargs];
+   for (int i=0; i<numargs; i++) {
+     ComValue& val = stack_arg(i, true);
+     if (val.is_char() || val.is_short() || val.is_int())
+       symbol_ids[i] = val.int_val();
+     else 
+       symbol_ids[i] = -1;
+   }
+   reset_stack();
+ 
+   AttributeValueList* avl = new AttributeValueList();
+   ComValue retval(avl);
+   for (int i=0; i<numargs; i++)
+     avl->Append(new AttributeValue(symbol_ids[i], AttributeValue::SymbolTy...
 
[truncated message content]

[Ivtools-patch] patch history mailing list

[<ivt...@li...>]

Mailing list for patch history of ivtools.  For both major release patches
and minor incremental ones.

For more info: http://www.vectaport.com/ivtools/changelogs.html

Hosted by: http://www.sourceforge.net

Scott Johnston