aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodney W. Grimes <rgrimes@FreeBSD.org>1995-05-30 05:05:38 +0000
committerRodney W. Grimes <rgrimes@FreeBSD.org>1995-05-30 05:05:38 +0000
commit4399be3cbd35324f7a2c00d77229d995b4022138 (patch)
treea3959baf797787918878bec6d58d6a0fb743ad0a
parent709e8f9ae1d734c1a163c9b421df4b8153939ce7 (diff)
downloadsrc-4399be3cbd35324f7a2c00d77229d995b4022138.tar.gz
src-4399be3cbd35324f7a2c00d77229d995b4022138.zip
Remove trailing whitespace.
Notes
Notes: svn path=/head/; revision=8858
-rw-r--r--gnu/games/chess/Makefile2
-rw-r--r--gnu/games/chess/Xchess/Makefile8
-rw-r--r--gnu/games/chess/Xchess/XCircle.c6
-rw-r--r--gnu/games/chess/Xchess/board.c8
-rw-r--r--gnu/games/chess/Xchess/button.c22
-rw-r--r--gnu/games/chess/Xchess/clock.c14
-rw-r--r--gnu/games/chess/Xchess/control.c8
-rw-r--r--gnu/games/chess/Xchess/jail.c20
-rw-r--r--gnu/games/chess/Xchess/message.c6
-rw-r--r--gnu/games/chess/Xchess/parse.c12
-rw-r--r--gnu/games/chess/Xchess/popup.c8
-rw-r--r--gnu/games/chess/Xchess/program.c4
-rw-r--r--gnu/games/chess/Xchess/record.c18
-rw-r--r--gnu/games/chess/Xchess/scrollText.c58
-rw-r--r--gnu/games/chess/Xchess/scrollText/scrollText.c58
-rw-r--r--gnu/games/chess/Xchess/std.c8
-rw-r--r--gnu/games/chess/Xchess/valid.c14
-rw-r--r--gnu/games/chess/Xchess/window.c114
-rw-r--r--gnu/games/chess/Xchess/xchess.c12
-rw-r--r--gnu/games/chess/gnuchess.c258
-rw-r--r--gnu/games/chess/gnuchess.h4
-rw-r--r--gnu/games/chess/move.c22
-rw-r--r--gnu/games/chess/move.h2
-rw-r--r--gnu/games/chess/nondsp.c68
-rw-r--r--gnu/games/chess/uxdsp.c70
-rw-r--r--gnu/include/values.h6
-rw-r--r--gnu/lib/libdialog/checklist.c4
-rw-r--r--gnu/lib/libdialog/dialog.h4
-rw-r--r--gnu/lib/libdialog/dialog.priv.h4
-rw-r--r--gnu/lib/libdialog/dir.c112
-rw-r--r--gnu/lib/libdialog/dir.h8
-rw-r--r--gnu/lib/libdialog/fselect.c34
-rw-r--r--gnu/lib/libdialog/gauge.c6
-rw-r--r--gnu/lib/libdialog/help.c10
-rw-r--r--gnu/lib/libdialog/kernel.c4
-rw-r--r--gnu/lib/libdialog/menubox.c8
-rw-r--r--gnu/lib/libdialog/msgbox.c14
-rw-r--r--gnu/lib/libdialog/notify.c4
-rw-r--r--gnu/lib/libdialog/radiolist.c4
-rw-r--r--gnu/lib/libdialog/raw_popen.c6
-rw-r--r--gnu/lib/libdialog/ui_objects.c54
-rw-r--r--gnu/lib/libdialog/ui_objects.h8
-rw-r--r--gnu/lib/libdialog/yesno.c2
-rw-r--r--gnu/lib/libg++/include/ACG.h4
-rw-r--r--gnu/lib/libg++/include/AllocRing.h4
-rw-r--r--gnu/lib/libg++/include/Binomial.h2
-rw-r--r--gnu/lib/libg++/include/BitSet.h30
-rw-r--r--gnu/lib/libg++/include/BitString.h80
-rw-r--r--gnu/lib/libg++/include/Complex.h46
-rw-r--r--gnu/lib/libg++/include/CursesW.h120
-rw-r--r--gnu/lib/libg++/include/DLList.h2
-rw-r--r--gnu/lib/libg++/include/DiscUnif.h4
-rw-r--r--gnu/lib/libg++/include/Erlang.h4
-rw-r--r--gnu/lib/libg++/include/Fix.h22
-rw-r--r--gnu/lib/libg++/include/Fix16.h322
-rw-r--r--gnu/lib/libg++/include/Fix24.h304
-rw-r--r--gnu/lib/libg++/include/Geom.h4
-rw-r--r--gnu/lib/libg++/include/GetOpt.h44
-rw-r--r--gnu/lib/libg++/include/HypGeom.h4
-rw-r--r--gnu/lib/libg++/include/Integer.h124
-rw-r--r--gnu/lib/libg++/include/LogNorm.h6
-rw-r--r--gnu/lib/libg++/include/MLCG.h4
-rw-r--r--gnu/lib/libg++/include/NegExp.h4
-rw-r--r--gnu/lib/libg++/include/Normal.h6
-rw-r--r--gnu/lib/libg++/include/Obstack.h66
-rw-r--r--gnu/lib/libg++/include/PlotFile.h18
-rw-r--r--gnu/lib/libg++/include/Poisson.h4
-rw-r--r--gnu/lib/libg++/include/RNG.h2
-rw-r--r--gnu/lib/libg++/include/Random.h2
-rw-r--r--gnu/lib/libg++/include/Rational.h20
-rw-r--r--gnu/lib/libg++/include/Regex.h10
-rw-r--r--gnu/lib/libg++/include/RndInt.h28
-rw-r--r--gnu/lib/libg++/include/SFile.h4
-rw-r--r--gnu/lib/libg++/include/SLList.h4
-rw-r--r--gnu/lib/libg++/include/SmplHist.h6
-rw-r--r--gnu/lib/libg++/include/SmplStat.h6
-rw-r--r--gnu/lib/libg++/include/String.h216
-rw-r--r--gnu/lib/libg++/include/Uniform.h4
-rw-r--r--gnu/lib/libg++/include/Weibull.h8
-rw-r--r--gnu/lib/libg++/include/_G_config.h2
-rw-r--r--gnu/lib/libg++/include/builtin.h14
-rw-r--r--gnu/lib/libg++/include/builtinbuf.h2
-rw-r--r--gnu/lib/libg++/include/compare.h2
-rw-r--r--gnu/lib/libg++/include/defines.h2
-rw-r--r--gnu/lib/libg++/include/editbuf.h4
-rw-r--r--gnu/lib/libg++/include/floatio.h2
-rw-r--r--gnu/lib/libg++/include/iomanip.h18
-rw-r--r--gnu/lib/libg++/include/iostream.h2
-rw-r--r--gnu/lib/libg++/include/iostreamP.h2
-rw-r--r--gnu/lib/libg++/include/libio.h12
-rw-r--r--gnu/lib/libg++/include/libioP.h2
-rw-r--r--gnu/lib/libg++/include/parsestream.h2
-rw-r--r--gnu/lib/libg++/include/rx.h400
-rw-r--r--gnu/lib/libg++/include/std.h6
-rw-r--r--gnu/lib/libg++/include/stream.h2
-rw-r--r--gnu/lib/libg++/include/streambuf.h4
-rw-r--r--gnu/lib/libg++/include/strfile.h2
-rw-r--r--gnu/lib/libg++/libg++/timer.c16
-rw-r--r--gnu/lib/libg++/libiberty/strerror.c2
-rw-r--r--gnu/lib/libg++/libiberty/strsignal.c2
-rw-r--r--gnu/lib/libg++/libio/filedoalloc.c4
-rw-r--r--gnu/lib/libg++/libio/fileops.c16
-rw-r--r--gnu/lib/libg++/libio/floatconv.c2
-rw-r--r--gnu/lib/libg++/libio/genops.c12
-rw-r--r--gnu/lib/libg++/libio/iofclose.c2
-rw-r--r--gnu/lib/libg++/libio/iofgetpos.c2
-rw-r--r--gnu/lib/libg++/libio/iofread.c2
-rw-r--r--gnu/lib/libg++/libio/iofscanf.c2
-rw-r--r--gnu/lib/libg++/libio/iofsetpos.c2
-rw-r--r--gnu/lib/libg++/libio/iogetdelim.c2
-rw-r--r--gnu/lib/libg++/libio/iogetline.c2
-rw-r--r--gnu/lib/libg++/libio/ioignore.c2
-rw-r--r--gnu/lib/libg++/libio/iopadn.c6
-rw-r--r--gnu/lib/libg++/libio/iopopen.c4
-rw-r--r--gnu/lib/libg++/libio/ioprims.c2
-rw-r--r--gnu/lib/libg++/libio/ioprintf.c2
-rw-r--r--gnu/lib/libg++/libio/ioseekoff.c2
-rw-r--r--gnu/lib/libg++/libio/ioseekpos.c2
-rw-r--r--gnu/lib/libg++/libio/ioungetc.c2
-rw-r--r--gnu/lib/libg++/libio/iovfprintf.c4
-rw-r--r--gnu/lib/libg++/libio/iovfscanf.c2
-rw-r--r--gnu/lib/libg++/libio/outfloat.c10
-rw-r--r--gnu/lib/libg++/libio/strops.c4
-rw-r--r--gnu/lib/libg++/librx/rx.c436
-rw-r--r--gnu/lib/libmalloc/mem-limits.h4
-rw-r--r--gnu/lib/libmalloc/ralloc.c10
-rw-r--r--gnu/lib/libmalloc/vm-limit.c6
-rw-r--r--gnu/lib/libreadline/complete.c4
-rw-r--r--gnu/lib/libreadline/display.c8
-rw-r--r--gnu/lib/libreadline/examples/Makefile2
-rw-r--r--gnu/lib/libreadline/examples/fileman.c2
-rw-r--r--gnu/lib/libreadline/examples/manexamp.c2
-rw-r--r--gnu/lib/libreadline/funmap.c2
-rw-r--r--gnu/lib/libreadline/history.c12
-rw-r--r--gnu/lib/libreadline/history.h2
-rw-r--r--gnu/lib/libreadline/posixstat.h2
-rw-r--r--gnu/lib/libreadline/readline.c10
-rw-r--r--gnu/lib/libreadline/readline.h2
-rw-r--r--gnu/lib/libreadline/tilde.c2
-rw-r--r--gnu/lib/libreadline/vi_mode.c4
-rw-r--r--gnu/lib/libregex/Makefile.gnu6
-rw-r--r--gnu/lib/libregex/Makefile.in6
-rw-r--r--gnu/lib/libregex/regex.c558
-rw-r--r--gnu/lib/libregex/regex.h22
-rw-r--r--gnu/lib/libregex/test/Makefile50
-rw-r--r--gnu/lib/libregex/test/Makefile.in48
-rw-r--r--gnu/lib/libregex/test/alloca.c2
-rw-r--r--gnu/lib/libregex/test/bsd-interf.c2
-rw-r--r--gnu/lib/libregex/test/debugmalloc.c54
-rw-r--r--gnu/lib/libregex/test/emacsmalloc.c22
-rw-r--r--gnu/lib/libregex/test/fileregex.c10
-rw-r--r--gnu/lib/libregex/test/g++malloc.c140
-rw-r--r--gnu/lib/libregex/test/iregex.c6
-rw-r--r--gnu/lib/libregex/test/main.c12
-rw-r--r--gnu/lib/libregex/test/other.c62
-rw-r--r--gnu/lib/libregex/test/psx-basic.c80
-rw-r--r--gnu/lib/libregex/test/psx-extend.c68
-rw-r--r--gnu/lib/libregex/test/psx-generic.c64
-rw-r--r--gnu/lib/libregex/test/psx-interf.c128
-rw-r--r--gnu/lib/libregex/test/psx-interv.c20
-rw-r--r--gnu/lib/libregex/test/test.c232
-rw-r--r--gnu/lib/libregex/test/test.h24
-rw-r--r--gnu/lib/libregex/test/tregress.c60
-rw-r--r--gnu/lib/libregex/test/upcase.c2
-rw-r--r--gnu/lib/libregex/test/xmalloc.c4
-rw-r--r--gnu/libexec/uucp/common_sources/chat.c6
-rw-r--r--gnu/libexec/uucp/common_sources/conn.c4
-rw-r--r--gnu/libexec/uucp/common_sources/getopt.h4
-rw-r--r--gnu/libexec/uucp/common_sources/log.c8
-rw-r--r--gnu/libexec/uucp/common_sources/tcp.c4
-rw-r--r--gnu/libexec/uucp/common_sources/tli.c16
-rw-r--r--gnu/libexec/uucp/contrib/amiga.c8
-rw-r--r--gnu/libexec/uucp/contrib/dialHDB.c12
-rw-r--r--gnu/libexec/uucp/contrib/uurate.c79
-rw-r--r--gnu/libexec/uucp/contrib/uusnap.c32
-rw-r--r--gnu/libexec/uucp/contrib/xchat.c300
-rw-r--r--gnu/libexec/uucp/cu/cu.c10
-rw-r--r--gnu/libexec/uucp/libunix/cohtty.c6
-rw-r--r--gnu/libexec/uucp/libunix/cusub.c14
-rw-r--r--gnu/libexec/uucp/libunix/cwd.c2
-rw-r--r--gnu/libexec/uucp/libunix/detach.c2
-rw-r--r--gnu/libexec/uucp/libunix/dup2.c2
-rw-r--r--gnu/libexec/uucp/libunix/epopen.c2
-rw-r--r--gnu/libexec/uucp/libunix/filnam.c2
-rw-r--r--gnu/libexec/uucp/libunix/fsusg.c4
-rw-r--r--gnu/libexec/uucp/libunix/getcwd.c2
-rw-r--r--gnu/libexec/uucp/libunix/isfork.c2
-rw-r--r--gnu/libexec/uucp/libunix/iswait.c2
-rw-r--r--gnu/libexec/uucp/libunix/locfil.c2
-rw-r--r--gnu/libexec/uucp/libunix/lock.c6
-rw-r--r--gnu/libexec/uucp/libunix/opensr.c4
-rw-r--r--gnu/libexec/uucp/libunix/picksb.c4
-rw-r--r--gnu/libexec/uucp/libunix/seq.c2
-rw-r--r--gnu/libexec/uucp/libunix/serial.c22
-rw-r--r--gnu/libexec/uucp/libunix/spawn.c8
-rw-r--r--gnu/libexec/uucp/libunix/spool.c8
-rw-r--r--gnu/libexec/uucp/libunix/srmdir.c2
-rw-r--r--gnu/libexec/uucp/libunix/wldcrd.c2
-rw-r--r--gnu/libexec/uucp/libunix/work.c10
-rw-r--r--gnu/libexec/uucp/libunix/xqtfil.c4
-rw-r--r--gnu/libexec/uucp/libunix/xqtsub.c12
-rw-r--r--gnu/libexec/uucp/libuuconf/bool.c4
-rw-r--r--gnu/libexec/uucp/libuuconf/callin.c4
-rw-r--r--gnu/libexec/uucp/libuuconf/calout.c4
-rw-r--r--gnu/libexec/uucp/libuuconf/cmdarg.c4
-rw-r--r--gnu/libexec/uucp/libuuconf/errstr.c4
-rw-r--r--gnu/libexec/uucp/libuuconf/hdial.c4
-rw-r--r--gnu/libexec/uucp/libuuconf/hdnams.c4
-rw-r--r--gnu/libexec/uucp/libuuconf/hinit.c4
-rw-r--r--gnu/libexec/uucp/libuuconf/hsinfo.c4
-rw-r--r--gnu/libexec/uucp/libuuconf/hsnams.c4
-rw-r--r--gnu/libexec/uucp/libuuconf/rdlocs.c4
-rw-r--r--gnu/libexec/uucp/libuuconf/syssub.c4
-rw-r--r--gnu/libexec/uucp/libuuconf/tdialc.c6
-rw-r--r--gnu/libexec/uucp/libuuconf/tdnams.c4
-rw-r--r--gnu/libexec/uucp/libuuconf/tportc.c4
-rw-r--r--gnu/libexec/uucp/libuuconf/uucnfi.h2
-rw-r--r--gnu/libexec/uucp/libuuconf/vport.c6
-rw-r--r--gnu/libexec/uucp/libuuconf/vsinfo.c4
-rw-r--r--gnu/libexec/uucp/libuucp/crc.c12
-rw-r--r--gnu/libexec/uucp/libuucp/debug.c4
-rw-r--r--gnu/libexec/uucp/libuucp/escape.c2
-rw-r--r--gnu/libexec/uucp/libuucp/getop1.c6
-rw-r--r--gnu/libexec/uucp/libuucp/getopt.c4
-rw-r--r--gnu/libexec/uucp/libuucp/memchr.c8
-rw-r--r--gnu/libexec/uucp/libuucp/parse.c8
-rw-r--r--gnu/libexec/uucp/tstuu.c16
-rw-r--r--gnu/libexec/uucp/uuchk/uuchk.c10
-rw-r--r--gnu/libexec/uucp/uucico/prote.c4
-rw-r--r--gnu/libexec/uucp/uucico/protf.c6
-rw-r--r--gnu/libexec/uucp/uucico/protg.c16
-rw-r--r--gnu/libexec/uucp/uucico/proti.c8
-rw-r--r--gnu/libexec/uucp/uucico/prott.c6
-rw-r--r--gnu/libexec/uucp/uucico/protz.c20
-rw-r--r--gnu/libexec/uucp/uucico/rec.c10
-rw-r--r--gnu/libexec/uucp/uucico/send.c8
-rw-r--r--gnu/libexec/uucp/uucico/trans.c14
-rw-r--r--gnu/libexec/uucp/uucico/uucico.c18
-rw-r--r--gnu/libexec/uucp/uuconv/Makefile4
-rw-r--r--gnu/libexec/uucp/uuconv/uuconv.c18
-rw-r--r--gnu/libexec/uucp/uulog/uulog.c4
-rw-r--r--gnu/libexec/uucp/uustat/uustat.c10
-rw-r--r--gnu/libexec/uucp/uux/uux.c6
-rw-r--r--gnu/libexec/uucp/uuxqt/uuxqt.c12
-rw-r--r--gnu/libexec/ypxfr/yp_xdr.c20
-rw-r--r--gnu/libexec/ypxfr/ypclnt.c28
-rw-r--r--gnu/libexec/ypxfr/ypxfr.c8
-rw-r--r--gnu/usr.bin/as/Makefile4
-rw-r--r--gnu/usr.bin/as/Makefile.in50
-rw-r--r--gnu/usr.bin/as/app.c18
-rw-r--r--gnu/usr.bin/as/as.c82
-rw-r--r--gnu/usr.bin/as/as.h24
-rw-r--r--gnu/usr.bin/as/atof-generic.c118
-rw-r--r--gnu/usr.bin/as/bignum-copy.c22
-rw-r--r--gnu/usr.bin/as/bignum.h10
-rw-r--r--gnu/usr.bin/as/bit_fix.h16
-rw-r--r--gnu/usr.bin/as/cond.c18
-rw-r--r--gnu/usr.bin/as/config/aout.h24
-rw-r--r--gnu/usr.bin/as/config/atof-ieee.c86
-rw-r--r--gnu/usr.bin/as/config/atof-tahoe.c20
-rw-r--r--gnu/usr.bin/as/config/atof-vax.c82
-rw-r--r--gnu/usr.bin/as/config/coff.h64
-rw-r--r--gnu/usr.bin/as/config/cplus-dem.c90
-rw-r--r--gnu/usr.bin/as/config/ho-ansi.h8
-rw-r--r--gnu/usr.bin/as/config/ho-decstation.h8
-rw-r--r--gnu/usr.bin/as/config/ho-generic.h8
-rw-r--r--gnu/usr.bin/as/config/ho-hpux.h8
-rw-r--r--gnu/usr.bin/as/config/ho-i386.h10
-rw-r--r--gnu/usr.bin/as/config/ho-i386aix.h8
-rw-r--r--gnu/usr.bin/as/config/ho-rs6000.h8
-rw-r--r--gnu/usr.bin/as/config/ho-sunos.h8
-rw-r--r--gnu/usr.bin/as/config/ho-sysv.h8
-rw-r--r--gnu/usr.bin/as/config/ho-vax.h8
-rw-r--r--gnu/usr.bin/as/config/ho-vms.h8
-rw-r--r--gnu/usr.bin/as/config/obj-aout.c102
-rw-r--r--gnu/usr.bin/as/config/obj-aout.h12
-rw-r--r--gnu/usr.bin/as/config/obj-bfd-sunos.c12
-rw-r--r--gnu/usr.bin/as/config/obj-bfd-sunos.h8
-rw-r--r--gnu/usr.bin/as/config/obj-bout.c96
-rw-r--r--gnu/usr.bin/as/config/obj-bout.h12
-rw-r--r--gnu/usr.bin/as/config/obj-coff.c440
-rw-r--r--gnu/usr.bin/as/config/obj-coff.h28
-rw-r--r--gnu/usr.bin/as/config/obj-coffbfd.c846
-rw-r--r--gnu/usr.bin/as/config/obj-coffbfd.h32
-rw-r--r--gnu/usr.bin/as/config/obj-generic.c10
-rw-r--r--gnu/usr.bin/as/config/obj-generic.h12
-rw-r--r--gnu/usr.bin/as/config/obj-ieee.c146
-rw-r--r--gnu/usr.bin/as/config/obj-ieee.h10
-rw-r--r--gnu/usr.bin/as/config/obj-vms.c20
-rw-r--r--gnu/usr.bin/as/config/obj-vms.h2
-rw-r--r--gnu/usr.bin/as/config/tc-a29k.c214
-rw-r--r--gnu/usr.bin/as/config/tc-a29k.h10
-rw-r--r--gnu/usr.bin/as/config/tc-generic.h8
-rw-r--r--gnu/usr.bin/as/config/tc-h8300.c430
-rw-r--r--gnu/usr.bin/as/config/tc-h8300.h10
-rw-r--r--gnu/usr.bin/as/config/tc-i386.c298
-rw-r--r--gnu/usr.bin/as/config/tc-i386.h32
-rw-r--r--gnu/usr.bin/as/config/tc-i860.c238
-rw-r--r--gnu/usr.bin/as/config/tc-i960.c458
-rw-r--r--gnu/usr.bin/as/config/tc-i960.h18
-rw-r--r--gnu/usr.bin/as/config/tc-m68851.h96
-rw-r--r--gnu/usr.bin/as/config/tc-m68k.c634
-rw-r--r--gnu/usr.bin/as/config/tc-m68k.h12
-rw-r--r--gnu/usr.bin/as/config/tc-m68kmote.h16
-rw-r--r--gnu/usr.bin/as/config/tc-m88k.c54
-rw-r--r--gnu/usr.bin/as/config/tc-m88k.h6
-rw-r--r--gnu/usr.bin/as/config/tc-ns32k.c136
-rw-r--r--gnu/usr.bin/as/config/tc-ns32k.h8
-rw-r--r--gnu/usr.bin/as/config/tc-sparc.c318
-rw-r--r--gnu/usr.bin/as/config/tc-sparc.h10
-rw-r--r--gnu/usr.bin/as/config/tc-tahoe.c84
-rw-r--r--gnu/usr.bin/as/config/tc-tahoe.h8
-rw-r--r--gnu/usr.bin/as/config/tc-vax.c282
-rw-r--r--gnu/usr.bin/as/config/te-ic960.h8
-rw-r--r--gnu/usr.bin/as/config/te-sun3.h14
-rw-r--r--gnu/usr.bin/as/config/vax-inst.h8
-rw-r--r--gnu/usr.bin/as/debug.c14
-rw-r--r--gnu/usr.bin/as/expr.c102
-rw-r--r--gnu/usr.bin/as/expr.h10
-rw-r--r--gnu/usr.bin/as/flo-const.c10
-rw-r--r--gnu/usr.bin/as/flo-copy.c16
-rw-r--r--gnu/usr.bin/as/flonum-mult.c32
-rw-r--r--gnu/usr.bin/as/flonum.h10
-rw-r--r--gnu/usr.bin/as/frags.c30
-rw-r--r--gnu/usr.bin/as/frags.h10
-rw-r--r--gnu/usr.bin/as/hash.c70
-rw-r--r--gnu/usr.bin/as/hash.h10
-rw-r--r--gnu/usr.bin/as/hex-value.c10
-rw-r--r--gnu/usr.bin/as/input-file.c46
-rw-r--r--gnu/usr.bin/as/input-file.h10
-rw-r--r--gnu/usr.bin/as/input-scrub.c8
-rw-r--r--gnu/usr.bin/as/listing.c16
-rw-r--r--gnu/usr.bin/as/messages.c32
-rw-r--r--gnu/usr.bin/as/obj.h12
-rw-r--r--gnu/usr.bin/as/obstack.h4
-rw-r--r--gnu/usr.bin/as/opcode/h8300.h18
-rw-r--r--gnu/usr.bin/as/opcode/i386.h14
-rw-r--r--gnu/usr.bin/as/opcode/i860.h2
-rw-r--r--gnu/usr.bin/as/opcode/i960.h6
-rw-r--r--gnu/usr.bin/as/opcode/m68k.h8
-rw-r--r--gnu/usr.bin/as/opcode/mips.h2
-rw-r--r--gnu/usr.bin/as/opcode/ns32k.h6
-rw-r--r--gnu/usr.bin/as/opcode/pyr.h18
-rw-r--r--gnu/usr.bin/as/opcode/sparc.h6
-rw-r--r--gnu/usr.bin/as/opcode/tahoe.h2
-rw-r--r--gnu/usr.bin/as/output-file.c16
-rw-r--r--gnu/usr.bin/as/output-file.h10
-rw-r--r--gnu/usr.bin/as/read.c352
-rw-r--r--gnu/usr.bin/as/read.h16
-rw-r--r--gnu/usr.bin/as/struc-symbol.h10
-rw-r--r--gnu/usr.bin/as/subsegs.c22
-rw-r--r--gnu/usr.bin/as/subsegs.h20
-rw-r--r--gnu/usr.bin/as/symbols.c126
-rw-r--r--gnu/usr.bin/as/symbols.h10
-rw-r--r--gnu/usr.bin/as/tc.h10
-rw-r--r--gnu/usr.bin/as/version.c12
-rw-r--r--gnu/usr.bin/as/write.c284
-rw-r--r--gnu/usr.bin/as/write.h10
-rw-r--r--gnu/usr.bin/as/xmalloc.c24
-rw-r--r--gnu/usr.bin/as/xrealloc.c24
-rw-r--r--gnu/usr.bin/awk/array.c20
-rw-r--r--gnu/usr.bin/awk/awk.h16
-rw-r--r--gnu/usr.bin/awk/builtin.c24
-rw-r--r--gnu/usr.bin/awk/config.h10
-rw-r--r--gnu/usr.bin/awk/dfa.c18
-rw-r--r--gnu/usr.bin/awk/eval.c22
-rw-r--r--gnu/usr.bin/awk/field.c14
-rw-r--r--gnu/usr.bin/awk/io.c22
-rw-r--r--gnu/usr.bin/awk/iop.c10
-rw-r--r--gnu/usr.bin/awk/main.c20
-rw-r--r--gnu/usr.bin/awk/msg.c10
-rw-r--r--gnu/usr.bin/awk/node.c22
-rw-r--r--gnu/usr.bin/awk/protos.h10
-rw-r--r--gnu/usr.bin/awk/re.c12
-rw-r--r--gnu/usr.bin/awk/version.c4
-rw-r--r--gnu/usr.bin/bc/bc.c18
-rw-r--r--gnu/usr.bin/bc/bcdefs.h4
-rw-r--r--gnu/usr.bin/bc/const.h2
-rw-r--r--gnu/usr.bin/bc/execute.c36
-rw-r--r--gnu/usr.bin/bc/global.c6
-rw-r--r--gnu/usr.bin/bc/global.h2
-rw-r--r--gnu/usr.bin/bc/load.c28
-rw-r--r--gnu/usr.bin/bc/main.c16
-rw-r--r--gnu/usr.bin/bc/number.c84
-rw-r--r--gnu/usr.bin/bc/number.h4
-rw-r--r--gnu/usr.bin/bc/proto.h4
-rw-r--r--gnu/usr.bin/bc/scan.c20
-rw-r--r--gnu/usr.bin/bc/storage.c48
-rw-r--r--gnu/usr.bin/bc/util.c58
-rw-r--r--gnu/usr.bin/binutils/gdb/i386/freebsd-nat.c66
-rw-r--r--gnu/usr.bin/cc/c++/g++.c8
-rw-r--r--gnu/usr.bin/cc/cc/gcc.c34
-rw-r--r--gnu/usr.bin/cc/cc1/c-aux-info.c2
-rw-r--r--gnu/usr.bin/cc/cc1/c-decl.c40
-rw-r--r--gnu/usr.bin/cc/cc1/c-iterate.c20
-rw-r--r--gnu/usr.bin/cc/cc1/c-lang.c2
-rw-r--r--gnu/usr.bin/cc/cc1/c-lex.c8
-rw-r--r--gnu/usr.bin/cc/cc1/c-parse.c4
-rw-r--r--gnu/usr.bin/cc/cc1/c-typeck.c80
-rw-r--r--gnu/usr.bin/cc/cc1plus/call.c38
-rw-r--r--gnu/usr.bin/cc/cc1plus/class.c52
-rw-r--r--gnu/usr.bin/cc/cc1plus/cp-tree.h6
-rw-r--r--gnu/usr.bin/cc/cc1plus/cvt.c30
-rw-r--r--gnu/usr.bin/cc/cc1plus/decl.c132
-rw-r--r--gnu/usr.bin/cc/cc1plus/decl2.c26
-rw-r--r--gnu/usr.bin/cc/cc1plus/edsel.c2
-rw-r--r--gnu/usr.bin/cc/cc1plus/errfn.c8
-rw-r--r--gnu/usr.bin/cc/cc1plus/error.c40
-rw-r--r--gnu/usr.bin/cc/cc1plus/except.c22
-rw-r--r--gnu/usr.bin/cc/cc1plus/expr.c2
-rw-r--r--gnu/usr.bin/cc/cc1plus/gc.c26
-rw-r--r--gnu/usr.bin/cc/cc1plus/hash.h60
-rw-r--r--gnu/usr.bin/cc/cc1plus/init.c20
-rw-r--r--gnu/usr.bin/cc/cc1plus/lex.c36
-rw-r--r--gnu/usr.bin/cc/cc1plus/method.c12
-rw-r--r--gnu/usr.bin/cc/cc1plus/parse.c52
-rw-r--r--gnu/usr.bin/cc/cc1plus/pt.c26
-rw-r--r--gnu/usr.bin/cc/cc1plus/search.c14
-rw-r--r--gnu/usr.bin/cc/cc1plus/sig.c10
-rw-r--r--gnu/usr.bin/cc/cc1plus/spew.c20
-rw-r--r--gnu/usr.bin/cc/cc1plus/tree.c12
-rw-r--r--gnu/usr.bin/cc/cc1plus/typeck.c74
-rw-r--r--gnu/usr.bin/cc/cc1plus/typeck2.c28
-rw-r--r--gnu/usr.bin/cc/cc_int/aux-output.c6
-rw-r--r--gnu/usr.bin/cc/cc_int/bc-emit.c2
-rw-r--r--gnu/usr.bin/cc/cc_int/bc-optab.c6
-rw-r--r--gnu/usr.bin/cc/cc_int/c-common.c22
-rw-r--r--gnu/usr.bin/cc/cc_int/caller-save.c44
-rw-r--r--gnu/usr.bin/cc/cc_int/calls.c36
-rw-r--r--gnu/usr.bin/cc/cc_int/combine.c232
-rw-r--r--gnu/usr.bin/cc/cc_int/convert.c8
-rw-r--r--gnu/usr.bin/cc/cc_int/cse.c146
-rw-r--r--gnu/usr.bin/cc/cc_int/dbxout.c14
-rw-r--r--gnu/usr.bin/cc/cc_int/dwarfout.c42
-rw-r--r--gnu/usr.bin/cc/cc_int/emit-rtl.c30
-rw-r--r--gnu/usr.bin/cc/cc_int/explow.c20
-rw-r--r--gnu/usr.bin/cc/cc_int/expmed.c54
-rw-r--r--gnu/usr.bin/cc/cc_int/expr.c430
-rw-r--r--gnu/usr.bin/cc/cc_int/final.c24
-rw-r--r--gnu/usr.bin/cc/cc_int/flow.c32
-rw-r--r--gnu/usr.bin/cc/cc_int/fold-const.c74
-rw-r--r--gnu/usr.bin/cc/cc_int/function.c78
-rw-r--r--gnu/usr.bin/cc/cc_int/global.c34
-rw-r--r--gnu/usr.bin/cc/cc_int/insn-output.c10
-rw-r--r--gnu/usr.bin/cc/cc_int/insn-recog.c20
-rw-r--r--gnu/usr.bin/cc/cc_int/integrate.c26
-rw-r--r--gnu/usr.bin/cc/cc_int/jump.c60
-rw-r--r--gnu/usr.bin/cc/cc_int/local-alloc.c42
-rw-r--r--gnu/usr.bin/cc/cc_int/loop.c76
-rw-r--r--gnu/usr.bin/cc/cc_int/optabs.c62
-rw-r--r--gnu/usr.bin/cc/cc_int/real.c242
-rw-r--r--gnu/usr.bin/cc/cc_int/recog.c14
-rw-r--r--gnu/usr.bin/cc/cc_int/reg-stack.c6
-rw-r--r--gnu/usr.bin/cc/cc_int/regclass.c36
-rw-r--r--gnu/usr.bin/cc/cc_int/reload.c126
-rw-r--r--gnu/usr.bin/cc/cc_int/reload1.c52
-rw-r--r--gnu/usr.bin/cc/cc_int/reorg.c88
-rw-r--r--gnu/usr.bin/cc/cc_int/rtl.c10
-rw-r--r--gnu/usr.bin/cc/cc_int/rtlanal.c32
-rw-r--r--gnu/usr.bin/cc/cc_int/sched.c22
-rw-r--r--gnu/usr.bin/cc/cc_int/sdbout.c2
-rw-r--r--gnu/usr.bin/cc/cc_int/stmt.c40
-rw-r--r--gnu/usr.bin/cc/cc_int/stor-layout.c4
-rw-r--r--gnu/usr.bin/cc/cc_int/stupid.c2
-rw-r--r--gnu/usr.bin/cc/cc_int/toplev.c18
-rw-r--r--gnu/usr.bin/cc/cc_int/tree.c22
-rw-r--r--gnu/usr.bin/cc/cc_int/unroll.c162
-rw-r--r--gnu/usr.bin/cc/cc_int/varasm.c30
-rw-r--r--gnu/usr.bin/cc/cc_int/xcoffout.c42
-rw-r--r--gnu/usr.bin/cc/cpp/cccp.c172
-rw-r--r--gnu/usr.bin/cc/cpp/cexp.c14
-rw-r--r--gnu/usr.bin/cc/f77/f77.c8
-rw-r--r--gnu/usr.bin/cc/include/bi-run.h2
-rw-r--r--gnu/usr.bin/cc/include/bytecode.h4
-rw-r--r--gnu/usr.bin/cc/include/c-gperf.h60
-rw-r--r--gnu/usr.bin/cc/include/expr.h4
-rw-r--r--gnu/usr.bin/cc/include/gbl-ctors.h2
-rw-r--r--gnu/usr.bin/cc/include/hard-reg-set.h2
-rw-r--r--gnu/usr.bin/cc/include/i386/i386.h12
-rw-r--r--gnu/usr.bin/cc/include/i386/unix.h4
-rw-r--r--gnu/usr.bin/cc/include/integrate.h2
-rw-r--r--gnu/usr.bin/cc/include/longlong.h2
-rw-r--r--gnu/usr.bin/cc/include/obstack.h2
-rw-r--r--gnu/usr.bin/cc/include/output.h2
-rw-r--r--gnu/usr.bin/cc/include/pcp.h6
-rw-r--r--gnu/usr.bin/cc/include/real.h4
-rw-r--r--gnu/usr.bin/cc/include/reload.h4
-rw-r--r--gnu/usr.bin/cc/include/rtl.h10
-rw-r--r--gnu/usr.bin/cc/include/stack.h2
-rw-r--r--gnu/usr.bin/cc/include/tree.h8
-rw-r--r--gnu/usr.bin/cc/libgcc/libgcc1.c2
-rw-r--r--gnu/usr.bin/cc/libgcc/libgcc2.c26
-rw-r--r--gnu/usr.bin/cpio/copyin.c42
-rw-r--r--gnu/usr.bin/cpio/copyout.c12
-rw-r--r--gnu/usr.bin/cpio/copypass.c16
-rw-r--r--gnu/usr.bin/cpio/idcache.c2
-rw-r--r--gnu/usr.bin/cpio/makepath.c2
-rw-r--r--gnu/usr.bin/cpio/tar.c4
-rw-r--r--gnu/usr.bin/cpio/util.c20
-rw-r--r--gnu/usr.bin/cvs/contrib/pcl-cvs/Makefile4
-rw-r--r--gnu/usr.bin/cvs/cvs/add.c16
-rw-r--r--gnu/usr.bin/cvs/cvs/admin.c6
-rw-r--r--gnu/usr.bin/cvs/cvs/checkin.c8
-rw-r--r--gnu/usr.bin/cvs/cvs/checkout.c30
-rw-r--r--gnu/usr.bin/cvs/cvs/classify.c4
-rw-r--r--gnu/usr.bin/cvs/cvs/commit.c20
-rw-r--r--gnu/usr.bin/cvs/cvs/create_adm.c6
-rw-r--r--gnu/usr.bin/cvs/cvs/cvs.h18
-rw-r--r--gnu/usr.bin/cvs/cvs/cvsrc.c10
-rw-r--r--gnu/usr.bin/cvs/cvs/diff.c8
-rw-r--r--gnu/usr.bin/cvs/cvs/entries.c6
-rw-r--r--gnu/usr.bin/cvs/cvs/find_names.c14
-rw-r--r--gnu/usr.bin/cvs/cvs/history.c2
-rw-r--r--gnu/usr.bin/cvs/cvs/ignore.c2
-rw-r--r--gnu/usr.bin/cvs/cvs/import.c20
-rw-r--r--gnu/usr.bin/cvs/cvs/lock.c10
-rw-r--r--gnu/usr.bin/cvs/cvs/log.c12
-rw-r--r--gnu/usr.bin/cvs/cvs/logmsg.c8
-rw-r--r--gnu/usr.bin/cvs/cvs/modules.c2
-rw-r--r--gnu/usr.bin/cvs/cvs/no_diff.c8
-rw-r--r--gnu/usr.bin/cvs/cvs/options.h14
-rw-r--r--gnu/usr.bin/cvs/cvs/parseinfo.c4
-rw-r--r--gnu/usr.bin/cvs/cvs/patch.c6
-rw-r--r--gnu/usr.bin/cvs/cvs/rcs.c34
-rw-r--r--gnu/usr.bin/cvs/cvs/rcs.h4
-rw-r--r--gnu/usr.bin/cvs/cvs/recurse.c14
-rw-r--r--gnu/usr.bin/cvs/cvs/release.c6
-rw-r--r--gnu/usr.bin/cvs/cvs/remove.c8
-rw-r--r--gnu/usr.bin/cvs/cvs/repos.c6
-rw-r--r--gnu/usr.bin/cvs/cvs/root.c8
-rw-r--r--gnu/usr.bin/cvs/cvs/rtag.c24
-rw-r--r--gnu/usr.bin/cvs/cvs/status.c4
-rw-r--r--gnu/usr.bin/cvs/cvs/tag.c16
-rw-r--r--gnu/usr.bin/cvs/cvs/update.c42
-rw-r--r--gnu/usr.bin/cvs/cvs/vers_ts.c4
-rw-r--r--gnu/usr.bin/cvs/lib/alloca.c2
-rw-r--r--gnu/usr.bin/cvs/lib/argmatch.c4
-rw-r--r--gnu/usr.bin/cvs/lib/fnmatch.c42
-rw-r--r--gnu/usr.bin/cvs/lib/hash.c8
-rw-r--r--gnu/usr.bin/cvs/lib/hash.h2
-rw-r--r--gnu/usr.bin/cvs/lib/myndbm.c8
-rw-r--r--gnu/usr.bin/cvs/lib/strerror.c2
-rw-r--r--gnu/usr.bin/cvs/lib/subr.c34
-rw-r--r--gnu/usr.bin/cvs/lib/system.h8
-rw-r--r--gnu/usr.bin/cvs/lib/version.c4
-rw-r--r--gnu/usr.bin/cvs/mkmodules/mkmodules.c10
-rw-r--r--gnu/usr.bin/dc/dc.c2
-rw-r--r--gnu/usr.bin/dc/decimal.c24
-rw-r--r--gnu/usr.bin/dc/decimal.h2
-rw-r--r--gnu/usr.bin/dialog/dialog.c4
-rw-r--r--gnu/usr.bin/diff/analyze.c2
-rw-r--r--gnu/usr.bin/diff/diff3.c2
-rw-r--r--gnu/usr.bin/diff/ed.c6
-rw-r--r--gnu/usr.bin/diff/ifdef.c2
-rw-r--r--gnu/usr.bin/diff/io.c8
-rw-r--r--gnu/usr.bin/diff/side.c2
-rw-r--r--gnu/usr.bin/gdb/bfd/aout-target.h4
-rw-r--r--gnu/usr.bin/gdb/bfd/aoutx.h14
-rw-r--r--gnu/usr.bin/gdb/bfd/archures.c74
-rw-r--r--gnu/usr.bin/gdb/bfd/bfd.c30
-rw-r--r--gnu/usr.bin/gdb/bfd/bfd.h154
-rw-r--r--gnu/usr.bin/gdb/bfd/cache.c14
-rw-r--r--gnu/usr.bin/gdb/bfd/coff-i386.c156
-rw-r--r--gnu/usr.bin/gdb/bfd/coffgen.c50
-rw-r--r--gnu/usr.bin/gdb/bfd/coffswap.h2
-rw-r--r--gnu/usr.bin/gdb/bfd/cpu-i386.c4
-rw-r--r--gnu/usr.bin/gdb/bfd/ctor.c18
-rw-r--r--gnu/usr.bin/gdb/bfd/ecoff.c66
-rw-r--r--gnu/usr.bin/gdb/bfd/ecofflink.c4
-rw-r--r--gnu/usr.bin/gdb/bfd/elf32-target.h4
-rw-r--r--gnu/usr.bin/gdb/bfd/elfcode.h6
-rw-r--r--gnu/usr.bin/gdb/bfd/format.c22
-rw-r--r--gnu/usr.bin/gdb/bfd/freebsd386.c2
-rw-r--r--gnu/usr.bin/gdb/bfd/hash.c4
-rw-r--r--gnu/usr.bin/gdb/bfd/i386aout.c2
-rw-r--r--gnu/usr.bin/gdb/bfd/libaout.h6
-rw-r--r--gnu/usr.bin/gdb/bfd/libbfd.c20
-rw-r--r--gnu/usr.bin/gdb/bfd/libbfd.h28
-rw-r--r--gnu/usr.bin/gdb/bfd/linker.c8
-rw-r--r--gnu/usr.bin/gdb/bfd/opncls.c6
-rw-r--r--gnu/usr.bin/gdb/bfd/reloc.c2
-rw-r--r--gnu/usr.bin/gdb/bfd/srec.c10
-rw-r--r--gnu/usr.bin/gdb/bfd/targets.c44
-rw-r--r--gnu/usr.bin/gdb/bfd/trad-core.c10
-rw-r--r--gnu/usr.bin/gdb/gdb/aout/aout64.h12
-rw-r--r--gnu/usr.bin/gdb/gdb/aout/ar.h2
-rw-r--r--gnu/usr.bin/gdb/gdb/aout/encap.h8
-rw-r--r--gnu/usr.bin/gdb/gdb/aout/ranlib.h2
-rw-r--r--gnu/usr.bin/gdb/gdb/aout/reloc.h6
-rw-r--r--gnu/usr.bin/gdb/gdb/bfdlink.h8
-rw-r--r--gnu/usr.bin/gdb/gdb/blockframe.c4
-rw-r--r--gnu/usr.bin/gdb/gdb/breakpoint.c128
-rw-r--r--gnu/usr.bin/gdb/gdb/breakpoint.h6
-rw-r--r--gnu/usr.bin/gdb/gdb/buildsym.c20
-rw-r--r--gnu/usr.bin/gdb/gdb/buildsym.h2
-rw-r--r--gnu/usr.bin/gdb/gdb/c-lang.c2
-rw-r--r--gnu/usr.bin/gdb/gdb/c-typeprint.c14
-rw-r--r--gnu/usr.bin/gdb/gdb/c-valprint.c8
-rw-r--r--gnu/usr.bin/gdb/gdb/ch-lang.c2
-rw-r--r--gnu/usr.bin/gdb/gdb/ch-valprint.c14
-rw-r--r--gnu/usr.bin/gdb/gdb/coff/i386.h8
-rw-r--r--gnu/usr.bin/gdb/gdb/coff/internal.h2
-rw-r--r--gnu/usr.bin/gdb/gdb/coff/sym.h16
-rw-r--r--gnu/usr.bin/gdb/gdb/coff/symconst.h4
-rw-r--r--gnu/usr.bin/gdb/gdb/coffread.c46
-rw-r--r--gnu/usr.bin/gdb/gdb/command.c54
-rw-r--r--gnu/usr.bin/gdb/gdb/complaints.c2
-rw-r--r--gnu/usr.bin/gdb/gdb/complaints.h2
-rw-r--r--gnu/usr.bin/gdb/gdb/corelow.c8
-rw-r--r--gnu/usr.bin/gdb/gdb/cp-valprint.c10
-rw-r--r--gnu/usr.bin/gdb/gdb/dbxread.c58
-rw-r--r--gnu/usr.bin/gdb/gdb/dcache.c2
-rw-r--r--gnu/usr.bin/gdb/gdb/defs.h8
-rw-r--r--gnu/usr.bin/gdb/gdb/demangle.c2
-rw-r--r--gnu/usr.bin/gdb/gdb/demangle.h2
-rw-r--r--gnu/usr.bin/gdb/gdb/dis-asm.h2
-rw-r--r--gnu/usr.bin/gdb/gdb/disassemble.c4
-rw-r--r--gnu/usr.bin/gdb/gdb/dwarfread.c162
-rw-r--r--gnu/usr.bin/gdb/gdb/elf/common.h2
-rw-r--r--gnu/usr.bin/gdb/gdb/elf/dwarf.h2
-rw-r--r--gnu/usr.bin/gdb/gdb/elf/external.h2
-rw-r--r--gnu/usr.bin/gdb/gdb/elf/internal.h2
-rw-r--r--gnu/usr.bin/gdb/gdb/elfread.c16
-rw-r--r--gnu/usr.bin/gdb/gdb/eval.c40
-rw-r--r--gnu/usr.bin/gdb/gdb/exec.c22
-rw-r--r--gnu/usr.bin/gdb/gdb/expprint.c6
-rw-r--r--gnu/usr.bin/gdb/gdb/findvar.c28
-rw-r--r--gnu/usr.bin/gdb/gdb/fopen-bin.h2
-rw-r--r--gnu/usr.bin/gdb/gdb/fopen-same.h2
-rw-r--r--gnu/usr.bin/gdb/gdb/fork-child.c4
-rw-r--r--gnu/usr.bin/gdb/gdb/frame.h2
-rw-r--r--gnu/usr.bin/gdb/gdb/freebsd-nat.c66
-rw-r--r--gnu/usr.bin/gdb/gdb/gdb-stabs.h4
-rw-r--r--gnu/usr.bin/gdb/gdb/gdbcore.h4
-rw-r--r--gnu/usr.bin/gdb/gdb/gdbm.h2
-rw-r--r--gnu/usr.bin/gdb/gdb/gdbtypes.c42
-rw-r--r--gnu/usr.bin/gdb/gdb/gdbtypes.h6
-rw-r--r--gnu/usr.bin/gdb/gdb/i386-dis.c218
-rw-r--r--gnu/usr.bin/gdb/gdb/i386-tdep.c100
-rw-r--r--gnu/usr.bin/gdb/gdb/ieee.h54
-rw-r--r--gnu/usr.bin/gdb/gdb/infcmd.c40
-rw-r--r--gnu/usr.bin/gdb/gdb/inferior.h2
-rw-r--r--gnu/usr.bin/gdb/gdb/inflow.c8
-rw-r--r--gnu/usr.bin/gdb/gdb/infptrace.c6
-rw-r--r--gnu/usr.bin/gdb/gdb/infrun.c32
-rw-r--r--gnu/usr.bin/gdb/gdb/kcorelow.c6
-rw-r--r--gnu/usr.bin/gdb/gdb/language.c4
-rw-r--r--gnu/usr.bin/gdb/gdb/language.h8
-rw-r--r--gnu/usr.bin/gdb/gdb/m2-lang.c2
-rw-r--r--gnu/usr.bin/gdb/gdb/main.c12
-rw-r--r--gnu/usr.bin/gdb/gdb/mdebugread.c8
-rw-r--r--gnu/usr.bin/gdb/gdb/mem-break.c2
-rw-r--r--gnu/usr.bin/gdb/gdb/minsyms.c18
-rw-r--r--gnu/usr.bin/gdb/gdb/nlmread.c10
-rw-r--r--gnu/usr.bin/gdb/gdb/objfiles.c20
-rw-r--r--gnu/usr.bin/gdb/gdb/objfiles.h6
-rw-r--r--gnu/usr.bin/gdb/gdb/obstack.h2
-rw-r--r--gnu/usr.bin/gdb/gdb/parse.c10
-rw-r--r--gnu/usr.bin/gdb/gdb/parser-defs.h4
-rw-r--r--gnu/usr.bin/gdb/gdb/partial-stab.h18
-rw-r--r--gnu/usr.bin/gdb/gdb/printcmd.c36
-rw-r--r--gnu/usr.bin/gdb/gdb/remote-utils.c6
-rw-r--r--gnu/usr.bin/gdb/gdb/remote-utils.h2
-rw-r--r--gnu/usr.bin/gdb/gdb/remote.c16
-rw-r--r--gnu/usr.bin/gdb/gdb/ser-unix.c14
-rw-r--r--gnu/usr.bin/gdb/gdb/serial.c2
-rw-r--r--gnu/usr.bin/gdb/gdb/solib.c78
-rw-r--r--gnu/usr.bin/gdb/gdb/source.c38
-rw-r--r--gnu/usr.bin/gdb/gdb/stabsread.c126
-rw-r--r--gnu/usr.bin/gdb/gdb/stabsread.h2
-rw-r--r--gnu/usr.bin/gdb/gdb/stack.c28
-rw-r--r--gnu/usr.bin/gdb/gdb/symfile.c44
-rw-r--r--gnu/usr.bin/gdb/gdb/symfile.h4
-rw-r--r--gnu/usr.bin/gdb/gdb/symmisc.c28
-rw-r--r--gnu/usr.bin/gdb/gdb/symtab.c110
-rw-r--r--gnu/usr.bin/gdb/gdb/symtab.h20
-rw-r--r--gnu/usr.bin/gdb/gdb/target.c28
-rw-r--r--gnu/usr.bin/gdb/gdb/target.h16
-rw-r--r--gnu/usr.bin/gdb/gdb/tm-i386v.h8
-rw-r--r--gnu/usr.bin/gdb/gdb/top.c32
-rw-r--r--gnu/usr.bin/gdb/gdb/utils.c44
-rw-r--r--gnu/usr.bin/gdb/gdb/valarith.c96
-rw-r--r--gnu/usr.bin/gdb/gdb/valops.c42
-rw-r--r--gnu/usr.bin/gdb/gdb/valprint.c30
-rw-r--r--gnu/usr.bin/gdb/gdb/value.h12
-rw-r--r--gnu/usr.bin/gdb/gdb/values.c20
-rw-r--r--gnu/usr.bin/gdb/gdb/wait.h4
-rw-r--r--gnu/usr.bin/gdb/libiberty/argv.c2
-rw-r--r--gnu/usr.bin/gdb/libiberty/cplus-dem.c80
-rw-r--r--gnu/usr.bin/gdb/libiberty/fdmatch.c2
-rw-r--r--gnu/usr.bin/gdb/libiberty/ieee-float.c6
-rw-r--r--gnu/usr.bin/gdb/libiberty/sigsetmask.c4
-rw-r--r--gnu/usr.bin/gdb/libiberty/spaces.c2
-rw-r--r--gnu/usr.bin/gdb/libiberty/strerror.c2
-rw-r--r--gnu/usr.bin/gdb/libiberty/strsignal.c2
-rw-r--r--gnu/usr.bin/gdb/libiberty/xmalloc.c2
-rw-r--r--gnu/usr.bin/gdb/mmalloc/attach.c2
-rw-r--r--gnu/usr.bin/gdb/mmalloc/detach.c4
-rw-r--r--gnu/usr.bin/gdb/mmalloc/keys.c4
-rw-r--r--gnu/usr.bin/gdb/mmalloc/mfree.c2
-rw-r--r--gnu/usr.bin/gdb/mmalloc/mmalloc.c4
-rw-r--r--gnu/usr.bin/gdb/mmalloc/mmalloc.h2
-rw-r--r--gnu/usr.bin/grep/dfa.c18
-rw-r--r--gnu/usr.bin/grep/grep.c4
-rw-r--r--gnu/usr.bin/grep/kwset.c2
-rw-r--r--gnu/usr.bin/grep/obstack.h2
-rw-r--r--gnu/usr.bin/grep/search.c2
-rw-r--r--gnu/usr.bin/groff/Makefile2
-rw-r--r--gnu/usr.bin/groff/Makefile.comm10
-rw-r--r--gnu/usr.bin/groff/Makefile.in12
-rw-r--r--gnu/usr.bin/groff/Makefile.init8
-rw-r--r--gnu/usr.bin/groff/addftinfo/guess.h2
-rw-r--r--gnu/usr.bin/groff/devascii/Makefile2
-rw-r--r--gnu/usr.bin/groff/doc/Makefile2
-rw-r--r--gnu/usr.bin/groff/eqn/Makefile2
-rw-r--r--gnu/usr.bin/groff/include/cset.h2
-rw-r--r--gnu/usr.bin/groff/include/stringclass.h10
-rw-r--r--gnu/usr.bin/groff/libgroff/Makefile2
-rw-r--r--gnu/usr.bin/groff/libgroff/iftoa.c2
-rw-r--r--gnu/usr.bin/groff/libgroff/strtol.c4
-rw-r--r--gnu/usr.bin/groff/mm/Makefile2
-rw-r--r--gnu/usr.bin/groff/mm/Makefile.sub2
-rw-r--r--gnu/usr.bin/groff/pic/Makefile.sub2
-rw-r--r--gnu/usr.bin/groff/pic/pic.h2
-rw-r--r--gnu/usr.bin/groff/psbb/psbb.c2
-rw-r--r--gnu/usr.bin/groff/tbl/table.h8
-rw-r--r--gnu/usr.bin/groff/troff/charinfo.h2
-rw-r--r--gnu/usr.bin/groff/troff/env.h8
-rw-r--r--gnu/usr.bin/groff/troff/token.h10
-rw-r--r--gnu/usr.bin/groff/xditview/Dvi.c12
-rw-r--r--gnu/usr.bin/groff/xditview/DviChar.c2
-rw-r--r--gnu/usr.bin/groff/xditview/DviP.h4
-rw-r--r--gnu/usr.bin/groff/xditview/Makefile2
-rw-r--r--gnu/usr.bin/groff/xditview/XFontName.c2
-rw-r--r--gnu/usr.bin/groff/xditview/device.c30
-rw-r--r--gnu/usr.bin/groff/xditview/draw.c44
-rw-r--r--gnu/usr.bin/groff/xditview/font.c14
-rw-r--r--gnu/usr.bin/groff/xditview/lex.c12
-rw-r--r--gnu/usr.bin/groff/xditview/parse.c14
-rw-r--r--gnu/usr.bin/groff/xditview/xditview.c12
-rw-r--r--gnu/usr.bin/groff/xditview/xtotroff.c6
-rw-r--r--gnu/usr.bin/gzip/bits.c4
-rw-r--r--gnu/usr.bin/gzip/deflate.c6
-rw-r--r--gnu/usr.bin/gzip/gzip.c10
-rw-r--r--gnu/usr.bin/gzip/gzip.h6
-rw-r--r--gnu/usr.bin/gzip/inflate.c10
-rw-r--r--gnu/usr.bin/gzip/tailor.h8
-rw-r--r--gnu/usr.bin/gzip/trees.c4
-rw-r--r--gnu/usr.bin/gzip/unlzw.c62
-rw-r--r--gnu/usr.bin/gzip/util.c4
-rw-r--r--gnu/usr.bin/ld/cplus-dem.c26
-rw-r--r--gnu/usr.bin/ld/ld.c28
-rw-r--r--gnu/usr.bin/ld/ld.h8
-rw-r--r--gnu/usr.bin/ld/lib.c4
-rw-r--r--gnu/usr.bin/ld/rtld/malloc.c14
-rw-r--r--gnu/usr.bin/ld/rtld/rtld.c12
-rw-r--r--gnu/usr.bin/ld/symseg.h6
-rw-r--r--gnu/usr.bin/man/Makefile2
-rw-r--r--gnu/usr.bin/man/lib/gripes.c2
-rw-r--r--gnu/usr.bin/man/lib/gripes.h2
-rw-r--r--gnu/usr.bin/man/lib/util.c2
-rw-r--r--gnu/usr.bin/man/man/Makefile2
-rw-r--r--gnu/usr.bin/man/man/glob.c10
-rw-r--r--gnu/usr.bin/man/man/man.c18
-rw-r--r--gnu/usr.bin/man/man/manpath.c8
-rw-r--r--gnu/usr.bin/man/man/manpath.h2
-rw-r--r--gnu/usr.bin/man/man/version.h2
-rw-r--r--gnu/usr.bin/man/manpath/manpath.c8
-rw-r--r--gnu/usr.bin/man/manpath/manpath.h2
-rw-r--r--gnu/usr.bin/mkisofs/Makefile.in4
-rw-r--r--gnu/usr.bin/mkisofs/diag/Makefile4
-rw-r--r--gnu/usr.bin/mkisofs/diag/dump.c4
-rw-r--r--gnu/usr.bin/mkisofs/diag/isodump.c16
-rw-r--r--gnu/usr.bin/mkisofs/diag/isovfy.c16
-rw-r--r--gnu/usr.bin/mkisofs/exclude.c4
-rw-r--r--gnu/usr.bin/mkisofs/exclude.h2
-rw-r--r--gnu/usr.bin/mkisofs/hash.c4
-rw-r--r--gnu/usr.bin/mkisofs/mkisofs.c14
-rw-r--r--gnu/usr.bin/mkisofs/mkisofs.h6
-rw-r--r--gnu/usr.bin/mkisofs/rock.c28
-rw-r--r--gnu/usr.bin/mkisofs/tree.c104
-rw-r--r--gnu/usr.bin/mkisofs/vms.c6
-rw-r--r--gnu/usr.bin/mkisofs/write.c60
-rw-r--r--gnu/usr.bin/patch/EXTERN.h9
-rw-r--r--gnu/usr.bin/patch/INTERN.h9
-rw-r--r--gnu/usr.bin/patch/Makefile2
-rw-r--r--gnu/usr.bin/patch/backupfile.c12
-rw-r--r--gnu/usr.bin/patch/common.h12
-rw-r--r--gnu/usr.bin/patch/config.h2
-rw-r--r--gnu/usr.bin/patch/inp.c16
-rw-r--r--gnu/usr.bin/patch/inp.h9
-rw-r--r--gnu/usr.bin/patch/patch.c76
-rw-r--r--gnu/usr.bin/patch/pch.c39
-rw-r--r--gnu/usr.bin/patch/pch.h11
-rw-r--r--gnu/usr.bin/patch/util.c6
-rw-r--r--gnu/usr.bin/patch/util.h9
-rw-r--r--gnu/usr.bin/patch/version.c9
-rw-r--r--gnu/usr.bin/patch/version.h9
-rw-r--r--gnu/usr.bin/perl/Makefile2
-rw-r--r--gnu/usr.bin/perl/lib/Makefile2
-rw-r--r--gnu/usr.bin/perl/perl/EXTERN.h9
-rw-r--r--gnu/usr.bin/perl/perl/INTERN.h9
-rw-r--r--gnu/usr.bin/perl/perl/Makefile10
-rw-r--r--gnu/usr.bin/perl/perl/arg.h14
-rw-r--r--gnu/usr.bin/perl/perl/array.c13
-rw-r--r--gnu/usr.bin/perl/perl/array.h11
-rw-r--r--gnu/usr.bin/perl/perl/cmd.c17
-rw-r--r--gnu/usr.bin/perl/perl/cmd.h11
-rw-r--r--gnu/usr.bin/perl/perl/cons.c15
-rw-r--r--gnu/usr.bin/perl/perl/consarg.c24
-rw-r--r--gnu/usr.bin/perl/perl/crypt.c4
-rw-r--r--gnu/usr.bin/perl/perl/doarg.c24
-rw-r--r--gnu/usr.bin/perl/perl/doio.c28
-rw-r--r--gnu/usr.bin/perl/perl/dolist.c21
-rw-r--r--gnu/usr.bin/perl/perl/dump.c12
-rw-r--r--gnu/usr.bin/perl/perl/eval.c19
-rw-r--r--gnu/usr.bin/perl/perl/form.c13
-rw-r--r--gnu/usr.bin/perl/perl/form.h9
-rw-r--r--gnu/usr.bin/perl/perl/handy.h15
-rw-r--r--gnu/usr.bin/perl/perl/hash.c13
-rw-r--r--gnu/usr.bin/perl/perl/hash.h11
-rw-r--r--gnu/usr.bin/perl/perl/malloc.c37
-rw-r--r--gnu/usr.bin/perl/perl/perl.c24
-rw-r--r--gnu/usr.bin/perl/perl/perl.h19
-rw-r--r--gnu/usr.bin/perl/perl/perly.c2
-rw-r--r--gnu/usr.bin/perl/perl/regcomp.c19
-rw-r--r--gnu/usr.bin/perl/perl/regcomp.h9
-rw-r--r--gnu/usr.bin/perl/perl/regexec.c19
-rw-r--r--gnu/usr.bin/perl/perl/regexp.h11
-rw-r--r--gnu/usr.bin/perl/perl/spat.h9
-rw-r--r--gnu/usr.bin/perl/perl/stab.c17
-rw-r--r--gnu/usr.bin/perl/perl/stab.h13
-rw-r--r--gnu/usr.bin/perl/perl/str.c27
-rw-r--r--gnu/usr.bin/perl/perl/str.h15
-rw-r--r--gnu/usr.bin/perl/perl/tdoio.c29
-rw-r--r--gnu/usr.bin/perl/perl/toke.c33
-rw-r--r--gnu/usr.bin/perl/perl/usersub.c11
-rw-r--r--gnu/usr.bin/perl/perl/util.c23
-rw-r--r--gnu/usr.bin/perl/perl/util.h15
-rw-r--r--gnu/usr.bin/perl/sperl/Makefile12
-rw-r--r--gnu/usr.bin/perl/tperl/Makefile12
-rw-r--r--gnu/usr.bin/perl/usub/usersub.c17
-rw-r--r--gnu/usr.bin/perl/x2p/EXTERN.h9
-rw-r--r--gnu/usr.bin/perl/x2p/INTERN.h9
-rw-r--r--gnu/usr.bin/perl/x2p/Makefile2
-rw-r--r--gnu/usr.bin/perl/x2p/a2p.h11
-rw-r--r--gnu/usr.bin/perl/x2p/a2py.c11
-rw-r--r--gnu/usr.bin/perl/x2p/handy.h11
-rw-r--r--gnu/usr.bin/perl/x2p/hash.c9
-rw-r--r--gnu/usr.bin/perl/x2p/hash.h9
-rw-r--r--gnu/usr.bin/perl/x2p/malloc.c37
-rw-r--r--gnu/usr.bin/perl/x2p/str.c13
-rw-r--r--gnu/usr.bin/perl/x2p/str.h9
-rw-r--r--gnu/usr.bin/perl/x2p/util.c13
-rw-r--r--gnu/usr.bin/perl/x2p/util.h11
-rw-r--r--gnu/usr.bin/perl/x2p/walk.c15
-rw-r--r--gnu/usr.bin/ptx/bumpalloc.h4
-rw-r--r--gnu/usr.bin/ptx/ptx.c22
-rw-r--r--gnu/usr.bin/rcs/ci/Makefile2
-rw-r--r--gnu/usr.bin/rcs/ci/ci.c39
-rw-r--r--gnu/usr.bin/rcs/co/Makefile2
-rw-r--r--gnu/usr.bin/rcs/co/co.c25
-rw-r--r--gnu/usr.bin/rcs/ident/Makefile2
-rw-r--r--gnu/usr.bin/rcs/ident/ident.c17
-rw-r--r--gnu/usr.bin/rcs/lib/maketime.c29
-rw-r--r--gnu/usr.bin/rcs/lib/partime.c15
-rw-r--r--gnu/usr.bin/rcs/lib/rcsbase.h33
-rw-r--r--gnu/usr.bin/rcs/lib/rcsedit.c31
-rw-r--r--gnu/usr.bin/rcs/lib/rcsfcmp.c19
-rw-r--r--gnu/usr.bin/rcs/lib/rcsfnms.c27
-rw-r--r--gnu/usr.bin/rcs/lib/rcsgen.c29
-rw-r--r--gnu/usr.bin/rcs/lib/rcskeep.c21
-rw-r--r--gnu/usr.bin/rcs/lib/rcskeys.c18
-rw-r--r--gnu/usr.bin/rcs/lib/rcslex.c22
-rw-r--r--gnu/usr.bin/rcs/lib/rcsrev.c23
-rw-r--r--gnu/usr.bin/rcs/lib/rcssyn.c21
-rw-r--r--gnu/usr.bin/rcs/lib/rcsutil.c21
-rw-r--r--gnu/usr.bin/rcs/rcs/Makefile2
-rw-r--r--gnu/usr.bin/rcs/rcs/rcs.c35
-rw-r--r--gnu/usr.bin/rcs/rcsclean/Makefile2
-rw-r--r--gnu/usr.bin/rcs/rcsdiff/Makefile2
-rw-r--r--gnu/usr.bin/rcs/rcsdiff/rcsdiff.c21
-rw-r--r--gnu/usr.bin/rcs/rcsmerge/Makefile2
-rw-r--r--gnu/usr.bin/rcs/rcsmerge/rcsmerge.c21
-rw-r--r--gnu/usr.bin/rcs/rlog/Makefile2
-rw-r--r--gnu/usr.bin/rcs/rlog/rlog.c25
-rw-r--r--gnu/usr.bin/sort/long-options.c2
-rw-r--r--gnu/usr.bin/tar/Makefile.gnu10
-rw-r--r--gnu/usr.bin/tar/extract.c8
-rw-r--r--gnu/usr.bin/tar/getopt.c4
-rw-r--r--gnu/usr.bin/tar/getopt.h4
-rw-r--r--gnu/usr.bin/tar/getopt1.c6
-rw-r--r--gnu/usr.bin/tar/list.c2
-rw-r--r--gnu/usr.bin/tar/port.c4
-rw-r--r--gnu/usr.bin/tar/tar.c14
-rw-r--r--gnu/usr.bin/texinfo/info/Makefile8
-rw-r--r--gnu/usr.bin/texinfo/info/display.c4
-rw-r--r--gnu/usr.bin/texinfo/info/echo_area.c4
-rw-r--r--gnu/usr.bin/texinfo/info/filesys.c2
-rw-r--r--gnu/usr.bin/texinfo/info/footnotes.c4
-rw-r--r--gnu/usr.bin/texinfo/info/info.c2
-rw-r--r--gnu/usr.bin/texinfo/info/infodoc.c6
-rw-r--r--gnu/usr.bin/texinfo/info/infomap.c2
-rw-r--r--gnu/usr.bin/texinfo/info/infomap.h2
-rw-r--r--gnu/usr.bin/texinfo/info/nodes.c2
-rw-r--r--gnu/usr.bin/texinfo/info/search.c2
-rw-r--r--gnu/usr.bin/texinfo/info/session.c2
-rw-r--r--gnu/usr.bin/texinfo/info/window.c4
-rw-r--r--gnu/usr.bin/texinfo/makedoc/Makefile6
-rw-r--r--gnu/usr.bin/texinfo/makedoc/makedoc.c2
-rw-r--r--gnu/usr.bin/texinfo/makeinfo/Makefile6
-rw-r--r--gnu/usr.bin/texinfo/makeinfo/makeinfo.c4
-rw-r--r--gnu/usr.bin/texinfo/misc/Makefile6
-rw-r--r--gnu/usr.bin/texinfo/misc/Makefile.in4
-rw-r--r--gnu/usr.bin/texinfo/texindex/Makefile8
-rw-r--r--gnu/usr.bin/yppush/Makefile4
-rw-r--r--gnu/usr.bin/yppush/yppush.c10
-rw-r--r--gnu/usr.sbin/isdn/alaw2ulaw/con.h192
-rw-r--r--gnu/usr.sbin/isdn/ulaw2alaw/con.h192
-rw-r--r--gnu/usr.sbin/yp_mkdb/yp_mkdb.c6
-rw-r--r--gnu/usr.sbin/yppasswdd/pw_util.c4
-rw-r--r--gnu/usr.sbin/yppasswdd/update.c4
-rw-r--r--gnu/usr.sbin/yppasswdd/yppasswd.h4
-rw-r--r--gnu/usr.sbin/yppasswdd/yppasswdd.c2
-rw-r--r--gnu/usr.sbin/ypserv/Makefile.yp4
-rw-r--r--gnu/usr.sbin/ypserv/server.c184
-rw-r--r--gnu/usr.sbin/ypserv/yp.h214
-rw-r--r--gnu/usr.sbin/ypserv/yp_svc.c10
-rw-r--r--gnu/usr.sbin/ypserv/yp_xdr.c30
-rw-r--r--include/arpa/nameser.h4
-rw-r--r--include/db.h2
-rw-r--r--include/dirent.h2
-rw-r--r--include/glob.h2
-rw-r--r--include/histedit.h2
-rw-r--r--include/math.h2
-rw-r--r--include/netdb.h6
-rw-r--r--include/nl_types.h4
-rw-r--r--include/protocols/routed.h2
-rw-r--r--include/protocols/timed.h8
-rw-r--r--include/resolv.h6
-rw-r--r--include/rpc/auth.h12
-rw-r--r--include/rpc/auth_unix.h16
-rw-r--r--include/rpc/clnt.h18
-rw-r--r--include/rpc/pmap_clnt.h16
-rw-r--r--include/rpc/pmap_prot.h14
-rw-r--r--include/rpc/pmap_rmt.h14
-rw-r--r--include/rpc/rpc.h10
-rw-r--r--include/rpc/rpc_msg.h12
-rw-r--r--include/rpc/svc.h24
-rw-r--r--include/rpc/svc_auth.h14
-rw-r--r--include/rpc/types.h12
-rw-r--r--include/rpc/xdr.h14
-rw-r--r--include/rpcsvc/yp_prot.h16
-rw-r--r--include/rpcsvc/ypclnt.h4
-rw-r--r--include/stdio.h2
-rw-r--r--include/strhash.h6
-rw-r--r--include/string.h2
-rw-r--r--libexec/rtld-aout/rtld.c12
-rw-r--r--sys/rpc/types.h12
959 files changed, 13154 insertions, 12889 deletions
diff --git a/gnu/games/chess/Makefile b/gnu/games/chess/Makefile
index 1fff3a27b10f..a12913749c70 100644
--- a/gnu/games/chess/Makefile
+++ b/gnu/games/chess/Makefile
@@ -8,7 +8,7 @@ DPADD= ${LIBCURSES} ${LIBTERMCAP}
LDADD= -lcurses -ltermcap
HIDEGAME=hidegame
-beforeinstall:
+beforeinstall:
install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/gnuchess.book \
${DESTDIR}/usr/share/games
diff --git a/gnu/games/chess/Xchess/Makefile b/gnu/games/chess/Xchess/Makefile
index d8892e29d39e..bbf27899dde5 100644
--- a/gnu/games/chess/Xchess/Makefile
+++ b/gnu/games/chess/Xchess/Makefile
@@ -1,5 +1,5 @@
-# RCS Info: $Revision: 1.1.1.1 $ on $Date: 1993/06/12 14:41:05 $
-# $Source: /a/cvs/386BSD/src/gnu/chess/Xchess/Makefile,v $
+# RCS Info: $Revision: 1.2 $ on $Date: 1994/01/07 11:10:39 $
+# $Source: /home/ncvs/src/gnu/games/chess/Xchess/Makefile,v $
# Copyright (c) 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
#
# Makefile for xchess.
@@ -95,7 +95,7 @@ reopt: all
install: all
-source: $(SOURCE)
+source: $(SOURCE)
tags: $(ALLFILES)
ctags -w -t *.c *.h > /dev/null 2>&1
@@ -123,7 +123,7 @@ depend: $(SOURCE)
echo '$$r makedep' >>eddep
echo 'w' >>eddep
ed - Makefile < eddep
- rm eddep makedep
+ rm eddep makedep
echo '# DEPENDENCIES MUST END AT END OF FILE' >> Makefile
echo '# IF YOU PUT STUFF HERE IT WILL GO AWAY' >> Makefile
echo '# see make depend above' >> Makefile
diff --git a/gnu/games/chess/Xchess/XCircle.c b/gnu/games/chess/Xchess/XCircle.c
index d2144bcab849..3d1b1c8d223a 100644
--- a/gnu/games/chess/Xchess/XCircle.c
+++ b/gnu/games/chess/Xchess/XCircle.c
@@ -20,8 +20,8 @@ file named COPYING. Among other things, the copyright notice
and this notice must be preserved on all copies. */
-/* RCS Info: $Revision: 1.2 $ on $Date: 86/11/23 17:17:04 $
- * $Source: /users/faustus/xchess/RCS/XCircle.c,v $
+/* RCS Info: $Revision: 1.1.1.1 $ on $Date: 1993/06/12 14:41:12 $
+ * $Source: /home/ncvs/src/gnu/games/chess/Xchess/XCircle.c,v $
* Copyright (c) 1986 Wayne A. Christopher, U. C. Berkeley CAD Group
* Permission is granted to do anything with this code except sell it
* or remove this message.
@@ -143,7 +143,7 @@ XCircle(win, x, y, rad, start, end, width, height, pixel, func, planes)
verts[0].flags |= VertexStartClosed;
verts[j].x = verts[0].x;
verts[j].y = verts[0].y;
- verts[j].flags = (verts[0].flags & ~VertexStartClosed) |
+ verts[j].flags = (verts[0].flags & ~VertexStartClosed) |
VertexEndClosed;
for (i = 0; i < 15; i++) {
if (dp)
diff --git a/gnu/games/chess/Xchess/board.c b/gnu/games/chess/Xchess/board.c
index 4c5b9347d8e6..fab97d8394cd 100644
--- a/gnu/games/chess/Xchess/board.c
+++ b/gnu/games/chess/Xchess/board.c
@@ -20,8 +20,8 @@ file named COPYING. Among other things, the copyright notice
and this notice must be preserved on all copies. */
-/* RCS Info: $Revision: 1.4 $ on $Date: 86/11/23 17:17:15 $
- * $Source: /users/faustus/xchess/RCS/board.c,v $
+/* RCS Info: $Revision: 1.1.1.1 $ on $Date: 1993/06/12 14:41:08 $
+ * $Source: /home/ncvs/src/gnu/games/chess/Xchess/board.c,v $
* Copyright (c) 1986 Wayne A. Christopher, U. C. Berkeley CAD Group
* Permission is granted to do anything with this code except sell it
* or remove this message.
@@ -164,12 +164,12 @@ board_move(b, m)
if (m->piece.color == WHITE) {
if (m->fromx == 0)
b->white_cant_castle_q = true;
- else if (m->fromx == 7)
+ else if (m->fromx == 7)
b->white_cant_castle_k = true;
} else {
if (m->fromx == 0)
b->black_cant_castle_q = true;
- else if (m->fromx == 7)
+ else if (m->fromx == 7)
b->black_cant_castle_k = true;
}
}
diff --git a/gnu/games/chess/Xchess/button.c b/gnu/games/chess/Xchess/button.c
index 67bf3c86942f..d91005df4362 100644
--- a/gnu/games/chess/Xchess/button.c
+++ b/gnu/games/chess/Xchess/button.c
@@ -20,8 +20,8 @@ file named COPYING. Among other things, the copyright notice
and this notice must be preserved on all copies. */
-/* RCS Info: $Revision: 1.4 $ on $Date: 86/11/26 12:09:41 $
- * $Source: /users/faustus/xchess/RCS/button.c,v $
+/* RCS Info: $Revision: 1.1.1.1 $ on $Date: 1993/06/12 14:41:15 $
+ * $Source: /home/ncvs/src/gnu/games/chess/Xchess/button.c,v $
* Copyright (c) 1986 Wayne A. Christopher, U. C. Berkeley CAD Group
* Permission is granted to do anything with this code except sell it
* or remove this message.
@@ -52,7 +52,7 @@ static struct but {
{ "Reset", 0, 80, 108, 29, RESTART } ,
{ "Save", 109, 80, 108, 29, SAVE } ,
#define EASY_OFFSET 8
- { "Switch", 219, 80, 108, 29, SWITCH }
+ { "Switch", 219, 80, 108, 29, SWITCH }
/* { "NoEasy", 219, 80, 108, 29, EASY }*/
} ;
static int easy = 1;
@@ -69,7 +69,7 @@ button_draw(win)
XSetLineAttributes(win->display, DefaultGC(win->display, 0),
BORDER_WIDTH, LineSolid, CapButt,
JoinMiter);
-
+
XDrawLine(win->display, win->buttonwin,
DefaultGC(win->display, 0),
0, 29, BUTTON_WIDTH, 29);
@@ -85,9 +85,9 @@ button_draw(win)
XSetFont(win->display, DefaultGC(win->display, 0), win->large->fid);
XSetForeground(win->display, DefaultGC(win->display, 0),
- win->textcolor.pixel);
+ win->textcolor.pixel);
XSetBackground(win->display, DefaultGC(win->display, 0),
- win->textback.pixel);
+ win->textback.pixel);
for (i = 0; i < numbuts; i++) {
x = (buts[i].width -
@@ -219,7 +219,7 @@ button_service(win, event)
case SAVE:
if (saveflag) {
- message_add(win,
+ message_add(win,
"Game is already being logged in file '", true);
message_add(win, record_file, true);
message_add(win, "'.\n", true);
@@ -248,12 +248,12 @@ button_service(win, event)
return;
}
}
- message_add(win1,
+ message_add(win1,
"Clock stopped.\nHit 'Pause' again to restart.\n",
false);
if (!oneboard)
- message_add(win2,
- "Clock stopped.\nHit 'Pause' again to restart.\n",
+ message_add(win2,
+ "Clock stopped.\nHit 'Pause' again to restart.\n",
false);
clock_started = false;
} else {
@@ -320,7 +320,7 @@ button_service(win, event)
win->textcolor.pixel);
XSetBackground(win->display,
DefaultGC(win->display, 0),
- win->textback.pixel);
+ win->textback.pixel);
XDrawImageString(win->display,
win->buttonwin,
diff --git a/gnu/games/chess/Xchess/clock.c b/gnu/games/chess/Xchess/clock.c
index a7b3c3264e3c..88228b0bd0ae 100644
--- a/gnu/games/chess/Xchess/clock.c
+++ b/gnu/games/chess/Xchess/clock.c
@@ -20,8 +20,8 @@ file named COPYING. Among other things, the copyright notice
and this notice must be preserved on all copies. */
-/* RCS Info: $Revision: 1.4 $ on $Date: 86/11/26 12:09:47 $
- * $Source: /users/faustus/xchess/RCS/clock.c,v $
+/* RCS Info: $Revision: 1.1.1.1 $ on $Date: 1993/06/12 14:41:08 $
+ * $Source: /home/ncvs/src/gnu/games/chess/Xchess/clock.c,v $
* Copyright (c) 1986 Wayne A. Christopher, U. C. Berkeley CAD Group
* Permission is granted to do anything with this code except sell it
* or remove this message.
@@ -59,7 +59,7 @@ clock_draw(win, col)
Window w = ((col == WHITE) ? win->wclockwin : win->bclockwin);
/* Draw a clock face and the hands. */
- XCircle(w, x, y, rad, 0.0, 0.0, 1, 1, win->textcolor.pixel, GXcopy,
+ XCircle(w, x, y, rad, 0.0, 0.0, 1, 1, win->textcolor.pixel, GXcopy,
AllPlanes);
rad -= 8;
@@ -112,7 +112,7 @@ clock_update()
lastwhite = lastblack = now;
return;
}
-
+
if (white_running) {
whiteseconds += now - lastwhite;
lastwhite = now;
@@ -198,7 +198,7 @@ dohands(win, col)
{
int cx = CLOCK_WIDTH / 2, cy = CLOCK_WIDTH / 2;
double *h = (col == WHITE) ? win->whitehands : win->blackhands;
- Window w = (col == WHITE) ? win->wclockwin : win->bclockwin;
+ Window w = (col == WHITE) ? win->wclockwin : win->bclockwin;
long secs = (col == WHITE) ? whiteseconds : blackseconds;
int rad, x, y, i;
@@ -272,11 +272,11 @@ hilight(win, col, on)
BORDER_WIDTH, LineSolid, CapButt, JoinMiter);
XSetFont(win->display, DefaultGC(win->display, 0),
win->large->fid);
-
+
XDrawLine(win->display, w, DefaultGC(win->display, 0),
0, CLOCK_HEIGHT - 26,
CLOCK_WIDTH, CLOCK_HEIGHT - 26);
-
+
XDrawImageString(win->display, w, DefaultGC(win->display, 0),
(CLOCK_WIDTH - x) / 2, CLOCK_HEIGHT,
s, strlen(s));
diff --git a/gnu/games/chess/Xchess/control.c b/gnu/games/chess/Xchess/control.c
index ad2e1d7994fd..7d23a7698b5a 100644
--- a/gnu/games/chess/Xchess/control.c
+++ b/gnu/games/chess/Xchess/control.c
@@ -19,8 +19,8 @@ file named COPYING. Among other things, the copyright notice
and this notice must be preserved on all copies. */
-/* RCS Info: $Revision: 1.4 $ on $Date: 86/11/23 17:17:32 $
- * $Source: /users/faustus/xchess/RCS/control.c,v $
+/* RCS Info: $Revision: 1.1.1.1 $ on $Date: 1993/06/12 14:41:11 $
+ * $Source: /home/ncvs/src/gnu/games/chess/Xchess/control.c,v $
* Copyright (c) 1986 Wayne A. Christopher, U. C. Berkeley CAD Group
* Permission is granted to do anything with this code except sell it
* or remove this message.
@@ -154,7 +154,7 @@ button_released(event, win)
thismove->type = QCASTLE;
else
thismove->type = MOVE;
-
+
/* Now check the en-passant case... */
if ((thismove->type == MOVE) && ((thismove->tox == thismove->fromx + 1)
|| (thismove->tox == thismove->fromx - 1)) &&
@@ -278,7 +278,7 @@ screen_move(m)
win_drawpiece(&m->piece, m->toy, m->tox, BLACK);
}
break;
-
+
case KCASTLE:
if (m->piece.color == WHITE) {
win_erasepiece(7, 4, WHITE);
diff --git a/gnu/games/chess/Xchess/jail.c b/gnu/games/chess/Xchess/jail.c
index e5e60642430a..b3ed39178465 100644
--- a/gnu/games/chess/Xchess/jail.c
+++ b/gnu/games/chess/Xchess/jail.c
@@ -20,8 +20,8 @@ file named COPYING. Among other things, the copyright notice
and this notice must be preserved on all copies. */
-/* RCS Info: $Revision: 1.3 $ on $Date: 86/11/26 12:09:54 $
- * $Source: /users/faustus/xchess/RCS/jail.c,v $
+/* RCS Info: $Revision: 1.1.1.1 $ on $Date: 1993/06/12 14:41:12 $
+ * $Source: /home/ncvs/src/gnu/games/chess/Xchess/jail.c,v $
* Copyright (c) 1986 Wayne A. Christopher, U. C. Berkeley CAD Group
* Permission is granted to do anything with this code except sell it
* or remove this message.
@@ -82,7 +82,7 @@ jail_draw(win)
win->textcolor.pixel);
XSetBackground(win->display, DefaultGC(win->display, 0),
win->textback.pixel);
-
+
XDrawImageString(win->display, win->jailwin,
DefaultGC(win->display, 0),
(JAIL_WIDTH - i) / 2, 20, JAIL_HEADER,
@@ -96,7 +96,7 @@ jail_draw(win)
FillSolid);
XSetFunction(win->display, DefaultGC(win->display, 0),
GXcopy);
-
+
for (i = 0; i < 16; i++)
if (pos[i]) {
p.color = WHITE;
@@ -105,7 +105,7 @@ jail_draw(win)
tmpPM = XCreateBitmapFromData(win->display,
win->jailwin, bits,
32, 32);
-
+
XCopyPlane(win->display, tmpPM, win->jailwin,
DefaultGC(win->display, 0),
0, 0, 32, 32,
@@ -127,7 +127,7 @@ jail_draw(win)
tmpPM = XCreateBitmapFromData(win->display,
win->jailwin, bits,
32, 32);
-
+
XCopyPlane(win->display, tmpPM, win->jailwin,
DefaultGC(win->display, 0),
0, 0, 32, 32,
@@ -151,7 +151,7 @@ jail_add(p)
int i = piecepos(p, false);
char *bits;
Pixmap tmpPM;
-
+
pos[i] = true;
bits = bitsget(p);
@@ -165,14 +165,14 @@ jail_add(p)
tmpPM = XCreateBitmapFromData(win1->display,
win1->jailwin, bits,
32, 32);
-
+
XCopyPlane(win1->display, tmpPM, win1->jailwin,
DefaultGC(win1->display, 0),
0, 0, 32, 32,
5 + (i % 8) * 32, ((i >= 16) ? 30 : 25) + (i / 8) * 32,
1);
XFreePixmap(win1->display, tmpPM);
-
+
if (!oneboard) {
XSetState(win2->display, DefaultGC(win2->display, 0),
win2->blackpiece.pixel,
@@ -184,7 +184,7 @@ jail_add(p)
tmpPM = XCreateBitmapFromData(win2->display,
win2->jailwin, bits,
32, 32);
-
+
XCopyPlane(win2->display, tmpPM, win2->jailwin,
DefaultGC(win2->display, 0),
0, 0, 32, 32,
diff --git a/gnu/games/chess/Xchess/message.c b/gnu/games/chess/Xchess/message.c
index 8b85e9c77f83..26df73974c26 100644
--- a/gnu/games/chess/Xchess/message.c
+++ b/gnu/games/chess/Xchess/message.c
@@ -20,8 +20,8 @@ file named COPYING. Among other things, the copyright notice
and this notice must be preserved on all copies. */
-/* RCS Info: $Revision: 1.4 $ on $Date: 86/11/26 12:10:22 $
- * $Source: /users/faustus/xchess/RCS/message.c,v $
+/* RCS Info: $Revision: 1.1.1.1 $ on $Date: 1993/06/12 14:41:14 $
+ * $Source: /home/ncvs/src/gnu/games/chess/Xchess/message.c,v $
* Copyright (c) 1986 Wayne A. Christopher, U. C. Berkeley CAD Group
* Permission is granted to do anything with this code except sell it
* or remove this message.
@@ -38,7 +38,7 @@ void
message_init(win)
windata *win;
{
- TxtGrab(win->display, win->messagewin, "xchess", win->medium,
+ TxtGrab(win->display, win->messagewin, "xchess", win->medium,
win->textback.pixel, win->textcolor.pixel,
win->cursorcolor.pixel);
TxtAddFont(win->display, win->messagewin, 1, win->large, win->textcolor.pixel);
diff --git a/gnu/games/chess/Xchess/parse.c b/gnu/games/chess/Xchess/parse.c
index c66cc38bdbfe..2dd94edc02d2 100644
--- a/gnu/games/chess/Xchess/parse.c
+++ b/gnu/games/chess/Xchess/parse.c
@@ -19,8 +19,8 @@ file named COPYING. Among other things, the copyright notice
and this notice must be preserved on all copies. */
-/* RCS Info: $Revision: 1.2 $ on $Date: 86/11/23 17:17:59 $
- * $Source: /users/faustus/xchess/RCS/parse.c,v $
+/* RCS Info: $Revision: 1.1.1.1 $ on $Date: 1993/06/12 14:41:06 $
+ * $Source: /home/ncvs/src/gnu/games/chess/Xchess/parse.c,v $
* Copyright (c) 1986 Wayne A. Christopher, U. C. Berkeley CAD Group
* Permission is granted to do anything with this code except sell it
* or remove this message.
@@ -71,7 +71,7 @@ load_game(file)
message_add(win1, buf, false);
if (!oneboard)
message_add(win2, buf, false);
-
+
fgets(buf, BSIZE, fp);
if (eq(buf, "\tenglish\n"))
eflag = true;
@@ -106,7 +106,7 @@ load_game(file)
while (fgets(buf, BSIZE, fp))
message_add(win1, buf, false);
-
+
fclose(fp);
return;
@@ -179,7 +179,7 @@ parse_file(fp, b, english)
* name followed by a row number. If the column name is kr, kn, kb, k, q,
* qb, qn, or qr, then the row number is according to the english system,
* or if it is a-h then it is according to the international system.
- *
+ *
*** As of now the spec must include the position.
*/
@@ -380,7 +380,7 @@ if (debug) fprintf(stderr, "(alg) parsing %s\n", buf);
else if ((m->piece.type == KING) && (m->fromy == m->toy) &&
(m->fromx == 4) && (m->tox == 2))
m->type = QCASTLE;
-
+
return (m);
}
diff --git a/gnu/games/chess/Xchess/popup.c b/gnu/games/chess/Xchess/popup.c
index 2e19ee5b4c35..0995638b359b 100644
--- a/gnu/games/chess/Xchess/popup.c
+++ b/gnu/games/chess/Xchess/popup.c
@@ -20,9 +20,9 @@ file named COPYING. Among other things, the copyright notice
and this notice must be preserved on all copies. */
-/* RCS Info: $Revision: 1.2 $ on $Date: 86/11/26 12:10:38 $
- * $Source: /users/faustus/xchess/RCS/popup.c,v $
- * Copyright (c) 1986 Wayne A. Christopher, U. C. Berkeley CAD Group
+/* RCS Info: $Revision: 1.1.1.1 $ on $Date: 1993/06/12 14:41:13 $
+ * $Source: /home/ncvs/src/gnu/games/chess/Xchess/popup.c,v $
+ * Copyright (c) 1986 Wayne A. Christopher, U. C. Berkeley CAD Group
* faustus@cad.berkeley.edu, ucbvax!faustus
* Permission is granted to modify and re-distribute this code in any manner
* as long as this notice is preserved. All standard disclaimers apply.
@@ -75,7 +75,7 @@ pop_question(win, text)
XMapRaised(win->display, w);
XSetFont(win->display, DefaultGC(win->display, 0),
win->medium->fid);
-
+
for (i = 0, s = text; i < nlines - 4; i++) {
for (t = s, j = 0; *t && (*t != '\n'); t++, j++)
;
diff --git a/gnu/games/chess/Xchess/program.c b/gnu/games/chess/Xchess/program.c
index c1ec0aca64bb..e2eb186f98ed 100644
--- a/gnu/games/chess/Xchess/program.c
+++ b/gnu/games/chess/Xchess/program.c
@@ -20,7 +20,7 @@ file named COPYING. Among other things, the copyright notice
and this notice must be preserved on all copies. */
-/* RCS Info: $Revision: 1.2 $ on $Date: 1994/01/07 11:10:40 $
+/* RCS Info: $Revision: 1.3 $ on $Date: 1994/11/04 02:11:30 $
* $Source: /home/ncvs/src/gnu/games/chess/Xchess/program.c,v $
* Copyright (c) 1986 Wayne A. Christopher, U. C. Berkeley CAD Group
* Permission is granted to do anything with this code except sell it
@@ -62,7 +62,7 @@ program_init(name)
sprintf (moves, "%d", movesperunit);
if (proghost)
execl("/usr/ucb/rsh", "rsh", proghost, name,
- moves, time,
+ moves, time,
(char *) NULL);
else
execl(name, name, moves, time, (char *) NULL);
diff --git a/gnu/games/chess/Xchess/record.c b/gnu/games/chess/Xchess/record.c
index d9459b3a64f0..b2fcea157635 100644
--- a/gnu/games/chess/Xchess/record.c
+++ b/gnu/games/chess/Xchess/record.c
@@ -20,8 +20,8 @@ file named COPYING. Among other things, the copyright notice
and this notice must be preserved on all copies. */
-/* RCS Info: $Revision: 1.4 $ on $Date: 86/11/23 17:18:20 $
- * $Source: /users/faustus/xchess/RCS/record.c,v $
+/* RCS Info: $Revision: 1.1.1.1 $ on $Date: 1993/06/12 14:41:09 $
+ * $Source: /home/ncvs/src/gnu/games/chess/Xchess/record.c,v $
* Copyright (c) 1986 Wayne A. Christopher, U. C. Berkeley CAD Group
* Permission is granted to do anything with this code except sell it
* or remove this message.
@@ -56,7 +56,7 @@ record_init(win)
i = XTextWidth(win->medium, RECORD_HEADER,
sizeof(RECORD_HEADER) - 1);
i = (40 * win->small->max_bounds.width - i *
- win->medium->max_bounds.width) /
+ win->medium->max_bounds.width) /
win->medium->max_bounds.width / 2;
TxtGrab(win->display, win->recwin, "xchess", win->small, win->textback.pixel,
win->textcolor.pixel, win->cursorcolor.pixel);
@@ -64,7 +64,7 @@ record_init(win)
for (; i > 0; i++)
TxtWriteStr(win->display, win->recwin, " ");
TxtWriteStr(win->display, win->recwin, RECORD_HEADER);
-
+
if (saveflag) {
if (!(backup = fopen(record_file, "w"))) {
perror(record_file);
@@ -72,7 +72,7 @@ record_init(win)
} else {
fprintf(backup, "X Chess -- %s\n", datestring());
if (dispname2)
- fprintf(backup, "\tWhite on %s, black on %s\n",
+ fprintf(backup, "\tWhite on %s, black on %s\n",
dispname1, dispname2);
else
fprintf(backup, "\tGame played on %s\n",
@@ -136,7 +136,7 @@ record_save()
}
fprintf(fp, "X Chess -- %s\n", datestring());
if (dispname2)
- fprintf(fp, "\tWhite on %s, black on %s\n",
+ fprintf(fp, "\tWhite on %s, black on %s\n",
dispname1, dispname2);
else
fprintf(fp, "\tGame played on %s\n", dispname1);
@@ -201,7 +201,7 @@ record_back()
s = buf;
for (i = 0; *s != '\0'; i++)
*s++ = ''; /* control H, backspace */
-
+
TxtWriteStr(win1->display, win1->recwin, buf);
if (!oneboard) {
TxtWriteStr(win2->display, win2->recwin, buf);
@@ -279,9 +279,9 @@ movestring(m)
sprintf(buf, "something strange");
break;
}
- if ((m->piece.type == PAWN) && (((m->piece.color == BLACK) &&
+ if ((m->piece.type == PAWN) && (((m->piece.color == BLACK) &&
(m->toy == 7)) || ((m->piece.color == WHITE) &&
- (m->toy == 0))))
+ (m->toy == 0))))
strcat(buf, "(Q)");
#ifdef smartass
diff --git a/gnu/games/chess/Xchess/scrollText.c b/gnu/games/chess/Xchess/scrollText.c
index ace88a722e4e..b8484dda4eb4 100644
--- a/gnu/games/chess/Xchess/scrollText.c
+++ b/gnu/games/chess/Xchess/scrollText.c
@@ -1,7 +1,7 @@
/*
* A Scrollable Text Output Window
*
- * David Harrison
+ * David Harrison
* University of California, Berkeley
* 1986
*
@@ -204,7 +204,7 @@ int bg, fg, cur; /* Background, foreground, and cursor colors */
XWindowAttributes winInfo; /* Window information */
int index;
XGCValues gc_val;
-
+
if (textWindows == (XAssocTable *) 0) {
textWindows = XCreateAssocTable(32);
if (textWindows == (XAssocTable *) 0) return(0);
@@ -259,7 +259,7 @@ int bg, fg, cur; /* Background, foreground, and cursor colors */
winInfo.width - BARSIZE,
0, BARSIZE - (2*BARBORDER),
winInfo.height - (2*BARBORDER),
- BARBORDER,
+ BARBORDER,
fg, bg);
XSelectInput(display, newWin->scrollBar, ExposureMask|ButtonReleaseMask);
XMapRaised(display, newWin->scrollBar);
@@ -302,7 +302,7 @@ int bg, fg, cur; /* Background, foreground, and cursor colors */
newWin->fontGC[index] = 0;
}
-
+
/* Initialize size of first line */
newWin->txtBuffer[0]->lineHeight = newWin->theFonts[0].ascent +
newWin->theFonts[0].descent;
@@ -391,7 +391,7 @@ struct txtWin *textInfo; /* Text window information */
(startPos > 0) && (textInfo->mainBuffer[startPos] != '\n');
startPos--)
/* null loop body */;
-
+
/* Clear out the old line start array */
for (index = 0; index < textInfo->numLines; index++) {
InitLine(textInfo->txtBuffer[index]);
@@ -411,7 +411,7 @@ struct txtWin *textInfo; /* Text window information */
curfont = 0;
for (index = 0; index < textInfo->bufSpot; index++) {
theChar = bufptr[index] & CHARMASK;
-
+
if ((bufptr[index] & FONTMASK) != curfont) {
int newFontNum, heightDiff;
@@ -503,7 +503,7 @@ int newColor; /* Color of font */
struct txtWin *textInfo;
int redrawFlag;
XGCValues gc_val;
-
+
if ((fontNumber < 0) || (fontNumber >= MAXFONTS)) return 0;
if ((textInfo = (struct txtWin *)
XLookUpAssoc(display, textWindows, (XID) textWin)) == 0)
@@ -518,7 +518,7 @@ int newColor; /* Color of font */
gc_val.plane_mask = AllPlanes;
gc_val.graphics_exposures = 1;
gc_val.function = GXcopy;
-
+
if (textInfo->fontGC[fontNumber] != 0)
{
XChangeGC(display, textInfo->fontGC[fontNumber],
@@ -532,7 +532,7 @@ int newColor; /* Color of font */
GCFunction |
GCPlaneMask |
GCGraphicsExposures,
- &gc_val);
+ &gc_val);
redrawFlag = (textInfo->theFonts[fontNumber].fid != 0) &&
@@ -622,7 +622,7 @@ struct txtWin *textInfo; /* Text window information */
if (bottom == textInfo->h-(2*BARBORDER)) bottom--;
XFillRectangle(display, textInfo->scrollBar,
- textInfo->bgGC,
+ textInfo->bgGC,
0, 0, BARSIZE, top-1);
#ifdef __FreeBSD__
XFillRectangle(display, textInfo->scrollBar,
@@ -648,7 +648,7 @@ Display *display;
Window w;
/*
* This routine clears a scrollable text window. It resets the current
- * writing position to the upper left hand corner of the screen.
+ * writing position to the upper left hand corner of the screen.
* NOTE: THIS ALSO CLEARS THE CONTENTS OF THE TEXT WINDOW BUFFER AND
* RESETS THE SCROLL BAR. Returns 0 if the window is not a text window.
* This should be used *instead* of XClear.
@@ -674,7 +674,7 @@ Window w;
textInfo->endLine = 0;
textInfo->curLine = 0;
textInfo->curX = 0;
- textInfo->curY = YPADDING + textInfo->theFonts[textInfo->curFont].ascent
+ textInfo->curY = YPADDING + textInfo->theFonts[textInfo->curFont].ascent
+ textInfo->theFonts[textInfo->curFont].descent;
textInfo->bottomSpace = textInfo->h - YPADDING -
@@ -1119,7 +1119,7 @@ int ypos; /* Y position for line */
curX += CharSize(textInfo, lineIndex, index);
glyph++;
}
-
+
/* Flush out the glyphs */
XFillRectangle(display, textInfo->mainWindow,
textInfo->bgGC,
@@ -1191,7 +1191,7 @@ int flagWord; /* DODISP or nothing */
if ((textInfo->curY + thisLine->lineHeight + heightDiff +
INTERLINE) > textInfo->h)
{
- /*
+ /*
* General approach: "unscroll" the last line up
* and then call ScrollDown to do the right thing.
*/
@@ -1210,7 +1210,7 @@ int flagWord; /* DODISP or nothing */
(textInfo->bottomSpace + INTERLINE +
thisLine->lineHeight);
}
- else
+ else
{
/* Just update bottom space */
textInfo->bottomSpace -= heightDiff;
@@ -1251,7 +1251,7 @@ register char *str; /* 0 terminated string */
* - A new font can be chosen using the sequence '^F<digit>' where
* <digit> is 0-7. The directive will be ignored if
* there is no font in the specified slot.
- * Returns 0 if something went wrong.
+ * Returns 0 if something went wrong.
*/
{
register int fontIndex;
@@ -1260,7 +1260,7 @@ register char *str; /* 0 terminated string */
if ((textInfo = (struct txtWin *) XLookUpAssoc(display, textWindows, (XID) w)) == 0)
return 0;
-
+
/* See if screen needs to be updated */
if (textInfo->flagWord & SCREENWRONG) {
TxtRepaint(display, textInfo->mainWindow);
@@ -1292,7 +1292,7 @@ register char *str; /* 0 terminated string */
continue;
}
}
-
+
/* Inline code for handling normal character case */
if ((*str >= LOWCHAR) && (*str <= HIGHCHAR)) {
register XFontStruct *thisFont;
@@ -1324,21 +1324,21 @@ register char *str; /* 0 terminated string */
HandleNewLine(display, textInfo, DODISP | NONEWLINE);
thisLine = textInfo->txtBuffer[textInfo->curLine];
}
-
+
/* Ready to draw character */
XDrawString(display, textInfo->mainWindow,
- DEFAULT_GC,
+ DEFAULT_GC,
textInfo->curX += charWidth,
- textInfo->curY + thisLine->lineHeight,
+ textInfo->curY + thisLine->lineHeight,
str, 1);
-
+
/* Append character onto main buffer */
if (textInfo->bufSpot >= textInfo->bufAlloc)
/* Make room for more characters */
ExpandBuffer(textInfo);
textInfo->mainBuffer[(textInfo->bufSpot)++] =
(textInfo->curFont << FONTSHIFT) | (*str);
-
+
/* Update the line start array */
thisLine->lineLength += 1;
thisLine->lineWidth += charWidth;
@@ -1384,7 +1384,7 @@ register char *str; /* NULL terminated string */
if ((textInfo = (struct txtWin *) XLookUpAssoc(display, textWindows, (XID) w)
) == 0)
return 0;
-
+
for ( /* str is ok */ ; (*str != 0) ; str++) {
/* Check to see if we are waiting on a font */
if (textInfo->flagWord & FONTNUMWAIT) {
@@ -1402,7 +1402,7 @@ register char *str; /* NULL terminated string */
register XFontStruct *thisFont;
register struct txtLine *thisLine;
register int charWidth;
-
+
/* Determine size of character */
thisFont = &(textInfo->theFonts[textInfo->curFont]);
@@ -1429,7 +1429,7 @@ register char *str; /* NULL terminated string */
ExpandBuffer(textInfo);
textInfo->mainBuffer[(textInfo->bufSpot)++] =
(textInfo->curFont << FONTSHIFT) | (*str);
-
+
/* Update the line start array */
thisLine->lineLength += 1;
thisLine->lineWidth += charWidth;
@@ -1455,7 +1455,7 @@ Display *display;
Window w;
/*
* Repaints the given scrollable text window. The routine repaints
- * the entire window. For handling exposure events, the TxtFilter
+ * the entire window. For handling exposure events, the TxtFilter
* routine should be used.
*/
{
@@ -1589,7 +1589,7 @@ struct txtWin *textInfo; /* Text window information */
0, textInfo->h - textInfo->bottomSpace,
textInfo->w, textInfo->bottomSpace);
#endif
-
+
UpdateExposures(display, textInfo);
UpdateScroll(display, textInfo);
@@ -1774,7 +1774,7 @@ XEvent *evt;
return 0;
if ((textInfo = (struct txtWin *)
- XLookUpAssoc(display, textWindows, (XID) w)) == 0)
+ XLookUpAssoc(display, textWindows, (XID) w)) == 0)
return 0;
/* Determine whether it's main window or not */
diff --git a/gnu/games/chess/Xchess/scrollText/scrollText.c b/gnu/games/chess/Xchess/scrollText/scrollText.c
index 432071086d15..aefb5999b2fd 100644
--- a/gnu/games/chess/Xchess/scrollText/scrollText.c
+++ b/gnu/games/chess/Xchess/scrollText/scrollText.c
@@ -1,7 +1,7 @@
/*
* A Scrollable Text Output Window
*
- * David Harrison
+ * David Harrison
* University of California, Berkeley
* 1986
*
@@ -204,7 +204,7 @@ int bg, fg, cur; /* Background, foreground, and cursor colors */
XWindowAttributes winInfo; /* Window information */
int index;
XGCValues gc_val;
-
+
if (textWindows == (XAssocTable *) 0) {
textWindows = XCreateAssocTable(32);
if (textWindows == (XAssocTable *) 0) return(0);
@@ -259,7 +259,7 @@ int bg, fg, cur; /* Background, foreground, and cursor colors */
winInfo.width - BARSIZE,
0, BARSIZE - (2*BARBORDER),
winInfo.height - (2*BARBORDER),
- BARBORDER,
+ BARBORDER,
fg, bg);
XSelectInput(display, newWin->scrollBar, ExposureMask|ButtonReleaseMask);
XMapRaised(display, newWin->scrollBar);
@@ -302,7 +302,7 @@ int bg, fg, cur; /* Background, foreground, and cursor colors */
newWin->fontGC[index] = 0;
}
-
+
/* Initialize size of first line */
newWin->txtBuffer[0]->lineHeight = newWin->theFonts[0].ascent +
newWin->theFonts[0].descent;
@@ -391,7 +391,7 @@ struct txtWin *textInfo; /* Text window information */
(startPos > 0) && (textInfo->mainBuffer[startPos] != '\n');
startPos--)
/* null loop body */;
-
+
/* Clear out the old line start array */
for (index = 0; index < textInfo->numLines; index++) {
InitLine(textInfo->txtBuffer[index]);
@@ -411,7 +411,7 @@ struct txtWin *textInfo; /* Text window information */
curfont = 0;
for (index = 0; index < textInfo->bufSpot; index++) {
theChar = bufptr[index] & CHARMASK;
-
+
if ((bufptr[index] & FONTMASK) != curfont) {
int newFontNum, heightDiff;
@@ -503,7 +503,7 @@ int newColor; /* Color of font */
struct txtWin *textInfo;
int redrawFlag;
XGCValues gc_val;
-
+
if ((fontNumber < 0) || (fontNumber >= MAXFONTS)) return 0;
if ((textInfo = (struct txtWin *)
XLookUpAssoc(display, textWindows, (XID) textWin)) == 0)
@@ -518,7 +518,7 @@ int newColor; /* Color of font */
gc_val.plane_mask = AllPlanes;
gc_val.graphics_exposures = 1;
gc_val.function = GXcopy;
-
+
if (textInfo->fontGC[fontNumber] != 0)
{
XChangeGC(display, textInfo->fontGC[fontNumber],
@@ -532,7 +532,7 @@ int newColor; /* Color of font */
GCFunction |
GCPlaneMask |
GCGraphicsExposures,
- &gc_val);
+ &gc_val);
redrawFlag = (textInfo->theFonts[fontNumber].fid != 0) &&
@@ -622,7 +622,7 @@ struct txtWin *textInfo; /* Text window information */
if (bottom == textInfo->h-(2*BARBORDER)) bottom--;
XFillRectangle(display, textInfo->scrollBar,
- textInfo->bgGC,
+ textInfo->bgGC,
0, 0, BARSIZE, top-1);
XFillRectangle(display, textInfo->scrollBar,
DEFAULT_GC, top, BARSIZE - (2*BARBORDER) - 2,
@@ -642,7 +642,7 @@ Display *display;
Window w;
/*
* This routine clears a scrollable text window. It resets the current
- * writing position to the upper left hand corner of the screen.
+ * writing position to the upper left hand corner of the screen.
* NOTE: THIS ALSO CLEARS THE CONTENTS OF THE TEXT WINDOW BUFFER AND
* RESETS THE SCROLL BAR. Returns 0 if the window is not a text window.
* This should be used *instead* of XClear.
@@ -668,7 +668,7 @@ Window w;
textInfo->endLine = 0;
textInfo->curLine = 0;
textInfo->curX = 0;
- textInfo->curY = YPADDING + textInfo->theFonts[textInfo->curFont].ascent
+ textInfo->curY = YPADDING + textInfo->theFonts[textInfo->curFont].ascent
+ textInfo->theFonts[textInfo->curFont].descent;
textInfo->bottomSpace = textInfo->h - YPADDING -
@@ -1106,7 +1106,7 @@ int ypos; /* Y position for line */
curX += CharSize(textInfo, lineIndex, index);
glyph++;
}
-
+
/* Flush out the glyphs */
XFillRectangle(display, textInfo->mainWindow,
textInfo->bgGC,
@@ -1178,7 +1178,7 @@ int flagWord; /* DODISP or nothing */
if ((textInfo->curY + thisLine->lineHeight + heightDiff +
INTERLINE) > textInfo->h)
{
- /*
+ /*
* General approach: "unscroll" the last line up
* and then call ScrollDown to do the right thing.
*/
@@ -1197,7 +1197,7 @@ int flagWord; /* DODISP or nothing */
(textInfo->bottomSpace + INTERLINE +
thisLine->lineHeight);
}
- else
+ else
{
/* Just update bottom space */
textInfo->bottomSpace -= heightDiff;
@@ -1238,7 +1238,7 @@ register char *str; /* 0 terminated string */
* - A new font can be chosen using the sequence '^F<digit>' where
* <digit> is 0-7. The directive will be ignored if
* there is no font in the specified slot.
- * Returns 0 if something went wrong.
+ * Returns 0 if something went wrong.
*/
{
register int fontIndex;
@@ -1247,7 +1247,7 @@ register char *str; /* 0 terminated string */
if ((textInfo = (struct txtWin *) XLookUpAssoc(display, textWindows, (XID) w)) == 0)
return 0;
-
+
/* See if screen needs to be updated */
if (textInfo->flagWord & SCREENWRONG) {
TxtRepaint(display, textInfo->mainWindow);
@@ -1279,7 +1279,7 @@ register char *str; /* 0 terminated string */
continue;
}
}
-
+
/* Inline code for handling normal character case */
if ((*str >= LOWCHAR) && (*str <= HIGHCHAR)) {
register XFontStruct *thisFont;
@@ -1311,21 +1311,21 @@ register char *str; /* 0 terminated string */
HandleNewLine(display, textInfo, DODISP | NONEWLINE);
thisLine = textInfo->txtBuffer[textInfo->curLine];
}
-
+
/* Ready to draw character */
XDrawString(display, textInfo->mainWindow,
- DEFAULT_GC,
+ DEFAULT_GC,
textInfo->curX += charWidth,
- textInfo->curY + thisLine->lineHeight,
+ textInfo->curY + thisLine->lineHeight,
str, 1);
-
+
/* Append character onto main buffer */
if (textInfo->bufSpot >= textInfo->bufAlloc)
/* Make room for more characters */
ExpandBuffer(textInfo);
textInfo->mainBuffer[(textInfo->bufSpot)++] =
(textInfo->curFont << FONTSHIFT) | (*str);
-
+
/* Update the line start array */
thisLine->lineLength += 1;
thisLine->lineWidth += charWidth;
@@ -1371,7 +1371,7 @@ register char *str; /* NULL terminated string */
if ((textInfo = (struct txtWin *) XLookUpAssoc(display, textWindows, (XID) w)
) == 0)
return 0;
-
+
for ( /* str is ok */ ; (*str != 0) ; str++) {
/* Check to see if we are waiting on a font */
if (textInfo->flagWord & FONTNUMWAIT) {
@@ -1389,7 +1389,7 @@ register char *str; /* NULL terminated string */
register XFontStruct *thisFont;
register struct txtLine *thisLine;
register int charWidth;
-
+
/* Determine size of character */
thisFont = &(textInfo->theFonts[textInfo->curFont]);
@@ -1416,7 +1416,7 @@ register char *str; /* NULL terminated string */
ExpandBuffer(textInfo);
textInfo->mainBuffer[(textInfo->bufSpot)++] =
(textInfo->curFont << FONTSHIFT) | (*str);
-
+
/* Update the line start array */
thisLine->lineLength += 1;
thisLine->lineWidth += charWidth;
@@ -1442,7 +1442,7 @@ Display *display;
Window w;
/*
* Repaints the given scrollable text window. The routine repaints
- * the entire window. For handling exposure events, the TxtFilter
+ * the entire window. For handling exposure events, the TxtFilter
* routine should be used.
*/
{
@@ -1570,7 +1570,7 @@ struct txtWin *textInfo; /* Text window information */
XClearArea(display, textInfo->mainWindow,
0, textInfo->h - textInfo->bottomSpace,
textInfo->w, textInfo->bottomSpace);
-
+
UpdateExposures(display, textInfo);
UpdateScroll(display, textInfo);
@@ -1755,7 +1755,7 @@ XEvent *evt;
return 0;
if ((textInfo = (struct txtWin *)
- XLookUpAssoc(display, textWindows, (XID) w)) == 0)
+ XLookUpAssoc(display, textWindows, (XID) w)) == 0)
return 0;
/* Determine whether it's main window or not */
diff --git a/gnu/games/chess/Xchess/std.c b/gnu/games/chess/Xchess/std.c
index 1aa9e8389186..2bbd113d65cf 100644
--- a/gnu/games/chess/Xchess/std.c
+++ b/gnu/games/chess/Xchess/std.c
@@ -20,7 +20,7 @@ file named COPYING. Among other things, the copyright notice
and this notice must be preserved on all copies. */
-/* RCS Info: $Revision: 1.2 $ on $Date: 1994/01/07 11:10:42 $
+/* RCS Info: $Revision: 1.3 $ on $Date: 1994/11/04 02:11:33 $
* $Source: /home/ncvs/src/gnu/games/chess/Xchess/std.c,v $
* Copyright (c) 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
*
@@ -62,7 +62,7 @@ copy(str)
char *str;
{
char *p, *tmalloc();
-
+
p = tmalloc(strlen(str) + 1);
strcpy(p, str);
return(p);
@@ -90,7 +90,7 @@ substring(sub, str)
}
/* Malloc num bytes and initialize to zero. Fatal error if the space can't
- * be malloc'd.
+ * be malloc'd.
*/
char *
@@ -375,7 +375,7 @@ setenv(name, value)
environ = xx;
} else
xx = environ;
-
+
xx[i] = tmalloc(strlen(name) + strlen(value) + 2);
sprintf(xx[i], "%s=%s", name, value);
return;
diff --git a/gnu/games/chess/Xchess/valid.c b/gnu/games/chess/Xchess/valid.c
index 3dcdb004d320..06d1f29b067d 100644
--- a/gnu/games/chess/Xchess/valid.c
+++ b/gnu/games/chess/Xchess/valid.c
@@ -20,8 +20,8 @@ file named COPYING. Among other things, the copyright notice
and this notice must be preserved on all copies. */
-/* RCS Info: $Revision: 1.3 $ on $Date: 86/11/23 17:18:35 $
- * $Source: /users/faustus/xchess/RCS/valid.c,v $
+/* RCS Info: $Revision: 1.1.1.1 $ on $Date: 1993/06/12 14:41:08 $
+ * $Source: /home/ncvs/src/gnu/games/chess/Xchess/valid.c,v $
* Copyright (c) 1986 Wayne A. Christopher, U. C. Berkeley CAD Group
* Permission is granted to do anything with this code except sell it
* or remove this message.
@@ -49,10 +49,10 @@ valid_move(m, b)
board_move(&tb, m);
if (ischeck(&tb, m->piece.color))
return (false);
-
+
if (ischeck(&tb, ((m->piece.color == WHITE) ? BLACK : WHITE)))
m->check = true;
-
+
return (true);
}
@@ -66,7 +66,7 @@ couldmove(m, b)
switch (m->type) {
case KCASTLE:
if ((m->piece.color == WHITE) && (b->white_cant_castle_k) ||
- (m->piece.color == BLACK) &&
+ (m->piece.color == BLACK) &&
(b->black_cant_castle_k))
return (false);
if ((b->square[m->fromy][5].color != NONE) ||
@@ -78,7 +78,7 @@ couldmove(m, b)
case QCASTLE:
if ((m->piece.color == WHITE) && (b->white_cant_castle_q) ||
- (m->piece.color == BLACK) &&
+ (m->piece.color == BLACK) &&
(b->black_cant_castle_q))
return (false);
if ((b->square[m->fromy][1].color != NONE) ||
@@ -129,7 +129,7 @@ couldmove(m, b)
*/
if (m->enpassant) {
if (b->square[(m->piece.color == WHITE)
- ? 3 : 4][m->tox].color ==
+ ? 3 : 4][m->tox].color ==
((m->piece.color == WHITE) ?
BLACK : WHITE))
break;
diff --git a/gnu/games/chess/Xchess/window.c b/gnu/games/chess/Xchess/window.c
index 4aae06d9ad90..c33ef812d806 100644
--- a/gnu/games/chess/Xchess/window.c
+++ b/gnu/games/chess/Xchess/window.c
@@ -19,8 +19,8 @@ file named COPYING. Among other things, the copyright notice
and this notice must be preserved on all copies. */
-/* RCS Info: $Revision: 1.5 $ on $Date: 86/11/26 12:11:15 $
- * $Source: /users/faustus/xchess/RCS/window.c,v $
+/* RCS Info: $Revision: 1.1.1.1 $ on $Date: 1993/06/12 14:41:08 $
+ * $Source: /home/ncvs/src/gnu/games/chess/Xchess/window.c,v $
* Copyright (c) 1986 Wayne A. Christopher, U. C. Berkeley CAD Group
* Permission is granted to do anything with this code except sell it
* or remove this message.
@@ -89,7 +89,7 @@ win_setup(disp1, disp2)
win2->flipped = true;
win_drawboard(win2);
}
-
+
return(true);
}
@@ -199,7 +199,7 @@ win_drawpiece(p, y, x, wnum)
XSetState(win->display, DefaultGC(win->display, 0),
BlackPixel(win->display, 0),
WhitePixel(win->display, 0), GXcopy, AllPlanes);
-
+
tmpPM = XCreateBitmapFromData(win->display, win->boardwin,
shade_bits, SQUARE_WIDTH, SQUARE_HEIGHT);
@@ -209,7 +209,7 @@ win_drawpiece(p, y, x, wnum)
y * (SQUARE_HEIGHT + BORDER_WIDTH), 1);
XFreePixmap(win->display, tmpPM);
-
+
XSetFunction(win->display, DefaultGC(win->display, 0),
GXandInverted);
maskPM = XCreateBitmapFromData(win->display, win->boardwin,
@@ -268,16 +268,16 @@ win_drawpiece(p, y, x, wnum)
gc.background = win->blacksquare.pixel;
gc.font = win->small->fid;
-
+
XChangeGC(win->display, DefaultGC(win->display, 0),
GCForeground | GCBackground | GCFont, &gc);
-
+
if (!x) {
sprintf(buf, " %d", SIZE - y);
XDrawImageString(win->display, win->boardwin,
DefaultGC(win->display, 0),
- 1, (y + 1) * (SQUARE_HEIGHT +
- BORDER_WIDTH) - BORDER_WIDTH +
+ 1, (y + 1) * (SQUARE_HEIGHT +
+ BORDER_WIDTH) - BORDER_WIDTH +
win->small->max_bounds.ascent - 1, buf, 2);
}
if (y == SIZE - 1) {
@@ -285,7 +285,7 @@ win_drawpiece(p, y, x, wnum)
XDrawImageString(win->display, win->boardwin,
DefaultGC(win->display, 0),
x * (SQUARE_WIDTH + BORDER_WIDTH) + 1,
- SIZE * (SQUARE_HEIGHT + BORDER_WIDTH) - BORDER_WIDTH +
+ SIZE * (SQUARE_HEIGHT + BORDER_WIDTH) - BORDER_WIDTH +
win->small->max_bounds.ascent - 1, buf, 1);
}
}
@@ -301,12 +301,12 @@ win_erasepiece(y, x, wnum)
char buf[BSIZE];
XGCValues gc;
Pixmap tmpPM;
-
+
if (oneboard || (wnum == win1->color))
win = win1;
else
win = win2;
-
+
if (win->flipped) {
y = SIZE - y - 1;
x = SIZE - x - 1;
@@ -354,16 +354,16 @@ win_erasepiece(y, x, wnum)
gc.background = win->blacksquare.pixel;
gc.font = win->small->fid;
-
+
XChangeGC(win->display, DefaultGC(win->display, 0),
GCForeground | GCBackground | GCFont, &gc);
-
+
if (!x) {
sprintf(buf, " %d", SIZE - y);
XDrawImageString(win->display, win->boardwin,
DefaultGC(win->display, 0),
- 1, (y + 1) * (SQUARE_HEIGHT +
- BORDER_WIDTH) - BORDER_WIDTH +
+ 1, (y + 1) * (SQUARE_HEIGHT +
+ BORDER_WIDTH) - BORDER_WIDTH +
win->small->max_bounds.ascent - 1, buf, 2);
}
if (y == SIZE - 1) {
@@ -371,11 +371,11 @@ win_erasepiece(y, x, wnum)
XDrawImageString(win->display, win->boardwin,
DefaultGC(win->display, 0),
x * (SQUARE_WIDTH + BORDER_WIDTH) + 1,
- SIZE * (SQUARE_HEIGHT + BORDER_WIDTH) - BORDER_WIDTH +
+ SIZE * (SQUARE_HEIGHT + BORDER_WIDTH) - BORDER_WIDTH +
win->small->max_bounds.ascent - 1, buf, 1);
}
}
-
+
return;
}
@@ -392,7 +392,7 @@ win_flash(m, wnum)
win = win1;
else
win = win2;
-
+
if (win->flipped) {
sx = SIZE - m->fromx - 1;
sy = SIZE - m->fromy - 1;
@@ -417,7 +417,7 @@ win_flash(m, wnum)
DefaultGC(win->display, 0),
sx, sy, ex, ey);
}
-
+
XSetFunction(win->display, DefaultGC(win->display, 0), GXcopy);
return;
}
@@ -598,7 +598,7 @@ win_redraw(win, event)
x2 = SIZE - x1 - 1;
}
- for (i = x1; i <= x2; i++)
+ for (i = x1; i <= x2; i++)
for (j = y1; j <= y2; j++) {
if (chessboard->square[j][i].color == NONE)
win_erasepiece(j, i, WHITE);
@@ -613,7 +613,7 @@ win_redraw(win, event)
j, i, BLACK);
}
}
-
+
return;
}
@@ -627,11 +627,11 @@ setup(dispname, win)
Cursor cur;
extern char *program, *recfile;
XSizeHints xsizes;
-
+
if (!(win->display = XOpenDisplay(dispname)))
return (false);
-
+
/* Now get boolean defaults... */
if ((s = XGetDefault(win->display, program, "noisy")) && eq(s, "on"))
@@ -646,13 +646,13 @@ setup(dispname, win)
quickflag = true;
if ((s = XGetDefault(win->display, program, "flash")) && eq(s, "on"))
win_flashmove = true;
-
+
/* ... numeric variables ... */
if (s = XGetDefault(win->display, program, "numflashes"))
num_flashes = atoi(s);
if (s = XGetDefault(win->display, program, "flashsize"))
flash_size = atoi(s);
-
+
/* ... and strings. */
if (s = XGetDefault(win->display, program, "progname"))
progname = s;
@@ -683,7 +683,7 @@ setup(dispname, win)
if ((DisplayPlanes(win->display, 0) == 1) || bnwflag)
win->bnw = true;
-
+
/* Allocate colors... */
if (win->bnw) {
win->blackpiece.pixel = BlackPixel (win->display, 0);
@@ -699,64 +699,64 @@ setup(dispname, win)
} else {
if (!XParseColor(win->display,
DefaultColormap(win->display, 0),
- black_piece_color, &win->blackpiece) ||
+ black_piece_color, &win->blackpiece) ||
!XParseColor(win->display,
DefaultColormap(win->display, 0),
- white_piece_color, &win->whitepiece) ||
+ white_piece_color, &win->whitepiece) ||
!XParseColor(win->display,
DefaultColormap(win->display, 0),
- black_square_color, &win->blacksquare) ||
+ black_square_color, &win->blacksquare) ||
!XParseColor(win->display,
DefaultColormap(win->display, 0),
- white_square_color, &win->whitesquare) ||
+ white_square_color, &win->whitesquare) ||
!XParseColor(win->display,
DefaultColormap(win->display, 0),
- border_color, &win->border) ||
+ border_color, &win->border) ||
!XParseColor(win->display,
DefaultColormap(win->display, 0),
- text_color, &win->textcolor) ||
+ text_color, &win->textcolor) ||
!XParseColor(win->display,
DefaultColormap(win->display, 0),
- text_back, &win->textback) ||
+ text_back, &win->textback) ||
!XParseColor(win->display,
DefaultColormap(win->display, 0),
- error_text, &win->errortext) ||
+ error_text, &win->errortext) ||
!XParseColor(win->display,
DefaultColormap(win->display, 0),
- player_text, &win->playertext) ||
+ player_text, &win->playertext) ||
!XParseColor(win->display,
DefaultColormap(win->display, 0),
cursor_color, &win->cursorcolor) ||
!XAllocColor(win->display,
DefaultColormap(win->display, 0),
- &win->blackpiece) ||
+ &win->blackpiece) ||
!XAllocColor(win->display,
DefaultColormap(win->display, 0),
- &win->whitepiece) ||
+ &win->whitepiece) ||
!XAllocColor(win->display,
DefaultColormap(win->display, 0),
- &win->blacksquare) ||
+ &win->blacksquare) ||
!XAllocColor(win->display,
DefaultColormap(win->display, 0),
- &win->whitesquare) ||
+ &win->whitesquare) ||
!XAllocColor(win->display,
DefaultColormap(win->display, 0),
- &win->border) ||
+ &win->border) ||
!XAllocColor(win->display,
DefaultColormap(win->display, 0),
- &win->textcolor) ||
+ &win->textcolor) ||
!XAllocColor(win->display,
DefaultColormap(win->display, 0),
- &win->textback) ||
+ &win->textback) ||
!XAllocColor(win->display,
DefaultColormap(win->display, 0),
- &win->errortext) ||
+ &win->errortext) ||
!XAllocColor(win->display,
DefaultColormap(win->display, 0),
- &win->playertext) ||
+ &win->playertext) ||
!XAllocColor(win->display,
DefaultColormap(win->display, 0),
- &win->cursorcolor))
+ &win->cursorcolor))
fprintf(stderr, "Can't get colors...\n");
}
@@ -773,17 +773,17 @@ setup(dispname, win)
NULL)
fprintf(stderr, "Can't get large font...\n");
-
+
/* Create the windows... */
win->basewin =
XCreateSimpleWindow(win->display,DefaultRootWindow(win->display),
- BASE_XPOS, BASE_YPOS,
+ BASE_XPOS, BASE_YPOS,
BASE_WIDTH, BASE_HEIGHT, 0,
BlackPixel(win->display, 0),
- WhitePixel(win->display, 0));
+ WhitePixel(win->display, 0));
win->boardwin = XCreateSimpleWindow(win->display,win->basewin,
- BOARD_XPOS, BOARD_YPOS,
+ BOARD_XPOS, BOARD_YPOS,
BOARD_WIDTH, BOARD_HEIGHT,
BORDER_WIDTH,
win->border.pixel,
@@ -819,7 +819,7 @@ setup(dispname, win)
BUTTON_WIDTH, BUTTON_HEIGHT,
BORDER_WIDTH, win->border.pixel,
win->textback.pixel);
-
+
/* Let's define an icon... */
win->iconpixmap = XCreatePixmapFromBitmapData(win->display,
win->basewin, icon_bits,
@@ -835,7 +835,7 @@ setup(dispname, win)
XSetStandardProperties(win->display, win->basewin,
program, program, win->iconpixmap,
0, NULL, &xsizes);
-
+
bm = XCreateBitmapFromData(win->display,
win->basewin, xchess_bits,
xchess_width, xchess_height);
@@ -848,7 +848,7 @@ setup(dispname, win)
xchess_x_hot, xchess_y_hot);
XFreePixmap(win->display, bm);
XFreePixmap(win->display, bmask);
-
+
XDefineCursor(win->display,win->basewin, cur);
XMapSubwindows(win->display,win->basewin);
@@ -866,7 +866,7 @@ setup(dispname, win)
ButtonReleaseMask | ExposureMask);
XSelectInput(win->display,win->buttonwin,
ButtonPressMask | ExposureMask);
-
+
message_init(win);
record_init(win);
button_draw(win);
@@ -900,12 +900,12 @@ drawgrid(win)
gc.foreground = win->border.pixel;
gc.line_width = 0;
gc.line_style = LineSolid;
-
+
XChangeGC(win->display,
DefaultGC(win->display, 0),
GCFunction | GCPlaneMask | GCForeground |
GCLineWidth | GCLineStyle, &gc);
-
+
/* Draw the lines... horizontal, */
for (i = 1; i < SIZE; i++)
XDrawLine(win->display, win->boardwin,
@@ -923,7 +923,7 @@ drawgrid(win)
i * (SQUARE_WIDTH + BORDER_WIDTH) -
BORDER_WIDTH / 2, 0,
i * (SQUARE_WIDTH + BORDER_WIDTH) -
- BORDER_WIDTH / 2,
+ BORDER_WIDTH / 2,
SIZE * (SQUARE_WIDTH + BORDER_WIDTH));
return;
}
diff --git a/gnu/games/chess/Xchess/xchess.c b/gnu/games/chess/Xchess/xchess.c
index 6de6502ddd28..74d010f2c717 100644
--- a/gnu/games/chess/Xchess/xchess.c
+++ b/gnu/games/chess/Xchess/xchess.c
@@ -20,8 +20,8 @@ file named COPYING. Among other things, the copyright notice
and this notice must be preserved on all copies. */
-/* RCS Info: $Revision: 1.2 $ on $Date: 89/04/28 08:44:02 $
- * $Source: /usr/local/src/source/X.V11R3/contrib/games/xchess/Xchess/RCS/xchess.c,v $
+/* RCS Info: $Revision: 1.1.1.1 $ on $Date: 1993/06/12 14:41:09 $
+ * $Source: /home/ncvs/src/gnu/games/chess/Xchess/xchess.c,v $
* Copyright (c) 1986 Wayne A. Christopher, U. C. Berkeley CAD Group
* Permission is granted to do anything with this code except sell it
* or remove this message.
@@ -82,7 +82,7 @@ main(ac, av)
char *s;
program = av[0];
-
+
#ifdef notdef
signal(SIGCHLD, die);
#endif
@@ -157,7 +157,7 @@ main(ac, av)
if (!dispname2)
oneboard = true;
-
+
srandom(getpid());
if (!oneboard && randflag && (random() % 2)) {
@@ -165,10 +165,10 @@ main(ac, av)
dispname1 = dispname2;
dispname2 = s;
}
-
+
if (!dispname1)
dispname1 = getenv("DISPLAY");
-
+
/* Set up the board. */
board_setup();
diff --git a/gnu/games/chess/gnuchess.c b/gnu/games/chess/gnuchess.c
index da56689289e1..20b32c4d7499 100644
--- a/gnu/games/chess/gnuchess.c
+++ b/gnu/games/chess/gnuchess.c
@@ -1,5 +1,5 @@
/*
- C source for CHESS
+ C source for CHESS
Revision: 4-25-88
@@ -44,7 +44,7 @@
#define neutral 2
#define white 0
-#define black 1
+#define black 1
#define no_piece 0
#define pawn 1
#define knight 2
@@ -164,7 +164,7 @@ short unmap[120]=
40,41,42,43,44,45,46,47,-1,-1,-1,-1,-1,-1,-1,-1,
48,49,50,51,52,53,54,55,-1,-1,-1,-1,-1,-1,-1,-1,
56,57,58,59,60,61,62,63};
-short Dcode[120]=
+short Dcode[120]=
{0,1,1,1,1,1,1,1,0,0,0,0,0,0,0x0E,0x0F,
0x10,0x11,0x12,0,0,0,0,0,0,0,0,0,0,0,0x0F,0x1F,
0x10,0x21,0x11,0,0,0,0,0,0,0,0,0,0,0x0F,0,0,
@@ -287,7 +287,7 @@ short PawnAdvance[64]=
12,16,24,32,32,24,16,12,
12,16,24,32,32,24,16,12,
0, 0, 0, 0, 0, 0, 0, 0};
-
+
main(argc,argv)
int argc; char *argv[];
@@ -331,8 +331,8 @@ short iop;
unsigned short *mv;
/*
- Compare the string 's' to the list of legal moves available for the
- opponent. If a match is found, make the move on the board.
+ Compare the string 's' to the list of legal moves available for the
+ opponent. If a match is found, make the move on the board.
*/
{
@@ -373,7 +373,7 @@ struct leaf *node;
if (xnode.flags & epmask) UpdateDisplay(0,0,1,0);
else UpdateDisplay(xnode.f,xnode.t,0,xnode.flags & cstlmask);
if (xnode.flags & cstlmask) Game50 = GameCnt;
- else if (board[xnode.t] == pawn || (xnode.flags & capture))
+ else if (board[xnode.t] == pawn || (xnode.flags & capture))
Game50 = GameCnt;
GameList[GameCnt].depth = GameList[GameCnt].score = 0;
GameList[GameCnt].nodes = 0;
@@ -384,7 +384,7 @@ struct leaf *node;
*mv = (xnode.f << 8) + xnode.t;
algbr(xnode.f,xnode.t,false);
return(true);
- }
+ }
}
if (cnt > 1) ShowMessage("Ambiguous Move!");
return(false);
@@ -464,12 +464,12 @@ SelectMove(side,iop)
short side,iop;
/*
- Select a move by calling function search() at progressively deeper
- ply until time is up or a mate or draw is reached. An alpha-beta
- window of -90 to +90 points is set around the score returned from the
- previous iteration. If Sdepth != 0 then the program has correctly
- predicted the opponents move and the search will start at a depth of
- Sdepth+1 rather than a depth of 1.
+ Select a move by calling function search() at progressively deeper
+ ply until time is up or a mate or draw is reached. An alpha-beta
+ window of -90 to +90 points is set around the score returned from the
+ previous iteration. If Sdepth != 0 then the program has correctly
+ predicted the opponents move and the search will start at a depth of
+ Sdepth+1 rather than a depth of 1.
*/
{
@@ -495,7 +495,7 @@ static short i,alpha,beta,score,tempb,tempc,tempsf,tempst,xside,rpt;
ExaminePosition();
ScorePosition(side,&score);
ShowSidetomove();
-
+
if (Sdepth == 0)
{
ZeroTTable();
@@ -516,7 +516,7 @@ static short i,alpha,beta,score,tempb,tempc,tempsf,tempst,xside,rpt;
NodeCnt = ETnodes = EvalNodes = HashCnt = 0;
Zscore = 0; zwndw = 20;
}
-
+
while (!timeout && Sdepth < MaxSearchDepth)
{
Sdepth++;
@@ -576,7 +576,7 @@ static short i,alpha,beta,score,tempb,tempc,tempsf,tempst,xside,rpt;
if (score == -9999 || score == 9998) mate = true;
if (mate) hint = 0;
if (root->flags & cstlmask) Game50 = GameCnt;
- else if (board[root->t] == pawn || (root->flags & capture))
+ else if (board[root->t] == pawn || (root->flags & capture))
Game50 = GameCnt;
GameList[GameCnt].score = score;
GameList[GameCnt].nodes = NodeCnt;
@@ -599,13 +599,13 @@ static short i,alpha,beta,score,tempb,tempc,tempsf,tempst,xside,rpt;
OpeningBook()
/*
- Go thru each of the opening lines of play and check for a match with
- the current game listing. If a match occurs, generate a random number.
- If this number is the largest generated so far then the next move in
- this line becomes the current "candidate". After all lines are
- checked, the candidate move is put at the top of the Tree[] array and
- will be played by the program. Note that the program does not handle
- book transpositions.
+ Go thru each of the opening lines of play and check for a match with
+ the current game listing. If a match occurs, generate a random number.
+ If this number is the largest generated so far then the next move in
+ this line becomes the current "candidate". After all lines are
+ checked, the candidate move is put at the top of the Tree[] array and
+ will be played by the program. Note that the program does not handle
+ book transpositions.
*/
{
@@ -630,7 +630,7 @@ struct BookEntry *p;
}
p = p->next;
}
-
+
for (pnt = TrPnt[1]; pnt < TrPnt[2]; pnt++)
if ((Tree[pnt].f<<8) + Tree[pnt].t == m) Tree[pnt].score = 0;
pick(TrPnt[1],TrPnt[2]-1);
@@ -658,12 +658,12 @@ short side,ply,depth,alpha,beta,*rpt;
unsigned short bstline[];
/*
- Perform an alpha-beta search to determine the score for the current
- board position. If depth <= 0 only capturing moves, pawn promotions
- and responses to check are generated and searched, otherwise all
- moves are processed. The search depth is modified for check evasions,
- certain re-captures and threats. Extensions may continue for up to 11
- ply beyond the nominal search depth.
+ Perform an alpha-beta search to determine the score for the current
+ board position. If depth <= 0 only capturing moves, pawn promotions
+ and responses to check are generated and searched, otherwise all
+ moves are processed. The search depth is modified for check evasions,
+ certain re-captures and threats. Extensions may continue for up to 11
+ ply beyond the nominal search depth.
*/
#define prune (cf && score+node->score < alpha)
@@ -683,7 +683,7 @@ struct leaf *node,tmp;
NodeCnt++;
xside = otherside[side];
if (depth < 0) depth = 0;
-
+
if (ply <= Sdepth+3) repetition(rpt); else *rpt = 0;
if (*rpt >= 2) return(0);
@@ -693,7 +693,7 @@ struct leaf *node,tmp;
bstline[ply] = 0;
return(score);
}
-
+
if (depth > 0)
{
if (InChk || PawnThreat[ply-1] || ReCapture) ++depth;
@@ -704,7 +704,7 @@ struct leaf *node,tmp;
(InChk || PawnThreat[ply-1] || Threat[ply-1])) ++depth;
else if (score <= beta && MateThreat) ++depth;
}
-
+
if (depth > 0 && hashflag && ply > 1)
{
ProbeTTable(side,depth,&alpha,&beta,&score);
@@ -713,21 +713,21 @@ struct leaf *node,tmp;
if (beta == -20000) return(score);
if (alpha > beta) return(alpha);
}
-
+
if (Sdepth == 1) d = 7; else d = 11;
if (ply > Sdepth+d || (depth < 1 && score > beta)) return(score);
if (ply > 1)
if (depth > 0) MoveList(side,ply);
else CaptureList(side,xside,ply);
-
+
if (TrPnt[ply] == TrPnt[ply+1]) return(score);
-
+
cf = (depth < 1 && ply > Sdepth+1 && !ChkFlag[ply-2] && !slk);
if (depth > 0) best = -12000; else best = score;
if (best > alpha) alpha = best;
-
+
for (pnt = pbst = TrPnt[ply];
pnt < TrPnt[ply+1] && best <= beta;
pnt++)
@@ -736,7 +736,7 @@ struct leaf *node,tmp;
node = &Tree[pnt];
mv = (node->f << 8) + node->t;
nxtline[ply+1] = 0;
-
+
if (prune) break;
if (ply == 1) UpdateSearchStatus;
@@ -789,7 +789,7 @@ struct leaf *node,tmp;
if (NodeCnt > ETnodes) ElapsedTime(0);
if (timeout) return(-Tscore[ply-1]);
}
-
+
node = &Tree[pbst];
mv = (node->f<<8) + node->t;
if (hashflag && ply <= Sdepth && *rpt == 0 && best == alpha)
@@ -815,13 +815,13 @@ evaluate(side,xside,ply,alpha,beta)
short side,xside,ply,alpha,beta;
/*
- Compute an estimate of the score by adding the positional score from
- the previous ply to the material difference. If this score falls
- inside a window which is 180 points wider than the alpha-beta window
- (or within a 50 point window during quiescence search) call
- ScorePosition() to determine a score, otherwise return the estimated
- score. If one side has only a king and the other either has no pawns
- or no pieces then the function ScoreLoneKing() is called.
+ Compute an estimate of the score by adding the positional score from
+ the previous ply to the material difference. If this score falls
+ inside a window which is 180 points wider than the alpha-beta window
+ (or within a 50 point window during quiescence search) call
+ ScorePosition() to determine a score, otherwise return the estimated
+ score. If one side has only a king and the other either has no pawns
+ or no pieces then the function ScoreLoneKing() is called.
*/
{
@@ -832,14 +832,14 @@ short s,evflag;
(mtl[black] == valueK && (pmtl[white] == 0 || emtl[white] == 0)));
s = -Pscore[ply-1] + mtl[side] - mtl[xside];
s -= INCscore;
-
+
if (slk) evflag = false;
- else evflag =
+ else evflag =
(ply == 1 || ply < Sdepth ||
((ply == Sdepth+1 || ply == Sdepth+2) &&
(s > alpha-xwndw && s < beta+xwndw)) ||
(ply > Sdepth+2 && s >= alpha-25 && s <= beta+25));
-
+
if (evflag)
{
EvalNodes++;
@@ -855,7 +855,7 @@ short s,evflag;
InChk = SqAtakd(PieceList[side][0],xside);
if (slk) ScoreLoneKing(side,&s);
}
-
+
Pscore[ply] = s - mtl[side] + mtl[xside];
if (InChk) ChkFlag[ply-1] = Pindex[TOsquare];
else ChkFlag[ply-1] = 0;
@@ -867,7 +867,7 @@ short s,evflag;
ProbeTTable(side,depth,alpha,beta,score)
short side,depth,*alpha,*beta,*score;
-/*
+/*
Look for the current board position in the transposition table.
*/
@@ -916,7 +916,7 @@ short hindx;
ptbl = (ttable + hindx);
ptbl->hashbd = hashbd;
ptbl->depth = depth;
- ptbl->score = score;
+ ptbl->score = score;
ptbl->mv = mv;
ptbl->flags = 0;
if (score < alpha) ptbl->flags |= upperbound;
@@ -941,10 +941,10 @@ MoveList(side,ply)
short side,ply;
/*
- Fill the array Tree[] with all available moves for side to play. Array
- TrPnt[ply] contains the index into Tree[] of the first move at a ply.
+ Fill the array Tree[] with all available moves for side to play. Array
+ TrPnt[ply] contains the index into Tree[] of the first move at a ply.
*/
-
+
{
register short i;
short xside,f;
@@ -979,16 +979,16 @@ GenMoves(ply,sq,side,xside)
short ply,sq,side,xside;
/*
- Generate moves for a piece. The from square is mapped onto a special
- board and offsets (taken from array Dir[]) are added to the mapped
- location. The newly generated square is tested to see if it falls off
- the board by ANDing the square with 88 HEX. Legal moves are linked
- into the tree.
+ Generate moves for a piece. The from square is mapped onto a special
+ board and offsets (taken from array Dir[]) are added to the mapped
+ location. The newly generated square is tested to see if it falls off
+ the board by ANDing the square with 88 HEX. Legal moves are linked
+ into the tree.
*/
-
+
{
register short m,u,d;
-short i,m0,piece;
+short i,m0,piece;
piece = board[sq]; m0 = map[sq];
if (sweep[piece])
@@ -1057,7 +1057,7 @@ short ply,f,t,xside;
2. Capture of last moved piece
3. Other captures (major pieces first)
4. Killer moves
- 5. "history" killers
+ 5. "history" killers
*/
{
@@ -1140,7 +1140,7 @@ struct leaf *node;
}
PL = PieceList[side];
for (i = 0; i <= PieceCnt[side]; i++)
- {
+ {
sq = PL[i];
m0 = map[sq]; piece = board[sq];
j1 = Dstart[piece]; j2 = Dstop[piece];
@@ -1176,7 +1176,7 @@ struct leaf *node;
}
}
#endif
-
+
int castle(side,kf,kt,iop)
short side,kf,kt,iop;
@@ -1244,7 +1244,7 @@ short l;
{
board[l] = no_piece; color[l] = neutral;
}
- else
+ else
{
board[l] = pawn; color[l] = xside;
}
@@ -1257,11 +1257,11 @@ short side,*tempc,*tempb,*tempsf,*tempst;
struct leaf *node;
/*
- Update Arrays board[], color[], and Pindex[] to reflect the new board
- position obtained after making the move pointed to by node. Also
- update miscellaneous stuff that changes when a move is made.
+ Update Arrays board[], color[], and Pindex[] to reflect the new board
+ position obtained after making the move pointed to by node. Also
+ update miscellaneous stuff that changes when a move is made.
*/
-
+
{
register short f,t;
short xside,ct,cf;
@@ -1323,7 +1323,7 @@ short xside,ct,cf;
UpdateHashbd(side,queen,f,-1);
}
INCscore -= *tempsf;
- }
+ }
if (board[t] == king) ++kingmoved[side];
if (node->flags & epmask) EnPassant(xside,f,t,1);
else if (hashflag) UpdateHashbd(side,board[t],f,t);
@@ -1363,7 +1363,7 @@ short xside;
UpdateHashbd(side,queen,-1,t);
UpdateHashbd(side,pawn,-1,t);
}
- }
+ }
if (*tempc != neutral)
{
UpdatePieceList(*tempc,t,2);
@@ -1388,10 +1388,10 @@ UpdateHashbd(side,piece,f,t)
short side,piece,f,t;
/*
- hashbd contains a 32 bit "signature" of the board position. hashkey
- contains a 16 bit code used to address the hash table. When a move is
- made, XOR'ing the hashcode of moved piece on the from and to squares
- with the hashbd and hashkey values keeps things current.
+ hashbd contains a 32 bit "signature" of the board position. hashkey
+ contains a 16 bit code used to address the hash table. When a move is
+ made, XOR'ing the hashcode of moved piece on the from and to squares
+ with the hashbd and hashkey values keeps things current.
*/
{
@@ -1412,8 +1412,8 @@ UpdatePieceList(side,sq,iop)
short side,sq,iop;
/*
- Update the PieceList and Pindex arrays when a piece is captured or
- when a capture is unmade.
+ Update the PieceList and Pindex arrays when a piece is captured or
+ when a capture is unmade.
*/
{
@@ -1439,13 +1439,13 @@ register short i;
InitializeStats()
/*
- Scan thru the board seeing what's on each square. If a piece is found,
- update the variables PieceCnt, PawnCnt, Pindex and PieceList. Also
- determine the material for each side and set the hashkey and hashbd
- variables to represent the current board position. Array
- PieceList[side][indx] contains the location of all the pieces of
- either side. Array Pindex[sq] contains the indx into PieceList for a
- given square.
+ Scan thru the board seeing what's on each square. If a piece is found,
+ update the variables PieceCnt, PawnCnt, Pindex and PieceList. Also
+ determine the material for each side and set the hashkey and hashbd
+ variables to represent the current board position. Array
+ PieceList[side][indx] contains the location of all the pieces of
+ either side. Array Pindex[sq] contains the indx into PieceList for a
+ given square.
*/
{
@@ -1477,9 +1477,9 @@ register short i,sq;
pick(p1,p2)
short p1,p2;
-/*
- Find the best move in the tree between indexes p1 and p2. Swap the
- best move into the p1 element.
+/*
+ Find the best move in the tree between indexes p1 and p2. Swap the
+ best move into the p1 element.
*/
{
@@ -1535,7 +1535,7 @@ short sq,side;
/*
See if any piece with color 'side' ataks sq. First check for pawns
or king, then try other pieces. Array Dcode is used to check for
- knight attacks or R,B,Q co-linearity.
+ knight attacks or R,B,Q co-linearity.
*/
{
@@ -1550,7 +1550,7 @@ short i,m0,m1,loc,piece,*PL;
if (!(m & 0x88))
if (board[unmap[m]] == pawn && color[unmap[m]] == side) return(true);
if (distance(sq,PieceList[side][0]) == 1) return(true);
-
+
PL = PieceList[side];
for (i = 1; i <= PieceCnt[side]; i++)
{
@@ -1584,7 +1584,7 @@ short side,*a;
{
register short u,m;
short d,c,j,j1,j2,piece,i,m0,sq,*PL;
-
+
/*
memset((char *)a,0,64*sizeof(short));
*/
@@ -1626,9 +1626,9 @@ ScorePosition(side,score)
short side,*score;
/*
- Perform normal static evaluation of board position. A score is
- generated for each piece and these are summed to get a score for each
- side.
+ Perform normal static evaluation of board position. A score is
+ generated for each piece and these are summed to get a score for each
+ side.
*/
{
@@ -1656,17 +1656,17 @@ short i,xside,pscore[3];
}
if (hung[side] > 1) pscore[side] += HUNGX;
if (hung[xside] > 1) pscore[xside] += HUNGX;
-
+
*score = mtl[side] - mtl[xside] + pscore[side] - pscore[xside] + 10;
if (dither) *score += rand() % dither;
-
+
if (*score > 0 && pmtl[side] == 0)
if (emtl[side] < valueR) *score = 0;
else if (*score < valueR) *score /= 2;
if (*score < 0 && pmtl[xside] == 0)
if (emtl[xside] < valueR) *score = 0;
else if (-*score < valueR) *score /= 2;
-
+
if (mtl[xside] == valueK && emtl[side] > valueB) *score += 200;
if (mtl[side] == valueK && emtl[xside] > valueB) *score -= 200;
}
@@ -1675,7 +1675,7 @@ short i,xside,pscore[3];
ScoreLoneKing(side,score)
short side,*score;
-/*
+/*
Static evaluation when loser has only a king and winner has no pawns
or no pieces.
*/
@@ -1687,19 +1687,19 @@ short winner,loser,king1,king2,s,i;
if (mtl[white] > mtl[black]) winner = white; else winner = black;
loser = otherside[winner];
king1 = PieceList[winner][0]; king2 = PieceList[loser][0];
-
+
s = 0;
-
+
if (pmtl[winner] > 0)
for (i = 1; i <= PieceCnt[winner]; i++)
s += ScoreKPK(side,winner,loser,king1,king2,PieceList[winner][i]);
-
+
else if (emtl[winner] == valueB+valueN)
s = ScoreKBNK(winner,king1,king2);
-
+
else if (emtl[winner] > valueB)
s = 500 + emtl[winner] - DyingKing[king2] - 2*distance(king1,king2);
-
+
if (side == winner) *score = s; else *score = -s;
}
@@ -1713,7 +1713,7 @@ short side,winner,loser,king1,king2,sq;
{
short s,r;
-
+
if (PieceCnt[winner] == 1) s = 50; else s = 120;
if (winner == white)
{
@@ -1883,8 +1883,8 @@ short s,piece,a1,a2,in_square,r,mob,e,c;
if (PC2[7] == 0) s += KHOPNX;
}
}
-
- if (a2 > 0)
+
+ if (a2 > 0)
{
c = (control[piece] & 0x4FFF);
if (a1 == 0 || a2 > c+1)
@@ -1977,8 +1977,8 @@ BRscan(sq,s,mob)
short sq,*s,*mob;
/*
- Find Bishop and Rook mobility, XRAY attacks, and pins. Increment the
- hung[] array if a pin is found.
+ Find Bishop and Rook mobility, XRAY attacks, and pins. Increment the
+ hung[] array if a pin is found.
*/
{
@@ -2077,9 +2077,9 @@ short i,m0;
ExaminePosition()
/*
- This is done one time before the search is started. Set up arrays
- Mwpawn, Mbpawn, Mknight, Mbishop, Mking which are used in the
- SqValue() function to determine the positional value of each piece.
+ This is done one time before the search is started. Set up arrays
+ Mwpawn, Mbpawn, Mknight, Mbishop, Mking which are used in the
+ SqValue() function to determine the positional value of each piece.
*/
{
@@ -2114,14 +2114,14 @@ short wpadv,bpadv,wstrong,bstrong,z,side,pp,j,val,Pd,fyle,rank;
if (!PawnStorm && stage < 5)
PawnStorm = ((column[wking] < 3 && column[bking] > 4) ||
(column[wking] > 4 && column[bking] < 3));
-
+
CopyBoard(pknight,Mknight[white]);
CopyBoard(pknight,Mknight[black]);
CopyBoard(pbishop,Mbishop[white]);
CopyBoard(pbishop,Mbishop[black]);
BlendBoard(KingOpening,KingEnding,Mking[white]);
BlendBoard(KingOpening,KingEnding,Mking[black]);
-
+
for (sq = 0; sq < 64; sq++)
{
fyle = column[sq]; rank = row[sq];
@@ -2159,7 +2159,7 @@ short wpadv,bpadv,wstrong,bstrong,z,side,pp,j,val,Pd,fyle,rank;
if ((column[bking] < 4 && fyle > 4) ||
(column[bking] > 3 && fyle < 3)) Mbpawn[sq] -= 3*rank;
}
-
+
Mknight[white][sq] += 5 - distance(sq,bking);
Mknight[white][sq] += 5 - distance(sq,wking);
Mknight[black][sq] += 5 - distance(sq,wking);
@@ -2176,19 +2176,19 @@ short wpadv,bpadv,wstrong,bstrong,z,side,pp,j,val,Pd,fyle,rank;
if (bstrong) Mknight[black][sq] += KNIGHTSTRONG;
if (wstrong) Mbishop[white][sq] += BISHOPSTRONG;
if (bstrong) Mbishop[black][sq] += BISHOPSTRONG;
-
+
if (HasBishop[white] == 2) Mbishop[white][sq] += 8;
if (HasBishop[black] == 2) Mbishop[black][sq] += 8;
if (HasKnight[white] == 2) Mknight[white][sq] += 5;
if (HasKnight[black] == 2) Mknight[black][sq] += 5;
-
+
if (board[sq] == bishop)
if (rank % 2 == fyle % 2) KBNKsq = 0; else KBNKsq = 7;
-
+
Kfield[white][sq] = Kfield[black][sq] = 0;
if (distance(sq,wking) == 1) Kfield[black][sq] = KATAK;
if (distance(sq,bking) == 1) Kfield[white][sq] = KATAK;
-
+
Pd = 0;
for (i = 0; i < 64; i++)
if (board[i] == pawn)
@@ -2221,9 +2221,9 @@ short wpadv,bpadv,wstrong,bstrong,z,side,pp,j,val,Pd,fyle,rank;
UpdateWeights()
-/*
- If material balance has changed, determine the values for the
- positional evaluation terms.
+/*
+ If material balance has changed, determine the values for the
+ positional evaluation terms.
*/
{
@@ -2241,7 +2241,7 @@ short tmtl;
if (tmtl > 3600) stage2 = 0;
else if (tmtl < 1400) stage2 = 10;
else stage2 = (3600-tmtl) / 220;
-
+
PEDRNK2B = -15; /* centre pawn on 2nd rank & blocked */
PBLOK = -4; /* blocked backward pawn */
PDOUBLED = -14; /* doubled pawn */
@@ -2250,27 +2250,27 @@ short tmtl;
PADVNCM = 10; /* advanced pawn multiplier */
PADVNCI = 7; /* muliplier for isolated pawn */
PawnBonus = stage;
-
+
KNIGHTPOST = (stage+2)/3; /* knight near enemy pieces */
KNIGHTSTRONG = (stage+6)/2; /* occupies pawn hole */
-
+
BISHOPSTRONG = (stage+6)/2; /* occupies pawn hole */
BishopBonus = 2*stage;
-
+
RHOPN = 10; /* rook on half open file */
RHOPNX = 4;
RookBonus = 6*stage;
-
+
XRAY = 8; /* Xray attack on piece */
PINVAL = 10; /* Pin */
-
+
KHOPN = (3*stage-30) / 2; /* king on half open file */
KHOPNX = KHOPN / 2;
KCASTLD = 10 - stage;
KMOVD = -40 / (stage+1); /* king moved before castling */
KATAK = (10-stage) / 2; /* B,R attacks near enemy king */
if (stage < 8) KSFTY = 16-2*stage; else KSFTY = 0;
-
+
ATAKD = -6; /* defender > attacker */
HUNGP = -8; /* each hung piece */
HUNGX = -12; /* extra for >1 hung piece */
diff --git a/gnu/games/chess/gnuchess.h b/gnu/games/chess/gnuchess.h
index 6e9c74bcbc22..ee6442eefd8b 100644
--- a/gnu/games/chess/gnuchess.h
+++ b/gnu/games/chess/gnuchess.h
@@ -21,11 +21,11 @@
*/
-/* Header file for GNU CHESS */
+/* Header file for GNU CHESS */
#define neutral 2
#define white 0
-#define black 1
+#define black 1
#define no_piece 0
#define pawn 1
#define knight 2
diff --git a/gnu/games/chess/move.c b/gnu/games/chess/move.c
index 4ce686c1b40a..b4b0d4267e9c 100644
--- a/gnu/games/chess/move.c
+++ b/gnu/games/chess/move.c
@@ -161,7 +161,7 @@ short sq,side;
u = p[u].nextpos;
}
else {
- if (color[u] == side &&
+ if (color[u] == side &&
(board[u] == queen || board[u] == bishop))
return(true);
u = p[u].nextdir;
@@ -175,7 +175,7 @@ short sq,side;
u = p[u].nextpos;
}
else {
- if (color[u] == side &&
+ if (color[u] == side &&
(board[u] == queen || board[u] == rook))
return(true);
u = p[u].nextdir;
@@ -201,8 +201,8 @@ short sq,side;
BRscan(sq,s,mob)
short sq,*s,*mob;
/*
- Find Bishop and Rook mobility, XRAY attacks, and pins. Increment the
- hung[] array if a pin is found.
+ Find Bishop and Rook mobility, XRAY attacks, and pins. Increment the
+ hung[] array if a pin is found.
*/
{
register short u,piece,pin;
@@ -260,7 +260,7 @@ short side,xside,ply;
register struct sqdata *p;
short i,piece,*PL;
struct leaf *node;
-
+
TrPnt[ply+1] = TrPnt[ply];
node = &Tree[TrPnt[ply]];
PL = PieceList[side];
@@ -312,17 +312,17 @@ short side,xside,ply;
#if (NEWMOVE > 5)
GenMoves(ply,sq,side,xside)
short ply,sq,side,xside;
-
+
/*
Generate moves for a piece. The moves are taken from the
precalulated array posdata. If the board is free, next move
is choosen from nextpos else from nextdir.
*/
-
+
{
register short u,piece;
register struct sqdata *p;
-
+
piece = board[sq];
p = posdata[side][piece][sq];
if (piece == pawn) {
@@ -339,7 +339,7 @@ GenMoves(ply,sq,side,xside)
}
u = p[u].nextpos;
}
- }
+ }
else {
u = p[sq].nextpos;
while (u != sq) {
@@ -352,6 +352,6 @@ GenMoves(ply,sq,side,xside)
u = p[u].nextdir;
}
}
- }
-}
+ }
+}
#endif
diff --git a/gnu/games/chess/move.h b/gnu/games/chess/move.h
index 2f328303763f..3294e4a6015d 100644
--- a/gnu/games/chess/move.h
+++ b/gnu/games/chess/move.h
@@ -11,7 +11,7 @@ extern short taxidata[64][64];
extern void Initialize_dist();
#endif
-
+
#if (NEWMOVE >= 2)
struct sqdata {
short nextpos;
diff --git a/gnu/games/chess/nondsp.c b/gnu/games/chess/nondsp.c
index 0b29ad5504c5..bec36d3800f9 100644
--- a/gnu/games/chess/nondsp.c
+++ b/gnu/games/chess/nondsp.c
@@ -1,8 +1,8 @@
/*
UNIX & MSDOS NON-DISPLAY, AND CHESSTOOL interface for Chess
-
+
Revision: 4-25-88
-
+
Copyright (C) 1986, 1987, 1988 Free Software Foundation, Inc.
Copyright (c) 1988 John Stanback
@@ -90,12 +90,12 @@ TerminateSearch()
InputCommand()
/*
- Process the users command. If easy mode is OFF (the computer is
- thinking on opponents time) and the program is out of book, then make
- the 'hint' move on the board and call SelectMove() to find a response.
- The user terminates the search by entering ^C (quit siqnal) before
- entering a command. If the opponent does not make the hint move, then
- set Sdepth to zero.
+ Process the users command. If easy mode is OFF (the computer is
+ thinking on opponents time) and the program is out of book, then make
+ the 'hint' move on the board and call SelectMove() to find a response.
+ The user terminates the search by entering ^C (quit siqnal) before
+ entering a command. If the opponent does not make the hint move, then
+ set Sdepth to zero.
*/
{
@@ -124,7 +124,7 @@ char s[80];
ft = time((long *)0) - time0;
epsquare = tmp;
}
-
+
#ifndef MSDOS
#endif
while (!(ok || quit))
@@ -139,7 +139,7 @@ char s[80];
Sdepth = 0;
ft = 0;
}
-
+
if (strcmp(s,"bd") == 0)
{
ClrScreen();
@@ -183,7 +183,7 @@ char s[80];
Sdepth = 0;
ok = true;
}
- if (strcmp(s,"white") == 0)
+ if (strcmp(s,"white") == 0)
{
computer = white; opponent = black;
ok = true; force = false;
@@ -196,7 +196,7 @@ char s[80];
Sdepth = 0;
}
if (strcmp(s,"undo") == 0 && GameCnt >= 0) Undo();
- if (strcmp(s,"remove") == 0 && GameCnt >= 1)
+ if (strcmp(s,"remove") == 0 && GameCnt >= 1)
{
Undo(); Undo();
}
@@ -221,7 +221,7 @@ char s[80];
printz("cnt= %ld rate= %ld\n",cnt,rate);
}
}
-
+
ElapsedTime(1);
if (force)
{
@@ -272,7 +272,7 @@ help()
printz("Easy mode: ");
if (easy) printz("ON\n"); else printz("OFF\n");
printz("Depth: %d\n",MaxSearchDepth);
- printz("Random: ");
+ printz("Random: ");
if (dither) printz("ON\n"); else printz("OFF\n");
printz("Transposition table: ");
if (hashflag) printz("ON\n"); else printz("OFF\n");
@@ -282,10 +282,10 @@ help()
EditBoard()
-/*
- Set up a board position. Pieces are entered by typing the piece
- followed by the location. For example, Nf3 will place a knight on
- square f3.
+/*
+ Set up a board position. Pieces are entered by typing the piece
+ followed by the location. For example, Nf3 will place a knight on
+ square f3.
*/
{
@@ -297,7 +297,7 @@ char s[80];
printz(". exit to main\n");
printz("# clear board\n");
printz("enter piece & location: \n");
-
+
a = white;
do
{
@@ -399,12 +399,12 @@ OutputMove()
NodeCnt,EvalNodes,HashCnt,evrate);
printz("CPU= %.2ld:%.2ld.%.2ld\n\n",
cputimer/6000,(cputimer % 6000)/100,cputimer % 100);
-
+
if (root->flags & epmask) UpdateDisplay(0,0,1,0);
else UpdateDisplay(root->f,root->t,0,root->flags & cstlmask);
printz("My move is: %s\n\n",mvstr1);
if (beep) printz("%c",7);
-
+
if (root->flags & draw) printz("Draw game!\n");
else if (root->score == -9999) printz("opponent mates!\n");
else if (root->score == 9998) printz("computer mates!\n");
@@ -417,10 +417,10 @@ OutputMove()
ElapsedTime(iop)
short iop;
-/*
- Determine the time that has passed since the search was started. If
- the elapsed time exceeds the target (ResponseTime+ExtraTime) then set
- timeout to true which will terminate the search.
+/*
+ Determine the time that has passed since the search was started. If
+ the elapsed time exceeds the target (ResponseTime+ExtraTime) then set
+ timeout to true which will terminate the search.
*/
{
@@ -508,12 +508,12 @@ short r,c,l;
GetOpenings()
/*
- Read in the Opening Book file and parse the algebraic notation for a
- move into an unsigned integer format indicating the from and to
- square. Create a linked list of opening lines of play, with
- entry->next pointing to the next line and entry->move pointing to a
- chunk of memory containing the moves. More Opening lines of up to 256
- half moves may be added to gnuchess.book.
+ Read in the Opening Book file and parse the algebraic notation for a
+ move into an unsigned integer format indicating the from and to
+ square. Create a linked list of opening lines of play, with
+ entry->next pointing to the next line and entry->move pointing to a
+ chunk of memory containing the moves. More Opening lines of up to 256
+ half moves may be added to gnuchess.book.
*/
{
@@ -542,7 +542,7 @@ unsigned short mv,*mp,tmp[100];
mp = (unsigned short *)malloc((i+1)*sizeof(unsigned short));
entry->mv = mp;
entry->next = Book;
- Book = entry;
+ Book = entry;
for (j = 1; j <= i; j++) *(mp++) = tmp[j];
*mp = 0;
i = 0; side = white;
@@ -640,7 +640,7 @@ short sq,i,c;
printz("Enter file name: ");
scanz("%s",fname);
-
+
if (fname[0] == '\0' || access(fname,W_OK) == -1) strcpy(fname,"chess.000");
fd = fopen(fname,"w");
fprintf(fd,"%d %d %d\n",computer+1,opponent+1,Game50);
@@ -687,7 +687,7 @@ short i,f,t;
}
fprintf(fd,"\n\n");
fclose(fd);
-}
+}
Undo()
diff --git a/gnu/games/chess/uxdsp.c b/gnu/games/chess/uxdsp.c
index d584738042a9..84034bc930ca 100644
--- a/gnu/games/chess/uxdsp.c
+++ b/gnu/games/chess/uxdsp.c
@@ -1,8 +1,8 @@
/*
ALPHA interface for CHESS
-
+
Revision: 4-25-88
-
+
Copyright (C) 1986, 1987, 1988 Free Software Foundation, Inc.
Copyright (c) 1988 John Stanback
@@ -88,12 +88,12 @@ TerminateSearch()
InputCommand()
/*
- Process the users command. If easy mode is OFF (the computer is
- thinking on opponents time) and the program is out of book, then make
- the 'hint' move on the board and call SelectMove() to find a response.
- The user terminates the search by entering ^C (quit siqnal) before
- entering a command. If the opponent does not make the hint move, then
- set Sdepth to zero.
+ Process the users command. If easy mode is OFF (the computer is
+ thinking on opponents time) and the program is out of book, then make
+ the 'hint' move on the board and call SelectMove() to find a response.
+ The user terminates the search by entering ^C (quit siqnal) before
+ entering a command. If the opponent does not make the hint move, then
+ set Sdepth to zero.
*/
{
@@ -123,7 +123,7 @@ char s[80];
ft = time((time_t *)0) - time0;
epsquare = tmp;
}
-
+
signal(SIGINT,Die); signal(SIGQUIT,Die);
while (!(ok || quit))
{
@@ -136,7 +136,7 @@ char s[80];
Sdepth = 0;
ft = 0;
}
-
+
if (strcmp(s,"bd") == 0)
{
ClrScreen();
@@ -179,7 +179,7 @@ char s[80];
Sdepth = 0;
ok = true;
}
- if (strcmp(s,"white") == 0)
+ if (strcmp(s,"white") == 0)
{
computer = white; opponent = black;
ok = true; force = false;
@@ -191,7 +191,7 @@ char s[80];
ok = true; force = false;
Sdepth = 0;
}
- if (strcmp(s,"remove") == 0 && GameCnt >= 1)
+ if (strcmp(s,"remove") == 0 && GameCnt >= 1)
{
Undo(); Undo();
}
@@ -220,7 +220,7 @@ char s[80];
if (strcmp(s,"p") == 0) ShowPostnValues();
if (strcmp(s,"debug") == 0) DoDebug();
}
-
+
ClearMessage();
ElapsedTime(1);
if (force)
@@ -234,10 +234,10 @@ char s[80];
EditBoard()
-/*
- Set up a board position. Pieces are entered by typing the piece
- followed by the location. For example, Nf3 will place a knight on
- square f3.
+/*
+ Set up a board position. Pieces are entered by typing the piece
+ followed by the location. For example, Nf3 will place a knight on
+ square f3.
*/
{
@@ -322,7 +322,7 @@ help()
gotoXY(10,24); printz("Easy mode: ");
if (easy) printz("ON"); else printz("OFF");
gotoXY(40,21); printz("Depth: %d",MaxSearchDepth);
- gotoXY(40,22); printz("Random: ");
+ gotoXY(40,22); printz("Random: ");
if (dither) printz("ON"); else printz("OFF");
gotoXY(40,23); printz("Transposition table: ");
if (hashflag) printz("ON"); else printz("OFF");
@@ -390,7 +390,7 @@ OutputMove()
gotoXY(50,17); printz("My move is: %s",mvstr1);
if (beep) putchar(7);
ClrEoln();
-
+
gotoXY(50,24);
if (root->flags & draw) printz("Draw game!");
else if (root->score == -9999) printz("opponent mates!");
@@ -398,7 +398,7 @@ OutputMove()
else if (root->score < -9000) printz("opponent will soon mate!");
else if (root->score > 9000) printz("computer will soon mate!");
ClrEoln();
-
+
if (post)
{
gotoXY(50,22); printz("Nodes= %6ld",NodeCnt); ClrEoln();
@@ -409,10 +409,10 @@ OutputMove()
ElapsedTime(iop)
-/*
- Determine the time that has passed since the search was started. If
- the elapsed time exceeds the target (ResponseTime+ExtraTime) then set
- timeout to true which will terminate the search.
+/*
+ Determine the time that has passed since the search was started. If
+ the elapsed time exceeds the target (ResponseTime+ExtraTime) then set
+ timeout to true which will terminate the search.
*/
short iop;
@@ -515,7 +515,7 @@ short r,c; char x;
UpdateDisplay(f,t,flag,iscastle)
short f,t,flag,iscastle;
{
-short i,l,z;
+short i,l,z;
if (flag)
{
gotoXY(56,2); printz("CHESS");
@@ -557,12 +557,12 @@ short i,l,z;
GetOpenings()
/*
- Read in the Opening Book file and parse the algebraic notation for a
- move into an unsigned integer format indicating the from and to
- square. Create a linked list of opening lines of play, with
- entry->next pointing to the next line and entry->move pointing to a
- chunk of memory containing the moves. More Opening lines of up to 256
- half moves may be added to gnuchess.book.
+ Read in the Opening Book file and parse the algebraic notation for a
+ move into an unsigned integer format indicating the from and to
+ square. Create a linked list of opening lines of play, with
+ entry->next pointing to the next line and entry->move pointing to a
+ chunk of memory containing the moves. More Opening lines of up to 256
+ half moves may be added to gnuchess.book.
*/
{
@@ -587,7 +587,7 @@ unsigned short mv,*mp,tmp[100];
mp = (unsigned short *)malloc((i+1)*sizeof(unsigned short));
entry->mv = mp;
entry->next = Book;
- Book = entry;
+ Book = entry;
for (j = 1; j <= i; j++) *(mp++) = tmp[j];
*mp = 0;
i = 0; side = white;
@@ -690,7 +690,7 @@ short sq,i,c;
ShowMessage("File name: ");
scanz("%s",fname);
-
+
if (fname[0] == '\0' || access(fname,W_OK) == -1) strcpy(fname,"chess.000");
fd = fopen(fname,"w");
fprintf(fd,"%d %d %d\n",computer+1,opponent+1,Game50);
@@ -737,7 +737,7 @@ short i,f,t;
}
fprintf(fd,"\n\n");
fclose(fd);
-}
+}
Undo()
@@ -851,7 +851,7 @@ SelectLevel()
gotoXY(20,11); printz(" 8. 1 move in 15 minutes");
gotoXY(20,12); printz(" 9. 1 move in 60 minutes");
gotoXY(20,13); printz("10. 1 move in 600 minutes");
-
+
OperatorTime = 0; TCmoves = 60; TCminutes = 5;
gotoXY(20,17); printz("Enter Level: ");
diff --git a/gnu/include/values.h b/gnu/include/values.h
index 91f448d1261c..9ba3e23ae1a2 100644
--- a/gnu/include/values.h
+++ b/gnu/include/values.h
@@ -2,7 +2,7 @@
#warning "this file includes <values.h> which is obsoleted, use <limits.h> or <float.h> instead"
#endif
-/*
+/*
Copyright (C) 1988 Free Software Foundation
written by Doug Lea (dl@rocky.oswego.edu)
@@ -72,7 +72,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
#define DMAXEXP ((1 << _DEXPLEN - 1) - 1 + _IEEE)
#define FMAXEXP ((1 << _FEXPLEN - 1) - 1 + _IEEE)
-#elif defined(sony)
+#elif defined(sony)
#define MAXDOUBLE 1.79769313486231470e+308
#define MAXFLOAT ((float)3.40282346638528860e+38)
#define MINDOUBLE 2.2250738585072010e-308
@@ -150,7 +150,7 @@ extern float _maxfloat, _minfloat;
/* #elif defined(vax) */
/* use vax versions by default -- they seem to be the most conservative */
-#else
+#else
#define MAXDOUBLE 1.701411834604692293e+38
#define MINDOUBLE (2.938735877055718770e-39)
diff --git a/gnu/lib/libdialog/checklist.c b/gnu/lib/libdialog/checklist.c
index 20174ae76038..0890c00e0aa4 100644
--- a/gnu/lib/libdialog/checklist.c
+++ b/gnu/lib/libdialog/checklist.c
@@ -79,7 +79,7 @@ int dialog_checklist(unsigned char *title, unsigned char *prompt, int height, in
/* center dialog box on screen */
x = (COLS - width)/2;
y = (LINES - height)/2;
-
+
#ifdef HAVE_NCURSES
if (use_shadow)
draw_shadow(stdscr, y, x, height, width);
@@ -156,7 +156,7 @@ int dialog_checklist(unsigned char *title, unsigned char *prompt, int height, in
if (key < 0x100 && toupper(key) == toupper(items[(scroll+i)*3][0]))
break;
- if (i < max_choice || (key >= '1' && key <= MIN('9', '0'+max_choice)) ||
+ if (i < max_choice || (key >= '1' && key <= MIN('9', '0'+max_choice)) ||
key == KEY_UP || key == KEY_DOWN || key == ' ' ||
key == '+' || key == '-' ) {
if (key >= '1' && key <= MIN('9', '0'+max_choice))
diff --git a/gnu/lib/libdialog/dialog.h b/gnu/lib/libdialog/dialog.h
index 31f1e0882289..6500ef82c90b 100644
--- a/gnu/lib/libdialog/dialog.h
+++ b/gnu/lib/libdialog/dialog.h
@@ -44,7 +44,7 @@
#endif
-/*
+/*
* Attribute names
*/
#define screen_attr attributes[0]
@@ -115,5 +115,5 @@ void use_helpfile(char *helpfile);
void use_helpline(char *helpline);
char *get_helpline(void);
void restore_helpline(char *helpline);
-void dialog_gauge(char *title, char *prompt, int y, int x,
+void dialog_gauge(char *title, char *prompt, int y, int x,
int height, int width, int perc);
diff --git a/gnu/lib/libdialog/dialog.priv.h b/gnu/lib/libdialog/dialog.priv.h
index 35e91a260f43..d84dc3967c73 100644
--- a/gnu/lib/libdialog/dialog.priv.h
+++ b/gnu/lib/libdialog/dialog.priv.h
@@ -49,7 +49,7 @@
#ifndef ctrl
#define ctrl(a) ((a) - 'a' + 1)
-#endif
+#endif
#ifndef HAVE_NCURSES
#ifndef ACS_ULCORNER
@@ -101,7 +101,7 @@ bool use_shadow = USE_SHADOW;
#endif
-/*
+/*
* Attribute values, default is for mono display
*/
chtype attributes[] = {
diff --git a/gnu/lib/libdialog/dir.c b/gnu/lib/libdialog/dir.c
index 2fa5835f7a21..04a30b2656c3 100644
--- a/gnu/lib/libdialog/dir.c
+++ b/gnu/lib/libdialog/dir.c
@@ -3,7 +3,7 @@
*
* Program: dir.c
* Author: Marc van Kempen
- * desc: Directory routines, sorting and reading
+ * desc: Directory routines, sorting and reading
*
* Copyright (c) 1995, Marc van Kempen
*
@@ -16,7 +16,7 @@
* responsible for the proper functioning of this software, nor does
* the author assume any responsibility for damages incurred with
* its use.
- *
+ *
****************************************************************************/
#include <sys/types.h>
@@ -71,7 +71,7 @@ static int _showdotfiles = TRUE;
*
****************************************************************************/
-int
+int
dir_select_nd(
#if defined __linux__
const struct dirent *d
@@ -79,8 +79,8 @@ dir_select_nd(
struct dirent *d
#endif
)
-/*
- * desc: allways include a directory entry <d>, except
+/*
+ * desc: allways include a directory entry <d>, except
* for the current directory and other dot-files
* keep '..' however.
* pre: <d> points to a dirent
@@ -90,13 +90,13 @@ dir_select_nd(
if (strcmp(d->d_name, ".")==0 ||
(d->d_name[0] == '.' && strlen(d->d_name) > 1 && d->d_name[1] != '.')) {
return(FALSE);
- } else {
+ } else {
return(TRUE);
}
}/* dir_select_nd() */
-int
+int
dir_select(
#ifdef __linux__
const struct dirent *d
@@ -104,8 +104,8 @@ dir_select(
struct dirent *d
#endif
)
-/*
- * desc: allways include a directory entry <d>, except
+/*
+ * desc: allways include a directory entry <d>, except
* for the current directory
* pre: <d> points to a dirent
* post: returns TRUE if d->d_name != "." else FALSE
@@ -118,16 +118,16 @@ dir_select(
}
} /* dir_select() */
-int
+int
dir_select_root_nd(
-#ifdef __linux__
+#ifdef __linux__
const struct dirent *d
#else
struct dirent *d
#endif
)
-/*
- * desc: allways include a directory entry <d>, except
+/*
+ * desc: allways include a directory entry <d>, except
* for the current directory and the parent directory.
* Also skip any other dot-files.
* pre: <d> points to a dirent
@@ -142,22 +142,22 @@ dir_select_root_nd(
} /* dir_select_root_nd() */
-int
+int
dir_select_root(
-#ifdef __linux__
+#ifdef __linux__
const struct dirent *d
#else
struct dirent *d
#endif
)
-/*
- * desc: allways include a directory entry <d>, except
+/*
+ * desc: allways include a directory entry <d>, except
* for the current directory and the parent directory
* pre: <d> points to a dirent
* post: returns TRUE if d->d_name[0] != "." else FALSE
*/
{
- if (strcmp(d->d_name, ".") == 0 || strcmp(d->d_name, "..") == 0) {
+ if (strcmp(d->d_name, ".") == 0 || strcmp(d->d_name, "..") == 0) {
return(FALSE);
} else {
return(TRUE);
@@ -185,7 +185,7 @@ dir_alphasort(const void *d1, const void *d2)
*
*/
{
- DirList *f1 = ((DirList *) d1),
+ DirList *f1 = ((DirList *) d1),
*f2 = ((DirList *) d2);
struct stat *s1 = &(f1->filestatus);
struct stat *s2 = &(f2->filestatus);
@@ -197,7 +197,7 @@ dir_alphasort(const void *d1, const void *d2)
if (strcmp(((DirList *) d2)->filename, "..") == 0) {
return(1);
}
-
+
/* put directories first */
if ((s1->st_mode & S_IFDIR) && (s2->st_mode & S_IFDIR)) {
return(strcmp(f1->filename, f2->filename));
@@ -212,7 +212,7 @@ dir_alphasort(const void *d1, const void *d2)
} /* dir_alphasort() */
-
+
int
dir_sizesort(const void *d1, const void *d2)
/*
@@ -220,7 +220,7 @@ dir_sizesort(const void *d1, const void *d2)
*
*/
{
- DirList *f1 = ((DirList *) d1),
+ DirList *f1 = ((DirList *) d1),
*f2 = ((DirList *) d2);
struct stat *s1 = &(f1->filestatus);
struct stat *s2 = &(f2->filestatus);
@@ -232,12 +232,12 @@ dir_sizesort(const void *d1, const void *d2)
if (strcmp(((DirList *) d2)->filename, "..") == 0) {
return(1);
}
-
+
/* put directories first */
if ((s1->st_mode & S_IFDIR) && (s2->st_mode & S_IFDIR)) {
- return(s1->st_size < s2->st_size ?
- -1
- :
+ return(s1->st_size < s2->st_size ?
+ -1
+ :
s1->st_size >= s2->st_size);
};
if (s1->st_mode & S_IFDIR) {
@@ -246,11 +246,11 @@ dir_sizesort(const void *d1, const void *d2)
if (s2->st_mode & S_IFDIR) {
return(1);
}
- return(s1->st_size < s2->st_size ?
- -1
- :
+ return(s1->st_size < s2->st_size ?
+ -1
+ :
s1->st_size >= s2->st_size);
-
+
} /* dir_sizesort() */
int
@@ -259,11 +259,11 @@ dir_datesort(const void *d1, const void *d2)
* desc: compare d1 and d2 on date, but put directories always first
*/
{
- DirList *f1 = ((DirList *) d1),
+ DirList *f1 = ((DirList *) d1),
*f2 = ((DirList *) d2);
struct stat *s1 = &(f1->filestatus);
struct stat *s2 = &(f2->filestatus);
-
+
/* check for '..' */
if (strcmp(((DirList *) d1)->filename, "..") == 0) {
@@ -272,12 +272,12 @@ dir_datesort(const void *d1, const void *d2)
if (strcmp(((DirList *) d2)->filename, "..") == 0) {
return(1);
}
-
+
/* put directories first */
if ((s1->st_mode & S_IFDIR) && (s2->st_mode & S_IFDIR)) {
- return(s1->st_mtime < s2->st_mtime ?
- -1
- :
+ return(s1->st_mtime < s2->st_mtime ?
+ -1
+ :
s1->st_mtime >= s2->st_mtime);
};
if (s1->st_mode & S_IFDIR) {
@@ -286,13 +286,13 @@ dir_datesort(const void *d1, const void *d2)
if (s2->st_mode & S_IFDIR) {
return(1);
}
- return(s1->st_mtime < s2->st_mtime ?
- -1
- :
+ return(s1->st_mtime < s2->st_mtime ?
+ -1
+ :
s1->st_mtime >= s2->st_mtime);
} /* dir_datesort() */
-
+
int
null_strcmp(char *s1, char *s2)
@@ -303,15 +303,15 @@ null_strcmp(char *s1, char *s2)
if ((s1 == NULL) && (s2 == NULL)) {
return(0);
}
- if (s1 == NULL) {
- return(-1);
+ if (s1 == NULL) {
+ return(-1);
}
if (s2 == NULL) {
return(1);
}
return(strcmp(s1, s2));
} /* null_strcmp() */
-
+
int
dir_extsort(const void *d1, const void *d2)
@@ -322,7 +322,7 @@ dir_extsort(const void *d1, const void *d2)
* post: see code
*/
{
- DirList *f1 = ((DirList *) d1),
+ DirList *f1 = ((DirList *) d1),
*f2 = ((DirList *) d2);
struct stat *s1 = &(f1->filestatus);
struct stat *s2 = &(f2->filestatus);
@@ -337,10 +337,10 @@ dir_extsort(const void *d1, const void *d2)
if (strcmp(((DirList *) d2)->filename, "..") == 0) {
return(1);
}
-
+
/* find the first extension */
-
+
ext1 = f1->filename + strlen(f1->filename);
extf = FALSE;
while (!extf && (ext1 > f1->filename)) {
@@ -353,21 +353,21 @@ dir_extsort(const void *d1, const void *d2)
}
/* ext1 == NULL if there's no "extension" else ext1 points */
/* to the first character of the extension string */
-
+
/* find the second extension */
-
+
ext2 = f2->filename + strlen(f2->filename);
extf = FALSE;
while (!extf && (ext2 > f2->filename)) {
extf = (*--ext2 == '.');
- }
+ }
if (!extf) {
ext2 = NULL;
} else {
ext2++;
}
/* idem as for ext1 */
-
+
if ((s1->st_mode & S_IFDIR) && (s2->st_mode & S_IFDIR)) {
ret = null_strcmp(ext1, ext2);
if (ret == 0) {
@@ -431,7 +431,7 @@ get_dir(char *dirname, char *fmask, DirList **dir, int *n)
/* Solution: */
/* manually insert the parent directory as the only */
/* directory entry, and return. */
-
+
if (*n == -1) {
*n = 1;
*dir = (DirList *) malloc(sizeof(DirList));
@@ -440,7 +440,7 @@ get_dir(char *dirname, char *fmask, DirList **dir, int *n)
(*dir)[0].filestatus = status;
(*dir)[0].link = FALSE;
return;
- }
+ }
*dir = (DirList *) malloc( *n * sizeof(DirList) );
d = 0;
@@ -450,7 +450,7 @@ get_dir(char *dirname, char *fmask, DirList **dir, int *n)
lstat(dire[j]->d_name, &status);
/* check if this file is to be included */
/* always include directories, the rest is subject to fmask */
- if (S_ISDIR(status.st_mode)
+ if (S_ISDIR(status.st_mode)
|| fnmatch(fmask, dire[j]->d_name, FNM_NOESCAPE) != FNM_NOMATCH) {
strcpy((*dir)[i].filename, dire[j]->d_name);
(*dir)[i].filestatus = status;
@@ -478,7 +478,7 @@ get_dir(char *dirname, char *fmask, DirList **dir, int *n)
j++;
}
*n = i;
-
+
/* sort the directory with the directory names on top */
qsort((*dir), *n, sizeof(DirList), _sort_func);
@@ -490,13 +490,13 @@ get_dir(char *dirname, char *fmask, DirList **dir, int *n)
return;
}/* get_dir() */
-
+
void
FreeDir(DirList *d, int n)
/*
* desc: free the dirlist d
- * pre: d != NULL
+ * pre: d != NULL
* post: memory allocated to d has been released
*/
{
diff --git a/gnu/lib/libdialog/dir.h b/gnu/lib/libdialog/dir.h
index cc06844b9cca..eadc0c5cb2f1 100644
--- a/gnu/lib/libdialog/dir.h
+++ b/gnu/lib/libdialog/dir.h
@@ -1,5 +1,5 @@
-/*
- * include file for dir.c
+/*
+ * include file for dir.c
*
* Copyright (c) 1995, Marc van Kempen
*
@@ -12,7 +12,7 @@
* responsible for the proper functioning of this software, nor does
* the author assume any responsibility for damages incurred with
* its use.
- *
+ *
*/
#include <sys/types.h>
@@ -25,7 +25,7 @@ typedef struct DirList { /* structure to hold the directory entries
int link; /* is it a link ? */
char *linkname; /* the name of the file the link points to */
} DirList;
-
+
#ifndef TRUE
#define TRUE (1)
#endif
diff --git a/gnu/lib/libdialog/fselect.c b/gnu/lib/libdialog/fselect.c
index e08849ba89e0..4a8d0751be44 100644
--- a/gnu/lib/libdialog/fselect.c
+++ b/gnu/lib/libdialog/fselect.c
@@ -1,7 +1,7 @@
/*
* program: fselect.c
* author: Marc van Kempen (wmbfmk@urc.tue.nl)
- * Desc: File selection routine
+ * Desc: File selection routine
*
* Copyright (c) 1995, Marc van Kempen
*
@@ -14,7 +14,7 @@
* responsible for the proper functioning of this software, nor does
* the author assume any responsibility for damages incurred with
* its use.
- *
+ *
*/
#include <stdlib.h>
@@ -31,7 +31,7 @@
char *dialog_dfselect(char *dir, char *fmask, int is_fselect);
-/*
+/*
* Functions
*/
@@ -60,7 +60,7 @@ get_directories(DirList *d, int n, char ***names, int *nd)
void
get_filenames(DirList *d, int n, char ***names, int *nf)
/*
- * Desc: return the filenames in <dir> as an arry in
+ * Desc: return the filenames in <dir> as an arry in
* <names>, the # of entries in <nf>, memory allocated
* to *names should be freed when done.
*/
@@ -78,7 +78,7 @@ get_filenames(DirList *d, int n, char ***names, int *nf)
(*names)[i] = (char *) malloc( strlen(d[i+nd].filename) + 1);
strcpy((*names)[i], d[i+nd].filename);
}
-
+
return;
} /* get_filenames() */
@@ -102,8 +102,8 @@ FreeNames(char **names, int n)
int
dialog_dselect_old(void)
/*
- * Desc: starting from the current directory,
- * choose a new current directory
+ * Desc: starting from the current directory,
+ * choose a new current directory
*/
{
DirList *d = NULL;
@@ -114,12 +114,12 @@ dialog_dselect_old(void)
StringObj *dir_obj;
char o_dir[MAXPATHLEN];
struct ComposeObj *obj = NULL;
- int n, nd, okbutton, cancelbutton,
+ int n, nd, okbutton, cancelbutton,
quit, cancel, ret;
ds_win = newwin(LINES-8, COLS-30, 4, 15);
if (ds_win == NULL) {
- fprintf(stderr, "\nnewwin(%d,%d,%d,%d) failed, maybe wrong dims\n",
+ fprintf(stderr, "\nnewwin(%d,%d,%d,%d) failed, maybe wrong dims\n",
LINES-8, COLS-30, 4, 15);
exit(1);
}
@@ -137,7 +137,7 @@ dialog_dselect_old(void)
/* the list of directories */
get_dir(".", "*", &d, &n);
get_directories(d, n, &names, &nd);
- dirs_obj = NewListObj(ds_win, "Directories:", names, o_dir, 5, 2,
+ dirs_obj = NewListObj(ds_win, "Directories:", names, o_dir, 5, 2,
LINES-15, COLS-48, nd);
AddObj(&obj, LISTOBJ, (void *) dirs_obj);
@@ -145,7 +145,7 @@ dialog_dselect_old(void)
okbutton = FALSE;
okbut = NewButtonObj(ds_win, "Continue", &okbutton, 7, COLS-45);
AddObj(&obj, BUTTONOBJ, (void *) okbut);
-
+
/* the Cancel-button */
cancelbutton = FALSE;
cancelbut = NewButtonObj(ds_win, "Return", &cancelbutton, 11, COLS-44);
@@ -176,7 +176,7 @@ dialog_dselect_old(void)
strcpy(old_dir, o_dir);
RefreshStringObj(dir_obj);
}
- }
+ }
get_dir(".", "*", &d, &n);
FreeNames(names, nd);
get_directories(d, n, &names, &nd);
@@ -194,7 +194,7 @@ dialog_dselect_old(void)
break;
}
}
-
+
FreeNames(names, nd);
DelObj(obj);
delwin(ds_win);
@@ -229,7 +229,7 @@ char *
dialog_dfselect(char *dir, char *fmask, int is_fselect)
/*
* Desc: choose a file from the directory <dir>, which
- * initially display files with the mask <filemask>
+ * initially display files with the mask <filemask>
* pre: <dir> is the initial directory
* only files corresponding to the mask <fmask> are displayed
* post: returns NULL if no file was selected
@@ -262,7 +262,7 @@ dialog_dfselect(char *dir, char *fmask, int is_fselect)
fs_win = newwin(LINES-2, COLS-20, 1, 10);
if (fs_win == NULL) {
endwin();
- fprintf(stderr, "\nnewwin(%d,%d,%d,%d) failed, maybe wrong dims\n",
+ fprintf(stderr, "\nnewwin(%d,%d,%d,%d) failed, maybe wrong dims\n",
LINES-2, COLS-20, 2, 10);
exit(1);
}
@@ -289,7 +289,7 @@ dialog_dfselect(char *dir, char *fmask, int is_fselect)
get_dir(".", fmask, &d, &n); /* read the entire directory */
get_directories(d, n, &dnames, &nd); /* extract the dir-entries */
if (is_fselect) {
- dirs_obj = NewListObj(fs_win, "Directories:", dnames, o_dir, 5, 2,
+ dirs_obj = NewListObj(fs_win, "Directories:", dnames, o_dir, 5, 2,
LINES-16, (COLS-20)/2-2, nd);
} else {
dirs_obj = NewListObj(fs_win, "Directories:", dnames, o_dir, 5, 2,
@@ -340,7 +340,7 @@ dialog_dfselect(char *dir, char *fmask, int is_fselect)
switch(ret) {
case SEL_CR:
if (strcmp(old_fmask, o_fm) || strcmp(old_dir, o_dir)) {
- /* reread directory and update the listobjects */
+ /* reread directory and update the listobjects */
if (strcmp(old_dir, o_dir)) { /* dir entry was changed */
if (chdir(o_dir)) {
dialog_notify("Could not change into directory");
diff --git a/gnu/lib/libdialog/gauge.c b/gnu/lib/libdialog/gauge.c
index 93f5542f8d7e..a44f96974416 100644
--- a/gnu/lib/libdialog/gauge.c
+++ b/gnu/lib/libdialog/gauge.c
@@ -20,7 +20,7 @@
#include "dialog.h"
void
-dialog_gauge(char *title, char *prompt, int y, int x,
+dialog_gauge(char *title, char *prompt, int y, int x,
int height, int width, int perc)
/*
* Desc: display a progress bar, progress indicated by <perc>
@@ -36,7 +36,7 @@ dialog_gauge(char *title, char *prompt, int y, int x,
height, width, y, x);
exit(-1);
}
-
+
draw_box(gw, 0, 0, height, width, dialog_attr, border_attr);
draw_shadow(stdscr, y, x, height, width);
@@ -69,4 +69,4 @@ dialog_gauge(char *title, char *prompt, int y, int x,
return;
} /* dialog_gauge() */
-
+
diff --git a/gnu/lib/libdialog/help.c b/gnu/lib/libdialog/help.c
index 51a1826f2e3a..de49c6ab576f 100644
--- a/gnu/lib/libdialog/help.c
+++ b/gnu/lib/libdialog/help.c
@@ -1,5 +1,5 @@
/***************************************************************
- *
+ *
* Program: help.c
* Author: Marc van Kempen
* Desc: get help
@@ -16,7 +16,7 @@
* responsible for the proper functioning of this software, nor does
* the author assume any responsibility for damages incurred with
* its use.
- *
+ *
***************************************************************/
#include <stdlib.h>
@@ -111,7 +111,7 @@ display_helpfile(void)
return;
} /* display_helpfile() */
-
+
/******************************************************************
*
@@ -121,7 +121,7 @@ display_helpfile(void)
void
use_helpline(char *hline)
-/*
+/*
* desc: set the helpline to printed in dialogs
*/
{
@@ -177,7 +177,7 @@ get_helpline(void)
} else {
hlp = NULL;
}
-
+
return(hlp);
} /* get_helpline() */
diff --git a/gnu/lib/libdialog/kernel.c b/gnu/lib/libdialog/kernel.c
index f719f7988542..e9d23b212930 100644
--- a/gnu/lib/libdialog/kernel.c
+++ b/gnu/lib/libdialog/kernel.c
@@ -25,7 +25,7 @@
* 19/12/93 - menu will now scroll if there are more items than can fit
* on the screen.
* - added 'checklist', a dialog box with a list of options that
- * can be turned on or off. A list of options that are on is
+ * can be turned on or off. A list of options that are on is
* returned on exit.
*
* 20/12/93 - Version 0.15 released.
@@ -67,7 +67,7 @@
* 13/01/94 - some changes for easier porting to other Unix systems (tested
* on Ultrix, SunOS and HPUX)
* - Version 0.3 released.
- *
+ *
* 08/06/94 - Patches by Stuart Herbert - S.Herbert@shef.ac.uk
* Fixed attr_clear and the textbox stuff to work with ncurses 1.8.5
* Fixed the wordwrap routine - it'll actually wrap properly now
diff --git a/gnu/lib/libdialog/menubox.c b/gnu/lib/libdialog/menubox.c
index 15324b4c0bd8..b5aed1f61333 100644
--- a/gnu/lib/libdialog/menubox.c
+++ b/gnu/lib/libdialog/menubox.c
@@ -71,7 +71,7 @@ int dialog_menu(unsigned char *title, unsigned char *prompt, int height, int wid
/* center dialog box on screen */
x = (COLS - width)/2;
y = (LINES - height)/2;
-
+
#ifdef HAVE_NCURSES
if (use_shadow)
draw_shadow(stdscr, y, x, height, width);
@@ -149,7 +149,7 @@ int dialog_menu(unsigned char *title, unsigned char *prompt, int height, int wid
if (key < 0x100 && toupper(key) == toupper(items[(scroll+i)*2][0]))
break;
- if (i < max_choice || (key >= '1' && key <= MIN('9', '0'+max_choice)) ||
+ if (i < max_choice || (key >= '1' && key <= MIN('9', '0'+max_choice)) ||
key == KEY_UP || key == KEY_DOWN || key == '-' || key == '+') {
if (key >= '1' && key <= MIN('9', '0'+max_choice))
i = key - '1';
@@ -245,7 +245,7 @@ int dialog_menu(unsigned char *title, unsigned char *prompt, int height, int wid
*ch = choice;
if (sc)
*sc = scroll;
-
+
switch (key) {
case KEY_PPAGE:
if (scroll > height-4) { /* can we go up? */
@@ -316,7 +316,7 @@ int dialog_menu(unsigned char *title, unsigned char *prompt, int height, int wid
}
if (redraw_menu) {
for (i = 0; i < max_choice; i++) {
- print_item(menu, items[(scroll+i)*2],
+ print_item(menu, items[(scroll+i)*2],
items[(scroll+i)*2 + 1], i, i == choice);
}
wnoutrefresh(menu);
diff --git a/gnu/lib/libdialog/msgbox.c b/gnu/lib/libdialog/msgbox.c
index 867f64989fbd..75ff399f5539 100644
--- a/gnu/lib/libdialog/msgbox.c
+++ b/gnu/lib/libdialog/msgbox.c
@@ -226,7 +226,7 @@ dialog_mesgbox(unsigned char *title, unsigned char *prompt, int height, int widt
display_helpfile();
break;
}
- print_page(dialog, theight, width, prompt, startline, hscroll);
+ print_page(dialog, theight, width, prompt, startline, hscroll);
print_perc(dialog, height-3, width-9, (float) (startline+theight)/max_lines);
wmove(dialog, height-2, width/2-2);
wrefresh(dialog);
@@ -284,7 +284,7 @@ getline(unsigned char *buf, int n)
if (n<0) {
return(NULL);
}
-
+
i=0;
while (*buf && i<n) {
if (*buf == '\n' || *buf == '\r') {
@@ -315,7 +315,7 @@ print_page(WINDOW *win, int height, int width, unsigned char *buf, int startline
wmove(win, 1+i, 1);
for (j=0; j<width-2; j++) waddnstr(win, " ", 1);
wmove(win, 1+i, 1);
- j = 0;
+ j = 0;
/* scroll to the right */
while (*b && (*b != '\n') && (*b != '\r') && (j<hscroll)) {
b++;
@@ -336,7 +336,7 @@ print_page(WINDOW *win, int height, int width, unsigned char *buf, int startline
if (*b) b++; /* skip over '\n', if it exists */
}
} /* print_page() */
-
-
-
-
+
+
+
+
diff --git a/gnu/lib/libdialog/notify.c b/gnu/lib/libdialog/notify.c
index 1000c7bd0f90..052ee8f27528 100644
--- a/gnu/lib/libdialog/notify.c
+++ b/gnu/lib/libdialog/notify.c
@@ -14,7 +14,7 @@
* responsible for the proper functioning of this software, nor does
* the author assume any responsibility for damages incurred with
* its use.
- *
+ *
*/
@@ -23,7 +23,7 @@
void
dialog_notify(char *msg)
-/*
+/*
* Desc: display an error message
*/
{
diff --git a/gnu/lib/libdialog/radiolist.c b/gnu/lib/libdialog/radiolist.c
index 31495d5587ef..fefcb53043f3 100644
--- a/gnu/lib/libdialog/radiolist.c
+++ b/gnu/lib/libdialog/radiolist.c
@@ -87,7 +87,7 @@ int dialog_radiolist(unsigned char *title, unsigned char *prompt, int height, in
/* center dialog box on screen */
x = (COLS - width)/2;
y = (LINES - height)/2;
-
+
#ifdef HAVE_NCURSES
if (use_shadow)
draw_shadow(stdscr, y, x, height, width);
@@ -164,7 +164,7 @@ int dialog_radiolist(unsigned char *title, unsigned char *prompt, int height, in
if (toupper(key) == toupper(items[(scroll+i)*3][0]))
break;
- if (i < max_choice || (key >= '1' && key <= MIN('9', '0'+max_choice)) ||
+ if (i < max_choice || (key >= '1' && key <= MIN('9', '0'+max_choice)) ||
key == KEY_UP || key == KEY_DOWN || key == ' ' ||
key == '+' || key == '-' ) {
if (key >= '1' && key <= MIN('9', '0'+max_choice))
diff --git a/gnu/lib/libdialog/raw_popen.c b/gnu/lib/libdialog/raw_popen.c
index 6393eb189944..fabf91e20c94 100644
--- a/gnu/lib/libdialog/raw_popen.c
+++ b/gnu/lib/libdialog/raw_popen.c
@@ -53,8 +53,8 @@ static struct pid {
struct pid *next;
FILE *fp;
pid_t pid;
-} *pidlist;
-
+} *pidlist;
+
FILE *
raw_popen(const char *program, char * const *argv, const char *type)
{
@@ -155,6 +155,6 @@ raw_pclose(FILE *iop)
else
last->next = cur->next;
free(cur);
-
+
return (pid == -1 ? -1 : pstat.w_status);
}
diff --git a/gnu/lib/libdialog/ui_objects.c b/gnu/lib/libdialog/ui_objects.c
index efa39dcc9d3c..c588b94a9464 100644
--- a/gnu/lib/libdialog/ui_objects.c
+++ b/gnu/lib/libdialog/ui_objects.c
@@ -3,7 +3,7 @@
* Author: Marc van Kempen
* Desc: Implementation of UI-objects:
* - String input fields
- * - List selection
+ * - List selection
* - Buttons
*
* Copyright (c) 1995, Marc van Kempen
@@ -17,7 +17,7 @@
* responsible for the proper functioning of this software, nor does
* the author assume any responsibility for damages incurred with
* its use.
- *
+ *
*/
#include <stdlib.h>
@@ -79,14 +79,14 @@ FreeObj(ComposeObj *Obj)
*/
{
ComposeObj *o = Obj;
-
+
o = Obj;
while (o) {
o = Obj->next;
free(Obj);
Obj = o;
}
-
+
return;
} /* FreeObj() */
@@ -94,7 +94,7 @@ FreeObj(ComposeObj *Obj)
int
ReadObj(ComposeObj *Obj)
/*
- * Desc: navigate through the different objects calling their
+ * Desc: navigate through the different objects calling their
* respective navigation routines as necessary
* Pre: Obj != NULL
*/
@@ -145,7 +145,7 @@ ReadObj(ComposeObj *Obj)
}
return(ret);
-
+
} /* ReadObj() */
@@ -225,7 +225,7 @@ DelObj(ComposeObj *Obj)
FreeObj(o);
} /* DelObj() */
-
+
/***********************************************************************
*
* StringObj routines
@@ -265,7 +265,7 @@ NewStringObj(WINDOW *win, char *title, char *s, int y, int x, int w, int len)
*/
{
StringObj *so;
-
+
/* Initialize a new object */
so = (StringObj *) malloc( sizeof(StringObj) );
if (!so) {
@@ -302,7 +302,7 @@ SelectStringObj(StringObj *so)
char tmp[so->len+1];
strcpy(tmp, so->s);
- key = line_edit(so->win, so->y+2, so->x+1,
+ key = line_edit(so->win, so->y+2, so->x+1,
so->len, so->w-2, inputbox_attr, TRUE, tmp);
if ((key == '\n') || (key == '\r') || (key == '\t') || key == (KEY_BTAB) ) {
strcpy(so->s, tmp);
@@ -335,7 +335,7 @@ DelStringObj(StringObj *so)
return;
}
-
+
/***********************************************************************
*
* ListObj routines
@@ -377,7 +377,7 @@ DrawNames(ListObj *lo)
i++;
}
- return;
+ return;
} /* DrawNames() */
void
@@ -401,12 +401,12 @@ RefreshListObj(ListObj *lo)
sprintf(perc, "(%3d%%)", MIN(100, (int) (100 * (lo->sel+lo->h-2) / MAX(1, lo->n))));
wmove(lo->win, lo->y + lo->h, lo->x + lo->w - 8);
wattrset(lo->win, dialog_attr);
- waddstr(lo->win, perc);
-
-
+ waddstr(lo->win, perc);
+
+
return;
} /* RefreshListObj() */
-
+
ListObj *
NewListObj(WINDOW *win, char *title, char **list, char *listelt, int y, int x,
int h, int w, int n)
@@ -485,7 +485,7 @@ UpdateListObj(ListObj *lo, char **list, int n)
}
} else {
lo->seld = NULL;
- }
+ }
lo->n = n;
lo->scroll = 0;
lo->sel = 0;
@@ -521,7 +521,7 @@ SelectListObj(ListObj *lo)
key = wgetch(lo->win);
quit = FALSE;
- while ((key != '\t') && (key != '\n') && (key != '\r')
+ while ((key != '\t') && (key != '\n') && (key != '\r')
&& (key != ESC) && (key != KEY_F(1)) && (key != '?') && !quit) {
/* first draw current item in normal video */
wmove(lo->win, sel_y, sel_x);
@@ -620,11 +620,11 @@ SelectListObj(ListObj *lo)
break;
}
/* Draw % indication */
- sprintf(perc, "(%3d%%)", MIN(100, (int)
+ sprintf(perc, "(%3d%%)", MIN(100, (int)
(100 * (lo->sel+lo->h - 2) / MAX(1, lo->n))));
wmove(lo->win, lo->y + lo->h, lo->x + lo->w - 8);
wattrset(lo->win, dialog_attr);
- waddstr(lo->win, perc);
+ waddstr(lo->win, perc);
/* draw current item in inverse */
wmove(lo->win, sel_y, sel_x);
@@ -632,8 +632,8 @@ SelectListObj(ListObj *lo)
if (strlen(lo->name[lo->sel]) > lo->w - 2) {
/* when printing in inverse video show the last characters in the */
/* name that will fit in the window */
- strncpy(tmp,
- lo->name[lo->sel] + strlen(lo->name[lo->sel]) - (lo->w - 2),
+ strncpy(tmp,
+ lo->name[lo->sel] + strlen(lo->name[lo->sel]) - (lo->w - 2),
lo->w - 2);
tmp[lo->w - 2] = 0;
waddstr(lo->win, tmp);
@@ -642,7 +642,7 @@ SelectListObj(ListObj *lo)
}
if (!quit) key = wgetch(lo->win);
}
-
+
if (key == ESC) {
return(SEL_ESC);
}
@@ -674,8 +674,8 @@ DelListObj(ListObj *lo)
void
MarkCurrentListObj(ListObj *lo)
-/*
- * Desc: mark the current item for the selection list
+/*
+ * Desc: mark the current item for the selection list
*/
{
lo->seld[lo->sel] = !(lo->seld[lo->sel]);
@@ -707,7 +707,7 @@ UnMarkAllListObj(ListObj *lo)
*/
{
int i;
-
+
for (i=0; i<lo->n; i++) {
lo->seld[i] = FALSE;
}
@@ -745,7 +745,7 @@ NewButtonObj(WINDOW *win, char *title, int *pushed, int y, int x)
ButtonObj *bo;
bo = (ButtonObj *) malloc( sizeof(ButtonObj) );
-
+
bo->win = win;
bo->title = (char *) malloc( strlen(title) + 1);
strcpy(bo->title, title);
@@ -771,7 +771,7 @@ SelectButtonObj(ButtonObj *bo)
print_button(bo->win, bo->title, bo->y+1, bo->x+2, TRUE);
wmove(bo->win, bo->y+1, bo->x+(bo->w/2)-1);
key = wgetch(bo->win);
- print_button(bo->win, bo->title, bo->y+1, bo->x+2, FALSE);
+ print_button(bo->win, bo->title, bo->y+1, bo->x+2, FALSE);
switch(key) {
case '\t':
return(SEL_TAB);
diff --git a/gnu/lib/libdialog/ui_objects.h b/gnu/lib/libdialog/ui_objects.h
index 3b0a544250ba..db9a12c18516 100644
--- a/gnu/lib/libdialog/ui_objects.h
+++ b/gnu/lib/libdialog/ui_objects.h
@@ -13,7 +13,7 @@
* responsible for the proper functioning of this software, nor does
* the author assume any responsibility for damages incurred with
* its use.
- *
+ *
*/
#include "dialog.h"
@@ -85,13 +85,13 @@ typedef struct ComposeObj {
**********************************************************************/
void RefreshStringObj(StringObj *so);
-StringObj *NewStringObj(WINDOW *win, char *title, char *s,
+StringObj *NewStringObj(WINDOW *win, char *title, char *s,
int y, int x, int w, int len);
int SelectStringObj(StringObj *so);
void DelStringObj(StringObj *so);
void RefreshListObj(ListObj *lo);
-ListObj *NewListObj(WINDOW *win, char *title, char **list,
+ListObj *NewListObj(WINDOW *win, char *title, char **list,
char *listelt, int y, int x, int h, int w, int n);
void UpdateListObj(ListObj *lo, char **list, int n);
int SelectListObj(ListObj *lo);
@@ -101,7 +101,7 @@ void MarkAllListObj(ListObj *lo);
void UnMarkAllListObj(ListObj *lo);
void RefreshButtonObj(ButtonObj *bo);
-ButtonObj *NewButtonObj(WINDOW *win, char *title, int *pushed,
+ButtonObj *NewButtonObj(WINDOW *win, char *title, int *pushed,
int y, int x);
int SelectButtonObj(ButtonObj *bo);
void DelButtonObj(ButtonObj *bo);
diff --git a/gnu/lib/libdialog/yesno.c b/gnu/lib/libdialog/yesno.c
index 14ec47dc8ec6..67de4243c55b 100644
--- a/gnu/lib/libdialog/yesno.c
+++ b/gnu/lib/libdialog/yesno.c
@@ -52,7 +52,7 @@ int dialog_yesno(unsigned char *title, unsigned char * prompt, int height, int w
/* center dialog box on screen */
x = (COLS - width)/2;
y = (LINES - height)/2;
-
+
#ifdef HAVE_NCURSES
if (use_shadow)
draw_shadow(stdscr, y, x, height, width);
diff --git a/gnu/lib/libg++/include/ACG.h b/gnu/lib/libg++/include/ACG.h
index 809380050ba9..fc16e2a82044 100644
--- a/gnu/lib/libg++/include/ACG.h
+++ b/gnu/lib/libg++/include/ACG.h
@@ -1,5 +1,5 @@
// This may look like C code, but it is really -*- C++ -*-
-/*
+/*
Copyright (C) 1988 Free Software Foundation
written by Dirk Grunwald (grunwald@cs.uiuc.edu)
@@ -16,7 +16,7 @@ License along with this library; if not, write to the Free Software
Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef _ACG_h
-#define _ACG_h 1
+#define _ACG_h 1
#include <RNG.h>
#include <math.h>
diff --git a/gnu/lib/libg++/include/AllocRing.h b/gnu/lib/libg++/include/AllocRing.h
index 15dd1610750c..f2f5db57d0e3 100644
--- a/gnu/lib/libg++/include/AllocRing.h
+++ b/gnu/lib/libg++/include/AllocRing.h
@@ -1,5 +1,5 @@
// This may look like C code, but it is really -*- C++ -*-
-/*
+/*
Copyright (C) 1989 Free Software Foundation
written by Doug Lea (dl@rocky.oswego.edu)
@@ -25,7 +25,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
/*
- An AllocRing holds the last n malloc'ed strings, reallocating/reusing
+ An AllocRing holds the last n malloc'ed strings, reallocating/reusing
one only when the queue wraps around. It thus guarantees that the
last n allocations are intact. It is useful for things like I/O
formatting where reasonable restrictions may be made about the
diff --git a/gnu/lib/libg++/include/Binomial.h b/gnu/lib/libg++/include/Binomial.h
index f88dfc3a4670..f02730bf49aa 100644
--- a/gnu/lib/libg++/include/Binomial.h
+++ b/gnu/lib/libg++/include/Binomial.h
@@ -1,5 +1,5 @@
// This may look like C code, but it is really -*- C++ -*-
-/*
+/*
Copyright (C) 1988 Free Software Foundation
written by Dirk Grunwald (grunwald@cs.uiuc.edu)
diff --git a/gnu/lib/libg++/include/BitSet.h b/gnu/lib/libg++/include/BitSet.h
index ca1d96f9ce32..c80e3274bae4 100644
--- a/gnu/lib/libg++/include/BitSet.h
+++ b/gnu/lib/libg++/include/BitSet.h
@@ -1,5 +1,5 @@
// This may look like C code, but it is really -*- C++ -*-
-/*
+/*
Copyright (C) 1988 Free Software Foundation
written by Doug Lea (dl@rocky.oswego.edu)
@@ -36,11 +36,11 @@ struct BitSetRep
unsigned short s[1]; // bits start here
};
-extern BitSetRep* BitSetalloc(BitSetRep*, const unsigned short*,
+extern BitSetRep* BitSetalloc(BitSetRep*, const unsigned short*,
int, int, int);
extern BitSetRep* BitSetcopy(BitSetRep*, const BitSetRep*);
extern BitSetRep* BitSetresize(BitSetRep*, int);
-extern BitSetRep* BitSetop(const BitSetRep*, const BitSetRep*,
+extern BitSetRep* BitSetop(const BitSetRep*, const BitSetRep*,
BitSetRep*, char);
extern BitSetRep* BitSetcmpl(const BitSetRep*, BitSetRep*);
@@ -69,7 +69,7 @@ class BitSet
protected:
BitSetRep* rep;
-
+
public:
// constructors
@@ -116,7 +116,7 @@ public:
int test(int from, int to) const;
BitSetBit operator [] (int i);
-
+
// iterators
int first(int b = 1) const;
@@ -132,13 +132,13 @@ public:
int empty() const;
int virtual_bit() const;
int count(int b = 1) const;
-
+
// convertors & IO
- friend BitSet atoBitSet(const char* s,
+ friend BitSet atoBitSet(const char* s,
char f='0', char t='1', char star='*');
// BitSettoa is deprecated; do not use in new programs.
- friend const char* BitSettoa(const BitSet& x,
+ friend const char* BitSettoa(const BitSet& x,
char f='0', char t='1', char star='*');
friend BitSet shorttoBitSet(unsigned short w);
@@ -193,7 +193,7 @@ inline BitSet::BitSet(const BitSet& x) :rep(BitSetcopy(0, x.rep)) {}
inline BitSet::~BitSet() { if (rep != &_nilBitSetRep) delete rep; }
inline BitSet& BitSet::operator = (const BitSet& y)
-{
+{
rep = BitSetcopy(rep, y.rep);
return *this;
}
@@ -258,27 +258,27 @@ inline BitSet operator ~ (const BitSet& x) return r
#else /* NO_NRV */
-inline BitSet operator & (const BitSet& x, const BitSet& y)
+inline BitSet operator & (const BitSet& x, const BitSet& y)
{
BitSet r; and(x, y, r); return r;
}
-inline BitSet operator | (const BitSet& x, const BitSet& y)
+inline BitSet operator | (const BitSet& x, const BitSet& y)
{
BitSet r; or(x, y, r); return r;
}
-inline BitSet operator ^ (const BitSet& x, const BitSet& y)
+inline BitSet operator ^ (const BitSet& x, const BitSet& y)
{
BitSet r; xor(x, y, r); return r;
}
-inline BitSet operator - (const BitSet& x, const BitSet& y)
+inline BitSet operator - (const BitSet& x, const BitSet& y)
{
BitSet r; diff(x, y, r); return r;
}
-inline BitSet operator ~ (const BitSet& x)
+inline BitSet operator ~ (const BitSet& x)
{
BitSet r; ::complement(x, r); return r;
}
@@ -329,7 +329,7 @@ inline int BitSet::test(int p) const
{
if (p < 0) error("Illegal bit index");
int index = BitSet_index(p);
- return (index >= rep->len)? rep->virt :
+ return (index >= rep->len)? rep->virt :
((rep->s[index] & (1 << BitSet_pos(p))) != 0);
}
diff --git a/gnu/lib/libg++/include/BitString.h b/gnu/lib/libg++/include/BitString.h
index b2b92b153c04..f30b440afaa3 100644
--- a/gnu/lib/libg++/include/BitString.h
+++ b/gnu/lib/libg++/include/BitString.h
@@ -1,5 +1,5 @@
// This may look like C code, but it is really -*- C++ -*-
-/*
+/*
Copyright (C) 1988 Free Software Foundation
written by Doug Lea (dl@rocky.oswego.edu)
@@ -138,7 +138,7 @@ public:
friend void complement(const BitString&, BitString&);
- friend int lcompare(const BitString&, const BitString&);
+ friend int lcompare(const BitString&, const BitString&);
// assignment-based operators
// (constuctive versions decalred inline below
@@ -162,7 +162,7 @@ public:
void clear(int pos);
void clear(int from, int to);
- void clear();
+ void clear();
void invert(int pos);
void invert(int from, int to);
@@ -188,7 +188,7 @@ public:
// searching & matching
- int index(unsigned int bit, int startpos = 0) const ;
+ int index(unsigned int bit, int startpos = 0) const ;
int index(const BitString&, int startpos = 0) const;
int index(const BitSubString&, int startpos = 0) const;
int index(const BitPattern&, int startpos = 0) const;
@@ -208,9 +208,9 @@ public:
// BitSubString extraction
BitSubString at(int pos, int len);
- BitSubString at(const BitString&, int startpos = 0);
- BitSubString at(const BitSubString&, int startpos = 0);
- BitSubString at(const BitPattern&, int startpos = 0);
+ BitSubString at(const BitString&, int startpos = 0);
+ BitSubString at(const BitSubString&, int startpos = 0);
+ BitSubString at(const BitPattern&, int startpos = 0);
BitSubString before(int pos);
BitSubString before(const BitString&, int startpos = 0);
@@ -224,9 +224,9 @@ public:
// other friends & utilities
- friend BitString common_prefix(const BitString&, const BitString&,
+ friend BitString common_prefix(const BitString&, const BitString&,
int pos = 0);
- friend BitString common_suffix(const BitString&, const BitString&,
+ friend BitString common_suffix(const BitString&, const BitString&,
int pos = -1);
friend BitString reverse(const BitString&);
@@ -259,7 +259,7 @@ public:
friend BitPattern atoBitPattern(const char* s,
char f='0',char t='1',char x='X');
- friend const char* BitPatterntoa(const BitPattern& p,
+ friend const char* BitPatterntoa(const BitPattern& p,
char f='0',char t='1',char x='X');
int OK() const;
};
@@ -277,7 +277,7 @@ public:
~BitPattern();
- friend const char* BitPatterntoa(const BitPattern& p,
+ friend const char* BitPatterntoa(const BitPattern& p,
char f/*='0'*/,char t/*='1'*/,char x/*='X'*/);
void printon(ostream&, char f='0',char t='1',char x='X') const;
friend BitPattern atoBitPattern(const char* s, char f,char t, char x);
@@ -320,16 +320,16 @@ inline BitString::BitString() :rep(&_nilBitStrRep) {}
inline BitString::BitString(const BitString& x) :rep(BStr_copy(0, x.rep)) {}
-inline BitString::BitString(const BitSubString& y)
+inline BitString::BitString(const BitSubString& y)
:rep (BStr_alloc(0, y.S.rep->s, y.pos, y.pos+y.len, y.len)) {}
inline BitString::~BitString()
-{
+{
if (rep != &_nilBitStrRep) delete rep;
}
-inline BitString shorttoBitString(unsigned short w)
-{
+inline BitString shorttoBitString(unsigned short w)
+{
BitString r;
_BS_word ww = w;
#if _BS_BIGENDIAN
@@ -339,8 +339,8 @@ inline BitString shorttoBitString(unsigned short w)
return r;
}
-inline BitString longtoBitString(unsigned long w)
-{
+inline BitString longtoBitString(unsigned long w)
+{
BitString r;
#if 1
_BS_word u = w;
@@ -355,13 +355,13 @@ inline BitString longtoBitString(unsigned long w)
}
inline BitString& BitString::operator = (const BitString& y)
-{
+{
rep = BStr_copy(rep, y.rep);
return *this;
}
inline BitString& BitString::operator = (unsigned int b)
-{
+{
_BS_word bit = b;
rep = BStr_alloc(rep, &bit, 0, 1, 1);
return *this;
@@ -373,7 +373,7 @@ inline BitString& BitString::operator=(const BitSubString& y)
return *this;
}
-inline BitSubString::BitSubString(const BitSubString& x)
+inline BitSubString::BitSubString(const BitSubString& x)
:S(x.S), pos(x.pos), len(x.len) {}
inline BitSubString::BitSubString(BitString& x, int p, int l)
@@ -544,47 +544,47 @@ inline BitString operator ~ (const BitString& x) return r
#else /* NO_NRV */
-inline BitString operator & (const BitString& x, const BitString& y)
+inline BitString operator & (const BitString& x, const BitString& y)
{
BitString r; and(x, y, r); return r;
}
-inline BitString operator | (const BitString& x, const BitString& y)
+inline BitString operator | (const BitString& x, const BitString& y)
{
BitString r; or(x, y, r); return r;
}
-inline BitString operator ^ (const BitString& x, const BitString& y)
+inline BitString operator ^ (const BitString& x, const BitString& y)
{
BitString r; xor(x, y, r); return r;
}
-inline BitString operator << (const BitString& x, int y)
+inline BitString operator << (const BitString& x, int y)
{
BitString r; lshift(x, y, r); return r;
}
-inline BitString operator >> (const BitString& x, int y)
+inline BitString operator >> (const BitString& x, int y)
{
BitString r; rshift(x, y, r); return r;
}
-inline BitString operator - (const BitString& x, const BitString& y)
+inline BitString operator - (const BitString& x, const BitString& y)
{
BitString r; diff(x, y, r); return r;
}
-inline BitString operator + (const BitString& x, const BitString& y)
+inline BitString operator + (const BitString& x, const BitString& y)
{
BitString r; cat(x, y, r); return r;
}
-inline BitString operator + (const BitString& x, unsigned int y)
+inline BitString operator + (const BitString& x, unsigned int y)
{
BitString r; cat(x, y, r); return r;
}
-inline BitString operator ~ (const BitString& x)
+inline BitString operator ~ (const BitString& x)
{
BitString r; complement(x, r); return r;
}
@@ -594,32 +594,32 @@ inline BitString operator ~ (const BitString& x)
// status, matching
inline int BitString::length() const
-{
+{
return rep->len;
}
inline int BitString::empty() const
-{
+{
return rep->len == 0;
}
inline int BitString::index(const BitString& y, int startpos) const
-{
+{
return search(startpos, rep->len, y.rep->s, 0, y.rep->len);
}
inline int BitString::index(const BitSubString& y, int startpos) const
-{
+{
return search(startpos, rep->len, y.S.rep->s, y.pos, y.pos+y.len);
}
inline int BitString::contains(const BitString& y) const
-{
+{
return search(0, rep->len, y.rep->s, 0, y.rep->len) >= 0;
}
inline int BitString::contains(const BitSubString& y) const
-{
+{
return search(0, rep->len, y.S.rep->s, y.pos, y.pos+y.len) >= 0;
}
@@ -664,12 +664,12 @@ inline int BitString::index(const BitPattern& r, int startpos) const
}
inline int BitSubString::length() const
-{
+{
return len;
}
inline int BitSubString::empty() const
-{
+{
return len == 0;
}
@@ -706,7 +706,7 @@ inline int BitString::index(unsigned int bit, int startpos) const
return prev(rep->len + startpos + 1, bit);
}
-inline void BitString::right_trim(unsigned int b)
+inline void BitString::right_trim(unsigned int b)
{
int nb = (b == 0)? 1 : 0;
rep = BStr_resize(rep, prev(rep->len, nb) + 1);
@@ -721,7 +721,7 @@ inline void BitString::left_trim(unsigned int b)
inline int BitString::test(int i) const
{
- return ((unsigned)(i) >= rep->len)? 0 :
+ return ((unsigned)(i) >= rep->len)? 0 :
((rep->s[BitStr_index(i)] & (1 << (BitStr_pos(i)))) != 0);
}
@@ -754,7 +754,7 @@ inline BitSubString BitString::_substr(int first, int l)
{
if (first < 0 || l <= 0 || (unsigned)(first + l) > rep->len)
return BitSubString(_nil_BitString, 0, 0) ;
- else
+ else
return BitSubString(*this, first, l);
}
diff --git a/gnu/lib/libg++/include/Complex.h b/gnu/lib/libg++/include/Complex.h
index 9b7e378ed383..128227bc3cc5 100644
--- a/gnu/lib/libg++/include/Complex.h
+++ b/gnu/lib/libg++/include/Complex.h
@@ -1,5 +1,5 @@
// This may look like C code, but it is really -*- C++ -*-
-/*
+/*
Copyright (C) 1988 Free Software Foundation
written by Doug Lea (dl@rocky.oswego.edu)
@@ -57,8 +57,8 @@ public:
Complex& operator *= (const Complex& y);
Complex& operator *= (double y);
- Complex& operator /= (const Complex& y);
- Complex& operator /= (double y);
+ Complex& operator /= (const Complex& y);
+ Complex& operator /= (double y);
void error(const char* msg) const;
};
@@ -83,7 +83,7 @@ Complex pow(const Complex& x, int p);
Complex pow(const Complex& x, const Complex& p);
Complex pow(const Complex& x, double y);
Complex sqrt(const Complex& x);
-
+
istream& operator >> (istream& s, Complex& x);
ostream& operator << (ostream& s, const Complex& x);
@@ -99,42 +99,42 @@ inline Complex::Complex(double r, double i) :re(r), im(i) {}
inline Complex::~Complex() {}
-inline Complex& Complex::operator = (const Complex& y)
-{
- re = y.real(); im = y.imag(); return *this;
-}
+inline Complex& Complex::operator = (const Complex& y)
+{
+ re = y.real(); im = y.imag(); return *this;
+}
inline Complex& Complex::operator += (const Complex& y)
-{
- re += y.real(); im += y.imag(); return *this;
+{
+ re += y.real(); im += y.imag(); return *this;
}
inline Complex& Complex::operator += (double y)
-{
- re += y; return *this;
+{
+ re += y; return *this;
}
inline Complex& Complex::operator -= (const Complex& y)
-{
- re -= y.real(); im -= y.imag(); return *this;
+{
+ re -= y.real(); im -= y.imag(); return *this;
}
inline Complex& Complex::operator -= (double y)
-{
- re -= y; return *this;
+{
+ re -= y; return *this;
}
inline Complex& Complex::operator *= (const Complex& y)
-{
+{
double r = re * y.real() - im * y.imag();
- im = re * y.imag() + im * y.real();
- re = r;
- return *this;
+ im = re * y.imag() + im * y.real();
+ re = r;
+ return *this;
}
inline Complex& Complex::operator *= (double y)
-{
- re *= y; im *= y; return *this;
+{
+ re *= y; im *= y; return *this;
}
@@ -202,7 +202,7 @@ inline Complex operator - (double x, const Complex& y)
inline Complex operator * (const Complex& x, const Complex& y)
{
- return Complex(x.real() * y.real() - x.imag() * y.imag(),
+ return Complex(x.real() * y.real() - x.imag() * y.imag(),
x.real() * y.imag() + x.imag() * y.real());
}
diff --git a/gnu/lib/libg++/include/CursesW.h b/gnu/lib/libg++/include/CursesW.h
index 1df2e8a0aa41..8ac6f3c4af6d 100644
--- a/gnu/lib/libg++/include/CursesW.h
+++ b/gnu/lib/libg++/include/CursesW.h
@@ -1,6 +1,6 @@
// This may look like C code, but it is really -*- C++ -*-
-/*
+/*
Copyright (C) 1989 Free Software Foundation
written by Eric Newton (newton@rocky.oswego.edu)
@@ -237,7 +237,7 @@ inline int (mvinsch)(int y, int x, char c)
*
*/
-class CursesWindow
+class CursesWindow
{
protected:
static int count; // count of all active windows:
@@ -385,102 +385,102 @@ inline int CursesWindow::width()
return maxx() - begx() + 1;
}
-inline int CursesWindow::box(char vert, char hor)
+inline int CursesWindow::box(char vert, char hor)
{
- return ::box(w, vert, hor);
+ return ::box(w, vert, hor);
}
-inline int CursesWindow::overlay(CursesWindow &win)
+inline int CursesWindow::overlay(CursesWindow &win)
{
- return ::overlay(w, win.w);
+ return ::overlay(w, win.w);
}
-inline int CursesWindow::overwrite(CursesWindow &win)
+inline int CursesWindow::overwrite(CursesWindow &win)
{
- return ::overwrite(w, win.w);
+ return ::overwrite(w, win.w);
}
-inline int CursesWindow::scroll()
+inline int CursesWindow::scroll()
{
- return ::scroll(w);
+ return ::scroll(w);
}
-inline int CursesWindow::touchwin()
+inline int CursesWindow::touchwin()
{
- return ::touchwin(w);
+ return ::touchwin(w);
}
-inline int CursesWindow::addch(const char ch)
+inline int CursesWindow::addch(const char ch)
{
- return ::waddch(w, ch);
+ return ::waddch(w, ch);
}
-inline int CursesWindow::addstr(const char * str)
+inline int CursesWindow::addstr(const char * str)
{
// The (char*) cast is to hack around prototypes in curses.h that
// have const missing in the parameter lists. [E.g. SVR4]
- return ::waddstr(w, (char*)str);
+ return ::waddstr(w, (char*)str);
}
-inline int CursesWindow::clear()
+inline int CursesWindow::clear()
{
- return ::wclear(w);
+ return ::wclear(w);
}
-inline int CursesWindow::clrtobot()
+inline int CursesWindow::clrtobot()
{
- return ::wclrtobot(w);
+ return ::wclrtobot(w);
}
-inline int CursesWindow::clrtoeol()
+inline int CursesWindow::clrtoeol()
{
- return ::wclrtoeol(w);
+ return ::wclrtoeol(w);
}
-inline int CursesWindow::delch()
+inline int CursesWindow::delch()
{
- return ::wdelch(w);
+ return ::wdelch(w);
}
-inline int CursesWindow::deleteln()
+inline int CursesWindow::deleteln()
{
- return ::wdeleteln(w);
+ return ::wdeleteln(w);
}
-inline int CursesWindow::erase()
+inline int CursesWindow::erase()
{
- return ::werase(w);
+ return ::werase(w);
}
-inline int CursesWindow::getch()
+inline int CursesWindow::getch()
{
- return ::wgetch(w);
+ return ::wgetch(w);
}
-inline int CursesWindow::getstr(char * str)
+inline int CursesWindow::getstr(char * str)
{
- return ::wgetstr(w, str);
+ return ::wgetstr(w, str);
}
-inline int CursesWindow::inch()
+inline int CursesWindow::inch()
{
- return winch(w);
+ return winch(w);
}
-inline int CursesWindow::insch(char c)
+inline int CursesWindow::insch(char c)
{
- return ::winsch(w, c);
+ return ::winsch(w, c);
}
-inline int CursesWindow::insertln()
+inline int CursesWindow::insertln()
{
- return ::winsertln(w);
+ return ::winsertln(w);
}
-inline int CursesWindow::move(int y, int x)
+inline int CursesWindow::move(int y, int x)
{
- return ::wmove(w, y, x);
+ return ::wmove(w, y, x);
}
@@ -524,56 +524,56 @@ inline int CursesWindow::mvinsch(int y, int x, char ch)
return (::wmove(w, y, x)==ERR) ? ERR : ::winsch(w, ch);
}
-inline int CursesWindow::refresh()
+inline int CursesWindow::refresh()
{
- return ::wrefresh(w);
+ return ::wrefresh(w);
}
-inline int CursesWindow::clearok(int bf)
+inline int CursesWindow::clearok(int bf)
{
- return ::clearok(w,bf);
+ return ::clearok(w,bf);
}
-inline int CursesWindow::leaveok(int bf)
+inline int CursesWindow::leaveok(int bf)
{
- return ::leaveok(w,bf);
+ return ::leaveok(w,bf);
}
-inline int CursesWindow::scrollok(int bf)
+inline int CursesWindow::scrollok(int bf)
{
- return ::scrollok(w,bf);
+ return ::scrollok(w,bf);
}
#ifndef _no_flushok
-inline int CursesWindow::flushok(int bf)
+inline int CursesWindow::flushok(int bf)
{
- return ::flushok(w, bf);
+ return ::flushok(w, bf);
}
#endif
-inline void CursesWindow::getyx(int& y, int& x)
+inline void CursesWindow::getyx(int& y, int& x)
{
- ::getyx(w, y, x);
+ ::getyx(w, y, x);
}
-inline int CursesWindow::standout()
+inline int CursesWindow::standout()
{
- return ::wstandout(w);
+ return ::wstandout(w);
}
-inline int CursesWindow::standend()
+inline int CursesWindow::standend()
{
- return ::wstandend(w);
+ return ::wstandend(w);
}
-inline int CursesWindow::lines()
+inline int CursesWindow::lines()
{
- return LINES;
+ return LINES;
}
-inline int CursesWindow::cols()
+inline int CursesWindow::cols()
{
- return COLS;
+ return COLS;
}
inline CursesWindow* CursesWindow::child()
diff --git a/gnu/lib/libg++/include/DLList.h b/gnu/lib/libg++/include/DLList.h
index 36f73bcb4aab..ba7ee868fa9f 100644
--- a/gnu/lib/libg++/include/DLList.h
+++ b/gnu/lib/libg++/include/DLList.h
@@ -1,5 +1,5 @@
// This may look like C code, but it is really -*- C++ -*-
-/*
+/*
Copyright (C) 1988 Free Software Foundation
written by Doug Lea (dl@rocky.oswego.edu)
diff --git a/gnu/lib/libg++/include/DiscUnif.h b/gnu/lib/libg++/include/DiscUnif.h
index 5f26f90b9592..0cd6a0f07097 100644
--- a/gnu/lib/libg++/include/DiscUnif.h
+++ b/gnu/lib/libg++/include/DiscUnif.h
@@ -1,5 +1,5 @@
// This may look like C code, but it is really -*- C++ -*-
-/*
+/*
Copyright (C) 1988 Free Software Foundation
written by Dirk Grunwald (grunwald@cs.uiuc.edu)
@@ -25,7 +25,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
//
// The interval [lo..hi)
-//
+//
class DiscreteUniform: public Random {
long pLow;
diff --git a/gnu/lib/libg++/include/Erlang.h b/gnu/lib/libg++/include/Erlang.h
index 98093884f72c..18838fc44af5 100644
--- a/gnu/lib/libg++/include/Erlang.h
+++ b/gnu/lib/libg++/include/Erlang.h
@@ -1,5 +1,5 @@
// This may look like C code, but it is really -*- C++ -*-
-/*
+/*
Copyright (C) 1988 Free Software Foundation
written by Dirk Grunwald (grunwald@cs.uiuc.edu)
@@ -19,7 +19,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
#ifdef __GNUG__
#pragma interface
#endif
-#define _Erlang_h 1
+#define _Erlang_h 1
#include <Random.h>
diff --git a/gnu/lib/libg++/include/Fix.h b/gnu/lib/libg++/include/Fix.h
index df76c94fb962..fab91b8e7b26 100644
--- a/gnu/lib/libg++/include/Fix.h
+++ b/gnu/lib/libg++/include/Fix.h
@@ -1,5 +1,5 @@
// -*- C++ -*-
-// Fix.h : variable length fixed point data type
+// Fix.h : variable length fixed point data type
//
#ifndef _Fix_h
@@ -124,7 +124,7 @@ public:
friend char* Ftoa(const Fix&, int width = default_print_width);
void printon(ostream&, int width = default_print_width) const;
friend Fix atoF(const char*, int len = default_length);
-
+
friend istream& operator >> (istream&, Fix&);
friend ostream& operator << (ostream&, const Fix&);
@@ -184,7 +184,7 @@ Fix::mask (Fix::Rep* x)
{
int n = x->len & 0x0f;
if ( n )
- x->s[x->siz - 1] &= 0xffff0000 >> n;
+ x->s[x->siz - 1] &= 0xffff0000 >> n;
}
inline Fix::Rep*
@@ -269,7 +269,7 @@ Fix::operator = (const Fix& y)
if ( rep->len == y.rep->len ) {
++y.rep->ref;
if ( --rep->ref <= 0 ) delete rep;
- rep = y.rep;
+ rep = y.rep;
}
else {
unique();
@@ -290,37 +290,37 @@ Fix::operator = (double d)
inline int
operator == (const Fix& x, const Fix& y)
{
- return Fix::compare(x.rep, y.rep) == 0;
+ return Fix::compare(x.rep, y.rep) == 0;
}
inline int
operator != (const Fix& x, const Fix& y)
{
- return Fix::compare(x.rep, y.rep) != 0;
+ return Fix::compare(x.rep, y.rep) != 0;
}
inline int
operator < (const Fix& x, const Fix& y)
{
- return Fix::compare(x.rep, y.rep) < 0;
+ return Fix::compare(x.rep, y.rep) < 0;
}
inline int
operator <= (const Fix& x, const Fix& y)
{
- return Fix::compare(x.rep, y.rep) <= 0;
+ return Fix::compare(x.rep, y.rep) <= 0;
}
inline int
operator > (const Fix& x, const Fix& y)
{
- return Fix::compare(x.rep, y.rep) > 0;
+ return Fix::compare(x.rep, y.rep) > 0;
}
inline int
operator >= (const Fix& x, const Fix& y)
{
- return Fix::compare(x.rep, y.rep) >= 0;
+ return Fix::compare(x.rep, y.rep) >= 0;
}
inline Fix&
@@ -415,7 +415,7 @@ operator << (const Fix& x, int y)
inline Fix
operator >> (const Fix& x, int y)
-{
+{
Fix::Rep* rep = Fix::shift(x.rep, -y); return rep;
}
diff --git a/gnu/lib/libg++/include/Fix16.h b/gnu/lib/libg++/include/Fix16.h
index e598113ede88..2ab220975d9a 100644
--- a/gnu/lib/libg++/include/Fix16.h
+++ b/gnu/lib/libg++/include/Fix16.h
@@ -1,5 +1,5 @@
// This may look like C code, but it is really -*- C++ -*-
-/*
+/*
Copyright (C) 1988 Free Software Foundation
written by Kurt Baudendistel (gt-eedsp!baud@gatech.edu)
adapted for libg++ by Doug Lea (dl@rocky.oswego.edu)
@@ -58,8 +58,8 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
// consists of a 16-bit mantissa (sign bit & 15 data bits).
//
-class Fix16
-{
+class Fix16
+{
friend class Fix32;
short m;
@@ -102,7 +102,7 @@ public:
Fix16& operator -= (const Fix16& f);
Fix16& operator *= (const Fix16& );
Fix16& operator /= (const Fix16& f);
-
+
Fix16& operator <<=(int b);
Fix16& operator >>=(int b);
@@ -124,15 +124,15 @@ public:
Fix16& operator *= (int g);
};
-
+
//
// Fix32 class: 32-bit Fixed point data type
//
// consists of a 32-bit mantissa (sign bit & 31 data bits).
//
-class Fix32
-{
+class Fix32
+{
friend class Fix16;
_G_int32_t m;
@@ -241,141 +241,141 @@ extern void
inline Fix16::~Fix16() {}
inline short Fix16::round(double d)
-{
- return short( (d >= 0)? d + 0.5 : d - 0.5);
+{
+ return short( (d >= 0)? d + 0.5 : d - 0.5);
}
-inline Fix16::Fix16(short i)
-{
- m = i;
+inline Fix16::Fix16(short i)
+{
+ m = i;
}
-inline Fix16::Fix16(int i)
-{
- m = i;
+inline Fix16::Fix16(int i)
+{
+ m = i;
}
-inline Fix16::operator double() const
-{
- return Fix16_div * m;
+inline Fix16::operator double() const
+{
+ return Fix16_div * m;
}
-inline Fix16::Fix16()
-{
- m = 0;
+inline Fix16::Fix16()
+{
+ m = 0;
}
-inline Fix16::Fix16(const Fix16& f)
-{
- m = f.m;
+inline Fix16::Fix16(const Fix16& f)
+{
+ m = f.m;
}
-inline Fix16::Fix16(double d)
+inline Fix16::Fix16(double d)
{
m = assign(d);
}
-inline Fix16& Fix16::operator=(const Fix16& f)
-{
- m = f.m;
- return *this;
+inline Fix16& Fix16::operator=(const Fix16& f)
+{
+ m = f.m;
+ return *this;
}
-inline Fix16& Fix16::operator=(double d)
-{
- m = assign(d);
- return *this;
+inline Fix16& Fix16::operator=(double d)
+{
+ m = assign(d);
+ return *this;
}
-inline Fix32::Fix32()
-{
+inline Fix32::Fix32()
+{
m = 0;
}
-inline Fix32::Fix32(_G_int32_t i)
-{
+inline Fix32::Fix32(_G_int32_t i)
+{
m = i;
}
-inline Fix32:: operator double() const
-{
+inline Fix32:: operator double() const
+{
return Fix32_div * m;
}
-inline Fix32::Fix32(const Fix32& f)
-{
+inline Fix32::Fix32(const Fix32& f)
+{
m = f.m;
}
-inline Fix32::Fix32(const Fix16& f)
-{
+inline Fix32::Fix32(const Fix16& f)
+{
m = _G_int32_t(f.m) << 16;
}
-inline Fix32::Fix32(double d)
-{
+inline Fix32::Fix32(double d)
+{
m = assign(d);
}
-inline Fix16::Fix16(const Fix32& f)
-{
- m = f.m >> 16;
+inline Fix16::Fix16(const Fix32& f)
+{
+ m = f.m >> 16;
}
inline Fix16& Fix16::operator=(const Fix32& f)
-{
- m = f.m >> 16;
- return *this;
+{
+ m = f.m >> 16;
+ return *this;
}
-inline Fix32& Fix32::operator=(const Fix32& f)
-{
+inline Fix32& Fix32::operator=(const Fix32& f)
+{
m = f.m;
- return *this;
+ return *this;
}
-inline Fix32& Fix32::operator=(const Fix16& f)
-{
+inline Fix32& Fix32::operator=(const Fix16& f)
+{
m = _G_int32_t(f.m) << 16;
return *this;
}
-inline Fix32& Fix32::operator=(double d)
-{
+inline Fix32& Fix32::operator=(double d)
+{
m = assign(d);
- return *this;
+ return *this;
}
-inline short& mantissa(Fix16& f)
-{
- return f.m;
+inline short& mantissa(Fix16& f)
+{
+ return f.m;
}
-inline const short& mantissa(const Fix16& f)
-{
- return f.m;
+inline const short& mantissa(const Fix16& f)
+{
+ return f.m;
}
-inline double value(const Fix16& f)
-{
- return double(f);
+inline double value(const Fix16& f)
+{
+ return double(f);
}
-inline Fix16 Fix16::operator+() const
-{
- return m;
+inline Fix16 Fix16::operator+() const
+{
+ return m;
}
-inline Fix16 Fix16::operator-() const
-{
- return -m;
+inline Fix16 Fix16::operator-() const
+{
+ return -m;
}
-inline Fix16 operator+(const Fix16& f, const Fix16& g)
+inline Fix16 operator+(const Fix16& f, const Fix16& g)
{
short sum = f.m + g.m;
if ( (f.m ^ sum) & (g.m ^ sum) & Fix16_msb )
@@ -383,7 +383,7 @@ inline Fix16 operator+(const Fix16& f, const Fix16& g)
return sum;
}
-inline Fix16 operator-(const Fix16& f, const Fix16& g)
+inline Fix16 operator-(const Fix16& f, const Fix16& g)
{
short sum = f.m - g.m;
if ( (f.m ^ sum) & (-g.m ^ sum) & Fix16_msb )
@@ -392,90 +392,90 @@ inline Fix16 operator-(const Fix16& f, const Fix16& g)
}
inline Fix32 operator*(const Fix16& f, const Fix16& g)
-{
- return Fix32( _G_int32_t( _G_int32_t(f.m) * _G_int32_t(g.m) << 1));
+{
+ return Fix32( _G_int32_t( _G_int32_t(f.m) * _G_int32_t(g.m) << 1));
}
-inline Fix16 operator<<(const Fix16& a, int b)
-{
- return a.m << b;
+inline Fix16 operator<<(const Fix16& a, int b)
+{
+ return a.m << b;
}
-inline Fix16 operator>>(const Fix16& a, int b)
-{
- return a.m >> b;
+inline Fix16 operator>>(const Fix16& a, int b)
+{
+ return a.m >> b;
}
inline Fix16& Fix16:: operator+=(const Fix16& f)
-{
- return *this = *this + f;
+{
+ return *this = *this + f;
}
-inline Fix16& Fix16:: operator-=(const Fix16& f)
-{
- return *this = *this - f;
+inline Fix16& Fix16:: operator-=(const Fix16& f)
+{
+ return *this = *this - f;
}
-inline Fix16& Fix16::operator*=(const Fix16& f)
-{
- return *this = *this * f;
+inline Fix16& Fix16::operator*=(const Fix16& f)
+{
+ return *this = *this * f;
}
-inline Fix16& Fix16:: operator/=(const Fix16& f)
-{
- return *this = *this / f;
+inline Fix16& Fix16:: operator/=(const Fix16& f)
+{
+ return *this = *this / f;
}
-inline Fix16& Fix16:: operator<<=(int b)
-{
+inline Fix16& Fix16:: operator<<=(int b)
+{
return *this = *this << b;
}
-inline Fix16& Fix16:: operator>>=(int b)
-{
+inline Fix16& Fix16:: operator>>=(int b)
+{
return *this = *this >> b;
}
-inline int operator==(const Fix16& f, const Fix16& g)
-{
+inline int operator==(const Fix16& f, const Fix16& g)
+{
return f.m == g.m;
}
-inline int operator!=(const Fix16& f, const Fix16& g)
-{
+inline int operator!=(const Fix16& f, const Fix16& g)
+{
return f.m != g.m;
}
-inline int operator>=(const Fix16& f, const Fix16& g)
-{
+inline int operator>=(const Fix16& f, const Fix16& g)
+{
return f.m >= g.m;
}
-inline int operator<=(const Fix16& f, const Fix16& g)
-{
+inline int operator<=(const Fix16& f, const Fix16& g)
+{
return f.m <= g.m;
}
-inline int operator>(const Fix16& f, const Fix16& g)
-{
+inline int operator>(const Fix16& f, const Fix16& g)
+{
return f.m > g.m;
}
-inline int operator<(const Fix16& f, const Fix16& g)
-{
+inline int operator<(const Fix16& f, const Fix16& g)
+{
return f.m < g.m;
}
inline istream& operator>>(istream& s, Fix16& f)
-{
+{
double d;
- s >> d;
- f = d;
- return s;
+ s >> d;
+ f = d;
+ return s;
}
inline ostream& operator<<(ostream& s, const Fix16& f)
-{
+{
return s << double(f);
}
@@ -499,36 +499,36 @@ inline Fix16& Fix16::operator*=(int g)
inline Fix32::~Fix32() {}
inline _G_int32_t Fix32::round(double d)
-{
+{
return _G_int32_t( (d >= 0)? d + 0.5 : d - 0.5);
}
-inline _G_int32_t& mantissa(Fix32& f)
-{
+inline _G_int32_t& mantissa(Fix32& f)
+{
return f.m;
}
-inline const _G_int32_t& mantissa(const Fix32& f)
-{
+inline const _G_int32_t& mantissa(const Fix32& f)
+{
return f.m;
}
-inline double value(const Fix32& f)
-{
+inline double value(const Fix32& f)
+{
return double(f);
}
inline Fix32 Fix32::operator+() const
-{
+{
return m;
}
-inline Fix32 Fix32::operator-() const
-{
+inline Fix32 Fix32::operator-() const
+{
return -m;
}
-inline Fix32 operator+(const Fix32& f, const Fix32& g)
+inline Fix32 operator+(const Fix32& f, const Fix32& g)
{
_G_int32_t sum = f.m + g.m;
if ( (f.m ^ sum) & (g.m ^ sum) & Fix32_msb )
@@ -536,7 +536,7 @@ inline Fix32 operator+(const Fix32& f, const Fix32& g)
return sum;
}
-inline Fix32 operator-(const Fix32& f, const Fix32& g)
+inline Fix32 operator-(const Fix32& f, const Fix32& g)
{
_G_int32_t sum = f.m - g.m;
if ( (f.m ^ sum) & (-g.m ^ sum) & Fix32_msb )
@@ -544,87 +544,87 @@ inline Fix32 operator-(const Fix32& f, const Fix32& g)
return sum;
}
-inline Fix32 operator<<(const Fix32& a, int b)
-{
+inline Fix32 operator<<(const Fix32& a, int b)
+{
return a.m << b;
}
-inline Fix32 operator>>(const Fix32& a, int b)
-{
+inline Fix32 operator>>(const Fix32& a, int b)
+{
return a.m >> b;
}
-inline Fix32& Fix32::operator+=(const Fix32& f)
-{
+inline Fix32& Fix32::operator+=(const Fix32& f)
+{
return *this = *this + f;
}
-inline Fix32& Fix32::operator-=(const Fix32& f)
-{
+inline Fix32& Fix32::operator-=(const Fix32& f)
+{
return *this = *this - f;
}
-inline Fix32& Fix32::operator*=(const Fix32& f)
-{
+inline Fix32& Fix32::operator*=(const Fix32& f)
+{
return *this = *this * f;
}
-inline Fix32& Fix32::operator/=(const Fix32& f)
-{
+inline Fix32& Fix32::operator/=(const Fix32& f)
+{
return *this = *this / f;
}
-inline Fix32& Fix32::operator<<=(int b)
-{
+inline Fix32& Fix32::operator<<=(int b)
+{
return *this = *this << b;
}
-inline Fix32& Fix32::operator>>=(int b)
-{
+inline Fix32& Fix32::operator>>=(int b)
+{
return *this = *this >> b;
}
-inline int operator==(const Fix32& f, const Fix32& g)
-{
+inline int operator==(const Fix32& f, const Fix32& g)
+{
return f.m == g.m;
}
-inline int operator!=(const Fix32& f, const Fix32& g)
-{
+inline int operator!=(const Fix32& f, const Fix32& g)
+{
return f.m != g.m;
}
-inline int operator>=(const Fix32& f, const Fix32& g)
-{
+inline int operator>=(const Fix32& f, const Fix32& g)
+{
return f.m >= g.m;
}
-inline int operator<=(const Fix32& f, const Fix32& g)
-{
+inline int operator<=(const Fix32& f, const Fix32& g)
+{
return f.m <= g.m;
}
-inline int operator>(const Fix32& f, const Fix32& g)
-{
+inline int operator>(const Fix32& f, const Fix32& g)
+{
return f.m > g.m;
}
-inline int operator<(const Fix32& f, const Fix32& g)
-{
+inline int operator<(const Fix32& f, const Fix32& g)
+{
return f.m < g.m;
}
inline istream& operator>>(istream& s, Fix32& f)
-{
+{
double d;
- s >> d;
- f = d;
- return s;
+ s >> d;
+ f = d;
+ return s;
}
inline ostream& operator<<(ostream& s, const Fix32& f)
-{
+{
return s << double(f);
}
diff --git a/gnu/lib/libg++/include/Fix24.h b/gnu/lib/libg++/include/Fix24.h
index 5db346e36896..0f4daeaa9e6d 100644
--- a/gnu/lib/libg++/include/Fix24.h
+++ b/gnu/lib/libg++/include/Fix24.h
@@ -1,5 +1,5 @@
// This may look like C code, but it is really -*- C++ -*-
-/*
+/*
Copyright (C) 1988 Free Software Foundation
written by Kurt Baudendistel (gt-eedsp!baud@gatech.edu)
adapted for libg++ by Doug Lea (dl@rocky.oswego.edu)
@@ -26,7 +26,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
#include <stream.h>
#include <std.h>
-// extra type definitions
+// extra type definitions
typedef struct {
_G_int32_t u;
@@ -37,14 +37,14 @@ typedef struct {
static const int
Fix24_shift = 31;
-
+
static const double
Fix24_fs = 2147483648., // 2^Fix24_shift
Fix24_mult = Fix24_fs,
Fix24_div = 1./Fix24_fs,
Fix24_max = 1. - .5/Fix24_fs,
Fix24_min = -1.;
-
+
static const _G_uint32_t
Fix24_msb = 0x80000000L,
Fix24_lsb = 0x00000100L,
@@ -57,21 +57,21 @@ static const double
Fix48_min = -1.,
Fix48_div_u = 1./Fix24_fs,
Fix48_div_l = 1./Fix48_fs;
-
+
static const twolongs
Fix48_msb = { 0x80000000L, 0L },
Fix48_lsb = { 0L, 0x00000100L },
Fix48_m_max = { 0x7fffff00L, 0xffffff00L },
Fix48_m_min = { 0x80000000L, 0L };
-
+
//
// Fix24 class: 24-bit Fixed point data type
//
// consists of a 24-bit mantissa (sign bit & 23 data bits).
//
-class Fix24
-{
+class Fix24
+{
friend class Fix48;
_G_int32_t m;
@@ -133,15 +133,15 @@ public:
void range_error(_G_int32_t&) const;
};
-
+
//
// Fix48 class: 48-bit Fixed point data type
//
// consists of a 48-bit mantissa (sign bit & 47 data bits).
//
-class Fix48
-{
+class Fix48
+{
friend class Fix24;
twolongs m;
@@ -242,85 +242,85 @@ extern void
inline Fix24::~Fix24() {}
-inline Fix24::Fix24(long i)
-{
- m = i;
+inline Fix24::Fix24(long i)
+{
+ m = i;
}
-inline Fix24::Fix24(int i)
-{
- m = i;
+inline Fix24::Fix24(int i)
+{
+ m = i;
}
inline Fix24::operator double() const
-{
- return Fix24_div * m;
+{
+ return Fix24_div * m;
}
-inline Fix24::Fix24()
-{
- m = 0;
+inline Fix24::Fix24()
+{
+ m = 0;
}
-inline Fix24::Fix24(const Fix24& f)
-{
- m = f.m;
+inline Fix24::Fix24(const Fix24& f)
+{
+ m = f.m;
}
-inline Fix24::Fix24(double d)
+inline Fix24::Fix24(double d)
{
m = assign(d);
}
-inline Fix24::Fix24(const Fix48& f)
-{
+inline Fix24::Fix24(const Fix48& f)
+{
m = f.m.u;
}
-inline Fix24& Fix24::operator=(const Fix24& f)
-{
- m = f.m;
- return *this;
+inline Fix24& Fix24::operator=(const Fix24& f)
+{
+ m = f.m;
+ return *this;
}
-inline Fix24& Fix24::operator=(double d)
-{
- m = assign(d);
- return *this;
+inline Fix24& Fix24::operator=(double d)
+{
+ m = assign(d);
+ return *this;
}
inline Fix24& Fix24::operator=(const Fix48& f)
-{
+{
m = f.m.u;
- return *this;
+ return *this;
}
inline _G_int32_t& mantissa(Fix24& f)
-{
- return f.m;
+{
+ return f.m;
}
inline const _G_int32_t& mantissa(const Fix24& f)
-{
- return f.m;
+{
+ return f.m;
}
inline double value(const Fix24& f)
-{
- return double(f);
+{
+ return double(f);
}
-inline Fix24 Fix24::operator+() const
-{
- return m;
+inline Fix24 Fix24::operator+() const
+{
+ return m;
}
inline Fix24 Fix24::operator-() const
-{
- return -m;
+{
+ return -m;
}
-inline Fix24 operator+(const Fix24& f, const Fix24& g)
+inline Fix24 operator+(const Fix24& f, const Fix24& g)
{
_G_int32_t sum = f.m + g.m;
if ( (f.m ^ sum) & (g.m ^ sum) & Fix24_msb )
@@ -328,7 +328,7 @@ inline Fix24 operator+(const Fix24& f, const Fix24& g)
return sum;
}
-inline Fix24 operator-(const Fix24& f, const Fix24& g)
+inline Fix24 operator-(const Fix24& f, const Fix24& g)
{
_G_int32_t sum = f.m - g.m;
if ( (f.m ^ sum) & (-g.m ^ sum) & Fix24_msb )
@@ -336,23 +336,23 @@ inline Fix24 operator-(const Fix24& f, const Fix24& g)
return sum;
}
-inline Fix24 operator*(const Fix24& a, int b)
-{
- return a.m * b;
+inline Fix24 operator*(const Fix24& a, int b)
+{
+ return a.m * b;
}
-inline Fix24 operator*(int b, const Fix24& a)
-{
- return a * b;
+inline Fix24 operator*(int b, const Fix24& a)
+{
+ return a * b;
}
-inline Fix24 operator<<(const Fix24& a, int b)
-{
- return a.m << b;
+inline Fix24 operator<<(const Fix24& a, int b)
+{
+ return a.m << b;
}
-inline Fix24 operator>>(const Fix24& a, int b)
-{
+inline Fix24 operator>>(const Fix24& a, int b)
+{
return (a.m >> b) & ~0xff;
}
@@ -361,236 +361,236 @@ inline Fix24& Fix24:: operator+=(const Fix24& f)
return *this = *this + f;
}
-inline Fix24& Fix24:: operator-=(const Fix24& f)
-{
- return *this = *this - f;
+inline Fix24& Fix24:: operator-=(const Fix24& f)
+{
+ return *this = *this - f;
}
-inline Fix24& Fix24::operator*=(const Fix24& f)
-{
- return *this = *this * f;
+inline Fix24& Fix24::operator*=(const Fix24& f)
+{
+ return *this = *this * f;
}
-inline Fix24& Fix24:: operator/=(const Fix24& f)
-{
- return *this = *this / f;
+inline Fix24& Fix24:: operator/=(const Fix24& f)
+{
+ return *this = *this / f;
}
-inline Fix24& Fix24:: operator<<=(int b)
-{
+inline Fix24& Fix24:: operator<<=(int b)
+{
return *this = *this << b;
}
-inline Fix24& Fix24:: operator>>=(int b)
-{
+inline Fix24& Fix24:: operator>>=(int b)
+{
return *this = *this >> b;
}
inline Fix24& Fix24::operator*=(int b)
-{
- return *this = *this * b;
+{
+ return *this = *this * b;
}
-inline int operator==(const Fix24& f, const Fix24& g)
-{
+inline int operator==(const Fix24& f, const Fix24& g)
+{
return f.m == g.m;
}
-inline int operator!=(const Fix24& f, const Fix24& g)
-{
+inline int operator!=(const Fix24& f, const Fix24& g)
+{
return f.m != g.m;
}
-inline int operator>=(const Fix24& f, const Fix24& g)
-{
+inline int operator>=(const Fix24& f, const Fix24& g)
+{
return f.m >= g.m;
}
-inline int operator<=(const Fix24& f, const Fix24& g)
-{
+inline int operator<=(const Fix24& f, const Fix24& g)
+{
return f.m <= g.m;
}
-inline int operator>(const Fix24& f, const Fix24& g)
-{
+inline int operator>(const Fix24& f, const Fix24& g)
+{
return f.m > g.m;
}
-inline int operator<(const Fix24& f, const Fix24& g)
-{
+inline int operator<(const Fix24& f, const Fix24& g)
+{
return f.m < g.m;
}
inline istream& operator>>(istream& s, Fix24& f)
-{
+{
double d;
- s >> d;
- f = d;
- return s;
+ s >> d;
+ f = d;
+ return s;
}
inline ostream& operator<<(ostream& s, const Fix24& f)
-{
+{
return s << double(f);
}
inline Fix48::~Fix48() {}
-inline Fix48::Fix48(twolongs i)
-{
+inline Fix48::Fix48(twolongs i)
+{
m = i;
}
inline Fix48:: operator double() const
-{
+{
/*
* Note: can't simply do Fix48_div_u * m.u + Fix48_div_l * m.l, because
* m.u is signed and m.l is unsigned.
*/
return (m.u >= 0)? Fix48_div_u * m.u + Fix48_div_l * m.l :
- (Fix48_div_u * ((_G_uint32_t)(m.u & 0xffffff00))
+ (Fix48_div_u * ((_G_uint32_t)(m.u & 0xffffff00))
+ Fix48_div_l * m.l) - 2;
}
-inline Fix48::Fix48()
-{
+inline Fix48::Fix48()
+{
m.u = 0;
m.l = 0;
}
-inline Fix48::Fix48(const Fix48& f)
-{
+inline Fix48::Fix48(const Fix48& f)
+{
m = f.m;
}
-inline Fix48::Fix48(const Fix24& f)
-{
+inline Fix48::Fix48(const Fix24& f)
+{
m.u = f.m;
m.l = 0;
}
-inline Fix48::Fix48(double d)
-{
+inline Fix48::Fix48(double d)
+{
m = assign(d);
}
-inline Fix48& Fix48::operator=(const Fix48& f)
-{
+inline Fix48& Fix48::operator=(const Fix48& f)
+{
m = f.m;
- return *this;
+ return *this;
}
-inline Fix48& Fix48::operator=(const Fix24& f)
-{
+inline Fix48& Fix48::operator=(const Fix24& f)
+{
m.u = f.m;
m.l = 0;
return *this;
}
-inline Fix48& Fix48::operator=(double d)
-{
+inline Fix48& Fix48::operator=(double d)
+{
m = assign(d);
- return *this;
+ return *this;
}
-inline twolongs& mantissa(Fix48& f)
-{
+inline twolongs& mantissa(Fix48& f)
+{
return f.m;
}
-inline const twolongs& mantissa(const Fix48& f)
-{
+inline const twolongs& mantissa(const Fix48& f)
+{
return f.m;
}
inline double value(const Fix48& f)
-{
+{
return double(f);
}
-inline Fix48 Fix48::operator+() const
-{
+inline Fix48 Fix48::operator+() const
+{
return m;
}
inline Fix48 Fix48::operator-() const
-{
+{
twolongs n;
n.l = -m.l;
n.u = ~m.u + ((n.l ^ m.l) & Fix24_msb ? 0 : Fix24_lsb);
return Fix48(n);
}
-inline Fix48 operator*(int b, const Fix48& a)
-{
- return a * b;
+inline Fix48 operator*(int b, const Fix48& a)
+{
+ return a * b;
}
-inline Fix48& Fix48::operator+=(const Fix48& f)
-{
+inline Fix48& Fix48::operator+=(const Fix48& f)
+{
return *this = *this + f;
}
-inline Fix48& Fix48::operator-=(const Fix48& f)
-{
+inline Fix48& Fix48::operator-=(const Fix48& f)
+{
return *this = *this - f;
}
-inline Fix48& Fix48::operator*=(int b)
-{
+inline Fix48& Fix48::operator*=(int b)
+{
return *this = *this * b;
}
-inline Fix48& Fix48::operator<<=(int b)
-{
+inline Fix48& Fix48::operator<<=(int b)
+{
return *this = *this << b;
}
-inline Fix48& Fix48::operator>>=(int b)
-{
+inline Fix48& Fix48::operator>>=(int b)
+{
return *this = *this >> b;
}
-inline int operator==(const Fix48& f, const Fix48& g)
-{
+inline int operator==(const Fix48& f, const Fix48& g)
+{
return f.m.u == g.m.u && f.m.l == g.m.l;
}
-inline int operator!=(const Fix48& f, const Fix48& g)
-{
+inline int operator!=(const Fix48& f, const Fix48& g)
+{
return f.m.u != g.m.u || f.m.l != g.m.l;
}
-inline int operator>=(const Fix48& f, const Fix48& g)
-{
+inline int operator>=(const Fix48& f, const Fix48& g)
+{
return f.m.u >= g.m.u || (f.m.u == g.m.u && f.m.l >= g.m.l);
}
-inline int operator<=(const Fix48& f, const Fix48& g)
-{
+inline int operator<=(const Fix48& f, const Fix48& g)
+{
return f.m.u <= g.m.u || (f.m.u == g.m.u && f.m.l <= g.m.l);
}
-inline int operator>(const Fix48& f, const Fix48& g)
-{
+inline int operator>(const Fix48& f, const Fix48& g)
+{
return f.m.u > g.m.u || (f.m.u == g.m.u && f.m.l > g.m.l);
}
-inline int operator<(const Fix48& f, const Fix48& g)
-{
+inline int operator<(const Fix48& f, const Fix48& g)
+{
return f.m.u < g.m.u || (f.m.u == g.m.u && f.m.l < g.m.l);
}
inline istream& operator>>(istream& s, Fix48& f)
-{
+{
double d;
- s >> d;
- f = d;
- return s;
+ s >> d;
+ f = d;
+ return s;
}
inline ostream& operator<<(ostream& s, const Fix48& f)
-{
+{
return s << double(f);
}
diff --git a/gnu/lib/libg++/include/Geom.h b/gnu/lib/libg++/include/Geom.h
index 5cfa39aaa396..7d05b8388bf5 100644
--- a/gnu/lib/libg++/include/Geom.h
+++ b/gnu/lib/libg++/include/Geom.h
@@ -1,5 +1,5 @@
// This may look like C code, but it is really -*- C++ -*-
-/*
+/*
Copyright (C) 1988 Free Software Foundation
written by Dirk Grunwald (grunwald@cs.uiuc.edu)
@@ -19,7 +19,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
#ifdef __GNUG__
#pragma interface
#endif
-#define _Geometric_h
+#define _Geometric_h
#include <Random.h>
diff --git a/gnu/lib/libg++/include/GetOpt.h b/gnu/lib/libg++/include/GetOpt.h
index 66ecf5c16165..9dfc3c6e6c04 100644
--- a/gnu/lib/libg++/include/GetOpt.h
+++ b/gnu/lib/libg++/include/GetOpt.h
@@ -1,4 +1,4 @@
-/* Getopt for GNU.
+/* Getopt for GNU.
Copyright (C) 1987, 1989, 1992 Free Software Foundation, Inc.
(Modified by Douglas C. Schmidt for use with GNU G++.)
@@ -45,51 +45,51 @@ private:
/* The next char to be scanned in the option-element
in which the last option character we returned was found.
This allows us to pick up the scan where we left off.
-
+
If this is zero, or a null string, it means resume the scan
by advancing to the next ARGV-element. */
-
+
static char *nextchar;
-
-
+
+
/* Describe how to deal with options that follow non-option ARGV-elements.
-
+
UNSPECIFIED means the caller did not specify anything;
the default is then REQUIRE_ORDER if the environment variable
_OPTIONS_FIRST is defined, PERMUTE otherwise.
-
+
REQUIRE_ORDER means don't recognize them as options.
Stop option processing when the first non-option is seen.
This is what Unix does.
-
+
PERMUTE is the default. We permute the contents of `argv' as we scan,
so that eventually all the options are at the end. This allows options
to be given in any order, even with programs that were not written to
expect this.
-
+
RETURN_IN_ORDER is an option available to programs that were written
to expect options and other ARGV-elements in any order and that care about
the ordering of the two. We describe each non-option ARGV-element
as if it were the argument of an option with character code zero.
Using `-' as the first character of the list of option characters
requests this mode of operation.
-
+
The special argument `--' forces an end of option-scanning regardless
of the value of `ordering'. In the case of RETURN_IN_ORDER, only
`--' can cause `getopt' to return EOF with `optind' != ARGC. */
-
+
enum OrderingEnum { REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER };
OrderingEnum ordering;
/* Handle permutation of arguments. */
-
+
/* Describe the part of ARGV that contains non-options that have
been skipped. `first_nonopt' is the index in ARGV of the first of them;
`last_nonopt' is the index after the last of them. */
-
+
static int first_nonopt;
static int last_nonopt;
-
+
void exchange (char **argv);
public:
/* For communication from `getopt' to the caller.
@@ -97,31 +97,31 @@ public:
the argument value is returned here.
Also, when `ordering' is RETURN_IN_ORDER,
each non-option ARGV-element is returned here. */
-
+
char *optarg;
-
+
/* Index in ARGV of the next element to be scanned.
This is used for communication to and from the caller
and for communication between successive calls to `getopt'.
On entry to `getopt', zero means this is the first call; initialize.
-
+
When `getopt' returns EOF, this is the index of the first of the
non-option elements that the caller should itself scan.
-
+
Otherwise, `optind' communicates from one call to the next
how much of ARGV has been scanned so far. */
-
+
int optind;
/* Callers store zero here to inhibit the error message
for unrecognized options. */
-
+
int opterr;
-
+
int nargc;
char **nargv;
const char *noptstring;
-
+
GetOpt (int argc, char **argv, const char *optstring);
int operator () (void);
};
diff --git a/gnu/lib/libg++/include/HypGeom.h b/gnu/lib/libg++/include/HypGeom.h
index e16e6552ccee..1864e9151a26 100644
--- a/gnu/lib/libg++/include/HypGeom.h
+++ b/gnu/lib/libg++/include/HypGeom.h
@@ -1,5 +1,5 @@
// This may look like C code, but it is really -*- C++ -*-
-/*
+/*
Copyright (C) 1988 Free Software Foundation
written by Dirk Grunwald (grunwald@cs.uiuc.edu)
@@ -19,7 +19,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
#ifdef __GNUG__
#pragma interface
#endif
-#define _HyperGeometric_h
+#define _HyperGeometric_h
#include <Random.h>
diff --git a/gnu/lib/libg++/include/Integer.h b/gnu/lib/libg++/include/Integer.h
index 7e67ae5be6e2..b5c1768a7bef 100644
--- a/gnu/lib/libg++/include/Integer.h
+++ b/gnu/lib/libg++/include/Integer.h
@@ -1,6 +1,6 @@
// This may look like C code, but it is really -*- C++ -*-
-/*
+/*
Copyright (C) 1988 Free Software Foundation
written by Doug Lea (dl@rocky.oswego.edu)
@@ -29,7 +29,7 @@ struct IntRep // internal Integer representations
{
unsigned short len; // current length
unsigned short sz; // allocated space (0 means static).
- short sgn; // 1 means >= 0; 0 means < 0
+ short sgn; // 1 means >= 0; 0 means < 0
unsigned short s[1]; // represented as ushort array starting here
};
@@ -67,7 +67,7 @@ extern int ucompare(const IntRep*, const IntRep*);
extern int ucompare(const IntRep*, long);
extern char* Itoa(const IntRep* x, int base = 10, int width = 0);
extern char* cvtItoa(const IntRep* x, char* fmt, int& fmtlen, int base,
- int showbase, int width, int align_right,
+ int showbase, int width, int align_right,
char fillchar, char Xcase, int showpos);
extern IntRep* atoIntRep(const char* s, int base = 10);
extern long Itolong(const IntRep*);
@@ -152,14 +152,14 @@ public:
friend void negate(const Integer& x, Integer& dest);
friend void complement(const Integer& x, Integer& dest);
- friend int compare(const Integer&, const Integer&);
- friend int ucompare(const Integer&, const Integer&);
+ friend int compare(const Integer&, const Integer&);
+ friend int ucompare(const Integer&, const Integer&);
friend void add(const Integer& x, const Integer& y, Integer& dest);
friend void sub(const Integer& x, const Integer& y, Integer& dest);
friend void mul(const Integer& x, const Integer& y, Integer& dest);
friend void div(const Integer& x, const Integer& y, Integer& dest);
friend void mod(const Integer& x, const Integer& y, Integer& dest);
- friend void divide(const Integer& x, const Integer& y,
+ friend void divide(const Integer& x, const Integer& y,
Integer& q, Integer& r);
friend void and(const Integer& x, const Integer& y, Integer& dest);
friend void or(const Integer& x, const Integer& y, Integer& dest);
@@ -168,8 +168,8 @@ public:
friend void rshift(const Integer& x, const Integer& y, Integer& dest);
friend void pow(const Integer& x, const Integer& y, Integer& dest);
- friend int compare(const Integer&, long);
- friend int ucompare(const Integer&, long);
+ friend int compare(const Integer&, long);
+ friend int ucompare(const Integer&, long);
friend void add(const Integer& x, long y, Integer& dest);
friend void sub(const Integer& x, long y, Integer& dest);
friend void mul(const Integer& x, long y, Integer& dest);
@@ -183,8 +183,8 @@ public:
friend void rshift(const Integer& x, long y, Integer& dest);
friend void pow(const Integer& x, long y, Integer& dest);
- friend int compare(long, const Integer&);
- friend int ucompare(long, const Integer&);
+ friend int compare(long, const Integer&);
+ friend int ucompare(long, const Integer&);
friend void add(long x, const Integer& y, Integer& dest);
friend void sub(long x, const Integer& y, Integer& dest);
friend void mul(long x, const Integer& y, Integer& dest);
@@ -203,7 +203,7 @@ public:
friend char* Itoa(const Integer& x, int base = 10, int width = 0);
friend Integer atoI(const char* s, int base = 10);
void printon(ostream& s, int base = 10, int width = 0) const;
-
+
friend istream& operator >> (istream& s, Integer& y);
friend ostream& operator << (ostream& s, const Integer& y);
@@ -211,7 +211,7 @@ public:
int initialized() const;
void error(const char* msg) const;
- int OK() const;
+ int OK() const;
};
@@ -263,7 +263,7 @@ public:
Integer pow(const Integer& x, const Integer& y);
Integer pow(const Integer& x, long y);
- Integer Ipow(long x, long y); // x to the y as Integer
+ Integer Ipow(long x, long y); // x to the y as Integer
extern char* dec(const Integer& x, int width = 0);
@@ -498,62 +498,62 @@ inline void xor(long x, const Integer& y, Integer& dest)
inline int operator == (const Integer& x, const Integer& y)
{
- return compare(x, y) == 0;
+ return compare(x, y) == 0;
}
inline int operator == (const Integer& x, long y)
{
- return compare(x, y) == 0;
+ return compare(x, y) == 0;
}
inline int operator != (const Integer& x, const Integer& y)
{
- return compare(x, y) != 0;
+ return compare(x, y) != 0;
}
inline int operator != (const Integer& x, long y)
{
- return compare(x, y) != 0;
+ return compare(x, y) != 0;
}
inline int operator < (const Integer& x, const Integer& y)
{
- return compare(x, y) < 0;
+ return compare(x, y) < 0;
}
inline int operator < (const Integer& x, long y)
{
- return compare(x, y) < 0;
+ return compare(x, y) < 0;
}
inline int operator <= (const Integer& x, const Integer& y)
{
- return compare(x, y) <= 0;
+ return compare(x, y) <= 0;
}
inline int operator <= (const Integer& x, long y)
{
- return compare(x, y) <= 0;
+ return compare(x, y) <= 0;
}
inline int operator > (const Integer& x, const Integer& y)
{
- return compare(x, y) > 0;
+ return compare(x, y) > 0;
}
inline int operator > (const Integer& x, long y)
{
- return compare(x, y) > 0;
+ return compare(x, y) > 0;
}
inline int operator >= (const Integer& x, const Integer& y)
{
- return compare(x, y) >= 0;
+ return compare(x, y) >= 0;
}
inline int operator >= (const Integer& x, long y)
{
- return compare(x, y) >= 0;
+ return compare(x, y) >= 0;
}
@@ -738,12 +738,12 @@ inline char* Itoa(const Integer& y, int base, int width)
-inline long lg(const Integer& x)
+inline long lg(const Integer& x)
{
return lg(x.rep);
}
-// constructive operations
+// constructive operations
#if defined(__GNUG__) && !defined(_G_NO_NRV)
@@ -926,179 +926,179 @@ inline Integer gcd(const Integer& x, const Integer& y) return r
#else /* NO_NRV */
-inline Integer operator + (const Integer& x, const Integer& y)
+inline Integer operator + (const Integer& x, const Integer& y)
{
Integer r; add(x, y, r); return r;
}
-inline Integer operator + (const Integer& x, long y)
+inline Integer operator + (const Integer& x, long y)
{
Integer r; add(x, y, r); return r;
}
-inline Integer operator + (long x, const Integer& y)
+inline Integer operator + (long x, const Integer& y)
{
Integer r; add(x, y, r); return r;
}
-inline Integer operator - (const Integer& x, const Integer& y)
+inline Integer operator - (const Integer& x, const Integer& y)
{
Integer r; sub(x, y, r); return r;
}
-inline Integer operator - (const Integer& x, long y)
+inline Integer operator - (const Integer& x, long y)
{
Integer r; sub(x, y, r); return r;
}
-inline Integer operator - (long x, const Integer& y)
+inline Integer operator - (long x, const Integer& y)
{
Integer r; sub(x, y, r); return r;
}
-inline Integer operator * (const Integer& x, const Integer& y)
+inline Integer operator * (const Integer& x, const Integer& y)
{
Integer r; mul(x, y, r); return r;
}
-inline Integer operator * (const Integer& x, long y)
+inline Integer operator * (const Integer& x, long y)
{
Integer r; mul(x, y, r); return r;
}
-inline Integer operator * (long x, const Integer& y)
+inline Integer operator * (long x, const Integer& y)
{
Integer r; mul(x, y, r); return r;
}
-inline Integer sqr(const Integer& x)
+inline Integer sqr(const Integer& x)
{
Integer r; mul(x, x, r); return r;
}
-inline Integer operator & (const Integer& x, const Integer& y)
+inline Integer operator & (const Integer& x, const Integer& y)
{
Integer r; and(x, y, r); return r;
}
-inline Integer operator & (const Integer& x, long y)
+inline Integer operator & (const Integer& x, long y)
{
Integer r; and(x, y, r); return r;
}
-inline Integer operator & (long x, const Integer& y)
+inline Integer operator & (long x, const Integer& y)
{
Integer r; and(x, y, r); return r;
}
-inline Integer operator | (const Integer& x, const Integer& y)
+inline Integer operator | (const Integer& x, const Integer& y)
{
Integer r; or(x, y, r); return r;
}
-inline Integer operator | (const Integer& x, long y)
+inline Integer operator | (const Integer& x, long y)
{
Integer r; or(x, y, r); return r;
}
-inline Integer operator | (long x, const Integer& y)
+inline Integer operator | (long x, const Integer& y)
{
Integer r; or(x, y, r); return r;
}
-inline Integer operator ^ (const Integer& x, const Integer& y)
+inline Integer operator ^ (const Integer& x, const Integer& y)
{
Integer r; xor(x, y, r); return r;
}
-inline Integer operator ^ (const Integer& x, long y)
+inline Integer operator ^ (const Integer& x, long y)
{
Integer r; xor(x, y, r); return r;
}
-inline Integer operator ^ (long x, const Integer& y)
+inline Integer operator ^ (long x, const Integer& y)
{
Integer r; xor(x, y, r); return r;
}
-inline Integer operator / (const Integer& x, const Integer& y)
+inline Integer operator / (const Integer& x, const Integer& y)
{
Integer r; div(x, y, r); return r;
}
-inline Integer operator / (const Integer& x, long y)
+inline Integer operator / (const Integer& x, long y)
{
Integer r; div(x, y, r); return r;
}
-inline Integer operator % (const Integer& x, const Integer& y)
+inline Integer operator % (const Integer& x, const Integer& y)
{
Integer r; mod(x, y, r); return r;
}
-inline Integer operator % (const Integer& x, long y)
+inline Integer operator % (const Integer& x, long y)
{
Integer r; mod(x, y, r); return r;
}
-inline Integer operator << (const Integer& x, const Integer& y)
+inline Integer operator << (const Integer& x, const Integer& y)
{
Integer r; lshift(x, y, r); return r;
}
-inline Integer operator << (const Integer& x, long y)
+inline Integer operator << (const Integer& x, long y)
{
Integer r; lshift(x, y, r); return r;
}
-inline Integer operator >> (const Integer& x, const Integer& y)
+inline Integer operator >> (const Integer& x, const Integer& y)
{
Integer r; rshift(x, y, r); return r;
}
-inline Integer operator >> (const Integer& x, long y)
+inline Integer operator >> (const Integer& x, long y)
{
Integer r; rshift(x, y, r); return r;
}
-inline Integer pow(const Integer& x, long y)
+inline Integer pow(const Integer& x, long y)
{
Integer r; pow(x, y, r); return r;
}
-inline Integer Ipow(long x, long y)
+inline Integer Ipow(long x, long y)
{
Integer r(x); pow(r, y, r); return r;
}
-inline Integer pow(const Integer& x, const Integer& y)
+inline Integer pow(const Integer& x, const Integer& y)
{
Integer r; pow(x, y, r); return r;
}
-inline Integer abs(const Integer& x)
+inline Integer abs(const Integer& x)
{
Integer r; abs(x, r); return r;
}
-inline Integer operator - (const Integer& x)
+inline Integer operator - (const Integer& x)
{
Integer r; negate(x, r); return r;
}
-inline Integer operator ~ (const Integer& x)
+inline Integer operator ~ (const Integer& x)
{
Integer r; complement(x, r); return r;
}
-inline Integer atoI(const char* s, int base)
+inline Integer atoI(const char* s, int base)
{
Integer r; r.rep = atoIntRep(s, base); return r;
}
-inline Integer gcd(const Integer& x, const Integer& y)
+inline Integer gcd(const Integer& x, const Integer& y)
{
Integer r; r.rep = gcd(x.rep, y.rep); return r;
}
diff --git a/gnu/lib/libg++/include/LogNorm.h b/gnu/lib/libg++/include/LogNorm.h
index ac98141e62a3..b5c4b463b151 100644
--- a/gnu/lib/libg++/include/LogNorm.h
+++ b/gnu/lib/libg++/include/LogNorm.h
@@ -1,5 +1,5 @@
// This may look like C code, but it is really -*- C++ -*-
-/*
+/*
Copyright (C) 1988 Free Software Foundation
written by Dirk Grunwald (grunwald@cs.uiuc.edu)
@@ -19,7 +19,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
#ifdef __GNUG__
#pragma interface
#endif
-#define _LogNormal_h
+#define _LogNormal_h
#include <Normal.h>
@@ -44,7 +44,7 @@ inline void LogNormal::setState()
pMean = log(m2 / sqrt(logVariance + m2) );
// from ch@heike.informatik.uni-dortmund.de:
// (was pVariance = log((sqrt(logVariance + m2)/m2 )); )
- pStdDev = sqrt(log((logVariance + m2)/m2 ));
+ pStdDev = sqrt(log((logVariance + m2)/m2 ));
}
inline LogNormal::LogNormal(double mean, double variance, RNG *gen)
diff --git a/gnu/lib/libg++/include/MLCG.h b/gnu/lib/libg++/include/MLCG.h
index 8fa08a856fe0..9b288a731283 100644
--- a/gnu/lib/libg++/include/MLCG.h
+++ b/gnu/lib/libg++/include/MLCG.h
@@ -1,5 +1,5 @@
// This may look like C code, but it is really -*- C++ -*-
-/*
+/*
Copyright (C) 1988 Free Software Foundation
written by Dirk Grunwald (grunwald@cs.uiuc.edu)
@@ -16,7 +16,7 @@ License along with this library; if not, write to the Free Software
Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef _MLCG_h
-#define _MLCG_h 1
+#define _MLCG_h 1
#ifdef __GNUG__
#pragma interface
#endif
diff --git a/gnu/lib/libg++/include/NegExp.h b/gnu/lib/libg++/include/NegExp.h
index b96f9132dfa8..041e083bffde 100644
--- a/gnu/lib/libg++/include/NegExp.h
+++ b/gnu/lib/libg++/include/NegExp.h
@@ -1,5 +1,5 @@
// This may look like C code, but it is really -*- C++ -*-
-/*
+/*
Copyright (C) 1988 Free Software Foundation
written by Dirk Grunwald (grunwald@cs.uiuc.edu)
@@ -25,7 +25,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
//
// Negative Exponential Random Numbers
//
-//
+//
#include <Random.h>
diff --git a/gnu/lib/libg++/include/Normal.h b/gnu/lib/libg++/include/Normal.h
index 8c8358ee1215..ab80f2a14d2d 100644
--- a/gnu/lib/libg++/include/Normal.h
+++ b/gnu/lib/libg++/include/Normal.h
@@ -1,5 +1,5 @@
// This may look like C code, but it is really -*- C++ -*-
-/*
+/*
Copyright (C) 1988 Free Software Foundation
written by Dirk Grunwald (grunwald@cs.uiuc.edu)
@@ -19,7 +19,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
#ifdef __GNUG__
#pragma interface
#endif
-#define _Normal_h
+#define _Normal_h
#include <Random.h>
@@ -31,7 +31,7 @@ protected:
double pMean;
double pVariance;
double pStdDev;
-
+
public:
Normal(double xmean, double xvariance, RNG *gen);
double mean();
diff --git a/gnu/lib/libg++/include/Obstack.h b/gnu/lib/libg++/include/Obstack.h
index 384157f630ef..6e353fb56a22 100644
--- a/gnu/lib/libg++/include/Obstack.h
+++ b/gnu/lib/libg++/include/Obstack.h
@@ -1,5 +1,5 @@
// This may look like C code, but it is really -*- C++ -*-
-/*
+/*
Copyright (C) 1988 Free Software Foundation
written by Doug Lea (dl@rocky.oswego.edu)
@@ -84,127 +84,127 @@ public:
inline Obstack::~Obstack()
{
- _free(0);
+ _free(0);
}
inline void* Obstack::base()
{
- return objectbase;
+ return objectbase;
}
inline void* Obstack::next_free()
{
- return nextfree;
+ return nextfree;
}
inline int Obstack::alignment_mask()
{
- return alignmentmask;
+ return alignmentmask;
}
inline int Obstack::chunk_size()
{
- return chunksize;
+ return chunksize;
}
inline int Obstack::size()
{
- return nextfree - objectbase;
+ return nextfree - objectbase;
}
inline int Obstack::room()
{
- return chunklimit - nextfree;
+ return chunklimit - nextfree;
}
inline void Obstack:: grow(const void* data, int size)
{
- if (nextfree+size > chunklimit)
+ if (nextfree+size > chunklimit)
newchunk(size);
memcpy(nextfree, data, size);
- nextfree += size;
+ nextfree += size;
}
inline void Obstack:: grow(const void* data, int size, char terminator)
{
- if (nextfree+size+1 > chunklimit)
+ if (nextfree+size+1 > chunklimit)
newchunk(size+1);
memcpy(nextfree, data, size);
- nextfree += size;
- *(nextfree)++ = terminator;
+ nextfree += size;
+ *(nextfree)++ = terminator;
}
inline void Obstack:: grow(const char* s)
{
- grow((const void*)s, strlen(s), 0);
+ grow((const void*)s, strlen(s), 0);
}
inline void Obstack:: grow(char c)
{
- if (nextfree+1 > chunklimit)
- newchunk(1);
- *(nextfree)++ = c;
+ if (nextfree+1 > chunklimit)
+ newchunk(1);
+ *(nextfree)++ = c;
}
inline void Obstack:: blank(int size)
{
- if (nextfree+size > chunklimit)
+ if (nextfree+size > chunklimit)
newchunk(size);
- nextfree += size;
+ nextfree += size;
}
inline void* Obstack::finish(char terminator)
{
- grow(terminator);
- return finish();
+ grow(terminator);
+ return finish();
}
inline void* Obstack::copy(const void* data, int size)
{
grow (data, size);
- return finish();
+ return finish();
}
inline void* Obstack::copy(const void* data, int size, char terminator)
{
- grow(data, size, terminator);
- return finish();
+ grow(data, size, terminator);
+ return finish();
}
inline void* Obstack::copy(const char* s)
{
- grow((const void*)s, strlen(s), 0);
- return finish();
+ grow((const void*)s, strlen(s), 0);
+ return finish();
}
inline void* Obstack::copy(char c)
{
grow(c);
- return finish();
+ return finish();
}
inline void* Obstack::alloc(int size)
{
blank(size);
- return finish();
+ return finish();
}
-inline void Obstack:: free(void* obj)
+inline void Obstack:: free(void* obj)
{
if (obj >= (void*)chunk && obj<(void*)chunklimit)
nextfree = objectbase = (char *) obj;
- else
- _free(obj);
+ else
+ _free(obj);
}
inline void Obstack:: grow_fast(char c)
{
- *(nextfree)++ = c;
+ *(nextfree)++ = c;
}
inline void Obstack:: blank_fast(int size)
{
- nextfree += size;
+ nextfree += size;
}
inline void Obstack:: shrink(int size) // from ken@cs.rochester.edu
diff --git a/gnu/lib/libg++/include/PlotFile.h b/gnu/lib/libg++/include/PlotFile.h
index 91ab6aeb5eb1..1a401cd57f1f 100644
--- a/gnu/lib/libg++/include/PlotFile.h
+++ b/gnu/lib/libg++/include/PlotFile.h
@@ -22,10 +22,10 @@ the resulting executable to be covered by the GNU General Public License.
This exception does not however invalidate any other reasons why
the executable file might be covered by the GNU General Public License. */
-/*
+/*
a very simple implementation of a class to output unix "plot"
format plotter files. See corresponding unix man pages for
- more details.
+ more details.
written by Doug Lea (dl@rocky.oswego.edu)
converted to use iostream library by Per Bothner (bothner@cygnus.com)
@@ -39,7 +39,7 @@ the executable file might be covered by the GNU General Public License. */
#include <fstream.h>
-/*
+/*
Some plot libraries have the `box' command to draw boxes. Some don't.
`box' is included here via moves & lines to allow both possiblilties.
*/
@@ -51,21 +51,21 @@ protected:
PlotFile& cmd(char c);
PlotFile& operator << (const int x);
PlotFile& operator << (const char *s);
-
+
public:
-
+
PlotFile() : ofstream() { }
PlotFile(int fd) : ofstream(fd) { }
PlotFile(const char *name, int mode=ios::out, int prot=0664)
: ofstream(name, mode, prot) { }
-
+
// PlotFile& remove() { ofstream::remove(); return *this; }
-
+
// int filedesc() { return ofstream::filedesc(); }
// const char* name() { return File::name(); }
// void setname(const char* newname) { File::setname(newname); }
// int iocount() { return File::iocount(); }
-
+
PlotFile& arc(const int xi, const int yi,
const int x0, const int y0,
const int x1, const int y1);
@@ -75,7 +75,7 @@ public:
PlotFile& cont(const int xi, const int yi);
PlotFile& dot(const int xi, const int yi, const int dx,
int n, const int* pat);
- PlotFile& erase();
+ PlotFile& erase();
PlotFile& label(const char* s);
PlotFile& line(const int x0, const int y0,
const int x1, const int y1);
diff --git a/gnu/lib/libg++/include/Poisson.h b/gnu/lib/libg++/include/Poisson.h
index e5851453be1f..895b072fc9d4 100644
--- a/gnu/lib/libg++/include/Poisson.h
+++ b/gnu/lib/libg++/include/Poisson.h
@@ -1,5 +1,5 @@
// This may look like C code, but it is really -*- C++ -*-
-/*
+/*
Copyright (C) 1988 Free Software Foundation
written by Dirk Grunwald (grunwald@cs.uiuc.edu)
@@ -19,7 +19,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
#ifdef __GNUG__
#pragma interface
#endif
-#define _Poisson_h
+#define _Poisson_h
#include <Random.h>
diff --git a/gnu/lib/libg++/include/RNG.h b/gnu/lib/libg++/include/RNG.h
index b924fb697c34..81b5e16797aa 100644
--- a/gnu/lib/libg++/include/RNG.h
+++ b/gnu/lib/libg++/include/RNG.h
@@ -1,5 +1,5 @@
// This may look like C code, but it is really -*- C++ -*-
-/*
+/*
Copyright (C) 1988 Free Software Foundation
written by Dirk Grunwald (grunwald@cs.uiuc.edu)
diff --git a/gnu/lib/libg++/include/Random.h b/gnu/lib/libg++/include/Random.h
index 925698f68b83..e3e624acdf51 100644
--- a/gnu/lib/libg++/include/Random.h
+++ b/gnu/lib/libg++/include/Random.h
@@ -1,5 +1,5 @@
// This may look like C code, but it is really -*- C++ -*-
-/*
+/*
Copyright (C) 1988 Free Software Foundation
written by Dirk Grunwald (grunwald@cs.uiuc.edu)
diff --git a/gnu/lib/libg++/include/Rational.h b/gnu/lib/libg++/include/Rational.h
index 131aabc79dd4..1f8b76b57b03 100644
--- a/gnu/lib/libg++/include/Rational.h
+++ b/gnu/lib/libg++/include/Rational.h
@@ -1,6 +1,6 @@
// This may look like C code, but it is really -*- C++ -*-
-/*
+/*
Copyright (C) 1988 Free Software Foundation
written by Doug Lea (dl@rocky.oswego.edu)
@@ -171,22 +171,22 @@ inline int operator != (const Rational& x, const Rational& y)
inline int operator < (const Rational& x, const Rational& y)
{
- return compare(x, y) < 0;
+ return compare(x, y) < 0;
}
inline int operator <= (const Rational& x, const Rational& y)
{
- return compare(x, y) <= 0;
+ return compare(x, y) <= 0;
}
inline int operator > (const Rational& x, const Rational& y)
{
- return compare(x, y) > 0;
+ return compare(x, y) > 0;
}
inline int operator >= (const Rational& x, const Rational& y)
{
- return compare(x, y) >= 0;
+ return compare(x, y) >= 0;
}
inline int sign(const Rational& x)
@@ -200,25 +200,25 @@ inline void Rational::negate()
}
-inline Rational& Rational::operator += (const Rational& y)
+inline Rational& Rational::operator += (const Rational& y)
{
add(*this, y, *this);
return *this;
}
-inline Rational& Rational::operator -= (const Rational& y)
+inline Rational& Rational::operator -= (const Rational& y)
{
sub(*this, y, *this);
return *this;
}
-inline Rational& Rational::operator *= (const Rational& y)
+inline Rational& Rational::operator *= (const Rational& y)
{
mul(*this, y, *this);
return *this;
}
-inline Rational& Rational::operator /= (const Rational& y)
+inline Rational& Rational::operator /= (const Rational& y)
{
div(*this, y, *this);
return *this;
@@ -264,7 +264,7 @@ inline Rational operator / (const Rational& x, const Rational& y) return r
#else /* NO_NRV */
-inline Rational operator + (const Rational& x, const Rational& y)
+inline Rational operator + (const Rational& x, const Rational& y)
{
Rational r; add(x, y, r); return r;
}
diff --git a/gnu/lib/libg++/include/Regex.h b/gnu/lib/libg++/include/Regex.h
index c8cf7319f244..adc1cea1354d 100644
--- a/gnu/lib/libg++/include/Regex.h
+++ b/gnu/lib/libg++/include/Regex.h
@@ -1,5 +1,5 @@
// This may look like C code, but it is really -*- C++ -*-
-/*
+/*
Copyright (C) 1988 Free Software Foundation
written by Doug Lea (dl@rocky.oswego.edu)
@@ -44,15 +44,15 @@ protected:
re_registers* reg;
public:
- Regex(const char* t,
- int fast = 0,
- int bufsize = 40,
+ Regex(const char* t,
+ int fast = 0,
+ int bufsize = 40,
const char* transtable = 0);
~Regex();
int match(const char* s, int len, int pos = 0) const;
- int search(const char* s, int len,
+ int search(const char* s, int len,
int& matchlen, int startpos = 0) const;
int match_info(int& start, int& length, int nth = 0) const;
diff --git a/gnu/lib/libg++/include/RndInt.h b/gnu/lib/libg++/include/RndInt.h
index b16c7f88ec89..bf0f955db21d 100644
--- a/gnu/lib/libg++/include/RndInt.h
+++ b/gnu/lib/libg++/include/RndInt.h
@@ -1,5 +1,5 @@
// This may look like C code, but it is really -*- C++ -*-
-/*
+/*
Copyright (C) 1990 Free Software Foundation
adapted from a submission from John Reidl <riedl@cs.purdue.edu>
@@ -40,13 +40,13 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
// in a specified range. By default the range is 0..1. Since in my
// experience random numbers are often needed for a wide variety of
// ranges in the same program, this generator accepts a new low or high value
-// as an argument to the asLong and operator() methods to temporarily
+// as an argument to the asLong and operator() methods to temporarily
// override stored values
#include <math.h>
#include <RNG.h>
-class RandomInteger
+class RandomInteger
{
protected:
RNG *pGenerator;
@@ -90,20 +90,20 @@ class RandomInteger
};
-inline RandomInteger::RandomInteger(long low, long high, RNG *gen)
+inline RandomInteger::RandomInteger(long low, long high, RNG *gen)
: pLow((low < high) ? low : high),
pHigh((low < high) ? high : low),
pGenerator(gen)
{}
-inline RandomInteger::RandomInteger(long high, RNG *gen)
+inline RandomInteger::RandomInteger(long high, RNG *gen)
: pLow((0 < high) ? 0 : high),
pHigh((0 < high) ? high : 0),
pGenerator(gen)
{}
-
-inline RandomInteger::RandomInteger(RNG *gen)
+
+inline RandomInteger::RandomInteger(RNG *gen)
: pLow(0),
pHigh(1),
pGenerator(gen)
@@ -113,28 +113,28 @@ inline RNG* RandomInteger::generator() const { return pGenerator;}
inline long RandomInteger::low() const { return pLow; }
inline long RandomInteger::high() const { return pHigh; }
-inline RNG* RandomInteger::generator(RNG *gen)
+inline RNG* RandomInteger::generator(RNG *gen)
{
RNG *tmp = pGenerator; pGenerator = gen; return tmp;
}
-inline long RandomInteger::low(long x)
+inline long RandomInteger::low(long x)
{
long tmp = pLow; pLow = x; return tmp;
}
-inline long RandomInteger:: high(long x)
+inline long RandomInteger:: high(long x)
{
long tmp = pHigh; pHigh = x; return tmp;
}
inline long RandomInteger:: _asLong(long low, long high)
-{
+{
return (pGenerator->asLong() % (high-low+1)) + low;
}
-inline long RandomInteger:: asLong()
+inline long RandomInteger:: asLong()
{
return _asLong(pLow, pHigh);
}
@@ -149,7 +149,7 @@ inline long RandomInteger:: asLong(long low, long high)
return _asLong(low, high);
}
-inline long RandomInteger:: operator () ()
+inline long RandomInteger:: operator () ()
{
return _asLong(pLow, pHigh);
}
@@ -167,7 +167,7 @@ inline long RandomInteger:: operator () (long low, long high)
-inline int RandomInteger:: asInt()
+inline int RandomInteger:: asInt()
{
return int(asLong());
}
diff --git a/gnu/lib/libg++/include/SFile.h b/gnu/lib/libg++/include/SFile.h
index 3726844cf564..d4b4c71fd20a 100644
--- a/gnu/lib/libg++/include/SFile.h
+++ b/gnu/lib/libg++/include/SFile.h
@@ -41,10 +41,10 @@ public:
SFile(int fd, int size);
SFile(const char *name, int size, int mode, int prot=0664);
void open(const char *name, int size, int mode, int prot=0664);
-
+
int size() { return sz; }
int setsize(int s) { int old = sz; sz = s; return old; }
-
+
SFile& get(void* x);
SFile& put(void* x);
SFile& operator[](long i);
diff --git a/gnu/lib/libg++/include/SLList.h b/gnu/lib/libg++/include/SLList.h
index 8c133d7ebf6d..4be457fd3524 100644
--- a/gnu/lib/libg++/include/SLList.h
+++ b/gnu/lib/libg++/include/SLList.h
@@ -1,5 +1,5 @@
// This may look like C code, but it is really -*- C++ -*-
-/*
+/*
Copyright (C) 1988, 1992 Free Software Foundation
written by Doug Lea (dl@rocky.oswego.edu)
@@ -104,7 +104,7 @@ public:
Pix ins_after(Pix p, const T& item)
{ return BaseSLList::ins_after(p, &item); }
void join(SLList<T>& a) { BaseSLList::join(a); }
-
+
T& front() {
if (last == 0) error("front: empty list");
return ((SLNode<T>*)last->tl)->hd; }
diff --git a/gnu/lib/libg++/include/SmplHist.h b/gnu/lib/libg++/include/SmplHist.h
index a9a755018374..54614b99bd90 100644
--- a/gnu/lib/libg++/include/SmplHist.h
+++ b/gnu/lib/libg++/include/SmplHist.h
@@ -1,5 +1,5 @@
// This may look like C code, but it is really -*- C++ -*-
-/*
+/*
Copyright (C) 1988 Free Software Foundation
written by Dirk Grunwald (grunwald@cs.uiuc.edu)
@@ -28,7 +28,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
extern const int SampleHistogramMinimum;
extern const int SampleHistogramMaximum;
-class SampleHistogram : public SampleStatistic
+class SampleHistogram : public SampleStatistic
{
protected:
short howManyBuckets;
@@ -36,7 +36,7 @@ protected:
double *bucketLimit;
public:
-
+
SampleHistogram(double low, double hi, double bucketWidth = -1.0);
~SampleHistogram();
diff --git a/gnu/lib/libg++/include/SmplStat.h b/gnu/lib/libg++/include/SmplStat.h
index 191ec676f75b..2ed5ab984c0b 100644
--- a/gnu/lib/libg++/include/SmplStat.h
+++ b/gnu/lib/libg++/include/SmplStat.h
@@ -1,5 +1,5 @@
// This may look like C code, but it is really -*- C++ -*-
-/*
+/*
Copyright (C) 1988 Free Software Foundation
written by Dirk Grunwald (grunwald@cs.uiuc.edu)
@@ -34,7 +34,7 @@ protected:
SampleStatistic();
virtual ~SampleStatistic();
- virtual void reset();
+ virtual void reset();
virtual void operator+=(double);
int samples();
@@ -54,7 +54,7 @@ protected:
extern void default_SampleStatistic_error_handler(const char*);
extern one_arg_error_handler_t SampleStatistic_error_handler;
-extern one_arg_error_handler_t
+extern one_arg_error_handler_t
set_SampleStatistic_error_handler(one_arg_error_handler_t f);
inline SampleStatistic:: SampleStatistic(){ reset();}
diff --git a/gnu/lib/libg++/include/String.h b/gnu/lib/libg++/include/String.h
index 95b2bdf9e67d..7a3d82b5bb19 100644
--- a/gnu/lib/libg++/include/String.h
+++ b/gnu/lib/libg++/include/String.h
@@ -1,5 +1,5 @@
// This may look like C code, but it is really -*- C++ -*-
-/*
+/*
Copyright (C) 1988 Free Software Foundation
written by Doug Lea (dl@rocky.oswego.edu)
@@ -28,9 +28,9 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
struct StrRep // internal String representations
{
- unsigned short len; // string length
+ unsigned short len; // string length
unsigned short sz; // allocated space
- char s[1]; // the string starts here
+ char s[1]; // the string starts here
// (at least 1 char for trailing null)
// allocated & expanded via non-public fcts
};
@@ -89,7 +89,7 @@ public:
int matches(const Regex& r) const;
-// IO
+// IO
friend ostream& operator<<(ostream& s, const SubString& x);
@@ -99,7 +99,7 @@ public:
int empty() const;
const char* chars() const;
- int OK() const;
+ int OK() const;
};
@@ -140,12 +140,12 @@ public:
// concatenation
- String& operator += (const String& y);
+ String& operator += (const String& y);
String& operator += (const SubString& y);
String& operator += (const char* t);
String& operator += (char c);
- void prepend(const String& y);
+ void prepend(const String& y);
void prepend(const SubString& y);
void prepend(const char* t);
void prepend(char c);
@@ -169,7 +169,7 @@ public:
friend inline void cat(const char*, const char*, String&);
friend inline void cat(const char*, char, String&);
-// double concatenation, by request. (yes, there are too many versions,
+// double concatenation, by request. (yes, there are too many versions,
// but if one is supported, then the others should be too...)
// Concatenate first 3 args, store in last arg
@@ -204,11 +204,11 @@ public:
// return position of target in string or -1 for failure
- int index(char c, int startpos = 0) const;
- int index(const String& y, int startpos = 0) const;
- int index(const SubString& y, int startpos = 0) const;
- int index(const char* t, int startpos = 0) const;
- int index(const Regex& r, int startpos = 0) const;
+ int index(char c, int startpos = 0) const;
+ int index(const String& y, int startpos = 0) const;
+ int index(const SubString& y, int startpos = 0) const;
+ int index(const char* t, int startpos = 0) const;
+ int index(const Regex& r, int startpos = 0) const;
// return 1 if target appears anyhere in String; else 0
@@ -218,7 +218,7 @@ public:
int contains(const char* t) const;
int contains(const Regex& r) const;
-// return 1 if target appears anywhere after position pos
+// return 1 if target appears anywhere after position pos
// (or before, if pos is negative) in String; else 0
int contains(char c, int pos) const;
@@ -237,7 +237,7 @@ public:
// return number of occurences of target in String
- int freq(char c) const;
+ int freq(char c) const;
int freq(const String& y) const;
int freq(const SubString& y) const;
int freq(const char* t) const;
@@ -251,11 +251,11 @@ public:
SubString at(int pos, int len);
SubString operator () (int pos, int len); // synonym for at
- SubString at(const String& x, int startpos = 0);
- SubString at(const SubString& x, int startpos = 0);
+ SubString at(const String& x, int startpos = 0);
+ SubString at(const SubString& x, int startpos = 0);
SubString at(const char* t, int startpos = 0);
SubString at(char c, int startpos = 0);
- SubString at(const Regex& r, int startpos = 0);
+ SubString at(const Regex& r, int startpos = 0);
SubString before(int pos);
SubString before(const String& x, int startpos = 0);
@@ -311,14 +311,14 @@ public:
// split string into array res at separators; return number of elements
- friend int split(const String& x, String res[], int maxn,
+ friend int split(const String& x, String res[], int maxn,
const String& sep);
- friend int split(const String& x, String res[], int maxn,
+ friend int split(const String& x, String res[], int maxn,
const Regex& sep);
- friend String common_prefix(const String& x, const String& y,
+ friend String common_prefix(const String& x, const String& y,
int startpos = 0);
- friend String common_suffix(const String& x, const String& y,
+ friend String common_suffix(const String& x, const String& y,
int startpos = -1);
friend String replicate(char c, int n);
friend String replicate(const String& y, int n);
@@ -358,7 +358,7 @@ public:
friend ostream& operator<<(ostream& s, const SubString& x);
friend istream& operator>>(istream& s, String& x);
- friend int readline(istream& s, String& x,
+ friend int readline(istream& s, String& x,
char terminator = '\n',
int discard_terminator = 1);
@@ -409,17 +409,17 @@ inline const char* SubString::chars() const { return &(S.rep->s[pos]); }
// constructors
-inline String::String()
+inline String::String()
: rep(&_nilStrRep) {}
-inline String::String(const String& x)
+inline String::String(const String& x)
: rep(Scopy(0, x.rep)) {}
-inline String::String(const char* t)
+inline String::String(const char* t)
: rep(Salloc(0, t, -1, -1)) {}
inline String::String(const char* t, int tlen)
: rep(Salloc(0, t, tlen, tlen)) {}
inline String::String(const SubString& y)
: rep(Salloc(0, y.chars(), y.length(), y.length())) {}
-inline String::String(char c)
+inline String::String(char c)
: rep(Salloc(0, &c, 1, 1)) {}
inline String::~String() { if (rep != &_nilStrRep) delete rep; }
@@ -434,7 +434,7 @@ inline SubString::~SubString() {}
// assignment
inline String& String::operator = (const String& y)
-{
+{
rep = Scopy(rep, y.rep);
return *this;
}
@@ -773,67 +773,67 @@ inline String operator + (const String& x, const String& y)
String r; cat(x, y, r); return r;
}
-inline String operator + (const String& x, const SubString& y)
+inline String operator + (const String& x, const SubString& y)
{
String r; cat(x, y, r); return r;
}
-inline String operator + (const String& x, const char* y)
+inline String operator + (const String& x, const char* y)
{
String r; cat(x, y, r); return r;
}
-inline String operator + (const String& x, char y)
+inline String operator + (const String& x, char y)
{
String r; cat(x, y, r); return r;
}
-inline String operator + (const SubString& x, const String& y)
+inline String operator + (const SubString& x, const String& y)
{
String r; cat(x, y, r); return r;
}
-inline String operator + (const SubString& x, const SubString& y)
+inline String operator + (const SubString& x, const SubString& y)
{
String r; cat(x, y, r); return r;
}
-inline String operator + (const SubString& x, const char* y)
+inline String operator + (const SubString& x, const char* y)
{
String r; cat(x, y, r); return r;
}
-inline String operator + (const SubString& x, char y)
+inline String operator + (const SubString& x, char y)
{
String r; cat(x, y, r); return r;
}
-inline String operator + (const char* x, const String& y)
+inline String operator + (const char* x, const String& y)
{
String r; cat(x, y, r); return r;
}
-inline String operator + (const char* x, const SubString& y)
+inline String operator + (const char* x, const SubString& y)
{
String r; cat(x, y, r); return r;
}
-inline String reverse(const String& x)
+inline String reverse(const String& x)
{
String r; r.rep = Sreverse(x.rep, r.rep); return r;
}
-inline String upcase(const String& x)
+inline String upcase(const String& x)
{
String r; r.rep = Supcase(x.rep, r.rep); return r;
}
-inline String downcase(const String& x)
+inline String downcase(const String& x)
{
String r; r.rep = Sdowncase(x.rep, r.rep); return r;
}
-inline String capitalize(const String& x)
+inline String capitalize(const String& x)
{
String r; r.rep = Scapitalize(x.rep, r.rep); return r;
}
@@ -849,12 +849,12 @@ inline void String::prepend(const String& y)
inline void String::prepend(const char* y)
{
- rep = Sprepend(rep, y, -1);
+ rep = Sprepend(rep, y, -1);
}
inline void String::prepend(char y)
{
- rep = Sprepend(rep, &y, 1);
+ rep = Sprepend(rep, &y, 1);
}
inline void String::prepend(const SubString& y)
@@ -890,31 +890,31 @@ inline void String::capitalize()
// element extraction
-inline char& String::operator [] (int i)
-{
+inline char& String::operator [] (int i)
+{
if (((unsigned)i) >= length()) error("invalid index");
return rep->s[i];
}
inline const char& String::operator [] (int i) const
-{
+{
if (((unsigned)i) >= length()) error("invalid index");
return rep->s[i];
}
inline char String::elem (int i) const
-{
+{
if (((unsigned)i) >= length()) error("invalid index");
return rep->s[i];
}
inline char String::firstchar() const
-{
+{
return elem(0);
}
inline char String::lastchar() const
-{
+{
return elem(length() - 1);
}
@@ -926,17 +926,17 @@ inline int String::index(char c, int startpos) const
}
inline int String::index(const char* t, int startpos) const
-{
+{
return search(startpos, length(), t);
}
inline int String::index(const String& y, int startpos) const
-{
+{
return search(startpos, length(), y.chars(), y.length());
}
inline int String::index(const SubString& y, int startpos) const
-{
+{
return search(startpos, length(), y.chars(), y.length());
}
@@ -951,17 +951,17 @@ inline int String::contains(char c) const
}
inline int String::contains(const char* t) const
-{
+{
return search(0, length(), t) >= 0;
}
inline int String::contains(const String& y) const
-{
+{
return search(0, length(), y.chars(), y.length()) >= 0;
}
inline int String::contains(const SubString& y) const
-{
+{
return search(0, length(), y.chars(), y.length()) >= 0;
}
@@ -1024,17 +1024,17 @@ inline int String::matches(const Regex& r, int p) const
inline int SubString::contains(const char* t) const
-{
+{
return S.search(pos, pos+len, t) >= 0;
}
inline int SubString::contains(const String& y) const
-{
+{
return S.search(pos, pos+len, y.chars(), y.length()) >= 0;
}
inline int SubString::contains(const SubString& y) const
-{
+{
return S.search(pos, pos+len, y.chars(), y.length()) >= 0;
}
@@ -1088,99 +1088,99 @@ inline ostream& operator<<(ostream& s, const String& x)
// a zillion comparison operators
-inline int operator==(const String& x, const String& y)
+inline int operator==(const String& x, const String& y)
{
- return compare(x, y) == 0;
+ return compare(x, y) == 0;
}
inline int operator!=(const String& x, const String& y)
{
- return compare(x, y) != 0;
+ return compare(x, y) != 0;
}
inline int operator>(const String& x, const String& y)
{
- return compare(x, y) > 0;
+ return compare(x, y) > 0;
}
inline int operator>=(const String& x, const String& y)
{
- return compare(x, y) >= 0;
+ return compare(x, y) >= 0;
}
inline int operator<(const String& x, const String& y)
{
- return compare(x, y) < 0;
+ return compare(x, y) < 0;
}
inline int operator<=(const String& x, const String& y)
{
- return compare(x, y) <= 0;
+ return compare(x, y) <= 0;
}
-inline int operator==(const String& x, const SubString& y)
+inline int operator==(const String& x, const SubString& y)
{
- return compare(x, y) == 0;
+ return compare(x, y) == 0;
}
inline int operator!=(const String& x, const SubString& y)
{
- return compare(x, y) != 0;
+ return compare(x, y) != 0;
}
-inline int operator>(const String& x, const SubString& y)
+inline int operator>(const String& x, const SubString& y)
{
- return compare(x, y) > 0;
+ return compare(x, y) > 0;
}
inline int operator>=(const String& x, const SubString& y)
{
- return compare(x, y) >= 0;
+ return compare(x, y) >= 0;
}
-inline int operator<(const String& x, const SubString& y)
+inline int operator<(const String& x, const SubString& y)
{
- return compare(x, y) < 0;
+ return compare(x, y) < 0;
}
inline int operator<=(const String& x, const SubString& y)
{
- return compare(x, y) <= 0;
+ return compare(x, y) <= 0;
}
-inline int operator==(const String& x, const char* t)
+inline int operator==(const String& x, const char* t)
{
- return compare(x, t) == 0;
+ return compare(x, t) == 0;
}
-inline int operator!=(const String& x, const char* t)
+inline int operator!=(const String& x, const char* t)
{
- return compare(x, t) != 0;
+ return compare(x, t) != 0;
}
-inline int operator>(const String& x, const char* t)
+inline int operator>(const String& x, const char* t)
{
- return compare(x, t) > 0;
+ return compare(x, t) > 0;
}
-inline int operator>=(const String& x, const char* t)
+inline int operator>=(const String& x, const char* t)
{
- return compare(x, t) >= 0;
+ return compare(x, t) >= 0;
}
-inline int operator<(const String& x, const char* t)
+inline int operator<(const String& x, const char* t)
{
- return compare(x, t) < 0;
+ return compare(x, t) < 0;
}
-inline int operator<=(const String& x, const char* t)
+inline int operator<=(const String& x, const char* t)
{
- return compare(x, t) <= 0;
+ return compare(x, t) <= 0;
}
-inline int operator==(const SubString& x, const String& y)
+inline int operator==(const SubString& x, const String& y)
{
- return compare(y, x) == 0;
+ return compare(y, x) == 0;
}
inline int operator!=(const SubString& x, const String& y)
@@ -1188,29 +1188,29 @@ inline int operator!=(const SubString& x, const String& y)
return compare(y, x) != 0;
}
-inline int operator>(const SubString& x, const String& y)
+inline int operator>(const SubString& x, const String& y)
{
return compare(y, x) < 0;
}
-inline int operator>=(const SubString& x, const String& y)
+inline int operator>=(const SubString& x, const String& y)
{
return compare(y, x) <= 0;
}
-inline int operator<(const SubString& x, const String& y)
+inline int operator<(const SubString& x, const String& y)
{
return compare(y, x) > 0;
}
-inline int operator<=(const SubString& x, const String& y)
+inline int operator<=(const SubString& x, const String& y)
{
return compare(y, x) >= 0;
}
-inline int operator==(const SubString& x, const SubString& y)
+inline int operator==(const SubString& x, const SubString& y)
{
- return compare(x, y) == 0;
+ return compare(x, y) == 0;
}
inline int operator!=(const SubString& x, const SubString& y)
@@ -1218,7 +1218,7 @@ inline int operator!=(const SubString& x, const SubString& y)
return compare(x, y) != 0;
}
-inline int operator>(const SubString& x, const SubString& y)
+inline int operator>(const SubString& x, const SubString& y)
{
return compare(x, y) > 0;
}
@@ -1228,7 +1228,7 @@ inline int operator>=(const SubString& x, const SubString& y)
return compare(x, y) >= 0;
}
-inline int operator<(const SubString& x, const SubString& y)
+inline int operator<(const SubString& x, const SubString& y)
{
return compare(x, y) < 0;
}
@@ -1238,34 +1238,34 @@ inline int operator<=(const SubString& x, const SubString& y)
return compare(x, y) <= 0;
}
-inline int operator==(const SubString& x, const char* t)
+inline int operator==(const SubString& x, const char* t)
{
- return compare(x, t) == 0;
+ return compare(x, t) == 0;
}
-inline int operator!=(const SubString& x, const char* t)
+inline int operator!=(const SubString& x, const char* t)
{
return compare(x, t) != 0;
}
-inline int operator>(const SubString& x, const char* t)
+inline int operator>(const SubString& x, const char* t)
{
- return compare(x, t) > 0;
+ return compare(x, t) > 0;
}
-inline int operator>=(const SubString& x, const char* t)
+inline int operator>=(const SubString& x, const char* t)
{
- return compare(x, t) >= 0;
+ return compare(x, t) >= 0;
}
-inline int operator<(const SubString& x, const char* t)
+inline int operator<(const SubString& x, const char* t)
{
- return compare(x, t) < 0;
+ return compare(x, t) < 0;
}
-inline int operator<=(const SubString& x, const char* t)
+inline int operator<=(const SubString& x, const char* t)
{
- return compare(x, t) <= 0;
+ return compare(x, t) <= 0;
}
@@ -1275,7 +1275,7 @@ inline SubString String::_substr(int first, int l)
{
if (first < 0 || (unsigned)(first + l) > length() )
return SubString(_nilString, 0, 0) ;
- else
+ else
return SubString(*this, first, l);
}
diff --git a/gnu/lib/libg++/include/Uniform.h b/gnu/lib/libg++/include/Uniform.h
index 5933f6b09b6f..91536ebedf1a 100644
--- a/gnu/lib/libg++/include/Uniform.h
+++ b/gnu/lib/libg++/include/Uniform.h
@@ -1,5 +1,5 @@
// This may look like C code, but it is really -*- C++ -*-
-/*
+/*
Copyright (C) 1988 Free Software Foundation
written by Dirk Grunwald (grunwald@cs.uiuc.edu)
@@ -25,7 +25,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
//
// The interval [lo..hi]
-//
+//
class Uniform: public Random {
double pLow;
diff --git a/gnu/lib/libg++/include/Weibull.h b/gnu/lib/libg++/include/Weibull.h
index d03567aa74c4..c0360dcdfac6 100644
--- a/gnu/lib/libg++/include/Weibull.h
+++ b/gnu/lib/libg++/include/Weibull.h
@@ -1,5 +1,5 @@
// This may look like C code, but it is really -*- C++ -*-
-/*
+/*
Copyright (C) 1988 Free Software Foundation
written by Dirk Grunwald (grunwald@cs.uiuc.edu)
@@ -19,7 +19,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
#ifdef __GNUG__
#pragma interface
#endif
-#define _Weibull_h
+#define _Weibull_h
#include <Random.h>
@@ -30,7 +30,7 @@ protected:
double pBeta;
void setState();
-
+
public:
Weibull(double alpha, double beta, RNG *gen);
@@ -47,7 +47,7 @@ public:
inline void Weibull::setState() {
pInvAlpha = 1.0 / pAlpha;
}
-
+
inline Weibull::Weibull(double alpha, double beta, RNG *gen) : Random(gen)
{
pAlpha = alpha;
diff --git a/gnu/lib/libg++/include/_G_config.h b/gnu/lib/libg++/include/_G_config.h
index fabb5707fe37..cbd1acf4078f 100644
--- a/gnu/lib/libg++/include/_G_config.h
+++ b/gnu/lib/libg++/include/_G_config.h
@@ -1,4 +1,4 @@
-/* AUTOMATICALLY GENERATED; DO NOT EDIT! */
+/* AUTOMATICALLY GENERATED; DO NOT EDIT! */
#include <sys/types.h>
#ifndef _G_config_h
#define _G_config_h
diff --git a/gnu/lib/libg++/include/builtin.h b/gnu/lib/libg++/include/builtin.h
index 73bb43187dde..e2d7bcee7909 100644
--- a/gnu/lib/libg++/include/builtin.h
+++ b/gnu/lib/libg++/include/builtin.h
@@ -1,6 +1,6 @@
// This may look like C code, but it is really -*- C++ -*-
-/*
+/*
Copyright (C) 1988, 1992 Free Software Foundation
written by Doug Lea (dl@rocky.oswego.edu)
@@ -42,7 +42,7 @@ typedef void (*one_arg_error_handler_t)(const char*);
typedef void (*two_arg_error_handler_t)(const char*, const char*);
long gcd(long, long);
-long lg(unsigned long);
+long lg(unsigned long);
double pow(double, long);
long pow(long, long);
@@ -60,30 +60,30 @@ extern _VOLATILE_VOID default_two_arg_error_handler(const char*, const char*);
extern two_arg_error_handler_t lib_error_handler;
-extern two_arg_error_handler_t
+extern two_arg_error_handler_t
set_lib_error_handler(two_arg_error_handler_t f);
#if !defined(IV)
#if ! _G_MATH_H_INLINES /* hpux and SCO define this in math.h */
-inline double abs(double arg)
+inline double abs(double arg)
{
return (arg < 0.0)? -arg : arg;
}
#endif
-inline float abs(float arg)
+inline float abs(float arg)
{
return (arg < 0.0)? -arg : arg;
}
-inline short abs(short arg)
+inline short abs(short arg)
{
return (arg < 0)? -arg : arg;
}
-inline long abs(long arg)
+inline long abs(long arg)
{
return (arg < 0)? -arg : arg;
}
diff --git a/gnu/lib/libg++/include/builtinbuf.h b/gnu/lib/libg++/include/builtinbuf.h
index fb91e6a83ff7..d67629a1de65 100644
--- a/gnu/lib/libg++/include/builtinbuf.h
+++ b/gnu/lib/libg++/include/builtinbuf.h
@@ -1,4 +1,4 @@
-/*
+/*
Copyright (C) 1993 Free Software Foundation
This file is part of the GNU IO Library. This library is free
diff --git a/gnu/lib/libg++/include/compare.h b/gnu/lib/libg++/include/compare.h
index bd13614179ca..aec3c30bd679 100644
--- a/gnu/lib/libg++/include/compare.h
+++ b/gnu/lib/libg++/include/compare.h
@@ -1,6 +1,6 @@
// This may look like C code, but it is really -*- C++ -*-
-/*
+/*
Copyright (C) 1988 Free Software Foundation
written by Doug Lea (dl@rocky.oswego.edu)
diff --git a/gnu/lib/libg++/include/defines.h b/gnu/lib/libg++/include/defines.h
index 0f2fb3be4f37..f5056b69c80b 100644
--- a/gnu/lib/libg++/include/defines.h
+++ b/gnu/lib/libg++/include/defines.h
@@ -1,5 +1,5 @@
// This may look like C code, but it is really -*- C++ -*-
-/*
+/*
Copyright (C) 1994 Free Software Foundation
written by Jason Merrill (jason@cygnus.com)
diff --git a/gnu/lib/libg++/include/editbuf.h b/gnu/lib/libg++/include/editbuf.h
index 8535155d6d44..2cac3bb8c2ad 100644
--- a/gnu/lib/libg++/include/editbuf.h
+++ b/gnu/lib/libg++/include/editbuf.h
@@ -39,9 +39,9 @@ typedef /*unsigned*/ char buf_char;
// Logical pos from start of buffer (does not count gap).
typedef long buf_index;
-
+
// Pos from start of buffer, possibly including gap_size.
-typedef long buf_offset;
+typedef long buf_offset;
#if 0
struct buf_cookie {
diff --git a/gnu/lib/libg++/include/floatio.h b/gnu/lib/libg++/include/floatio.h
index edfe2971135a..880f8074c849 100644
--- a/gnu/lib/libg++/include/floatio.h
+++ b/gnu/lib/libg++/include/floatio.h
@@ -1,4 +1,4 @@
-/*
+/*
Copyright (C) 1993 Free Software Foundation
This file is part of the GNU IO Library. This library is free
diff --git a/gnu/lib/libg++/include/iomanip.h b/gnu/lib/libg++/include/iomanip.h
index bf3d6f46c06b..a87e7bf63e5c 100644
--- a/gnu/lib/libg++/include/iomanip.h
+++ b/gnu/lib/libg++/include/iomanip.h
@@ -42,10 +42,10 @@ template<class TP> class smanip; // TP = Type Param
template<class TP> class sapp {
ios& (*_f)(ios&, TP);
-public:
+public:
sapp(ios& (*f)(ios&, TP)) : _f(f) {}
//
- smanip<TP> operator()(TP a)
+ smanip<TP> operator()(TP a)
{ return smanip<TP>(_f, a); }
};
@@ -55,7 +55,7 @@ template <class TP> class smanip {
public:
smanip(ios& (*f)(ios&, TP), TP a) : _f(f), _a(a) {}
//
- friend
+ friend
istream& operator>>(istream& i, const smanip<TP>& m);
friend
ostream& operator<<(ostream& o, const smanip<TP>& m);
@@ -85,11 +85,11 @@ extern template ostream& operator<<(ostream&, const smanip<ios::fmtflags>&);
// Input-Stream Manipulators
//-----------------------------------------------------------------------------
//
-template<class TP> class imanip;
+template<class TP> class imanip;
template<class TP> class iapp {
istream& (*_f)(istream&, TP);
-public:
+public:
iapp(istream& (*f)(istream&,TP)) : _f(f) {}
//
imanip<TP> operator()(TP a)
@@ -102,7 +102,7 @@ template <class TP> class imanip {
public:
imanip(istream& (*f)(istream&, TP), TP a) : _f(f), _a(a) {}
//
- friend
+ friend
istream& operator>>(istream& i, const imanip<TP>& m)
{ return (*m._f)( i, m._a); }
};
@@ -112,11 +112,11 @@ public:
// Output-Stream Manipulators
//-----------------------------------------------------------------------------
//
-template<class TP> class omanip;
+template<class TP> class omanip;
template<class TP> class oapp {
ostream& (*_f)(ostream&, TP);
-public:
+public:
oapp(ostream& (*f)(ostream&,TP)) : _f(f) {}
//
omanip<TP> operator()(TP a)
@@ -141,7 +141,7 @@ public:
//
// Macro to define an iomanip function, with one argument
-// The underlying function is `__iomanip_<name>'
+// The underlying function is `__iomanip_<name>'
//
#define __DEFINE_IOMANIP_FN1(type,param,function) \
extern ios& __iomanip_##function (ios&, param); \
diff --git a/gnu/lib/libg++/include/iostream.h b/gnu/lib/libg++/include/iostream.h
index e370be2725a9..4802b37b0dea 100644
--- a/gnu/lib/libg++/include/iostream.h
+++ b/gnu/lib/libg++/include/iostream.h
@@ -1,4 +1,4 @@
-/* This is part of libio/iostream, providing -*- C++ -*- input/output.
+/* This is part of libio/iostream, providing -*- C++ -*- input/output.
Copyright (C) 1993 Free Software Foundation
This file is part of the GNU IO Library. This library is free
diff --git a/gnu/lib/libg++/include/iostreamP.h b/gnu/lib/libg++/include/iostreamP.h
index 720deb32ee91..e24c93f115c7 100644
--- a/gnu/lib/libg++/include/iostreamP.h
+++ b/gnu/lib/libg++/include/iostreamP.h
@@ -1,4 +1,4 @@
-/*
+/*
Copyright (C) 1993 Free Software Foundation
This file is part of the GNU IO Library. This library is free
diff --git a/gnu/lib/libg++/include/libio.h b/gnu/lib/libg++/include/libio.h
index 8a9c25beee0c..f00b730f5e2d 100644
--- a/gnu/lib/libg++/include/libio.h
+++ b/gnu/lib/libg++/include/libio.h
@@ -1,4 +1,4 @@
-/*
+/*
Copyright (C) 1993 Free Software Foundation
This file is part of the GNU IO Library. This library is free
@@ -185,21 +185,21 @@ struct _IO_FILE {
char *_IO_save_end; /* Pointer to end of non-current get area. */
struct _IO_marker *_markers;
-
+
struct _IO_FILE *_chain;
-
+
struct _IO_jump_t *_jumps; /* Jump table */
-
+
int _fileno;
int _blksize;
_IO_off_t _offset;
-
+
#define __HAVE_COLUMN /* temporary */
/* 1+column number of pbase(); 0 is unknown. */
unsigned short _cur_column;
char _unused;
char _shortbuf[1];
-
+
/* char* _save_gptr; char* _save_egptr; */
};
diff --git a/gnu/lib/libg++/include/libioP.h b/gnu/lib/libg++/include/libioP.h
index ca870479671f..074b9d7fa0cd 100644
--- a/gnu/lib/libg++/include/libioP.h
+++ b/gnu/lib/libg++/include/libioP.h
@@ -1,4 +1,4 @@
-/*
+/*
Copyright (C) 1993 Free Software Foundation
This file is part of the GNU IO Library. This library is free
diff --git a/gnu/lib/libg++/include/parsestream.h b/gnu/lib/libg++/include/parsestream.h
index b1687073ad49..c0dfce2c51fb 100644
--- a/gnu/lib/libg++/include/parsestream.h
+++ b/gnu/lib/libg++/include/parsestream.h
@@ -67,7 +67,7 @@ class parsebuf : public streambuf {
// Length of current line, not counting either '\n'.
int line_length() { return _line_length; }
- // Current line - not a copy, so file ops may trash it.
+ // Current line - not a copy, so file ops may trash it.
virtual char* current_line();
virtual streampos seekoff(streamoff, _seek_dir, int mode=ios::in|ios::out);
virtual streambuf* setbuf(char* p, int len);
diff --git a/gnu/lib/libg++/include/rx.h b/gnu/lib/libg++/include/rx.h
index 0c9db1e49024..edb26b4a8c00 100644
--- a/gnu/lib/libg++/include/rx.h
+++ b/gnu/lib/libg++/include/rx.h
@@ -67,7 +67,7 @@ typedef int (*rx_sp_comparer) (void * a, void * b);
typedef int (*rx_sp_comparer) ();
#endif
-struct rx_sp_node
+struct rx_sp_node
{
void * key;
void * data;
@@ -135,7 +135,7 @@ struct rx_hash_rules
/* Matchers decide what to do by examining a series of these.
* Instruction types are described below.
*/
-struct rx_inx
+struct rx_inx
{
void * inx;
void * data;
@@ -179,7 +179,7 @@ struct rx
/* --------- The remaining fields are for internal use only. --------- */
/* --------- But! they should be initialized to 0. --------- */
/* NODEC is the number of nodes in the NFA with non-epsilon
- * orx transitions.
+ * orx transitions.
*/
int nodec;
@@ -196,7 +196,7 @@ struct rx
/* A memo for sets of states in the possible_future lists of an nfa: */
struct rx_hash set_list_memo;
- /* The instruction table is indexed by the enum of instructions defined in
+ /* The instruction table is indexed by the enum of instructions defined in
* rxrun.h. The values in the table are used to fill in the `inx'
* slot of instruction frames (see rxrun.h).
*/
@@ -213,7 +213,7 @@ struct rx
/* An RX NFA may contain epsilon edges labeled with side effects.
* These side effects represent match actions that can not normally be
* defined in a `pure' NFA; for example, recording the location at
- * which a paren is crossed in a register structure.
+ * which a paren is crossed in a register structure.
*
* A matcher is supposed to find a particular path
* through the NFA (such as leftmost-longest), and then to execute the
@@ -222,7 +222,7 @@ struct rx
* backtracking.
*
* As the NFA is manipulated during matching sets of side effects.
- * Simple lists are used to hold side effect lists.
+ * Simple lists are used to hold side effect lists.
*/
typedef void * rx_side_effect;
@@ -287,7 +287,7 @@ struct rexp_node
struct rx_nfa_state
{
- int id;
+ int id;
struct rx_nfa_edge *edges;
struct rx_possible_future *futures;
unsigned int is_final:1;
@@ -333,17 +333,17 @@ struct rx_possible_future
enum rx_opcode
{
- /*
+ /*
* BACKTRACK_POINT is invoked when a transition results in more
* than one possible future.
*
* There is one occurence of this instruction per transition_class
- * structure; that occurence is only ever executed if the
+ * structure; that occurence is only ever executed if the
* transition_class contains a list of more than 1 edge.
*/
rx_backtrack_point = 0, /* data is (struct transition_class *) */
- /*
+ /*
* RX_DO_SIDE_EFFECTS evaluates the side effects of an epsilon path.
* There is one occurence of this instruction per rx_distinct_future.
* This instruction is skipped if a rx_distinct_future has no side effects.
@@ -351,7 +351,7 @@ enum rx_opcode
rx_do_side_effects = rx_backtrack_point + 1,
/* data is (struct rx_distinct_future *) */
- /*
+ /*
* RX_CACHE_MISS instructions are stored in rx_distinct_futures whose
* destination superstate has been reclaimed (or was never built).
* It recomputes the destination superstate.
@@ -361,9 +361,9 @@ enum rx_opcode
rx_cache_miss = rx_do_side_effects + 1,
/* data is (struct rx_distinct_future *) */
- /*
+ /*
* RX_NEXT_CHAR is called to consume the next character and take the
- * corresponding transition. This is the only instruction that uses
+ * corresponding transition. This is the only instruction that uses
* the DATA field of the instruction frame instead of DATA_2.
* (see EXPLORE_FUTURE in regex.c).
*/
@@ -373,7 +373,7 @@ enum rx_opcode
*/
rx_backtrack = rx_next_char + 1, /* no data */
- /*
+ /*
* RX_ERROR_INX is stored only in places that should never be executed.
*/
rx_error_inx = rx_backtrack + 1, /* Not supposed to occur. */
@@ -390,7 +390,7 @@ extern void * rx_id_instruction_table[rx_num_instructions];
/* If the instruction is `rx_next_char' then data is valid. Otherwise it's 0
* and data_2 is valid.
*/
-struct rx_inx
+struct rx_inx
{
void * inx;
void * data;
@@ -431,7 +431,7 @@ struct rx_superset
/* Every character occurs in at most one super edge per super-state.
* But, that edge might have more than one option, indicating a point
- * of non-determinism.
+ * of non-determinism.
*/
struct rx_super_edge
{
@@ -447,7 +447,7 @@ struct rx_super_edge
* without warning. To protect a superstate, use LOCK_SUPERSTATE.
*
* Joe Keane thought of calling these superstates and several people
- * have commented on what a good name it is for what they do.
+ * have commented on what a good name it is for what they do.
*/
struct rx_superstate
{
@@ -501,7 +501,7 @@ typedef void (*rx_morecore_fn)(struct rx_cache *);
typedef void (*rx_morecore_fn)();
#endif
-/* You use this to control the allocation of superstate data
+/* You use this to control the allocation of superstate data
* during matching. Most of it should be initialized to 0.
*
* A MORECORE function is necessary. It should allocate
@@ -512,10 +512,10 @@ typedef void (*rx_morecore_fn)();
* the system will try to allocate. The default is 128. Batch style
* applications that are very regexp intensive should use as high a number
* as possible without thrashing.
- *
+ *
* The LOCAL_CSET_SIZE is the number of characters in a character set.
* It is therefore the number of entries in a superstate transition table.
- * Generally, it should be 256. If your character set has 16 bits,
+ * Generally, it should be 256. If your character set has 16 bits,
* it is better to translate your regexps into equivalent 8 bit patterns.
*/
@@ -523,7 +523,7 @@ struct rx_cache
{
struct rx_hash_rules superset_hash_rules;
- /* Objects are allocated by incrementing a pointer that
+ /* Objects are allocated by incrementing a pointer that
* scans across rx_blocklists.
*/
struct rx_blocklist * memory;
@@ -614,7 +614,7 @@ typedef enum rx_get_burst_return
(*rx_get_burst_fn) (struct rx_string_position * pos,
void * app_closure,
int stop);
-
+
#else
typedef enum rx_get_burst_return (*rx_get_burst_fn) ();
#endif
@@ -628,7 +628,7 @@ enum rx_back_check_return
rx_back_check_fail
};
-/* Back_check should advance the position it is passed
+/* Back_check should advance the position it is passed
* over rparen - lparen characters and return pass iff
* the characters starting at POS match those indexed
* by [LPAREN..RPAREN].
@@ -645,7 +645,7 @@ typedef enum rx_back_check_return
unsigned char * translate,
void * app_closure,
int stop);
-
+
#else
typedef enum rx_back_check_return (*rx_back_check_fn) ();
#endif
@@ -683,7 +683,7 @@ enum rx_search_return
/* regex.h
- *
+ *
* The remaining declarations replace regex.h.
*/
@@ -707,7 +707,7 @@ typedef enum
REG_EESCAPE, /* Trailing backslash. */
REG_ESUBREG, /* Invalid back reference. */
REG_EBRACK, /* Unmatched left bracket. */
- REG_EPAREN, /* Parenthesis imbalance. */
+ REG_EPAREN, /* Parenthesis imbalance. */
REG_EBRACE, /* Unmatched \{. */
REG_BADBR, /* Invalid contents of \{\}. */
REG_ERANGE, /* Invalid range end. */
@@ -741,8 +741,8 @@ enum re_side_effects
};
/* These hold paramaters for the kinds of side effects that are possible
- * in the supported pattern languages. These include things like the
- * numeric bounds of {} operators and the index of paren registers for
+ * in the supported pattern languages. These include things like the
+ * numeric bounds of {} operators and the index of paren registers for
* subexpression measurement or backreferencing.
*/
struct re_se_params
@@ -761,10 +761,10 @@ struct re_pattern_buffer
unsigned int no_sub:1; /* If set, don't return register offsets. */
unsigned int not_bol:1; /* If set, the anchors ('^' and '$') don't */
- unsigned int not_eol:1; /* match at the ends of the string. */
+ unsigned int not_eol:1; /* match at the ends of the string. */
unsigned int newline_anchor:1;/* If true, an anchor at a newline matches.*/
unsigned int least_subs:1; /* If set, and returning registers, return
- * as few values as possible. Only
+ * as few values as possible. Only
* backreferenced groups and group 0 (the whole
* match) will be returned.
*/
@@ -780,18 +780,18 @@ struct re_pattern_buffer
unsigned int is_anchored:1; /* Anchorded by ^? */
unsigned int begbuf_only:1; /* Anchored to char position 0? */
-
+
/* If REGS_UNALLOCATED, allocate space in the `regs' structure
* for `max (RE_NREGS, re_nsub + 1)' groups.
* If REGS_REALLOCATE, reallocate space if necessary.
- * If REGS_FIXED, use what's there.
+ * If REGS_FIXED, use what's there.
*/
#define REGS_UNALLOCATED 0
#define REGS_REALLOCATE 1
#define REGS_FIXED 2
unsigned int regs_allocated:2;
-
+
/* Either a translate table to apply to all characters before
* comparing them, or zero for no translation. The translation
* is applied to a pattern when it is compiled and to a string
@@ -799,11 +799,11 @@ struct re_pattern_buffer
*/
unsigned char * translate;
- /* If this is a valid pointer, it tells rx not to store the extents of
+ /* If this is a valid pointer, it tells rx not to store the extents of
* certain subexpressions (those corresponding to non-zero entries).
* Passing 0x1 is the same as passing an array of all ones. Passing 0x0
* is the same as passing an array of all zeros.
- * The array should contain as many entries as their are subexps in the
+ * The array should contain as many entries as their are subexps in the
* regexp.
*/
char * syntax_parens;
@@ -820,7 +820,7 @@ struct re_pattern_buffer
char *fastmap;
unsigned int fastmap_accurate:1; /* These three are internal. */
- unsigned int can_match_empty:1;
+ unsigned int can_match_empty:1;
struct rx_nfa_state * start; /* The nfa starting state. */
/* This is the list of iterator bounds for {lo,hi} constructs.
@@ -871,7 +871,7 @@ typedef struct
#define RE_BACKSLASH_ESCAPE_IN_LISTS (1)
/* If this bit is not set, then + and ? are operators, and \+ and \? are
- literals.
+ literals.
If set, then \+ and \? are operators and + and ? are literals. */
#define RE_BK_PLUS_QM (RE_BACKSLASH_ESCAPE_IN_LISTS << 1)
@@ -887,7 +887,7 @@ typedef struct
^ is an anchor if it is at the beginning of a regular
expression or after an open-group or an alternation operator;
$ is an anchor if it is at the end of a regular expression, or
- before a close-group or an alternation operator.
+ before a close-group or an alternation operator.
This bit could be (re)combined with RE_CONTEXT_INDEP_OPS, because
POSIX draft 11.2 says that * etc. in leading positions is undefined.
@@ -898,7 +898,7 @@ typedef struct
/* If this bit is set, then special characters are always special
regardless of where they are in the pattern.
If this bit is not set, then special characters are special only in
- some contexts; otherwise they are ordinary. Specifically,
+ some contexts; otherwise they are ordinary. Specifically,
* + ? and intervals are only special when not after the beginning,
open-group, or alternation operator. */
#define RE_CONTEXT_INDEP_OPS (RE_CONTEXT_INDEP_ANCHORS << 1)
@@ -920,7 +920,7 @@ typedef struct
#define RE_HAT_LISTS_NOT_NEWLINE (RE_DOT_NOT_NULL << 1)
/* If this bit is set, either \{...\} or {...} defines an
- interval, depending on RE_NO_BK_BRACES.
+ interval, depending on RE_NO_BK_BRACES.
If not set, \{, \}, {, and } are literals. */
#define RE_INTERVALS (RE_HAT_LISTS_NOT_NEWLINE << 1)
@@ -945,7 +945,7 @@ typedef struct
If not set, then \<digit> is a back-reference. */
#define RE_NO_BK_REFS (RE_NO_BK_PARENS << 1)
-/* If this bit is set, then | is an alternation operator, and \| is literal.
+/* If this bit is set, then | is an alternation operator, and \| is literal.
If not set, then \| is an alternation operator, and | is literal. */
#define RE_NO_BK_VBAR (RE_NO_BK_REFS << 1)
@@ -967,7 +967,7 @@ extern reg_syntax_t re_syntax_options;
/* Define combinations of the above bits for the standard possibilities.
(The [[[ comments delimit what gets put into the Texinfo file, so
- don't delete them!) */
+ don't delete them!) */
/* [[[begin syntaxes]]] */
#define RE_SYNTAX_EMACS 0
@@ -1031,7 +1031,7 @@ extern reg_syntax_t re_syntax_options;
#ifdef RE_DUP_MAX
#undef RE_DUP_MAX
#endif
-#define RE_DUP_MAX ((1 << 15) - 1)
+#define RE_DUP_MAX ((1 << 15) - 1)
#if !defined(BSD) || (BSD < 199306)
@@ -1044,7 +1044,7 @@ extern reg_syntax_t re_syntax_options;
/* If this bit is set, then ignore case when matching.
If not set, then case is significant. */
#define REG_ICASE (REG_EXTENDED << 1)
-
+
/* If this bit is set, then anchors do not match at newline
characters in the string.
If not set, then anchors do match at newlines. */
@@ -1070,7 +1070,7 @@ extern reg_syntax_t re_syntax_options;
/* If `regs_allocated' is REGS_UNALLOCATED in the pattern buffer,
* `re_match_2' returns information about at least this many registers
- * the first time a `regs' structure is passed.
+ * the first time a `regs' structure is passed.
*
* Also, this is the greatest number of backreferenced subexpressions
* allowed in a pattern being matched without caller-supplied registers.
@@ -1087,7 +1087,7 @@ extern char rx_version_string[];
#ifdef RX_WANT_RX_DEFS
/* This is decls to the interesting subsystems and lower layers
- * of rx. Everything which doesn't have a public counterpart in
+ * of rx. Everything which doesn't have a public counterpart in
* regex.c is declared here.
*/
@@ -1318,7 +1318,7 @@ struct rx_backtrack_frame
{
char * counter_stack_sp;
- /* A frame is used to save the matchers state when it crosses a
+ /* A frame is used to save the matchers state when it crosses a
* backtracking point. The `stk_' fields correspond to variables
* in re_search_2 (just strip off thes `stk_'). They are documented
* tere.
@@ -1331,7 +1331,7 @@ struct rx_backtrack_frame
int stk_test_ret;
/* This is the list of options left to explore at the backtrack
- * point for which this frame was created.
+ * point for which this frame was created.
*/
struct rx_distinct_future * df;
struct rx_distinct_future * first_df;
@@ -1407,15 +1407,15 @@ struct rx_search_state
int * best_lpspace; /* in case the user doesn't want these */
int * best_rpspace; /* values, we still need space to store
* them. Normally, this memoryis unused
- * and the space pointed to by REGS is
+ * and the space pointed to by REGS is
* used instead.
*/
-
+
int last_l; /* Highest index of a valid lparen. */
int last_r; /* It's dual. */
-
+
int * best_lparen; /* This contains the best known register */
- int * best_rparen; /* assignments.
+ int * best_rparen; /* assignments.
* This may point to the same mem as
* best_lpspace, or it might point to memory
* passed by the caller.
@@ -1424,7 +1424,7 @@ struct rx_search_state
int best_last_r;
- unsigned char * translate;
+ unsigned char * translate;
struct rx_string_position outer_pos;
@@ -1443,7 +1443,7 @@ struct rx_search_state
rx_get_burst_fn saved_get_burst;
rx_back_check_fn saved_back_check;
struct re_registers * saved_regs;
-
+
/**
** state for fastmap
**/
@@ -1455,23 +1455,23 @@ struct rx_search_state
enum rx_fastmap_entry fastmap_resume_pt;
/**
- ** state for test_match
+ ** state for test_match
**/
/* The current superNFA position of the matcher. */
struct rx_superstate * super;
-
+
/* The matcher interprets a series of instruction frames.
* This is the `instruction counter' for the interpretation.
*/
struct rx_inx * ifr;
-
+
/* We insert a ghost character in the string to prime
* the nfa. test_pos.pos, test_pos.str_half, and test_pos.end_half
* keep track of the test-match position and string-half.
*/
unsigned char c;
-
+
/* Position within the string. */
struct rx_string_position test_pos;
@@ -1481,7 +1481,7 @@ struct rx_search_state
int chunk_bytes;
struct rx_stack_chunk * free_chunks;
- /* To return from this function, set test_ret and
+ /* To return from this function, set test_ret and
* `goto test_do_return'.
*
* Possible return values are:
@@ -1501,14 +1501,14 @@ struct rx_search_state
int test_ret;
int could_have_continued;
-
+
#ifdef RX_DEBUG
int backtrack_depth;
/* There is a search tree with every node as set of deterministic
- * transitions in the super nfa. For every branch of a
+ * transitions in the super nfa. For every branch of a
* backtrack point is an edge in the tree.
* This counts up a pre-order of nodes in that tree.
- * It's saved on the search stack and printed when debugging.
+ * It's saved on the search stack and printed when debugging.
*/
int line_no;
int lines_found;
@@ -1521,7 +1521,7 @@ struct rx_search_state
struct rx_inx * saved_this_tr_table;
int saved_reg;
struct rx_backtrack_frame * saved_bf;
-
+
};
@@ -1536,7 +1536,7 @@ init_fastmap (rxb, search_state)
search_state->fastmap = (rxb->fastmap
? (char *)rxb->fastmap
: (char *)rx_slowmap);
- /* Update the fastmap now if not correct already.
+ /* Update the fastmap now if not correct already.
* When the regexp was compiled, the fastmap was computed
* and stored in a bitset. This expands the bitset into a
* character array containing 1s and 0s.
@@ -1586,7 +1586,7 @@ fastmap_search (rxb, stop, get_burst, app_closure, search_state)
* This sentinal will trap the fastmap loop when it reaches the last
* valid character in a string half.
*
- * This must be reset when the fastmap/search loop crosses a string
+ * This must be reset when the fastmap/search loop crosses a string
* boundry, and before returning to the caller. So sometimes,
* the fastmap loop is restarted with `continue', othertimes by
* `goto init_fastmap_sentinal'.
@@ -1605,7 +1605,7 @@ fastmap_search (rxb, stop, get_burst, app_closure, search_state)
search_state->fastmap_chr = -1;
search_state->fastmap_val = 0;
}
-
+
if (search_state->outer_pos.pos >= search_state->outer_pos.end)
goto fastmap_hit_bound;
else
@@ -1629,7 +1629,7 @@ fastmap_search (rxb, stop, get_burst, app_closure, search_state)
++search_state->outer_pos.pos;
if (*search_state->outer_pos.pos != search_state->fastmap_chr)
return rx_fastmap_ok;
- else
+ else
{
++search_state->outer_pos.pos;
if (search_state->outer_pos.pos == search_state->outer_pos.end)
@@ -1659,7 +1659,7 @@ fastmap_search (rxb, stop, get_burst, app_closure, search_state)
--search_state->outer_pos.pos;
if ((*search_state->outer_pos.pos != search_state->fastmap_chr) || search_state->fastmap_val)
return rx_fastmap_ok;
- else
+ else
{
--search_state->outer_pos.pos;
if (search_state->outer_pos.pos == bound)
@@ -1669,12 +1669,12 @@ fastmap_search (rxb, stop, get_burst, app_closure, search_state)
}
}
}
-
+
case rx_fastmap_string_break:
fastmap_hit_bound:
{
/* If we hit a bound, it may be time to fetch another burst
- * of string, or it may be time to return a continuation to
+ * of string, or it may be time to return a continuation to
* the caller, or it might be time to fail.
*/
@@ -1692,7 +1692,7 @@ fastmap_search (rxb, stop, get_burst, app_closure, search_state)
case rx_get_burst_ok:
goto init_fastmap_sentinal;
case rx_get_burst_no_more:
- /* ...not a string split, simply no more string.
+ /* ...not a string split, simply no more string.
*
* When searching backward, running out of string
* is reason to quit.
@@ -1714,7 +1714,7 @@ fastmap_search (rxb, stop, get_burst, app_closure, search_state)
#ifdef emacs
/* The `emacs' switch turns on certain matching commands
- * that make sense only in Emacs.
+ * that make sense only in Emacs.
*/
#include "config.h"
#include "lisp.h"
@@ -1731,7 +1731,7 @@ fastmap_search (rxb, stop, get_burst, app_closure, search_state)
#else /* not RX_RX_MEMDBUG */
/* We used to test for `BSTRING' here, but only GCC and Emacs define
- * `BSTRING', as far as I know, and neither of them use this code.
+ * `BSTRING', as far as I know, and neither of them use this code.
*/
#if HAVE_STRING_H || STDC_HEADERS
#include <string.h>
@@ -1767,7 +1767,7 @@ char *realloc ();
* This must be nonzero for the wordchar and notwordchar pattern
* commands in re_match_2.
*/
-#ifndef Sword
+#ifndef Sword
#define Sword 1
#endif
@@ -1780,7 +1780,7 @@ RX_DECL char re_syntax_table[CHAR_SET_SIZE];
/* Test if at very beginning or at very end of the virtual concatenation
- * of `string1' and `string2'. If only one string, it's `string2'.
+ * of `string1' and `string2'. If only one string, it's `string2'.
*/
#define AT_STRINGS_BEG() \
@@ -1799,14 +1799,14 @@ RX_DECL char re_syntax_table[CHAR_SET_SIZE];
* the first character in string2; and if before the beginning of
* string2, look at the last character in string1.
*
- * Assumes `string1' exists, so use in conjunction with AT_STRINGS_BEG ().
+ * Assumes `string1' exists, so use in conjunction with AT_STRINGS_BEG ().
*/
#define LETTER_P(POS,OFF) \
( SYNTAX (fetch_char(POS, OFF, app_closure, stop)) \
== Sword)
/* Test if the character at D and the one after D differ with respect
- * to being word-constituent.
+ * to being word-constituent.
*/
#define AT_WORD_BOUNDARY(d) \
(AT_STRINGS_BEG () || AT_STRINGS_END () || LETTER_P (d,0) != LETTER_P (d, 1))
@@ -1948,17 +1948,17 @@ rx_search (rxb, startpos, range, stop, total_size,
= search_state.best_lpspace
= search_state.best_rpspace
= 0);
-
+
/* figure the number of registers we may need for use in backreferences.
- * the number here includes an element for register zero.
+ * the number here includes an element for register zero.
*/
search_state.num_regs = rxb->re_nsub + 1;
-
-
+
+
/* check for out-of-range startpos. */
if ((startpos < 0) || (startpos > total_size))
return rx_search_fail;
-
+
/* fix up range if it might eventually take us outside the string. */
{
int endpos;
@@ -1968,7 +1968,7 @@ rx_search (rxb, startpos, range, stop, total_size,
else if (endpos > total_size)
range = total_size - startpos;
}
-
+
/* if the search isn't to be a backwards one, don't waste time in a
* long search for a pattern that says it is anchored.
*/
@@ -1979,7 +1979,7 @@ rx_search (rxb, startpos, range, stop, total_size,
else
range = 1;
}
-
+
/* decide whether to use internal or user-provided reg buffers. */
if (!regs || rxb->no_sub)
{
@@ -1991,7 +1991,7 @@ rx_search (rxb, startpos, range, stop, total_size,
search_state.best_rparen = search_state.best_rpspace;
}
else
- {
+ {
/* have the register data arrays been allocated? */
if (rxb->regs_allocated == REGS_UNALLOCATED)
{ /* no. so allocate them with malloc. we need one
@@ -2025,7 +2025,7 @@ rx_search (rxb, startpos, range, stop, total_size,
}
else if (rxb->regs_allocated != REGS_FIXED)
return rx_search_error;
-
+
if (regs->num_regs < search_state.num_regs + 1)
{
search_state.best_lpspace =
@@ -2043,38 +2043,38 @@ rx_search (rxb, startpos, range, stop, total_size,
search_state.best_rparen = regs->end;
}
}
-
+
search_state.lparen =
(int *) REGEX_ALLOCATE (search_state.num_regs * sizeof(int ));
search_state.rparen =
(int *) REGEX_ALLOCATE (search_state.num_regs * sizeof(int ));
-
+
if (! ( search_state.best_rparen
&& search_state.best_lparen
&& search_state.lparen && search_state.rparen))
return rx_search_error;
-
+
search_state.best_last_l = search_state.best_last_r = -1;
-
+
search_state.translate = (rxb->translate
? rxb->translate
: rx_id_translation);
-
-
-
+
+
+
/*
- * two nfa's were compiled.
+ * two nfa's were compiled.
* `0' is complete.
* `1' faster but gets registers wrong and ends too soon.
*/
search_state.nfa_choice = (regs && !rxb->least_subs) ? '\0' : '\1';
-
+
/* we have the option to look for the best match or the first
* one we can find. if the user isn't asking for register information,
* we don't need to find the best match.
*/
search_state.first_found = !regs;
-
+
if (range >= 0)
{
search_state.outer_pos.search_end = MIN (total_size, startpos + range) + 1;
@@ -2085,20 +2085,20 @@ rx_search (rxb, startpos, range, stop, total_size,
search_state.outer_pos.search_end = MAX(-1, startpos + range);
search_state.outer_pos.search_direction = -1;
}
-
+
/* the vacuous search always turns up nothing. */
if ((search_state.outer_pos.search_direction == 1)
? (startpos > search_state.outer_pos.search_end)
: (startpos < search_state.outer_pos.search_end))
return rx_search_fail;
-
+
/* now we build the starting state of the supernfa. */
{
struct rx_superset * start_contents;
struct rx_nfa_state_set * start_nfa_set;
-
+
/* we presume here that the nfa start state has only one
- * possible future with no side effects.
+ * possible future with no side effects.
*/
start_nfa_set = rxb->start->futures->destset;
if ( rxb->rx.start_set
@@ -2110,10 +2110,10 @@ rx_search (rxb, startpos, range, stop, total_size,
rx_superstate_eclosure_union (&rxb->rx,
rx_superset_cons (&rxb->rx, 0, 0),
start_nfa_set);
-
+
if (!start_contents)
return rx_search_fail;
-
+
start_contents->starts_for = &rxb->rx;
rxb->rx.start_set = start_contents;
}
@@ -2126,7 +2126,7 @@ rx_search (rxb, startpos, range, stop, total_size,
else
{
rx_protect_superset (&rxb->rx, start_contents);
-
+
search_state.start_super = rx_superstate (&rxb->rx, start_contents);
if (!search_state.start_super)
return rx_search_fail;
@@ -2134,9 +2134,9 @@ rx_search (rxb, startpos, range, stop, total_size,
rx_release_superset (&rxb->rx, start_contents);
}
}
-
-
-
+
+
+
( search_state.outer_pos.string
= search_state.outer_pos.end
= 0);
@@ -2166,8 +2166,8 @@ rx_search (rxb, startpos, range, stop, total_size,
break;
}
}
-
- /* now the fastmap loop has brought us to a plausible
+
+ /* now the fastmap loop has brought us to a plausible
* starting point for a match. so, it's time to run the
* nfa and see if a match occured.
*/
@@ -2225,12 +2225,12 @@ rx_search (rxb, startpos, range, stop, total_size,
: (startpos > search_state.outer_pos.search_end))
goto pseudo_do;
-
+
finish:
uninit_fastmap (rxb, &search_state);
if (search_state.start_super)
rx_unlock_superstate (&rxb->rx, search_state.start_super);
-
+
#ifdef regex_malloc
if (search_state.lparen) free (search_state.lparen);
if (search_state.rparen) free (search_state.rparen);
@@ -2255,7 +2255,7 @@ rx_search (rxb, startpos, range, stop, total_size,
search_state.lparen[0] = startpos;
search_state.super = search_state.start_super;
search_state.c = search_state.nfa_choice;
- search_state.test_pos.pos = search_state.outer_pos.pos - 1;
+ search_state.test_pos.pos = search_state.outer_pos.pos - 1;
search_state.test_pos.string = search_state.outer_pos.string;
search_state.test_pos.end = search_state.outer_pos.end;
search_state.test_pos.offset = search_state.outer_pos.offset;
@@ -2272,8 +2272,8 @@ rx_search (rxb, startpos, range, stop, total_size,
search_state.free_chunks = 0;
search_state.test_ret = rx_test_line_finished;
search_state.could_have_continued = 0;
- }
- /* This is while (1)...except that the body of the loop is interrupted
+ }
+ /* This is while (1)...except that the body of the loop is interrupted
* by some alternative entry points.
*/
pseudo_while_1:
@@ -2288,42 +2288,42 @@ rx_search (rxb, startpos, range, stop, total_size,
case rx_test_start:
#ifdef RX_DEBUG
/* There is a search tree with every node as set of deterministic
- * transitions in the super nfa. For every branch of a
+ * transitions in the super nfa. For every branch of a
* backtrack point is an edge in the tree.
* This counts up a pre-order of nodes in that tree.
- * It's saved on the search stack and printed when debugging.
+ * It's saved on the search stack and printed when debugging.
*/
search_state.line_no = 0;
search_state.lines_found = 0;
#endif
-
+
top_of_cycle:
- /* A superstate is basicly a transition table, indexed by
- * characters from the string being tested, and containing
+ /* A superstate is basicly a transition table, indexed by
+ * characters from the string being tested, and containing
* RX_INX (`instruction frame') structures.
*/
search_state.ifr = &search_state.super->transitions [search_state.c];
-
+
recurse_test_match:
/* This is the point to which control is sent when the
* test matcher `recurses'. Before jumping here, some variables
* need to be saved on the stack and the next instruction frame
* has to be computed.
*/
-
+
restart:
/* Some instructions don't advance the matcher, but just
* carry out some side effects and fetch a new instruction.
* To dispatch that new instruction, `goto restart'.
*/
-
+
{
struct rx_inx * next_tr_table;
struct rx_inx * this_tr_table;
- /* The fastest route through the loop is when the instruction
+ /* The fastest route through the loop is when the instruction
* is RX_NEXT_CHAR. This case is detected when SEARCH_STATE.IFR->DATA
* is non-zero. In that case, it points to the next
- * superstate.
+ * superstate.
*
* This allows us to not bother fetching the bytecode.
*/
@@ -2335,19 +2335,19 @@ rx_search (rxb, startpos, range, stop, total_size,
if (rx_debug_trace)
{
struct rx_superset * setp;
-
+
fprintf (stderr, "%d %d>> re_next_char @ %d (%d)",
search_state.line_no,
search_state.backtrack_depth,
(search_state.test_pos.pos - search_state.test_pos.string
+ search_state.test_pos.offset), search_state.c);
-
+
search_state.super =
((struct rx_superstate *)
((char *)this_tr_table
- ((unsigned long)
((struct rx_superstate *)0)->transitions)));
-
+
setp = search_state.super->contents;
fprintf (stderr, " superstet (rx=%d, &=%x: ",
rxb->rx.rx_id, setp);
@@ -2374,22 +2374,22 @@ rx_search (rxb, startpos, range, stop, total_size,
search_state.saved_next_tr_table = next_tr_table;
test_pc = rx_test_cache_hit_loop;
goto test_return_continuation;
-
+
resume_continuation_1:
/* Continuation one jumps here to do its work: */
search_state.saved_this_tr_table = this_tr_table;
search_state.saved_next_tr_table = next_tr_table;
goto try_burst_1;
-
+
case rx_get_burst_ok:
/* get_burst succeeded...keep going */
break;
-
+
case rx_get_burst_no_more:
search_state.test_ret = rx_test_line_finished;
search_state.could_have_continued = 1;
goto test_do_return;
-
+
case rx_get_burst_error:
/* An error... */
search_state.test_ret = rx_test_internal_error;
@@ -2400,8 +2400,8 @@ rx_search (rxb, startpos, range, stop, total_size,
search_state.ifr = this_tr_table + search_state.c;
next_tr_table = (struct rx_inx *)search_state.ifr->data;
} /* Fast loop through cached transition tables */
-
- /* Here when we ran out of cached next-char transitions.
+
+ /* Here when we ran out of cached next-char transitions.
* So, it will be necessary to do a more expensive
* dispatch on the current instruction. The superstate
* pointer is allowed to become invalid during next-char
@@ -2413,7 +2413,7 @@ rx_search (rxb, startpos, range, stop, total_size,
- ((unsigned long)
((struct rx_superstate *)0)->transitions)));
}
-
+
/* We've encountered an instruction other than next-char.
* Dispatch that instruction:
*/
@@ -2422,13 +2422,13 @@ rx_search (rxb, startpos, range, stop, total_size,
if (rx_debug_trace)
{
struct rx_superset * setp = search_state.super->contents;
-
+
fprintf (stderr, "%d %d>> %s @ %d (%d)", search_state.line_no,
search_state.backtrack_depth,
inx_names[inx],
(search_state.test_pos.pos - search_state.test_pos.string
+ (test_pos.half == 0 ? 0 : size1)), search_state.c);
-
+
fprintf (stderr, " superstet (rx=%d, &=%x: ",
rxb->rx.rx_id, setp);
while (setp)
@@ -2442,8 +2442,8 @@ rx_search (rxb, startpos, range, stop, total_size,
switch ((enum rx_opcode)inx)
{
case rx_do_side_effects:
-
- /* RX_DO_SIDE_EFFECTS occurs when we cross epsilon
+
+ /* RX_DO_SIDE_EFFECTS occurs when we cross epsilon
* edges associated with parentheses, backreferencing, etc.
*/
{
@@ -2463,7 +2463,7 @@ rx_search (rxb, startpos, range, stop, total_size,
if (rx_debug_trace)
{
struct rx_superset * setp = search_state.super->contents;
-
+
fprintf (stderr, "....%d %d>> %s\n", search_state.line_no,
search_state.backtrack_depth,
efnames[-effect]);
@@ -2590,7 +2590,7 @@ rx_search (rxb, startpos, range, stop, total_size,
else
goto test_do_return;
}
-
+
case re_se_try:
/* This is the first side effect in every
* expression.
@@ -2598,7 +2598,7 @@ rx_search (rxb, startpos, range, stop, total_size,
* FOR NO GOOD REASON...get rid of it...
*/
break;
-
+
case re_se_pushpos:
{
int urhere =
@@ -2621,7 +2621,7 @@ rx_search (rxb, startpos, range, stop, total_size,
cf->cdr = old_cf;
break;
}
-
+
case re_se_chkpos:
{
int urhere =
@@ -2637,13 +2637,13 @@ rx_search (rxb, startpos, range, stop, total_size,
break;
}
break;
-
+
case re_se_poppos:
POP(search_state.counter_stack,
sizeof (struct rx_counter_frame));
break;
-
-
+
+
case re_se_at_dot:
case re_se_syntax:
case re_se_not_syntax:
@@ -2677,10 +2677,10 @@ rx_search (rxb, startpos, range, stop, total_size,
switch (rxb->se_params [effect].se)
{
case re_se_win:
- /* This side effect indicates that we've
- * found a match, though not necessarily the
- * best match. This is a fancy assignment to
- * register 0 unless the caller didn't
+ /* This side effect indicates that we've
+ * found a match, though not necessarily the
+ * best match. This is a fancy assignment to
+ * register 0 unless the caller didn't
* care about registers. In which case,
* this stops the match.
*/
@@ -2689,7 +2689,7 @@ rx_search (rxb, startpos, range, stop, total_size,
((int)(search_state.test_pos.pos
- search_state.test_pos.string)
+ search_state.test_pos.offset);
-
+
if ( (search_state.best_last_r < 0)
|| (urhere + 1 > search_state.best_rparen[0]))
{
@@ -2705,7 +2705,7 @@ rx_search (rxb, startpos, range, stop, total_size,
search_state.best_rparen[0] = urhere + 1;
search_state.best_last_r = search_state.last_r;
}
- /* If we're not reporting the match-length
+ /* If we're not reporting the match-length
* or other register info, we need look no
* further.
*/
@@ -2722,7 +2722,7 @@ rx_search (rxb, startpos, range, stop, total_size,
((int)(search_state.test_pos.pos
- search_state.test_pos.string)
+ search_state.test_pos.offset);
-
+
int reg = rxb->se_params [effect].op1;
#if 0
if (reg > search_state.last_l)
@@ -2742,7 +2742,7 @@ rx_search (rxb, startpos, range, stop, total_size,
}
break;
}
-
+
case re_se_rparen:
{
int urhere =
@@ -2759,14 +2759,14 @@ rx_search (rxb, startpos, range, stop, total_size,
}
break;
}
-
+
case re_se_backref:
{
int reg = rxb->se_params [effect].op1;
if ( reg > search_state.last_r
|| search_state.rparen[reg] < 0)
goto test_do_return;
-
+
{
int backref_status;
check_backreference:
@@ -2873,7 +2873,7 @@ rx_search (rxb, startpos, range, stop, total_size,
search_state.ifr = &df->future_frame;
goto restart;
}
-
+
case rx_backtrack_point:
{
/* A backtrack point indicates that we've reached a
@@ -2883,18 +2883,18 @@ rx_search (rxb, startpos, range, stop, total_size,
* A backtracking strategy is used. We keep track of what
* registers are valid so we can erase side effects.
*
- * First, make sure there is some stack space to hold
+ * First, make sure there is some stack space to hold
* our state.
*/
-
+
struct rx_backtrack_frame * bf;
-
+
PUSH(search_state.backtrack_stack,
search_state.backtrack_frame_bytes);
#ifdef RX_DEBUG
++search_state.backtrack_depth;
#endif
-
+
bf = ((struct rx_backtrack_frame *)
search_state.backtrack_stack->sp);
{
@@ -2929,30 +2929,30 @@ rx_search (rxb, startpos, range, stop, total_size,
stk[x] = search_state.rparen[x];
}
}
-
+
/* Here is a while loop whose body is mainly a function
* call and some code to handle a return from that
* function.
*
* From here on for the rest of `case backtrack_point' it
- * is unsafe to assume that the search_state copies of
+ * is unsafe to assume that the search_state copies of
* variables saved on the backtracking stack are valid
* -- so read their values from the backtracking stack.
*
* This lets us use one generation fewer stack saves in
* the call-graph of a search.
*/
-
+
while_non_det_options:
#ifdef RX_DEBUG
++search_state.lines_found;
if (rx_debug_trace)
fprintf (stderr, "@@@ %d calls %d @@@\n",
search_state.line_no, search_state.lines_found);
-
+
search_state.line_no = search_state.lines_found;
#endif
-
+
if (bf->df->next_same_super_edge[0] == bf->first_df)
{
/* This is a tail-call optimization -- we don't recurse
@@ -2961,7 +2961,7 @@ rx_search (rxb, startpos, range, stop, total_size,
search_state.ifr = (bf->df->effects
? &bf->df->side_effects_frame
: &bf->df->future_frame);
-
+
rx_unlock_superstate (&rxb->rx, search_state.super);
POP(search_state.backtrack_stack,
search_state.backtrack_frame_bytes);
@@ -2983,14 +2983,14 @@ rx_search (rxb, startpos, range, stop, total_size,
cf->val = old_cf->val;
cf->inherited_from = old_cf;
cf->cdr = 0;
- }
+ }
/* `Call' this test-match block */
search_state.ifr = (bf->df->effects
? &bf->df->side_effects_frame
: &bf->df->future_frame);
goto recurse_test_match;
}
-
+
/* Returns in this block are accomplished by
* goto test_do_return. There are two cases.
* If there is some search-stack left,
@@ -2998,9 +2998,9 @@ rx_search (rxb, startpos, range, stop, total_size,
* If there is no search-stack left, then
* we should return to the fastmap/search loop.
*/
-
+
test_do_return:
-
+
if (!search_state.backtrack_stack)
{
#ifdef RX_DEBUG
@@ -3008,18 +3008,18 @@ rx_search (rxb, startpos, range, stop, total_size,
fprintf (stderr, "!!! %d bails returning %d !!!\n",
search_state.line_no, search_state.test_ret);
#endif
-
+
/* No more search-stack -- this test is done. */
if (search_state.test_ret)
goto return_from_test_match;
else
goto error_in_testing_match;
}
-
- /* Returning from a recursive call to
+
+ /* Returning from a recursive call to
* the test match block:
*/
-
+
bf = ((struct rx_backtrack_frame *)
search_state.backtrack_stack->sp);
#ifdef RX_DEBUG
@@ -3029,7 +3029,7 @@ rx_search (rxb, startpos, range, stop, total_size,
search_state.test_ret,
bf->stk_search_state.line_no);
#endif
-
+
while (search_state.counter_stack
&& (!bf->counter_stack_sp
|| (bf->counter_stack_sp
@@ -3038,15 +3038,15 @@ rx_search (rxb, startpos, range, stop, total_size,
POP(search_state.counter_stack,
sizeof (struct rx_counter_frame));
}
-
+
if (search_state.test_ret == rx_test_error)
{
POP (search_state.backtrack_stack,
search_state.backtrack_frame_bytes);
goto test_do_return;
}
-
- /* If a non-longest match was found and that is good
+
+ /* If a non-longest match was found and that is good
* enough, return immediately.
*/
if ( (search_state.test_ret == rx_test_found_first)
@@ -3057,7 +3057,7 @@ rx_search (rxb, startpos, range, stop, total_size,
search_state.backtrack_frame_bytes);
goto test_do_return;
}
-
+
search_state.test_ret = bf->stk_test_ret;
search_state.last_l = bf->stk_last_l;
search_state.last_r = bf->stk_last_r;
@@ -3067,7 +3067,7 @@ rx_search (rxb, startpos, range, stop, total_size,
#ifdef RX_DEBUG
search_state.line_no = bf->stk_search_state.line_no;
#endif
-
+
if (rxb->match_regs_on_stack)
{
int x;
@@ -3079,7 +3079,7 @@ rx_search (rxb, startpos, range, stop, total_size,
for (x = 0; x <= search_state.last_r; ++x)
search_state.rparen[x] = stk[x];
}
-
+
{
int x;
try_burst_2:
@@ -3107,8 +3107,8 @@ rx_search (rxb, startpos, range, stop, total_size,
search_state.test_pos = bf->stk_test_pos;
goto while_non_det_options;
}
-
-
+
+
case rx_cache_miss:
/* Because the superstate NFA is lazily constructed,
* and in fact may erode from underneath us, we sometimes
@@ -3125,14 +3125,14 @@ rx_search (rxb, startpos, range, stop, total_size,
goto test_do_return;
}
goto restart;
-
+
case rx_backtrack:
/* RX_BACKTRACK means that we've reached the empty
* superstate, indicating that match can't succeed
* from this point.
*/
goto test_do_return;
-
+
case rx_next_char:
case rx_error_inx:
case rx_num_instructions:
@@ -3141,21 +3141,21 @@ rx_search (rxb, startpos, range, stop, total_size,
}
goto pseudo_while_1;
}
-
- /* Healthy exits from the test-match loop do a
- * `goto return_from_test_match' On the other hand,
+
+ /* Healthy exits from the test-match loop do a
+ * `goto return_from_test_match' On the other hand,
* we might end up here.
*/
error_in_testing_match:
test_state = rx_test_error;
goto test_returns_to_search;
-
+
/***** fastmap/search loop body
* considering the results testing for a match
*/
-
+
return_from_test_match:
-
+
if (search_state.best_last_l >= 0)
{
if (regs && (regs->start != search_state.best_lparen))
@@ -3185,7 +3185,7 @@ rx_search (rxb, startpos, range, stop, total_size,
test_state = rx_test_fail;
goto test_returns_to_search;
}
-
+
test_return_continuation:
search_state.test_match_resume_pt = test_pc;
test_state = rx_test_continuation;
@@ -3203,16 +3203,16 @@ rx_search (rxb, startpos, range, stop, total_size,
/* Integers are used to represent side effects.
*
* Simple side effects are given negative integer names by these enums.
- *
+ *
* Non-negative names are reserved for complex effects.
*
- * Complex effects are those that take arguments. For example,
+ * Complex effects are those that take arguments. For example,
* a register assignment associated with a group is complex because
* it requires an argument to tell which group is being matched.
- *
+ *
* The integer name of a complex effect is an index into rxb->se_params.
*/
-
+
RX_DEF_SE(1, re_se_try, = -1) /* Epsilon from start state */
RX_DEF_SE(0, re_se_pushback, = re_se_try - 1)
@@ -3228,15 +3228,15 @@ rx_search (rxb, startpos, range, stop, total_size,
RX_DEF_SE(1, re_se_begbuf, = re_se_not_syntax - 1) /* match beginning of buffer */
RX_DEF_SE(1, re_se_hat, = re_se_begbuf - 1) /* match beginning of line */
- RX_DEF_SE(1, re_se_wordbeg, = re_se_hat - 1)
+ RX_DEF_SE(1, re_se_wordbeg, = re_se_hat - 1)
RX_DEF_SE(1, re_se_wordbound, = re_se_wordbeg - 1)
RX_DEF_SE(1, re_se_notwordbound, = re_se_wordbound - 1)
RX_DEF_SE(1, re_se_wordend, = re_se_notwordbound - 1)
RX_DEF_SE(1, re_se_endbuf, = re_se_wordend - 1)
- /* This fails except at the end of a line.
- * It deserves to go here since it is typicly one of the last steps
+ /* This fails except at the end of a line.
+ * It deserves to go here since it is typicly one of the last steps
* in a match.
*/
RX_DEF_SE(1, re_se_dollar, = re_se_endbuf - 1)
@@ -3244,7 +3244,7 @@ rx_search (rxb, startpos, range, stop, total_size,
/* Simple effects: */
RX_DEF_SE(1, re_se_fail, = re_se_dollar - 1)
- /* Complex effects. These are used in the 'se' field of
+ /* Complex effects. These are used in the 'se' field of
* a struct re_se_params. Indexes into the se array
* are stored as instructions on nfa edges.
*/
@@ -3252,7 +3252,7 @@ rx_search (rxb, startpos, range, stop, total_size,
RX_DEF_CPLX_SE(1, re_se_lparen, = re_se_win + 1)
RX_DEF_CPLX_SE(1, re_se_rparen, = re_se_lparen + 1)
RX_DEF_CPLX_SE(0, re_se_backref, = re_se_rparen + 1)
- RX_DEF_CPLX_SE(0, re_se_iter, = re_se_backref + 1)
+ RX_DEF_CPLX_SE(0, re_se_iter, = re_se_backref + 1)
RX_DEF_CPLX_SE(0, re_se_end_iter, = re_se_iter + 1)
RX_DEF_CPLX_SE(0, re_se_tv, = re_se_end_iter + 1)
diff --git a/gnu/lib/libg++/include/std.h b/gnu/lib/libg++/include/std.h
index 069b522d68d5..dcafc354c045 100644
--- a/gnu/lib/libg++/include/std.h
+++ b/gnu/lib/libg++/include/std.h
@@ -1,5 +1,5 @@
// This may look like C code, but it is really -*- C++ -*-
-/*
+/*
Copyright (C) 1988, 1992 Free Software Foundation
written by Doug Lea (dl@rocky.oswego.edu)
@@ -24,7 +24,7 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <stdio.h>
+#include <stdio.h>
#include <errno.h>
#include <fcntl.h>
@@ -32,4 +32,4 @@ extern "C" {
int strcasecmp _G_ARGS((const char*, const char*));
}
-#endif
+#endif
diff --git a/gnu/lib/libg++/include/stream.h b/gnu/lib/libg++/include/stream.h
index 488f3679bcd1..f9569a5582d7 100644
--- a/gnu/lib/libg++/include/stream.h
+++ b/gnu/lib/libg++/include/stream.h
@@ -1,4 +1,4 @@
-/*
+/*
Copyright (C) 1993 Free Software Foundation
This file is part of the GNU IO Library. This library is free
diff --git a/gnu/lib/libg++/include/streambuf.h b/gnu/lib/libg++/include/streambuf.h
index efbab12c2b59..7a3df54fcb69 100644
--- a/gnu/lib/libg++/include/streambuf.h
+++ b/gnu/lib/libg++/include/streambuf.h
@@ -314,7 +314,7 @@ struct streambuf : public _IO_FILE { // protected??
void setp(char* p, char* ep)
{ _IO_write_base=_IO_write_ptr=p; _IO_write_end=ep; }
void setg(char* eb, char* g, char *eg) {
- if (_IO_file_flags & _IO_IN_BACKUP) _IO_free_backup_area(this);
+ if (_IO_file_flags & _IO_IN_BACKUP) _IO_free_backup_area(this);
_IO_read_base = eb; _IO_read_ptr = g; _IO_read_end = eg; }
char *shortbuf() { return _shortbuf; }
@@ -336,7 +336,7 @@ struct streambuf : public _IO_FILE { // protected??
void unsave_markers(); // Make all streammarkers !saving().
int put_mode() { return _flags & _IO_CURRENTLY_PUTTING; }
int switch_to_get_mode();
-
+
streambuf(int flags=0);
public:
static int flush_all();
diff --git a/gnu/lib/libg++/include/strfile.h b/gnu/lib/libg++/include/strfile.h
index bff25b1ed106..950f2f56b3b5 100644
--- a/gnu/lib/libg++/include/strfile.h
+++ b/gnu/lib/libg++/include/strfile.h
@@ -1,4 +1,4 @@
-/*
+/*
Copyright (C) 1993 Free Software Foundation
This file is part of the GNU IO Library. This library is free
diff --git a/gnu/lib/libg++/libg++/timer.c b/gnu/lib/libg++/libg++/timer.c
index 6e3432bf5b42..579cc549c667 100644
--- a/gnu/lib/libg++/libg++/timer.c
+++ b/gnu/lib/libg++/libg++/timer.c
@@ -1,4 +1,4 @@
-/*
+/*
Copyright (C) 1990, 1992 Free Software Foundation
written by Doug Lea (dl@rocky.oswego.edu)
@@ -22,9 +22,9 @@ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
/* Timing functions from Doug Schmidt... */
/* no such thing as "negative time"! */
-#define TIMER_ERROR_VALUE -1.0
+#define TIMER_ERROR_VALUE -1.0
-/* If this does not work on your system, change this to #if 0, and
+/* If this does not work on your system, change this to #if 0, and
report the problem. */
#if 1
@@ -73,7 +73,7 @@ return_elapsed_time(Last_Time)
{
if (!Timer_Set) {
return(TIMER_ERROR_VALUE);
- }
+ }
else {
/* get process time */
#ifdef USE_TIMES
@@ -85,8 +85,8 @@ return_elapsed_time(Last_Time)
#ifdef USE_TIMES
return((double) (New_Time.tms_utime - Old_Time.tms_utime) / HZ);
#else
- return((New_Time.ru_utime.tv_sec - Old_Time.ru_utime.tv_sec) +
- ((New_Time.ru_utime.tv_usec - Old_Time.ru_utime.tv_usec)
+ return((New_Time.ru_utime.tv_sec - Old_Time.ru_utime.tv_sec) +
+ ((New_Time.ru_utime.tv_usec - Old_Time.ru_utime.tv_usec)
/ 1000000.0));
#endif
}
@@ -94,7 +94,7 @@ return_elapsed_time(Last_Time)
#ifdef USE_TIMES
return((double) New_Time.tms_utime / HZ - Last_Time);
#else
- return((New_Time.ru_utime.tv_sec +
+ return((New_Time.ru_utime.tv_sec +
(New_Time.ru_utime.tv_usec / 1000000.0)) - Last_Time);
#endif
}
@@ -115,7 +115,7 @@ getrusage(int dummy,struct rusage* time){
/* we subtract an offset to make sure that the number fits in a long int*/
rtime=rtime/1.0e+7-4.144e+9;
time->ru_utime.tv_sec= rtime;
- rtime=(rtime-time->ru_utime.tv_sec)*1.0e6;
+ rtime=(rtime-time->ru_utime.tv_sec)*1.0e6;
time->ru_utime.tv_usec= rtime;
}
#endif
diff --git a/gnu/lib/libg++/libiberty/strerror.c b/gnu/lib/libg++/libiberty/strerror.c
index 5c0a58d97a46..29a4e4acc86b 100644
--- a/gnu/lib/libg++/libiberty/strerror.c
+++ b/gnu/lib/libg++/libiberty/strerror.c
@@ -666,7 +666,7 @@ strerror (errnoval)
/* In range, and a valid message. Just return the message. */
msg = (char *) sys_errlist[errnoval];
}
-
+
return (msg);
}
diff --git a/gnu/lib/libg++/libiberty/strsignal.c b/gnu/lib/libg++/libiberty/strsignal.c
index 7acb733bd56f..815af831d78d 100644
--- a/gnu/lib/libg++/libiberty/strsignal.c
+++ b/gnu/lib/libg++/libiberty/strsignal.c
@@ -448,7 +448,7 @@ strsignal (signo)
/* In range, and a valid message. Just return the message. */
msg = (const char *) sys_siglist[signo];
}
-
+
return (msg);
}
diff --git a/gnu/lib/libg++/libio/filedoalloc.c b/gnu/lib/libg++/libio/filedoalloc.c
index a85b84613e64..92c510563179 100644
--- a/gnu/lib/libg++/libio/filedoalloc.c
+++ b/gnu/lib/libg++/libio/filedoalloc.c
@@ -1,4 +1,4 @@
-/*
+/*
Copyright (C) 1993 Free Software Foundation
This file is part of the GNU IO Library. This library is free
@@ -74,7 +74,7 @@ _IO_file_doallocate(fp)
if (_IO_cleanup_registration_needed)
(*_IO_cleanup_registration_needed)();
-
+
if (fp->_fileno < 0 || fp->_jumps->__stat(fp, &st) < 0)
{
couldbetty = 0;
diff --git a/gnu/lib/libg++/libio/fileops.c b/gnu/lib/libg++/libio/fileops.c
index 2bd7c2410990..332a0da9f028 100644
--- a/gnu/lib/libg++/libio/fileops.c
+++ b/gnu/lib/libg++/libio/fileops.c
@@ -1,4 +1,4 @@
-/*
+/*
Copyright (C) 1993 Free Software Foundation
This file is part of the GNU IO Library. This library is free
@@ -68,14 +68,14 @@ extern int errno;
(The pointers save_gptr() and save_egptr() are the values
of gptr() and egptr() at the time putback mode was entered.)
The OS position corresponds to that of save_egptr().
-
+
LINE BUFFERED OUTPUT:
During line buffered output, pbase()==base() && epptr()==base().
However, ptr() may be anywhere between base() and ebuf().
This forces a call to filebuf::overflow(int C) on every put.
If there is more space in the buffer, and C is not a '\n',
then C is inserted, and pptr() incremented.
-
+
UNBUFFERED STREAMS:
If a filebuf is unbuffered(), the _shortbuf[1] is used as the buffer.
*/
@@ -108,7 +108,7 @@ _IO_file_close_it(fp)
_IO_unsave_markers(fp);
status = fp->_jumps->__close(fp);
-
+
/* Free buffer. */
_IO_setb(fp, NULL, NULL, 0);
_IO_setg(fp, NULL, NULL, NULL);
@@ -228,7 +228,7 @@ _IO_do_write(fp, data, to_do)
unpredictable. */
fp->_offset = _IO_pos_BAD;
else if (fp->_IO_read_end != fp->_IO_write_base)
- {
+ {
_IO_pos_t new_pos = fp->_jumps->__seek(fp, fp->_IO_write_base - fp->_IO_read_end, 1);
if (new_pos == _IO_pos_BAD)
return EOF;
@@ -337,7 +337,7 @@ _IO_file_sync(fp)
/* char* ptr = cur_ptr(); */
if (fp->_IO_write_ptr > fp->_IO_write_base)
if (_IO_do_flush(fp)) return EOF;
- delta = fp->_IO_read_ptr - fp->_IO_read_end;
+ delta = fp->_IO_read_ptr - fp->_IO_read_end;
if (delta != 0)
{
#ifdef TODO
@@ -643,7 +643,7 @@ _IO_file_xsputn(f, data, n)
if (_IO_do_write(f, s, count) == EOF)
return n - to_do;
to_do = dont_write;
-
+
/* Now write out the remainder. Normally, this will fit in the
buffer, but it's somewhat messier for line-buffered files,
so we let _IO_default_xsputn handle the general case. */
@@ -710,7 +710,7 @@ _IO_file_xsgetn(fp, data, n)
else
fp->_flags |= _IO_ERR_SEEN, count = 0;
}
-
+
s += count;
more -= count;
}
diff --git a/gnu/lib/libg++/libio/floatconv.c b/gnu/lib/libg++/libio/floatconv.c
index ff300bbbefca..acd6998a0c82 100644
--- a/gnu/lib/libg++/libio/floatconv.c
+++ b/gnu/lib/libg++/libio/floatconv.c
@@ -1,4 +1,4 @@
-/*
+/*
Copyright (C) 1993 Free Software Foundation
This file is part of the GNU IO Library. This library is free
diff --git a/gnu/lib/libg++/libio/genops.c b/gnu/lib/libg++/libio/genops.c
index 469694cb68dd..71989a5b4c5d 100644
--- a/gnu/lib/libg++/libio/genops.c
+++ b/gnu/lib/libg++/libio/genops.c
@@ -1,4 +1,4 @@
-/*
+/*
Copyright (C) 1993 Free Software Foundation
This file is part of the GNU IO Library. This library is free
@@ -589,7 +589,7 @@ int
_IO_get_column(fp)
register _IO_FILE *fp;
{
- if (fp->_cur_column)
+ if (fp->_cur_column)
return _IO_adjust_column(fp->_cur_column - 1,
fp->_IO_write_base,
fp->_IO_write_ptr - fp->_IO_write_base);
@@ -636,7 +636,7 @@ _IO_cleanup ()
So it is possible that other static destructord might want to
write to cout - and they're supposed to be able to do so.
- The following will make the standard streambufs be unbuffered,
+ The following will make the standard streambufs be unbuffered,
which forces any output from late destructors to be written out. */
_IO_unbuffer_all ();
}
@@ -652,7 +652,7 @@ void _IO_init_marker(marker, fp)
marker->_pos = fp->_IO_read_ptr - fp->_IO_read_end;
else
marker->_pos = fp->_IO_read_ptr - fp->_IO_read_base;
-
+
/* Should perhaps sort the chain? */
marker->_next = fp->_markers;
fp->_markers = marker;
@@ -776,7 +776,7 @@ _IO_default_pbackfail(fp, c)
/* Need to handle a filebuf in write mode (switch to read mode). FIXME!*/
if (_IO_have_backup(fp) && !_IO_in_backup(fp))
_IO_switch_to_backup_area(fp);
-
+
if (!_IO_have_backup(fp))
{
/* No backup buffer: allocate one. */
@@ -860,7 +860,7 @@ _IO_default_write(fp, data, n)
struct __io_defs {
__io_defs() { }
~__io_defs() { _IO_cleanup(); }
-};
+};
__io_defs io_defs__;
#endif
diff --git a/gnu/lib/libg++/libio/iofclose.c b/gnu/lib/libg++/libio/iofclose.c
index 03be4518b4db..d8ad3a6f47a2 100644
--- a/gnu/lib/libg++/libio/iofclose.c
+++ b/gnu/lib/libg++/libio/iofclose.c
@@ -1,4 +1,4 @@
-/*
+/*
Copyright (C) 1993 Free Software Foundation
This file is part of the GNU IO Library. This library is free
diff --git a/gnu/lib/libg++/libio/iofgetpos.c b/gnu/lib/libg++/libio/iofgetpos.c
index ac417f5dbc1c..f345463d3902 100644
--- a/gnu/lib/libg++/libio/iofgetpos.c
+++ b/gnu/lib/libg++/libio/iofgetpos.c
@@ -1,4 +1,4 @@
-/*
+/*
Copyright (C) 1993 Free Software Foundation
This file is part of the GNU IO Library. This library is free
diff --git a/gnu/lib/libg++/libio/iofread.c b/gnu/lib/libg++/libio/iofread.c
index 4bfe717c029d..9cb633e5678c 100644
--- a/gnu/lib/libg++/libio/iofread.c
+++ b/gnu/lib/libg++/libio/iofread.c
@@ -1,4 +1,4 @@
-/*
+/*
Copyright (C) 1993 Free Software Foundation
This file is part of the GNU IO Library. This library is free
diff --git a/gnu/lib/libg++/libio/iofscanf.c b/gnu/lib/libg++/libio/iofscanf.c
index 5daef91741aa..fc43d7eb540e 100644
--- a/gnu/lib/libg++/libio/iofscanf.c
+++ b/gnu/lib/libg++/libio/iofscanf.c
@@ -1,4 +1,4 @@
-/*
+/*
Copyright (C) 1993 Free Software Foundation
This file is part of the GNU IO Library. This library is free
diff --git a/gnu/lib/libg++/libio/iofsetpos.c b/gnu/lib/libg++/libio/iofsetpos.c
index 0a6fff2f02f2..5f2023b7b995 100644
--- a/gnu/lib/libg++/libio/iofsetpos.c
+++ b/gnu/lib/libg++/libio/iofsetpos.c
@@ -1,4 +1,4 @@
-/*
+/*
Copyright (C) 1993 Free Software Foundation
This file is part of the GNU IO Library. This library is free
diff --git a/gnu/lib/libg++/libio/iogetdelim.c b/gnu/lib/libg++/libio/iogetdelim.c
index 3dc5cd1ca77b..42527ffe666a 100644
--- a/gnu/lib/libg++/libio/iogetdelim.c
+++ b/gnu/lib/libg++/libio/iogetdelim.c
@@ -1,4 +1,4 @@
-/*
+/*
Copyright (C) 1994 Free Software Foundation
This file is part of the GNU IO Library. This library is free
diff --git a/gnu/lib/libg++/libio/iogetline.c b/gnu/lib/libg++/libio/iogetline.c
index dcaa4a167bae..9ca1b70a8f37 100644
--- a/gnu/lib/libg++/libio/iogetline.c
+++ b/gnu/lib/libg++/libio/iogetline.c
@@ -1,4 +1,4 @@
-/*
+/*
Copyright (C) 1993 Free Software Foundation
This file is part of the GNU IO Library. This library is free
diff --git a/gnu/lib/libg++/libio/ioignore.c b/gnu/lib/libg++/libio/ioignore.c
index 1b26503a9c68..70479e21925c 100644
--- a/gnu/lib/libg++/libio/ioignore.c
+++ b/gnu/lib/libg++/libio/ioignore.c
@@ -1,4 +1,4 @@
-/*
+/*
Copyright (C) 1993 Free Software Foundation
This file is part of the GNU IO Library. This library is free
diff --git a/gnu/lib/libg++/libio/iopadn.c b/gnu/lib/libg++/libio/iopadn.c
index 84dcee615e32..77b7af758d32 100644
--- a/gnu/lib/libg++/libio/iopadn.c
+++ b/gnu/lib/libg++/libio/iopadn.c
@@ -1,4 +1,4 @@
-/*
+/*
Copyright (C) 1993 Free Software Foundation
This file is part of the GNU IO Library. This library is free
@@ -40,7 +40,7 @@ _IO_padn(fp, pad, count)
const char *padptr;
register int i;
_IO_size_t written = 0, w;
-
+
if (pad == ' ')
padptr = blanks;
else if (pad == '0')
@@ -57,7 +57,7 @@ _IO_padn(fp, pad, count)
if (w != PADSIZE)
return written;
}
-
+
if (i > 0)
{
w = _IO_sputn(fp, padptr, i);
diff --git a/gnu/lib/libg++/libio/iopopen.c b/gnu/lib/libg++/libio/iopopen.c
index dfa3482a22cf..99a91452503a 100644
--- a/gnu/lib/libg++/libio/iopopen.c
+++ b/gnu/lib/libg++/libio/iopopen.c
@@ -1,4 +1,4 @@
-/*
+/*
Copyright (C) 1993 Free Software Foundation
This file is part of the GNU IO Library. This library is free
@@ -170,7 +170,7 @@ _IO_proc_close(fp)
_IO_proc_file **ptr = &proc_file_chain;
_IO_pid_t wait_pid;
int status = -1;
-
+
/* Unlink from proc_file_chain. */
for ( ; *ptr != NULL; ptr = &(*ptr)->next)
{
diff --git a/gnu/lib/libg++/libio/ioprims.c b/gnu/lib/libg++/libio/ioprims.c
index 4c41ed8f823f..8164ba3bb113 100644
--- a/gnu/lib/libg++/libio/ioprims.c
+++ b/gnu/lib/libg++/libio/ioprims.c
@@ -1,4 +1,4 @@
-/*
+/*
Copyright (C) 1993 Free Software Foundation
This file is part of the GNU IO Library. This library is free
diff --git a/gnu/lib/libg++/libio/ioprintf.c b/gnu/lib/libg++/libio/ioprintf.c
index 519785a0d237..69dce3eadcf0 100644
--- a/gnu/lib/libg++/libio/ioprintf.c
+++ b/gnu/lib/libg++/libio/ioprintf.c
@@ -1,4 +1,4 @@
-/*
+/*
Copyright (C) 1993 Free Software Foundation
This file is part of the GNU IO Library. This library is free
diff --git a/gnu/lib/libg++/libio/ioseekoff.c b/gnu/lib/libg++/libio/ioseekoff.c
index 7ebf183d0b46..c409586713f8 100644
--- a/gnu/lib/libg++/libio/ioseekoff.c
+++ b/gnu/lib/libg++/libio/ioseekoff.c
@@ -1,4 +1,4 @@
-/*
+/*
Copyright (C) 1993 Free Software Foundation
This file is part of the GNU IO Library. This library is free
diff --git a/gnu/lib/libg++/libio/ioseekpos.c b/gnu/lib/libg++/libio/ioseekpos.c
index a99b7033f83f..54a36b2c0ea1 100644
--- a/gnu/lib/libg++/libio/ioseekpos.c
+++ b/gnu/lib/libg++/libio/ioseekpos.c
@@ -1,4 +1,4 @@
-/*
+/*
Copyright (C) 1993 Free Software Foundation
This file is part of the GNU IO Library. This library is free
diff --git a/gnu/lib/libg++/libio/ioungetc.c b/gnu/lib/libg++/libio/ioungetc.c
index b52e4a27e92f..0b13e6d159e3 100644
--- a/gnu/lib/libg++/libio/ioungetc.c
+++ b/gnu/lib/libg++/libio/ioungetc.c
@@ -1,4 +1,4 @@
-/*
+/*
Copyright (C) 1993 Free Software Foundation
This file is part of the GNU IO Library. This library is free
diff --git a/gnu/lib/libg++/libio/iovfprintf.c b/gnu/lib/libg++/libio/iovfprintf.c
index e3fb2da0c1fe..4ee12e07be0f 100644
--- a/gnu/lib/libg++/libio/iovfprintf.c
+++ b/gnu/lib/libg++/libio/iovfprintf.c
@@ -1,4 +1,4 @@
-/*
+/*
Copyright (C) 1993 Free Software Foundation
This file is part of the GNU IO Library. This library is free
@@ -132,7 +132,7 @@ helper_vfprintf(fp, fmt0, ap)
hp->_IO_write_end = buf+_IO_BUFSIZ;
hp->_IO_file_flags = _IO_MAGIC|_IO_NO_READS;
hp->_jumps = &_IO_helper_jumps;
-
+
/* Now print to helper instead. */
result = _IO_vfprintf(hp, fmt0, ap);
diff --git a/gnu/lib/libg++/libio/iovfscanf.c b/gnu/lib/libg++/libio/iovfscanf.c
index 85168afdbd78..909f1ac90215 100644
--- a/gnu/lib/libg++/libio/iovfscanf.c
+++ b/gnu/lib/libg++/libio/iovfscanf.c
@@ -1,4 +1,4 @@
-/*
+/*
Copyright (C) 1993 Free Software Foundation
This file is part of the GNU IO Library. This library is free
diff --git a/gnu/lib/libg++/libio/outfloat.c b/gnu/lib/libg++/libio/outfloat.c
index 7f4559b22c0a..83101b5387fb 100644
--- a/gnu/lib/libg++/libio/outfloat.c
+++ b/gnu/lib/libg++/libio/outfloat.c
@@ -1,4 +1,4 @@
-/*
+/*
Copyright (C) 1993 Free Software Foundation
This file is part of the GNU IO Library. This library is free
@@ -132,7 +132,7 @@ int _IO_outfloat(value, sb, type, width, precision, flags,
precision = 0;
show_dot = 0;
}
-
+
/* dtoa truncates trailing zeroes. Set the variable trailing_zeroes to
the number of 0's we have to add (after the decimal point). */
if (skip_zeroes)
@@ -146,7 +146,7 @@ int _IO_outfloat(value, sb, type, width, precision, flags,
trailing_zeroes = useful_digits <= decpt ? precision - decpt
: precision-useful_digits;
if (trailing_zeroes < 0) trailing_zeroes = 0;
-
+
if (trailing_zeroes != 0 || useful_digits > decpt)
show_dot = 1;
if (sign_mode == 0)
@@ -155,14 +155,14 @@ int _IO_outfloat(value, sb, type, width, precision, flags,
print_sign = sign ? '-' : '+';
else /* if (sign_mode == ' ') */
print_sign = sign ? '-' : ' ';
-
+
/* Calculate the width (before padding). */
unpadded_width =
(print_sign != 0) + trailing_zeroes + exponent_size + show_dot
+ useful_digits
+ (decpt > useful_digits ? decpt - useful_digits
: decpt > 0 ? 0 : 1 - decpt);
-
+
padding = width > unpadded_width ? width - unpadded_width : 0;
if (padding > 0 && pad_kind != _IO_LEFT && pad_kind != _IO_INTERNAL)
PADN(fill, padding); /* Default (right) adjust */
diff --git a/gnu/lib/libg++/libio/strops.c b/gnu/lib/libg++/libio/strops.c
index f507343fbafa..1332d0b37e5f 100644
--- a/gnu/lib/libg++/libio/strops.c
+++ b/gnu/lib/libg++/libio/strops.c
@@ -1,4 +1,4 @@
-/*
+/*
Copyright (C) 1993 Free Software Foundation
This file is part of the GNU IO Library. This library is free
@@ -195,7 +195,7 @@ _IO_str_count (fp)
if (put_len < ((_IO_strfile*)fp)->_s._len)
put_len = ((_IO_strfile*)fp)->_s._len;
return put_len;
-}
+}
_IO_pos_t
_IO_str_seekoff(fp, offset, mode)
diff --git a/gnu/lib/libg++/librx/rx.c b/gnu/lib/libg++/librx/rx.c
index 2c7ea0362429..58add6753516 100644
--- a/gnu/lib/libg++/librx/rx.c
+++ b/gnu/lib/libg++/librx/rx.c
@@ -19,9 +19,9 @@ write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA
#define _RX_C_
-/* NOTE!!! AIX is so losing it requires this to be the first thing in the
- * file.
- * Do not put ANYTHING before it!
+/* NOTE!!! AIX is so losing it requires this to be the first thing in the
+ * file.
+ * Do not put ANYTHING before it!
*/
#if !defined (__GNUC__) && defined (_AIX)
#pragma alloca
@@ -77,7 +77,7 @@ typedef char boolean;
#ifndef _AIX /* Already did AIX, up at the top. */
char *alloca ();
#endif /* not _AIX */
-#endif /* not HAVE_ALLOCA_H */
+#endif /* not HAVE_ALLOCA_H */
#endif /* not __GNUC__ */
#endif /* not alloca */
@@ -102,7 +102,7 @@ char *alloca ();
#ifdef RX_WANT_RX_DEFS
#define RX_DECL extern
-#define RX_DEF_QUAL
+#define RX_DEF_QUAL
#else
#define RX_WANT_RX_DEFS
#define RX_DECL static
@@ -333,7 +333,7 @@ static char * efnames2[] =
"re_se_tv"
};
-static char * inx_names[] =
+static char * inx_names[] =
{
"rx_backtrack_point",
"rx_do_side_effects",
@@ -617,7 +617,7 @@ rx_bitset_hash (size, b)
}
-RX_DECL RX_subset rx_subset_singletons [RX_subset_bits] =
+RX_DECL RX_subset rx_subset_singletons [RX_subset_bits] =
{
0x1,
0x2,
@@ -689,13 +689,13 @@ static unsigned long rx_hash_masks[4] =
/* Hash tables */
#ifdef __STDC__
-RX_DECL struct rx_hash_item *
+RX_DECL struct rx_hash_item *
rx_hash_find (struct rx_hash * table,
unsigned long hash,
void * value,
struct rx_hash_rules * rules)
#else
-RX_DECL struct rx_hash_item *
+RX_DECL struct rx_hash_item *
rx_hash_find (table, hash, value, rules)
struct rx_hash * table;
unsigned long hash;
@@ -749,7 +749,7 @@ rx_hash_store (table, hash, value, rules)
long mask = rx_hash_masks[0];
int bucket = (hash & mask) % 13;
int depth = 0;
-
+
while (table->children [bucket])
{
table = table->children [bucket];
@@ -758,7 +758,7 @@ rx_hash_store (table, hash, value, rules)
bucket = (hash & mask) % 13;
++depth;
}
-
+
{
struct rx_hash_item * it = table->buckets[bucket];
while (it)
@@ -767,7 +767,7 @@ rx_hash_store (table, hash, value, rules)
else
it = it->next_same_hash;
}
-
+
{
if ( (depth < 3)
&& (table->bucket_size [bucket] >= 4))
@@ -842,7 +842,7 @@ rx_hash_free (it, rules)
: 0);
int bucket = (hash & rx_hash_masks [depth]) % 13;
struct rx_hash_item ** pos = &table->buckets [bucket];
-
+
while (*pos != it)
pos = &(*pos)->next_same_hash;
*pos = it->next_same_hash;
@@ -1232,7 +1232,7 @@ rx_free_rexp (rx, node)
case r_side_effect:
break;
-
+
case r_concat:
case r_alternate:
case r_2phase_star:
@@ -1252,11 +1252,11 @@ rx_free_rexp (rx, node)
#ifdef __STDC__
-RX_DECL struct rexp_node *
+RX_DECL struct rexp_node *
rx_copy_rexp (struct rx *rx,
struct rexp_node *node)
#else
-RX_DECL struct rexp_node *
+RX_DECL struct rexp_node *
rx_copy_rexp (rx, node)
struct rx *rx;
struct rexp_node *node;
@@ -1349,11 +1349,11 @@ rx_free_nfa_state (n)
* assigned after the nfa has been built.
*/
#ifdef __STDC__
-RX_DECL struct rx_nfa_state *
+RX_DECL struct rx_nfa_state *
rx_id_to_nfa_state (struct rx * rx,
int id)
#else
-RX_DECL struct rx_nfa_state *
+RX_DECL struct rx_nfa_state *
rx_id_to_nfa_state (rx, id)
struct rx * rx;
int id;
@@ -1367,18 +1367,18 @@ rx_id_to_nfa_state (rx, id)
}
-/* This adds an edge between two nodes, but doesn't initialize the
+/* This adds an edge between two nodes, but doesn't initialize the
* edge label.
*/
#ifdef __STDC__
-RX_DECL struct rx_nfa_edge *
+RX_DECL struct rx_nfa_edge *
rx_nfa_edge (struct rx *rx,
enum rx_nfa_etype type,
struct rx_nfa_state *start,
struct rx_nfa_state *dest)
#else
-RX_DECL struct rx_nfa_edge *
+RX_DECL struct rx_nfa_edge *
rx_nfa_edge (rx, type, start, dest)
struct rx *rx;
enum rx_nfa_etype type;
@@ -1413,14 +1413,14 @@ rx_free_nfa_edge (e)
/* This constructs a POSSIBLE_FUTURE, which is a kind epsilon-closure
* of an NFA. These are added to an nfa automaticly by eclose_nfa.
- */
+ */
#ifdef __STDC__
-static struct rx_possible_future *
+static struct rx_possible_future *
rx_possible_future (struct rx * rx,
struct rx_se_list * effects)
#else
-static struct rx_possible_future *
+static struct rx_possible_future *
rx_possible_future (rx, effects)
struct rx * rx;
struct rx_se_list * effects;
@@ -1499,17 +1499,17 @@ rx_free_nfa (rx)
-/* This page: translating a pattern expression into an nfa and doing the
+/* This page: translating a pattern expression into an nfa and doing the
* static part of the nfa->super-nfa translation.
*/
-/* This is the thompson regexp->nfa algorithm.
+/* This is the thompson regexp->nfa algorithm.
* It is modified to allow for `side-effect epsilons.' Those are
* edges that are taken whenever a similar epsilon edge would be,
- * but which imply that some side effect occurs when the edge
+ * but which imply that some side effect occurs when the edge
* is taken.
*
- * Side effects are used to model parts of the pattern langauge
+ * Side effects are used to model parts of the pattern langauge
* that are not regular (in the formal sense).
*/
@@ -1566,7 +1566,7 @@ rx_build_nfa (rx, rexp, start, end)
return 0;
}
return 1;
-
+
case r_opt:
return (rx_build_nfa (rx, rexp->params.pair.left, start, end)
&& rx_nfa_edge (rx, ne_epsilon, *start, *end));
@@ -1646,10 +1646,10 @@ rx_build_nfa (rx, rexp, start, end)
/* RX_NAME_NFA_STATES identifies all nodes with outgoing non-epsilon
- * transitions. Only these nodes can occur in super-states.
- * All nodes are given an integer id.
+ * transitions. Only these nodes can occur in super-states.
+ * All nodes are given an integer id.
* The id is non-negative if the node has non-epsilon out-transitions, negative
- * otherwise (this is because we want the non-negative ids to be used as
+ * otherwise (this is because we want the non-negative ids to be used as
* array indexes in a few places).
*/
@@ -1728,10 +1728,10 @@ rx_name_nfa_states (rx)
*/
#ifdef __STDC__
-static int
+static int
se_list_cmp (void * va, void * vb)
#else
-static int
+static int
se_list_cmp (va, vb)
void * va;
void * vb;
@@ -1755,10 +1755,10 @@ se_list_cmp (va, vb)
#ifdef __STDC__
-static int
+static int
se_list_equal (void * va, void * vb)
#else
-static int
+static int
se_list_equal (va, vb)
void * va;
void * vb;
@@ -1778,11 +1778,11 @@ static struct rx_hash_rules se_list_hash_rules =
#ifdef __STDC__
-static struct rx_se_list *
+static struct rx_se_list *
side_effect_cons (struct rx * rx,
void * se, struct rx_se_list * list)
#else
-static struct rx_se_list *
+static struct rx_se_list *
side_effect_cons (rx, se, list)
struct rx * rx;
void * se;
@@ -1834,7 +1834,7 @@ hash_cons_se_prog (rx, memo, car, cdr)
return (struct rx_se_list *)it->data;
}
}
-
+
#ifdef __STDC__
static struct rx_se_list *
@@ -1859,10 +1859,10 @@ hash_se_prog (rx, memo, prog)
}
#ifdef __STDC__
-static int
+static int
nfa_set_cmp (void * va, void * vb)
#else
-static int
+static int
nfa_set_cmp (va, vb)
void * va;
void * vb;
@@ -1885,10 +1885,10 @@ nfa_set_cmp (va, vb)
}
#ifdef __STDC__
-static int
+static int
nfa_set_equal (void * va, void * vb)
#else
-static int
+static int
nfa_set_equal (va, vb)
void * va;
void * vb;
@@ -1908,12 +1908,12 @@ static struct rx_hash_rules nfa_set_hash_rules =
#ifdef __STDC__
-static struct rx_nfa_state_set *
+static struct rx_nfa_state_set *
nfa_set_cons (struct rx * rx,
struct rx_hash * memo, struct rx_nfa_state * state,
struct rx_nfa_state_set * set)
#else
-static struct rx_nfa_state_set *
+static struct rx_nfa_state_set *
nfa_set_cons (rx, memo, state, set)
struct rx * rx;
struct rx_hash * memo;
@@ -1944,12 +1944,12 @@ nfa_set_cons (rx, memo, state, set)
#ifdef __STDC__
-static struct rx_nfa_state_set *
+static struct rx_nfa_state_set *
nfa_set_enjoin (struct rx * rx,
struct rx_hash * memo, struct rx_nfa_state * state,
struct rx_nfa_state_set * set)
#else
-static struct rx_nfa_state_set *
+static struct rx_nfa_state_set *
nfa_set_enjoin (rx, memo, state, set)
struct rx * rx;
struct rx_hash * memo;
@@ -1976,7 +1976,7 @@ nfa_set_enjoin (rx, memo, state, set)
/* This page: computing epsilon closures. The closures aren't total.
* Each node's closures are partitioned according to the side effects entailed
* along the epsilon edges. Return true on success.
- */
+ */
struct eclose_frame
{
@@ -1985,11 +1985,11 @@ struct eclose_frame
#ifdef __STDC__
-static int
+static int
eclose_node (struct rx *rx, struct rx_nfa_state *outnode,
struct rx_nfa_state *node, struct eclose_frame *frame)
#else
-static int
+static int
eclose_node (rx, outnode, node, frame)
struct rx *rx;
struct rx_nfa_state *outnode;
@@ -2054,7 +2054,7 @@ eclose_node (rx, outnode, node, frame)
break;
case ne_side_effect:
{
- frame->prog_backwards = side_effect_cons (rx,
+ frame->prog_backwards = side_effect_cons (rx,
e->params.side_effect,
frame->prog_backwards);
if (!frame->prog_backwards)
@@ -2079,10 +2079,10 @@ eclose_node (rx, outnode, node, frame)
#ifdef __STDC__
-RX_DECL int
+RX_DECL int
rx_eclose_nfa (struct rx *rx)
#else
-RX_DECL int
+RX_DECL int
rx_eclose_nfa (rx)
struct rx *rx;
#endif
@@ -2090,7 +2090,7 @@ rx_eclose_nfa (rx)
struct rx_nfa_state *n = rx->nfa_states;
struct eclose_frame frame;
static int rx_id = 0;
-
+
frame.prog_backwards = 0;
rx->rx_id = rx_id++;
bzero (&rx->se_list_memo, sizeof (rx->se_list_memo));
@@ -2113,10 +2113,10 @@ rx_eclose_nfa (rx)
*/
#ifdef __STDC__
-RX_DECL void
+RX_DECL void
rx_delete_epsilon_transitions (struct rx *rx)
#else
-RX_DECL void
+RX_DECL void
rx_delete_epsilon_transitions (rx)
struct rx *rx;
#endif
@@ -2154,16 +2154,16 @@ rx_delete_epsilon_transitions (rx)
*/
/* This is for qsort on an array of nfa_states. The order
- * is based on state ids and goes
+ * is based on state ids and goes
* [0...MAX][MIN..-1] where (MAX>=0) and (MIN<0)
* This way, positive ids double as array indices.
*/
#ifdef __STDC__
-static int
+static int
nfacmp (void * va, void * vb)
#else
-static int
+static int
nfacmp (va, vb)
void * va;
void * vb;
@@ -2180,10 +2180,10 @@ nfacmp (va, vb)
}
#ifdef __STDC__
-static int
+static int
count_hash_nodes (struct rx_hash * st)
#else
-static int
+static int
count_hash_nodes (st)
struct rx_hash * st;
#endif
@@ -2194,16 +2194,16 @@ count_hash_nodes (st)
count += ((st->children[x])
? count_hash_nodes (st->children[x])
: st->bucket_size[x]);
-
+
return count;
}
#ifdef __STDC__
-static void
+static void
se_memo_freer (struct rx_hash_item * node)
#else
-static void
+static void
se_memo_freer (node)
struct rx_hash_item * node;
#endif
@@ -2213,10 +2213,10 @@ se_memo_freer (node)
#ifdef __STDC__
-static void
+static void
nfa_set_freer (struct rx_hash_item * node)
#else
-static void
+static void
nfa_set_freer (node)
struct rx_hash_item * node;
#endif
@@ -2231,11 +2231,11 @@ nfa_set_freer (node)
*/
#ifdef __STDC__
-RX_DECL int
+RX_DECL int
rx_compactify_nfa (struct rx *rx,
void **mem, unsigned long *size)
#else
-RX_DECL int
+RX_DECL int
rx_compactify_nfa (rx, mem, size)
struct rx *rx;
void **mem;
@@ -2251,8 +2251,8 @@ rx_compactify_nfa (rx, mem, size)
unsigned long total_size;
/* This takes place in two stages. First, the total size of the
- * nfa is computed, then structures are copied.
- */
+ * nfa is computed, then structures are copied.
+ */
n = rx->nfa_states;
total_nodec = 0;
while (n)
@@ -2425,11 +2425,11 @@ rx_compactify_nfa (rx, mem, size)
/* The functions in the next several pages define the lazy-NFA-conversion used
- * by matchers. The input to this construction is an NFA such as
+ * by matchers. The input to this construction is an NFA such as
* is built by compactify_nfa (rx.c). The output is the superNFA.
*/
-/* Match engines can use arbitrary values for opcodes. So, the parse tree
+/* Match engines can use arbitrary values for opcodes. So, the parse tree
* is built using instructions names (enum rx_opcode), but the superstate
* nfa is populated with mystery opcodes (void *).
*
@@ -2502,16 +2502,16 @@ rx_cache_free (cache, freelist, mem)
}
-/* The partially instantiated superstate graph has a transition
+/* The partially instantiated superstate graph has a transition
* table at every node. There is one entry for every character.
* This fills in the transition for a set.
*/
#ifdef __STDC__
-static void
+static void
install_transition (struct rx_superstate *super,
- struct rx_inx *answer, rx_Bitset trcset)
+ struct rx_inx *answer, rx_Bitset trcset)
#else
-static void
+static void
install_transition (super, answer, trcset)
struct rx_superstate *super;
struct rx_inx *answer;
@@ -2579,14 +2579,14 @@ check_cache (cache)
check_cache (you_fucked_up);
}
-/* When a superstate is old and neglected, it can enter a
+/* When a superstate is old and neglected, it can enter a
* semi-free state. A semi-free state is slated to die.
* Incoming transitions to a semi-free state are re-written
* to cause an (interpreted) fault when they are taken.
* The fault handler revives the semi-free state, patches
* incoming transitions back to normal, and continues.
*
- * The idea is basicly to free in two stages, aborting
+ * The idea is basicly to free in two stages, aborting
* between the two if the state turns out to be useful again.
* When a free is aborted, the rescued superstate is placed
* in the most-favored slot to maximize the time until it
@@ -2663,11 +2663,11 @@ semifree_superstate (cache)
#ifdef __STDC__
-static void
+static void
refresh_semifree_superstate (struct rx_cache * cache,
struct rx_superstate * super)
#else
-static void
+static void
refresh_semifree_superstate (cache, super)
struct rx_cache * cache;
struct rx_superstate * super;
@@ -2677,7 +2677,7 @@ refresh_semifree_superstate (cache, super)
if (super->transition_refs)
{
- super->transition_refs->prev_same_dest->next_same_dest = 0;
+ super->transition_refs->prev_same_dest->next_same_dest = 0;
for (df = super->transition_refs; df; df = df->next_same_dest)
{
df->future_frame.inx = cache->instruction_table[rx_next_char];
@@ -2745,11 +2745,11 @@ rx_refresh_this_superstate (cache, superstate)
}
#ifdef __STDC__
-static void
+static void
release_superset_low (struct rx_cache * cache,
struct rx_superset *set)
#else
-static void
+static void
release_superset_low (cache, set)
struct rx_cache * cache;
struct rx_superset *set;
@@ -2774,11 +2774,11 @@ release_superset_low (cache, set)
}
#ifdef __STDC__
-RX_DECL void
+RX_DECL void
rx_release_superset (struct rx *rx,
struct rx_superset *set)
#else
-RX_DECL void
+RX_DECL void
rx_release_superset (rx, set)
struct rx *rx;
struct rx_superset *set;
@@ -2888,8 +2888,8 @@ rx_really_free_superstate (cache)
{
struct rx_distinct_future *dft = df;
df = df->next_same_super_edge[0];
-
-
+
+
if (dft->future && dft->future->transition_refs == dft)
{
dft->future->transition_refs = dft->next_same_dest;
@@ -2905,7 +2905,7 @@ rx_really_free_superstate (cache)
tc = tct;
}
}
-
+
if (it->contents->superstate == it)
it->contents->superstate = 0;
release_superset_low (cache, it->contents);
@@ -3043,10 +3043,10 @@ superset_allocator (rules, val)
}
#ifdef __STDC__
-static struct rx_hash *
+static struct rx_hash *
super_hash_allocator (struct rx_hash_rules * rules)
#else
-static struct rx_hash *
+static struct rx_hash *
super_hash_allocator (rules)
struct rx_hash_rules * rules;
#endif
@@ -3133,7 +3133,7 @@ rx_morecore (cache)
while (*pos)
pos = &(*pos)->next;
*pos = ((struct rx_blocklist *)
- malloc (size + sizeof (struct rx_blocklist)));
+ malloc (size + sizeof (struct rx_blocklist)));
if (!*pos)
return;
@@ -3145,7 +3145,7 @@ rx_morecore (cache)
}
}
-static struct rx_cache default_cache =
+static struct rx_cache default_cache =
{
{
supersetcmp,
@@ -3191,7 +3191,7 @@ static struct rx_cache default_cache =
/* This adds an element to a superstate set. These sets are lists, such
* that lists with == elements are ==. The empty set is returned by
- * superset_cons (rx, 0, 0) and is NOT equivelent to
+ * superset_cons (rx, 0, 0) and is NOT equivelent to
* (struct rx_superset)0.
*/
@@ -3247,7 +3247,7 @@ rx_superset_cons (rx, car, cdr)
#ifdef __STDC__
RX_DECL struct rx_superset *
rx_superstate_eclosure_union
- (struct rx * rx, struct rx_superset *set, struct rx_nfa_state_set *ecl)
+ (struct rx * rx, struct rx_superset *set, struct rx_nfa_state_set *ecl)
#else
RX_DECL struct rx_superset *
rx_superstate_eclosure_union (rx, set, ecl)
@@ -3304,14 +3304,14 @@ rx_superstate_eclosure_union (rx, set, ecl)
* This makes sure that a list of rx_distinct_futures contains
* a future for each possible set of side effects in the eclosure
* of a given state. This is some of the work of filling in a
- * superstate transition.
+ * superstate transition.
*/
#ifdef __STDC__
static struct rx_distinct_future *
include_futures (struct rx *rx,
struct rx_distinct_future *df, struct rx_nfa_state
- *state, struct rx_superstate *superstate)
+ *state, struct rx_superstate *superstate)
#else
static struct rx_distinct_future *
include_futures (rx, df, state, superstate)
@@ -3385,7 +3385,7 @@ include_futures (rx, df, state, superstate)
-/* This constructs a new superstate from its state set. The only
+/* This constructs a new superstate from its state set. The only
* complexity here is memory management.
*/
#ifdef __STDC__
@@ -3520,10 +3520,10 @@ rx_superstate (rx, set)
*/
#ifdef __STDC__
-static int
+static int
solve_destination (struct rx *rx, struct rx_distinct_future *df)
#else
-static int
+static int
solve_destination (rx, df)
struct rx *rx;
struct rx_distinct_future *df;
@@ -3544,7 +3544,7 @@ solve_destination (rx, df)
struct rx_nfa_edge *e;
/* Iterate over all edges of each NFA state. */
for (e = nfa_state->car->edges; e; e = e->next)
- /* If we find an edge that is labeled with
+ /* If we find an edge that is labeled with
* the characters we are solving for.....
*/
if (rx_bitset_is_subset (rx->local_cset_size,
@@ -3572,7 +3572,7 @@ solve_destination (rx, df)
}
}
}
- /* It is possible that the RX_DISTINCT_FUTURE we are working on has
+ /* It is possible that the RX_DISTINCT_FUTURE we are working on has
* the empty set of NFA states as its definition. In that case, this
* is a failure point.
*/
@@ -3617,20 +3617,20 @@ solve_destination (rx, df)
/* This takes a superstate and a character, and computes some edges
* from the superstate NFA. In particular, this computes all edges
- * that lead from SUPERSTATE given CHR. This function also
+ * that lead from SUPERSTATE given CHR. This function also
* computes the set of characters that share this edge set.
* This returns 0 on allocation error.
- * The character set and list of edges are returned through
+ * The character set and list of edges are returned through
* the paramters CSETOUT and DFOUT.
} */
#ifdef __STDC__
-static int
+static int
compute_super_edge (struct rx *rx, struct rx_distinct_future **dfout,
rx_Bitset csetout, struct rx_superstate *superstate,
- unsigned char chr)
+ unsigned char chr)
#else
-static int
+static int
compute_super_edge (rx, dfout, csetout, superstate, chr)
struct rx *rx;
struct rx_distinct_future **dfout;
@@ -3641,7 +3641,7 @@ compute_super_edge (rx, dfout, csetout, superstate, chr)
{
struct rx_superset *stateset = superstate->contents;
- /* To compute the set of characters that share edges with CHR,
+ /* To compute the set of characters that share edges with CHR,
* we start with the full character set, and subtract.
*/
rx_bitset_universe (rx->local_cset_size, csetout);
@@ -3712,7 +3712,7 @@ compute_super_edge (rx, dfout, csetout, superstate, chr)
static struct rx_super_edge *
rx_super_edge (struct rx *rx,
struct rx_superstate *super, rx_Bitset cset,
- struct rx_distinct_future *df)
+ struct rx_distinct_future *df)
#else
static struct rx_super_edge *
rx_super_edge (rx, super, cset, df)
@@ -3784,7 +3784,7 @@ install_partial_transition (super, answer, set, offset)
int end = start + 32;
RX_subset pos = 1;
struct rx_inx * transitions = super->transitions;
-
+
while (start < end)
{
if (set & pos)
@@ -3798,7 +3798,7 @@ install_partial_transition (super, answer, set, offset)
#ifdef __STDC__
RX_DECL struct rx_inx *
rx_handle_cache_miss
- (struct rx *rx, struct rx_superstate *super, unsigned char chr, void *data)
+ (struct rx *rx, struct rx_superstate *super, unsigned char chr, void *data)
#else
RX_DECL struct rx_inx *
rx_handle_cache_miss (rx, super, chr, data)
@@ -3875,7 +3875,7 @@ rx_handle_cache_miss (rx, super, chr, data)
}
else if (df->future) /* A cache miss on an edge with a future? Must be
* a semi-free destination. */
- {
+ {
if (df->future->is_semifree)
refresh_semifree_superstate (rx->cache, df->future);
return &df->future_frame;
@@ -3927,7 +3927,7 @@ __const__ char *re_error_msg[] =
-/*
+/*
* Macros used while compiling patterns.
*
* By convention, PEND points just past the end of the uncompiled pattern,
@@ -3938,7 +3938,7 @@ __const__ char *re_error_msg[] =
/*
- * Fetch the next character in the uncompiled pattern---translating it
+ * Fetch the next character in the uncompiled pattern---translating it
* if necessary. *Also cast from a signed character in the constant
* string passed to us by the user to an unsigned char that we can use
* as an array index (in, e.g., `translate').
@@ -3949,7 +3949,7 @@ __const__ char *re_error_msg[] =
c = translate[c]; \
} while (0)
-/*
+/*
* Fetch the next character in the uncompiled pattern, with no
* translation.
*/
@@ -4016,7 +4016,7 @@ typedef struct
PATFETCH (c); \
} \
} \
- }
+ }
#define CHAR_CLASS_MAX_LENGTH 6 /* Namely, `xdigit'. */
@@ -4033,7 +4033,7 @@ typedef struct
/* P points to just after a ^ in PATTERN. Return true if that ^ comes
* after an alternative or a begin-subexpression. We assume there is at
- * least one character before the ^.
+ * least one character before the ^.
*/
#ifdef __STDC__
@@ -4049,9 +4049,9 @@ at_begline_loc_p (pattern, p, syntax)
{
__const__ char *prev = p - 2;
boolean prev_prev_backslash = ((prev > pattern) && (prev[-1] == '\\'));
-
+
return
-
+
(/* After a subexpression? */
((*prev == '(') && ((syntax & RE_NO_BK_PARENS) || prev_prev_backslash))
||
@@ -4078,7 +4078,7 @@ at_endline_loc_p (p, pend, syntax)
__const__ char *next = p;
boolean next_backslash = (*next == '\\');
__const__ char *next_next = (p + 1 < pend) ? (p + 1) : 0;
-
+
return
(
/* Before a subexpression? */
@@ -4147,7 +4147,7 @@ inverse_translation (rxb, valid, cache, translate, c)
#endif
{
rx_Bitset cs
- = cache + c * rx_bitset_numb_subsets (rxb->rx.local_cset_size);
+ = cache + c * rx_bitset_numb_subsets (rxb->rx.local_cset_size);
if (!valid[c])
{
@@ -4167,7 +4167,7 @@ inverse_translation (rxb, valid, cache, translate, c)
/* More subroutine declarations and macros for regex_compile. */
-/* Returns true if REGNUM is in one of COMPILE_STACK's elements and
+/* Returns true if REGNUM is in one of COMPILE_STACK's elements and
false if it's not. */
#ifdef __STDC__
@@ -4182,8 +4182,8 @@ group_in_compile_stack (compile_stack, regnum)
{
int this_element;
- for (this_element = compile_stack.avail - 1;
- this_element >= 0;
+ for (this_element = compile_stack.avail - 1;
+ this_element >= 0;
this_element--)
if (compile_stack.stack[this_element].regnum == regnum)
return true;
@@ -4198,11 +4198,11 @@ group_in_compile_stack (compile_stack, regnum)
* starting character is in `P[-2]'. (`P[-1]' is the character `-'.)
* Then we set the translation of all bits between the starting and
* ending characters (inclusive) in the compiled pattern B.
- *
+ *
* Return an error code.
- *
+ *
* We use these short variable names so we can use the same macros as
- * `regex_compile' itself.
+ * `regex_compile' itself.
*/
#ifdef __STDC__
@@ -4247,7 +4247,7 @@ compile_range (rxb, cs, p_ptr, pend, translate, syntax, inv_tr, valid_inv_tr)
inverse_translation (rxb, valid_inv_tr, inv_tr, translate, this_char);
rx_bitset_union (rxb->rx.local_cset_size, cs, it);
}
-
+
return REG_NOERROR;
}
@@ -4383,7 +4383,7 @@ is_anchored (rexp, se)
case r_opt:
case r_star:
return is_anchored (rexp->params.pair.left, se) ? 2 : 0;
-
+
case r_side_effect:
return ((rexp->params.side_effect == se)
? 1 : 2);
@@ -4397,7 +4397,7 @@ is_anchored (rexp, se)
/* This removes register assignments that aren't required by backreferencing.
* This can speed up explore_future, especially if it eliminates
* non-determinism in the superstate NFA.
- *
+ *
* NEEDED is an array of characters, presumably filled in by FIND_BACKREFS.
* The non-zero elements of the array indicate which register assignments
* can NOT be removed from the expression.
@@ -4605,7 +4605,7 @@ static char idempotent_complex_se[] =
#define RX_WANT_SE_DEFS 1
#undef RX_DEF_SE
#undef RX_DEF_CPLX_SE
-#define RX_DEF_SE(IDEM, NAME, VALUE)
+#define RX_DEF_SE(IDEM, NAME, VALUE)
#define RX_DEF_CPLX_SE(IDEM, NAME, VALUE) IDEM,
#include "rx.h"
#undef RX_DEF_SE
@@ -4621,7 +4621,7 @@ static char idempotent_se[] =
#undef RX_DEF_SE
#undef RX_DEF_CPLX_SE
#define RX_DEF_SE(IDEM, NAME, VALUE) IDEM,
-#define RX_DEF_CPLX_SE(IDEM, NAME, VALUE)
+#define RX_DEF_CPLX_SE(IDEM, NAME, VALUE)
#include "rx.h"
#undef RX_DEF_SE
#undef RX_DEF_CPLX_SE
@@ -4654,7 +4654,7 @@ has_any_se (rx, rexp)
case r_side_effect:
return 1;
-
+
case r_2phase_star:
case r_concat:
case r_alternate:
@@ -4702,7 +4702,7 @@ has_non_idempotent_epsilon_path (rx, rexp, params)
!((long)rexp->params.side_effect > 0
? idempotent_complex_se [ params [(long)rexp->params.side_effect].se ]
: idempotent_se [-(long)rexp->params.side_effect]);
-
+
case r_alternate:
return
( has_non_idempotent_epsilon_path (rx,
@@ -4729,7 +4729,7 @@ has_non_idempotent_epsilon_path (rx, rexp, params)
-/* This computes rougly what it's name suggests. It can (and does) go wrong
+/* This computes rougly what it's name suggests. It can (and does) go wrong
* in the direction of returning spurious 0 without causing disasters.
*/
#ifdef __STDC__
@@ -4753,7 +4753,7 @@ begins_with_complex_se (rx, rexp)
case r_side_effect:
return ((long)rexp->params.side_effect >= 0);
-
+
case r_alternate:
return
( begins_with_complex_se (rx, rexp->params.pair.left)
@@ -4773,11 +4773,11 @@ begins_with_complex_se (rx, rexp)
}
-/* This destructively removes some of the re_se_tv side effects from
+/* This destructively removes some of the re_se_tv side effects from
* a rexp tree. In particular, during parsing re_se_tv was inserted on the
- * right half of every | to guarantee that posix path preference could be
- * honored. This function removes some which it can be determined aren't
- * needed.
+ * right half of every | to guarantee that posix path preference could be
+ * honored. This function removes some which it can be determined aren't
+ * needed.
*/
#ifdef __STDC__
@@ -4819,7 +4819,7 @@ speed_up_alt (rx, rexp, unposix)
speed_up_alt (rx, rexp->params.pair.left, unposix);
speed_up_alt (rx, rexp->params.pair.right->params.pair.right, unposix);
-
+
if ( unposix
|| (begins_with_complex_se
(rx, rexp->params.pair.right->params.pair.right))
@@ -4852,7 +4852,7 @@ speed_up_alt (rx, rexp, unposix)
`fastmap_accurate' is set to zero;
`re_nsub' is set to the number of groups in PATTERN;
`not_bol' and `not_eol' are set to zero.
-
+
The `fastmap' and `newline_anchor' fields are neither
examined nor set. */
@@ -4862,7 +4862,7 @@ speed_up_alt (rx, rexp, unposix)
RX_DECL reg_errcode_t
rx_compile (__const__ char *pattern, int size,
reg_syntax_t syntax,
- struct re_pattern_buffer * rxb)
+ struct re_pattern_buffer * rxb)
#else
RX_DECL reg_errcode_t
rx_compile (pattern, size, syntax, rxb)
@@ -4881,17 +4881,17 @@ rx_compile (pattern, size, syntax, rxb)
`char *' (i.e., signed), we declare these variables as unsigned, so
they can be reliably used as array indices. */
register unsigned char c, c1;
-
+
/* A random tempory spot in PATTERN. */
__const__ char *p1;
-
+
/* Keeps track of unclosed groups. */
compile_stack_type compile_stack;
/* Points to the current (ending) position in the pattern. */
__const__ char *p = pattern;
__const__ char *pend = pattern + size;
-
+
/* How to translate the characters in the pattern. */
unsigned char *translate = (rxb->translate
? rxb->translate
@@ -4900,7 +4900,7 @@ rx_compile (pattern, size, syntax, rxb)
/* When parsing is done, this will hold the expression tree. */
struct rexp_node * rexp = 0;
- /* In the midst of compilation, this holds onto the regexp
+ /* In the midst of compilation, this holds onto the regexp
* first parst while rexp goes on to aquire additional constructs.
*/
struct rexp_node * orig_rexp = 0;
@@ -4909,7 +4909,7 @@ rx_compile (pattern, size, syntax, rxb)
/* This and top_expression are saved on the compile stack. */
struct rexp_node ** top_expression = &rexp;
struct rexp_node ** last_expression = top_expression;
-
+
/* Parameter to `goto append_node' */
struct rexp_node * append;
@@ -4919,7 +4919,7 @@ rx_compile (pattern, size, syntax, rxb)
regnum_t regnum = 0;
/* Place in the uncompiled pattern (i.e., the {) to
- * which to go back if the interval is invalid.
+ * which to go back if the interval is invalid.
*/
__const__ char *beg_interval;
@@ -4947,8 +4947,8 @@ rx_compile (pattern, size, syntax, rxb)
rxb->fastmap_accurate = 0;
rxb->not_bol = rxb->not_eol = 0;
rxb->least_subs = 0;
-
- /* Always count groups, whether or not rxb->no_sub is set.
+
+ /* Always count groups, whether or not rxb->no_sub is set.
* The whole pattern is implicitly group 0, so counting begins
* with 1.
*/
@@ -4991,7 +4991,7 @@ rx_compile (pattern, size, syntax, rxb)
case '$':
{
if ( /* If at end of pattern, it's an operator. */
- p == pend
+ p == pend
/* If context independent, it's an operator. */
|| syntax & RE_CONTEXT_INDEP_ANCHORS
/* Otherwise, depends on what's next. */
@@ -5158,7 +5158,7 @@ rx_compile (pattern, size, syntax, rxb)
goto add_side_effect;
}
}
- /* The old regex.c used to optimize `.*\n'.
+ /* The old regex.c used to optimize `.*\n'.
* Maybe rx should too?
*/
}
@@ -5191,36 +5191,36 @@ rx_compile (pattern, size, syntax, rxb)
rx_Bitset cs = rx_cset (&rxb->rx);
struct rexp_node * node = rx_mk_r_cset (&rxb->rx, cs);
int is_inverted = *p == '^';
-
+
if (!(node && cs))
return REG_ESPACE;
-
+
/* This branch of the switch is normally exited with
*`goto append_node'
*/
append = node;
-
+
if (is_inverted)
p++;
-
+
/* Remember the first position in the bracket expression. */
p1 = p;
-
+
/* Read in characters and ranges, setting map bits. */
for (;;)
{
if (p == pend) return REG_EBRACK;
-
+
PATFETCH (c);
-
+
/* \ might escape characters inside [...] and [^...]. */
if ((syntax & RE_BACKSLASH_ESCAPE_IN_LISTS) && c == '\\')
{
if (p == pend) return REG_EESCAPE;
-
+
PATFETCH (c1);
{
- rx_Bitset it = inverse_translation (rxb,
+ rx_Bitset it = inverse_translation (rxb,
validate_inv_tr,
inverse_translate,
translate,
@@ -5229,24 +5229,24 @@ rx_compile (pattern, size, syntax, rxb)
}
continue;
}
-
+
/* Could be the end of the bracket expression. If it's
not (i.e., when the bracket expression is `[]' so
far), the ']' character bit gets set way below. */
if (c == ']' && p != p1 + 1)
goto finalize_class_and_append;
-
+
/* Look ahead to see if it's a range when the last thing
was a character class. */
if (had_char_class && c == '-' && *p != ']')
return REG_ERANGE;
-
+
/* Look ahead to see if it's a range when the last thing
was a character: if this is a hyphen not at the
beginning or the end of a list, then it's the range
operator. */
- if (c == '-'
- && !(p - 2 >= pattern && p[-2] == '[')
+ if (c == '-'
+ && !(p - 2 >= pattern && p[-2] == '[')
&& !(p - 3 >= pattern && p[-3] == '[' && p[-2] == '^')
&& *p != ']')
{
@@ -5255,33 +5255,33 @@ rx_compile (pattern, size, syntax, rxb)
inverse_translate, validate_inv_tr);
if (ret != REG_NOERROR) return ret;
}
-
+
else if (p[0] == '-' && p[1] != ']')
{ /* This handles ranges made up of characters only. */
reg_errcode_t ret;
-
+
/* Move past the `-'. */
PATFETCH (c1);
-
+
ret = compile_range (rxb, cs, &p, pend, translate, syntax,
inverse_translate, validate_inv_tr);
if (ret != REG_NOERROR) return ret;
}
-
+
/* See if we're at the beginning of a possible character
class. */
-
+
else if ((syntax & RE_CHAR_CLASSES)
&& (c == '[') && (*p == ':'))
{
char str[CHAR_CLASS_MAX_LENGTH + 1];
-
+
PATFETCH (c);
c1 = 0;
-
+
/* If pattern is `[[:'. */
if (p == pend) return REG_EBRACK;
-
+
for (;;)
{
PATFETCH (c);
@@ -5291,9 +5291,9 @@ rx_compile (pattern, size, syntax, rxb)
str[c1++] = c;
}
str[c1] = '\0';
-
+
/* If isn't a word bracketed by `[:' and:`]':
- undo the ending character, the letters, and leave
+ undo the ending character, the letters, and leave
the leading `:' and `[' (but set bits for them). */
if (c == ':' && *p == ']')
{
@@ -5310,15 +5310,15 @@ rx_compile (pattern, size, syntax, rxb)
boolean is_space = !strcmp (str, "space");
boolean is_upper = !strcmp (str, "upper");
boolean is_xdigit = !strcmp (str, "xdigit");
-
+
if (!IS_CHAR_CLASS (str)) return REG_ECTYPE;
-
+
/* Throw away the ] at the end of the character
class. */
- PATFETCH (c);
-
+ PATFETCH (c);
+
if (p == pend) return REG_EBRACK;
-
+
for (ch = 0; ch < 1 << CHARBITS; ch++)
{
if ( (is_alnum && isalnum (ch))
@@ -5335,7 +5335,7 @@ rx_compile (pattern, size, syntax, rxb)
|| (is_xdigit && isxdigit (ch)))
{
rx_Bitset it =
- inverse_translation (rxb,
+ inverse_translation (rxb,
validate_inv_tr,
inverse_translate,
translate,
@@ -5349,11 +5349,11 @@ rx_compile (pattern, size, syntax, rxb)
else
{
c1++;
- while (c1--)
+ while (c1--)
PATUNFETCH;
{
rx_Bitset it =
- inverse_translation (rxb,
+ inverse_translation (rxb,
validate_inv_tr,
inverse_translate,
translate,
@@ -5363,7 +5363,7 @@ rx_compile (pattern, size, syntax, rxb)
}
{
rx_Bitset it =
- inverse_translation (rxb,
+ inverse_translation (rxb,
validate_inv_tr,
inverse_translate,
translate,
@@ -5378,7 +5378,7 @@ rx_compile (pattern, size, syntax, rxb)
{
had_char_class = false;
{
- rx_Bitset it = inverse_translation (rxb,
+ rx_Bitset it = inverse_translation (rxb,
validate_inv_tr,
inverse_translate,
translate,
@@ -5453,7 +5453,7 @@ rx_compile (pattern, size, syntax, rxb)
rxb->re_nsub++;
regnum++;
if (COMPILE_STACK_FULL)
- {
+ {
((compile_stack.stack) =
(compile_stack_elt_t *) realloc (compile_stack.stack, ( compile_stack.size << 1) * sizeof (
compile_stack_elt_t)));
@@ -5474,14 +5474,14 @@ rx_compile (pattern, size, syntax, rxb)
/*
* These are the values to restore when we hit end of this
- * group.
+ * group.
*/
COMPILE_STACK_TOP.top_expression = top_expression;
COMPILE_STACK_TOP.last_expression = last_expression;
COMPILE_STACK_TOP.regnum = regnum;
-
+
compile_stack.avail++;
-
+
top_expression = last_expression;
break;
@@ -5595,10 +5595,10 @@ rx_compile (pattern, size, syntax, rxb)
break;
- case '{':
+ case '{':
/* If \{ is a literal. */
if (!(syntax & RE_INTERVALS)
- /* If we're at `\{' and it's not the open-interval
+ /* If we're at `\{' and it's not the open-interval
operator. */
|| ((syntax & RE_INTERVALS) && (syntax & RE_NO_BK_BRACES))
|| (p - 2 == pattern && p == pend))
@@ -5637,11 +5637,11 @@ rx_compile (pattern, size, syntax, rxb)
{
if (syntax & RE_NO_BK_BRACES)
goto unfetch_interval;
- else
+ else
return REG_BADBR;
}
- if (!(syntax & RE_NO_BK_BRACES))
+ if (!(syntax & RE_NO_BK_BRACES))
{
if (c != '\\') return REG_EBRACE;
PATFETCH (c);
@@ -5651,7 +5651,7 @@ rx_compile (pattern, size, syntax, rxb)
{
if (syntax & RE_NO_BK_BRACES)
goto unfetch_interval;
- else
+ else
return REG_BADBR;
}
@@ -5747,7 +5747,7 @@ rx_compile (pattern, size, syntax, rxb)
beg_interval = NULL;
/* normal_char and normal_backslash need `c'. */
- PATFETCH (c);
+ PATFETCH (c);
if (!(syntax & RE_NO_BK_BRACES))
{
@@ -5780,7 +5780,7 @@ rx_compile (pattern, size, syntax, rxb)
char code = syntax_spec_code (c);
for (x = 0; x < 256; ++x)
{
-
+
if (SYNTAX (x) & code)
{
rx_Bitset it =
@@ -5819,7 +5819,7 @@ rx_compile (pattern, size, syntax, rxb)
/* With a little extra work, some of these side effects could be optimized
* away (basicly by looking at what we already know about the surrounding
- * chars).
+ * chars).
*/
case '<':
side = (rx_side_effect)re_se_wordbeg;
@@ -5845,7 +5845,7 @@ rx_compile (pattern, size, syntax, rxb)
side = (rx_side_effect)re_se_begbuf;
goto add_side_effect;
break;
-
+
case '\'':
side = (rx_side_effect)re_se_endbuf;
goto add_side_effect;
@@ -5945,7 +5945,7 @@ rx_compile (pattern, size, syntax, rxb)
} /* switch (c) */
} /* while p != pend */
-
+
{
int win_se = paramc;
params = (params
@@ -5972,7 +5972,7 @@ rx_compile (pattern, size, syntax, rxb)
/* Through the pattern now. */
- if (!COMPILE_STACK_EMPTY)
+ if (!COMPILE_STACK_EMPTY)
return REG_EPAREN;
free (compile_stack.stack);
@@ -6023,11 +6023,11 @@ rx_compile (pattern, size, syntax, rxb)
}
}
- /* At least one more optimization would be nice to have here but i ran out
- * of time. The idea would be to delay side effects.
+ /* At least one more optimization would be nice to have here but i ran out
+ * of time. The idea would be to delay side effects.
* For examle, `(abc)' is the same thing as `abc()' except that the
* left paren is offset by 3 (which we know at compile time).
- * (In this comment, write that second pattern `abc(:3:)'
+ * (In this comment, write that second pattern `abc(:3:)'
* where `(:3:' is a syntactic unit.)
*
* Trickier: `(abc|defg)' is the same as `(abc(:3:|defg(:4:))'
@@ -6041,7 +6041,7 @@ rx_compile (pattern, size, syntax, rxb)
/* What we compile is different than what the parser returns.
* Suppose the parser returns expression R.
- * Let R' be R with unnecessary register assignments removed
+ * Let R' be R with unnecessary register assignments removed
* (see REMOVE_UNECESSARY_SIDE_EFFECTS, above).
*
* What we will compile is the expression:
@@ -6049,8 +6049,8 @@ rx_compile (pattern, size, syntax, rxb)
* m{try}R{win}\|s{try}R'{win}
*
* {try} and {win} denote side effect epsilons (see EXPLORE_FUTURE).
- *
- * When trying a match, we insert an `m' at the beginning of the
+ *
+ * When trying a match, we insert an `m' at the beginning of the
* string if the user wants registers to be filled, `s' if not.
*/
new_rexp =
@@ -6105,7 +6105,7 @@ rx_compile (pattern, size, syntax, rxb)
else
{
rx_delete_epsilon_transitions (&rxb->rx);
-
+
/* For compatability reasons, we need to shove the
* compiled nfa into one chunk of malloced memory.
*/
@@ -6136,7 +6136,7 @@ rx_compile (pattern, size, syntax, rxb)
rx_bitset_null (rxb->rx.local_cset_size, rxb->fastset);