Changeset 1dc616 in git


Ignore:
Timestamp:
May 15, 2006, 10:17:57 AM (17 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')
Children:
181148eb58afcf5d585ec06f89fbab21c1ab9c99
Parents:
e5102ce459d04b385f3c94f631b05329d7681e20
Message:
*hannes: test for iostream and iostream.h


git-svn-id: file:///usr/local/Singular/svn/trunk@9134 2c84dea3-7e68-4137-9b89-c4e89433aadc
Location:
factory
Files:
25 edited

Legend:

Unmodified
Added
Removed

  • factory/bifac.h

    re5102c r1dc616  
    2222#ifndef NOSTREAMIO
    2323#include <stdio.h>
     24#ifdef HAVE_IOSTREAM
     25#include <fstream>
     26#include <iostream>
     27#elif defined(HAVE_IOSTREAM_H)
    2428#include <fstream.h>
    2529#include <iostream.h>
     30#endif
    2631#include <iomanip.h>
    2732#endif

  • factory/canonicalform.h

    re5102c r1dc616  
    11/* emacs edit mode for this file is -*- C++ -*- */
    2 /* $Id: canonicalform.h,v 1.30 2005-12-09 08:35:37 Singular Exp $ */
     2/* $Id: canonicalform.h,v 1.31 2006-05-15 08:17:49 Singular Exp $ */
    33
    44#ifndef INCL_CANONICALFORM_H
    … …  
    88
    99#ifndef NOSTREAMIO
     10#ifdef HAVE_IOSTREAM
     11#include <iostream>
     12#elif defined(HAVE_IOSTREAM_H)
    1013#include <iostream.h>
     14#endif
    1115#endif /* NOSTREAMIO */
    1216

  • factory/cf_eval.h

    re5102c r1dc616  
    11/* emacs edit mode for this file is -*- C++ -*- */
    2 /* $Id: cf_eval.h,v 1.3 1997-06-19 12:27:20 schmidt Exp $ */
     2/* $Id: cf_eval.h,v 1.4 2006-05-15 08:17:50 Singular Exp $ */
    33
    44#ifndef INCL_CF_EVAL_H
    … …  
    88
    99#ifndef NOSTREAMIO
     10#ifdef HAVE_IOSTREAM
     11#include <iostream>
     12#elif defined(HAVE_IOSTREAM_H)
    1013#include <iostream.h>
     14#endif
    1115#endif /* NOSTREAMIO */
    1216

  • factory/cf_map.h

    re5102c r1dc616  
    11/* emacs edit mode for this file is -*- C++ -*- */
    2 /* $Id: cf_map.h,v 1.12 2000-05-29 15:05:21 Singular Exp $ */
     2/* $Id: cf_map.h,v 1.13 2006-05-15 08:17:50 Singular Exp $ */
    33
    44#ifndef INCL_CF_MAP_H
    … …  
    1414
    1515#ifndef NOSTREAMIO
     16#ifdef HAVE_IOSTREAM
     17#include <iostream>
     18#elif defined(HAVE_IOSTREAM_H)
    1619#include <iostream.h>
     20#endif
    1721#endif /* NOSTREAMIO */
    1822

  • factory/config.h.in

    re5102c r1dc616  
    11/* emacs edit mode for this file is -*- C -*- */
    2 /* $Id: config.h.in,v 1.12 2005-11-08 18:08:58 Singular Exp $ */
     2/* $Id: config.h.in,v 1.13 2006-05-15 08:17:50 Singular Exp $ */
    33
    44#ifndef INCL_CONFIG_H
    … …  
    5050#undef NOSTREAMIO
    5151
     52/* which C++ header variants to use */
     53#undef HAVE_IOSTREAM_H
     54#undef HAVE_FSTREAM_H
     55#undef HAVE_STRSTREAM_H
     56
     57#undef HAVE_IOSTREAM
     58#undef HAVE_FSTREAM
     59#undef HAVE_STRING
     60
    5261/* define if linked to Singular */
    5362#undef SINGULAR

  • factory/configure

    re5102c r1dc616  
    18831883
    18841884if test "x$enable_streamio" != xno; then
    1885   for ac_hdr in iostream.h strstream.h fstream.h
     1885  for ac_hdr in iostream.h strstream.h fstream.h iostream string fstream
    18861886do
    18871887ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    … …  
    19201920else
    19211921  echo "$ac_t""no" 1>&6
    1922 echo "configure: warning: C++ header files not found" 1>&2
    19231922fi
    19241923done
    … …  
    19281927ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    19291928echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
    1930 echo "configure:1931: checking for $ac_hdr" >&5
     1929echo "configure:1930: checking for $ac_hdr" >&5
    19311930if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    19321931  echo $ac_n "(cached) $ac_c" 1>&6
    19331932else
    19341933  cat > conftest.$ac_ext <<EOF
    1935 #line 1936 "configure"
     1934#line 1935 "configure"
    19361935#include "confdefs.h"
    19371936#include <$ac_hdr>
    19381937EOF
    19391938ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1940 { (eval echo configure:1941: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1939{ (eval echo configure:1940: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    19411940ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    19421941if test -z "$ac_err"; then
    … …  
    19721971ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    19731972echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
    1974 echo "configure:1975: checking for $ac_hdr" >&5
     1973echo "configure:1974: checking for $ac_hdr" >&5
    19751974if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    19761975  echo $ac_n "(cached) $ac_c" 1>&6
    19771976else
    19781977  cat > conftest.$ac_ext <<EOF
    1979 #line 1980 "configure"
     1978#line 1979 "configure"
    19801979#include "confdefs.h"
    19811980#include <$ac_hdr>
    19821981EOF
    19831982ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1984 { (eval echo configure:1985: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1983{ (eval echo configure:1984: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    19851984ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    19861985if test -z "$ac_err"; then
    … …  
    20182017ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    20192018echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
    2020 echo "configure:2021: checking for $ac_hdr" >&5
     2019echo "configure:2020: checking for $ac_hdr" >&5
    20212020if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    20222021  echo $ac_n "(cached) $ac_c" 1>&6
    20232022else
    20242023  cat > conftest.$ac_ext <<EOF
    2025 #line 2026 "configure"
     2024#line 2025 "configure"
    20262025#include "confdefs.h"
    20272026#include <$ac_hdr>
    20282027EOF
    20292028ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    2030 { (eval echo configure:2031: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     2029{ (eval echo configure:2030: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    20312030ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    20322031if test -z "$ac_err"; then
    … …  
    20622061ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    20632062echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
    2064 echo "configure:2065: checking for $ac_hdr" >&5
     2063echo "configure:2064: checking for $ac_hdr" >&5
    20652064if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    20662065  echo $ac_n "(cached) $ac_c" 1>&6
    20672066else
    20682067  cat > conftest.$ac_ext <<EOF
    2069 #line 2070 "configure"
     2068#line 2069 "configure"
    20702069#include "confdefs.h"
    20712070#include <$ac_hdr>
    20722071EOF
    20732072ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    2074 { (eval echo configure:2075: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     2073{ (eval echo configure:2074: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    20752074ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    20762075if test -z "$ac_err"; then
    … …  
    21292128# arithmetic shift
    21302129echo $ac_n "checking whether your compiler does arithmetic shifts""... $ac_c" 1>&6
    2131 echo "configure:2132: checking whether your compiler does arithmetic shifts" >&5
     2130echo "configure:2131: checking whether your compiler does arithmetic shifts" >&5
    21322131if eval "test \"`echo '$''{'ac_cv_shift'+set}'`\" = set"; then
    21332132  echo $ac_n "(cached) $ac_c" 1>&6
    … …  
    21382137else
    21392138  cat > conftest.$ac_ext <<EOF
    2140 #line 2141 "configure"
     2139#line 2140 "configure"
    21412140#include "confdefs.h"
    21422141 int main() { if (-2 >> 1 == -1) return(0); else return(1); }
    21432142EOF
    2144 if { (eval echo configure:2145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
     2143if { (eval echo configure:2144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
    21452144then
    21462145  ac_cv_shift=yes
    … …  
    22242223# check whether CXX accepts -fno-rtti
    22252224echo $ac_n "checking whether gcc accepts -fno-rtti""... $ac_c" 1>&6
    2226 echo "configure:2227: checking whether gcc accepts -fno-rtti" >&5
     2225echo "configure:2226: checking whether gcc accepts -fno-rtti" >&5
    22272226tmp_flags=${CXXFLAGS}
    22282227CXXFLAGS="${CXXFLAGS} -fno-rtti"
    … …  
    22312230else
    22322231  cat > conftest.$ac_ext <<EOF
    2233 #line 2234 "configure"
     2232#line 2233 "configure"
    22342233#include "confdefs.h"
    22352234
    … …  
    22382237; return 0; }
    22392238EOF
    2240 if { (eval echo configure:2241: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     2239if { (eval echo configure:2240: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    22412240  rm -rf conftest*
    22422241  ac_cv_cxx_have_rtti=yes
    … …  
    22582257
    22592258echo $ac_n "checking whether gcc accepts -fno-exceptions""... $ac_c" 1>&6
    2260 echo "configure:2261: checking whether gcc accepts -fno-exceptions" >&5
     2259echo "configure:2260: checking whether gcc accepts -fno-exceptions" >&5
    22612260tmp_flags=${CXXFLAGS}
    22622261CXXFLAGS="${CXXFLAGS} -fno-exceptions"
    … …  
    22652264else
    22662265  cat > conftest.$ac_ext <<EOF
    2267 #line 2268 "configure"
     2266#line 2267 "configure"
    22682267#include "confdefs.h"
    22692268
    … …  
    22722271; return 0; }
    22732272EOF
    2274 if { (eval echo configure:2275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     2273if { (eval echo configure:2274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    22752274  rm -rf conftest*
    22762275  ac_cv_cxx_have_exceptions=yes
    … …  
    23402339
    23412340echo $ac_n "checking whether to use omalloc""... $ac_c" 1>&6
    2342 echo "configure:2343: checking whether to use omalloc" >&5
     2341echo "configure:2342: checking whether to use omalloc" >&5
    23432342
    23442343if test "$with_omalloc" = yes; then

  • factory/configure.in

    re5102c r1dc616  
    11dnl # emacs edit mode for this file is -*- sh -*-
    2 dnl # $Id: configure.in,v 1.44 2006-05-03 15:17:21 Singular Exp $
     2dnl # $Id: configure.in,v 1.45 2006-05-15 08:17:52 Singular Exp $
    33
    44dnl #
    … …  
    1313# - initialisation.
    1414#
    15 AC_REVISION($Id: configure.in,v 1.44 2006-05-03 15:17:21 Singular Exp $)
     15AC_REVISION($Id: configure.in,v 1.45 2006-05-15 08:17:52 Singular Exp $)
    1616AC_INIT(canonicalform.cc)
    1717AC_CONFIG_HEADER(config.h)
    … …  
    269269
    270270if test "x$enable_streamio" != xno; then
    271   AC_CHECK_HEADERS(iostream.h strstream.h fstream.h, ,
    272     [ AC_MSG_WARN(C++ header files not found) ])
     271  AC_CHECK_HEADERS(iostream.h strstream.h fstream.h iostream string fstream)
    273272  AC_CHECK_HEADERS(ctype.h, , [ AC_MSG_ERROR(standard C header files not found) ])
    274273

  • factory/debug.h

    re5102c r1dc616  
    11/* emacs edit mode for this file is -*- C++ -*- */
    2 /* $Id: debug.h,v 1.5 1997-06-19 12:23:48 schmidt Exp $ */
     2/* $Id: debug.h,v 1.6 2006-05-15 08:17:52 Singular Exp $ */
    33
    44/* It should be possible to include this file multiple times for different */
    … …  
    1313
    1414#ifdef DEBUGOUTPUT
     15#ifdef HAVE_IOSTREAM
     16#include <iostream>
     17#elif defined(HAVE_IOSTREAM_H)
    1518#include <iostream.h>
     19#endif
    1620void deb_inc_level();
    1721void deb_dec_level();

  • factory/fac_iterfor.h

    re5102c r1dc616  
    11/* emacs edit mode for this file is -*- C++ -*- */
    2 /* $Id: fac_iterfor.h,v 1.4 1997-06-19 12:23:29 schmidt Exp $ */
     2/* $Id: fac_iterfor.h,v 1.5 2006-05-15 08:17:52 Singular Exp $ */
    33
    44#ifndef INCL_FAC_ITERFOR_H
    … …  
    88
    99#ifndef NOSTREAMIO
     10#ifdef HAVE_IOSTREAM
     11#include <iostream>
     12#elif defined(HAVE_IOSTREAM_H)
    1013#include <iostream.h>
     14#endif
    1115#endif /* NOSTREAMIO */
    1216

  • factory/ftmpl_matrix.h

    re5102c r1dc616  
    11/* emacs edit mode for this file is -*- C++ -*- */
    2 /* $Id: ftmpl_matrix.h,v 1.2 2005-06-13 09:46:35 Singular Exp $ */
     2/* $Id: ftmpl_matrix.h,v 1.3 2006-05-15 08:17:53 Singular Exp $ */
    33
    44#ifndef INCL_MATRIX_H
    … …  
    88
    99#ifndef NOSTREAMIO
     10#ifdef HAVE_IOSTREAM
     11#include <iostream>
     12#elif defined(HAVE_IOSTREAM_H)
    1013#include <iostream.h>
     14#endif
    1115#endif /* NOSTREAMIO */
    1216

  • factory/gengftables.cc

    re5102c r1dc616  
    11/* emacs edit mode for this file is -*- C++ -*- */
    2 /* $Id: gengftables.cc,v 1.2 1997-10-23 13:25:52 schmidt Exp $ */
     2/* $Id: gengftables.cc,v 1.3 2006-05-15 08:17:53 Singular Exp $ */
    33
    44//{{{ docu
    … …  
    1111//}}}
    1212
     13#ifdef HAVE_IOSTREAM
     14#include <iostream>
     15#include <fstream>
     16#include <strstream>
     17#elif defined(HAVE_IOSTREAM_H)
    1318#include <iostream.h>
    1419#include <fstream.h>
    1520#include <strstream.h>
     21#endif
    1622
    1723#include <factory.h>

  • factory/gfops.h

    re5102c r1dc616  
    11/* emacs edit mode for this file is -*- C++ -*- */
    2 /* $Id: gfops.h,v 1.6 1997-11-19 11:43:24 schmidt Exp $ */
     2/* $Id: gfops.h,v 1.7 2006-05-15 08:17:53 Singular Exp $ */
    33
    44#ifndef INCL_GFOPS_H
    … …  
    88
    99#ifndef NOSTREAMIO
     10#ifdef HAVE_IOSTREAM
     11#include <iostream>
     12#elif defined(HAVE_IOSTREAM_H)
    1013#include <iostream.h>
     14#endif
    1115#endif /* NOSTREAMIO */
    1216

  • factory/imm.h

    re5102c r1dc616  
    11/* emacs edit mode for this file is -*- C++ -*- */
    2 /* $Id: imm.h,v 1.20 2005-11-08 18:08:58 Singular Exp $ */
     2/* $Id: imm.h,v 1.21 2006-05-15 08:17:53 Singular Exp $ */
    33
    44#ifndef INCL_IMM_H
    … …  
    88
    99#ifndef NOSTREAMIO
     10#ifdef HAVE_IOSTREAM
     11#include <iostream>
     12#elif defined(HAVE_IOSTREAM_H)
    1013#include <iostream.h>
     14#endif
    1115#endif /* NOSTREAMIO */
    1216

  • factory/int_cf.h

    re5102c r1dc616  
    11/* emacs edit mode for this file is -*- C++ -*- */
    2 /* $Id: int_cf.h,v 1.10 1998-06-26 16:13:49 schmidt Exp $ */
     2/* $Id: int_cf.h,v 1.11 2006-05-15 08:17:54 Singular Exp $ */
    33
    44#ifndef INCL_INT_CF_H
    … …  
    88
    99#ifndef NOSTREAMIO
     10#ifdef HAVE_IOSTREAM
     11#include <iostream>
     12#elif defined(HAVE_IOSTREAM_H)
    1013#include <iostream.h>
     14#endif
    1115#endif /* NOSTREAMIO */
    1216

  • factory/int_int.h

    re5102c r1dc616  
    11/* emacs edit mode for this file is -*- C++ -*- */
    2 /* $Id: int_int.h,v 1.12 2006-05-02 12:21:07 Singular Exp $ */
     2/* $Id: int_int.h,v 1.13 2006-05-15 08:17:54 Singular Exp $ */
    33
    44#ifndef INCL_INT_INT_H
    … …  
    88
    99#ifndef NOSTREAMIO
     10#ifdef HAVE_IOSTREAM
     11#include <iostream>
     12#elif defined(HAVE_IOSTREAM_H)
    1013#include <iostream.h>
     14#endif
    1115#endif /* NOSTREAMIO */
    1216

  • factory/int_poly.h

    re5102c r1dc616  
    11/* emacs edit mode for this file is -*- C++ -*- */
    2 /* $Id: int_poly.h,v 1.8 2006-05-02 12:21:07 Singular Exp $ */
     2/* $Id: int_poly.h,v 1.9 2006-05-15 08:17:54 Singular Exp $ */
    33
    44#ifndef INCL_INT_POLY_H
    … …  
    88
    99#ifndef NOSTREAMIO
     10#ifdef HAVE_IOSTREAM
     11#include <iostream>
     12#elif defined(HAVE_IOSTREAM_H)
    1013#include <iostream.h>
     14#endif
    1115#endif /* NOSTREAMIO */
    1216

  • factory/int_pp.h

    re5102c r1dc616  
    11/* emacs edit mode for this file is -*- C++ -*- */
    2 /* $Id: int_pp.h,v 1.4 2003-10-15 17:19:41 Singular Exp $ */
     2/* $Id: int_pp.h,v 1.5 2006-05-15 08:17:54 Singular Exp $ */
    33
    44#ifndef INCL_INT_PP_H
    … …  
    1010
    1111#ifndef NOSTREAMIO
     12#ifdef HAVE_IOSTREAM
     13#include <iostream>
     14#elif defined(HAVE_IOSTREAM_H)
    1215#include <iostream.h>
     16#endif
    1317#endif /* NOSTREAMIO */
    1418

  • factory/int_rat.h

    re5102c r1dc616  
    11/* emacs edit mode for this file is -*- C++ -*- */
    2 /* $Id: int_rat.h,v 1.6 1998-06-26 16:16:08 schmidt Exp $ */
     2/* $Id: int_rat.h,v 1.7 2006-05-15 08:17:55 Singular Exp $ */
    33
    44#ifndef INCL_INT_RAT_H
    … …  
    88
    99#ifndef NOSTREAMIO
     10#ifdef HAVE_IOSTREAM
     11#include <iostream>
     12#elif defined(HAVE_IOSTREAM_H)
    1013#include <iostream.h>
     14#endif
    1115#endif /* NOSTREAMIO */
    1216

  • factory/readcf.cc

    re5102c r1dc616  
    11
    2 /*  A Bison parser, made from ../factory-normal/readcf.y
    3  by  GNU Bison version 1.25
    4   */
     2/*  A Bison parser, made from readcf.y
     3    by GNU Bison version 1.28  */
    54
    65#define YYBISON 1  /* Identify Bison output.  */
    76
    8 #define NUM     258
    9 #define NEG     259
    10 
    11 #line 4 "../factory-normal/readcf.y"
     7#define NUM     257
     8#define NEG     258
     9
     10#line 4 "readcf.y"
    1211
    1312
    … …  
    2120
    2221#include <ctype.h>
     22#ifdef HAVE_IOSTREAM
     23#include <iostream>
     24#elif defined(HAVE_IOSTREAM_H)
    2325#include <iostream.h>
     26#endif
     27
    2428
    2529#include "assert.h"
    … …  
    6670#define YYNTBASE        13
    6771
    68 #define YYTRANSLATE(x) ((unsigned)(x) <= 259 ? yytranslate[x] : 16)
     72#define YYTRANSLATE(x) ((unsigned)(x) <= 258 ? yytranslate[x] : 16)
    6973
    7074static const char yytranslate[] = {     0,
    … …  
    9498     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
    9599     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
    96      2,     2,     2,     2,     2,     1,     2,     3,     8
     100     2,     2,     2,     2,     2,     1,     3,     8
    97101};
    98102
    … …  
    114118#if YYDEBUG != 0
    115119static const short yyrline[] = { 0,
    116     56,    57,    60,    61,    64,    65,    66,    67,    68,    69,
    117     70,    71,    72
     120    61,    62,    65,    66,    69,    70,    71,    72,    73,    74,
     121    75,    76,    77
    118122};
    119123#endif
    … …  
    178182/* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
    179183#line 3 "/usr/lib/bison.simple"
     184/* This file comes from bison-1.28.  */
    180185
    181186/* Skeleton output parser for bison,
    … …  
    194199   You should have received a copy of the GNU General Public License
    195200   along with this program; if not, write to the Free Software
    196    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
     201   Foundation, Inc., 59 Temple Place - Suite 330,
     202   Boston, MA 02111-1307, USA.  */
    197203
    198204/* As a special exception, when this file is copied by Bison into a
    … …  
    201207   in version 1.24 of Bison.  */
    202208
    203 #ifndef alloca
    204 #ifdef __GNUC__
    205 #define alloca __builtin_alloca
    206 #else /* not GNU C.  */
    207 #if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi)
    208 #include <alloca.h>
    209 #else /* not sparc */
    210 #if defined (MSDOS) && !defined (__TURBOC__)
    211 #include <malloc.h>
    212 #else /* not MSDOS, or __TURBOC__ */
    213 #if defined(_AIX)
    214 #include <malloc.h>
    215  #pragma alloca
    216 #else /* not MSDOS, __TURBOC__, or _AIX */
    217 #ifdef __hpux
    218 #ifdef __cplusplus
    219 extern "C" {
    220 void *alloca (unsigned int);
    221 };
    222 #else /* not __cplusplus */
    223 void *alloca ();
    224 #endif /* not __cplusplus */
    225 #endif /* __hpux */
    226 #endif /* not _AIX */
    227 #endif /* not MSDOS, or __TURBOC__ */
    228 #endif /* not sparc.  */
    229 #endif /* not GNU C.  */
    230 #endif /* alloca not defined.  */
    231 
    232209/* This is the parser code that is written into each bison parser
    233210  when the %semantic_parser declaration is not specified in the grammar.
    … …  
    235212  used when %semantic_parser is specified.  */
    236213
     214#ifndef YYSTACK_USE_ALLOCA
     215#ifdef alloca
     216#define YYSTACK_USE_ALLOCA
     217#else /* alloca not defined */
     218#ifdef __GNUC__
     219#define YYSTACK_USE_ALLOCA
     220#define alloca __builtin_alloca
     221#else /* not GNU C.  */
     222#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
     223#define YYSTACK_USE_ALLOCA
     224#include <alloca.h>
     225#else /* not sparc */
     226/* We think this test detects Watcom and Microsoft C.  */
     227/* This used to test MSDOS, but that is a bad idea
     228   since that symbol is in the user namespace.  */
     229#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
     230#if 0 /* No need for malloc.h, which pollutes the namespace;
     231         instead, just don't use alloca.  */
     232#include <malloc.h>
     233#endif
     234#else /* not MSDOS, or __TURBOC__ */
     235#if defined(_AIX)
     236/* I don't know what this was needed for, but it pollutes the namespace.
     237   So I turned it off.   rms, 2 May 1997.  */
     238/* #include <malloc.h>  */
     239 #pragma alloca
     240#define YYSTACK_USE_ALLOCA
     241#else /* not MSDOS, or __TURBOC__, or _AIX */
     242#if 0
     243#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up,
     244                 and on HPUX 10.  Eventually we can turn this on.  */
     245#define YYSTACK_USE_ALLOCA
     246#define alloca __builtin_alloca
     247#endif /* __hpux */
     248#endif
     249#endif /* not _AIX */
     250#endif /* not MSDOS, or __TURBOC__ */
     251#endif /* not sparc */
     252#endif /* not GNU C */
     253#endif /* alloca not defined */
     254#endif /* YYSTACK_USE_ALLOCA not defined */
     255
     256#ifdef YYSTACK_USE_ALLOCA
     257#define YYSTACK_ALLOC alloca
     258#else
     259#define YYSTACK_ALLOC malloc
     260#endif
     261
    237262/* Note: there must be only one dollar sign in this file.
    238263   It is replaced by the list of actions, each action
    … …  
    243268#define YYEMPTY         -2
    244269#define YYEOF           0
    245 #define YYACCEPT        return(0)
    246 #define YYABORT         return(1)
     270#define YYACCEPT        goto yyacceptlab
     271#define YYABORT         goto yyabortlab
    247272#define YYERROR         goto yyerrlab1
    248273/* Like YYERROR except do call yyerror.
    … …  
    326351#endif
    327352
    328 /* Prevent warning if -Wstrict-prototypes.  */
    329 #ifdef __GNUC__
    330 int yyparse (void);
    331 #endif
    332 
     353
     354/* Define __yy_memcpy.  Note that the size argument
     355   should be passed with type unsigned int, because that is what the non-GCC
     356   definitions require.  With GCC, __builtin_memcpy takes an arg
     357   of type size_t, but it can handle unsigned int.  */
    333358
    334359#if __GNUC__ > 1                /* GNU C and GNU C++ define this.  */
    … …  
    343368     char *to;
    344369     char *from;
    345      int count;
     370     unsigned int count;
    346371{
    347372  register char *f = from;
    … …  
    358383   in available built-in functions on various systems.  */
    359384static void
    360 __yy_memcpy (char *to, char *from, int count)
     385__yy_memcpy (char *to, char *from, unsigned int count)
    361386{
     387  register char *t = to;
    362388  register char *f = from;
    363   register char *t = to;
    364389  register int i = count;
    365390
    … …  
    372397
    373398
    374 #line 196 "/usr/lib/bison.simple"
     399#line 217 "/usr/lib/bison.simple"
    375400
    376401/* The user can define YYPARSE_PARAM as the name of an argument to be passed
    … …  
    393418#endif /* not YYPARSE_PARAM */
    394419
     420/* Prevent warning if -Wstrict-prototypes.  */
     421#ifdef __GNUC__
     422#ifdef YYPARSE_PARAM
     423int yyparse (void *);
     424#else
     425int yyparse (void);
     426#endif
     427#endif
     428
    395429int
    396430yyparse(YYPARSE_PARAM_ARG)
    … …  
    421455
    422456  int yystacksize = YYINITDEPTH;
     457  int yyfree_stacks = 0;
    423458
    424459#ifdef YYPURE
    … …  
    505540        {
    506541          yyerror("parser stack overflow");
     542          if (yyfree_stacks)
     543            {
     544              free (yyss);
     545              free (yyvs);
     546#ifdef YYLSP_NEEDED
     547              free (yyls);
     548#endif
     549            }
    507550          return 2;
    508551        }
    … …  
    510553      if (yystacksize > YYMAXDEPTH)
    511554        yystacksize = YYMAXDEPTH;
    512       yyss = (short *) alloca (yystacksize * sizeof (*yyssp));
    513       __yy_memcpy ((char *)yyss, (char *)yyss1, size * sizeof (*yyssp));
    514       yyvs = (YYSTYPE *) alloca (yystacksize * sizeof (*yyvsp));
    515       __yy_memcpy ((char *)yyvs, (char *)yyvs1, size * sizeof (*yyvsp));
    516 #ifdef YYLSP_NEEDED
    517       yyls = (YYLTYPE *) alloca (yystacksize * sizeof (*yylsp));
    518       __yy_memcpy ((char *)yyls, (char *)yyls1, size * sizeof (*yylsp));
     555#ifndef YYSTACK_USE_ALLOCA
     556      yyfree_stacks = 1;
     557#endif
     558      yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
     559      __yy_memcpy ((char *)yyss, (char *)yyss1,
     560                   size * (unsigned int) sizeof (*yyssp));
     561      yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
     562      __yy_memcpy ((char *)yyvs, (char *)yyvs1,
     563                   size * (unsigned int) sizeof (*yyvsp));
     564#ifdef YYLSP_NEEDED
     565      yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
     566      __yy_memcpy ((char *)yyls, (char *)yyls1,
     567                   size * (unsigned int) sizeof (*yylsp));
    519568#endif
    520569#endif /* no yyoverflow */
    … …  
    677726
    678727case 4:
    679 #line 61 "../factory-normal/readcf.y"
     728#line 66 "readcf.y"
    680729{ *retvalue = yyvsp[-1].getval(); return 0; ;
    681730    break;}
    682731case 5:
    683 #line 64 "../factory-normal/readcf.y"
     732#line 69 "readcf.y"
    684733{ yyval = yyvsp[0]; ;
    685734    break;}
    686735case 6:
    687 #line 65 "../factory-normal/readcf.y"
     736#line 70 "readcf.y"
    688737{ yyval = yyvsp[-2].getval() + yyvsp[0].getval(); ;
    689738    break;}
    690739case 7:
    691 #line 66 "../factory-normal/readcf.y"
     740#line 71 "readcf.y"
    692741{ yyval = yyvsp[-2].getval() - yyvsp[0].getval(); ;
    693742    break;}
    694743case 8:
    695 #line 67 "../factory-normal/readcf.y"
     744#line 72 "readcf.y"
    696745{ yyval = yyvsp[-2].getval() * yyvsp[0].getval(); ;
    697746    break;}
    698747case 9:
    699 #line 68 "../factory-normal/readcf.y"
     748#line 73 "readcf.y"
    700749{ yyval = yyvsp[-2].getval() / yyvsp[0].getval(); ;
    701750    break;}
    702751case 10:
    703 #line 69 "../factory-normal/readcf.y"
     752#line 74 "readcf.y"
    704753{ yyval = -yyvsp[0].getval(); ;
    705754    break;}
    706755case 11:
    707 #line 70 "../factory-normal/readcf.y"
     756#line 75 "readcf.y"
    708757{ yyval = yyvsp[0].getval(); ;
    709758    break;}
    710759case 12:
    711 #line 71 "../factory-normal/readcf.y"
     760#line 76 "readcf.y"
    712761{ yyval = power( yyvsp[-2].getval(), yyvsp[0].getintval() ); ;
    713762    break;}
    714763case 13:
    715 #line 72 "../factory-normal/readcf.y"
     764#line 77 "readcf.y"
    716765{ yyval = yyvsp[-1].getval(); ;
    717766    break;}
    718767}
    719768   /* the action file gets copied in in place of this dollarsign */
    720 #line 498 "/usr/lib/bison.simple"
     769#line 543 "/usr/lib/bison.simple"
    721770
    722771
    … …  
    914963  yystate = yyn;
    915964  goto yynewstate;
     965
     966 yyacceptlab:
     967  /* YYACCEPT comes here.  */
     968  if (yyfree_stacks)
     969    {
     970      free (yyss);
     971      free (yyvs);
     972#ifdef YYLSP_NEEDED
     973      free (yyls);
     974#endif
     975    }
     976  return 0;
     977
     978 yyabortlab:
     979  /* YYABORT comes here.  */
     980  if (yyfree_stacks)
     981    {
     982      free (yyss);
     983      free (yyvs);
     984#ifdef YYLSP_NEEDED
     985      free (yyls);
     986#endif
     987    }
     988  return 1;
    916989}
    917 #line 75 "../factory-normal/readcf.y"
     990#line 80 "readcf.y"
    918991
    919992

  • factory/readcf.y

    re5102c r1dc616  
    11/* emacs edit mode for this file is -*- C++ -*- */
    2 /* $Id: readcf.y,v 1.8 1998-06-12 14:33:57 schmidt Exp $ */
     2/* $Id: readcf.y,v 1.9 2006-05-15 08:17:55 Singular Exp $ */
    33
    44%{
    … …  
    1313
    1414#include <ctype.h>
     15#ifdef HAVE_IOSTREAM
     16#include <iostream>
     17#elif defined(HAVE_IOSTREAM_H)
    1518#include <iostream.h>
     19#endif
     20
    1621
    1722#include "assert.h"

  • factory/templates/ftmpl_array.h

    re5102c r1dc616  
    11/* emacs edit mode for this file is -*- C++ -*- */
    2 /* $Id: ftmpl_array.h,v 1.5 1997-06-19 13:11:13 schmidt Exp $ */
     2/* $Id: ftmpl_array.h,v 1.6 2006-05-15 08:17:56 Singular Exp $ */
    33
    44#ifndef INCL_ARRAY_H
    … …  
    88
    99#ifndef NOSTREAMIO
     10#ifdef HAVE_IOSTREAM
     11#include <iostream>
     12#elif defined(HAVE_IOSTREAM_H)
    1013#include <iostream.h>
     14#endif
    1115#endif /* NOSTREAMIO */
    1216

  • factory/templates/ftmpl_factor.h

    re5102c r1dc616  
    11/* emacs edit mode for this file is -*- C++ -*- */
    2 /* $Id: ftmpl_factor.h,v 1.5 1998-06-03 14:51:33 pohl Exp $ */
     2/* $Id: ftmpl_factor.h,v 1.6 2006-05-15 08:17:56 Singular Exp $ */
    33
    44#ifndef INCL_FACTOR_H
    … …  
    88
    99#ifndef NOSTREAMIO
     10#ifdef HAVE_IOSTREAM
     11#include <iostream>
     12#elif defined(HAVE_IOSTREAM_H)
    1013#include <iostream.h>
     14#endif
    1115#endif /* NOSTREAMIO */
    1216

  • factory/templates/ftmpl_list.h

    re5102c r1dc616  
    11/* emacs edit mode for this file is -*- C++ -*- */
    2 /* $Id: ftmpl_list.h,v 1.8 2005-01-13 15:10:23 Singular Exp $ */
     2/* $Id: ftmpl_list.h,v 1.9 2006-05-15 08:17:56 Singular Exp $ */
    33
    44#ifndef INCL_LIST_H
    … …  
    88
    99#ifndef NOSTREAMIO
     10#ifdef HAVE_IOSTREAM
     11#include <iostream>
     12#elif defined(HAVE_IOSTREAM_H)
    1013#include <iostream.h>
     14#endif
    1115#endif /* NOSTREAMIO */
    1216

  • factory/templates/ftmpl_matrix.h

    re5102c r1dc616  
    11/* emacs edit mode for this file is -*- C++ -*- */
    2 /* $Id: ftmpl_matrix.h,v 1.11 2005-06-13 09:46:35 Singular Exp $ */
     2/* $Id: ftmpl_matrix.h,v 1.12 2006-05-15 08:17:57 Singular Exp $ */
    33
    44#ifndef INCL_MATRIX_H
    … …  
    88
    99#ifndef NOSTREAMIO
     10#ifdef HAVE_IOSTREAM
     11#include <iostream>
     12#elif defined(HAVE_IOSTREAM_H)
    1013#include <iostream.h>
     14#endif
    1115#endif /* NOSTREAMIO */
    1216

  • factory/variable.h

    re5102c r1dc616  
    11/* emacs edit mode for this file is -*- C++ -*- */
    2 /* $Id: variable.h,v 1.5 2006-04-21 15:37:10 Singular Exp $ */
     2/* $Id: variable.h,v 1.6 2006-05-15 08:17:55 Singular Exp $ */
    33
    44#ifndef INCL_VARIABLE_H
    … …  
    88
    99#ifndef NOSTREAMIO
     10#ifdef HAVE_IOSTREAM
     11#include <iostream>
     12#elif defined(HAVE_IOSTREAM_H)
    1013#include <iostream.h>
     14#endif
    1115#endif /* NOSTREAMIO */
    1216
Note: See TracChangeset for help on using the changeset viewer.