#! /bin/sh # # This is patch #5 to gawk 3.0. cd to gawk-3.0.4 and sh this file. # Then remove all the .orig files and rename the directory gawk-3.0.5. # Changes to files that are automatically recreated have been omitted. # They will be recreated the first time you run make. # This includes all the extracted example files in awklib. # first, slight rearranging rm -f README_d/README.irix config.guess config.sub # Now, apply the patch patch -p1 << \EOF diff -cNr gawk-3.0.4/ChangeLog gawk-3.0.5/ChangeLog *** gawk-3.0.4/ChangeLog Wed Jun 30 16:15:06 1999 --- gawk-3.0.5/ChangeLog Sun Jun 25 15:09:02 2000 *************** *** 1,3 **** --- 1,238 ---- + Sun Jun 25 15:08:19 2000 Arnold D. Robbins + + * Release 3.0.5: Release tar file made. + + Wed Jun 14 13:03:45 2000 Arnold D. Robbins + + * field.c (set_record): manage a private buffer for $0. + Keeps things safe in case `getline var' rearranges the + IOBUF's contents that $0 is still pointing into. + + Tue Jun 13 16:27:55 2000 Paul Eggert + + Upgrade to latest and greatest version of largefile code. + + * configure.in (AC_CANONICAL_HOST): Remove. + (GAWK_AC_SYS_LARGEFILE): Defer until after AC_MINIX, + to avoid autoconf warnings. + + Rewrite largefile configuration so that we don't need to run + getconf and don't need AC_CANONICAL_HOST. + * config.guess, config.sub: Remove these files. + * Makefile.in (MISC): Remove config.guess, config.sub. + * m4/largefile.m4 (GAWK_AC_SYS_LARGEFILE_FLAGS, + GAWK_AC_SYS_LARGEFILE_SPACE_APPEND): Remove. + (GAWK_AC_SYS_LARGEFILE_TEST_INCLUDES): New macro. + (GAWK_AC_SYS_LARGEFILE_MACRO_VALUE): Change arguments from + CODE-TO-SET-DEFAULT to VALUE, INCLUDES, FUNCTION-BODY. + All uses changed. + Instead of inspecting the output of getconf, try to compile the + test program without and with the macro definition. + (GAWK_AC_SYS_LARGEFILE): Do not require AC_CANONICAL_HOST or check + for getconf. Instead, check for the needed flags by compiling + test programs. + + (GAWK_AC_SYS_LARGEFILE): Define _XOPEN_SOURCE to be 500 to + work around glibc 2.1.3 bug. + + (GAWK_AC_SYS_LARGEFILE_FLAGS): Don't use -n32 on IRIX if the + installer said otherwise. + + (GAWK_AC_SYS_LARGEFILE_FLAGS): Work around a bug in the QNX shell, + which doesn't propagate exit status of failed commands inside + shell assignments. + + Wed Jun 7 13:23:09 2000 Arnold D. Robbins + + * Updated copyright dates in appropriate files. + + Mon May 22 17:29:43 2000 Arnold D. Robbins + + * Makefile.in (clean): get `*/core' too. + + Sun May 7 16:33:05 2000 Arnold D. Robbins + + * array.c (concat_exp): Change ref to `lnode->stlen' and + `lnode->stptr' for SUBSEP to use `var_value->...'. + + Tue May 2 09:54:29 2000 Arnold D. Robbins + + Fix referencing freed memory as shown by test/arynocls.* tests. + * awk.h [Node_array_ref]: new node type. + [orig_array]: new macro element in NODE structure. + * field.c (do_split): handle case for Node_array_ref, fetch + the original array. + * array.c (in_array, do_delete): ditto. + * eval.c (nodetypes[]): add Node_array_ref string. + (r_tree_eval): handle case for Node_array_ref. + (push_args): push arrays as Node_array_ref, and pass them on. + (pop_fcall): don't unref lnode if it's an array when releasing + local arguments. Check for both Node_array and Node_array_ref. + (r_get_lhs): choke on Node_array_ref as for Node_array. + For Node_subscript, handle Node_array_ref. + + Tue May 2 09:52:12 2000 Bruno Haible + + * io.c (redirect): After reopening a `struct redirect', move it to + the head of the list. + + Sun Apr 2 17:51:40 2000 Arnold D. Robbins + + * re.c (re_update): Check if IGNORECASE has changed, and + if so recompute the re. See test/igncdym.awk. + + Mon Mar 20 16:18:34 2000 Arnold D. Robbins + + * io.c (set_RS): Added a lint warning about multicharacter RS, + per suggestion from Akim DeMaille (akim@epita.fr). + + Sun Feb 13 14:40:32 2000 Arnold D. Robbins + + * eval.c (push_args): Fix from Nide Naoyuki , + re-assign `f' in case tree_eval moved fcall_list around. + + Sun Feb 6 11:39:33 2000 Arnold D. Robbins + + * eval.c (op_assign): Fix it right. For ++ and --, get the lhs + in the operations, do the op, and then return. For += etc, + get the rhs FIRST, since the lhs can move around as a result, + *then* get the lhs and do the operation. See test/opasnidx.awk. + + Tue Feb 1 18:41:40 2000 Arnold D. Robbins + + * eval.c (op_assign): reget the rval after regetting + the left hand side. See test/opasnslf.awk for why. + + Thu Jan 27 18:06:31 2000 Arnold D. Robbins + + * awk.y (yylex): Made ']' not one of the characters + that sets `want_assign' to false. `a[i] /= 2' was + broken. Per bug report from Kristofer T. Karas + . + + Wed Dec 22 15:06:37 1999 Arnold D. Robbins + + * awk.y: Removed declarations of functions before + definition of `tokentab[]'. They're redundant with + what's in awk.h. + + Thu Dec 9 17:01:07 1999 Arnold D. Robbins + + * node.c (parse_escape): Add lint warning for unrecognized + escape sequences. + + Mon Dec 6 15:17:34 1999 Arnold D. Robbins + + * main.c (usage): Changed bug reporting email addresses to + be a reference to `Bugs' node in the online and printed + doc, instead. + + Thu Dec 2 13:08:18 1999 Arnold D. Robbins + + * builtin.c (do_compl): test `d' for negative inside the do_lint + test, not uval. Ooops. + + Fri Nov 26 10:58:36 1999 Arnold D. Robbins + + * array.c (assoc_find): ALWAYS compare indexes as strings, + don't use cmp_nodes in case they are numeric. Oh my. + Talk about a Day 1 bug! + + Tue Nov 23 11:58:53 1999 Arnold D. Robbins + + * regex.c (SYNTAX): cast argument to `unsigned char' instead of + &-ing with 0xFF. Hopefully somewhat more portable, ala 21 Nov 99 + changes to awk.y. + + Sun Nov 21 22:25:27 1999 Paul Eggert + + * aclocal.m4 (AC_SYS_LARGEFILE_FLAGS): Work around a + problem with the QNX 4.25 shell, which doesn't propagate exit + status of failed commands inside shell assignments. + + Sun Nov 21 20:33:35 1999 Arnold D. Robbins + + * awk.h (nextc): remove declaration, don't need it here. + awk.y (nextc): Cast values to unsigned char so that latin-1 + characters in strings don't turn themselves into EOF. + Most notably y-umlaut, which is decimal 255. + + Mon Nov 1 20:00:25 1999 Arnold D. Robbins + + * regex.c (init_syntax_once): move below definition of + ISALNUM etc., then use ISALNUM to init the table, so that + the word ops will work if i18n'ed. + (SYNTAX): And subscript with 0xFF for Latin-1 characters. + + Mon Oct 25 18:37:13 1999 Arnold D. Robbins + + * awk.h, main.c, io.c: undo previous changes (22 Oct 1999). + * main.c (main): move call to `init_fields()' to before + arg parsing. This allows `-v NF=blah' to work ok. + + Fri Oct 22 17:43:40 1999 Arnold D. Robbins + + * main.c (arg_assign): Add new arg, `initing' for icky special + casing of -v of special variables. Use it to check for NF. + May need to add other cases later. + (pre_assign): change call arg_assign, passing initing=TRUE; + io.c (nextfile): change call arg_assign, passing initing=FALSE; + awk.h: Change prototype for arg_assign. + + Tue Oct 19 16:06:48 1999 Paul Eggert + + * io.c (close_redir): Don't munge errno between setting it and + using it. + + Wed Oct 6 17:47:47 1999 Arnold D. Robbins + + * main.c (arg_assign): return NULL on bad variable. Allows + things like `./3x=stuff' to work as a filename. + + Thu Sep 23 21:35:46 1999 Paul Eggert + + * aclocal.m4 (GAWK_AC_SYS_LARGEFILE_FLAGS): Work around GCC + 2.95.1 bug in HP-UX 10.20 or later. (Had to fix the fix. ADR. :-) + + Tue Sep 21 13:31:36 1999 Arnold D. Robbins + + * builtin.c (format_tree): For '0', only set zero_flag if we + haven't seen the field width or precision yet. + + Mon Aug 9 13:06:01 1999 Arnold D. Robbins + + * array.c (assoc_lookup): Removed code that gave each array + a private copy of each index. Balloons memory usage for + no good reason that I can see. Just use dupnode in all + cases. + * configure.in: check for $srcdir/.developing adds extra + defines for my testing/debugging use. Yes, hack alert. + + Sun Aug 1 11:02:02 1999 Arnold D. Robbins + + * node.c (dupnode): turn off FIELD when copying nodes. + * array.c (do_adump, assoc_dump): new functions for array debugging. + * awk.y (tokentab): conditionally add "adump" function for debugging. + * awk.h: delcare new functions. + + Thu Jul 29 23:26:40 1999 Arnold D. Robbins + + From wsanchez@apple.com: + * Makefile.in (install-strip): new target, coding stds. compatibility. + * config.guess, config.sub: Add MacOS X recognition. + + Thu Jul 29 19:09:19 1999 Arnold D. Robbins + + * awk.y (func_install): make `function foo(foo)' a fatal error. + eval.c (r_tree_eval): diagnose use of a function name as a + variable inside the function. + + Sun Jul 4 16:53:14 1999 Arnold D. Robbins + + * eval.c (eval_condition): add extra braces to avoid + gcc warning. I'm not going to bother for the library + code like dfa and regex. + Wed Jun 30 16:14:36 1999 Arnold D. Robbins * Release 3.0.4: Release tar file made. This time for sure. *************** *** 103,109 **** Sun Apr 25 13:39:16 1999 Arnold D. Robbins * Makefile.in (gawk): add $(CFLAGS) to linking step. ! * configure.in: correctly do AC_FUNC_GETPRGP on HP systems too. Tue Apr 13 20:21:00 1999 Arnold D. Robbins --- 338,344 ---- Sun Apr 25 13:39:16 1999 Arnold D. Robbins * Makefile.in (gawk): add $(CFLAGS) to linking step. ! * configure.in: correctly do AC_FUNC_GETPGRP on HP systems too. Tue Apr 13 20:21:00 1999 Arnold D. Robbins *************** *** 149,155 **** Wed Oct 28 20:40:17 1998 Arnold D. Robbins ! * eval.c (r_tree_eval): Case for Node_concat. Get lengthes separately, in case one expression has a side effect that that changes another. Ugly, but it keeps gawk from core dumping. See test/nasty.awk. --- 384,390 ---- Wed Oct 28 20:40:17 1998 Arnold D. Robbins ! * eval.c (r_tree_eval): Case for Node_concat. Get lengths separately, in case one expression has a side effect that that changes another. Ugly, but it keeps gawk from core dumping. See test/nasty.awk. *************** *** 418,424 **** * awk.h: Add decls of new routines do_compl() and set_loc(). * awk.y (tokentab): add entry for "compl" function. ! * builtin.c (do_compl): new functionto do ones complement. (do_substr): rationalized yet again, now notices negative start and length parameters. * eval.c (push_args): fix if call_list gets realloc'ed in the --- 653,659 ---- * awk.h: Add decls of new routines do_compl() and set_loc(). * awk.y (tokentab): add entry for "compl" function. ! * builtin.c (do_compl): new function to do ones complement. (do_substr): rationalized yet again, now notices negative start and length parameters. * eval.c (push_args): fix if call_list gets realloc'ed in the *************** *** 517,523 **** Fri Feb 14 09:47:31 1997 Arnold D. Robbins ! * io.c [#include "awk.h"]: undef HAVE_MMAP to just use thoe old code. Something is causing a file descriptor leak, and this is getting to be just too much hair. I reserve the right to rip out the mmap code entirely at a future date. --- 752,758 ---- Fri Feb 14 09:47:31 1997 Arnold D. Robbins ! * io.c [#include "awk.h"]: undef HAVE_MMAP to just use the old code. Something is causing a file descriptor leak, and this is getting to be just too much hair. I reserve the right to rip out the mmap code entirely at a future date. *************** *** 616,622 **** * configure.in [AC_PREREQ]: Update to 2.12 in order to switch to autoconf 2.12. Lots of other files will be rebuilt automatically. [AM_SANITY_CHECK_CC]: Removed, autoconf does it now. ! * alocal.m4 [AM_SANITY_CHECK_CC]: Removed, autoconf does it now. Tue Dec 17 22:23:16 1996 Arnold D. Robbins --- 851,857 ---- * configure.in [AC_PREREQ]: Update to 2.12 in order to switch to autoconf 2.12. Lots of other files will be rebuilt automatically. [AM_SANITY_CHECK_CC]: Removed, autoconf does it now. ! * aclocal.m4 [AM_SANITY_CHECK_CC]: Removed, autoconf does it now. Tue Dec 17 22:23:16 1996 Arnold D. Robbins *************** *** 808,814 **** Fri Sep 20 11:54:31 1996 Arnold D. Robbins * builtin.c (do_print): evaluate all the expressions first and ! then print them. Avoids suprising behavior. See test/prtoeval.awk for an example. Tue Sep 10 06:21:40 1996 Arnold D. Robbins --- 1043,1049 ---- Fri Sep 20 11:54:31 1996 Arnold D. Robbins * builtin.c (do_print): evaluate all the expressions first and ! then print them. Avoids surprising behavior. See test/prtoeval.awk for an example. Tue Sep 10 06:21:40 1996 Arnold D. Robbins *************** *** 976,982 **** Wed May 15 02:34:55 1996 Arnold D. Robbins * Makefile.in (awklib/all): now depends on gawk, fixes problem ! with parrallel make. Tue May 14 15:02:52 1996 Arnold D. Robbins --- 1211,1217 ---- Wed May 15 02:34:55 1996 Arnold D. Robbins * Makefile.in (awklib/all): now depends on gawk, fixes problem ! with parallel make. Tue May 14 15:02:52 1996 Arnold D. Robbins *************** *** 1027,1033 **** * field.c (set_NF): If NF is decremented, clear fields between NF and parse_high_water, otherwise if NF incremented, clear fields between parse_high_water and NF. ! * eval.c (nodetype2str): new function, used for diganostics. eval.c (interpret): use nodetype2str when finding invalid node. Mon Mar 4 09:02:28 1996 Arnold D. Robbins --- 1262,1268 ---- * field.c (set_NF): If NF is decremented, clear fields between NF and parse_high_water, otherwise if NF incremented, clear fields between parse_high_water and NF. ! * eval.c (nodetype2str): new function, used for diagnostics. eval.c (interpret): use nodetype2str when finding invalid node. Mon Mar 4 09:02:28 1996 Arnold D. Robbins *************** *** 1066,1072 **** Sun Jan 28 07:00:56 1996 Arnold D. Robbins * builtin.c (do_substr): rationalized handling of missing length ! argument, as well as various accompagnying lint warnings. Previous code was slightly bogus. Talk about your Day 1 bugs. Thu Jan 25 14:09:11 1996 Arnold D. Robbins --- 1301,1307 ---- Sun Jan 28 07:00:56 1996 Arnold D. Robbins * builtin.c (do_substr): rationalized handling of missing length ! argument, as well as various accompanying lint warnings. Previous code was slightly bogus. Talk about your Day 1 bugs. Thu Jan 25 14:09:11 1996 Arnold D. Robbins diff -cNr gawk-3.0.4/Makefile.in gawk-3.0.5/Makefile.in *** gawk-3.0.4/Makefile.in Wed Jun 9 11:36:30 1999 --- gawk-3.0.5/Makefile.in Sun Jun 18 15:14:08 2000 *************** *** 1,6 **** # Makefile for GNU Awk. # ! # Copyright (C) 1986, 1988-1999 the Free Software Foundation, Inc. # # This file is part of GAWK, the GNU implementation of the # AWK Programming Language. --- 1,6 ---- # Makefile for GNU Awk. # ! # Copyright (C) 1986, 1988-2000 the Free Software Foundation, Inc. # # This file is part of GAWK, the GNU implementation of the # AWK Programming Language. *************** *** 97,103 **** MISC = NEWS COPYING FUTURES Makefile.in PROBLEMS README PORTS POSIX.STD \ configure configure.in acconfig.h configh.in ACKNOWLEDGMENT \ ChangeLog INSTALL LIMITATIONS install-sh mkinstalldirs aclocal.m4 \ ! stamp-h.in config.sub config.guess OTHERS= doc pc atari vms README_d posix awklib --- 97,103 ---- MISC = NEWS COPYING FUTURES Makefile.in PROBLEMS README PORTS POSIX.STD \ configure configure.in acconfig.h configh.in ACKNOWLEDGMENT \ ChangeLog INSTALL LIMITATIONS install-sh mkinstalldirs aclocal.m4 \ ! stamp-h.in OTHERS= doc pc atari vms README_d posix awklib *************** *** 190,195 **** --- 190,198 ---- $(srcdir)/mkinstalldirs $(bindir) $(datadir) \ $(libdir) $(infodir) $(mandir) $(libexecdir) + install-strip: + $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install + uninstall: (cd $(bindir); \ if [ -f awk ] && cmp awk gawk > /dev/null; then rm -f awk; fi) *************** *** 213,219 **** : use "make clean" to really clean things out clean: ! rm -rf gawk *.o core y.output cd doc && $(MAKE) clean cd test && $(MAKE) clean cd awklib && $(MAKE) clean --- 216,222 ---- : use "make clean" to really clean things out clean: ! rm -rf gawk *.o core */core y.output cd doc && $(MAKE) clean cd test && $(MAKE) clean cd awklib && $(MAKE) clean diff -cNr gawk-3.0.4/NEWS gawk-3.0.5/NEWS *** gawk-3.0.4/NEWS Wed Jun 9 11:40:24 1999 --- gawk-3.0.5/NEWS Tue May 2 10:12:39 2000 *************** *** 1,3 **** --- 1,51 ---- + Changes from 3.0.4 to 3.0.5 + --------------------------- + + This is a bug fix release only, pending further development on 3.1.0. + + Bugs Fixed: + + 1. `function foo(foo)' is now a fatal error. + + 2. Array indexing is now much more efficient: where possible, only one + copy of an index string is kept, even if used in multiple arrays. + + 3. Support was added for MacOS X and an `install-strip' target. + + 4. [s]printf formatting for `0' flag and floating point formats now + works correctly. + + 5. HP-UX large file support with GCC 2.95.1 now works. + + 6. Arguments that contain `=' but that aren't syntactically valid are + now treated as filenames, instead of as fatal errors. + + 7. `-v NF=foo' now works. + + 8. Non-ascii alphanumeric characters are now treated as such in the + right locales by regex.c. Similarly, a Latin-1 y-umlaut (decimal + value 255) in the program text no longer acts like EOF. + + 9. Array indexes are always compared as strings; fixes an obscure bug + when user input gets used for the `x in array' test. + + 10. The usage message now points users to the documentation for how + to report bugs. + + 11. `/=' now works after an array. + + 12. `b += b += 1' now works correctly. + + 13. IGNORECASE changing with calls match() now works better. (Fix for + semi-obscure bug.) + + 14. Multicharacter values for RS now generate a lint warning. + + 15. The gawk open file caching is now much more efficient. + + 16. Global arrays passed to functions are now managed better. In particular, + test/arynocls.awk won't crash referencing freed memory. + Changes from 3.0.3 to 3.0.4 --------------------------- diff -cNr gawk-3.0.4/PORTS gawk-3.0.5/PORTS *** gawk-3.0.4/PORTS Sun Jun 27 13:33:27 1999 --- gawk-3.0.5/PORTS Tue Jun 20 14:00:16 2000 *************** *** 1,27 **** ! Gawk 3.0.4 has been successfully compiled and run "make test" on the following: ! Linux 2.2.5 gcc 2.7.2.3 ! Linux 2.0.33 gcc 2.7.2.1 ! IRIX64 6.4 gcc 2.8.1 ! IRIX 5.3 gcc 2.7.2.2 ! UNIX_SV maxion OS 4.2MP gcc 2.7.2 ! IRIX 6.2 gcc 2.7.2.2 ! CYGWIN_95-4.0 20.1 (0.3/1/1) egcs-2.91.66 (has minor problems due to env.) ! The builds of gawk-3.0.45, and validation and installation, were ! successful on these systems: ! ! DEC Alpha OSF/1 3.2 HP 9000/735 HP-UX 10.01 IBM PowerPC AIX 4.2 ! Intel Pentium II MMX GNU/Linux 2.0.35 NeXT Turbostation Mach 3.3 ! SGI Indigo/2 IRIX 5.3 ! SGI O2 R10000-SC IRIX 6.3 Sun SPARC Solaris 2.6 ! On ! SGI Origin 200 IRIX 6.4 ! a build with gcc-2.8.1 succeeded, but several tests failed; a rebuild ! with c89 fixed the problem. --- 1,29 ---- ! Gawk 3.0.5 has been successfully compiled and run "make test" on the following: ! Linux 2.2.14 gcc 2.95.2 ! Linux 2.2.13-SMP egcs-2.91.66 make test -j5 ! IRIX64 6.5 gcc 2.8.1 ! IRIX 5.3 gcc 2.7.2.2 ! SunOS 5.3 gcc 2.5.8 ! Linux 2.0.33 gcc 2.7.2.1 ! IRIX64 6.5 gcc 2.95.1 ! Apple Macintosh PPC G3 Rhapsody 5.5 ! DEC Alpha OSF/1 4.0F ! DEC Alpha Linux HP 9000/735 HP-UX 10.01 + HP PA 1.1 HP-UX 11.00 IBM PowerPC AIX 4.2 ! Intel Pentium III GNU/Linux 2.2.12-20smp (Redhat 6.1) NeXT Turbostation Mach 3.3 ! SGI MIPS IRIX 6.3 ! SGI Origin 200 IRIX 6.5 ! Sun SPARC GNU/Linux 2.2.12-42smp (Redhat 6.1) Sun SPARC Solaris 2.6 + Sun SPARC Solaris 2.7 + + DEC Alpha OpenVMS + DEC Vax VMS DEC C ! OS/2 EMX GCC diff -cNr gawk-3.0.4/README gawk-3.0.5/README *** gawk-3.0.4/README Sun May 9 14:03:52 1999 --- gawk-3.0.5/README Sun Apr 9 14:53:55 2000 *************** *** 1,10 **** README: ! This is GNU Awk 3.0.4. It should be upwardly compatible with the Bell Labs research version of awk. It is almost completely compliant with the 1993 POSIX 1003.2 standard for awk. (See the note below about POSIX.) ! Patches 1 through 4 just fix bugs -- see NEWS and ChangeLog for details. See the file INSTALL for installation instructions. --- 1,10 ---- README: ! This is GNU Awk 3.0.5. It should be upwardly compatible with the Bell Labs research version of awk. It is almost completely compliant with the 1993 POSIX 1003.2 standard for awk. (See the note below about POSIX.) ! Patches 1 through 5 just fix bugs -- see NEWS and ChangeLog for details. See the file INSTALL for installation instructions. diff -cNr gawk-3.0.4/README_d/README.sgi gawk-3.0.5/README_d/README.sgi *** gawk-3.0.4/README_d/README.sgi Sun Jan 19 23:58:24 1997 --- gawk-3.0.5/README_d/README.sgi Sun Jun 18 14:57:42 2000 *************** *** 1,20 **** ! From emory!hawkwind.utcs.toronto.edu!cks Mon Dec 30 20:12:35 1996 ! Return-Path: ! To: arnold@skeeve.atl.ga.us (Arnold D. Robbins) ! Subject: Re: gawk regex bug ! In-Reply-To: Your message of Tue, 30 Jul 1996 21:45:00 -0400. ! ! Date: Mon, 30 Dec 1996 19:37:30 -0500 ! From: Chris Siebenmann ! Message-Id: <96Dec30.193738est.24603@hawkwind.utcs.utoronto.ca> ! Status: OR ! Content-Length: 196 ! X-Lines: 5 ! X-Display-Position: 2 ! The latest in my 'gawk on SGIs' stuff: with the newest SGI compilers ! (MIPSPro 7.1, just released) gawk 3.0 compiles and passes the selftests ! even at the highest (-O3) optimization level. ! - cks --- 1,14 ---- ! Tue May 2 11:40:54 IDT 2000 ! GCC and gawk often don't mix on SGI systems. Use the native C compiler to ! compile gawk. `make test' should work ok, although the `tweakfld' test ! may fail. That's ok; see README.ultrix for the details on that one. ! Note that the SGI compiler will complain about some constructs in ! regex.c and dfa.c. It's ok to ignore those complaints. + If you ask me about this, I will fuss at you for not having done + your homework! + + Arnold Robbins + arnold@gnu.org diff -cNr gawk-3.0.4/README_d/README.tests gawk-3.0.5/README_d/README.tests *** gawk-3.0.4/README_d/README.tests Thu Jan 1 02:00:00 1970 --- gawk-3.0.5/README_d/README.tests Wed May 3 10:54:11 2000 *************** *** 0 **** --- 1,46 ---- + Date: Sat, 22 Apr 2000 06:07:06 -0600 (MDT) + From: "Nelson H. F. Beebe" + To: arnold@gnu.org + Cc: beebe@math.utah.edu, sysstaff@math.utah.edu, othmer@math.utah.edu + Subject: gawk-3.0.4 and a GNU/Linux gotcha + + Yesterday, I was assisting a colleague install some software on his + GNU/Linux machine for which uname -r reports 2.2.14. + + A (mis)feature of this system, which I've never encountered before, + broke the build of one of my programs, and also of gawk-3.0.4. + + Namely, the kernel will not execute anything that resides in /tmp, + though it will if the same script is in /usr/tmp! + + % cat /tmp/foo.sh + #! /bin/sh + echo hello + + ls -l /tmp/foo.sh + -rwxr-xr-x 1 othmer math 22 Apr 21 10:34 /tmp/foo.sh* + + % /tmp/foo.sh + bash: /tmp/foo.sh: Permission denied + + % cp /tmp/foo.sh /usr/tmp + + % /usr/tmp/foo.sh + hello + + Thus, programs that do a temporary install in /tmp, as some of mine do + in order to run the validation suite, will fail. + + gawk-3.0.4, and likely other gawk versions, hits this problem too. It + fails because test/poundbang starts with + + #! /tmp/gawk -f + + I tracked down where it comes from: + + % grep /tmp /etc/fstab + /dev/hda3 /tmp ext2 rw,nosuid,noexec,nouser,auto,async,nodev 1 1 + !!!!!! + + Since this is done via a mount command, potentially ANY directory tree + could be mounted with noexec. diff -cNr gawk-3.0.4/acconfig.h gawk-3.0.5/acconfig.h *** gawk-3.0.4/acconfig.h Wed Jun 9 11:34:12 1999 --- gawk-3.0.5/acconfig.h Wed Jun 7 11:47:25 2000 *************** *** 3,9 **** */ /* ! * Copyright (C) 1995-1999 the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the * AWK Programming Language. --- 3,9 ---- */ /* ! * Copyright (C) 1995-2000 the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the * AWK Programming Language. diff -cNr gawk-3.0.4/aclocal.m4 gawk-3.0.5/aclocal.m4 *** gawk-3.0.4/aclocal.m4 Wed Jun 9 11:35:41 1999 --- gawk-3.0.5/aclocal.m4 Mon Jun 12 15:55:50 2000 *************** *** 1,7 **** dnl dnl aclocal.m4 --- autoconf input file for gawk dnl ! dnl Copyright (C) 1995, 1996, 1998, 1999 the Free Software Foundation, Inc. dnl dnl This file is part of GAWK, the GNU implementation of the dnl AWK Progamming Language. --- 1,7 ---- dnl dnl aclocal.m4 --- autoconf input file for gawk dnl ! dnl Copyright (C) 1995, 1996, 1998, 1999, 2000 the Free Software Foundation, Inc. dnl dnl This file is part of GAWK, the GNU implementation of the dnl AWK Progamming Language. *************** *** 48,153 **** dnl Written by Paul Eggert . dnl Internal subroutine of GAWK_AC_SYS_LARGEFILE. ! dnl GAWK_AC_SYS_LARGEFILE_FLAGS(FLAGSNAME) ! AC_DEFUN(GAWK_AC_SYS_LARGEFILE_FLAGS, ! [AC_CACHE_CHECK([for $1 value to request large file support], ! gawk_cv_sys_largefile_$1, ! [gawk_cv_sys_largefile_$1=`($GETCONF LFS_$1) 2>/dev/null` || { ! gawk_cv_sys_largefile_$1=no ! ifelse($1, CFLAGS, ! [case "$host_os" in ! # IRIX 6.2 and later require cc -n32. ! changequote(, )dnl ! irix6.[2-9]* | irix6.1[0-9]* | irix[7-9].* | irix[1-9][0-9]*) ! changequote([, ])dnl ! if test "$GCC" != yes; then ! gawk_cv_sys_largefile_CFLAGS=-n32 ! fi ! gawk_save_CC="$CC" ! CC="$CC $gawk_cv_sys_largefile_CFLAGS" ! AC_TRY_LINK(, , , gawk_cv_sys_largefile_CFLAGS=no) ! CC="$gawk_save_CC" ! esac]) ! }])]) dnl Internal subroutine of GAWK_AC_SYS_LARGEFILE. ! dnl GAWK_AC_SYS_LARGEFILE_SPACE_APPEND(VAR, VAL) ! AC_DEFUN(GAWK_AC_SYS_LARGEFILE_SPACE_APPEND, ! [case $2 in ! no) ;; ! ?*) ! case "[$]$1" in ! '') $1=$2 ;; ! *) $1=[$]$1' '$2 ;; ! esac ;; ! esac]) ! ! dnl Internal subroutine of GAWK_AC_SYS_LARGEFILE. ! dnl GAWK_AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, CACHE-VAR, CODE-TO-SET-DEFAULT) AC_DEFUN(GAWK_AC_SYS_LARGEFILE_MACRO_VALUE, ! [AC_CACHE_CHECK([for $1], $2, ! [$2=no ! changequote(, )dnl ! $3 ! for gawk_flag in $gawk_cv_sys_largefile_CFLAGS no; do ! case "$gawk_flag" in ! -D$1) ! $2=1 ;; ! -D$1=*) ! $2=`expr " $gawk_flag" : '[^=]*=\(.*\)'` ;; ! esac ! done ! changequote([, ])dnl ! ]) ! if test "[$]$2" != no; then ! AC_DEFINE_UNQUOTED([$1], [$]$2) fi]) AC_DEFUN(GAWK_AC_SYS_LARGEFILE, ! [AC_REQUIRE([AC_CANONICAL_HOST]) ! AC_ARG_ENABLE(largefile, [ --disable-largefile omit support for large files]) if test "$enable_largefile" != no; then ! AC_CHECK_TOOL(GETCONF, getconf) ! GAWK_AC_SYS_LARGEFILE_FLAGS(CFLAGS) ! GAWK_AC_SYS_LARGEFILE_FLAGS(LDFLAGS) ! GAWK_AC_SYS_LARGEFILE_FLAGS(LIBS) ! ! for gawk_flag in $gawk_cv_sys_largefile_CFLAGS no; do ! case "$gawk_flag" in ! no) ;; ! -D_FILE_OFFSET_BITS=*) ;; ! -D_LARGEFILE_SOURCE | -D_LARGEFILE_SOURCE=*) ;; ! -D_LARGE_FILES | -D_LARGE_FILES=*) ;; ! -D?* | -I?*) ! GAWK_AC_SYS_LARGEFILE_SPACE_APPEND(CPPFLAGS, "$gawk_flag") ;; ! *) ! GAWK_AC_SYS_LARGEFILE_SPACE_APPEND(CFLAGS, "$gawk_flag") ;; ! esac ! done ! GAWK_AC_SYS_LARGEFILE_SPACE_APPEND(LDFLAGS, "$gawk_cv_sys_largefile_LDFLAGS") ! GAWK_AC_SYS_LARGEFILE_SPACE_APPEND(LIBS, "$gawk_cv_sys_largefile_LIBS") ! GAWK_AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, gawk_cv_sys_file_offset_bits, ! [case "$host_os" in ! # HP-UX 10.20 and later ! hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*) ! gawk_cv_sys_file_offset_bits=64 ;; ! esac]) ! GAWK_AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, gawk_cv_sys_largefile_source, ! [case "$host_os" in ! # HP-UX 10.20 and later ! hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*) ! gawk_cv_sys_largefile_source=1 ;; ! esac]) ! GAWK_AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, gawk_cv_sys_large_files, ! [case "$host_os" in ! # AIX 4.2 and later ! aix4.[2-9]* | aix4.1[0-9]* | aix[5-9].* | aix[1-9][0-9]*) ! gawk_cv_sys_large_files=1 ;; ! esac]) fi ]) --- 48,115 ---- dnl Written by Paul Eggert . dnl Internal subroutine of GAWK_AC_SYS_LARGEFILE. ! dnl GAWK_AC_SYS_LARGEFILE_TEST_INCLUDES ! AC_DEFUN(GAWK_AC_SYS_LARGEFILE_TEST_INCLUDES, ! [[#include ! int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1]; ! ]]) dnl Internal subroutine of GAWK_AC_SYS_LARGEFILE. ! dnl GAWK_AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, CACHE-VAR, COMMENT, INCLUDES, FUNCTION-BODY) AC_DEFUN(GAWK_AC_SYS_LARGEFILE_MACRO_VALUE, ! [AC_CACHE_CHECK([for $1 value needed for large files], $3, ! [$3=no ! AC_TRY_COMPILE(GAWK_AC_SYS_LARGEFILE_TEST_INCLUDES ! $5 ! , ! [$6], ! , ! [AC_TRY_COMPILE([#define $1 $2] ! GAWK_AC_SYS_LARGEFILE_TEST_INCLUDES ! $5 ! , ! [$6], ! [$3=$2])])]) ! if test "[$]$3" != no; then ! AC_DEFINE_UNQUOTED([$1], [$]$3, [$4]) fi]) AC_DEFUN(GAWK_AC_SYS_LARGEFILE, ! [AC_ARG_ENABLE(largefile, [ --disable-largefile omit support for large files]) if test "$enable_largefile" != no; then ! ! AC_CACHE_CHECK([for special C compiler options needed for large files], ! gawk_cv_sys_largefile_CC, ! [gawk_cv_sys_largefile_CC=no ! if test "$GCC" != yes; then ! # IRIX 6.2 and later do not support large files by default, ! # so use the C compiler's -n32 option if that helps. ! AC_TRY_COMPILE(GAWK_AC_SYS_LARGEFILE_TEST_INCLUDES, , , ! [ac_save_CC="$CC" ! CC="$CC -n32" ! AC_TRY_COMPILE(GAWK_AC_SYS_LARGEFILE_TEST_INCLUDES, , ! gawk_cv_sys_largefile_CC=' -n32') ! CC="$ac_save_CC"]) ! fi]) ! if test "$gawk_cv_sys_largefile_CC" != no; then ! CC="$CC$gawk_cv_sys_largefile_CC" ! fi ! ! GAWK_AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64, gawk_cv_sys_file_offset_bits, ! [Number of bits in a file offset, on hosts where this is settable.]) ! GAWK_AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, 1, gawk_cv_sys_largefile_source, ! [Define to make ftello visible on some hosts (e.g. HP-UX 10.20).], ! [#include ], [return !ftello;]) ! GAWK_AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1, gawk_cv_sys_large_files, ! [Define for large files, on AIX-style hosts.]) ! GAWK_AC_SYS_LARGEFILE_MACRO_VALUE(_XOPEN_SOURCE, 500, ! gawk_cv_sys_xopen_source, ! [Define to make ftello visible on some hosts (e.g. glibc 2.1.3).], ! [#include ], [return !ftello;]) fi ]) diff -cNr gawk-3.0.4/array.c gawk-3.0.5/array.c *** gawk-3.0.4/array.c Mon May 3 16:55:48 1999 --- gawk-3.0.5/array.c Wed Jun 7 11:45:32 2000 *************** *** 3,9 **** */ /* ! * Copyright (C) 1986, 1988, 1989, 1991-1999 the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the * AWK Programming Language. --- 3,9 ---- */ /* ! * Copyright (C) 1986, 1988, 1989, 1991-2000 the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the * AWK Programming Language. *************** *** 61,68 **** r = force_string(tree_eval(tree->lnode)); if (tree->rnode == NULL) return r; ! subseplen = SUBSEP_node->lnode->stlen; ! subsep = SUBSEP_node->lnode->stptr; len = r->stlen + subseplen + 2; emalloc(str, char *, len, "concat_exp"); memcpy(str, r->stptr, r->stlen+1); --- 61,68 ---- r = force_string(tree_eval(tree->lnode)); if (tree->rnode == NULL) return r; ! subseplen = SUBSEP_node->var_value->stlen; ! subsep = SUBSEP_node->var_value->stptr; len = r->stlen + subseplen + 2; emalloc(str, char *, len, "concat_exp"); memcpy(str, r->stptr, r->stlen+1); *************** *** 214,223 **** int hash1; { register NODE *bucket; for (bucket = symbol->var_array[hash1]; bucket != NULL; bucket = bucket->ahnext) { ! if (cmp_nodes(bucket->ahname, subs) == 0) return bucket; } return NULL; --- 214,232 ---- int hash1; { register NODE *bucket; + NODE *s1, *s2; for (bucket = symbol->var_array[hash1]; bucket != NULL; bucket = bucket->ahnext) { ! /* ! * This used to use cmp_nodes() here. That's wrong. ! * Array indexes are strings; compare as such, always! ! */ ! s1 = bucket->ahname; ! s2 = subs; ! ! if (s1->stlen == s2->stlen ! && STREQN(s1->stptr, s2->stptr, s1->stlen)) return bucket; } return NULL; *************** *** 234,239 **** --- 243,250 ---- if (symbol->type == Node_param_list) symbol = stack_ptr[symbol->param_cnt]; + if (symbol->type == Node_array_ref) + symbol = symbol->orig_array; if ((symbol->flags & SCALAR) != 0) fatal("attempt to use scalar as array"); /* *************** *** 266,271 **** --- 277,284 ---- register int hash1; register NODE *bucket; + assert(symbol->type == Node_var_array || symbol->type == Node_var); + (void) force_string(subs); if ((symbol->flags & SCALAR) != 0) *************** *** 308,322 **** getnode(bucket); bucket->type = Node_ahash; ! if (subs->flags & TEMP) ! bucket->ahname = dupnode(subs); ! else { ! unsigned int saveflags = subs->flags; ! ! subs->flags &= ~MALLOC; ! bucket->ahname = dupnode(subs); ! subs->flags = saveflags; ! } free_temp(subs); /* array subscripts are strings */ --- 321,327 ---- getnode(bucket); bucket->type = Node_ahash; ! bucket->ahname = dupnode(subs); free_temp(subs); /* array subscripts are strings */ *************** *** 343,348 **** --- 348,355 ---- if (symbol->type == Node_var) return; } + if (symbol->type == Node_array_ref) + symbol = symbol->orig_array; if (symbol->type == Node_var_array) { if (symbol->var_array == NULL) return; *************** *** 527,530 **** --- 534,595 ---- */ symbol->var_array = new; symbol->array_size = newsize; + } + + /* pr_node --- print simple node info */ + + static void + pr_node(n) + NODE *n; + { + if ((n->flags & (NUM|NUMBER)) != 0) + printf("%g", n->numbr); + else + printf("%.*s", (int) n->stlen, n->stptr); + } + + /* assoc_dump --- dump the contents of an array */ + + NODE * + assoc_dump(symbol) + NODE *symbol; + { + int i; + NODE *bucket; + + if (symbol->var_array == NULL) { + printf("%s: empty\n", symbol->vname); + return tmp_number((AWKNUM) 0); + } + + for (i = 0; i < symbol->array_size; i++) { + for (bucket = symbol->var_array[i]; bucket != NULL; + bucket = bucket->ahnext) { + printf("%s: i: (%p, %ld, %s) %.*s, v: ", + symbol->vname, + bucket->ahname, + bucket->ahname->stref, + flags2str(bucket->ahname->flags), + (int) bucket->ahname->stlen, + bucket->ahname->stptr); + pr_node(bucket->ahvalue); + printf("\n"); + } + } + + return tmp_number((AWKNUM) 0); + } + + /* do_adump --- dump an array: interface to assoc_dump */ + + NODE * + do_adump(tree) + NODE *tree; + { + NODE *r, *a; + + a = tree->lnode; + r = assoc_dump(a); + + return r; } diff -cNr gawk-3.0.4/atari/ChangeLog gawk-3.0.5/atari/ChangeLog *** gawk-3.0.4/atari/ChangeLog Wed Jun 30 16:15:17 1999 --- gawk-3.0.5/atari/ChangeLog Sun Jun 25 15:09:32 2000 *************** *** 1,3 **** --- 1,7 ---- + Sun Jun 25 15:08:19 2000 Arnold D. Robbins + + * Release 3.0.5: Release tar file made. + Wed Jun 30 16:14:36 1999 Arnold D. Robbins * Release 3.0.4: Release tar file made. This time for sure. diff -cNr gawk-3.0.4/awk.h gawk-3.0.5/awk.h *** gawk-3.0.4/awk.h Wed Jun 30 16:06:13 1999 --- gawk-3.0.5/awk.h Wed Jun 7 20:59:07 2000 *************** *** 3,9 **** */ /* ! * Copyright (C) 1986, 1988, 1989, 1991-1999 the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the * AWK Programming Language. --- 3,9 ---- */ /* ! * Copyright (C) 1986, 1988, 1989, 1991-2000 the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the * AWK Programming Language. *************** *** 332,337 **** --- 332,338 ---- Node_regex, /* a regexp, text, compiled, flags, etc */ Node_hashnode, /* an identifier in the symbol table */ Node_ahash, /* an array element */ + Node_array_ref, /* array passed by ref as parameter */ Node_NF, /* variables recognized in the grammar */ Node_NR, Node_FNR, *************** *** 457,462 **** --- 458,465 ---- #define array_size sub.nodep.l.ll #define table_size sub.nodep.x.xl + #define orig_array sub.nodep.x.extra + #define condpair lnode #define triggered sub.nodep.r.r_ent *************** *** 717,730 **** extern void do_delete P((NODE *symbol, NODE *tree)); extern void assoc_scan P((NODE *symbol, struct search *lookat)); extern void assoc_next P((struct search *lookat)); /* awktab.c */ extern char *tokexpand P((void)); - extern char nextc P((void)); extern NODE *node P((NODE *left, NODETYPE op, NODE *right)); extern NODE *install P((char *name, NODE *value)); extern NODE *lookup P((const char *name)); extern NODE *variable P((char *name, int can_free, NODETYPE type)); extern int yyparse P((void)); /* builtin.c */ extern double double_to_int P((double d)); extern NODE *do_exp P((NODE *tree)); --- 720,735 ---- extern void do_delete P((NODE *symbol, NODE *tree)); extern void assoc_scan P((NODE *symbol, struct search *lookat)); extern void assoc_next P((struct search *lookat)); + extern NODE *assoc_dump P((NODE *symbol)); + extern NODE *do_adump P((NODE *tree)); /* awktab.c */ extern char *tokexpand P((void)); extern NODE *node P((NODE *left, NODETYPE op, NODE *right)); extern NODE *install P((char *name, NODE *value)); extern NODE *lookup P((const char *name)); extern NODE *variable P((char *name, int can_free, NODETYPE type)); extern int yyparse P((void)); + extern NODE *stopme P((NODE *tree)); /* builtin.c */ extern double double_to_int P((double d)); extern NODE *do_exp P((NODE *tree)); *************** *** 775,780 **** --- 780,786 ---- void set_ORS P((void)); void set_OFMT P((void)); void set_CONVFMT P((void)); + extern char *flags2str P((int)); /* field.c */ extern void init_fields P((void)); extern void set_record P((char *buf, int cnt, int freeold)); diff -cNr gawk-3.0.4/awk.y gawk-3.0.5/awk.y *** gawk-3.0.4/awk.y Wed Jun 30 16:06:24 1999 --- gawk-3.0.5/awk.y Wed Jun 7 21:00:47 2000 *************** *** 3,9 **** */ /* ! * Copyright (C) 1986, 1988, 1989, 1991-1999 the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the * AWK Programming Language. --- 3,9 ---- */ /* ! * Copyright (C) 1986, 1988, 1989, 1991-2000 the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the * AWK Programming Language. *************** *** 883,902 **** NODE *(*ptr)(); /* function that implements this keyword */ }; - extern NODE - *do_exp(), *do_getline(), *do_index(), *do_length(), - *do_sqrt(), *do_log(), *do_sprintf(), *do_substr(), - *do_split(), *do_system(), *do_int(), *do_close(), - *do_atan2(), *do_sin(), *do_cos(), *do_rand(), - *do_srand(), *do_match(), *do_tolower(), *do_toupper(), - *do_sub(), *do_gsub(), *do_strftime(), *do_systime(), - *do_fflush(); /* Tokentab is sorted ascii ascending order, so it can be binary searched. */ static struct token tokentab[] = { {"BEGIN", Node_illegal, LEX_BEGIN, 0, 0}, {"END", Node_illegal, LEX_END, 0, 0}, #ifdef BITOPS {"and", Node_builtin, LEX_BUILTIN, GAWKX|A(2), do_and}, #endif /* BITOPS */ --- 883,898 ---- NODE *(*ptr)(); /* function that implements this keyword */ }; /* Tokentab is sorted ascii ascending order, so it can be binary searched. */ + /* Function pointers come from declarations in awk.h. */ static struct token tokentab[] = { {"BEGIN", Node_illegal, LEX_BEGIN, 0, 0}, {"END", Node_illegal, LEX_END, 0, 0}, + #ifdef ARRAYDEBUG + {"adump", Node_builtin, LEX_BUILTIN, GAWKX|A(1), do_adump}, + #endif #ifdef BITOPS {"and", Node_builtin, LEX_BUILTIN, GAWKX|A(2), do_and}, #endif /* BITOPS */ *************** *** 947,952 **** --- 943,951 ---- {"sprintf", Node_builtin, LEX_BUILTIN, 0, do_sprintf}, {"sqrt", Node_builtin, LEX_BUILTIN, A(1), do_sqrt}, {"srand", Node_builtin, LEX_BUILTIN, NOT_OLD|A(0)|A(1), do_srand}, + #ifdef ARRAYDEBUG + {"stopme", Node_builtin, LEX_BUILTIN, GAWKX|A(0), stopme}, + #endif {"strftime", Node_builtin, LEX_BUILTIN, GAWKX|A(0)|A(1)|A(2), do_strftime}, #ifdef BITOPS {"strtonum", Node_builtin, LEX_BUILTIN, GAWKX|A(1), do_strtonum}, *************** *** 1217,1225 **** int c; if (lexptr && lexptr < lexend) ! c = *lexptr++; else if (get_src_buf()) ! c = *lexptr++; else c = EOF; --- 1216,1224 ---- int c; if (lexptr && lexptr < lexend) ! c = (unsigned char) *lexptr++; else if (get_src_buf()) ! c = (unsigned char) *lexptr++; else c = EOF; *************** *** 1227,1234 **** } #else #define nextc() ((lexptr && lexptr < lexend) ? \ ! *lexptr++ : \ ! (get_src_buf() ? *lexptr++ : EOF) \ ) #endif --- 1226,1233 ---- } #else #define nextc() ((lexptr && lexptr < lexend) ? \ ! ((unsigned char) *lexptr++) : \ ! (get_src_buf() ? ((unsigned char) *lexptr++) : EOF) \ ) #endif *************** *** 1457,1463 **** return lasttok = c; case ')': - case ']': case '(': case ';': case '{': --- 1456,1461 ---- *************** *** 1465,1470 **** --- 1463,1469 ---- want_assign = FALSE; /* fall through */ case '[': + case ']': return lasttok = c; case '*': *************** *** 2143,2148 **** --- 2142,2155 ---- NODE *def; { NODE *r; + NODE *n; + + /* check for function foo(foo) { ... }. bleh. */ + for (n = params->rnode; n != NULL; n = n->rnode) { + if (strcmp(n->param, params->param) == 0) + fatal("function `%s': can't use function name as parameter name", + params->param); + } pop_params(params->rnode); pop_var(params, FALSE); *************** *** 2440,2443 **** --- 2447,2458 ---- break; /* keeps gcc -Wall happy */ } return FALSE; + } + + /* for debugging */ + NODE * + stopme(tree) + NODE *tree; + { + return tmp_number((AWKNUM) 0.0); } diff -cNr gawk-3.0.4/awklib/ChangeLog gawk-3.0.5/awklib/ChangeLog *** gawk-3.0.4/awklib/ChangeLog Wed Jun 30 16:15:27 1999 --- gawk-3.0.5/awklib/ChangeLog Sun Jun 25 15:09:43 2000 *************** *** 1,3 **** --- 1,7 ---- + Sun Jun 25 15:08:19 2000 Arnold D. Robbins + + * Release 3.0.5: Release tar file made. + Wed Jun 30 16:14:36 1999 Arnold D. Robbins * Release 3.0.4: Release tar file made. This time for sure. diff -cNr gawk-3.0.4/builtin.c gawk-3.0.5/builtin.c *** gawk-3.0.4/builtin.c Wed Jun 30 16:06:45 1999 --- gawk-3.0.5/builtin.c Wed Jun 7 11:45:35 2000 *************** *** 3,9 **** */ /* ! * Copyright (C) 1986, 1988, 1989, 1991-1999 the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the * AWK Programming Language. --- 3,9 ---- */ /* ! * Copyright (C) 1986, 1988, 1989, 1991-2000 the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the * AWK Programming Language. *************** *** 459,465 **** break; case '0': ! zero_flag = TRUE; if (lj) goto retry; /* FALL through */ --- 459,471 ---- break; case '0': ! /* ! * Only turn on zero_flag if we haven't seen ! * the field width or precision yet. Otherwise, ! * screws up floating point formatting. ! */ ! if (cur == & fw) ! zero_flag = TRUE; if (lj) goto retry; /* FALL through */ *************** *** 1998,2004 **** free_temp(tmp); if (do_lint) { ! if (uval < 0) warning("compl(%lf): negative value will give strange results", d); if (double_to_int(d) != d) warning("compl(%lf): fractional value will be truncated", d); --- 2004,2010 ---- free_temp(tmp); if (do_lint) { ! if (d < 0) warning("compl(%lf): negative value will give strange results", d); if (double_to_int(d) != d) warning("compl(%lf): fractional value will be truncated", d); diff -cNr gawk-3.0.4/configh.in gawk-3.0.5/configh.in *** gawk-3.0.4/configh.in Wed Jun 9 11:37:17 1999 --- gawk-3.0.5/configh.in Mon Jun 12 15:56:11 2000 *************** *** 4,10 **** */ /* ! * Copyright (C) 1995-1999 the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the * AWK Programming Language. --- 4,10 ---- */ /* ! * Copyright (C) 1995-2000 the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the * AWK Programming Language. *************** *** 72,77 **** --- 72,80 ---- /* Define if your struct stat has st_blksize. */ #undef HAVE_ST_BLKSIZE + /* Define if you have the ANSI # stringizing operator in cpp. */ + #undef HAVE_STRINGIZE + /* Define if you have that is POSIX.1 compatible. */ #undef HAVE_SYS_WAIT_H *************** *** 205,209 **** --- 208,225 ---- /* Define if you have the m library (-lm). */ #undef HAVE_LIBM + + /* Number of bits in a file offset, on hosts where this is settable. */ + #undef _FILE_OFFSET_BITS + + /* Define to make ftello visible on some hosts (e.g. HP-UX 10.20). */ + #undef _LARGEFILE_SOURCE + + /* Define for large files, on AIX-style hosts. */ + #undef _LARGE_FILES + + /* Define to make ftello visible on some hosts (e.g. glibc 2.1.3). */ + #undef _XOPEN_SOURCE + #include /* overrides for stuff autoconf can't deal with */ diff -cNr gawk-3.0.4/configure gawk-3.0.5/configure *** gawk-3.0.4/configure Wed Jun 9 11:37:35 1999 --- gawk-3.0.5/configure Mon Jun 12 15:56:04 2000 *************** *** 1,7 **** #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated automatically using autoconf version 2.12 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation --- 1,7 ---- #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation *************** *** 55,60 **** --- 55,61 ---- # Initialize some other variables. subdirs= MFLAGS= MAKEFLAGS= + SHELL=${CONFIG_SHELL-/bin/sh} # Maximum number of lines to put in a shell here document. ac_max_here_lines=12 *************** *** 338,344 **** verbose=yes ;; -version | --version | --versio | --versi | --vers) ! echo "configure generated by autoconf version 2.12" exit 0 ;; -with-* | --with-*) --- 339,345 ---- verbose=yes ;; -version | --version | --versio | --versi | --vers) ! echo "configure generated by autoconf version 2.13" exit 0 ;; -with-* | --with-*) *************** *** 508,516 **** # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then --- 509,519 ---- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross + ac_exeext= + ac_objext=o if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then *************** *** 526,577 **** - ac_aux_dir= - for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f $ac_dir/install.sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - fi - done - if test -z "$ac_aux_dir"; then - { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } - fi - ac_config_guess=$ac_aux_dir/config.guess - ac_config_sub=$ac_aux_dir/config.sub - ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. - - - # Make sure we can run config.sub. - if $ac_config_sub sun4 >/dev/null 2>&1; then : - else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } - fi - - echo $ac_n "checking host system type""... $ac_c" 1>&6 - echo "configure:556: checking host system type" >&5 - - host_alias=$host - case "$host_alias" in - NONE) - case $nonopt in - NONE) - if host_alias=`$ac_config_guess`; then : - else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } - fi ;; - *) host_alias=$nonopt ;; - esac ;; - esac - - host=`$ac_config_sub $host_alias` - host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` - host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` - host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - echo "$ac_t""$host" 1>&6 - # Check whether --enable-bitops or --disable-bitops was given. if test "${enable_bitops+set}" = set; then --- 529,534 ---- *************** *** 597,611 **** # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:601: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$YACC"; then ac_cv_prog_YACC="$YACC" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_YACC="$ac_prog" --- 554,569 ---- # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:558: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$YACC"; then ac_cv_prog_YACC="$YACC" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_YACC="$ac_prog" *************** *** 627,633 **** test -n "$YACC" || YACC="yacc" echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 ! echo "configure:631: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 585,591 ---- test -n "$YACC" || YACC="yacc" echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 ! echo "configure:589: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 650,664 **** # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:654: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_CC="gcc" --- 608,623 ---- # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:612: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_CC="gcc" *************** *** 679,694 **** # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:683: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ac_prog_rejected=no ! for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then --- 638,654 ---- # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:642: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_prog_rejected=no ! ac_dummy="$PATH" ! for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then *************** *** 723,747 **** echo "$ac_t""no" 1>&6 fi test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 ! echo "configure:731: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross ! cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then --- 683,743 ---- echo "$ac_t""no" 1>&6 fi + if test -z "$CC"; then + case "`uname -s`" in + *win32* | *WIN32*) + # Extract the first word of "cl", so it can be a program name with args. + set dummy cl; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 + echo "configure:693: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CC="cl" + break + fi + done + IFS="$ac_save_ifs" + fi + fi + CC="$ac_cv_prog_CC" + if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + ;; + esac + fi test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 ! echo "configure:725: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross ! cat > conftest.$ac_ext << EOF ! ! #line 736 "configure" #include "confdefs.h" + main(){return(0);} EOF ! if { (eval echo configure:741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then *************** *** 755,772 **** ac_cv_prog_cc_works=no fi rm -fr conftest* echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 ! echo "configure:765: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 ! echo "configure:770: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 751,774 ---- ac_cv_prog_cc_works=no fi rm -fr conftest* + ac_ext=c + # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. + ac_cpp='$CPP $CPPFLAGS' + ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + cross_compiling=$ac_cv_prog_cc_cross echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 ! echo "configure:767: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 ! echo "configure:772: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 775,781 **** yes; #endif EOF ! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:779: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no --- 777,783 ---- yes; #endif EOF ! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:781: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no *************** *** 786,796 **** if test $ac_cv_prog_gcc = yes; then GCC=yes ! ac_test_CFLAGS="${CFLAGS+set}" ! ac_save_CFLAGS="$CFLAGS" ! CFLAGS= ! echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 ! echo "configure:794: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 788,802 ---- if test $ac_cv_prog_gcc = yes; then GCC=yes ! else ! GCC= ! fi ! ! ac_test_CFLAGS="${CFLAGS+set}" ! ac_save_CFLAGS="$CFLAGS" ! CFLAGS= ! echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 ! echo "configure:800: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 805,824 **** fi echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 ! if test "$ac_test_CFLAGS" = set; then ! CFLAGS="$ac_save_CFLAGS" ! elif test $ac_cv_prog_cc_g = yes; then CFLAGS="-g -O2" else ! CFLAGS="-O2" fi else ! GCC= ! test "${CFLAGS+set}" = set || CFLAGS="-g" fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 ! echo "configure:822: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= --- 811,834 ---- fi echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 ! if test "$ac_test_CFLAGS" = set; then ! CFLAGS="$ac_save_CFLAGS" ! elif test $ac_cv_prog_cc_g = yes; then ! if test "$GCC" = yes; then CFLAGS="-g -O2" else ! CFLAGS="-g" fi else ! if test "$GCC" = yes; then ! CFLAGS="-O2" ! else ! CFLAGS= ! fi fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 ! echo "configure:832: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= *************** *** 833,846 **** # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:843: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : else --- 843,856 ---- # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:853: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : else *************** *** 850,863 **** rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:860: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : else --- 860,890 ---- rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:870: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ! if test -z "$ac_err"; then ! : ! else ! echo "$ac_err" >&5 ! echo "configure: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! rm -rf conftest* ! CPP="${CC-cc} -nologo -E" ! cat > conftest.$ac_ext < ! Syntax Error ! EOF ! ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:887: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : else *************** *** 870,875 **** --- 897,904 ---- rm -f conftest* fi rm -f conftest* + fi + rm -f conftest* ac_cv_prog_CPP="$CPP" fi CPP="$ac_cv_prog_CPP" *************** *** 882,887 **** --- 911,935 ---- # This is a hack. Different versions of install on different systems # are just too different. Chuck it and use install-sh. INSTALL="$srcdir/install-sh -c"; export INSTALL + ac_aux_dir= + for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do + if test -f $ac_dir/install-sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f $ac_dir/install.sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + fi + done + if test -z "$ac_aux_dir"; then + { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } + fi + ac_config_guess=$ac_aux_dir/config.guess + ac_config_sub=$ac_aux_dir/config.sub + ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: *************** *** 889,916 **** # SunOS /usr/etc/install # IRIX /sbin/install # AIX /bin/install # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 ! echo "configure:897: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ! IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. ! for ac_prog in ginstall installbsd scoinst install; do if test -f $ac_dir/$ac_prog; then if test $ac_prog = install && grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. - # OSF/1 installbsd also uses dspmsg, but is usable. : else ac_cv_path_install="$ac_dir/$ac_prog -c" --- 937,966 ---- # SunOS /usr/etc/install # IRIX /sbin/install # AIX /bin/install + # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 ! echo "configure:946: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ! IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. ! # Don't use installbsd from OSF since it installs stuff as root ! # by default. ! for ac_prog in ginstall scoinst install; do if test -f $ac_dir/$ac_prog; then if test $ac_prog = install && grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : else ac_cv_path_install="$ac_dir/$ac_prog -c" *************** *** 940,950 **** # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 ! echo "configure:948: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 990,1002 ---- # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 ! echo "configure:1000: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 981,1249 **** fi fi ! ! echo $ac_n "checking build system type""... $ac_c" 1>&6 ! echo "configure:987: checking build system type" >&5 ! ! build_alias=$build ! case "$build_alias" in ! NONE) ! case $nonopt in ! NONE) build_alias=$host_alias ;; ! *) build_alias=$nonopt ;; ! esac ;; ! esac ! ! build=`$ac_config_sub $build_alias` ! build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` ! build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` ! build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` ! echo "$ac_t""$build" 1>&6 ! ! if test $host != $build; then ! ac_tool_prefix=${host_alias}- ! else ! ac_tool_prefix= ! fi ! ! ! # Check whether --enable-largefile or --disable-largefile was given. ! if test "${enable_largefile+set}" = set; then ! enableval="$enable_largefile" ! : ! fi ! ! if test "$enable_largefile" != no; then ! # Extract the first word of "${ac_tool_prefix}getconf", so it can be a program name with args. ! set dummy ${ac_tool_prefix}getconf; ac_word=$2 ! echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ! echo "configure:1021: checking for $ac_word" >&5 ! if eval "test \"`echo '$''{'ac_cv_prog_GETCONF'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! if test -n "$GETCONF"; then ! ac_cv_prog_GETCONF="$GETCONF" # Let the user override the test. ! else ! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ! for ac_dir in $PATH; do ! test -z "$ac_dir" && ac_dir=. ! if test -f $ac_dir/$ac_word; then ! ac_cv_prog_GETCONF="${ac_tool_prefix}getconf" ! break ! fi ! done ! IFS="$ac_save_ifs" ! test -z "$ac_cv_prog_GETCONF" && ac_cv_prog_GETCONF="getconf" ! fi ! fi ! GETCONF="$ac_cv_prog_GETCONF" ! if test -n "$GETCONF"; then ! echo "$ac_t""$GETCONF" 1>&6 ! else ! echo "$ac_t""no" 1>&6 ! fi ! ! ! ! echo $ac_n "checking for CFLAGS value to request large file support""... $ac_c" 1>&6 ! echo "configure:1050: checking for CFLAGS value to request large file support" >&5 ! if eval "test \"`echo '$''{'gawk_cv_sys_largefile_CFLAGS'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! gawk_cv_sys_largefile_CFLAGS=`($GETCONF LFS_CFLAGS) 2>/dev/null` || { ! gawk_cv_sys_largefile_CFLAGS=no ! case "$host_os" in ! # IRIX 6.2 and later require cc -n32. ! irix6.[2-9]* | irix6.1[0-9]* | irix[7-9].* | irix[1-9][0-9]*) ! if test "$GCC" != yes; then ! gawk_cv_sys_largefile_CFLAGS=-n32 ! fi ! gawk_save_CC="$CC" ! CC="$CC $gawk_cv_sys_largefile_CFLAGS" ! cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then ! : ! else ! echo "configure: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! rm -rf conftest* ! gawk_cv_sys_largefile_CFLAGS=no ! fi ! rm -f conftest* ! CC="$gawk_save_CC" ! esac ! } ! fi ! ! echo "$ac_t""$gawk_cv_sys_largefile_CFLAGS" 1>&6 ! echo $ac_n "checking for LDFLAGS value to request large file support""... $ac_c" 1>&6 ! echo "configure:1088: checking for LDFLAGS value to request large file support" >&5 ! if eval "test \"`echo '$''{'gawk_cv_sys_largefile_LDFLAGS'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! gawk_cv_sys_largefile_LDFLAGS=`($GETCONF LFS_LDFLAGS) 2>/dev/null` || { ! gawk_cv_sys_largefile_LDFLAGS=no ! ! } ! fi ! ! echo "$ac_t""$gawk_cv_sys_largefile_LDFLAGS" 1>&6 ! echo $ac_n "checking for LIBS value to request large file support""... $ac_c" 1>&6 ! echo "configure:1100: checking for LIBS value to request large file support" >&5 ! if eval "test \"`echo '$''{'gawk_cv_sys_largefile_LIBS'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! gawk_cv_sys_largefile_LIBS=`($GETCONF LFS_LIBS) 2>/dev/null` || { ! gawk_cv_sys_largefile_LIBS=no ! ! } ! fi ! ! echo "$ac_t""$gawk_cv_sys_largefile_LIBS" 1>&6 ! ! for gawk_flag in $gawk_cv_sys_largefile_CFLAGS no; do ! case "$gawk_flag" in ! no) ;; ! -D_FILE_OFFSET_BITS=*) ;; ! -D_LARGEFILE_SOURCE | -D_LARGEFILE_SOURCE=*) ;; ! -D_LARGE_FILES | -D_LARGE_FILES=*) ;; ! -D?* | -I?*) ! case "$gawk_flag" in ! no) ;; ! ?*) ! case "$CPPFLAGS" in ! '') CPPFLAGS="$gawk_flag" ;; ! *) CPPFLAGS=$CPPFLAGS' '"$gawk_flag" ;; ! esac ;; ! esac ;; ! *) ! case "$gawk_flag" in ! no) ;; ! ?*) ! case "$CFLAGS" in ! '') CFLAGS="$gawk_flag" ;; ! *) CFLAGS=$CFLAGS' '"$gawk_flag" ;; ! esac ;; ! esac ;; ! esac ! done ! case "$gawk_cv_sys_largefile_LDFLAGS" in ! no) ;; ! ?*) ! case "$LDFLAGS" in ! '') LDFLAGS="$gawk_cv_sys_largefile_LDFLAGS" ;; ! *) LDFLAGS=$LDFLAGS' '"$gawk_cv_sys_largefile_LDFLAGS" ;; ! esac ;; ! esac ! case "$gawk_cv_sys_largefile_LIBS" in ! no) ;; ! ?*) ! case "$LIBS" in ! '') LIBS="$gawk_cv_sys_largefile_LIBS" ;; ! *) LIBS=$LIBS' '"$gawk_cv_sys_largefile_LIBS" ;; ! esac ;; ! esac ! echo $ac_n "checking for _FILE_OFFSET_BITS""... $ac_c" 1>&6 ! echo "configure:1155: checking for _FILE_OFFSET_BITS" >&5 ! if eval "test \"`echo '$''{'gawk_cv_sys_file_offset_bits'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! gawk_cv_sys_file_offset_bits=no ! case "$host_os" in ! # HP-UX 10.20 and later ! hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*) ! gawk_cv_sys_file_offset_bits=64 ;; ! esac ! for gawk_flag in $gawk_cv_sys_largefile_CFLAGS no; do ! case "$gawk_flag" in ! -D_FILE_OFFSET_BITS) ! gawk_cv_sys_file_offset_bits=1 ;; ! -D_FILE_OFFSET_BITS=*) ! gawk_cv_sys_file_offset_bits=`expr " $gawk_flag" : '[^=]*=\(.*\)'` ;; ! esac ! done ! ! fi ! ! echo "$ac_t""$gawk_cv_sys_file_offset_bits" 1>&6 ! if test "$gawk_cv_sys_file_offset_bits" != no; then ! cat >> confdefs.h <&6 ! echo "configure:1184: checking for _LARGEFILE_SOURCE" >&5 ! if eval "test \"`echo '$''{'gawk_cv_sys_largefile_source'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! gawk_cv_sys_largefile_source=no ! case "$host_os" in ! # HP-UX 10.20 and later ! hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*) ! gawk_cv_sys_largefile_source=1 ;; ! esac ! for gawk_flag in $gawk_cv_sys_largefile_CFLAGS no; do ! case "$gawk_flag" in ! -D_LARGEFILE_SOURCE) ! gawk_cv_sys_largefile_source=1 ;; ! -D_LARGEFILE_SOURCE=*) ! gawk_cv_sys_largefile_source=`expr " $gawk_flag" : '[^=]*=\(.*\)'` ;; ! esac ! done ! ! fi ! ! echo "$ac_t""$gawk_cv_sys_largefile_source" 1>&6 ! if test "$gawk_cv_sys_largefile_source" != no; then ! cat >> confdefs.h <&6 ! echo "configure:1213: checking for _LARGE_FILES" >&5 ! if eval "test \"`echo '$''{'gawk_cv_sys_large_files'+set}'`\" = set"; then ! echo $ac_n "(cached) $ac_c" 1>&6 ! else ! gawk_cv_sys_large_files=no ! case "$host_os" in ! # AIX 4.2 and later ! aix4.[2-9]* | aix4.1[0-9]* | aix[5-9].* | aix[1-9][0-9]*) ! gawk_cv_sys_large_files=1 ;; ! esac ! for gawk_flag in $gawk_cv_sys_largefile_CFLAGS no; do ! case "$gawk_flag" in ! -D_LARGE_FILES) ! gawk_cv_sys_large_files=1 ;; ! -D_LARGE_FILES=*) ! gawk_cv_sys_large_files=`expr " $gawk_flag" : '[^=]*=\(.*\)'` ;; ! esac ! done ! fi - echo "$ac_t""$gawk_cv_sys_large_files" 1>&6 - if test "$gawk_cv_sys_large_files" != no; then - cat >> confdefs.h <&6 ! echo "configure:1245: checking for AIX" >&5 cat > conftest.$ac_ext <> confdefs.h <<\EOF ! #define BITOPS 1 EOF ! cat >> confdefs.h <<\EOF ! #define NONDECDATA 1 EOF ! CFLAGS="$CFLAGS -DARRAYDEBUG" fi echo $ac_n "checking for AIX""... $ac_c" 1>&6 ! echo "configure:1055: checking for AIX" >&5 cat > conftest.$ac_ext <&6 ! echo "configure:1269: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then --- 1075,1081 ---- echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 ! echo "configure:1079: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then *************** *** 1287,1304 **** ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6 ! echo "configure:1291: checking for minix/config.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1301: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" --- 1097,1114 ---- ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6 ! echo "configure:1101: checking for minix/config.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1111: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" *************** *** 1334,1342 **** fi echo $ac_n "checking for AIX compilation hacks""... $ac_c" 1>&6 ! echo "configure:1340: checking for AIX compilation hacks" >&5 if eval "test \"`echo '$''{'gawk_cv_aix_hack'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 1144,1442 ---- fi + # Check whether --enable-largefile or --disable-largefile was given. + if test "${enable_largefile+set}" = set; then + enableval="$enable_largefile" + : + fi + + if test "$enable_largefile" != no; then + + echo $ac_n "checking for special C compiler options needed for large files""... $ac_c" 1>&6 + echo "configure:1157: checking for special C compiler options needed for large files" >&5 + if eval "test \"`echo '$''{'gawk_cv_sys_largefile_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + gawk_cv_sys_largefile_CC=no + if test "$GCC" != yes; then + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + cat > conftest.$ac_ext < + int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1]; + + int main() { + + ; return 0; } + EOF + if { (eval echo configure:1175: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_save_CC="$CC" + CC="$CC -n32" + cat > conftest.$ac_ext < + int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1]; + + int main() { + + ; return 0; } + EOF + if { (eval echo configure:1193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + gawk_cv_sys_largefile_CC=' -n32' + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + fi + rm -f conftest* + CC="$ac_save_CC" + fi + rm -f conftest* + fi + fi + + echo "$ac_t""$gawk_cv_sys_largefile_CC" 1>&6 + if test "$gawk_cv_sys_largefile_CC" != no; then + CC="$CC$gawk_cv_sys_largefile_CC" + fi + + echo $ac_n "checking for _FILE_OFFSET_BITS value needed for large files""... $ac_c" 1>&6 + echo "configure:1213: checking for _FILE_OFFSET_BITS value needed for large files" >&5 + if eval "test \"`echo '$''{'gawk_cv_sys_file_offset_bits'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + gawk_cv_sys_file_offset_bits=no + cat > conftest.$ac_ext < + int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1]; + + + + int main() { + + ; return 0; } + EOF + if { (eval echo configure:1230: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + cat > conftest.$ac_ext < + int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1]; + + + + int main() { + + ; return 0; } + EOF + if { (eval echo configure:1249: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + gawk_cv_sys_file_offset_bits=64 + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + fi + rm -f conftest* + fi + rm -f conftest* + fi + + echo "$ac_t""$gawk_cv_sys_file_offset_bits" 1>&6 + if test "$gawk_cv_sys_file_offset_bits" != no; then + cat >> confdefs.h <&6 + echo "configure:1269: checking for _LARGEFILE_SOURCE value needed for large files" >&5 + if eval "test \"`echo '$''{'gawk_cv_sys_largefile_source'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + gawk_cv_sys_largefile_source=no + cat > conftest.$ac_ext < + int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1]; + + #include + + int main() { + return !ftello; + ; return 0; } + EOF + if { (eval echo configure:1286: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + cat > conftest.$ac_ext < + int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1]; + + #include + + int main() { + return !ftello; + ; return 0; } + EOF + if { (eval echo configure:1305: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + gawk_cv_sys_largefile_source=1 + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + fi + rm -f conftest* + fi + rm -f conftest* + fi + + echo "$ac_t""$gawk_cv_sys_largefile_source" 1>&6 + if test "$gawk_cv_sys_largefile_source" != no; then + cat >> confdefs.h <&6 + echo "configure:1325: checking for _LARGE_FILES value needed for large files" >&5 + if eval "test \"`echo '$''{'gawk_cv_sys_large_files'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + gawk_cv_sys_large_files=no + cat > conftest.$ac_ext < + int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1]; + + + + int main() { + + ; return 0; } + EOF + if { (eval echo configure:1342: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + cat > conftest.$ac_ext < + int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1]; + + + + int main() { + + ; return 0; } + EOF + if { (eval echo configure:1361: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + gawk_cv_sys_large_files=1 + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + fi + rm -f conftest* + fi + rm -f conftest* + fi + + echo "$ac_t""$gawk_cv_sys_large_files" 1>&6 + if test "$gawk_cv_sys_large_files" != no; then + cat >> confdefs.h <&6 + echo "configure:1381: checking for _XOPEN_SOURCE value needed for large files" >&5 + if eval "test \"`echo '$''{'gawk_cv_sys_xopen_source'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + gawk_cv_sys_xopen_source=no + cat > conftest.$ac_ext < + int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1]; + + #include + + int main() { + return !ftello; + ; return 0; } + EOF + if { (eval echo configure:1398: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + cat > conftest.$ac_ext < + int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1]; + + #include + + int main() { + return !ftello; + ; return 0; } + EOF + if { (eval echo configure:1417: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + gawk_cv_sys_xopen_source=500 + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + fi + rm -f conftest* + fi + rm -f conftest* + fi + + echo "$ac_t""$gawk_cv_sys_xopen_source" 1>&6 + if test "$gawk_cv_sys_xopen_source" != no; then + cat >> confdefs.h <&6 ! echo "configure:1440: checking for AIX compilation hacks" >&5 if eval "test \"`echo '$''{'gawk_cv_aix_hack'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 1359,1370 **** fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 ! echo "configure:1363: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include --- 1459,1470 ---- fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 ! echo "configure:1463: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include *************** *** 1372,1379 **** #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1376: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* ac_cv_header_stdc=yes --- 1472,1479 ---- #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1476: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ac_cv_header_stdc=yes *************** *** 1389,1395 **** if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF --- 1489,1495 ---- if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF *************** *** 1407,1413 **** if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF --- 1507,1513 ---- if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF *************** *** 1428,1434 **** : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') --- 1528,1534 ---- : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') *************** *** 1439,1445 **** exit (0); } EOF ! if { (eval echo configure:1443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else --- 1539,1545 ---- exit (0); } EOF ! if { (eval echo configure:1543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else *************** *** 1463,1474 **** fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 ! echo "configure:1467: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include --- 1563,1574 ---- fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 ! echo "configure:1567: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include *************** *** 1484,1490 **** s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF ! if { (eval echo configure:1488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else --- 1584,1590 ---- s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF ! if { (eval echo configure:1588: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else *************** *** 1508,1525 **** do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ! echo "configure:1512: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1522: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" --- 1608,1625 ---- do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ! echo "configure:1612: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1622: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" *************** *** 1550,1567 **** do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ! echo "configure:1554: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1564: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" --- 1650,1667 ---- do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ! echo "configure:1654: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1664: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" *************** *** 1591,1608 **** do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ! echo "configure:1595: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" --- 1691,1708 ---- do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ! echo "configure:1695: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:1705: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" *************** *** 1630,1641 **** fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 ! echo "configure:1634: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS --- 1730,1741 ---- fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 ! echo "configure:1734: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS *************** *** 1644,1650 **** #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! egrep "pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_pid_t=yes else --- 1744,1750 ---- #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_pid_t=yes else *************** *** 1663,1674 **** fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 ! echo "configure:1667: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include --- 1763,1774 ---- fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 ! echo "configure:1767: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include *************** *** 1685,1691 **** int i; ; return 0; } EOF ! if { (eval echo configure:1689: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else --- 1785,1791 ---- int i; ; return 0; } EOF ! if { (eval echo configure:1789: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else *************** *** 1704,1715 **** echo $ac_n "checking for size_t""... $ac_c" 1>&6 ! echo "configure:1708: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS --- 1804,1815 ---- echo $ac_n "checking for size_t""... $ac_c" 1>&6 ! echo "configure:1808: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS *************** *** 1718,1724 **** #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! egrep "size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_size_t=yes else --- 1818,1824 ---- #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_size_t=yes else *************** *** 1737,1748 **** fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 ! echo "configure:1741: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF --- 1837,1848 ---- fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 ! echo "configure:1841: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF *************** *** 1771,1777 **** fi echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6 ! echo "configure:1775: checking type of array argument to getgroups" >&5 if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 1871,1877 ---- fi echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6 ! echo "configure:1875: checking type of array argument to getgroups" >&5 if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 1779,1785 **** ac_cv_type_getgroups=cross else cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_type_getgroups=gid_t else --- 1904,1910 ---- } EOF ! if { (eval echo configure:1908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_type_getgroups=gid_t else *************** *** 1818,1824 **** if test $ac_cv_type_getgroups = cross; then cat > conftest.$ac_ext < EOF --- 1918,1924 ---- if test $ac_cv_type_getgroups = cross; then cat > conftest.$ac_ext < EOF *************** *** 1842,1848 **** cat > conftest.$ac_ext < EOF --- 1942,1948 ---- cat > conftest.$ac_ext < EOF *************** *** 1869,1887 **** # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 ! echo "configure:1873: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF ! if { (eval echo configure:1885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_header_alloca_h=yes else --- 1969,1987 ---- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 ! echo "configure:1973: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF ! if { (eval echo configure:1985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else *************** *** 1902,1926 **** fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 ! echo "configure:1906: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < # else ! # ifdef _AIX ! #pragma alloca # else ! # ifndef alloca /* predefined by HP cc +Olibcalls */ char *alloca (); # endif # endif # endif --- 2002,2031 ---- fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 ! echo "configure:2006: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < ! # define alloca _alloca # else ! # if HAVE_ALLOCA_H ! # include # else ! # ifdef _AIX ! #pragma alloca ! # else ! # ifndef alloca /* predefined by HP cc +Olibcalls */ char *alloca (); + # endif # endif # endif # endif *************** *** 1930,1936 **** char *p = (char *) alloca(1); ; return 0; } EOF ! if { (eval echo configure:1934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_func_alloca_works=yes else --- 2035,2041 ---- char *p = (char *) alloca(1); ; return 0; } EOF ! if { (eval echo configure:2039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else *************** *** 1955,1973 **** # that cause trouble. Some versions do not even contain alloca or # contain a buggy version. If you still want to use their alloca, # use ar to extract alloca.o from them instead of compiling alloca.c. ! ALLOCA=alloca.o cat >> confdefs.h <<\EOF #define C_ALLOCA 1 EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 ! echo "configure:1966: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <> confdefs.h <<\EOF #define C_ALLOCA 1 EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 ! echo "configure:2071: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ! echo "configure:1996: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ! echo "configure:2101: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else --- 2125,2131 ---- ; return 0; } EOF ! if { (eval echo configure:2129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else *************** *** 2047,2053 **** fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 ! echo "configure:2051: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 2152,2158 ---- fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 ! echo "configure:2156: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 2055,2061 **** ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else --- 2179,2185 ---- exit (find_stack_direction() < 0); } EOF ! if { (eval echo configure:2183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else *************** *** 2101,2112 **** EOF echo $ac_n "checking for vprintf""... $ac_c" 1>&6 ! echo "configure:2105: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ! echo "configure:2210: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else --- 2234,2240 ---- ; return 0; } EOF ! if { (eval echo configure:2238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else *************** *** 2153,2164 **** if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 ! echo "configure:2157: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ! echo "configure:2262: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else --- 2286,2292 ---- ; return 0; } EOF ! if { (eval echo configure:2290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else *************** *** 2207,2213 **** echo $ac_n "checking for fmod in -lm""... $ac_c" 1>&6 ! echo "configure:2211: checking for fmod in -lm" >&5 ac_lib_var=`echo m'_'fmod | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 2312,2318 ---- echo $ac_n "checking for fmod in -lm""... $ac_c" 1>&6 ! echo "configure:2316: checking for fmod in -lm" >&5 ac_lib_var=`echo m'_'fmod | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 2215,2221 **** ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else --- 2331,2337 ---- fmod() ; return 0; } EOF ! if { (eval echo configure:2335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else *************** *** 2257,2268 **** strftime strncasecmp strtod system tzset do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ! echo "configure:2261: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ! echo "configure:2366: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else --- 2390,2396 ---- ; return 0; } EOF ! if { (eval echo configure:2394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else *************** *** 2314,2331 **** do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ! echo "configure:2318: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:2328: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" --- 2419,2436 ---- do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ! echo "configure:2423: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:2433: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" *************** *** 2353,2364 **** for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ! echo "configure:2357: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ! echo "configure:2462: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else --- 2486,2492 ---- ; return 0; } EOF ! if { (eval echo configure:2490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else *************** *** 2406,2412 **** done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 ! echo "configure:2410: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 2511,2517 ---- done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 ! echo "configure:2515: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 2414,2420 **** ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else --- 2659,2665 ---- } EOF ! if { (eval echo configure:2663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else *************** *** 2601,2607 **** # have to do the getpgrp test since won't # fall into the default echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6 ! echo "configure:2605: checking whether getpgrp takes no argument" >&5 if eval "test \"`echo '$''{'ac_cv_func_getpgrp_void'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 2706,2712 ---- # have to do the getpgrp test since won't # fall into the default echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6 ! echo "configure:2710: checking whether getpgrp takes no argument" >&5 if eval "test \"`echo '$''{'ac_cv_func_getpgrp_void'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 2609,2615 **** { echo "configure: error: cannot check getpgrp if cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_getpgrp_void=yes else --- 2769,2775 ---- } EOF ! if { (eval echo configure:2773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_getpgrp_void=yes else *************** *** 2689,2695 **** ;; *) echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6 ! echo "configure:2693: checking whether getpgrp takes no argument" >&5 if eval "test \"`echo '$''{'ac_cv_func_getpgrp_void'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 2794,2800 ---- ;; *) echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6 ! echo "configure:2798: checking whether getpgrp takes no argument" >&5 if eval "test \"`echo '$''{'ac_cv_func_getpgrp_void'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 2697,2703 **** { echo "configure: error: cannot check getpgrp if cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_getpgrp_void=yes else --- 2857,2863 ---- } EOF ! if { (eval echo configure:2861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_getpgrp_void=yes else *************** *** 2779,2785 **** esac else echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6 ! echo "configure:2783: checking whether getpgrp takes no argument" >&5 if eval "test \"`echo '$''{'ac_cv_func_getpgrp_void'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else --- 2884,2890 ---- esac else echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6 ! echo "configure:2888: checking whether getpgrp takes no argument" >&5 if eval "test \"`echo '$''{'ac_cv_func_getpgrp_void'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else *************** *** 2787,2793 **** { echo "configure: error: cannot check getpgrp if cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_getpgrp_void=yes else --- 2947,2953 ---- } EOF ! if { (eval echo configure:2951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_getpgrp_void=yes else *************** *** 2868,2879 **** fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 ! echo "configure:2872: checking for st_blksize in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include --- 2973,2984 ---- fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 ! echo "configure:2977: checking for st_blksize in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include *************** *** 2881,2887 **** struct stat s; s.st_blksize; ; return 0; } EOF ! if { (eval echo configure:2885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else --- 2986,2992 ---- struct stat s; s.st_blksize; ; return 0; } EOF ! if { (eval echo configure:2990: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else *************** *** 2902,2913 **** fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 ! echo "configure:2906: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include --- 3007,3018 ---- fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 ! echo "configure:3011: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include *************** *** 2916,2922 **** struct tm *tp; ; return 0; } EOF ! if { (eval echo configure:2920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else --- 3021,3027 ---- struct tm *tp; ; return 0; } EOF ! if { (eval echo configure:3025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else *************** *** 2937,2948 **** fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 ! echo "configure:2941: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include --- 3042,3053 ---- fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 ! echo "configure:3046: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include *************** *** 2950,2956 **** struct tm *tp; tp->tm_sec; ; return 0; } EOF ! if { (eval echo configure:2954: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else --- 3055,3061 ---- struct tm *tp; tp->tm_sec; ; return 0; } EOF ! if { (eval echo configure:3059: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else *************** *** 2971,2982 **** fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 ! echo "configure:2975: checking for tm_zone in struct tm" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_cv_struct_tm> --- 3076,3087 ---- fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 ! echo "configure:3080: checking for tm_zone in struct tm" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_cv_struct_tm> *************** *** 2984,2990 **** struct tm tm; tm.tm_zone; ; return 0; } EOF ! if { (eval echo configure:2988: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else --- 3089,3095 ---- struct tm tm; tm.tm_zone; ; return 0; } EOF ! if { (eval echo configure:3093: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else *************** *** 3004,3015 **** else echo $ac_n "checking for tzname""... $ac_c" 1>&6 ! echo "configure:3008: checking for tzname" >&5 if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifndef tzname /* For SGI. */ --- 3109,3120 ---- else echo $ac_n "checking for tzname""... $ac_c" 1>&6 ! echo "configure:3113: checking for tzname" >&5 if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifndef tzname /* For SGI. */ *************** *** 3019,3025 **** atoi(*tzname); ; return 0; } EOF ! if { (eval echo configure:3023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_var_tzname=yes else --- 3124,3130 ---- atoi(*tzname); ; return 0; } EOF ! if { (eval echo configure:3128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else *************** *** 3042,3055 **** echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6 ! echo "configure:3046: checking whether char is unsigned" >&5 if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$GCC" = yes; then # GCC predefines this symbol on systems where it applies. cat > conftest.$ac_ext <&6 ! echo "configure:3151: checking whether char is unsigned" >&5 if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$GCC" = yes; then # GCC predefines this symbol on systems where it applies. cat > conftest.$ac_ext <&2; exit 1; } else cat > conftest.$ac_ext <&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_c_char_unsigned=yes else --- 3186,3192 ---- volatile char c = 255; exit(c < 0); } EOF ! if { (eval echo configure:3190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_char_unsigned=yes else *************** *** 3105,3116 **** fi echo $ac_n "checking for working const""... $ac_c" 1>&6 ! echo "configure:3109: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ! echo "configure:3214: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else --- 3264,3270 ---- ; return 0; } EOF ! if { (eval echo configure:3268: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else *************** *** 3182,3193 **** echo $ac_n "checking for ANSI stringizing capability""... $ac_c" 1>&6 ! echo "configure:3186: checking for ANSI stringizing capability" >&5 if eval "test \"`echo '$''{'gawk_cv_c_stringize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ! echo "configure:3291: checking for ANSI stringizing capability" >&5 if eval "test \"`echo '$''{'gawk_cv_c_stringize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&1 | ! case `(ac_space=' '; set) 2>&1` in *ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote substitution # turns \\\\ into \\, and sed turns \\ into \). --- 3345,3351 ---- # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. (set) 2>&1 | ! case `(ac_space=' '; set | grep ac_space) 2>&1` in *ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote substitution # turns \\\\ into \\, and sed turns \\ into \). *************** *** 3307,3313 **** echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) ! echo "$CONFIG_STATUS generated by autoconf version 2.12" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; --- 3412,3418 ---- echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) ! echo "$CONFIG_STATUS generated by autoconf version 2.13" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; *************** *** 3327,3335 **** --- 3432,3442 ---- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF $ac_vpsub $extrasub + s%@SHELL@%$SHELL%g s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g s%@CXXFLAGS@%$CXXFLAGS%g + s%@FFLAGS@%$FFLAGS%g s%@DEFS@%$DEFS%g s%@LDFLAGS@%$LDFLAGS%g s%@LIBS@%$LIBS%g *************** *** 3348,3371 **** s%@oldincludedir@%$oldincludedir%g s%@infodir@%$infodir%g s%@mandir@%$mandir%g - s%@host@%$host%g - s%@host_alias@%$host_alias%g - s%@host_cpu@%$host_cpu%g - s%@host_vendor@%$host_vendor%g - s%@host_os@%$host_os%g s%@YACC@%$YACC%g s%@LN_S@%$LN_S%g s%@CC@%$CC%g s%@CPP@%$CPP%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g s%@INSTALL_DATA@%$INSTALL_DATA%g s%@SET_MAKE@%$SET_MAKE%g - s%@build@%$build%g - s%@build_alias@%$build_alias%g - s%@build_cpu@%$build_cpu%g - s%@build_vendor@%$build_vendor%g - s%@build_os@%$build_os%g - s%@GETCONF@%$GETCONF%g s%@ALLOCA@%$ALLOCA%g CEOF --- 3455,3468 ---- s%@oldincludedir@%$oldincludedir%g s%@infodir@%$infodir%g s%@mandir@%$mandir%g s%@YACC@%$YACC%g s%@LN_S@%$LN_S%g s%@CC@%$CC%g s%@CPP@%$CPP%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g + s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@INSTALL_DATA@%$INSTALL_DATA%g s%@SET_MAKE@%$SET_MAKE%g s%@ALLOCA@%$ALLOCA%g CEOF diff -cNr gawk-3.0.4/configure.in gawk-3.0.5/configure.in *** gawk-3.0.4/configure.in Wed Jun 9 11:34:12 1999 --- gawk-3.0.5/configure.in Mon Jun 12 15:55:50 2000 *************** *** 1,7 **** dnl dnl configure.in --- autoconf input file for gawk dnl ! dnl Copyright (C) 1995-1999 the Free Software Foundation, Inc. dnl dnl This file is part of GAWK, the GNU implementation of the dnl AWK Programming Language. --- 1,7 ---- dnl dnl configure.in --- autoconf input file for gawk dnl ! dnl Copyright (C) 1995-2000 the Free Software Foundation, Inc. dnl dnl This file is part of GAWK, the GNU implementation of the dnl AWK Programming Language. *************** *** 30,36 **** AC_INIT(awk.h) AC_PREREQ(2.12) AC_CONFIG_HEADER(config.h:configh.in) - AC_CANONICAL_HOST dnl Additional argument stuff AC_ARG_ENABLE(bitops, [ --enable-bitops Enable Octal and Hex constants and bit functions], AC_DEFINE(BITOPS)) --- 30,35 ---- *************** *** 60,74 **** CFLAGS="-O" fi fi - AC_SUBST(CFLAGS) ! dnl check for Solaris (or other) large file support ! GAWK_AC_SYS_LARGEFILE dnl checks for systems AC_AIX AC_ISC_POSIX AC_MINIX GAWK_AC_AIX_TWEAK if test "$ISC" = 1 # will be set by test for ISC --- 59,81 ---- CFLAGS="-O" fi fi ! # This is mainly for my use during testing and development. ! # Yes, it's a bit of a hack. ! if test -f $srcdir/.developing ! then ! AC_DEFINE(BITOPS) ! AC_DEFINE(NONDECDATA) ! CFLAGS="$CFLAGS -DARRAYDEBUG" ! fi ! ! AC_SUBST(CFLAGS) dnl checks for systems AC_AIX AC_ISC_POSIX AC_MINIX + GAWK_AC_SYS_LARGEFILE GAWK_AC_AIX_TWEAK if test "$ISC" = 1 # will be set by test for ISC diff -cNr gawk-3.0.4/custom.h gawk-3.0.5/custom.h *** gawk-3.0.4/custom.h Wed Apr 28 17:10:44 1999 --- gawk-3.0.5/custom.h Wed Jun 7 11:45:28 2000 *************** *** 11,17 **** */ /* ! * Copyright (C) 1995-1999 the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the * AWK Programming Language. --- 11,17 ---- */ /* ! * Copyright (C) 1995-2000 the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the * AWK Programming Language. diff -cNr gawk-3.0.4/doc/ChangeLog gawk-3.0.5/doc/ChangeLog *** gawk-3.0.4/doc/ChangeLog Wed Jun 30 16:15:09 1999 --- gawk-3.0.5/doc/ChangeLog Sun Jun 25 15:09:06 2000 *************** *** 1,3 **** --- 1,52 ---- + Sun Jun 25 15:08:19 2000 Arnold D. Robbins + + * Release 3.0.5: Release tar file made. + + Wed May 17 19:04:54 2000 Arnold D. Robbins + + * gawk.texi, gawk.1, awkcard.in: Documented %u. Ooops. + + Tue May 2 11:44:13 2000 Arnold D. Robbins + + * texinfo.tex: Updated to version 1999-10-01.07. + * gawk.texi: Redid page breaking for new texinfo.tex. + + Thu Apr 6 12:32:49 2000 Arnold D. Robbins + + * gawk.texi: Change info dir file entry to `(gawk)' from + `(gawk.info)'. + * Makefile.in [$(infodir)/gawk.info]: Fix grep test is + accordance with above. + + Sun Feb 13 15:36:32 2000 Paul Eggert + + * gawk.texi: Mention that arithmetic is done in double + precision floating point, and point to Goldberg's paper for + people who want to know more. Fix some other minor floating + point discussion issues. + + Wed Nov 3 17:04:35 1999 Arnold D. Robbins + + * gawk.1: Lots of troff ``lint'' from Paul Eggert. Not all + of his changes, just the ones I thought worth doing. + + Mon Oct 11 16:53:54 1999 Arnold D. Robbins + + * Makefile.in (gawk.dvi): Put $(srcdir) first in TEXINPUTS, + and also just use texi2dvi, don't run texindex and tex + manually. Doing so is no longer necessary. + + Mon Aug 9 13:06:01 1999 Arnold D. Robbins + + * gawk.texi: New node `Array Efficiency' on the best use + of subscripting to avoid memory bloat. + + Thu Jul 29 23:15:34 1999 Arnold D. Robbins + + * Makefile.in ($(infodir)/gawk.info): Removed loop around + $(INSTALL_DATA), since there's only one Info file to install, + install it directly. + Wed Jun 30 16:14:36 1999 Arnold D. Robbins * Release 3.0.4: Release tar file made. This time for sure. diff -cNr gawk-3.0.4/doc/Makefile.in gawk-3.0.5/doc/Makefile.in *** gawk-3.0.4/doc/Makefile.in Wed Apr 28 17:21:56 1999 --- gawk-3.0.5/doc/Makefile.in Wed Jun 7 11:48:18 2000 *************** *** 1,6 **** # Makefile for GNU Awk documentation. # ! # Copyright (C) 1993-1999 the Free Software Foundation, Inc. # # This file is part of GAWK, the GNU implementation of the # AWK Programming Language. --- 1,6 ---- # Makefile for GNU Awk documentation. # ! # Copyright (C) 1993-2000 the Free Software Foundation, Inc. # # This file is part of GAWK, the GNU implementation of the # AWK Programming Language. *************** *** 76,87 **** else d=$(srcdir); fi; \ if [ -f $(infodir)/dir -a -f $(infodir)/gawk.info ] \ && cmp $$d/gawk.info $(infodir)/gawk.info > /dev/null \ ! && grep '(gawk\.info)' $(infodir)/dir > /dev/null; then \ exit 0; \ fi; \ ! for i in $$d/gawk.info*; do \ ! $(INSTALL_DATA) $$i $(infodir)/$$i ; \ ! done; \ if $(SHELL) -c 'install-info --version' > /dev/null 2>&1 ; \ then install-info --info-dir=$(infodir) gawk.info ; \ else true ; fi; exit 0 --- 76,85 ---- else d=$(srcdir); fi; \ if [ -f $(infodir)/dir -a -f $(infodir)/gawk.info ] \ && cmp $$d/gawk.info $(infodir)/gawk.info > /dev/null \ ! && grep '(gawk)' $(infodir)/dir > /dev/null; then \ exit 0; \ fi; \ ! $(INSTALL_DATA) $$d/gawk.info $(infodir)/gawk.info ; \ if $(SHELL) -c 'install-info --version' > /dev/null 2>&1 ; \ then install-info --info-dir=$(infodir) gawk.info ; \ else true ; fi; exit 0 *************** *** 98,106 **** dvi: gawk.dvi gawk.dvi: gawk.texi ! -TEXINPUTS=$$TEXINPUTS:$(srcdir) $(TEXI2DVI) $(srcdir)/gawk.texi ! texindex gawk.?? ! TEXINPUTS=$$TEXINPUTS:$(srcdir) $(TEX) $(srcdir)/gawk.texi info: gawk.info --- 96,102 ---- dvi: gawk.dvi gawk.dvi: gawk.texi ! -TEXINPUTS=$(srcdir):$$TEXINPUTS $(TEXI2DVI) $(srcdir)/gawk.texi info: gawk.info diff -cNr gawk-3.0.4/doc/awkcard.in gawk-3.0.5/doc/awkcard.in *** gawk-3.0.4/doc/awkcard.in Wed May 5 17:45:34 1999 --- gawk-3.0.5/doc/awkcard.in Wed May 17 19:04:49 2000 *************** *** 1,6 **** .\" AWK Reference Card --- Arnold Robbins, arnold@gnu.org .\" ! .\" Copyright (C) 1996, 97, 98, 99 Free Software Foundation, Inc. .\" .\" Permission is granted to make and distribute verbatim copies of .\" this reference card provided the copyright notice and this permission --- 1,6 ---- .\" AWK Reference Card --- Arnold Robbins, arnold@gnu.org .\" ! .\" Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. .\" .\" Permission is granted to make and distribute verbatim copies of .\" this reference card provided the copyright notice and this permission *************** *** 95,101 **** \*(CD .SL .nf ! \*(FR\(co Copyright 1996-1999, Free Software Foundation 59 Temple Place \(em Suite 330 Boston, MA 02111-1307 USA .nf --- 95,101 ---- \*(CD .SL .nf ! \*(FR\(co Copyright 1996-2000, Free Software Foundation 59 Temple Place \(em Suite 330 Boston, MA 02111-1307 USA .nf *************** *** 1078,1083 **** --- 1078,1084 ---- nonsignificant zeros suppressed \*(FC%G\fP like \*(FC%g\fP, but use \*(FC%E\fP instead of \*(FC%e\*(FR \*(FC%o\fP an unsigned octal integer + \*(FC%u\fP an unsigned decimal integer \*(FC%s\fP a character string \*(FC%x\fP an unsigned hexadecimal integer \*(FC%X\fP like \*(FC%x\fP, but use \*(FCABCDEF\fP for 10\(en15 *************** *** 1503,1509 **** .ES .nf \*(CDHost: \*(FCgnudist.gnu.org\*(FR ! File: \*(FC/gnu/gawk/gawk-3.0.4.tar.gz\fP .in +.2i .fi GNU \*(AK (\*(GK). There may be a later version. --- 1504,1510 ---- .ES .nf \*(CDHost: \*(FCgnudist.gnu.org\*(FR ! File: \*(FC/gnu/gawk/gawk-3.0.5.tar.gz\fP .in +.2i .fi GNU \*(AK (\*(GK). There may be a later version. *************** *** 1530,1536 **** .\" --- Copying Permissions .ES .fi ! \*(CDCopyright \(co 1996, 1997 Free Software Foundation, Inc. .sp .5 Permission is granted to make and distribute verbatim copies of this reference card provided the copyright notice and this permission notice --- 1531,1537 ---- .\" --- Copying Permissions .ES .fi ! \*(CDCopyright \(co 1996-2000 Free Software Foundation, Inc. .sp .5 Permission is granted to make and distribute verbatim copies of this reference card provided the copyright notice and this permission notice diff -cNr gawk-3.0.4/doc/gawk.1 gawk-3.0.5/doc/gawk.1 *** gawk-3.0.4/doc/gawk.1 Wed Apr 28 17:23:33 1999 --- gawk-3.0.5/doc/gawk.1 Wed Jun 7 11:49:04 2000 *************** *** 1,28 **** .ds PX \s-1POSIX\s+1 .ds UX \s-1UNIX\s+1 .ds AN \s-1ANSI\s+1 ! .TH GAWK 1 "Apr 28 1999" "Free Software Foundation" "Utility Commands" .SH NAME gawk \- pattern scanning and processing language .SH SYNOPSIS .B gawk ! [ POSIX or GNU style options ] .B \-f .I program-file [ .B \-\^\- ! ] file .\^.\^. .br .B gawk ! [ POSIX or GNU style options ] [ .B \-\^\- ] .I program-text ! file .\^.\^. .SH DESCRIPTION .I Gawk ! is the GNU Project's implementation of the AWK programming language. It conforms to the definition of the language in the \*(PX 1003.2 Command Language And Utilities Standard. This version in turn is based on the description in --- 1,40 ---- .ds PX \s-1POSIX\s+1 .ds UX \s-1UNIX\s+1 .ds AN \s-1ANSI\s+1 ! .ds GN \s-1GNU\s+1 ! .ds AK \s-1AWK\s+1 ! .if !\n(.g \{\ ! . if !\w|\*(lq| \{\ ! . ds lq `` ! . if \w'\(lq' .ds lq "\(lq ! . \} ! . if !\w|\*(rq| \{\ ! . ds rq '' ! . if \w'\(rq' .ds rq "\(rq ! . \} ! .\} ! .TH GAWK 1 "May 17 2000" "Free Software Foundation" "Utility Commands" .SH NAME gawk \- pattern scanning and processing language .SH SYNOPSIS .B gawk ! [ \*(PX or \*(GN style options ] .B \-f .I program-file [ .B \-\^\- ! ] file .\|.\|. .br .B gawk ! [ \*(PX or \*(GN style options ] [ .B \-\^\- ] .I program-text ! file .\|.\|. .SH DESCRIPTION .I Gawk ! is the \*(GN Project's implementation of the \*(AK programming language. It conforms to the definition of the language in the \*(PX 1003.2 Command Language And Utilities Standard. This version in turn is based on the description in *************** *** 34,44 **** .I Gawk also provides more recent Bell Labs .I awk ! extensions, and some GNU-specific extensions. .PP The command line consists of options to .I gawk ! itself, the AWK program text (if not supplied via the .B \-f or .B \-\^\-file --- 46,56 ---- .I Gawk also provides more recent Bell Labs .I awk ! extensions, and some \*(GN-specific extensions. .PP The command line consists of options to .I gawk ! itself, the \*(AK program text (if not supplied via the .B \-f or .B \-\^\-file *************** *** 47,60 **** .B ARGC and .B ARGV ! pre-defined AWK variables. .SH OPTION FORMAT .PP .I Gawk options may be either the traditional \*(PX one letter options, ! or the GNU style long options. \*(PX options start with a single ``\-'', ! while long options start with ``\-\^\-''. ! Long options are provided for both GNU-specific features and for \*(PX mandated features. .PP Following the \*(PX standard, --- 59,72 ---- .B ARGC and .B ARGV ! pre-defined \*(AK variables. .SH OPTION FORMAT .PP .I Gawk options may be either the traditional \*(PX one letter options, ! or the \*(GN style long options. \*(PX options start with a single \*(lq\-\*(rq, ! while long options start with \*(lq\-\^\-\*(rq. ! Long options are provided for both \*(GN-specific features and for \*(PX mandated features. .PP Following the \*(PX standard, *************** *** 103,116 **** before execution of the program begins. Such variable values are available to the .B BEGIN ! block of an AWK program. .TP .PD 0 .BI \-f " program-file" .TP .PD .BI \-\^\-file " program-file" ! Read the AWK program source from the file .IR program-file , instead of from the first command line argument. Multiple --- 115,128 ---- before execution of the program begins. Such variable values are available to the .B BEGIN ! block of an \*(AK program. .TP .PD 0 .BI \-f " program-file" .TP .PD .BI \-\^\-file " program-file" ! Read the \*(AK program source from the file .IR program-file , instead of from the first command line argument. Multiple *************** *** 157,163 **** .I gawk behaves identically to \*(UX .IR awk ; ! none of the GNU-specific extensions are recognized. The use of .B \-\^\-traditional is preferred over the other forms of this option. --- 169,175 ---- .I gawk behaves identically to \*(UX .IR awk ; ! none of the \*(GN-specific extensions are recognized. The use of .B \-\^\-traditional is preferred over the other forms of this option. *************** *** 176,182 **** .TP .PD .B \-\^\-copyright ! Print the short version of the GNU copyright information message on the standard output, and exits successfully. .TP .PD 0 --- 188,194 ---- .TP .PD .B \-\^\-copyright ! Print the short version of the \*(GN copyright information message on the standard output, and exits successfully. .TP .PD 0 *************** *** 202,208 **** .PD .B \-\^\-lint Provide warnings about constructs that are ! dubious or non-portable to other AWK implementations. .TP .PD 0 .B "\-W lint\-old" --- 214,220 ---- .PD .B \-\^\-lint Provide warnings about constructs that are ! dubious or non-portable to other \*(AK implementations. .TP .PD 0 .B "\-W lint\-old" *************** *** 231,237 **** .PD .B \-\^\-posix This turns on ! .I compatibility mode, with the following additional restrictions: .RS .TP \w'\(bu'u+1n --- 243,249 ---- .PD .B \-\^\-posix This turns on ! .I compatibility mode, with the following additional restrictions: .RS .TP \w'\(bu'u+1n *************** *** 279,291 **** .BR "Regular Expressions" , below). Interval expressions were not traditionally available in the ! AWK language. The POSIX standard added them, to make .I awk and .I egrep consistent with each other. However, their use is likely ! to break old AWK programs, so .I gawk only provides them if they are requested with this option, or when .B \-\^\-posix --- 291,303 ---- .BR "Regular Expressions" , below). Interval expressions were not traditionally available in the ! \*(AK language. The \*(PX standard added them, to make .I awk and .I egrep consistent with each other. However, their use is likely ! to break old \*(AK programs, so .I gawk only provides them if they are requested with this option, or when .B \-\^\-posix *************** *** 298,310 **** .BI \-\^\-source " program-text" Use .I program-text ! as AWK program source code. ! This option allows the easy intermixing of library functions (used via the .B \-f and .B \-\^\-file options) with source code entered on the command line. ! It is intended primarily for medium to large AWK programs used in shell scripts. .TP .PD 0 --- 310,322 ---- .BI \-\^\-source " program-text" Use .I program-text ! as \*(AK program source code. ! This option allows the easy intermixing of library functions (used via the .B \-f and .B \-\^\-file options) with source code entered on the command line. ! It is intended primarily for medium to large \*(AK programs used in shell scripts. .TP .PD 0 *************** *** 326,346 **** these options cause an immediate, successful exit.) .TP .B \-\^\- ! Signal the end of options. This is useful to allow further arguments to the ! AWK program itself to start with a ``\-''. This is mainly for consistency with the argument parsing convention used by most other \*(PX programs. .PP In compatibility mode, any other options are flagged as illegal, but are otherwise ignored. In normal operation, as long as program text has been supplied, unknown ! options are passed on to the AWK program in the .B ARGV ! array for processing. This is particularly useful for running AWK ! programs via the ``#!'' executable interpreter mechanism. .SH AWK PROGRAM EXECUTION .PP ! An AWK program consists of a sequence of pattern-action statements and optional function definitions. .RS .PP --- 338,358 ---- these options cause an immediate, successful exit.) .TP .B \-\^\- ! Signal the end of options. This is useful to allow further arguments to the ! \*(AK program itself to start with a \*(lq\-\*(rq. This is mainly for consistency with the argument parsing convention used by most other \*(PX programs. .PP In compatibility mode, any other options are flagged as illegal, but are otherwise ignored. In normal operation, as long as program text has been supplied, unknown ! options are passed on to the \*(AK program in the .B ARGV ! array for processing. This is particularly useful for running \*(AK ! programs via the \*(lq#!\*(rq executable interpreter mechanism. .SH AWK PROGRAM EXECUTION .PP ! An \*(AK program consists of a sequence of pattern-action statements and optional function definitions. .RS .PP *************** *** 366,379 **** .IR program-file s and command line source texts had been concatenated together. This is useful for building libraries ! of AWK functions, without having to include them in each new AWK program that uses them. It also provides the ability to mix library functions with command line programs. .PP The environment variable .B AWKPATH specifies a search path to use when finding source files named with ! the .B \-f option. If this variable does not exist, the default path is \fB".:/usr/local/share/awk"\fR. --- 378,391 ---- .IR program-file s and command line source texts had been concatenated together. This is useful for building libraries ! of \*(AK functions, without having to include them in each new \*(AK program that uses them. It also provides the ability to mix library functions with command line programs. .PP The environment variable .B AWKPATH specifies a search path to use when finding source files named with ! the .B \-f option. If this variable does not exist, the default path is \fB".:/usr/local/share/awk"\fR. *************** *** 382,391 **** was built and installed.) If a file name given to the .B \-f ! option contains a ``/'' character, no path search is performed. .PP .I Gawk ! executes AWK programs in the following order. First, all variable assignments specified via the .B \-v --- 394,403 ---- was built and installed.) If a file name given to the .B \-f ! option contains a \*(lq/\*(rq character, no path search is performed. .PP .I Gawk ! executes \*(AK programs in the following order. First, all variable assignments specified via the .B \-v *************** *** 408,414 **** .PP If a filename on the command line has the form .IB var = val ! it is treated as a variable assignment. The variable .I var will be assigned the value .IR val . --- 420,426 ---- .PP If a filename on the command line has the form .IB var = val ! it is treated as a variable assignment. The variable .I var will be assigned the value .IR val . *************** *** 417,424 **** block(s) have been run.) Command line variable assignment is most useful for dynamically assigning values to the variables ! AWK uses to control how input is broken into fields and records. It ! is also useful for controlling state if multiple passes are needed over a single data file. .PP If the value of a particular element of --- 429,436 ---- block(s) have been run.) Command line variable assignment is most useful for dynamically assigning values to the variables ! \*(AK uses to control how input is broken into fields and records. ! It is also useful for controlling state if multiple passes are needed over a single data file. .PP If the value of a particular element of *************** *** 431,437 **** .I gawk tests to see if it matches any .I pattern ! in the AWK program. For each pattern that the record matches, the associated .I action is executed. --- 443,449 ---- .I gawk tests to see if it matches any .I pattern ! in the \*(AK program. For each pattern that the record matches, the associated .I action is executed. *************** *** 443,460 **** .B END block(s) (if any). .SH VARIABLES, RECORDS AND FIELDS ! AWK variables are dynamic; they come into existence when they are ! first used. Their values are either floating-point numbers or strings, or both, ! depending upon how they are used. AWK also has one dimensional arrays; arrays with multiple dimensions may be simulated. Several pre-defined variables are set as a program runs; these will be described as needed and summarized below. .SS Records ! Normally, records are separated by newline characters. You can control how records are separated by assigning values to the built-in variable .BR RS . ! If .B RS is any single character, that character separates records. Otherwise, --- 455,472 ---- .B END block(s) (if any). .SH VARIABLES, RECORDS AND FIELDS ! \*(AK variables are dynamic; they come into existence when they are ! first used. Their values are either floating-point numbers or strings, or both, ! depending upon how they are used. \*(AK also has one dimensional arrays; arrays with multiple dimensions may be simulated. Several pre-defined variables are set as a program runs; these will be described as needed and summarized below. .SS Records ! Normally, records are separated by newline characters. You can control how records are separated by assigning values to the built-in variable .BR RS . ! If .B RS is any single character, that character separates records. Otherwise, *************** *** 498,504 **** is a single space, fields are separated by runs of spaces and/or tabs and/or newlines. (But see the discussion of ! .BR \-\-posix , below). Note that the value of .B IGNORECASE --- 510,516 ---- is a single space, fields are separated by runs of spaces and/or tabs and/or newlines. (But see the discussion of ! .BR \-\^\-posix , below). Note that the value of .B IGNORECASE *************** *** 527,533 **** .BR $2 , and so on. .B $0 ! is the whole record. The value of a field may be assigned to as well. Fields need not be referenced by constants: .RS .PP --- 539,545 ---- .BR $2 , and so on. .B $0 ! is the whole record. The value of a field may be assigned to as well. Fields need not be referenced by constants: .RS .PP *************** *** 545,552 **** .PP References to non-existent fields (i.e. fields after .BR $NF ) ! produce the null-string. However, assigning to a non-existent field ! (e.g., .BR "$(NF+2) = 5" ) will increase the value of .BR NF , --- 557,564 ---- .PP References to non-existent fields (i.e. fields after .BR $NF ) ! produce the null-string. However, assigning to a non-existent field ! (e.g., .BR "$(NF+2) = 5" ) will increase the value of .BR NF , *************** *** 579,585 **** of the current file being processed. .TP .B ARGV ! Array of command line arguments. The array is indexed from 0 to .B ARGC \- 1. --- 591,597 ---- of the current file being processed. .TP .B ARGV ! Array of command line arguments. The array is indexed from 0 to .B ARGC \- 1. *************** *** 632,638 **** The name of the current input file. If no files are specified on the command line, the value of .B FILENAME ! is ``\-''. However, .B FILENAME is undefined inside the --- 644,650 ---- The name of the current input file. If no files are specified on the command line, the value of .B FILENAME ! is \*(lq\-\*(rq. However, .B FILENAME is undefined inside the *************** *** 648,655 **** above. .TP .B IGNORECASE ! Controls the case-sensitivity of all regular expression ! and string operations. If .B IGNORECASE has a non-zero value, then string comparisons and pattern matching in rules, --- 660,667 ---- above. .TP .B IGNORECASE ! Controls the case-sensitivity of all regular expression ! and string operations. If .B IGNORECASE has a non-zero value, then string comparisons and pattern matching in rules, *************** *** 677,683 **** .B /aB/ matches all of the strings \fB"ab"\fP, \fB"aB"\fP, \fB"Ab"\fP, and \fB"AB"\fP. ! As with all AWK variables, the initial value of .B IGNORECASE is zero, so all regular expression and string operations are normally case-sensitive. --- 689,695 ---- .B /aB/ matches all of the strings \fB"ab"\fP, \fB"aB"\fP, \fB"Ab"\fP, and \fB"AB"\fP. ! As with all \*(AK variables, the initial value of .B IGNORECASE is zero, so all regular expression and string operations are normally case-sensitive. *************** *** 688,694 **** .I gawk prior to 3.0, .B IGNORECASE ! only affected regular expression operations. It now affects string comparisons as well. .TP .B NF --- 700,706 ---- .I gawk prior to 3.0, .B IGNORECASE ! only affected regular expression operations. It now affects string comparisons as well. .TP .B NF *************** *** 736,749 **** Arrays are subscripted with an expression between square brackets .RB ( [ " and " ] ). If the expression is an expression list ! .RI ( expr ", " expr " ...)" then the array subscript is a string consisting of the concatenation of the (string) value of each expression, separated by the value of the .B SUBSEP variable. This facility is used to simulate multiply dimensioned ! arrays. For example: .PP .RS .ft B --- 748,761 ---- Arrays are subscripted with an expression between square brackets .RB ( [ " and " ] ). If the expression is an expression list ! .RI ( expr ", " expr " .\|.\|.)" then the array subscript is a string consisting of the concatenation of the (string) value of each expression, separated by the value of the .B SUBSEP variable. This facility is used to simulate multiply dimensioned ! arrays. For example: .PP .RS .ft B *************** *** 755,761 **** .PP assigns the string \fB"hello, world\en"\fR to the element of the array .B x ! which is indexed by the string \fB"A\e034B\e034C"\fR. All arrays in AWK are associative, i.e. indexed by string values. .PP The special operator --- 767,773 ---- .PP assigns the string \fB"hello, world\en"\fR to the element of the array .B x ! which is indexed by the string \fB"A\e034B\e034C"\fR. All arrays in \*(AK are associative, i.e. indexed by string values. .PP The special operator *************** *** 795,802 **** .SS Variable Typing And Conversion .PP Variables and fields ! may be (floating point) numbers, or strings, or both. How the ! value of a variable is interpreted depends upon its context. If used in a numeric expression, it will be treated as a number, if used as a string it will be treated as a string. .PP --- 807,814 ---- .SS Variable Typing And Conversion .PP Variables and fields ! may be (floating point) numbers, or strings, or both. How the ! value of a variable is interpreted depends upon its context. If used in a numeric expression, it will be treated as a number, if used as a string it will be treated as a string. .PP *************** *** 811,817 **** as a format string for .IR sprintf (3), with the numeric value of the variable as the argument. ! However, even though all numbers in AWK are floating-point, integral values are .I always converted as integers. Thus, given --- 823,829 ---- as a format string for .IR sprintf (3), with the numeric value of the variable as the argument. ! However, even though all numbers in \*(AK are floating-point, integral values are .I always converted as integers. Thus, given *************** *** 834,840 **** performs comparisons as follows: If two variables are numeric, they are compared numerically. If one value is numeric and the other has a string value that is a ! ``numeric string,'' then comparisons are also done numerically. Otherwise, the numeric value is converted to a string and a string comparison is performed. Two strings are compared, of course, as strings. --- 846,852 ---- performs comparisons as follows: If two variables are numeric, they are compared numerically. If one value is numeric and the other has a string value that is a ! \*(lqnumeric string,\*(rq then comparisons are also done numerically. Otherwise, the numeric value is converted to a string and a string comparison is performed. Two strings are compared, of course, as strings. *************** *** 846,852 **** .PP Note that string constants, such as \fB"57"\fP, are .I not ! numeric strings, they are string constants. The idea of ``numeric string'' only applies to fields, .B getline input, --- 858,865 ---- .PP Note that string constants, such as \fB"57"\fP, are .I not ! numeric strings, they are string constants. ! The idea of \*(lqnumeric string\*(rq only applies to fields, .B getline input, *************** *** 865,877 **** Uninitialized variables have the numeric value 0 and the string value "" (the null, or empty, string). .SH PATTERNS AND ACTIONS ! AWK is a line oriented language. The pattern comes first, and then the ! action. Action statements are enclosed in .B { and .BR } . Either the pattern may be missing, or the action may be missing, but, ! of course, not both. If the pattern is missing, the action will be executed for every single record of input. A missing action is equivalent to .RS --- 878,890 ---- Uninitialized variables have the numeric value 0 and the string value "" (the null, or empty, string). .SH PATTERNS AND ACTIONS ! \*(AK is a line-oriented language. The pattern comes first, and then the ! action. Action statements are enclosed in .B { and .BR } . Either the pattern may be missing, or the action may be missing, but, ! of course, not both. If the pattern is missing, the action will be executed for every single record of input. A missing action is equivalent to .RS *************** *** 881,892 **** .PP which prints the entire record. .PP ! Comments begin with the ``#'' character, and continue until the end of the line. Blank lines may be used to separate statements. Normally, a statement ends with a newline, however, this is not the case for lines ending in ! a ``,'', .BR { , .BR ? , .BR : , --- 894,905 ---- .PP which prints the entire record. .PP ! Comments begin with the \*(lq#\*(rq character, and continue until the end of the line. Blank lines may be used to separate statements. Normally, a statement ends with a newline, however, this is not the case for lines ending in ! a \*(lq,\*(rq, .BR { , .BR ? , .BR : , *************** *** 898,913 **** or .B else also have their statements automatically continued on the following line. ! In other cases, a line can be continued by ending it with a ``\e'', in which case the newline will be ignored. .PP Multiple statements may ! be put on one line by separating them with a ``;''. This applies to both the statements within the action part of a pattern-action pair (the usual case), and to the pattern-action statements themselves. .SS Patterns ! AWK patterns may be one of the following: .PP .RS .nf --- 911,926 ---- or .B else also have their statements automatically continued on the following line. ! In other cases, a line can be continued by ending it with a \*(lq\e\*(rq, in which case the newline will be ignored. .PP Multiple statements may ! be put on one line by separating them with a \*(lq;\*(rq. This applies to both the statements within the action part of a pattern-action pair (the usual case), and to the pattern-action statements themselves. .SS Patterns ! \*(AK patterns may be one of the following: .PP .RS .nf *************** *** 934,941 **** patterns are merged as if all the statements had been written in a single .B BEGIN ! block. They are executed before any ! of the input is read. Similarly, all the .B END blocks are merged, and executed when all the input is exhausted (or when an --- 947,954 ---- patterns are merged as if all the statements had been written in a single .B BEGIN ! block. They are executed before any ! of the input is read. Similarly, all the .B END blocks are merged, and executed when all the input is exhausted (or when an *************** *** 970,985 **** .B ! operators are logical AND, logical OR, and logical NOT, respectively, as in C. They do short-circuit evaluation, also as in C, and are used for combining ! more primitive pattern expressions. As in most languages, parentheses may be used to change the order of evaluation. .PP The .B ?\^: ! operator is like the same operator in C. If the first pattern is true then the pattern used for testing is the second pattern, otherwise it is ! the third. Only one of the second and third patterns is evaluated. .PP ! The .IB pattern1 ", " pattern2 form of an expression is called a .IR "range pattern" . --- 983,998 ---- .B ! operators are logical AND, logical OR, and logical NOT, respectively, as in C. They do short-circuit evaluation, also as in C, and are used for combining ! more primitive pattern expressions. As in most languages, parentheses may be used to change the order of evaluation. .PP The .B ?\^: ! operator is like the same operator in C. If the first pattern is true then the pattern used for testing is the second pattern, otherwise it is ! the third. Only one of the second and third patterns is evaluated. .PP ! The .IB pattern1 ", " pattern2 form of an expression is called a .IR "range pattern" . *************** *** 987,998 **** .IR pattern1 , and continuing until a record that matches .IR pattern2 , ! inclusive. It does not combine with any other sort of pattern expression. .SS Regular Expressions Regular expressions are the extended kind found in .IR egrep . They are composed of characters as follows: ! .TP \w'\fB[^\fIabc...\fB]\fR'u+2n .I c matches the non-metacharacter .IR c . --- 1000,1011 ---- .IR pattern1 , and continuing until a record that matches .IR pattern2 , ! inclusive. It does not combine with any other sort of pattern expression. .SS Regular Expressions Regular expressions are the extended kind found in .IR egrep . They are composed of characters as follows: ! .TP \w'\fB[^\fIabc.\|.\|.\fB]\fR'u+2n .I c matches the non-metacharacter .IR c . *************** *** 1012,1024 **** .B $ matches the end of a string. .TP ! .BI [ abc... ] character list, matches any of the characters ! .IR abc... . .TP ! .BI [^ abc... ] negated character list, matches any character except ! .IR abc... . .TP .IB r1 | r2 alternation: matches either --- 1025,1037 ---- .B $ matches the end of a string. .TP ! .BI [ abc.\|.\|. ] character list, matches any of the characters ! .IR abc.\|.\|. . .TP ! .BI [^ abc.\|.\|. ] negated character list, matches any character except ! .IR abc.\|.\|. . .TP .IB r1 | r2 alternation: matches either *************** *** 1034,1048 **** .TP .IB r + matches one or more ! .IR r 's. .TP .IB r * matches zero or more ! .IR r 's. .TP .IB r ? matches zero or one ! .IR r 's. .TP .BI ( r ) grouping: matches --- 1047,1061 ---- .TP .IB r + matches one or more ! .IR r 's. .TP .IB r * matches zero or more ! .IR r 's. .TP .IB r ? matches zero or one ! .IR r 's. .TP .BI ( r ) grouping: matches *************** *** 1110,1118 **** are also legal in regular expressions. .PP .I "Character classes" ! are a new feature introduced in the POSIX standard. A character class is a special notation for describing ! lists of characters that have a specific attribute, but where the actual characters themselves can vary from country to country and/or from character set to character set. For example, the notion of what is an alphabetic character differs in the USA and in France. --- 1123,1131 ---- are also legal in regular expressions. .PP .I "Character classes" ! are a new feature introduced in the \*(PX standard. A character class is a special notation for describing ! lists of characters that have a specific attribute, but where the actual characters themselves can vary from country to country and/or from character set to character set. For example, the notion of what is an alphabetic character differs in the USA and in France. *************** *** 1124,1130 **** a keyword denoting the class, and .BR :] . Here are the character ! classes defined by the POSIX standard. .TP .B [:alnum:] Alphanumeric characters. --- 1137,1143 ---- a keyword denoting the class, and .BR :] . Here are the character ! classes defined by the \*(PX standard. .TP .B [:alnum:] Alphanumeric characters. *************** *** 1166,1176 **** .B [:xdigit:] Characters that are hexadecimal digits. .PP ! For example, before the POSIX standard, to match alphanumeric characters, you would have had to write .BR /[A\-Za\-z0\-9]/ . If your character set had other alphabetic characters in it, this would not ! match them. With the POSIX character classes, you can write .BR /[[:alnum:]]/ , and this will match .I all --- 1179,1189 ---- .B [:xdigit:] Characters that are hexadecimal digits. .PP ! For example, before the \*(PX standard, to match alphanumeric characters, you would have had to write .BR /[A\-Za\-z0\-9]/ . If your character set had other alphabetic characters in it, this would not ! match them. With the \*(PX character classes, you can write .BR /[[:alnum:]]/ , and this will match .I all *************** *** 1178,1189 **** .PP Two additional special sequences can appear in character lists. These apply to non-ASCII character sets, which can have single symbols ! (called .IR "collating elements" ) that are represented with more than one character, as well as several characters that are equivalent for .IR collating , ! or sorting, purposes. (E.g., in French, a plain ``e'' and a grave-accented e\` are equivalent.) .TP Collating Symbols --- 1191,1202 ---- .PP Two additional special sequences can appear in character lists. These apply to non-ASCII character sets, which can have single symbols ! (called .IR "collating elements" ) that are represented with more than one character, as well as several characters that are equivalent for .IR collating , ! or sorting, purposes. (E.g., in French, a plain \*(lqe\*(rq and a grave-accented e\` are equivalent.) .TP Collating Symbols *************** *** 1204,1217 **** .TP Equivalence Classes An equivalence class is a locale-specific name for a list of ! characters that are equivalent. The name is enclosed in .B [= and .BR =] . For example, the name .B e might be used to represent all of ! ``e,'' ``e\`,'' and ``e\`.'' In this case, .B [[=e]] is a regexp --- 1217,1230 ---- .TP Equivalence Classes An equivalence class is a locale-specific name for a list of ! characters that are equivalent. The name is enclosed in .B [= and .BR =] . For example, the name .B e might be used to represent all of ! \*(lqe,\*(rq \*(lqe\`,\*(rq and \*(lqe\`.\*(rq In this case, .B [[=e]] is a regexp *************** *** 1225,1231 **** The library functions that .I gawk uses for regular expression matching ! currently only recognize POSIX character classes; they do not recognize collating symbols or equivalence classes. .PP The --- 1238,1244 ---- The library functions that .I gawk uses for regular expression matching ! currently only recognize \*(PX character classes; they do not recognize collating symbols or equivalence classes. .PP The *************** *** 1240,1246 **** .B \e' operators are specific to .IR gawk ; ! they are extensions based on facilities in the GNU regexp libraries. .PP The various command line options control how --- 1253,1259 ---- .B \e' operators are specific to .IR gawk ; ! they are extensions based on facilities in the \*(GN regexp libraries. .PP The various command line options control how *************** *** 1251,1261 **** In the default case, .I gawk provide all the facilities of ! POSIX regexps and the GNU regexp operators described above. However, interval expressions are not supported. .TP .B \-\^\-posix ! Only POSIX regexps are supported, the GNU operators are not special. (E.g., .B \ew matches a literal --- 1264,1274 ---- In the default case, .I gawk provide all the facilities of ! \*(PX regexps and the \*(GN regexp operators described above. However, interval expressions are not supported. .TP .B \-\^\-posix ! Only \*(PX regexps are supported, the \*(GN operators are not special. (E.g., .B \ew matches a literal *************** *** 1265,1273 **** .B \-\^\-traditional Traditional Unix .I awk ! regexps are matched. The GNU operators are not special, interval expressions are not available, and neither ! are the POSIX character classes .RB ( [[:alnum:]] and so on). Characters described by octal and hexadecimal escape sequences are --- 1278,1286 ---- .B \-\^\-traditional Traditional Unix .I awk ! regexps are matched. The \*(GN operators are not special, interval expressions are not available, and neither ! are the \*(PX character classes .RB ( [[:alnum:]] and so on). Characters described by octal and hexadecimal escape sequences are *************** *** 1283,1297 **** and .BR } . Action statements consist of the usual assignment, conditional, and looping ! statements found in most languages. The operators, control statements, and input/output statements available are patterned after those in C. .SS Operators .PP ! The operators in AWK, in order of decreasing precedence, are .PP .TP "\w'\fB*= /= %= ^=\fR'u+1n" ! .BR ( \&... ) Grouping .TP .B $ --- 1296,1310 ---- and .BR } . Action statements consist of the usual assignment, conditional, and looping ! statements found in most languages. The operators, control statements, and input/output statements available are patterned after those in C. .SS Operators .PP ! The operators in \*(AK, in order of decreasing precedence, are .PP .TP "\w'\fB*= /= %= ^=\fR'u+1n" ! .BR ( \&.\|.\|. ) Grouping .TP .B $ *************** *** 1352,1360 **** Logical OR. .TP .B ?: ! The C conditional expression. This has the form .IB expr1 " ? " expr2 " : " expr3\c ! \&. If .I expr1 is true, the value of the expression is .IR expr2 , --- 1365,1374 ---- Logical OR. .TP .B ?: ! The C conditional expression. This has the form .IB expr1 " ? " expr2 " : " expr3\c ! \&. ! If .I expr1 is true, the value of the expression is .IR expr2 , *************** *** 1371,1377 **** .TP .PD .B "*= /= %= ^=" ! Assignment. Both absolute assignment .BI ( var " = " value ) and operator-assignment (the other forms) are supported. .SS Control Statements --- 1385,1391 ---- .TP .PD .B "*= /= %= ^=" ! Assignment. Both absolute assignment .BI ( var " = " value ) and operator-assignment (the other forms) are supported. .SS Control Statements *************** *** 1432,1440 **** .IR file . .TP .B next ! Stop processing the current input record. The next input record is read and processing starts over with the first pattern in the ! AWK program. If the end of the input data is reached, the .B END block(s), if any, are executed. .TP --- 1446,1454 ---- .IR file . .TP .B next ! Stop processing the current input record. The next input record is read and processing starts over with the first pattern in the ! \*(AK program. If the end of the input data is reached, the .B END block(s), if any, are executed. .TP *************** *** 1447,1459 **** are updated, .B FNR is reset to 1, and processing starts over with the first pattern in the ! AWK program. If the end of the input data is reached, the .B END block(s), if any, are executed. .B NOTE: Earlier versions of gawk used .BR "next file" , ! as two words. While this usage is still recognized, it generates a warning message and will eventually be removed. .TP .B print --- 1461,1473 ---- are updated, .B FNR is reset to 1, and processing starts over with the first pattern in the ! \*(AK program. If the end of the input data is reached, the .B END block(s), if any, are executed. .B NOTE: Earlier versions of gawk used .BR "next file" , ! as two words. While this usage is still recognized, it generates a warning message and will eventually be removed. .TP .B print *************** *** 1476,1482 **** .IR file . Each expression is separated by the value of the .B OFS ! variable. The output record is terminated with the value of the .B ORS variable. .TP --- 1490,1496 ---- .IR file . Each expression is separated by the value of the .B OFS ! variable. The output record is terminated with the value of the .B ORS variable. .TP *************** *** 1505,1515 **** then all open output files and pipes have their buffers flushed. .PP ! Other input/output redirections are also allowed. For .B print and .BR printf , ! .BI >> file appends output to the .IR file , while --- 1519,1529 ---- then all open output files and pipes have their buffers flushed. .PP ! Other input/output redirections are also allowed. For .B print and .BR printf , ! .BI >> " file" appends output to the .IR file , while *************** *** 1522,1530 **** The .BR getline command will return 0 on end of file, and \-1 on an error. .SS The \fIprintf\fP\^ Statement .PP ! The AWK versions of the .B printf statement and .B sprintf() --- 1536,1558 ---- The .BR getline command will return 0 on end of file, and \-1 on an error. + .PP + NOTE: If using a pipe to + .BR getline , + or from + .B print + or + .BR printf + within a loop, you + .I must + use + .B close() + to create new instances of the command. + AWK does not automatically close pipes when + they return EOF. .SS The \fIprintf\fP\^ Statement .PP ! The \*(AK versions of the .B printf statement and .B sprintf() *************** *** 1583,1589 **** .BR %e . .TP .B %o ! An unsigned octal number (again, an integer). .TP .B %s A character string. --- 1611,1621 ---- .BR %e . .TP .B %o ! An unsigned octal number (also an integer). ! .TP ! .PD ! .B %u ! An unsigned decimal number (again, an integer). .TP .B %s A character string. *************** *** 1594,1600 **** .PD .B %X An unsigned hexadecimal number (an integer). ! .The .B %X format uses .B ABCDEF --- 1626,1632 ---- .PD .B %X An unsigned hexadecimal number (an integer). ! The .B %X format uses .B ABCDEF *************** *** 1620,1631 **** .B + The plus sign, used before the width modifier (see below), says to always supply a sign for numeric conversions, even if the data ! to be formatted is positive. The .B + overrides the space modifier. .TP .B # ! Use an ``alternate form'' for certain control letters. For .BR %o , supply a leading zero. --- 1652,1663 ---- .B + The plus sign, used before the width modifier (see below), says to always supply a sign for numeric conversions, even if the data ! to be formatted is positive. The .B + overrides the space modifier. .TP .B # ! Use an \*(lqalternate form\*(rq for certain control letters. For .BR %o , supply a leading zero. *************** *** 1634,1642 **** and .BR %X , supply a leading ! .BR 0x or ! .BR 0X for a nonzero result. For --- 1666,1674 ---- and .BR %X , supply a leading ! .BR 0x or ! .BR 0X for a nonzero result. For *************** *** 1662,1668 **** value to be printed. .TP .I width ! The field should be padded to this width. The field is normally padded with spaces. If the .B 0 flag has been used, it is padded with zeroes. --- 1694,1700 ---- value to be printed. .TP .I width ! The field should be padded to this width. The field is normally padded with spaces. If the .B 0 flag has been used, it is padded with zeroes. *************** *** 1673,1679 **** .BR %e , .BR %E , and ! .BR %f formats, this specifies the number of digits you want printed to the right of the decimal point. For the --- 1705,1711 ---- .BR %e , .BR %E , and ! .BR %f formats, this specifies the number of digits you want printed to the right of the decimal point. For the *************** *** 1779,1785 **** The file associated with the open file descriptor .IR n . .PP ! These are particularly useful for error messages. For example: .PP .RS .ft B --- 1811,1817 ---- The file associated with the open file descriptor .IR n . .PP ! These are particularly useful for error messages. For example: .PP .RS .ft B *************** *** 1798,1804 **** These file names may also be used on the command line to name data files. .SS Numeric Functions .PP ! AWK has the following pre-defined arithmetic functions: .PP .TP \w'\fBsrand(\fR[\fIexpr\^\fR]\fB)\fR'u+1n .BI atan2( y , " x" ) --- 1830,1836 ---- These file names may also be used on the command line to name data files. .SS Numeric Functions .PP ! \*(AK has the following pre-defined arithmetic functions: .PP .TP \w'\fBsrand(\fR[\fIexpr\^\fR]\fB)\fR'u+1n .BI atan2( y , " x" ) *************** *** 1834,1840 **** \&\fBsrand(\fR[\fIexpr\^\fR]\fB)\fR uses .I expr ! as a new seed for the random number generator. If no .I expr is provided, the time of day will be used. The return value is the previous seed for the random --- 1866,1872 ---- \&\fBsrand(\fR[\fIexpr\^\fR]\fB)\fR uses .I expr ! as a new seed for the random number generator. If no .I expr is provided, the time of day will be used. The return value is the previous seed for the random *************** *** 1879,1885 **** is a digit from 1 to 9, may be used to indicate just the text that matched the .IR n 'th ! parenthesized subexpression. The sequence .B \e0 represents the entire matched text, as does the character .BR & . --- 1911,1917 ---- is a digit from 1 to 9, may be used to indicate just the text that matched the .IR n 'th ! parenthesized subexpression. The sequence .B \e0 represents the entire matched text, as does the character .BR & . *************** *** 1912,1918 **** to get a literal .BR & . See ! .I "AWK Language Programming" for a fuller discussion of the rules for .BR &'s and backslashes in the replacement text of --- 1944,1950 ---- to get a literal .BR & . See ! .I "Effective AWK Programming" for a fuller discussion of the rules for .BR &'s and backslashes in the replacement text of *************** *** 1958,1964 **** .I a on the regular expression .IR r , ! and returns the number of fields. If .I r is omitted, .B FS --- 1990,1996 ---- .I a on the regular expression .IR r , ! and returns the number of fields. If .I r is omitted, .B FS *************** *** 2010,2016 **** Non-alphabetic characters are left unchanged. .SS Time Functions .PP ! Since one of the primary uses of AWK programs is processing log files that contain time stamp information, .I gawk provides the following two functions for obtaining time stamps and --- 2042,2048 ---- Non-alphabetic characters are left unchanged. .SS Time Functions .PP ! Since one of the primary uses of \*(AK programs is processing log files that contain time stamp information, .I gawk provides the following two functions for obtaining time stamps and *************** *** 2052,2068 **** .IR gawk. .SS String Constants .PP ! String constants in AWK are sequences of characters enclosed ! between double quotes (\fB"\fR). Within strings, certain .I "escape sequences" ! are recognized, as in C. These are: .PP .TP \w'\fB\e\^\fIddd\fR'u+1n .B \e\e A literal backslash. .TP .B \ea ! The ``alert'' character; usually the \s-1ASCII\s+1 \s-1BEL\s+1 character. .TP .B \eb backspace. --- 2084,2100 ---- .IR gawk. .SS String Constants .PP ! String constants in \*(AK are sequences of characters enclosed ! between double quotes (\fB"\fR). Within strings, certain .I "escape sequences" ! are recognized, as in C. These are: .PP .TP \w'\fB\e\^\fIddd\fR'u+1n .B \e\e A literal backslash. .TP .B \ea ! The \*(lqalert\*(rq character; usually the \s-1ASCII\s+1 \s-1BEL\s+1 character. .TP .B \eb backspace. *************** *** 2093,2099 **** .TP .BI \e ddd The character represented by the 1-, 2-, or 3-digit sequence of octal ! digits. E.g. \fB"\e033"\fR is the \s-1ASCII\s+1 \s-1ESC\s+1 (escape) character. .TP .BI \e c The literal character --- 2125,2132 ---- .TP .BI \e ddd The character represented by the 1-, 2-, or 3-digit sequence of octal ! digits. ! E.g., \fB"\e033"\fR is the \s-1ASCII\s+1 \s-1ESC\s+1 (escape) character. .TP .BI \e c The literal character *************** *** 2106,2117 **** .PP In compatibility mode, the characters represented by octal and hexadecimal escape sequences are treated literally when used in ! regexp constants. Thus, .B /a\e52b/ is equivalent to .BR /a\e*b/ . .SH FUNCTIONS ! Functions in AWK are defined as follows: .PP .RS \fBfunction \fIname\fB(\fIparameter list\fB) { \fIstatements \fB}\fR --- 2139,2150 ---- .PP In compatibility mode, the characters represented by octal and hexadecimal escape sequences are treated literally when used in ! regexp constants. Thus, .B /a\e52b/ is equivalent to .BR /a\e*b/ . .SH FUNCTIONS ! Functions in \*(AK are defined as follows: .PP .RS \fBfunction \fIname\fB(\fIparameter list\fB) { \fIstatements \fB}\fR *************** *** 2122,2141 **** call are used to instantiate the formal parameters declared in the function. Arrays are passed by reference, other variables are passed by value. .PP ! Since functions were not originally part of the AWK language, the provision for local variables is rather clumsy: They are declared as extra parameters ! in the parameter list. The convention is to separate local variables from ! real parameters by extra spaces in the parameter list. For example: .PP .RS .ft B .nf function f(p, q, a, b) # a & b are local { ! \&..... } ! /abc/ { ... ; f(1, 2) ; ... } .fi .ft R .RE --- 2155,2174 ---- call are used to instantiate the formal parameters declared in the function. Arrays are passed by reference, other variables are passed by value. .PP ! Since functions were not originally part of the \*(AK language, the provision for local variables is rather clumsy: They are declared as extra parameters ! in the parameter list. The convention is to separate local variables from ! real parameters by extra spaces in the parameter list. For example: .PP .RS .ft B .nf function f(p, q, a, b) # a & b are local { ! \&.\|.\|. } ! /abc/ { .\|.\|. ; f(1, 2) ; .\|.\|. } .fi .ft R .RE *************** *** 2152,2159 **** .PP Use .BI return " expr" ! to return a value from a function. The return value is undefined if no ! value is provided, or if the function returns by ``falling off'' the end. .PP If --- 2185,2192 ---- .PP Use .BI return " expr" ! to return a value from a function. The return value is undefined if no ! value is provided, or if the function returns by \*(lqfalling off\*(rq the end. .PP If *************** *** 2209,2217 **** .PP .IR "The AWK Programming Language" , Alfred V. Aho, Brian W. Kernighan, Peter J. Weinberger, ! Addison-Wesley, 1988. ISBN 0-201-07981-X. .PP ! .IR "AWK Language Programming" , Edition 1.0, published by the Free Software Foundation, 1995. .SH POSIX COMPATIBILITY A primary goal for --- 2242,2250 ---- .PP .IR "The AWK Programming Language" , Alfred V. Aho, Brian W. Kernighan, Peter J. Weinberger, ! Addison-Wesley, 1988. ISBN 0-201-07981-X. .PP ! .IR "Effective AWK Programming" , Edition 1.0, published by the Free Software Foundation, 1995. .SH POSIX COMPATIBILITY A primary goal for *************** *** 2222,2228 **** To this end, .I gawk incorporates the following user visible ! features which are not described in the AWK book, but are part of the Bell Labs version of .IR awk , and are in the \*(PX standard. --- 2255,2261 ---- To this end, .I gawk incorporates the following user visible ! features which are not described in the \*(AK book, but are part of the Bell Labs version of .IR awk , and are in the \*(PX standard. *************** *** 2239,2250 **** .I before the .B BEGIN ! block was run. Applications came to depend on this ``feature.'' When .I awk was changed to match its documentation, this option was added to accommodate applications that depended upon the old behavior. ! (This feature was agreed upon by both the AT&T and GNU developers.) .PP The .B \-W --- 2272,2283 ---- .I before the .B BEGIN ! block was run. Applications came to depend on this \*(lqfeature.\*(rq When .I awk was changed to match its documentation, this option was added to accommodate applications that depended upon the old behavior. ! (This feature was agreed upon by both the AT&T and \*(GN developers.) .PP The .B \-W *************** *** 2252,2269 **** .PP When processing arguments, .I gawk ! uses the special option ``\fB\-\^\-\fP'' to signal the end of arguments. In compatibility mode, it will warn about, but otherwise ignore, undefined options. ! In normal operation, such arguments are passed on to the AWK program for it to process. .PP ! The AWK book does not define the return value of .BR srand() . The \*(PX standard has it return the seed it was using, to allow keeping track ! of random number sequences. Therefore .B srand() in .I gawk --- 2285,2302 ---- .PP When processing arguments, .I gawk ! uses the special option \*(lq\-\^\-\*(rq to signal the end of arguments. In compatibility mode, it will warn about, but otherwise ignore, undefined options. ! In normal operation, such arguments are passed on to the \*(AK program for it to process. .PP ! The \*(AK book does not define the return value of .BR srand() . The \*(PX standard has it return the seed it was using, to allow keeping track ! of random number sequences. Therefore .B srand() in .I gawk *************** *** 2401,2413 **** .I fs argument to the .B \-F ! option is ``t'', then .B FS will be set to the tab character. Note that typing ! .B "gawk \-F\et \&..." ! simply causes the shell to quote the ``t,'', and does not pass ! ``\et'' to the .B \-F option. Since this is a rather ugly special case, it is not the default behavior. --- 2434,2446 ---- .I fs argument to the .B \-F ! option is \*(lqt\*(rq, then .B FS will be set to the tab character. Note that typing ! .B "gawk \-F\et \&.\|.\|." ! simply causes the shell to quote the \*(lqt,\*(rq, and does not pass ! \*(lq\et\*(rq to the .B \-F option. Since this is a rather ugly special case, it is not the default behavior. *************** *** 2416,2422 **** has been specified. To really get a tab character as the field separator, it is best to use quotes: ! .BR "gawk \-F'\et' \&..." . .ig .PP If --- 2449,2455 ---- has been specified. To really get a tab character as the field separator, it is best to use quotes: ! .BR "gawk \-F'\et' \&.\|.\|." . .ig .PP If *************** *** 2440,2446 **** .IR gawk . .. .SH HISTORICAL FEATURES ! There are two features of historical AWK implementations that .I gawk supports. First, it is possible to call the --- 2473,2479 ---- .IR gawk . .. .SH HISTORICAL FEATURES ! There are two features of historical \*(AK implementations that .I gawk supports. First, it is possible to call the *************** *** 2464,2470 **** .ft R .RE .PP ! This feature is marked as ``deprecated'' in the \*(PX standard, and .I gawk will issue a warning about its use if .B \-\^\-lint --- 2497,2503 ---- .ft R .RE .PP ! This feature is marked as \*(lqdeprecated\*(rq in the \*(PX standard, and .I gawk will issue a warning about its use if .B \-\^\-lint *************** *** 2479,2485 **** .BR for , or .B do ! loop. Traditional AWK implementations have treated such usage as equivalent to the .B next statement. --- 2512,2518 ---- .BR for , or .B do ! loop. Traditional \*(AK implementations have treated such usage as equivalent to the .B next statement. *************** *** 2541,2552 **** .SH VERSION INFORMATION This man page documents .IR gawk , ! version 3.0.4. .SH AUTHORS The original version of \*(UX .I awk was designed and implemented by Alfred Aho, ! Peter Weinberger, and Brian Kernighan of AT&T Bell Labs. Brian Kernighan continues to maintain and enhance it. .PP Paul Rubin and Jay Fenlason, --- 2574,2585 ---- .SH VERSION INFORMATION This man page documents .IR gawk , ! version 3.0.5. .SH AUTHORS The original version of \*(UX .I awk was designed and implemented by Alfred Aho, ! Peter Weinberger, and Brian Kernighan of AT&T Bell Labs. Brian Kernighan continues to maintain and enhance it. .PP Paul Rubin and Jay Fenlason, *************** *** 2581,2587 **** what C compiler you used to compile it, and a test program and data that are as small as possible for reproducing the problem. .PP ! Before sending a bug report, please do two things. First, verify that you have the latest version of .IR gawk . Many bugs (usually subtle ones) are fixed at each release, and if --- 2614,2620 ---- what C compiler you used to compile it, and a test program and data that are as small as possible for reproducing the problem. .PP ! Before sending a bug report, please do two things. First, verify that you have the latest version of .IR gawk . Many bugs (usually subtle ones) are fixed at each release, and if *************** *** 2597,2610 **** While the .I gawk developers occasionally read this newsgroup, posting bug reports there ! is an unreliable way to report bugs. Instead, please use the electronic mail addresses given above. .SH ACKNOWLEDGEMENTS Brian Kernighan of Bell Labs provided valuable assistance during testing and debugging. We thank him. .SH COPYING PERMISSIONS ! Copyright \(co) 1996,97,98,99 Free Software Foundation, Inc. .PP Permission is granted to make and distribute verbatim copies of this manual page provided the copyright notice and this permission --- 2630,2643 ---- While the .I gawk developers occasionally read this newsgroup, posting bug reports there ! is an unreliable way to report bugs. Instead, please use the electronic mail addresses given above. .SH ACKNOWLEDGEMENTS Brian Kernighan of Bell Labs provided valuable assistance during testing and debugging. We thank him. .SH COPYING PERMISSIONS ! Copyright \(co 1996\-2000 Free Software Foundation, Inc. .PP Permission is granted to make and distribute verbatim copies of this manual page provided the copyright notice and this permission diff -cNr gawk-3.0.4/doc/gawk.texi gawk-3.0.5/doc/gawk.texi *** gawk-3.0.4/doc/gawk.texi Wed May 5 18:05:13 1999 --- gawk-3.0.5/doc/gawk.texi Tue Jun 20 14:34:19 2000 *************** *** 9,15 **** @c I hope this is the right category @dircategory Programming Languages @direntry ! * Gawk: (gawk.info). A Text Scanning and Processing Language. @end direntry @end ifinfo --- 9,15 ---- @c I hope this is the right category @dircategory Programming Languages @direntry ! * Gawk: (gawk). A Text Scanning and Processing Language. @end direntry @end ifinfo *************** *** 21,30 **** @c applies to, and when the document was updated. @set TITLE Effective AWK Programming @set SUBTITLE A User's Guide for GNU Awk ! @set PATCHLEVEL 4 @set EDITION 1.0.@value{PATCHLEVEL} @set VERSION 3.0 ! @set UPDATE-MONTH April, 1999 @iftex @set DOCUMENT book @end iftex --- 21,30 ---- @c applies to, and when the document was updated. @set TITLE Effective AWK Programming @set SUBTITLE A User's Guide for GNU Awk ! @set PATCHLEVEL 5 @set EDITION 1.0.@value{PATCHLEVEL} @set VERSION 3.0 ! @set UPDATE-MONTH June, 2000 @iftex @set DOCUMENT book @end iftex *************** *** 74,80 **** This is Edition @value{EDITION} of @cite{@value{TITLE}}, for the @value{VERSION}.@value{PATCHLEVEL} version of the GNU implementation of AWK. ! Copyright (C) 1989, 1991, 92, 93, 96, 97, 98, 99 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice --- 74,80 ---- This is Edition @value{EDITION} of @cite{@value{TITLE}}, for the @value{VERSION}.@value{PATCHLEVEL} version of the GNU implementation of AWK. ! Copyright (C) 1989, 1991, 1992, 1993, 1996-2000 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice *************** *** 138,168 **** Registered Trademark of Paramount Pictures Corporation. @* @c sorry, i couldn't resist @sp 3 ! Copyright @copyright{} 1989, 1991, 92, 93, 96, 97, 98, 99 Free Software Foundation, Inc. @sp 2 This is Edition @value{EDITION} of @cite{@value{TITLE}}, @* for the @value{VERSION}.@value{PATCHLEVEL} (or later) version of the GNU implementation of AWK. @sp 2 ! @center Published jointly by: ! @multitable {Specialized Systems Consultants, Inc. (SSC)} {Boston, MA 02111-1307 USA} ! @item Specialized Systems Consultants, Inc. (SSC) @tab Free Software Foundation ! @item PO Box 55549 @tab 59 Temple Place --- Suite 330 ! @item Seattle, WA 98155 USA @tab Boston, MA 02111-1307 USA ! @item Phone: +1-206-782-7733 @tab Phone: +1-617-542-5942 ! @item Fax: +1-206-782-7191 @tab Fax: +1-617-542-2652 ! @item E-mail: @code{sales@@ssc.com} @tab E-mail: @code{gnu@@gnu.org} ! @item URL: @code{http://www.ssc.com/} @tab URL: @code{http://www.fsf.org/} ! @end multitable @sp 1 ! @c this ISBN can change! Check with SSC @c This one is correct for gawk 3.0 and edition 1.0 from the FSF ISBN 1-882114-26-4 @* - @c This one is correct for gawk 3.0.3 and edition 1.0.3 from SSC - @c ISBN 1-57831-000-8 @* Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice --- 138,164 ---- Registered Trademark of Paramount Pictures Corporation. @* @c sorry, i couldn't resist @sp 3 ! Copyright @copyright{} 1989, 1991, 1992, 1993, 1996-2000 Free Software Foundation, Inc. @sp 2 This is Edition @value{EDITION} of @cite{@value{TITLE}}, @* for the @value{VERSION}.@value{PATCHLEVEL} (or later) version of the GNU implementation of AWK. @sp 2 ! Published by: ! Free Software Foundation @* ! 59 Temple Place --- Suite 330 @* ! Boston, MA 02111-1307 USA @* ! Phone: +1-617-542-5942 @* ! Fax: +1-617-542-2652 @* ! Email: @code{gnu@@gnu.org} @* ! URL: @code{http://www.gnu.org/} @* @sp 1 ! @c this ISBN can change! @c This one is correct for gawk 3.0 and edition 1.0 from the FSF ISBN 1-882114-26-4 @* Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice *************** *** 178,185 **** except that this permission notice may be stated in a translation approved by the Foundation. @sp 2 ! @c Cover art by Etienne Suvasa. ! Cover art by Amy Wells Wood. @end titlepage @c Thanks to Bob Chassell for directions on doing dedications. --- 174,180 ---- except that this permission notice may be stated in a translation approved by the Foundation. @sp 2 ! Cover art by Etienne Suvasa. @end titlepage @c Thanks to Bob Chassell for directions on doing dedications. *************** *** 195,200 **** --- 190,197 ---- @center @i{To Rivka, for the exponential increase.} @sp 1 @center @i{To Nachum, for the added dimension.} + @sp 1 + @center @i{To Malka, for the new beginning.} @page @w{ } @page *************** *** 540,545 **** --- 537,544 ---- @center To Rivka, for the exponential increase. @sp 1 @center To Nachum, for the added dimension. + @sp 1 + @center To Malka, for the new beginning. @end ifinfo @node Preface, What Is Awk, Top, Top *************** *** 2686,2692 **** @table @asis @item No options ! In the default case, @code{gawk} provide all the facilities of POSIX regexps and the GNU regexp operators described @iftex above. --- 2685,2691 ---- @table @asis @item No options ! In the default case, @code{gawk} provides all the facilities of POSIX regexps and the GNU regexp operators described @iftex above. *************** *** 2843,2849 **** @end example For simple match/no-match tests, this is not so important. But when doing - regexp-based field and record splitting, and text matching and substitutions with the @code{match}, @code{sub}, @code{gsub}, and @code{gensub} functions, it is very important. @ifinfo --- 2842,2847 ---- *************** *** 2871,2877 **** regexp}. For example: @example ! BEGIN @{ identifier_regexp = "[A-Za-z_][A-Za-z_0-9]+" @} $0 ~ identifier_regexp @{ print @} @end example --- 2869,2875 ---- regexp}. For example: @example ! BEGIN @{ identifier_regexp = "[A-Za-z_][A-Za-z_0-9]*" @} $0 ~ identifier_regexp @{ print @} @end example *************** *** 2879,2884 **** --- 2877,2888 ---- sets @code{identifier_regexp} to a regexp that describes @code{awk} variable names, and tests if the input record matches this regexp. + @ignore + Do we want to use "^[A-Za-z_][A-Za-z_0-9]*$" to restrict the entire + record to just identifiers? Doing that also would disrupt the flow of + the text. + @end ignore + @strong{Caution:} When using the @samp{~} and @samp{!~} operators, there is a difference between a regexp constant enclosed in slashes, and a string constant enclosed in double quotes. *************** *** 3070,3077 **** --- 3074,3083 ---- variable @code{NF} is the number of fields in the current record. @example + @group $ echo | awk 'BEGIN @{ RS = "a" @} ; @{ print NF @}' @print{} 1 + @end group @end example @cindex dark corner *************** *** 3219,3224 **** --- 3225,3232 ---- a special case: it represents the whole input record. @code{$0} is used when you are not interested in fields. + @c NEEDED + @page Here are some more examples: @example *************** *** 3613,3620 **** --- 3621,3630 ---- For example, the following pipeline prints @samp{b}: @example + @group $ echo ' a b c d ' | awk '@{ print $2 @}' @print{} b + @end group @end example @noindent *************** *** 3914,3930 **** haven't been introduced yet.) @example - @group BEGIN @{ FIELDWIDTHS = "9 6 10 6 7 7 35" @} NR > 2 @{ idle = $4 sub(/^ */, "", idle) # strip leading spaces if (idle == "") idle = 0 if (idle ~ /:/) @{ split(idle, t, ":") idle = t[1] * 60 + t[2] @} if (idle ~ /days/) idle *= 24 * 60 * 60 --- 3924,3942 ---- haven't been introduced yet.) @example BEGIN @{ FIELDWIDTHS = "9 6 10 6 7 7 35" @} NR > 2 @{ idle = $4 sub(/^ */, "", idle) # strip leading spaces if (idle == "") idle = 0 + @group if (idle ~ /:/) @{ split(idle, t, ":") idle = t[1] * 60 + t[2] @} + @end group + @group if (idle ~ /days/) idle *= 24 * 60 * 60 *************** *** 4042,4047 **** --- 4054,4061 ---- list, where each entry is separated by blank lines. If we have a mailing list in a file named @file{addresses}, that looks like this: + @c NEEDED + @page @example Jane Doe 123 Main Street *************** *** 4050,4056 **** John Smith 456 Tree-lined Avenue Smallville, MW 98765-4321 - @dots{} @end example --- 4064,4069 ---- *************** *** 4426,4433 **** @c Exercise!! @c This example is unrealistic, since you could just use system - @c NEEDED - @page Given the input: @example --- 4439,4444 ---- *************** *** 4974,4979 **** --- 4985,4996 ---- @item s This prints a string. + @item u + This prints an unsigned decimal number. + (This format is of marginal use, since all numbers in @code{awk} + are floating point. It is provided primarily for compatibility + with C.) + @item x @itemx X This prints an unsigned hexadecimal integer. *************** *** 5525,5531 **** 0, 1, and 2. If you do close one of these files, unpredictable behavior will result. ! The special files that provide process-related information may disappear in a future version of @code{gawk}. @xref{Future Extensions, ,Probable Future Extensions}. --- 5542,5548 ---- 0, 1, and 2. If you do close one of these files, unpredictable behavior will result. ! The special files that provide process-related information will disappear in a future version of @code{gawk}. @xref{Future Extensions, ,Probable Future Extensions}. *************** *** 5624,5629 **** --- 5641,5648 ---- redirect output to the @code{mail} program, the message is not actually sent until the pipe is closed. + @c NEEDED + @page @item To run the same program a second time, with the same arguments. This is not the same thing as giving more input to the first run! *************** *** 6017,6024 **** @code{CONVFMT}'s default value is @code{"%.6g"}, which prints a value with at least six significant digits. For some applications you will want to ! change it to specify more precision. Double precision on most modern ! machines gives you 16 or 17 decimal digits of precision. Strange results can happen if you set @code{CONVFMT} to a string that doesn't tell @code{sprintf} how to format floating point numbers in a useful way. --- 6036,6043 ---- @code{CONVFMT}'s default value is @code{"%.6g"}, which prints a value with at least six significant digits. For some applications you will want to ! change it to specify more precision. On most modern machines, you must ! print 17 digits to capture a floating point number's value exactly. Strange results can happen if you set @code{CONVFMT} to a string that doesn't tell @code{sprintf} how to format floating point numbers in a useful way. *************** *** 6069,6075 **** The @code{awk} language uses the common arithmetic operators when evaluating expressions. All of these arithmetic operators follow normal ! precedence rules, and work as you would expect them to. Here is a file @file{grades} containing a list of student names and three test scores per student (it's a small class): --- 6088,6099 ---- The @code{awk} language uses the common arithmetic operators when evaluating expressions. All of these arithmetic operators follow normal ! precedence rules, and work as you would expect them to. Arithmetic ! operations are evaluated using double precision floating point, which ! has the usual problems of inexactness and exceptions.@footnote{David ! Goldberg, @uref{http://www.validgh.com/goldberg/paper.ps, @cite{What Every ! Computer Scientist Should Know About Floating-point Arithmetic}}, ! @cite{ACM Computing Surveys} @strong{23}, 1 (1991-03), 5-48.} Here is a file @file{grades} containing a list of student names and three test scores per student (it's a small class): *************** *** 6117,6123 **** @item @var{x} / @var{y} Division. Since all numbers in @code{awk} are ! real numbers, the result is not rounded to an integer: @samp{3 / 4} has the value 0.75. @item @var{x} % @var{y} --- 6141,6147 ---- @item @var{x} / @var{y} Division. Since all numbers in @code{awk} are ! floating point numbers, the result is not rounded to an integer: @samp{3 / 4} has the value 0.75. @item @var{x} % @var{y} *************** *** 6976,6983 **** @end example Each time the conditional expression is computed, exactly one of ! @var{if-true-exp} and @var{if-false-exp} is computed; the other is ignored. ! This is important when the expressions contain side effects. For example, this conditional expression examines element @code{i} of either array @code{a} or array @code{b}, and increments @code{i}. --- 7000,7007 ---- @end example Each time the conditional expression is computed, exactly one of ! @var{if-true-exp} and @var{if-false-exp} is used; the other is ignored. ! This is important when the expressions have side effects. For example, this conditional expression examines element @code{i} of either array @code{a} or array @code{b}, and increments @code{i}. *************** *** 7975,7983 **** --- 7999,8009 ---- @example awk '# find smallest divisor of num @{ num = $1 + @group for (div = 2; div*div <= num; div++) if (num % div == 0) break + @end group if (num % div == 0) printf "Smallest divisor of %d is %d\n", num, div else *************** *** 8049,8056 **** @ignore In Texinfo source files, text that the author wishes to ignore can be enclosed between lines that start with @samp{@@ignore} and end with ! @samp{@@end ignore}. Here is a program that strips out lines between ! @samp{@@ignore} and @samp{@@end ignore} pairs. @example BEGIN @{ --- 8075,8082 ---- @ignore In Texinfo source files, text that the author wishes to ignore can be enclosed between lines that start with @samp{@@ignore} and end with ! @samp{@atend ignore}. Here is a program that strips out lines between ! @samp{@@ignore} and @samp{@atend ignore} pairs. @example BEGIN @{ *************** *** 8069,8075 **** @end example When an @samp{@@ignore} is seen, the @code{ignoring} flag is set to one (true). ! When @samp{@@end ignore} is seen, the flag is reset to zero (false). As long as the flag is true, the input record is not printed, because the @code{continue} restarts the @code{while} loop, skipping over the @code{print} statement. --- 8095,8101 ---- @end example When an @samp{@@ignore} is seen, the @code{ignoring} flag is set to one (true). ! When @samp{@atend ignore} is seen, the flag is reset to zero (false). As long as the flag is true, the input record is not printed, because the @code{continue} restarts the @code{while} loop, skipping over the @code{print} statement. *************** *** 8778,8783 **** --- 8804,8810 ---- * Multi-dimensional:: Emulating multi-dimensional arrays in @code{awk}. * Multi-scanning:: Scanning multi-dimensional arrays. + * Array Efficiency:: Implementation-specific tips. @end menu @node Array Intro, Reference to Elements, Arrays, Arrays *************** *** 9008,9019 **** --- 9035,9048 ---- numbers, gaps, or lines that don't begin with a number. @example + @group @c file eg/misc/arraymax.awk @{ if ($1 > max) max = $1 arr[$1] = $0 @} + @end group END @{ for (x = 1; x <= max; x++) *************** *** 9308,9314 **** At first glance, this program should have worked. The variable @code{lines} is uninitialized, and uninitialized variables have the numeric value zero. ! So, the value of @code{l[0]} should have been printed. The issue here is that subscripts for @code{awk} arrays are @strong{always} strings. And uninitialized variables, when used as strings, have the --- 9337,9343 ---- At first glance, this program should have worked. The variable @code{lines} is uninitialized, and uninitialized variables have the numeric value zero. ! So, @code{awk} should have printed the value of @code{l[0]}. The issue here is that subscripts for @code{awk} arrays are @strong{always} strings. And uninitialized variables, when used as strings, have the *************** *** 9445,9451 **** @end group @end example ! @node Multi-scanning, , Multi-dimensional, Arrays @section Scanning Multi-dimensional Arrays There is no special @code{for} statement for scanning a --- 9474,9480 ---- @end group @end example ! @node Multi-scanning, Array Efficiency, Multi-dimensional, Arrays @section Scanning Multi-dimensional Arrays There is no special @code{for} statement for scanning a *************** *** 9492,9497 **** --- 9521,9554 ---- @code{separate[2]} to @code{"foo"}. Presto, the original sequence of separate indices has been recovered. + @node Array Efficiency, , Multi-scanning, Arrays + @section Using Array Memory Efficiently + + This section applies just to @code{gawk}. + + It is often useful to use the same bit of data as an index + into multiple arrays. + Due to the way @code{gawk} implements associative arrays, + when you need to use input data as an index for multiple + arrays, it is much more effecient to assign the input field + to a separate variable, and then use that variable as the index. + + @example + @{ + name = $1 + ssn = $2 + nkids = $3 + @dots{} + seniority[name]++ # better than seniority[$1]++ + kids[name] = nkids # better than kids[$1] = nkids + @} + @end example + + Using separate variables with mnemonic names for the input fields + makes programs more readable, in any case. + It is an eventual goal to make @code{gawk}'s array indexing as efficient + as possible, no matter what the source of the index value. + @node Built-in, User-defined, Arrays, Top @chapter Built-in Functions *************** *** 9625,9631 **** @end example @noindent ! The multiplication produces a random real number greater than zero and less than @code{n}. We then make it an integer (using @code{int}) between zero and @code{n} @minus{} 1, inclusive. --- 9682,9688 ---- @end example @noindent ! The multiplication produces a random number greater than zero and less than @code{n}. We then make it an integer (using @code{int}) between zero and @code{n} @minus{} 1, inclusive. *************** *** 9915,9924 **** @example awk 'BEGIN @{ str = "daabaaa" ! sub(/a*/, "c&c", str) print str @}' ! @print{} dcaacbaaa @end example @noindent --- 9972,9981 ---- @example awk 'BEGIN @{ str = "daabaaa" ! sub(/a+/, "C&C", str) print str @}' ! @print{} dCaaCbaaa @end example @noindent *************** *** 10229,10235 **** @end enumerate The POSIX standard is under revision.@footnote{As of @value{UPDATE-MONTH}, ! with final approval and publication hopefully sometime in 1997.} Because of the above problems, proposed text for the revised standard reverts to rules that correspond more closely to the original existing practice. The proposed rules have special cases that make it possible --- 10286,10293 ---- @end enumerate The POSIX standard is under revision.@footnote{As of @value{UPDATE-MONTH}, ! with final approval and publication as part of the Austin Group ! Standards hopefully sometime in 2001.} Because of the above problems, proposed text for the revised standard reverts to rules that correspond more closely to the original existing practice. The proposed rules have special cases that make it possible *************** *** 10981,10986 **** --- 11039,11046 ---- Instead of having to repeat this loop everywhere in your program that you need to clear out an array, your program can just call @code{delarray}. + (This guarantees portability. The usage @samp{delete @var{array}} to delete + the contents of an entire array is a non-standard extension.) Here is an example of a recursive function. It takes a string as an input parameter, and returns the string in backwards order. *************** *** 11012,11022 **** @example @c file eg/lib/ctime.awk - @group # ctime.awk # # awk version of C ctime(3) function function ctime(ts, format) @{ format = "%a %b %d %H:%M:%S %Z %Y" --- 11072,11082 ---- @example @c file eg/lib/ctime.awk # ctime.awk # # awk version of C ctime(3) function + @group function ctime(ts, format) @{ format = "%a %b %d %H:%M:%S %Z %Y" *************** *** 11113,11122 **** --- 11173,11184 ---- @end iftex @example + @group function changeit(array, ind, nvalue) @{ array[ind] = nvalue @} + @end group BEGIN @{ a[1] = 1; a[2] = 2; a[3] = 3 *************** *** 11355,11360 **** --- 11417,11427 ---- it more than once, setting another variable each time, like this: @samp{awk @w{-v foo=1} @w{-v bar=2} @dots{}}. + @strong{Caution:} Using @samp{-v} to set the values of the builtin + variables may lead to suprising results. @code{awk} will reset the + values of those variables as it needs to, possibly ignoring any + predefined value you may have given. + @item -mf @var{NNN} @itemx -mr @var{NNN} Set various memory limits to the value @var{NNN}. The @samp{f} flag sets *************** *** 11656,11662 **** @code{AWKPATH} environment variable. If that variable does not exist, @code{gawk} uses a default path, which is @samp{.:/usr/local/share/awk}.@footnote{Your version of @code{gawk} ! may use a directory that is different than @file{/usr/local/share/awk}; it will depend upon how @code{gawk} was built and installed. The actual directory will be the value of @samp{$(datadir)} generated when @code{gawk} was configured. You probably don't need to worry about this --- 11723,11729 ---- @code{AWKPATH} environment variable. If that variable does not exist, @code{gawk} uses a default path, which is @samp{.:/usr/local/share/awk}.@footnote{Your version of @code{gawk} ! may use a different directory; it will depend upon how @code{gawk} was built and installed. The actual directory will be the value of @samp{$(datadir)} generated when @code{gawk} was configured. You probably don't need to worry about this *************** *** 11958,11964 **** Here is a second version of @code{nextfile} that remedies this problem. @example - @group @c file eg/lib/nextfile.awk # nextfile --- skip remaining records in current file # correctly handle successive occurrences of the same file --- 12025,12030 ---- *************** *** 11969,11982 **** function nextfile() @{ _abandon_ = FILENAME; next @} _abandon_ == FILENAME @{ if (FNR == 1) _abandon_ = "" else next @} - @c endfile @end group @end example The @code{nextfile} function has not changed. It sets @code{_abandon_} --- 12035,12049 ---- function nextfile() @{ _abandon_ = FILENAME; next @} + @group _abandon_ == FILENAME @{ if (FNR == 1) _abandon_ = "" else next @} @end group + @c endfile @end example The @code{nextfile} function has not changed. It sets @code{_abandon_} *************** *** 12029,12034 **** --- 12096,12103 ---- been true but was not, and then it kills the program. In C, using @code{assert} looks this: + @c NEEDED + @page @example #include *************** *** 12093,12098 **** --- 12162,12169 ---- For all of this to work correctly, @file{assert.awk} must be the first source file read by @code{awk}. + @c NEEDED + @page You would use this function in your programs this way: @example *************** *** 12158,12167 **** --- 12229,12240 ---- aval = -x # absolute value ival = int(aval) fraction = aval - ival + @group if (fraction >= .5) return int(x) - 1 # -2.5 --> -3 else return int(x) # -2.3 --> -2 + @end group @} else @{ fraction = x - ival if (fraction >= .5) *************** *** 12283,12289 **** @c endfile @end group ! @c @group @c file eg/lib/ord.awk #### test code #### # BEGIN \ --- 12356,12362 ---- @c endfile @end group ! @group @c file eg/lib/ord.awk #### test code #### # BEGIN \ *************** *** 12296,12302 **** # @} # @} @c endfile ! @c @end group @end example An obvious improvement to these functions would be to move the code for the --- 12369,12375 ---- # @} # @} @c endfile ! @end group @end example An obvious improvement to these functions would be to move the code for the *************** *** 12381,12387 **** It would appear at first glance that @code{gawk} would have to supply a @code{mktime} built-in function that was simply a ``hook'' to the C language version. In fact though, @code{mktime} can be implemented entirely in ! @code{awk}. Here is a version of @code{mktime} for @code{awk}. It takes a simple representation of the date and time, and converts it into a timestamp. --- 12454,12464 ---- It would appear at first glance that @code{gawk} would have to supply a @code{mktime} built-in function that was simply a ``hook'' to the C language version. In fact though, @code{mktime} can be implemented entirely in ! @code{awk}.@footnote{@value{UPDATE-MONTH}: Actually, I was mistaken when ! I wrote this. The version presented here doesn't always work correctly, ! and the next major version of @code{gawk} will provide @code{mktime} ! as a built-in function.} ! @c sigh. Here is a version of @code{mktime} for @code{awk}. It takes a simple representation of the date and time, and converts it into a timestamp. *************** *** 12630,12642 **** Finally, there is a ``main'' program for testing the function. @example @c @group @c file eg/lib/mktime.awk BEGIN @{ if (_tm_test) @{ printf "Enter date as yyyy mm dd hh mm ss: " getline _tm_test_date - t = mktime(_tm_test_date) r = strftime("%Y %m %d %H %M %S", t) printf "Got back (%s)\n", r --- 12707,12720 ---- Finally, there is a ``main'' program for testing the function. @example + @c there used to be a blank line after the getline, + @c squished out for page formatting reasons @c @group @c file eg/lib/mktime.awk BEGIN @{ if (_tm_test) @{ printf "Enter date as yyyy mm dd hh mm ss: " getline _tm_test_date t = mktime(_tm_test_date) r = strftime("%Y %m %d %H %M %S", t) printf "Got back (%s)\n", r *************** *** 12722,12728 **** # time["timezone"] -- abbreviation of timezone name # time["ampm"] -- AM or PM designation - @group function gettimeofday(time, ret, now, i) @{ # get time once, avoids unnecessary system calls --- 12800,12805 ---- *************** *** 12734,12742 **** # clear out target array for (i in time) delete time[i] - @end group - @group # fill in values, force numeric values to be # numeric by adding 0 time["second"] = strftime("%S", now) + 0 --- 12811,12817 ---- *************** *** 12761,12767 **** return ret @} - @end group @c endfile @end example --- 12836,12841 ---- *************** *** 13569,13577 **** --- 13643,13653 ---- int i; @end group + @group while ((g = getgrent()) != NULL) @{ printf("%s:%s:%d:", g->gr_name, g->gr_passwd, g->gr_gid); + @end group for (i = 0; g->gr_mem[i] != NULL; i++) @{ printf("%s", g->gr_mem[i]); if (g->gr_mem[i+1] != NULL) *************** *** 14074,14084 **** if (c == "f") @{ by_fields = 1 fieldlist = Optarg - @group @} else if (c == "c") @{ by_chars = 1 fieldlist = Optarg OFS = "" @} else if (c == "d") @{ if (length(Optarg) > 1) @{ printf("Using first character of %s" \ --- 14150,14160 ---- if (c == "f") @{ by_fields = 1 fieldlist = Optarg @} else if (c == "c") @{ by_chars = 1 fieldlist = Optarg OFS = "" + @group @} else if (c == "d") @{ if (length(Optarg) > 1) @{ printf("Using first character of %s" \ *************** *** 14304,14311 **** lines that matched. If multiple file names are provided on the command line, each output line is preceded by the name of the file and a colon. - @c NEEDED - @page The options are: @table @code --- 14380,14385 ---- *************** *** 14457,14463 **** know how many lines altogether matched the pattern. @example ! @c @group @c file eg/prog/egrep.awk function endfile(file) @{ --- 14531,14537 ---- know how many lines altogether matched the pattern. @example ! @group @c file eg/prog/egrep.awk function endfile(file) @{ *************** *** 14470,14476 **** total += fcount @} @c endfile ! @c @end group @end example This rule does most of the work of matching lines. The variable --- 14544,14550 ---- total += fcount @} @c endfile ! @end group @end example This rule does most of the work of matching lines. The variable *************** *** 14520,14529 **** fcount += matches # 1 or 0 - @group if (! matches) next - @end group if (no_print && ! count_only) nextfile --- 14594,14601 ---- *************** *** 14535,14542 **** --- 14607,14616 ---- if (do_filenames && ! count_only) print FILENAME ":" $0 + @group else if (! count_only) print + @end group @} @c endfile @c @end group *************** *** 15032,15038 **** @findex uniq.awk @example - @c @group @c file eg/prog/uniq.awk # uniq.awk --- do uniq in awk # Arnold Robbins, arnold@@gnu.org, Public Domain --- 15106,15111 ---- *************** *** 15047,15061 **** @} @end group - @group # -c count lines. overrides -d and -u # -d only repeated lines # -u only non-repeated lines # -n skip n fields # +n skip n characters, skip fields first - @end group ! BEGIN \ @{ count = 1 outputfile = "/dev/stdout" --- 15120,15132 ---- @} @end group # -c count lines. overrides -d and -u # -d only repeated lines # -u only non-repeated lines # -n skip n fields # +n skip n characters, skip fields first ! BEGIN \ @{ count = 1 outputfile = "/dev/stdout" *************** *** 15072,15081 **** --- 15143,15154 ---- # this messes us up for things like -5 if (Optarg ~ /^[0-9]+$/) fcount = (c Optarg) + 0 + @group else @{ fcount = c + 0 Optind-- @} + @end group @} else usage() @} *************** *** 15091,15104 **** if (repeated_only == 0 && non_repeated_only == 0) repeated_only = non_repeated_only = 1 - @group if (ARGC - Optind == 2) @{ outputfile = ARGV[ARGC - 1] ARGV[ARGC - 1] = "" @} @} @c endfile - @end group @end example The following function, @code{are_equal}, compares the current line, --- 15164,15175 ---- *************** *** 15315,15337 **** numbers for the following data file. @example ! @c @group @c file eg/prog/wc.awk ! function beginfile(file) ! @{ chars = lines = words = 0 fname = FILENAME @} function endfile(file) @{ tchars += chars tlines += lines twords += words - @group if (do_lines) printf "\t%d", lines - @end group if (do_words) printf "\t%d", words if (do_chars) --- 15386,15407 ---- numbers for the following data file. @example ! @c left brace on line with `function' because of page breaking @c file eg/prog/wc.awk ! @group ! function beginfile(file) @{ chars = lines = words = 0 fname = FILENAME @} + @end group function endfile(file) @{ tchars += chars tlines += lines twords += words if (do_lines) printf "\t%d", lines if (do_words) printf "\t%d", words if (do_chars) *************** *** 15339,15345 **** printf "\t%s\n", fname @} @c endfile - @c @end group @end example There is one rule that is executed for each line. It adds the length of the --- 15409,15414 ---- *************** *** 15565,15575 **** seconds are necessary. @example - @c @group @c file eg/prog/alarm.awk # zzzzzz..... go away if interrupted if (system(sprintf("sleep %d", naptime)) != 0) exit 1 # time to notify! command = sprintf("sleep %d", delay) --- 15634,15645 ---- seconds are necessary. @example @c file eg/prog/alarm.awk + @group # zzzzzz..... go away if interrupted if (system(sprintf("sleep %d", naptime)) != 0) exit 1 + @end group # time to notify! command = sprintf("sleep %d", delay) *************** *** 15583,15589 **** exit 0 @} @c endfile - @c @end group @end example @node Translate Program, Labels Program, Alarm Program, Miscellaneous Programs --- 15653,15658 ---- *************** *** 15625,15631 **** (@pxref{String Functions, ,Built-in Functions for String Manipulation}).@footnote{This program was written before @code{gawk} acquired the ability to split each character in a string into separate array elements. ! How might this ability simplify the program?} There are two functions. The first, @code{stranslate}, takes three arguments. --- 15694,15700 ---- (@pxref{String Functions, ,Built-in Functions for String Manipulation}).@footnote{This program was written before @code{gawk} acquired the ability to split each character in a string into separate array elements. ! How might you use this new feature to simplify the program?} There are two functions. The first, @code{stranslate}, takes three arguments. *************** *** 15683,15701 **** return target @} - @group function translate(from, to) @{ return $0 = stranslate(from, to, $0) @} - @end group # main program BEGIN @{ if (ARGC < 3) @{ print "usage: translate from to" > "/dev/stderr" exit @} FROM = ARGV[1] TO = ARGV[2] ARGC = 2 --- 15752,15770 ---- return target @} function translate(from, to) @{ return $0 = stranslate(from, to, $0) @} + @group # main program BEGIN @{ if (ARGC < 3) @{ print "usage: translate from to" > "/dev/stderr" exit @} + @end group FROM = ARGV[1] TO = ARGV[2] ARGC = 2 *************** *** 15852,15861 **** --- 15921,15932 ---- freq[$i]++ @} + @group END @{ for (word in freq) printf "%s\t%d\n", word, freq[word] @}' + @end group @end example The first thing to notice about this program is that it has two rules. The *************** *** 15914,15923 **** --- 15985,15996 ---- @} @c endfile + @group END @{ for (word in freq) printf "%s\t%d\n", word, freq[word] @} + @end group @end example Assuming we have saved this program in a file named @file{wordfreq.awk}, *************** *** 16126,16133 **** @c file eg/prog/extract.awk # extract.awk --- extract files and run programs # from texinfo files ! # Arnold Robbins, arnold@@gnu.org, Public Domain ! # May 1993 BEGIN @{ IGNORECASE = 1 @} --- 16199,16205 ---- @c file eg/prog/extract.awk # extract.awk --- extract files and run programs # from texinfo files ! # Arnold Robbins, arnold@@gnu.org, Public Domain, May 1993 BEGIN @{ IGNORECASE = 1 @} *************** *** 16315,16332 **** # Arnold Robbins, arnold@@gnu.org, Public Domain # August 1995 - @group function usage() @{ print "usage: awksed pat repl [files...]" > "/dev/stderr" exit 1 @} - @end group BEGIN @{ # validate arguments if (ARGC < 3) usage() RS = ARGV[1] ORS = ARGV[2] --- 16387,16404 ---- # Arnold Robbins, arnold@@gnu.org, Public Domain # August 1995 function usage() @{ print "usage: awksed pat repl [files...]" > "/dev/stderr" exit 1 @} + @group BEGIN @{ # validate arguments if (ARGC < 3) usage() + @end group RS = ARGV[1] ORS = ARGV[2] *************** *** 16515,16521 **** The source text is echoed into @file{/tmp/ig.s.$$}. @item --version - @itemx --version @itemx -Wversion @code{igawk} prints its version number, and runs @samp{gawk --version} to get the @code{gawk} version information, and then exits. --- 16587,16592 ---- *************** *** 16660,16670 **** @end ignore @example - @c @group @c file eg/prog/igawk.sh gawk -- ' # process @@include directives function pathto(file, i, t, junk) @{ if (index(file, "/") != 0) --- 16731,16743 ---- @end ignore @example @c file eg/prog/igawk.sh gawk -- ' # process @@include directives + @c endfile + @group + @c file eg/prog/igawk.sh function pathto(file, i, t, junk) @{ if (index(file, "/") != 0) *************** *** 16681,16687 **** return "" @} @c endfile ! @c @end group @end example The main program is contained inside one @code{BEGIN} rule. The first thing it --- 16754,16760 ---- return "" @} @c endfile ! @end group @end example The main program is contained inside one @code{BEGIN} rule. The first thing it *************** *** 18068,18086 **** The pipeline to the command stays open until the @code{close} function is called. ! @item printf @var{fmt, expr-list} Format and print. ! @item printf @var{fmt, expr-list} > file Format and print to @var{file}. If @var{file} does not exist, it is created. If it does exist, its contents are deleted the first time the @code{printf} is executed. ! @item printf @var{fmt, expr-list} >> @var{file} Format and print to @var{file}. The previous contents of @var{file} are retained, and the output of @code{printf} is appended to the file. ! @item printf @var{fmt, expr-list} | @var{command} Format and print, sending the output down a pipe to @var{command}. The pipeline to the command stays open until the @code{close} function is called. --- 18141,18159 ---- The pipeline to the command stays open until the @code{close} function is called. ! @item printf @var{fmt}, @var{expr-list} Format and print. ! @item printf @var{fmt}, @var{expr-list} > @var{file} Format and print to @var{file}. If @var{file} does not exist, it is created. If it does exist, its contents are deleted the first time the @code{printf} is executed. ! @item printf @var{fmt}, @var{expr-list} >> @var{file} Format and print to @var{file}. The previous contents of @var{file} are retained, and the output of @code{printf} is appended to the file. ! @item printf @var{fmt}, @var{expr-list} | @var{command} Format and print, sending the output down a pipe to @var{command}. The pipeline to the command stays open until the @code{close} function is called. *************** *** 18128,18134 **** @samp{%G} will use @samp{%E} instead of @samp{%e}. @item %o ! An unsigned octal number (again, an integer). @item %s A character string. --- 18201,18210 ---- @samp{%G} will use @samp{%E} instead of @samp{%e}. @item %o ! An unsigned octal number (also an integer). ! ! @item %u ! An unsigned decimal number (again, an integer). @item %s A character string. *************** *** 18256,18261 **** --- 18332,18339 ---- @code{awk} provides a number of built-in functions for performing numeric operations, string related operations, and I/O related operations. + @c NEEDED + @page The built-in arithmetic functions are: @table @code *************** *** 18592,18598 **** Boston, MA 02111-1307 USA @* Phone: +1-617-542-5942 @* Fax (including Japan): +1-617-542-2652 @* ! E-mail: @code{gnu@@gnu.org} @* @end quotation @noindent --- 18670,18677 ---- Boston, MA 02111-1307 USA @* Phone: +1-617-542-5942 @* Fax (including Japan): +1-617-542-2652 @* ! Email: @code{gnu@@gnu.org} @* ! URL: @code{http://www.gnu.org/} @* @end quotation @noindent *************** *** 18617,18622 **** --- 18696,18703 ---- @itemx utsun.s.u-tokyo.ac.jp:/ftpsync/prep @end table + @c NEEDED + @page @item Australia: @table @code @item archie.au:/gnu *************** *** 19412,19418 **** @code{gawk} gave you. Also say what you expected to occur; this will help us decide whether the problem was really in the documentation. ! Once you have a precise problem, there are two e-mail addresses you can send mail to. @table @asis --- 19493,19499 ---- @code{gawk} gave you. Also say what you expected to occur; this will help us decide whether the problem was really in the documentation. ! Once you have a precise problem, there are two email addresses you can send mail to. @table @asis *************** *** 19514,19521 **** This is a shell archive that has been compressed with the GNU @code{gzip} utility. It can be uncompressed with the @code{gunzip} utility. ! You can also retrieve this version via the World Wide Web from ! @uref{http://cm.bell-labs.com/who/bwk, Brian Kernighan's home page}. This version requires an ANSI C compiler; GCC (the GNU C compiler) works quite nicely. --- 19595,19602 ---- This is a shell archive that has been compressed with the GNU @code{gzip} utility. It can be uncompressed with the @code{gunzip} utility. ! You can also retrieve this version via the World Wide Web from his ! @uref{http://cm.bell-labs.com/who/bwk, home page}. This version requires an ANSI C compiler; GCC (the GNU C compiler) works quite nicely. *************** *** 19729,19734 **** --- 19810,19820 ---- master version of the @code{gawk} source code (using @code{patch}). If I have to apply the changes manually, using a text editor, I may not do so, particularly if there are lots of changes. + + @item + Include an entry for the @file{ChangeLog} file with your submission. + This further helps minimize the amount of work I have to do, + making it easier for me to accept patches. @end enumerate Although this sounds like a lot of work, please remember that while you *************** *** 19736,19741 **** --- 19822,19828 ---- isn't possible for me to do that with a minimum of extra work, then I probably will not. + @node New Ports, , Adding Code, Additions @appendixsubsec Porting @code{gawk} to a New Operating System *************** *** 19900,19906 **** @item A @code{PROCINFO} Array The special files that provide process-related information (@pxref{Special Files, ,Special File Names in @code{gawk}}) ! may be superseded by a @code{PROCINFO} array that would provide the same information, in an easier to access fashion. @item More @code{lint} warnings --- 19987,19993 ---- @item A @code{PROCINFO} Array The special files that provide process-related information (@pxref{Special Files, ,Special File Names in @code{gawk}}) ! will be superseded by a @code{PROCINFO} array that would provide the same information, in an easier to access fashion. @item More @code{lint} warnings *************** *** 20771,20777 **** @smallexample @var{one line to give the program's name and an idea of what it does.} ! Copyright (C) 19@var{yy} @var{name of author} This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License --- 20858,20864 ---- @smallexample @var{one line to give the program's name and an idea of what it does.} ! Copyright (C) @var{year} @var{name of author} This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License *************** *** 20794,20800 **** when it starts in an interactive mode: @smallexample ! Gnomovision version 69, Copyright (C) 19@var{yy} @var{name of author} Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' --- 20881,20887 ---- when it starts in an interactive mode: @smallexample ! Gnomovision version 69, Copyright (C) @var{year} @var{name of author} Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' diff -cNr gawk-3.0.4/doc/igawk.1 gawk-3.0.5/doc/igawk.1 *** gawk-3.0.4/doc/igawk.1 Tue Sep 8 21:09:07 1998 --- gawk-3.0.5/doc/igawk.1 Thu Nov 4 06:45:54 1999 *************** *** 1,4 **** ! .TH IGAWK 1 "Oct 13 1995" "Free Software Foundation" "Utility Commands" .SH NAME igawk \- gawk with include files .SH SYNOPSIS --- 1,4 ---- ! .TH IGAWK 1 "Nov 3 1999" "Free Software Foundation" "Utility Commands" .SH NAME igawk \- gawk with include files .SH SYNOPSIS *************** *** 66,73 **** .SH SEE ALSO .IR gawk (1) .PP ! .IR "AWK Language Programming" , Edition 1.0, published by the Free Software Foundation, 1995. .SH AUTHOR Arnold Robbins ! .RB ( arnold@gnu.org ). --- 66,73 ---- .SH SEE ALSO .IR gawk (1) .PP ! .IR "Effective AWK Programming" , Edition 1.0, published by the Free Software Foundation, 1995. .SH AUTHOR Arnold Robbins ! .RB ( arnold@skeeve.com ). diff -cNr gawk-3.0.4/doc/texinfo.tex gawk-3.0.5/doc/texinfo.tex *** gawk-3.0.4/doc/texinfo.tex Wed May 27 10:53:14 1998 --- gawk-3.0.5/doc/texinfo.tex Sun Apr 9 16:11:14 2000 *************** *** 1,7 **** % texinfo.tex -- TeX macros to handle Texinfo files. - % $Id: texinfo.tex,v 2.227 1998/02/25 22:54:34 karl Exp $ % ! % Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98 % Free Software Foundation, Inc. % % This texinfo.tex file is free software; you can redistribute it and/or --- 1,11 ---- % texinfo.tex -- TeX macros to handle Texinfo files. % ! % Load plain if necessary, i.e., if running under initex. ! \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi ! % ! \def\texinfoversion{1999-10-01.07} ! % ! % Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99 % Free Software Foundation, Inc. % % This texinfo.tex file is free software; you can redistribute it and/or *************** *** 25,60 **** % % Please try the latest version of texinfo.tex before submitting bug % reports; you can get the latest version from: ! % ftp://ftp.cs.umb.edu/pub/tex/texinfo.tex ! % /home/gd/gnu/doc/texinfo.tex on the GNU machines. ! % ! % Send bug reports to bug-texinfo@gnu.org. ! % Please include a precise test case in each bug report, ! % including a complete document with which we can reproduce the problem. ! % ! % Texinfo macros (with @macro) are *not* supported by texinfo.tex. You ! % have to run makeinfo -E to expand macros first; the texi2dvi script ! % does this. ! ! ! % Make it possible to create a .fmt file just by loading this file: ! % if the underlying format is not loaded, start by loading it now. ! % Added by gildea November 1993. ! \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi ! % This automatically updates the version number based on RCS. ! \def\deftexinfoversion$#1: #2 ${\def\texinfoversion{#2}} ! \deftexinfoversion$Revision: 2.227 $ ! \message{Loading texinfo package [Version \texinfoversion]:} % If in a .fmt file, print the version number % and turn on active characters that we couldn't do earlier because % they might have appeared in the input file name. ! \everyjob{\message{[Texinfo version \texinfoversion]}\message{} \catcode`+=\active \catcode`\_=\active} % Save some parts of plain tex whose names we will redefine. - \let\ptexb=\b \let\ptexbullet=\bullet \let\ptexc=\c --- 29,72 ---- % % Please try the latest version of texinfo.tex before submitting bug % reports; you can get the latest version from: ! % ftp://ftp.gnu.org/gnu/texinfo.tex ! % (and all GNU mirrors, see http://www.gnu.org/order/ftp.html) ! % ftp://texinfo.org/tex/texinfo.tex ! % ftp://us.ctan.org/macros/texinfo/texinfo.tex ! % (and all CTAN mirrors, finger ctan@us.ctan.org for a list). ! % /home/gd/gnu/doc/texinfo.tex on the GNU machines. ! % The texinfo.tex in any given Texinfo distribution could well be out ! % of date, so if that's what you're using, please check. ! % Texinfo has a small home page at http://texinfo.org/. ! % ! % Send bug reports to bug-texinfo@gnu.org. Please include including a ! % complete document in each bug report with which we can reproduce the ! % problem. Patches are, of course, greatly appreciated. ! % ! % To process a Texinfo manual with TeX, it's most reliable to use the ! % texi2dvi shell script that comes with the distribution. For a simple ! % manual foo.texi, however, you can get away with this: ! % tex foo.texi ! % texindex foo.?? ! % tex foo.texi ! % tex foo.texi ! % dvips foo.dvi -o # or whatever, to process the dvi file; this makes foo.ps. ! % The extra runs of TeX get the cross-reference information correct. ! % Sometimes one run after texindex suffices, and sometimes you need more ! % than two; texi2dvi does it as many times as necessary. ! % ! % It is possible to adapt texinfo.tex for other languages. You can get ! % the existing language-specific files from ftp://ftp.gnu.org/gnu/texinfo/. ! \message{Loading texinfo [version \texinfoversion]:} % If in a .fmt file, print the version number % and turn on active characters that we couldn't do earlier because % they might have appeared in the input file name. ! \everyjob{\message{[Texinfo version \texinfoversion]}% \catcode`+=\active \catcode`\_=\active} % Save some parts of plain tex whose names we will redefine. \let\ptexb=\b \let\ptexbullet=\bullet \let\ptexc=\c *************** *** 70,87 **** \let\ptexstar=\* \let\ptext=\t ! % Be sure we're in horizontal mode when doing a tie, since we make space ! % equivalent to this in @example-like environments. Otherwise, a space ! % at the beginning of a line will start with \penalty -- and ! % since \penalty is valid in vertical mode, we'd end up putting the ! % penalty on the vertical list instead of in the new paragraph. ! {\catcode`@ = 11 ! % Avoid using \@M directly, because that causes trouble ! % if the definition is written into an index file. ! \global\let\tiepenalty = \@M ! \gdef\tie{\leavevmode\penalty\tiepenalty\ } ! } ! \message{Basics,} \chardef\other=12 --- 82,90 ---- \let\ptexstar=\* \let\ptext=\t ! % We never want plain's outer \+ definition in Texinfo. ! % For @tex, we can use \tabalign. ! \let\+ = \relax \message{Basics,} \chardef\other=12 *************** *** 90,107 **** % starts a new line in the output. \newlinechar = `^^J ! % Set up fixed words for English. ! \ifx\putwordChapter\undefined{\gdef\putwordChapter{Chapter}}\fi% ! \def\putwordInfo{Info}% ! \ifx\putwordSee\undefined{\gdef\putwordSee{See}}\fi% ! \ifx\putwordsee\undefined{\gdef\putwordsee{see}}\fi% ! \ifx\putwordfile\undefined{\gdef\putwordfile{file}}\fi% ! \ifx\putwordpage\undefined{\gdef\putwordpage{page}}\fi% ! \ifx\putwordsection\undefined{\gdef\putwordsection{section}}\fi% ! \ifx\putwordSection\undefined{\gdef\putwordSection{Section}}\fi% ! \ifx\putwordTableofContents\undefined{\gdef\putwordTableofContents{Table of Contents}}\fi% ! \ifx\putwordShortContents\undefined{\gdef\putwordShortContents{Short Contents}}\fi% ! \ifx\putwordAppendix\undefined{\gdef\putwordAppendix{Appendix}}\fi% % Ignore a token. % --- 93,139 ---- % starts a new line in the output. \newlinechar = `^^J ! % Set up fixed words for English if not already set. ! \ifx\putwordAppendix\undefined \gdef\putwordAppendix{Appendix}\fi ! \ifx\putwordChapter\undefined \gdef\putwordChapter{Chapter}\fi ! \ifx\putwordfile\undefined \gdef\putwordfile{file}\fi ! \ifx\putwordin\undefined \gdef\putwordin{in}\fi ! \ifx\putwordIndexIsEmpty\undefined \gdef\putwordIndexIsEmpty{(Index is empty)}\fi ! \ifx\putwordIndexNonexistent\undefined \gdef\putwordIndexNonexistent{(Index is nonexistent)}\fi ! \ifx\putwordInfo\undefined \gdef\putwordInfo{Info}\fi ! \ifx\putwordInstanceVariableof\undefined \gdef\putwordInstanceVariableof{Instance Variable of}\fi ! \ifx\putwordMethodon\undefined \gdef\putwordMethodon{Method on}\fi ! \ifx\putwordNoTitle\undefined \gdef\putwordNoTitle{No Title}\fi ! \ifx\putwordof\undefined \gdef\putwordof{of}\fi ! \ifx\putwordon\undefined \gdef\putwordon{on}\fi ! \ifx\putwordpage\undefined \gdef\putwordpage{page}\fi ! \ifx\putwordsection\undefined \gdef\putwordsection{section}\fi ! \ifx\putwordSection\undefined \gdef\putwordSection{Section}\fi ! \ifx\putwordsee\undefined \gdef\putwordsee{see}\fi ! \ifx\putwordSee\undefined \gdef\putwordSee{See}\fi ! \ifx\putwordShortTOC\undefined \gdef\putwordShortTOC{Short Contents}\fi ! \ifx\putwordTOC\undefined \gdef\putwordTOC{Table of Contents}\fi ! % ! \ifx\putwordMJan\undefined \gdef\putwordMJan{January}\fi ! \ifx\putwordMFeb\undefined \gdef\putwordMFeb{February}\fi ! \ifx\putwordMMar\undefined \gdef\putwordMMar{March}\fi ! \ifx\putwordMApr\undefined \gdef\putwordMApr{April}\fi ! \ifx\putwordMMay\undefined \gdef\putwordMMay{May}\fi ! \ifx\putwordMJun\undefined \gdef\putwordMJun{June}\fi ! \ifx\putwordMJul\undefined \gdef\putwordMJul{July}\fi ! \ifx\putwordMAug\undefined \gdef\putwordMAug{August}\fi ! \ifx\putwordMSep\undefined \gdef\putwordMSep{September}\fi ! \ifx\putwordMOct\undefined \gdef\putwordMOct{October}\fi ! \ifx\putwordMNov\undefined \gdef\putwordMNov{November}\fi ! \ifx\putwordMDec\undefined \gdef\putwordMDec{December}\fi ! % ! \ifx\putwordDefmac\undefined \gdef\putwordDefmac{Macro}\fi ! \ifx\putwordDefspec\undefined \gdef\putwordDefspec{Special Form}\fi ! \ifx\putwordDefvar\undefined \gdef\putwordDefvar{Variable}\fi ! \ifx\putwordDefopt\undefined \gdef\putwordDefopt{User Option}\fi ! \ifx\putwordDeftypevar\undefined\gdef\putwordDeftypevar{Variable}\fi ! \ifx\putwordDeffunc\undefined \gdef\putwordDeffunc{Function}\fi ! \ifx\putwordDeftypefun\undefined\gdef\putwordDeftypefun{Function}\fi % Ignore a token. % *************** *** 122,151 **** % since that produces some useless output on the terminal. % \def\gloggingall{\begingroup \globaldefs = 1 \loggingall \endgroup}% \def\loggingall{\tracingcommands2 \tracingstats2 \tracingpages1 \tracingoutput1 \tracinglostchars1 \tracingmacros2 \tracingparagraphs1 \tracingrestores1 \showboxbreadth\maxdimen\showboxdepth\maxdimen }% % For @cropmarks command. % Do @cropmarks to get crop marks. ! % \newif\ifcropmarks \let\cropmarks = \cropmarkstrue % % Dimensions to add cropmarks at corners. % Added by P. A. MacKay, 12 Nov. 1986 % ! \newdimen\cornerlong \newdimen\cornerthick ! \newdimen\topandbottommargin ! \newdimen\outerhsize \newdimen\outervsize ! \cornerlong=1pc\cornerthick=.3pt % These set size of cropmarks ! \outerhsize=7in ! %\outervsize=9.5in ! % Alternative @smallbook page size is 9.25in ! \outervsize=9.25in ! \topandbottommargin=.75in % Main output routine. \chardef\PAGE = 255 --- 154,188 ---- % since that produces some useless output on the terminal. % \def\gloggingall{\begingroup \globaldefs = 1 \loggingall \endgroup}% + \ifx\eTeXversion\undefined \def\loggingall{\tracingcommands2 \tracingstats2 \tracingpages1 \tracingoutput1 \tracinglostchars1 \tracingmacros2 \tracingparagraphs1 \tracingrestores1 \showboxbreadth\maxdimen\showboxdepth\maxdimen }% + \else + \def\loggingall{\tracingcommands3 \tracingstats2 + \tracingpages1 \tracingoutput1 \tracinglostchars1 + \tracingmacros2 \tracingparagraphs1 \tracingrestores1 + \tracingscantokens1 \tracingassigns1 \tracingifs1 + \tracinggroups1 \tracingnesting2 + \showboxbreadth\maxdimen\showboxdepth\maxdimen + }% + \fi % For @cropmarks command. % Do @cropmarks to get crop marks. ! % \newif\ifcropmarks \let\cropmarks = \cropmarkstrue % % Dimensions to add cropmarks at corners. % Added by P. A. MacKay, 12 Nov. 1986 % ! \newdimen\outerhsize \newdimen\outervsize % set by the paper size routines ! \newdimen\cornerlong \cornerlong=1pc ! \newdimen\cornerthick \cornerthick=.3pt ! \newdimen\topandbottommargin \topandbottommargin=.75in % Main output routine. \chardef\PAGE = 255 *************** *** 179,191 **** \shipout\vbox{% \ifcropmarks \vbox to \outervsize\bgroup \hsize = \outerhsize ! \line{\ewtop\hfil\ewtop}% ! \nointerlineskip ! \line{% ! \vbox{\moveleft\cornerthick\nstop}% ! \hfill ! \vbox{\moveright\cornerthick\nstop}% ! }% \vskip\topandbottommargin \line\bgroup \hfil % center the page within the outer (page) hsize. --- 216,231 ---- \shipout\vbox{% \ifcropmarks \vbox to \outervsize\bgroup \hsize = \outerhsize ! \vskip-\topandbottommargin ! \vtop to0pt{% ! \line{\ewtop\hfil\ewtop}% ! \nointerlineskip ! \line{% ! \vbox{\moveleft\cornerthick\nstop}% ! \hfill ! \vbox{\moveright\cornerthick\nstop}% ! }% ! \vss}% \vskip\topandbottommargin \line\bgroup \hfil % center the page within the outer (page) hsize. *************** *** 203,220 **** \unvbox\footlinebox \fi % \ifcropmarks \egroup % end of \vbox\bgroup \hfil\egroup % end of (centering) \line\bgroup \vskip\topandbottommargin plus1fill minus1fill \boxmaxdepth = \cornerthick ! \line{% ! \vbox{\moveleft\cornerthick\nsbot}% ! \hfill ! \vbox{\moveright\cornerthick\nsbot}% }% - \nointerlineskip - \line{\ewbot\hfil\ewbot}% \egroup % \vbox from first cropmarks clause \fi }% end of \shipout\vbox --- 243,264 ---- \unvbox\footlinebox \fi % + \ifpdfmakepagedest \pdfmkdest{\the\pageno} \fi + % \ifcropmarks \egroup % end of \vbox\bgroup \hfil\egroup % end of (centering) \line\bgroup \vskip\topandbottommargin plus1fill minus1fill \boxmaxdepth = \cornerthick ! \vbox to0pt{\vss ! \line{% ! \vbox{\moveleft\cornerthick\nsbot}% ! \hfill ! \vbox{\moveright\cornerthick\nsbot}% ! }% ! \nointerlineskip ! \line{\ewbot\hfil\ewbot}% }% \egroup % \vbox from first cropmarks clause \fi }% end of \shipout\vbox *************** *** 330,340 **** %% Call \inENV within environments (after a \begingroup) \newif\ifENV \ENVfalse \def\inENV{\ifENV\relax\else\ENVtrue\fi} \def\ENVcheck{% ! \ifENV\errmessage{Still within an environment. Type Return to continue.} \endgroup\fi} % This is not perfect, but it should reduce lossage % @begin foo is the same as @foo, for now. ! \newhelp\EMsimple{Type to continue.} \outer\def\begin{\parsearg\beginxxx} --- 374,384 ---- %% Call \inENV within environments (after a \begingroup) \newif\ifENV \ENVfalse \def\inENV{\ifENV\relax\else\ENVtrue\fi} \def\ENVcheck{% ! \ifENV\errmessage{Still within an environment; press RETURN to continue} \endgroup\fi} % This is not perfect, but it should reduce lossage % @begin foo is the same as @foo, for now. ! \newhelp\EMsimple{Press RETURN to continue.} \outer\def\begin{\parsearg\beginxxx} *************** *** 393,399 **** % @@ prints an @ % Kludge this until the fonts are right (grr). ! \def\@{{\tt \char '100}} % This is turned off because it was never documented % and you can use @w{...} around a quote to suppress ligatures. --- 437,443 ---- % @@ prints an @ % Kludge this until the fonts are right (grr). ! \def\@{{\tt\char64}} % This is turned off because it was never documented % and you can use @w{...} around a quote to suppress ligatures. *************** *** 403,410 **** %\def\'{{'}} % Used to generate quoted braces. ! \def\mylbrace {{\tt \char '173}} ! \def\myrbrace {{\tt \char '175}} \let\{=\mylbrace \let\}=\myrbrace \begingroup --- 447,454 ---- %\def\'{{'}} % Used to generate quoted braces. ! \def\mylbrace {{\tt\char123}} ! \def\myrbrace {{\tt\char125}} \let\{=\mylbrace \let\}=\myrbrace \begingroup *************** *** 441,446 **** --- 485,502 ---- \fi\fi } + % Be sure we're in horizontal mode when doing a tie, since we make space + % equivalent to this in @example-like environments. Otherwise, a space + % at the beginning of a line will start with \penalty -- and + % since \penalty is valid in vertical mode, we'd end up putting the + % penalty on the vertical list instead of in the new paragraph. + {\catcode`@ = 11 + % Avoid using \@M directly, because that causes trouble + % if the definition is written into an index file. + \global\let\tiepenalty = \@M + \gdef\tie{\leavevmode\penalty\tiepenalty\ } + } + % @: forces normal size whitespace following. \def\:{\spacefactor=1000 } *************** *** 538,578 **** %% This method tries to make TeX break the page naturally %% if the depth of the box does not fit. %{\baselineskip=0pt% ! %\vtop to #1\mil{\vfil}\kern -#1\mil\penalty 10000 %\prevdepth=-1000pt %}} \def\needx#1{% ! % Go into vertical mode, so we don't make a big box in the middle of a % paragraph. \par % ! % Don't add any leading before our big empty box, but allow a page ! % break, since the best break might be right here. ! \allowbreak ! \nointerlineskip ! \vtop to #1\mil{\vfil}% ! % ! % TeX does not even consider page breaks if a penalty added to the ! % main vertical list is 10000 or more. But in order to see if the ! % empty box we just added fits on the page, we must make it consider ! % page breaks. On the other hand, we don't want to actually break the ! % page after the empty box. So we use a penalty of 9999. ! % ! % There is an extremely small chance that TeX will actually break the ! % page at this \penalty, if there are no other feasible breakpoints in ! % sight. (If the user is using lots of big @group commands, which ! % almost-but-not-quite fill up a page, TeX will have a hard time doing ! % good page breaking, for example.) However, I could not construct an ! % example where a page broke at this \penalty; if it happens in a real ! % document, then we can reconsider our strategy. ! \penalty9999 ! % ! % Back up by the size of the box, whether we did a page break or not. ! \kern -#1\mil ! % ! % Do not allow a page break right after this kern. ! \nobreak } % @br forces paragraph break --- 594,640 ---- %% This method tries to make TeX break the page naturally %% if the depth of the box does not fit. %{\baselineskip=0pt% ! %\vtop to #1\mil{\vfil}\kern -#1\mil\nobreak %\prevdepth=-1000pt %}} \def\needx#1{% ! % Ensure vertical mode, so we don't make a big box in the middle of a % paragraph. \par % ! % If the @need value is less than one line space, it's useless. ! \dimen0 = #1\mil ! \dimen2 = \ht\strutbox ! \advance\dimen2 by \dp\strutbox ! \ifdim\dimen0 > \dimen2 ! % ! % Do a \strut just to make the height of this box be normal, so the ! % normal leading is inserted relative to the preceding line. ! % And a page break here is fine. ! \vtop to #1\mil{\strut\vfil}% ! % ! % TeX does not even consider page breaks if a penalty added to the ! % main vertical list is 10000 or more. But in order to see if the ! % empty box we just added fits on the page, we must make it consider ! % page breaks. On the other hand, we don't want to actually break the ! % page after the empty box. So we use a penalty of 9999. ! % ! % There is an extremely small chance that TeX will actually break the ! % page at this \penalty, if there are no other feasible breakpoints in ! % sight. (If the user is using lots of big @group commands, which ! % almost-but-not-quite fill up a page, TeX will have a hard time doing ! % good page breaking, for example.) However, I could not construct an ! % example where a page broke at this \penalty; if it happens in a real ! % document, then we can reconsider our strategy. ! \penalty9999 ! % ! % Back up by the size of the box, whether we did a page break or not. ! \kern -#1\mil ! % ! % Do not allow a page break right after this kern. ! \nobreak ! \fi } % @br forces paragraph break *************** *** 583,597 **** % We do .5em per period so that it has the same spacing in a typewriter % font as three actual period characters. % ! \def\dots{\hbox to 1.5em{% ! \hskip 0pt plus 0.25fil minus 0.25fil ! .\hss.\hss.% ! \hskip 0pt plus 0.5fil minus 0.5fil ! }} % @enddots{} is an end-of-sentence ellipsis. ! % \def\enddots{% \hbox to 2em{% \hskip 0pt plus 0.25fil minus 0.25fil .\hss.\hss.\hss.% --- 645,663 ---- % We do .5em per period so that it has the same spacing in a typewriter % font as three actual period characters. % ! \def\dots{% ! \leavevmode ! \hbox to 1.5em{% ! \hskip 0pt plus 0.25fil minus 0.25fil ! .\hss.\hss.% ! \hskip 0pt plus 0.5fil minus 0.5fil ! }% ! } % @enddots{} is an end-of-sentence ellipsis. ! % \def\enddots{% + \leavevmode \hbox to 2em{% \hskip 0pt plus 0.25fil minus 0.25fil .\hss.\hss.\hss.% *************** *** 602,608 **** % @page forces the start of a new page ! \def\page{\par\vfill\supereject} % @exdent text.... --- 668,674 ---- % @page forces the start of a new page ! % \def\page{\par\vfill\supereject} % @exdent text.... *************** *** 669,1088 **** % @c is the same as @comment % @ignore ... @end ignore is another way to write a comment ! \def\comment{\catcode 64=\other \catcode 123=\other \catcode 125=\other% ! \parsearg \commentxxx} ! ! \def\commentxxx #1{\catcode 64=0 \catcode 123=1 \catcode 125=2 } \let\c=\comment ! % @paragraphindent is defined for the Info formatting commands only. ! \let\paragraphindent=\comment ! ! % Prevent errors for section commands. ! % Used in @ignore and in failing conditionals. ! \def\ignoresections{% ! \let\chapter=\relax ! \let\unnumbered=\relax ! \let\top=\relax ! \let\unnumberedsec=\relax ! \let\unnumberedsection=\relax ! \let\unnumberedsubsec=\relax ! \let\unnumberedsubsection=\relax ! \let\unnumberedsubsubsec=\relax ! \let\unnumberedsubsubsection=\relax ! \let\section=\relax ! \let\subsec=\relax ! \let\subsubsec=\relax ! \let\subsection=\relax ! \let\subsubsection=\relax ! \let\appendix=\relax ! \let\appendixsec=\relax ! \let\appendixsection=\relax ! \let\appendixsubsec=\relax ! \let\appendixsubsection=\relax ! \let\appendixsubsubsec=\relax ! \let\appendixsubsubsection=\relax ! \let\contents=\relax ! \let\smallbook=\relax ! \let\titlepage=\relax } ! % Used in nested conditionals, where we have to parse the Texinfo source ! % and so want to turn off most commands, in case they are used ! % incorrectly. ! % ! \def\ignoremorecommands{% ! \let\defcodeindex = \relax ! \let\defcv = \relax ! \let\deffn = \relax ! \let\deffnx = \relax ! \let\defindex = \relax ! \let\defivar = \relax ! \let\defmac = \relax ! \let\defmethod = \relax ! \let\defop = \relax ! \let\defopt = \relax ! \let\defspec = \relax ! \let\deftp = \relax ! \let\deftypefn = \relax ! \let\deftypefun = \relax ! \let\deftypevar = \relax ! \let\deftypevr = \relax ! \let\defun = \relax ! \let\defvar = \relax ! \let\defvr = \relax ! \let\ref = \relax ! \let\xref = \relax ! \let\printindex = \relax ! \let\pxref = \relax ! \let\settitle = \relax ! \let\setchapternewpage = \relax ! \let\setchapterstyle = \relax ! \let\everyheading = \relax ! \let\evenheading = \relax ! \let\oddheading = \relax ! \let\everyfooting = \relax ! \let\evenfooting = \relax ! \let\oddfooting = \relax ! \let\headings = \relax ! \let\include = \relax ! \let\lowersections = \relax ! \let\down = \relax ! \let\raisesections = \relax ! \let\up = \relax ! \let\set = \relax ! \let\clear = \relax ! \let\item = \relax } ! % Ignore @ignore ... @end ignore. % ! \def\ignore{\doignore{ignore}} ! % Ignore @ifinfo, @ifhtml, @ifnottex, @html, @menu, and @direntry text. % ! \def\ifinfo{\doignore{ifinfo}} ! \def\ifhtml{\doignore{ifhtml}} ! \def\ifnottex{\doignore{ifnottex}} ! \def\html{\doignore{html}} ! \def\menu{\doignore{menu}} ! \def\direntry{\doignore{direntry}} ! ! % Also ignore @macro ... @end macro. The user must run texi2dvi, ! % which runs makeinfo to do macro expansion. Ignore @unmacro, too. ! \def\macro{\doignore{macro}} ! \let\unmacro = \comment ! % @dircategory CATEGORY -- specify a category of the dir file ! % which this file should belong to. Ignore this in TeX. ! \let\dircategory = \comment ! % Ignore text until a line `@end #1'. % ! \def\doignore#1{\begingroup ! % Don't complain about control sequences we have declared \outer. ! \ignoresections ! % ! % Define a command to swallow text until we reach `@end #1'. ! \long\def\doignoretext##1\end #1{\enddoignore}% ! % ! % Make sure that spaces turn into tokens that match what \doignoretext wants. ! \catcode32 = 10 ! % ! % Ignore braces, too, so mismatched braces don't cause trouble. ! \catcode`\{ = 9 ! \catcode`\} = 9 ! % ! % And now expand that command. ! \doignoretext } ! % What we do to finish off ignored text. % ! \def\enddoignore{\endgroup\ignorespaces}% ! \newif\ifwarnedobs\warnedobsfalse ! \def\obstexwarn{% ! \ifwarnedobs\relax\else ! % We need to warn folks that they may have trouble with TeX 3.0. ! % This uses \immediate\write16 rather than \message to get newlines. ! \immediate\write16{} ! \immediate\write16{***WARNING*** for users of Unix TeX 3.0!} ! \immediate\write16{This manual trips a bug in TeX version 3.0 (tex hangs).} ! \immediate\write16{If you are running another version of TeX, relax.} ! \immediate\write16{If you are running Unix TeX 3.0, kill this TeX process.} ! \immediate\write16{ Then upgrade your TeX installation if you can.} ! \immediate\write16{ (See ftp://ftp.gnu.ai.mit.edu/pub/gnu/TeX.README.)} ! \immediate\write16{If you are stuck with version 3.0, run the} ! \immediate\write16{ script ``tex3patch'' from the Texinfo distribution} ! \immediate\write16{ to use a workaround.} ! \immediate\write16{} ! \global\warnedobstrue \fi ! } ! ! % **In TeX 3.0, setting text in \nullfont hangs tex. For a ! % workaround (which requires the file ``dummy.tfm'' to be installed), ! % uncomment the following line: ! %%%%%\font\nullfont=dummy\let\obstexwarn=\relax ! ! % Ignore text, except that we keep track of conditional commands for ! % purposes of nesting, up to an `@end #1' command. ! % ! \def\nestedignore#1{% ! \obstexwarn ! % We must actually expand the ignored text to look for the @end ! % command, so that nested ignore constructs work. Thus, we put the ! % text into a \vbox and then do nothing with the result. To minimize ! % the change of memory overflow, we follow the approach outlined on ! % page 401 of the TeXbook: make the current font be a dummy font. ! % ! \setbox0 = \vbox\bgroup ! % Don't complain about control sequences we have declared \outer. ! \ignoresections ! % ! % Define `@end #1' to end the box, which will in turn undefine the ! % @end command again. ! \expandafter\def\csname E#1\endcsname{\egroup\ignorespaces}% ! % ! % We are going to be parsing Texinfo commands. Most cause no ! % trouble when they are used incorrectly, but some commands do ! % complicated argument parsing or otherwise get confused, so we ! % undefine them. ! % ! % We can't do anything about stray @-signs, unfortunately; ! % they'll produce `undefined control sequence' errors. ! \ignoremorecommands ! % ! % Set the current font to be \nullfont, a TeX primitive, and define ! % all the font commands to also use \nullfont. We don't use ! % dummy.tfm, as suggested in the TeXbook, because not all sites ! % might have that installed. Therefore, math mode will still ! % produce output, but that should be an extremely small amount of ! % stuff compared to the main input. ! % ! \nullfont ! \let\tenrm = \nullfont \let\tenit = \nullfont \let\tensl = \nullfont ! \let\tenbf = \nullfont \let\tentt = \nullfont \let\smallcaps = \nullfont ! \let\tensf = \nullfont ! % Similarly for index fonts (mostly for their use in ! % smallexample) ! \let\indrm = \nullfont \let\indit = \nullfont \let\indsl = \nullfont ! \let\indbf = \nullfont \let\indtt = \nullfont \let\indsc = \nullfont ! \let\indsf = \nullfont ! % ! % Don't complain when characters are missing from the fonts. ! \tracinglostchars = 0 ! % ! % Don't bother to do space factor calculations. ! \frenchspacing ! % ! % Don't report underfull hboxes. ! \hbadness = 10000 ! % ! % Do minimal line-breaking. ! \pretolerance = 10000 ! % ! % Do not execute instructions in @tex ! \def\tex{\doignore{tex}}% ! } ! ! % @set VAR sets the variable VAR to an empty value. ! % @set VAR REST-OF-LINE sets VAR to the value REST-OF-LINE. ! % ! % Since we want to separate VAR from REST-OF-LINE (which might be ! % empty), we can't just use \parsearg; we have to insert a space of our ! % own to delimit the rest of the line, and then take it out again if we ! % didn't need it. Make sure the catcode of space is correct to avoid ! % losing inside @example, for instance. ! % ! \def\set{\begingroup\catcode` =10 ! \catcode`\-=12 \catcode`\_=12 % Allow - and _ in VAR. ! \parsearg\setxxx} ! \def\setxxx#1{\setyyy#1 \endsetyyy} ! \def\setyyy#1 #2\endsetyyy{% ! \def\temp{#2}% ! \ifx\temp\empty \global\expandafter\let\csname SET#1\endcsname = \empty ! \else \setzzz{#1}#2\endsetzzz % Remove the trailing space \setxxx inserted. ! \fi ! \endgroup ! } ! % Can't use \xdef to pre-expand #2 and save some time, since \temp or ! % \next or other control sequences that we've defined might get us into ! % an infinite loop. Consider `@set foo @cite{bar}'. ! \def\setzzz#1#2 \endsetzzz{\expandafter\gdef\csname SET#1\endcsname{#2}} ! ! % @clear VAR clears (i.e., unsets) the variable VAR. ! % ! \def\clear{\parsearg\clearxxx} ! \def\clearxxx#1{\global\expandafter\let\csname SET#1\endcsname=\relax} ! ! % @value{foo} gets the text saved in variable foo. ! % ! \def\value{\begingroup ! \catcode`\-=12 \catcode`\_=12 % Allow - and _ in VAR. ! \valuexxx} ! \def\valuexxx#1{% ! \expandafter\ifx\csname SET#1\endcsname\relax ! {\{No value for ``#1''\}}% ! \else ! \csname SET#1\endcsname ! \fi ! \endgroup} ! ! % @ifset VAR ... @end ifset reads the `...' iff VAR has been defined ! % with @set. ! % ! \def\ifset{\parsearg\ifsetxxx} ! \def\ifsetxxx #1{% ! \expandafter\ifx\csname SET#1\endcsname\relax ! \expandafter\ifsetfail ! \else ! \expandafter\ifsetsucceed ! \fi ! } ! \def\ifsetsucceed{\conditionalsucceed{ifset}} ! \def\ifsetfail{\nestedignore{ifset}} ! \defineunmatchedend{ifset} ! ! % @ifclear VAR ... @end ifclear reads the `...' iff VAR has never been ! % defined with @set, or has been undefined with @clear. ! % ! \def\ifclear{\parsearg\ifclearxxx} ! \def\ifclearxxx #1{% ! \expandafter\ifx\csname SET#1\endcsname\relax ! \expandafter\ifclearsucceed ! \else ! \expandafter\ifclearfail ! \fi ! } ! \def\ifclearsucceed{\conditionalsucceed{ifclear}} ! \def\ifclearfail{\nestedignore{ifclear}} ! \defineunmatchedend{ifclear} ! ! % @iftex, @ifnothtml, @ifnotinfo always succeed; we read the text ! % following, through the first @end iftex (etc.). Make `@end iftex' ! % (etc.) valid only after an @iftex. ! % ! \def\iftex{\conditionalsucceed{iftex}} ! \def\ifnothtml{\conditionalsucceed{ifnothtml}} ! \def\ifnotinfo{\conditionalsucceed{ifnotinfo}} ! \defineunmatchedend{iftex} ! \defineunmatchedend{ifnothtml} ! \defineunmatchedend{ifnotinfo} ! ! % We can't just want to start a group at @iftex (for example) and end it ! % at @end iftex, since then @set commands inside the conditional have no ! % effect (they'd get reverted at the end of the group). So we must ! % define \Eiftex to redefine itself to be its previous value. (We can't ! % just define it to fail again with an ``unmatched end'' error, since ! % the @ifset might be nested.) ! % ! \def\conditionalsucceed#1{% ! \edef\temp{% ! % Remember the current value of \E#1. ! \let\nece{prevE#1} = \nece{E#1}% ! % ! % At the `@end #1', redefine \E#1 to be its previous value. ! \def\nece{E#1}{\let\nece{E#1} = \nece{prevE#1}}% ! }% ! \temp ! } ! ! % We need to expand lots of \csname's, but we don't want to expand the ! % control sequences after we've constructed them. ! % ! \def\nece#1{\expandafter\noexpand\csname#1\endcsname} ! ! % @asis just yields its argument. Used with @table, for example. ! % ! \def\asis#1{#1} ! ! % @math means output in math mode. ! % We don't use $'s directly in the definition of \math because control ! % sequences like \math are expanded when the toc file is written. Then, ! % we read the toc file back, the $'s will be normal characters (as they ! % should be, according to the definition of Texinfo). So we must use a ! % control sequence to switch into and out of math mode. ! % ! % This isn't quite enough for @math to work properly in indices, but it ! % seems unlikely it will ever be needed there. ! % ! \let\implicitmath = $ ! \def\math#1{\implicitmath #1\implicitmath} ! ! % @bullet and @minus need the same treatment as @math, just above. ! \def\bullet{\implicitmath\ptexbullet\implicitmath} ! \def\minus{\implicitmath-\implicitmath} ! ! \def\node{\ENVcheck\parsearg\nodezzz} ! \def\nodezzz#1{\nodexxx [#1,]} ! \def\nodexxx[#1,#2]{\gdef\lastnode{#1}} ! \let\nwnode=\node ! \let\lastnode=\relax ! ! \def\donoderef{\ifx\lastnode\relax\else ! \expandafter\expandafter\expandafter\setref{\lastnode}\fi ! \global\let\lastnode=\relax} ! ! \def\unnumbnoderef{\ifx\lastnode\relax\else ! \expandafter\expandafter\expandafter\unnumbsetref{\lastnode}\fi ! \global\let\lastnode=\relax} ! ! \def\appendixnoderef{\ifx\lastnode\relax\else ! \expandafter\expandafter\expandafter\appendixsetref{\lastnode}\fi ! \global\let\lastnode=\relax} ! ! % @refill is a no-op. ! \let\refill=\relax ! ! % @setfilename is done at the beginning of every texinfo file. ! % So open here the files we need to have open while reading the input. ! % This makes it possible to make a .fmt file for texinfo. ! \def\setfilename{% ! \readauxfile ! \opencontents ! \openindices ! \fixbackslash % Turn off hack to swallow `\input texinfo'. ! \global\let\setfilename=\comment % Ignore extra @setfilename cmds. ! % ! % If texinfo.cnf is present on the system, read it. ! % Useful for site-wide @afourpaper, etc. ! % Just to be on the safe side, close the input stream before the \input. ! \openin 1 texinfo.cnf ! \ifeof1 \let\temp=\relax \else \def\temp{\input texinfo.cnf }\fi ! \closein1 ! \temp ! % ! \comment % Ignore the actual filename. ! } ! ! % @bye. ! \outer\def\bye{\pagealignmacro\tracingstats=1\ptexend} ! ! % \def\macro#1{\begingroup\ignoresections\catcode`\#=6\def\macrotemp{#1}\parsearg\macroxxx} ! % \def\macroxxx#1#2 \end macro{% ! % \expandafter\gdef\macrotemp#1{#2}% ! % \endgroup} ! ! %\def\linemacro#1{\begingroup\ignoresections\catcode`\#=6\def\macrotemp{#1}\parsearg\linemacroxxx} ! %\def\linemacroxxx#1#2 \end linemacro{% ! %\let\parsearg=\relax ! %\edef\macrotempx{\csname M\butfirst\expandafter\string\macrotemp\endcsname}% ! %\expandafter\xdef\macrotemp{\parsearg\macrotempx}% ! %\expandafter\gdef\macrotempx#1{#2}% ! %\endgroup} ! ! %\def\butfirst#1{} \message{fonts,} - % Font-change commands. ! % Texinfo supports the sans serif font style, which plain TeX does not. % So we set up a \sf analogous to plain's \rm, etc. \newfam\sffam \def\sf{\fam=\sffam \tensf} --- 735,1029 ---- % @c is the same as @comment % @ignore ... @end ignore is another way to write a comment ! \def\comment{\begingroup \catcode`\^^M=\other% ! \catcode`\@=\other \catcode`\{=\other \catcode`\}=\other% ! \commentxxx} ! {\catcode`\^^M=\other \gdef\commentxxx#1^^M{\endgroup}} \let\c=\comment ! % @paragraphindent NCHARS ! % We'll use ems for NCHARS, close enough. ! % We cannot implement @paragraphindent asis, though. ! % ! \def\asisword{asis} % no translation, these are keywords ! \def\noneword{none} ! % ! \def\paragraphindent{\parsearg\doparagraphindent} ! \def\doparagraphindent#1{% ! \def\temp{#1}% ! \ifx\temp\asisword ! \else ! \ifx\temp\noneword ! \defaultparindent = 0pt ! \else ! \defaultparindent = #1em ! \fi ! \fi ! \parindent = \defaultparindent } ! % @exampleindent NCHARS ! % We'll use ems for NCHARS like @paragraphindent. ! % It seems @exampleindent asis isn't necessary, but ! % I preserve it to make it similar to @paragraphindent. ! \def\exampleindent{\parsearg\doexampleindent} ! \def\doexampleindent#1{% ! \def\temp{#1}% ! \ifx\temp\asisword ! \else ! \ifx\temp\noneword ! \lispnarrowing = 0pt ! \else ! \lispnarrowing = #1em ! \fi ! \fi } ! % @asis just yields its argument. Used with @table, for example. % ! \def\asis#1{#1} ! % @math means output in math mode. ! % We don't use $'s directly in the definition of \math because control ! % sequences like \math are expanded when the toc file is written. Then, ! % we read the toc file back, the $'s will be normal characters (as they ! % should be, according to the definition of Texinfo). So we must use a ! % control sequence to switch into and out of math mode. % ! % This isn't quite enough for @math to work properly in indices, but it ! % seems unlikely it will ever be needed there. ! % ! \let\implicitmath = $ ! \def\math#1{\implicitmath #1\implicitmath} + % @bullet and @minus need the same treatment as @math, just above. + \def\bullet{\implicitmath\ptexbullet\implicitmath} + \def\minus{\implicitmath-\implicitmath} ! % @refill is a no-op. ! \let\refill=\relax ! % If working on a large document in chapters, it is convenient to ! % be able to disable indexing, cross-referencing, and contents, for test runs. ! % This is done with @novalidate (before @setfilename). % ! \newif\iflinks \linkstrue % by default we want the aux files. ! \let\novalidate = \linksfalse ! ! % @setfilename is done at the beginning of every texinfo file. ! % So open here the files we need to have open while reading the input. ! % This makes it possible to make a .fmt file for texinfo. ! \def\setfilename{% ! \iflinks ! \readauxfile ! \fi % \openindices needs to do some work in any case. ! \openindices ! \fixbackslash % Turn off hack to swallow `\input texinfo'. ! \global\let\setfilename=\comment % Ignore extra @setfilename cmds. ! % ! % If texinfo.cnf is present on the system, read it. ! % Useful for site-wide @afourpaper, etc. ! % Just to be on the safe side, close the input stream before the \input. ! \openin 1 texinfo.cnf ! \ifeof1 \let\temp=\relax \else \def\temp{\input texinfo.cnf }\fi ! \closein1 ! \temp ! % ! \comment % Ignore the actual filename. } ! % Called from \setfilename. % ! \def\openindices{% ! \newindex{cp}% ! \newcodeindex{fn}% ! \newcodeindex{vr}% ! \newcodeindex{tp}% ! \newcodeindex{ky}% ! \newcodeindex{pg}% ! } ! % @bye. ! \outer\def\bye{\pagealignmacro\tracingstats=1\ptexend} ! ! ! \message{pdf,} ! % adobe `portable' document format ! \newcount\tempnum ! \newcount\lnkcount ! \newtoks\filename ! \newcount\filenamelength ! \newcount\pgn ! \newtoks\toksA ! \newtoks\toksB ! \newtoks\toksC ! \newtoks\toksD ! \newbox\boxA ! \newcount\countA ! \newif\ifpdf ! \newif\ifpdfmakepagedest ! ! \ifx\pdfoutput\undefined ! \pdffalse ! \let\pdfmkdest = \gobble ! \let\pdfurl = \gobble ! \let\endlink = \relax ! \let\linkcolor = \relax ! \let\pdfmakeoutlines = \relax ! \else ! \pdftrue ! \pdfoutput = 1 ! \input pdfcolor ! \def\dopdfimage#1#2#3{% ! \def\imagewidth{#2}% ! \def\imageheight{#3}% ! \ifnum\pdftexversion < 14 ! \pdfimage ! \else ! \pdfximage \fi ! \ifx\empty\imagewidth\else width \imagewidth \fi ! \ifx\empty\imageheight\else height \imageheight \fi ! {#1.pdf}% ! \ifnum\pdftexversion < 14 \else ! \pdfrefximage \pdflastximage ! \fi} ! \def\pdfmkdest#1{\pdfdest name{#1@} xyz} ! \def\pdfmkpgn#1{#1@} ! \let\linkcolor = \Cyan ! \def\endlink{\Black\pdfendlink} ! % Adding outlines to PDF; macros for calculating structure of outlines ! % come from Petr Olsak ! \def\expnumber#1{\expandafter\ifx\csname#1\endcsname\relax 0% ! \else \csname#1\endcsname \fi} ! \def\advancenumber#1{\tempnum=\expnumber{#1}\relax ! \advance\tempnum by1 ! \expandafter\xdef\csname#1\endcsname{\the\tempnum}} ! \def\pdfmakeoutlines{{% ! \openin 1 \jobname.toc ! \ifeof 1\else\bgroup ! \closein 1 ! \indexnofonts ! \def\tt{} ! % thanh's hack / proper braces in bookmarks ! \edef\mylbrace{\iftrue \string{\else}\fi}\let\{=\mylbrace ! \edef\myrbrace{\iffalse{\else\string}\fi}\let\}=\myrbrace ! % ! \def\chapentry ##1##2##3{} ! \def\unnumbchapentry ##1##2{} ! \def\secentry ##1##2##3##4{\advancenumber{chap##2}} ! \def\unnumbsecentry ##1##2{} ! \def\subsecentry ##1##2##3##4##5{\advancenumber{sec##2.##3}} ! \def\unnumbsubsecentry ##1##2{} ! \def\subsubsecentry ##1##2##3##4##5##6{\advancenumber{subsec##2.##3.##4}} ! \def\unnumbsubsubsecentry ##1##2{} ! \input \jobname.toc ! \def\chapentry ##1##2##3{% ! \pdfoutline goto name{\pdfmkpgn{##3}}count-\expnumber{chap##2}{##1}} ! \def\unnumbchapentry ##1##2{% ! \pdfoutline goto name{\pdfmkpgn{##2}}{##1}} ! \def\secentry ##1##2##3##4{% ! \pdfoutline goto name{\pdfmkpgn{##4}}count-\expnumber{sec##2.##3}{##1}} ! \def\unnumbsecentry ##1##2{% ! \pdfoutline goto name{\pdfmkpgn{##2}}{##1}} ! \def\subsecentry ##1##2##3##4##5{% ! \pdfoutline goto name{\pdfmkpgn{##5}}count-\expnumber{subsec##2.##3.##4}{##1}} ! \def\unnumbsubsecentry ##1##2{% ! \pdfoutline goto name{\pdfmkpgn{##2}}{##1}} ! \def\subsubsecentry ##1##2##3##4##5##6{% ! \pdfoutline goto name{\pdfmkpgn{##6}}{##1}} ! \def\unnumbsubsubsecentry ##1##2{% ! \pdfoutline goto name{\pdfmkpgn{##2}}{##1}} ! \input \jobname.toc ! \egroup\fi ! }} ! \def\makelinks #1,{% ! \def\params{#1}\def\E{END}% ! \ifx\params\E ! \let\nextmakelinks=\relax ! \else ! \let\nextmakelinks=\makelinks ! \ifnum\lnkcount>0,\fi ! \picknum{#1}% ! \startlink attr{/Border [0 0 0]} ! goto name{\pdfmkpgn{\the\pgn}}% ! \linkcolor #1% ! \advance\lnkcount by 1% ! \endlink ! \fi ! \nextmakelinks ! } ! \def\picknum#1{\expandafter\pn#1} ! \def\pn#1{% ! \def\p{#1}% ! \ifx\p\lbrace ! \let\nextpn=\ppn ! \else ! \let\nextpn=\ppnn ! \def\first{#1} ! \fi ! \nextpn ! } ! \def\ppn#1{\pgn=#1\gobble} ! \def\ppnn{\pgn=\first} ! \def\pdfmklnk#1{\lnkcount=0\makelinks #1,END,} ! \def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks} ! \def\skipspaces#1{\def\PP{#1}\def\D{|}% ! \ifx\PP\D\let\nextsp\relax ! \else\let\nextsp\skipspaces ! \ifx\p\space\else\addtokens{\filename}{\PP}% ! \advance\filenamelength by 1 ! \fi ! \fi ! \nextsp} ! \def\getfilename#1{\filenamelength=0\expandafter\skipspaces#1|\relax} ! \ifnum\pdftexversion < 14 ! \let \startlink \pdfannotlink ! \else ! \let \startlink \pdfstartlink ! \fi ! \def\pdfurl#1{% ! \begingroup ! \normalturnoffactive\def\@{@}% ! \leavevmode\Red ! \startlink attr{/Border [0 0 0]}% ! user{/Subtype /Link /A << /S /URI /URI (#1) >>}% ! % #1 ! \endgroup} ! \def\pdfgettoks#1.{\setbox\boxA=\hbox{\toksA={#1.}\toksB={}\maketoks}} ! \def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks} ! \def\adn#1{\addtokens{\toksC}{#1}\global\countA=1\let\next=\maketoks} ! \def\poptoks#1#2|ENDTOKS|{\let\first=#1\toksD={#1}\toksA={#2}} ! \def\maketoks{% ! \expandafter\poptoks\the\toksA|ENDTOKS| ! \ifx\first0\adn0 ! \else\ifx\first1\adn1 \else\ifx\first2\adn2 \else\ifx\first3\adn3 ! \else\ifx\first4\adn4 \else\ifx\first5\adn5 \else\ifx\first6\adn6 ! \else\ifx\first7\adn7 \else\ifx\first8\adn8 \else\ifx\first9\adn9 ! \else ! \ifnum0=\countA\else\makelink\fi ! \ifx\first.\let\next=\done\else ! \let\next=\maketoks ! \addtokens{\toksB}{\the\toksD} ! \ifx\first,\addtokens{\toksB}{\space}\fi ! \fi ! \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi ! \next} ! \def\makelink{\addtokens{\toksB}% ! {\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0} ! \def\pdflink#1{% ! \startlink attr{/Border [0 0 0]} goto name{\mkpgn{#1}} ! \linkcolor #1\endlink} ! \def\mkpgn#1{#1@} ! \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st} ! \fi % \ifx\pdfoutput \message{fonts,} % Font-change commands. ! % Texinfo sort of supports the sans serif font style, which plain TeX does not. % So we set up a \sf analogous to plain's \rm, etc. \newfam\sffam \def\sf{\fam=\sffam \tensf} *************** *** 1148,1169 **** \setfont\deftt\ttshape{10}{\magstep1} \def\df{\let\tentt=\deftt \let\tenbf = \defbf \bf} ! % Fonts for indices and small examples (9pt). ! % We actually use the slanted font rather than the italic, ! % because texinfo normally uses the slanted fonts for that. ! % Do not make many font distinctions in general in the index, since they ! % aren't very useful. ! \setfont\ninett\ttshape{9}{1000} ! \setfont\indrm\rmshape{9}{1000} ! \setfont\indit\slshape{9}{1000} ! \let\indsl=\indit ! \let\indtt=\ninett ! \let\indttsl=\ninett ! \let\indsf=\indrm ! \let\indbf=\indrm ! \setfont\indsc\scshape{10}{900} ! \font\indi=cmmi9 ! \font\indsy=cmsy9 % Fonts for title page: \setfont\titlerm\rmbshape{12}{\magstep3} --- 1089,1105 ---- \setfont\deftt\ttshape{10}{\magstep1} \def\df{\let\tentt=\deftt \let\tenbf = \defbf \bf} ! % Fonts for indices, footnotes, small examples (9pt). ! \setfont\smallrm\rmshape{9}{1000} ! \setfont\smalltt\ttshape{9}{1000} ! \setfont\smallbf\bfshape{10}{900} ! \setfont\smallit\itshape{9}{1000} ! \setfont\smallsl\slshape{9}{1000} ! \setfont\smallsf\sfshape{9}{1000} ! \setfont\smallsc\scshape{10}{900} ! \setfont\smallttsl\ttslshape{10}{900} ! \font\smalli=cmmi9 ! \font\smallsy=cmsy9 % Fonts for title page: \setfont\titlerm\rmbshape{12}{\magstep3} *************** *** 1277,1287 **** \let\tensf=\ssecsf \let\teni=\sseci \let\tensy=\ssecsy \let\tenttsl=\ssecttsl \resetmathfonts \setleading{15pt}} \let\subsubsecfonts = \subsecfonts % Maybe make sssec fonts scaled magstephalf? ! \def\indexfonts{% ! \let\tenrm=\indrm \let\tenit=\indit \let\tensl=\indsl ! \let\tenbf=\indbf \let\tentt=\indtt \let\smallcaps=\indsc ! \let\tensf=\indsf \let\teni=\indi \let\tensy=\indsy \let\tenttsl=\indttsl ! \resetmathfonts \setleading{12pt}} % Set up the default fonts, so we can use them for creating boxes. % --- 1213,1224 ---- \let\tensf=\ssecsf \let\teni=\sseci \let\tensy=\ssecsy \let\tenttsl=\ssecttsl \resetmathfonts \setleading{15pt}} \let\subsubsecfonts = \subsecfonts % Maybe make sssec fonts scaled magstephalf? ! \def\smallfonts{% ! \let\tenrm=\smallrm \let\tenit=\smallit \let\tensl=\smallsl ! \let\tenbf=\smallbf \let\tentt=\smalltt \let\smallcaps=\smallsc ! \let\tensf=\smallsf \let\teni=\smalli \let\tensy=\smallsy ! \let\tenttsl=\smallttsl ! \resetmathfonts \setleading{11pt}} % Set up the default fonts, so we can use them for creating boxes. % *************** *** 1305,1317 **** % \smartitalic{ARG} outputs arg in italics, followed by an italic correction % unless the following character is such as not to need one. \def\smartitalicx{\ifx\next,\else\ifx\next-\else\ifx\next.\else\/\fi\fi\fi} ! \def\smartitalic#1{{\sl #1}\futurelet\next\smartitalicx} \let\i=\smartitalic ! \let\var=\smartitalic ! \let\dfn=\smartitalic \let\emph=\smartitalic ! \let\cite=\smartitalic \def\b#1{{\bf #1}} \let\strong=\b --- 1242,1255 ---- % \smartitalic{ARG} outputs arg in italics, followed by an italic correction % unless the following character is such as not to need one. \def\smartitalicx{\ifx\next,\else\ifx\next-\else\ifx\next.\else\/\fi\fi\fi} ! \def\smartslanted#1{{\sl #1}\futurelet\next\smartitalicx} ! \def\smartitalic#1{{\it #1}\futurelet\next\smartitalicx} \let\i=\smartitalic ! \let\var=\smartslanted ! \let\dfn=\smartslanted \let\emph=\smartitalic ! \let\cite=\smartslanted \def\b#1{{\bf #1}} \let\strong=\b *************** *** 1329,1337 **** } \let\ttfont=\t \def\samp#1{`\tclose{#1}'\null} ! \setfont\smallrm\rmshape{8}{1000} ! \font\smallsy=cmsy9 ! \def\key#1{{\smallrm\textfont2=\smallsy \leavevmode\hbox{% \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{% \vbox{\hrule\kern-0.4pt \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}% --- 1267,1275 ---- } \let\ttfont=\t \def\samp#1{`\tclose{#1}'\null} ! \setfont\keyrm\rmshape{8}{1000} ! \font\keysy=cmsy9 ! \def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{% \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{% \vbox{\hrule\kern-0.4pt \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}% *************** *** 1341,1347 **** --- 1279,1287 ---- %\def\key #1{{\ttsl \nohyphenation \uppercase{#1}}\null} \def\ctrl #1{{\tt \rawbackslash \hat}#1} + % @file, @option are the same as @samp. \let\file=\samp + \let\option=\samp % @code is a modification of @t, % which makes spaces the same size as normal in the surrounding text. *************** *** 1376,1395 **** % and arrange explicitly to hyphenate at a dash. % -- rms. { ! \catcode`\-=\active ! \catcode`\_=\active ! \catcode`\|=\active ! \global\def\code{\begingroup \catcode`\-=\active \let-\codedash \catcode`\_=\active \let_\codeunder \codex} ! % The following is used by \doprintindex to insure that long function names ! % wrap around. It is necessary for - and _ to be active before the index is ! % read from the file, as \entry parses the arguments long before \code is ! % ever called. -- mycroft ! % _ is always active; and it shouldn't be \let = to an _ that is a ! % subscript character anyway. Then, @cindex @samp{_} (for example) ! % fails. --karl ! \global\def\indexbreaks{% ! \catcode`\-=\active \let-\realdash ! } } \def\realdash{-} --- 1316,1333 ---- % and arrange explicitly to hyphenate at a dash. % -- rms. { ! \catcode`\-=\active ! \catcode`\_=\active ! % ! \global\def\code{\begingroup ! \catcode`\-=\active \let-\codedash ! \catcode`\_=\active \let_\codeunder ! \codex ! } ! % ! % If we end up with any active - characters when handling the index, ! % just treat them as a normal -. ! \global\def\indexbreaks{\catcode`\-=\active \let-\realdash} } \def\realdash{-} *************** *** 1430,1456 **** \else{\tclose{\kbdfont\look}}\fi \else{\tclose{\kbdfont\look}}\fi} ! % @url. Quotes do not seem necessary, so use \code. \let\url=\code ! % @uref (abbreviation for `urlref') takes an optional second argument ! % specifying the text to display. First (mandatory) arg is the url. ! % Perhaps eventually put in a hypertex \special here. ! % ! \def\uref#1{\urefxxx #1,,\finish} ! \def\urefxxx#1,#2,#3\finish{% ! \setbox0 = \hbox{\ignorespaces #2}% \ifdim\wd0 > 0pt ! \unhbox0\ (\code{#1})% \else ! \code{#1}% \fi ! } ! % rms does not like the angle brackets --karl, 17may97. ! % So now @email is just like @uref. %\def\email#1{\angleleft{\tt #1}\angleright} ! \let\email=\uref % Check if we are currently using a typewriter font. Since all the % Computer Modern typewriter fonts have zero interword stretch (and --- 1368,1422 ---- \else{\tclose{\kbdfont\look}}\fi \else{\tclose{\kbdfont\look}}\fi} ! % For @url, @env, @command quotes seem unnecessary, so use \code. \let\url=\code + \let\env=\code + \let\command=\code ! % @uref (abbreviation for `urlref') takes an optional (comma-separated) ! % second argument specifying the text to display and an optional third ! % arg as text to display instead of (rather than in addition to) the url ! % itself. First (mandatory) arg is the url. Perhaps eventually put in ! % a hypertex \special here. ! % ! \def\uref#1{\douref #1,,,\finish} ! \def\douref#1,#2,#3,#4\finish{\begingroup ! \unsepspaces ! \pdfurl{#1}% ! \setbox0 = \hbox{\ignorespaces #3}% \ifdim\wd0 > 0pt ! \unhbox0 % third arg given, show only that \else ! \setbox0 = \hbox{\ignorespaces #2}% ! \ifdim\wd0 > 0pt ! \ifpdf ! \unhbox0 % PDF: 2nd arg given, show only it ! \else ! \unhbox0\ (\code{#1})% DVI: 2nd arg given, show both it and url ! \fi ! \else ! \code{#1}% only url given, so show it ! \fi \fi ! \endlink ! \endgroup} ! % rms does not like angle brackets --karl, 17may97. ! % So now @email is just like @uref, unless we are pdf. ! % %\def\email#1{\angleleft{\tt #1}\angleright} ! \ifpdf ! \def\email#1{\doemail#1,,\finish} ! \def\doemail#1,#2,#3\finish{\begingroup ! \unsepspaces ! \pdfurl{mailto:#1}% ! \setbox0 = \hbox{\ignorespaces #2}% ! \ifdim\wd0>0pt\unhbox0\else\code{#1}\fi ! \endlink ! \endgroup} ! \else ! \let\email=\uref ! \fi % Check if we are currently using a typewriter font. Since all the % Computer Modern typewriter fonts have zero interword stretch (and *************** *** 1460,1467 **** \def\ifmonospace{\ifdim\fontdimen3\font=0pt } % Typeset a dimension, e.g., `in' or `pt'. The only reason for the ! % argument is to make the input look right: @dmn{pt} instead of ! % @dmn{}pt. % \def\dmn#1{\thinspace #1} --- 1426,1432 ---- \def\ifmonospace{\ifdim\fontdimen3\font=0pt } % Typeset a dimension, e.g., `in' or `pt'. The only reason for the ! % argument is to make the input look right: @dmn{pt} instead of @dmn{}pt. % \def\dmn#1{\thinspace #1} *************** *** 1472,1482 **** % Polish suppressed-l. --karl, 22sep96. %\def\l#1{{\li #1}\null} \def\r#1{{\rm #1}} % roman font - % Use of \lowercase was suggested. \def\sc#1{{\smallcaps#1}} % smallcaps font \def\ii#1{{\it #1}} % italic font % @pounds{} is a sterling sign. \def\pounds{{\it\$}} --- 1437,1450 ---- % Polish suppressed-l. --karl, 22sep96. %\def\l#1{{\li #1}\null} + % Explicit font changes: @r, @sc, undocumented @ii. \def\r#1{{\rm #1}} % roman font \def\sc#1{{\smallcaps#1}} % smallcaps font \def\ii#1{{\it #1}} % italic font + % @acronym downcases the argument and prints in smallcaps. + \def\acronym#1{{\smallcaps \lowercase{#1}}} + % @pounds{} is a sterling sign. \def\pounds{{\it\$}} *************** *** 1490,1504 **** \newif\ifseenauthor \newif\iffinishedtitlepage \def\shorttitlepage{\parsearg\shorttitlepagezzz} \def\shorttitlepagezzz #1{\begingroup\hbox{}\vskip 1.5in \chaprm \centerline{#1}% \endgroup\page\hbox{}\page} \def\titlepage{\begingroup \parindent=0pt \textfonts \let\subtitlerm=\tenrm - % I deinstalled the following change because \cmr12 is undefined. - % This change was not in the ChangeLog anyway. --rms. - % \let\subtitlerm=\cmr12 \def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines}% % \def\authorfont{\authorrm \normalbaselineskip = 16pt \normalbaselines}% --- 1458,1477 ---- \newif\ifseenauthor \newif\iffinishedtitlepage + % Do an implicit @contents or @shortcontents after @end titlepage if the + % user says @setcontentsaftertitlepage or @setshortcontentsaftertitlepage. + % + \newif\ifsetcontentsaftertitlepage + \let\setcontentsaftertitlepage = \setcontentsaftertitlepagetrue + \newif\ifsetshortcontentsaftertitlepage + \let\setshortcontentsaftertitlepage = \setshortcontentsaftertitlepagetrue + \def\shorttitlepage{\parsearg\shorttitlepagezzz} \def\shorttitlepagezzz #1{\begingroup\hbox{}\vskip 1.5in \chaprm \centerline{#1}% \endgroup\page\hbox{}\page} \def\titlepage{\begingroup \parindent=0pt \textfonts \let\subtitlerm=\tenrm \def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines}% % \def\authorfont{\authorrm \normalbaselineskip = 16pt \normalbaselines}% *************** *** 1547,1552 **** --- 1520,1542 ---- % after the title page, which we certainly don't want. \oldpage \endgroup + % + % If they want short, they certainly want long too. + \ifsetshortcontentsaftertitlepage + \shortcontents + \contents + \global\let\shortcontents = \relax + \global\let\contents = \relax + \fi + % + \ifsetcontentsaftertitlepage + \contents + \global\let\contents = \relax + \global\let\shortcontents = \relax + \fi + % + \ifpdf \pdfmakepagedesttrue \fi + % \HEADINGSon } *************** *** 1560,1569 **** \let\thispage=\folio ! \newtoks \evenheadline % Token sequence for heading line of even pages ! \newtoks \oddheadline % Token sequence for heading line of odd pages ! \newtoks \evenfootline % Token sequence for footing line of even pages ! \newtoks \oddfootline % Token sequence for footing line of odd pages % Now make Tex use those variables \headline={{\textfonts\rm \ifodd\pageno \the\oddheadline --- 1550,1559 ---- \let\thispage=\folio ! \newtoks\evenheadline % headline on even pages ! \newtoks\oddheadline % headline on odd pages ! \newtoks\evenfootline % footline on even pages ! \newtoks\oddfootline % footline on odd pages % Now make Tex use those variables \headline={{\textfonts\rm \ifodd\pageno \the\oddheadline *************** *** 1681,1719 **** % Subroutines used in generating headings % Produces Day Month Year style of output. ! \def\today{\number\day\space ! \ifcase\month\or ! January\or February\or March\or April\or May\or June\or ! July\or August\or September\or October\or November\or December\fi ! \space\number\year} ! ! % Use this if you want the Month Day, Year style of output. ! %\def\today{\ifcase\month\or ! %January\or February\or March\or April\or May\or June\or ! %July\or August\or September\or October\or November\or December\fi ! %\space\number\day, \number\year} ! ! % @settitle line... specifies the title of the document, for headings ! % It generates no output of its own ! \def\thistitle{No Title} \def\settitle{\parsearg\settitlezzz} \def\settitlezzz #1{\gdef\thistitle{#1}} \message{tables,} - - % @tabs -- simple alignment - - % These don't work. For one thing, \+ is defined as outer. - % So these macros cannot even be defined. - - %\def\tabs{\parsearg\tabszzz} - %\def\tabszzz #1{\settabs\+#1\cr} - %\def\tabline{\parsearg\tablinezzz} - %\def\tablinezzz #1{\+#1\cr} - %\def\&{&} - % Tables -- @table, @ftable, @vtable, @item(x), @kitem(x), @xitem(x). % default indentation of table text --- 1671,1693 ---- % Subroutines used in generating headings % Produces Day Month Year style of output. ! \def\today{% ! \number\day\space ! \ifcase\month ! \or\putwordMJan\or\putwordMFeb\or\putwordMMar\or\putwordMApr ! \or\putwordMMay\or\putwordMJun\or\putwordMJul\or\putwordMAug ! \or\putwordMSep\or\putwordMOct\or\putwordMNov\or\putwordMDec ! \fi ! \space\number\year} ! % @settitle line... specifies the title of the document, for headings. ! % It generates no output of its own. ! \def\thistitle{\putwordNoTitle} \def\settitle{\parsearg\settitlezzz} \def\settitlezzz #1{\gdef\thistitle{#1}} \message{tables,} % Tables -- @table, @ftable, @vtable, @item(x), @kitem(x), @xitem(x). % default indentation of table text *************** *** 1757,1767 **** \itemindex{#1}% \nobreak % This prevents a break before @itemx. % - % Be sure we are not still in the middle of a paragraph. - %{\parskip = 0in - %\par - %}% - % % If the item text does not fit in the space we have, put it on a line % by itself, and do not allow a page break either before or after that % line. We do not start a paragraph here because then if the next --- 1731,1736 ---- *************** *** 1790,1802 **** \itemxneedsnegativevskipfalse \else % The item text fits into the space. Start a paragraph, so that the ! % following text (if any) will end up on the same line. Since that ! % text will be indented by \tableindent, we make the item text be in ! % a zero-width box. \noindent ! \rlap{\hskip -\tableindent\box0}\ignorespaces% ! \endgroup% ! \itemxneedsnegativevskiptrue% \fi } --- 1759,1775 ---- \itemxneedsnegativevskipfalse \else % The item text fits into the space. Start a paragraph, so that the ! % following text (if any) will end up on the same line. \noindent ! % Do this with kerns and \unhbox so that if there is a footnote in ! % the item text, it can migrate to the main vertical list and ! % eventually be printed. ! \nobreak\kern-\tableindent ! \dimen0 = \itemmax \advance\dimen0 by \itemmargin \advance\dimen0 by -\wd0 ! \unhbox0 ! \nobreak\kern\dimen0 ! \endgroup ! \itemxneedsnegativevskiptrue \fi } *************** *** 1807,1815 **** \def\xitem{\errmessage{@xitem while not in a table}} \def\xitemx{\errmessage{@xitemx while not in a table}} ! %% Contains a kludge to get @end[description] to work \def\description{\tablez{\dontindex}{1}{}{}{}{}} \def\table{\begingroup\inENV\obeylines\obeyspaces\tablex} {\obeylines\obeyspaces% \gdef\tablex #1^^M{% --- 1780,1789 ---- \def\xitem{\errmessage{@xitem while not in a table}} \def\xitemx{\errmessage{@xitemx while not in a table}} ! % Contains a kludge to get @end[description] to work. \def\description{\tablez{\dontindex}{1}{}{}{}{}} + % @table, @ftable, @vtable. \def\table{\begingroup\inENV\obeylines\obeyspaces\tablex} {\obeylines\obeyspaces% \gdef\tablex #1^^M{% *************** *** 1869,1875 **** \def\itemize{\parsearg\itemizezzz} \def\itemizezzz #1{% ! \begingroup % ended by the @end itemsize \itemizey {#1}{\Eitemize} } --- 1843,1849 ---- \def\itemize{\parsearg\itemizezzz} \def\itemizezzz #1{% ! \begingroup % ended by the @end itemize \itemizey {#1}{\Eitemize} } *************** *** 2082,2127 **** \multitablelinespace=0pt % Macros used to set up halign preamble: ! % \let\endsetuptable\relax \def\xendsetuptable{\endsetuptable} \let\columnfractions\relax \def\xcolumnfractions{\columnfractions} \newif\ifsetpercent ! % 2/1/96, to allow fractions to be given with more than one digit. ! \def\pickupwholefraction#1 {\global\advance\colcount by1 % ! \expandafter\xdef\csname col\the\colcount\endcsname{.#1\hsize}% ! \setuptable} \newcount\colcount ! \def\setuptable#1{\def\firstarg{#1}% ! \ifx\firstarg\xendsetuptable\let\go\relax% ! \else ! \ifx\firstarg\xcolumnfractions\global\setpercenttrue% \else ! \ifsetpercent ! \let\go\pickupwholefraction % In this case arg of setuptable ! % is the decimal point before the ! % number given in percent of hsize. ! % We don't need this so we don't use it. \else ! \global\advance\colcount by1 ! \setbox0=\hbox{#1 }% Add a normal word space as a separator; ! % typically that is always in the input, anyway. ! \expandafter\xdef\csname col\the\colcount\endcsname{\the\wd0}% \fi% ! \fi% ! \ifx\go\pickupwholefraction\else\let\go\setuptable\fi% ! \fi\go} ! % multitable syntax ! \def\tab{&\hskip1sp\relax} % 2/2/96 ! % tiny skip here makes sure this column space is ! % maintained, even if it is never used. % @multitable ... @end multitable definitions: ! \def\multitable{\parsearg\dotable} \def\dotable#1{\bgroup \vskip\parskip --- 2056,2115 ---- \multitablelinespace=0pt % Macros used to set up halign preamble: ! % \let\endsetuptable\relax \def\xendsetuptable{\endsetuptable} \let\columnfractions\relax \def\xcolumnfractions{\columnfractions} \newif\ifsetpercent ! % #1 is the part of the @columnfraction before the decimal point, which ! % is presumably either 0 or the empty string (but we don't check, we ! % just throw it away). #2 is the decimal part, which we use as the ! % percent of \hsize for this column. ! \def\pickupwholefraction#1.#2 {% ! \global\advance\colcount by 1 ! \expandafter\xdef\csname col\the\colcount\endcsname{.#2\hsize}% ! \setuptable ! } \newcount\colcount ! \def\setuptable#1{% ! \def\firstarg{#1}% ! \ifx\firstarg\xendsetuptable ! \let\go = \relax \else ! \ifx\firstarg\xcolumnfractions ! \global\setpercenttrue ! \else ! \ifsetpercent ! \let\go\pickupwholefraction ! \else ! \global\advance\colcount by 1 ! \setbox0=\hbox{#1\unskip }% Add a normal word space as a separator; ! % typically that is always in the input, anyway. ! \expandafter\xdef\csname col\the\colcount\endcsname{\the\wd0}% ! \fi ! \fi ! \ifx\go\pickupwholefraction ! % Put the argument back for the \pickupwholefraction call, so ! % we'll always have a period there to be parsed. ! \def\go{\pickupwholefraction#1}% \else ! \let\go = \setuptable \fi% ! \fi ! \go ! } ! % This used to have \hskip1sp. But then the space in a template line is ! % not enough. That is bad. So let's go back to just & until we ! % encounter the problem it was intended to solve again. ! % --karl, nathan@acm.org, 20apr99. ! \def\tab{&} % @multitable ... @end multitable definitions: ! % \def\multitable{\parsearg\dotable} \def\dotable#1{\bgroup \vskip\parskip *************** *** 2160,2174 **** % In order to keep entries from bumping into each other % we will add a \leftskip of \multitablecolspace to all columns after % the first one. ! % % If a template has been used, we will add \multitablecolspace % to the width of each template entry. ! % % If the user has set preamble in terms of percent of \hsize we will % use that dimension as the width of the column, and the \leftskip % will keep entries from bumping into each other. Table will start at % left margin and final column will justify at right margin. ! % % Make sure we don't inherit \rightskip from the outer environment. \rightskip=0pt \ifnum\colcount=1 --- 2148,2162 ---- % In order to keep entries from bumping into each other % we will add a \leftskip of \multitablecolspace to all columns after % the first one. ! % % If a template has been used, we will add \multitablecolspace % to the width of each template entry. ! % % If the user has set preamble in terms of percent of \hsize we will % use that dimension as the width of the column, and the \leftskip % will keep entries from bumping into each other. Table will start at % left margin and final column will justify at right margin. ! % % Make sure we don't inherit \rightskip from the outer environment. \rightskip=0pt \ifnum\colcount=1 *************** *** 2199,2213 **** % If so, do nothing. If not, give it an appropriate dimension based on % current baselineskip. \ifdim\multitablelinespace=0pt %% strut to put in table in case some entry doesn't have descenders, %% to keep lines equally spaced \let\multistrut = \strut - %% Test to see if parskip is larger than space between lines of - %% table. If not, do nothing. - %% If so, set to same dimension as multitablelinespace. \else \gdef\multistrut{\vrule height\multitablelinespace depth\dp0 width0pt\relax} \fi \ifdim\multitableparskip>\multitablelinespace \global\multitableparskip=\multitablelinespace \global\advance\multitableparskip-7pt %% to keep parskip somewhat smaller --- 2187,2204 ---- % If so, do nothing. If not, give it an appropriate dimension based on % current baselineskip. \ifdim\multitablelinespace=0pt + \setbox0=\vbox{X}\global\multitablelinespace=\the\baselineskip + \global\advance\multitablelinespace by-\ht0 %% strut to put in table in case some entry doesn't have descenders, %% to keep lines equally spaced \let\multistrut = \strut \else + %% FIXME: what is \box0 supposed to be? \gdef\multistrut{\vrule height\multitablelinespace depth\dp0 width0pt\relax} \fi + %% Test to see if parskip is larger than space between lines of + %% table. If not, do nothing. + %% If so, set to same dimension as multitablelinespace. \ifdim\multitableparskip>\multitablelinespace \global\multitableparskip=\multitablelinespace \global\advance\multitableparskip-7pt %% to keep parskip somewhat smaller *************** *** 2220,2229 **** \fi} ! \message{indexing,} ! % Index generation facilities ! ! % Define \newwrite to be identical to plain tex's \newwrite % except not \outer, so it can be used within \newindex. {\catcode`\@=11 \gdef\newwrite{\alloc@7\write\chardef\sixt@@n}} --- 2211,2570 ---- \fi} ! \message{conditionals,} ! % Prevent errors for section commands. ! % Used in @ignore and in failing conditionals. ! \def\ignoresections{% ! \let\chapter=\relax ! \let\unnumbered=\relax ! \let\top=\relax ! \let\unnumberedsec=\relax ! \let\unnumberedsection=\relax ! \let\unnumberedsubsec=\relax ! \let\unnumberedsubsection=\relax ! \let\unnumberedsubsubsec=\relax ! \let\unnumberedsubsubsection=\relax ! \let\section=\relax ! \let\subsec=\relax ! \let\subsubsec=\relax ! \let\subsection=\relax ! \let\subsubsection=\relax ! \let\appendix=\relax ! \let\appendixsec=\relax ! \let\appendixsection=\relax ! \let\appendixsubsec=\relax ! \let\appendixsubsection=\relax ! \let\appendixsubsubsec=\relax ! \let\appendixsubsubsection=\relax ! \let\contents=\relax ! \let\smallbook=\relax ! \let\titlepage=\relax ! } ! ! % Used in nested conditionals, where we have to parse the Texinfo source ! % and so want to turn off most commands, in case they are used ! % incorrectly. ! % ! \def\ignoremorecommands{% ! \let\defcodeindex = \relax ! \let\defcv = \relax ! \let\deffn = \relax ! \let\deffnx = \relax ! \let\defindex = \relax ! \let\defivar = \relax ! \let\defmac = \relax ! \let\defmethod = \relax ! \let\defop = \relax ! \let\defopt = \relax ! \let\defspec = \relax ! \let\deftp = \relax ! \let\deftypefn = \relax ! \let\deftypefun = \relax ! \let\deftypeivar = \relax ! \let\deftypeop = \relax ! \let\deftypevar = \relax ! \let\deftypevr = \relax ! \let\defun = \relax ! \let\defvar = \relax ! \let\defvr = \relax ! \let\ref = \relax ! \let\xref = \relax ! \let\printindex = \relax ! \let\pxref = \relax ! \let\settitle = \relax ! \let\setchapternewpage = \relax ! \let\setchapterstyle = \relax ! \let\everyheading = \relax ! \let\evenheading = \relax ! \let\oddheading = \relax ! \let\everyfooting = \relax ! \let\evenfooting = \relax ! \let\oddfooting = \relax ! \let\headings = \relax ! \let\include = \relax ! \let\lowersections = \relax ! \let\down = \relax ! \let\raisesections = \relax ! \let\up = \relax ! \let\set = \relax ! \let\clear = \relax ! \let\item = \relax ! } ! ! % Ignore @ignore ... @end ignore. ! % ! \def\ignore{\doignore{ignore}} ! ! % Ignore @ifinfo, @ifhtml, @ifnottex, @html, @menu, and @direntry text. ! % ! \def\ifinfo{\doignore{ifinfo}} ! \def\ifhtml{\doignore{ifhtml}} ! \def\ifnottex{\doignore{ifnottex}} ! \def\html{\doignore{html}} ! \def\menu{\doignore{menu}} ! \def\direntry{\doignore{direntry}} ! ! % @dircategory CATEGORY -- specify a category of the dir file ! % which this file should belong to. Ignore this in TeX. ! \let\dircategory = \comment ! ! % Ignore text until a line `@end #1'. ! % ! \def\doignore#1{\begingroup ! % Don't complain about control sequences we have declared \outer. ! \ignoresections ! % ! % Define a command to swallow text until we reach `@end #1'. ! % This @ is a catcode 12 token (that is the normal catcode of @ in ! % this texinfo.tex file). We change the catcode of @ below to match. ! \long\def\doignoretext##1@end #1{\enddoignore}% ! % ! % Make sure that spaces turn into tokens that match what \doignoretext wants. ! \catcode32 = 10 ! % ! % Ignore braces, too, so mismatched braces don't cause trouble. ! \catcode`\{ = 9 ! \catcode`\} = 9 ! % ! % We must not have @c interpreted as a control sequence. ! \catcode`\@ = 12 ! % ! % Make the letter c a comment character so that the rest of the line ! % will be ignored. This way, the document can have (for example) ! % @c @end ifinfo ! % and the @end ifinfo will be properly ignored. ! % (We've just changed @ to catcode 12.) ! \catcode`\c = 14 ! % ! % And now expand that command. ! \doignoretext ! } ! ! % What we do to finish off ignored text. ! % ! \def\enddoignore{\endgroup\ignorespaces}% ! ! \newif\ifwarnedobs\warnedobsfalse ! \def\obstexwarn{% ! \ifwarnedobs\relax\else ! % We need to warn folks that they may have trouble with TeX 3.0. ! % This uses \immediate\write16 rather than \message to get newlines. ! \immediate\write16{} ! \immediate\write16{WARNING: for users of Unix TeX 3.0!} ! \immediate\write16{This manual trips a bug in TeX version 3.0 (tex hangs).} ! \immediate\write16{If you are running another version of TeX, relax.} ! \immediate\write16{If you are running Unix TeX 3.0, kill this TeX process.} ! \immediate\write16{ Then upgrade your TeX installation if you can.} ! \immediate\write16{ (See ftp://ftp.gnu.org/pub/gnu/TeX.README.)} ! \immediate\write16{If you are stuck with version 3.0, run the} ! \immediate\write16{ script ``tex3patch'' from the Texinfo distribution} ! \immediate\write16{ to use a workaround.} ! \immediate\write16{} ! \global\warnedobstrue ! \fi ! } ! ! % **In TeX 3.0, setting text in \nullfont hangs tex. For a ! % workaround (which requires the file ``dummy.tfm'' to be installed), ! % uncomment the following line: ! %%%%%\font\nullfont=dummy\let\obstexwarn=\relax ! ! % Ignore text, except that we keep track of conditional commands for ! % purposes of nesting, up to an `@end #1' command. ! % ! \def\nestedignore#1{% ! \obstexwarn ! % We must actually expand the ignored text to look for the @end ! % command, so that nested ignore constructs work. Thus, we put the ! % text into a \vbox and then do nothing with the result. To minimize ! % the change of memory overflow, we follow the approach outlined on ! % page 401 of the TeXbook: make the current font be a dummy font. ! % ! \setbox0 = \vbox\bgroup ! % Don't complain about control sequences we have declared \outer. ! \ignoresections ! % ! % Define `@end #1' to end the box, which will in turn undefine the ! % @end command again. ! \expandafter\def\csname E#1\endcsname{\egroup\ignorespaces}% ! % ! % We are going to be parsing Texinfo commands. Most cause no ! % trouble when they are used incorrectly, but some commands do ! % complicated argument parsing or otherwise get confused, so we ! % undefine them. ! % ! % We can't do anything about stray @-signs, unfortunately; ! % they'll produce `undefined control sequence' errors. ! \ignoremorecommands ! % ! % Set the current font to be \nullfont, a TeX primitive, and define ! % all the font commands to also use \nullfont. We don't use ! % dummy.tfm, as suggested in the TeXbook, because not all sites ! % might have that installed. Therefore, math mode will still ! % produce output, but that should be an extremely small amount of ! % stuff compared to the main input. ! % ! \nullfont ! \let\tenrm=\nullfont \let\tenit=\nullfont \let\tensl=\nullfont ! \let\tenbf=\nullfont \let\tentt=\nullfont \let\smallcaps=\nullfont ! \let\tensf=\nullfont ! % Similarly for index fonts (mostly for their use in smallexample). ! \let\smallrm=\nullfont \let\smallit=\nullfont \let\smallsl=\nullfont ! \let\smallbf=\nullfont \let\smalltt=\nullfont \let\smallsc=\nullfont ! \let\smallsf=\nullfont ! % ! % Don't complain when characters are missing from the fonts. ! \tracinglostchars = 0 ! % ! % Don't bother to do space factor calculations. ! \frenchspacing ! % ! % Don't report underfull hboxes. ! \hbadness = 10000 ! % ! % Do minimal line-breaking. ! \pretolerance = 10000 ! % ! % Do not execute instructions in @tex ! \def\tex{\doignore{tex}}% ! % Do not execute macro definitions. ! % `c' is a comment character, so the word `macro' will get cut off. ! \def\macro{\doignore{ma}}% ! } ! ! % @set VAR sets the variable VAR to an empty value. ! % @set VAR REST-OF-LINE sets VAR to the value REST-OF-LINE. ! % ! % Since we want to separate VAR from REST-OF-LINE (which might be ! % empty), we can't just use \parsearg; we have to insert a space of our ! % own to delimit the rest of the line, and then take it out again if we ! % didn't need it. Make sure the catcode of space is correct to avoid ! % losing inside @example, for instance. ! % ! \def\set{\begingroup\catcode` =10 ! \catcode`\-=12 \catcode`\_=12 % Allow - and _ in VAR. ! \parsearg\setxxx} ! \def\setxxx#1{\setyyy#1 \endsetyyy} ! \def\setyyy#1 #2\endsetyyy{% ! \def\temp{#2}% ! \ifx\temp\empty \global\expandafter\let\csname SET#1\endcsname = \empty ! \else \setzzz{#1}#2\endsetzzz % Remove the trailing space \setxxx inserted. ! \fi ! \endgroup ! } ! % Can't use \xdef to pre-expand #2 and save some time, since \temp or ! % \next or other control sequences that we've defined might get us into ! % an infinite loop. Consider `@set foo @cite{bar}'. ! \def\setzzz#1#2 \endsetzzz{\expandafter\gdef\csname SET#1\endcsname{#2}} ! ! % @clear VAR clears (i.e., unsets) the variable VAR. ! % ! \def\clear{\parsearg\clearxxx} ! \def\clearxxx#1{\global\expandafter\let\csname SET#1\endcsname=\relax} ! ! % @value{foo} gets the text saved in variable foo. ! { ! \catcode`\_ = \active ! % ! % We might end up with active _ or - characters in the argument if ! % we're called from @code, as @code{@value{foo-bar_}}. So \let any ! % such active characters to their normal equivalents. ! \gdef\value{\begingroup ! \catcode`\-=12 \catcode`\_=12 ! \indexbreaks \let_\normalunderscore ! \valuexxx} ! } ! \def\valuexxx#1{\expandablevalue{#1}\endgroup} ! ! % We have this subroutine so that we can handle at least some @value's ! % properly in indexes (we \let\value to this in \indexdummies). Ones ! % whose names contain - or _ still won't work, but we can't do anything ! % about that. The command has to be fully expandable, since the result ! % winds up in the index file. This means that if the variable's value ! % contains other Texinfo commands, it's almost certain it will fail ! % (although perhaps we could fix that with sufficient work to do a ! % one-level expansion on the result, instead of complete). ! % ! \def\expandablevalue#1{% ! \expandafter\ifx\csname SET#1\endcsname\relax ! {[No value for ``#1'']}% ! \else ! \csname SET#1\endcsname ! \fi ! } ! ! % @ifset VAR ... @end ifset reads the `...' iff VAR has been defined ! % with @set. ! % ! \def\ifset{\parsearg\ifsetxxx} ! \def\ifsetxxx #1{% ! \expandafter\ifx\csname SET#1\endcsname\relax ! \expandafter\ifsetfail ! \else ! \expandafter\ifsetsucceed ! \fi ! } ! \def\ifsetsucceed{\conditionalsucceed{ifset}} ! \def\ifsetfail{\nestedignore{ifset}} ! \defineunmatchedend{ifset} ! ! % @ifclear VAR ... @end ifclear reads the `...' iff VAR has never been ! % defined with @set, or has been undefined with @clear. ! % ! \def\ifclear{\parsearg\ifclearxxx} ! \def\ifclearxxx #1{% ! \expandafter\ifx\csname SET#1\endcsname\relax ! \expandafter\ifclearsucceed ! \else ! \expandafter\ifclearfail ! \fi ! } ! \def\ifclearsucceed{\conditionalsucceed{ifclear}} ! \def\ifclearfail{\nestedignore{ifclear}} ! \defineunmatchedend{ifclear} ! ! % @iftex, @ifnothtml, @ifnotinfo always succeed; we read the text ! % following, through the first @end iftex (etc.). Make `@end iftex' ! % (etc.) valid only after an @iftex. ! % ! \def\iftex{\conditionalsucceed{iftex}} ! \def\ifnothtml{\conditionalsucceed{ifnothtml}} ! \def\ifnotinfo{\conditionalsucceed{ifnotinfo}} ! \defineunmatchedend{iftex} ! \defineunmatchedend{ifnothtml} ! \defineunmatchedend{ifnotinfo} ! ! % We can't just want to start a group at @iftex (for example) and end it ! % at @end iftex, since then @set commands inside the conditional have no ! % effect (they'd get reverted at the end of the group). So we must ! % define \Eiftex to redefine itself to be its previous value. (We can't ! % just define it to fail again with an ``unmatched end'' error, since ! % the @ifset might be nested.) ! % ! \def\conditionalsucceed#1{% ! \edef\temp{% ! % Remember the current value of \E#1. ! \let\nece{prevE#1} = \nece{E#1}% ! % ! % At the `@end #1', redefine \E#1 to be its previous value. ! \def\nece{E#1}{\let\nece{E#1} = \nece{prevE#1}}% ! }% ! \temp ! } ! ! % We need to expand lots of \csname's, but we don't want to expand the ! % control sequences after we've constructed them. ! % ! \def\nece#1{\expandafter\noexpand\csname#1\endcsname} ! ! % @defininfoenclose. ! \let\definfoenclose=\comment ! ! ! \message{indexing,} ! % Index generation facilities ! ! % Define \newwrite to be identical to plain tex's \newwrite % except not \outer, so it can be used within \newindex. {\catcode`\@=11 \gdef\newwrite{\alloc@7\write\chardef\sixt@@n}} *************** *** 2235,2246 **** % the file that accumulates this index. The file's extension is foo. % The name of an index should be no more than 2 characters long % for the sake of vms. ! ! \def\newindex #1{ ! \expandafter\newwrite \csname#1indfile\endcsname% Define number for output file ! \openout \csname#1indfile\endcsname \jobname.#1 % Open the file ! \expandafter\xdef\csname#1index\endcsname{% % Define \xxxindex ! \noexpand\doindex {#1}} } % @defindex foo == \newindex{foo} --- 2576,2589 ---- % the file that accumulates this index. The file's extension is foo. % The name of an index should be no more than 2 characters long % for the sake of vms. ! % ! \def\newindex#1{% ! \iflinks ! \expandafter\newwrite \csname#1indfile\endcsname ! \openout \csname#1indfile\endcsname \jobname.#1 % Open the file ! \fi ! \expandafter\xdef\csname#1index\endcsname{% % Define @#1index ! \noexpand\doindex{#1}} } % @defindex foo == \newindex{foo} *************** *** 2249,2279 **** % Define @defcodeindex, like @defindex except put all entries in @code. ! \def\newcodeindex #1{ ! \expandafter\newwrite \csname#1indfile\endcsname% Define number for output file ! \openout \csname#1indfile\endcsname \jobname.#1 % Open the file ! \expandafter\xdef\csname#1index\endcsname{% % Define \xxxindex ! \noexpand\docodeindex {#1}} } \def\defcodeindex{\parsearg\newcodeindex} % @synindex foo bar makes index foo feed into index bar. % Do this instead of @defindex foo if you don't want it as a separate index. ! \def\synindex #1 #2 {% ! \expandafter\let\expandafter\synindexfoo\expandafter=\csname#2indfile\endcsname ! \expandafter\let\csname#1indfile\endcsname=\synindexfoo ! \expandafter\xdef\csname#1index\endcsname{% % Define \xxxindex ! \noexpand\doindex {#2}}% } % @syncodeindex foo bar similar, but put all entries made for index foo % inside @code. ! \def\syncodeindex #1 #2 {% ! \expandafter\let\expandafter\synindexfoo\expandafter=\csname#2indfile\endcsname ! \expandafter\let\csname#1indfile\endcsname=\synindexfoo ! \expandafter\xdef\csname#1index\endcsname{% % Define \xxxindex ! \noexpand\docodeindex {#2}}% } % Define \doindex, the driver for all \fooindex macros. --- 2592,2628 ---- % Define @defcodeindex, like @defindex except put all entries in @code. ! \def\newcodeindex#1{% ! \iflinks ! \expandafter\newwrite \csname#1indfile\endcsname ! \openout \csname#1indfile\endcsname \jobname.#1 ! \fi ! \expandafter\xdef\csname#1index\endcsname{% ! \noexpand\docodeindex{#1}} } \def\defcodeindex{\parsearg\newcodeindex} % @synindex foo bar makes index foo feed into index bar. % Do this instead of @defindex foo if you don't want it as a separate index. ! % The \closeout helps reduce unnecessary open files; the limit on the ! % Acorn RISC OS is a mere 16 files. ! \def\synindex#1 #2 {% ! \expandafter\let\expandafter\synindexfoo\expandafter=\csname#2indfile\endcsname ! \expandafter\closeout\csname#1indfile\endcsname ! \expandafter\let\csname#1indfile\endcsname=\synindexfoo ! \expandafter\xdef\csname#1index\endcsname{% define \xxxindex ! \noexpand\doindex{#2}}% } % @syncodeindex foo bar similar, but put all entries made for index foo % inside @code. ! \def\syncodeindex#1 #2 {% ! \expandafter\let\expandafter\synindexfoo\expandafter=\csname#2indfile\endcsname ! \expandafter\closeout\csname#1indfile\endcsname ! \expandafter\let\csname#1indfile\endcsname=\synindexfoo ! \expandafter\xdef\csname#1index\endcsname{% define \xxxindex ! \noexpand\docodeindex{#2}}% } % Define \doindex, the driver for all \fooindex macros. *************** *** 2294,2299 **** --- 2643,2649 ---- \def\singlecodeindexer #1{\doind{\indexname}{\code{#1}}} \def\indexdummies{% + \def\ { }% % Take care of the plain tex accent commands. \def\"{\realbackslash "}% \def\`{\realbackslash `}% *************** *** 2323,2330 **** % (Must be a way to avoid doing expansion at all, and thus not have to % laboriously list every single command here.) \def\@{@}% will be @@ when we switch to @ as escape char. ! %\let\{ = \lbracecmd ! %\let\} = \rbracecmd \def\_{{\realbackslash _}}% \def\w{\realbackslash w }% \def\bf{\realbackslash bf }% --- 2673,2683 ---- % (Must be a way to avoid doing expansion at all, and thus not have to % laboriously list every single command here.) \def\@{@}% will be @@ when we switch to @ as escape char. ! % Need these in case \tex is in effect and \{ is a \delimiter again. ! % But can't use \lbracecmd and \rbracecmd because texindex assumes ! % braces and backslashes are used only as delimiters. ! \let\{ = \mylbrace ! \let\} = \myrbrace \def\_{{\realbackslash _}}% \def\w{\realbackslash w }% \def\bf{\realbackslash bf }% *************** *** 2335,2341 **** \def\gtr{\realbackslash gtr}% \def\less{\realbackslash less}% \def\hat{\realbackslash hat}% - %\def\char{\realbackslash char}% \def\TeX{\realbackslash TeX}% \def\dots{\realbackslash dots }% \def\result{\realbackslash result}% --- 2688,2693 ---- *************** *** 2347,2352 **** --- 2699,2709 ---- \def\copyright{\realbackslash copyright}% \def\tclose##1{\realbackslash tclose {##1}}% \def\code##1{\realbackslash code {##1}}% + \def\uref##1{\realbackslash uref {##1}}% + \def\url##1{\realbackslash url {##1}}% + \def\env##1{\realbackslash env {##1}}% + \def\command##1{\realbackslash command {##1}}% + \def\option##1{\realbackslash option {##1}}% \def\dotless##1{\realbackslash dotless {##1}}% \def\samp##1{\realbackslash samp {##1}}% \def\,##1{\realbackslash ,{##1}}% *************** *** 2362,2369 **** \def\kbd##1{\realbackslash kbd {##1}}% \def\dfn##1{\realbackslash dfn {##1}}% \def\emph##1{\realbackslash emph {##1}}% ! \def\value##1{\realbackslash value {##1}}% \unsepspaces } % If an index command is used in an @example environment, any spaces --- 2719,2734 ---- \def\kbd##1{\realbackslash kbd {##1}}% \def\dfn##1{\realbackslash dfn {##1}}% \def\emph##1{\realbackslash emph {##1}}% ! \def\acronym##1{\realbackslash acronym {##1}}% ! % ! % Handle some cases of @value -- where the variable name does not ! % contain - or _, and the value does not contain any ! % (non-fully-expandable) commands. ! \let\value = \expandablevalue ! % \unsepspaces + % Turn off macro expansion + \turnoffmacros } % If an index command is used in an @example environment, any spaces *************** *** 2420,2425 **** --- 2785,2796 ---- %\let\tt=\indexdummyfont \let\tclose=\indexdummyfont \let\code=\indexdummyfont + \let\url=\indexdummyfont + \let\uref=\indexdummyfont + \let\env=\indexdummyfont + \let\acronym=\indexdummyfont + \let\command=\indexdummyfont + \let\option=\indexdummyfont \let\file=\indexdummyfont \let\samp=\indexdummyfont \let\kbd=\indexdummyfont *************** *** 2435,2448 **** % so we do not become unable to do a definition. {\catcode`\@=0 \catcode`\\=\other ! @gdef@realbackslash{\}} \let\indexbackslash=0 %overridden during \printindex. ! \let\SETmarginindex=\relax %initialize! ! % workhorse for all \fooindexes ! % #1 is name of index, #2 is stuff to put there ! \def\doind #1#2{% % Put the index entry in the margin if desired. \ifx\SETmarginindex\relax\else \insert\margin{\hbox{\vrule height8pt depth3pt width0pt #2}}% --- 2806,2829 ---- % so we do not become unable to do a definition. {\catcode`\@=0 \catcode`\\=\other ! @gdef@realbackslash{\}} \let\indexbackslash=0 %overridden during \printindex. + \let\SETmarginindex=\relax % put index entries in margin (undocumented)? + + % For \ifx comparisons. + \def\emptymacro{\empty} + + % Most index entries go through here, but \dosubind is the general case. + % + \def\doind#1#2{\dosubind{#1}{#2}\empty} ! % Workhorse for all \fooindexes. ! % #1 is name of index, #2 is stuff to put there, #3 is subentry -- ! % \empty if called from \doind, as we usually are. The main exception ! % is with defuns, which call us directly. ! % ! \def\dosubind#1#2#3{% % Put the index entry in the margin if desired. \ifx\SETmarginindex\relax\else \insert\margin{\hbox{\vrule height8pt depth3pt width0pt #2}}% *************** *** 2453,2500 **** \indexdummies % Must do this here, since \bf, etc expand at this stage \escapechar=`\\ {% ! \let\folio=0% We will expand all macros now EXCEPT \folio. \def\rawbackslashxx{\indexbackslash}% \indexbackslash isn't defined now % so it will be output as is; and it will print as backslash. % ! % First process the index-string with all font commands turned off ! % to get the string to sort by. ! {\indexnofonts \xdef\indexsorttmp{#2}}% % ! % Now produce the complete index entry, with both the sort key and the ! % original text, including any font commands. \toks0 = {#2}% \edef\temp{% \write\csname#1indfile\endcsname{% \realbackslash entry{\indexsorttmp}{\folio}{\the\toks0}}% }% ! \temp }% }% \penalty\count255 }% } - \def\dosubind #1#2#3{% - {\count10=\lastpenalty % - {\indexdummies % Must do this here, since \bf, etc expand at this stage - \escapechar=`\\% - {\let\folio=0% - \def\rawbackslashxx{\indexbackslash}% - % - % Now process the index-string once, with all font commands turned off, - % to get the string to sort the index by. - {\indexnofonts - \xdef\temp1{#2 #3}% - }% - % Now produce the complete index entry. We process the index-string again, - % this time with font commands expanded, to get what to print in the index. - \edef\temp{% - \write \csname#1indfile\endcsname{% - \realbackslash entry {\temp1}{\folio}{#2}{#3}}}% - \temp }% - }\penalty\count10}} - % The index entry written in the file actually looks like % \entry {sortstring}{page}{topic} % or --- 2834,2908 ---- \indexdummies % Must do this here, since \bf, etc expand at this stage \escapechar=`\\ {% ! \let\folio = 0% We will expand all macros now EXCEPT \folio. \def\rawbackslashxx{\indexbackslash}% \indexbackslash isn't defined now % so it will be output as is; and it will print as backslash. % ! \def\thirdarg{#3}% ! % ! % If third arg is present, precede it with space in sort key. ! \ifx\thirdarg\emptymacro ! \let\subentry = \empty ! \else ! \def\subentry{ #3}% ! \fi ! % ! % First process the index entry with all font commands turned ! % off to get the string to sort by. ! {\indexnofonts \xdef\indexsorttmp{#2\subentry}}% % ! % Now the real index entry with the fonts. \toks0 = {#2}% + % + % If third (subentry) arg is present, add it to the index + % string. And include a space. + \ifx\thirdarg\emptymacro \else + \toks0 = \expandafter{\the\toks0 \space #3}% + \fi + % + % Set up the complete index entry, with both the sort key + % and the original text, including any font commands. We write + % three arguments to \entry to the .?? file, texindex reduces to + % two when writing the .??s sorted result. \edef\temp{% \write\csname#1indfile\endcsname{% \realbackslash entry{\indexsorttmp}{\folio}{\the\toks0}}% }% ! % ! % If a skip is the last thing on the list now, preserve it ! % by backing up by \lastskip, doing the \write, then inserting ! % the skip again. Otherwise, the whatsit generated by the ! % \write will make \lastskip zero. The result is that sequences ! % like this: ! % @end defun ! % @tindex whatever ! % @defun ... ! % will have extra space inserted, because the \medbreak in the ! % start of the @defun won't see the skip inserted by the @end of ! % the previous defun. ! % ! % But don't do any of this if we're not in vertical mode. We ! % don't want to do a \vskip and prematurely end a paragraph. ! % ! % Avoid page breaks due to these extra skips, too. ! % ! \iflinks ! \ifvmode ! \skip0 = \lastskip ! \ifdim\lastskip = 0pt \else \nobreak\vskip-\lastskip \fi ! \fi ! % ! \temp % do the write ! % ! % ! \ifvmode \ifdim\skip0 = 0pt \else \nobreak\vskip\skip0 \fi \fi ! \fi }% }% \penalty\count255 }% } % The index entry written in the file actually looks like % \entry {sortstring}{page}{topic} % or *************** *** 2534,2540 **** \def\doprintindex#1{\begingroup \dobreak \chapheadingskip{10000}% % ! \indexfonts \rm \tolerance = 9500 \indexbreaks % --- 2942,2948 ---- \def\doprintindex#1{\begingroup \dobreak \chapheadingskip{10000}% % ! \smallfonts \rm \tolerance = 9500 \indexbreaks % *************** *** 2550,2556 **** % and it loses the chapter title and the aux file entries for the % index. The easiest way to prevent this problem is to make sure % there is some text. ! (Index is nonexistent) \else % % If the index file exists but is empty, then \openin leaves \ifeof --- 2958,2964 ---- % and it loses the chapter title and the aux file entries for the % index. The easiest way to prevent this problem is to make sure % there is some text. ! \putwordIndexNonexistent \else % % If the index file exists but is empty, then \openin leaves \ifeof *************** *** 2558,2564 **** % it can discover if there is anything in it. \read 1 to \temp \ifeof 1 ! (Index is empty) \else % Index files are almost Texinfo source, but we use \ as the escape % character. It would be better to use @, but that's too big a change --- 2966,2972 ---- % it can discover if there is anything in it. \read 1 to \temp \ifeof 1 ! \putwordIndexIsEmpty \else % Index files are almost Texinfo source, but we use \ as the escape % character. It would be better to use @, but that's too big a change *************** *** 2577,2597 **** % These macros are used by the sorted index file itself. % Change them to control the appearance of the index. ! % Same as \bigskipamount except no shrink. ! % \balancecolumns gets confused if there is any shrink. ! \newskip\initialskipamount \initialskipamount 12pt plus4pt ! ! \def\initial #1{% ! {\let\tentt=\sectt \let\tt=\sectt \let\sf=\sectt ! \ifdim\lastskip<\initialskipamount ! \removelastskip \penalty-200 \vskip \initialskipamount\fi ! \line{\secbf#1\hfill}\kern 2pt\penalty10000}} % This typesets a paragraph consisting of #1, dot leaders, and then #2 % flush to the right margin. It is used for index and table of contents % entries. The paragraph is indented by \leftskip. % ! \def\entry #1#2{\begingroup % % Start a new paragraph if necessary, so our assignments below can't % affect previous text. --- 2985,3019 ---- % These macros are used by the sorted index file itself. % Change them to control the appearance of the index. ! \def\initial#1{{% ! % Some minor font changes for the special characters. ! \let\tentt=\sectt \let\tt=\sectt \let\sf=\sectt ! % ! % Remove any glue we may have, we'll be inserting our own. ! \removelastskip ! % ! % We like breaks before the index initials, so insert a bonus. ! \penalty -300 ! % ! % Typeset the initial. Making this add up to a whole number of ! % baselineskips increases the chance of the dots lining up from column ! % to column. It still won't often be perfect, because of the stretch ! % we need before each entry, but it's better. ! % ! % No shrink because it confuses \balancecolumns. ! \vskip 1.67\baselineskip plus .5\baselineskip ! \leftline{\secbf #1}% ! \vskip .33\baselineskip plus .1\baselineskip ! % ! % Do our best not to break after the initial. ! \nobreak ! }} % This typesets a paragraph consisting of #1, dot leaders, and then #2 % flush to the right margin. It is used for index and table of contents % entries. The paragraph is indented by \leftskip. % ! \def\entry#1#2{\begingroup % % Start a new paragraph if necessary, so our assignments below can't % affect previous text. *************** *** 2614,2625 **** % % \hangafter is reset to 1 (which is the value we want) at the start % of each paragraph, so we need not do anything with that. ! \hangindent=2em % % When the entry text needs to be broken, just fill out the first line % with blank space. \rightskip = 0pt plus1fil % % Start a ``paragraph'' for the index entry so the line breaking % parameters we've set above will have an effect. \noindent --- 3036,3050 ---- % % \hangafter is reset to 1 (which is the value we want) at the start % of each paragraph, so we need not do anything with that. ! \hangindent = 2em % % When the entry text needs to be broken, just fill out the first line % with blank space. \rightskip = 0pt plus1fil % + % A bit of stretch before each entry for the benefit of balancing columns. + \vskip 0pt plus1pt + % % Start a ``paragraph'' for the index entry so the line breaking % parameters we've set above will have an effect. \noindent *************** *** 2644,2650 **** % The `\ ' here is removed by the implicit \unskip that TeX does as % part of (the primitive) \par. Without it, a spurious underfull % \hbox ensues. ! \ #2% The page number ends the paragraph. \fi% \par \endgroup} --- 3069,3079 ---- % The `\ ' here is removed by the implicit \unskip that TeX does as % part of (the primitive) \par. Without it, a spurious underfull % \hbox ensues. ! \ifpdf ! \pdfgettoks#2.\ \the\toksA % The page number ends the paragraph. ! \else ! \ #2% The page number ends the paragraph. ! \fi \fi% \par \endgroup} *************** *** 2673,2696 **** \def\begindoublecolumns{\begingroup % ended by \enddoublecolumns % Grab any single-column material above us. ! \output = {\global\setbox\partialpage = \vbox{% ! % % Here is a possibility not foreseen in manmac: if we accumulate a % whole lot of material, we might end up calling this \output % routine twice in a row (see the doublecol-lose test, which is % essentially a couple of indexes with @setchapternewpage off). In ! % that case, we must prevent the second \partialpage from ! % simply overwriting the first, causing us to lose the page. ! % This will preserve it until a real output routine can ship it ! % out. Generally, \partialpage will be empty when this runs and ! % this will be a no-op. ! \unvbox\partialpage % ! % Unvbox the main output page. ! \unvbox255 ! \kern-\topskip \kern\baselineskip ! }}% ! \eject % % Use the double-column output routine for subsequent pages. \output = {\doublecolumnout}% --- 3102,3127 ---- \def\begindoublecolumns{\begingroup % ended by \enddoublecolumns % Grab any single-column material above us. ! \output = {% ! % % Here is a possibility not foreseen in manmac: if we accumulate a % whole lot of material, we might end up calling this \output % routine twice in a row (see the doublecol-lose test, which is % essentially a couple of indexes with @setchapternewpage off). In ! % that case we just ship out what is in \partialpage with the normal ! % output routine. Generally, \partialpage will be empty when this ! % runs and this will be a no-op. See the indexspread.tex test case. ! \ifvoid\partialpage \else ! \onepageout{\pagecontents\partialpage}% ! \fi % ! \global\setbox\partialpage = \vbox{% ! % Unvbox the main output page. ! \unvbox\PAGE ! \kern-\topskip \kern\baselineskip ! }% ! }% ! \eject % run that output routine to set \partialpage % % Use the double-column output routine for subsequent pages. \output = {\doublecolumnout}% *************** *** 2718,2731 **** % % Double the \vsize as well. (We don't need a separate register here, % since nobody clobbers \vsize.) \vsize = 2\vsize } \def\doublecolumnout{% \splittopskip=\topskip \splitmaxdepth=\maxdepth % Get the available space for the double columns -- the normal % (undoubled) page height minus any material left over from the % previous page. ! \dimen@=\pageheight \advance\dimen@ by-\ht\partialpage % box0 will be the left-hand column, box2 the right. \setbox0=\vsplit255 to\dimen@ \setbox2=\vsplit255 to\dimen@ \onepageout\pagesofar --- 3149,3169 ---- % % Double the \vsize as well. (We don't need a separate register here, % since nobody clobbers \vsize.) + \advance\vsize by -\ht\partialpage \vsize = 2\vsize } + + % The double-column output routine for all double-column pages except + % the last. + % \def\doublecolumnout{% \splittopskip=\topskip \splitmaxdepth=\maxdepth % Get the available space for the double columns -- the normal % (undoubled) page height minus any material left over from the % previous page. ! \dimen@ = \vsize ! \divide\dimen@ by 2 ! % % box0 will be the left-hand column, box2 the right. \setbox0=\vsplit255 to\dimen@ \setbox2=\vsplit255 to\dimen@ \onepageout\pagesofar *************** *** 2734,2775 **** } \def\pagesofar{% % Re-output the contents of the output page -- any previous material, ! % followed by the two boxes we just split. \unvbox\partialpage \hsize = \doublecolumnhsize ! \wd0=\hsize \wd2=\hsize \hbox to\pagewidth{\box0\hfil\box2}% } \def\enddoublecolumns{% ! \output = {\balancecolumns}\eject % split what we have \endgroup % started in \begindoublecolumns % ! % Back to normal single-column typesetting, but take account of the ! % fact that we just accumulated some stuff on the output page. \pagegoal = \vsize } \def\balancecolumns{% % Called at the end of the double column material. ! \setbox0 = \vbox{\unvbox255}% \dimen@ = \ht0 \advance\dimen@ by \topskip \advance\dimen@ by-\baselineskip ! \divide\dimen@ by 2 \splittopskip = \topskip % Loop until we get a decent breakpoint. ! {\vbadness=10000 \loop ! \global\setbox3=\copy0 ! \global\setbox1=\vsplit3 to\dimen@ ! \ifdim\ht3>\dimen@ \global\advance\dimen@ by1pt ! \repeat}% \setbox0=\vbox to\dimen@{\unvbox1}% \setbox2=\vbox to\dimen@{\unvbox3}% \pagesofar } \catcode`\@ = \other \message{sectioning,} ! % Define chapters, sections, etc. \newcount\chapno \newcount\secno \secno=0 --- 3172,3238 ---- } \def\pagesofar{% % Re-output the contents of the output page -- any previous material, ! % followed by the two boxes we just split, in box0 and box2. \unvbox\partialpage + % \hsize = \doublecolumnhsize ! \wd0=\hsize \wd2=\hsize ! \hbox to\pagewidth{\box0\hfil\box2}% } \def\enddoublecolumns{% ! \output = {% ! % Split the last of the double-column material. Leave it on the ! % current page, no automatic page break. ! \balancecolumns ! % ! % If we end up splitting too much material for the current page, ! % though, there will be another page break right after this \output ! % invocation ends. Having called \balancecolumns once, we do not ! % want to call it again. Therefore, reset \output to its normal ! % definition right away. (We hope \balancecolumns will never be ! % called on to balance too much material, but if it is, this makes ! % the output somewhat more palatable.) ! \global\output = {\onepageout{\pagecontents\PAGE}}% ! }% ! \eject \endgroup % started in \begindoublecolumns % ! % \pagegoal was set to the doubled \vsize above, since we restarted ! % the current page. We're now back to normal single-column ! % typesetting, so reset \pagegoal to the normal \vsize (after the ! % \endgroup where \vsize got restored). \pagegoal = \vsize } \def\balancecolumns{% % Called at the end of the double column material. ! \setbox0 = \vbox{\unvbox255}% like \box255 but more efficient, see p.120. \dimen@ = \ht0 \advance\dimen@ by \topskip \advance\dimen@ by-\baselineskip ! \divide\dimen@ by 2 % target to split to ! %debug\message{final 2-column material height=\the\ht0, target=\the\dimen@.}% \splittopskip = \topskip % Loop until we get a decent breakpoint. ! {% ! \vbadness = 10000 ! \loop ! \global\setbox3 = \copy0 ! \global\setbox1 = \vsplit3 to \dimen@ ! \ifdim\ht3>\dimen@ ! \global\advance\dimen@ by 1pt ! \repeat ! }% ! %debug\message{split to \the\dimen@, column heights: \the\ht1, \the\ht3.}% \setbox0=\vbox to\dimen@{\unvbox1}% \setbox2=\vbox to\dimen@{\unvbox3}% + % \pagesofar } \catcode`\@ = \other \message{sectioning,} ! % Chapters, sections, etc. \newcount\chapno \newcount\secno \secno=0 *************** *** 2778,2835 **** % This counter is funny since it counts through charcodes of letters A, B, ... \newcount\appendixno \appendixno = `\@ ! \def\appendixletter{\char\the\appendixno} ! ! \newwrite\contentsfile ! % This is called from \setfilename. ! \def\opencontents{\openout\contentsfile = \jobname.toc } % Each @chapter defines this as the name of the chapter. ! % page headings and footings can use it. @section does likewise ! ! \def\thischapter{} \def\thissection{} ! \def\seccheck#1{\ifnum \pageno<0 ! \errmessage{@#1 not allowed after generating table of contents}% ! \fi} ! ! \def\chapternofonts{% ! \let\rawbackslash=\relax ! \let\frenchspacing=\relax ! \def\result{\realbackslash result}% ! \def\equiv{\realbackslash equiv}% ! \def\expansion{\realbackslash expansion}% ! \def\print{\realbackslash print}% ! \def\TeX{\realbackslash TeX}% ! \def\dots{\realbackslash dots}% ! \def\result{\realbackslash result}% ! \def\equiv{\realbackslash equiv}% ! \def\expansion{\realbackslash expansion}% ! \def\print{\realbackslash print}% ! \def\error{\realbackslash error}% ! \def\point{\realbackslash point}% ! \def\copyright{\realbackslash copyright}% ! \def\tt{\realbackslash tt}% ! \def\bf{\realbackslash bf}% ! \def\w{\realbackslash w}% ! \def\less{\realbackslash less}% ! \def\gtr{\realbackslash gtr}% ! \def\hat{\realbackslash hat}% ! \def\char{\realbackslash char}% ! \def\tclose##1{\realbackslash tclose{##1}}% ! \def\code##1{\realbackslash code{##1}}% ! \def\samp##1{\realbackslash samp{##1}}% ! \def\r##1{\realbackslash r{##1}}% ! \def\b##1{\realbackslash b{##1}}% ! \def\key##1{\realbackslash key{##1}}% ! \def\file##1{\realbackslash file{##1}}% ! \def\kbd##1{\realbackslash kbd{##1}}% ! % These are redefined because @smartitalic wouldn't work inside xdef. ! \def\i##1{\realbackslash i{##1}}% ! \def\cite##1{\realbackslash cite{##1}}% ! \def\var##1{\realbackslash var{##1}}% ! \def\emph##1{\realbackslash emph{##1}}% ! \def\dfn##1{\realbackslash dfn{##1}}% ! } \newcount\absseclevel % used to calculate proper heading level \newcount\secbase\secbase=0 % @raise/lowersections modify this count --- 3241,3288 ---- % This counter is funny since it counts through charcodes of letters A, B, ... \newcount\appendixno \appendixno = `\@ ! % \def\appendixletter{\char\the\appendixno} ! % We do the following for the sake of pdftex, which needs the actual ! % letter in the expansion, not just typeset. ! \def\appendixletter{% ! \ifnum\appendixno=`A A% ! \else\ifnum\appendixno=`B B% ! \else\ifnum\appendixno=`C C% ! \else\ifnum\appendixno=`D D% ! \else\ifnum\appendixno=`E E% ! \else\ifnum\appendixno=`F F% ! \else\ifnum\appendixno=`G G% ! \else\ifnum\appendixno=`H H% ! \else\ifnum\appendixno=`I I% ! \else\ifnum\appendixno=`J J% ! \else\ifnum\appendixno=`K K% ! \else\ifnum\appendixno=`L L% ! \else\ifnum\appendixno=`M M% ! \else\ifnum\appendixno=`N N% ! \else\ifnum\appendixno=`O O% ! \else\ifnum\appendixno=`P P% ! \else\ifnum\appendixno=`Q Q% ! \else\ifnum\appendixno=`R R% ! \else\ifnum\appendixno=`S S% ! \else\ifnum\appendixno=`T T% ! \else\ifnum\appendixno=`U U% ! \else\ifnum\appendixno=`V V% ! \else\ifnum\appendixno=`W W% ! \else\ifnum\appendixno=`X X% ! \else\ifnum\appendixno=`Y Y% ! \else\ifnum\appendixno=`Z Z% ! % The \the is necessary, despite appearances, because \appendixletter is ! % expanded while writing the .toc file. \char\appendixno is not ! % expandable, thus it is written literally, thus all appendixes come out ! % with the same letter (or @) in the toc without it. ! \else\char\the\appendixno ! \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi ! \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi} % Each @chapter defines this as the name of the chapter. ! % page headings and footings can use it. @section does likewise. ! \def\thischapter{} ! \def\thissection{} \newcount\absseclevel % used to calculate proper heading level \newcount\secbase\secbase=0 % @raise/lowersections modify this count *************** *** 2901,2959 **** \fi } ! \def\thischaptername{No Chapter Title} \outer\def\chapter{\parsearg\chapteryyy} \def\chapteryyy #1{\numhead0{#1}} % normally numhead0 calls chapterzzz ! \def\chapterzzz #1{\seccheck{chapter}% \secno=0 \subsecno=0 \subsubsecno=0 ! \global\advance \chapno by 1 \message{\putwordChapter \the\chapno}% \chapmacro {#1}{\the\chapno}% \gdef\thissection{#1}% \gdef\thischaptername{#1}% % We don't substitute the actual chapter name into \thischapter % because we don't want its macros evaluated now. \xdef\thischapter{\putwordChapter{} \the\chapno: \noexpand\thischaptername}% - {\chapternofonts% \toks0 = {#1}% ! \edef\temp{{\realbackslash chapentry{\the\toks0}{\the\chapno}{\noexpand\folio}}}% ! \escapechar=`\\% ! \write \contentsfile \temp % ! \donoderef % \global\let\section = \numberedsec \global\let\subsection = \numberedsubsec \global\let\subsubsection = \numberedsubsubsec ! }} \outer\def\appendix{\parsearg\appendixyyy} \def\appendixyyy #1{\apphead0{#1}} % normally apphead0 calls appendixzzz ! \def\appendixzzz #1{\seccheck{appendix}% \secno=0 \subsecno=0 \subsubsecno=0 ! \global\advance \appendixno by 1 \message{Appendix \appendixletter}% \chapmacro {#1}{\putwordAppendix{} \appendixletter}% \gdef\thissection{#1}% \gdef\thischaptername{#1}% \xdef\thischapter{\putwordAppendix{} \appendixletter: \noexpand\thischaptername}% - {\chapternofonts% \toks0 = {#1}% ! \edef\temp{{\realbackslash chapentry{\the\toks0}% ! {\putwordAppendix{} \appendixletter}{\noexpand\folio}}}% ! \escapechar=`\\% ! \write \contentsfile \temp % ! \appendixnoderef % \global\let\section = \appendixsec \global\let\subsection = \appendixsubsec \global\let\subsubsection = \appendixsubsubsec ! }} % @centerchap is like @unnumbered, but the heading is centered. \outer\def\centerchap{\parsearg\centerchapyyy} \def\centerchapyyy #1{{\let\unnumbchapmacro=\centerchapmacro \unnumberedyyy{#1}}} \outer\def\top{\parsearg\unnumberedyyy} \outer\def\unnumbered{\parsearg\unnumberedyyy} \def\unnumberedyyy #1{\unnmhead0{#1}} % normally unnmhead0 calls unnumberedzzz ! \def\unnumberedzzz #1{\seccheck{unnumbered}% \secno=0 \subsecno=0 \subsubsecno=0 % % This used to be simply \message{#1}, but TeX fully expands the --- 3354,3412 ---- \fi } ! % @chapter, @appendix, @unnumbered. \def\thischaptername{No Chapter Title} \outer\def\chapter{\parsearg\chapteryyy} \def\chapteryyy #1{\numhead0{#1}} % normally numhead0 calls chapterzzz ! \def\chapterzzz #1{% \secno=0 \subsecno=0 \subsubsecno=0 ! \global\advance \chapno by 1 \message{\putwordChapter\space \the\chapno}% \chapmacro {#1}{\the\chapno}% \gdef\thissection{#1}% \gdef\thischaptername{#1}% % We don't substitute the actual chapter name into \thischapter % because we don't want its macros evaluated now. \xdef\thischapter{\putwordChapter{} \the\chapno: \noexpand\thischaptername}% \toks0 = {#1}% ! \edef\temp{\noexpand\writetocentry{\realbackslash chapentry{\the\toks0}% ! {\the\chapno}}}% ! \temp ! \donoderef \global\let\section = \numberedsec \global\let\subsection = \numberedsubsec \global\let\subsubsection = \numberedsubsubsec ! } \outer\def\appendix{\parsearg\appendixyyy} \def\appendixyyy #1{\apphead0{#1}} % normally apphead0 calls appendixzzz ! \def\appendixzzz #1{% \secno=0 \subsecno=0 \subsubsecno=0 ! \global\advance \appendixno by 1 ! \message{\putwordAppendix\space \appendixletter}% \chapmacro {#1}{\putwordAppendix{} \appendixletter}% \gdef\thissection{#1}% \gdef\thischaptername{#1}% \xdef\thischapter{\putwordAppendix{} \appendixletter: \noexpand\thischaptername}% \toks0 = {#1}% ! \edef\temp{\noexpand\writetocentry{\realbackslash chapentry{\the\toks0}% ! {\putwordAppendix{} \appendixletter}}}% ! \temp ! \appendixnoderef \global\let\section = \appendixsec \global\let\subsection = \appendixsubsec \global\let\subsubsection = \appendixsubsubsec ! } % @centerchap is like @unnumbered, but the heading is centered. \outer\def\centerchap{\parsearg\centerchapyyy} \def\centerchapyyy #1{{\let\unnumbchapmacro=\centerchapmacro \unnumberedyyy{#1}}} + % @top is like @unnumbered. \outer\def\top{\parsearg\unnumberedyyy} + \outer\def\unnumbered{\parsearg\unnumberedyyy} \def\unnumberedyyy #1{\unnmhead0{#1}} % normally unnmhead0 calls unnumberedzzz ! \def\unnumberedzzz #1{% \secno=0 \subsecno=0 \subsubsecno=0 % % This used to be simply \message{#1}, but TeX fully expands the *************** *** 2965,3119 **** % Anyway, we don't want the fully-expanded definition of @cite to appear % as a result of the \message, we just want `@cite' itself. We use % \the to achieve this: TeX expands \the only once, ! % simply yielding the contents of the . \toks0 = {#1}\message{(\the\toks0)}% % \unnumbchapmacro {#1}% \gdef\thischapter{#1}\gdef\thissection{#1}% - {\chapternofonts% \toks0 = {#1}% ! \edef\temp{{\realbackslash unnumbchapentry{\the\toks0}{\noexpand\folio}}}% ! \escapechar=`\\% ! \write \contentsfile \temp % ! \unnumbnoderef % \global\let\section = \unnumberedsec \global\let\subsection = \unnumberedsubsec \global\let\subsubsection = \unnumberedsubsubsec ! }} \outer\def\numberedsec{\parsearg\secyyy} \def\secyyy #1{\numhead1{#1}} % normally calls seczzz ! \def\seczzz #1{\seccheck{section}% \subsecno=0 \subsubsecno=0 \global\advance \secno by 1 % \gdef\thissection{#1}\secheading {#1}{\the\chapno}{\the\secno}% - {\chapternofonts% \toks0 = {#1}% ! \edef\temp{{\realbackslash secentry % ! {\the\toks0}{\the\chapno}{\the\secno}{\noexpand\folio}}}% ! \escapechar=`\\% ! \write \contentsfile \temp % ! \donoderef % ! \penalty 10000 % ! }} \outer\def\appendixsection{\parsearg\appendixsecyyy} \outer\def\appendixsec{\parsearg\appendixsecyyy} \def\appendixsecyyy #1{\apphead1{#1}} % normally calls appendixsectionzzz ! \def\appendixsectionzzz #1{\seccheck{appendixsection}% \subsecno=0 \subsubsecno=0 \global\advance \secno by 1 % \gdef\thissection{#1}\secheading {#1}{\appendixletter}{\the\secno}% - {\chapternofonts% \toks0 = {#1}% ! \edef\temp{{\realbackslash secentry % ! {\the\toks0}{\appendixletter}{\the\secno}{\noexpand\folio}}}% ! \escapechar=`\\% ! \write \contentsfile \temp % ! \appendixnoderef % ! \penalty 10000 % ! }} \outer\def\unnumberedsec{\parsearg\unnumberedsecyyy} \def\unnumberedsecyyy #1{\unnmhead1{#1}} % normally calls unnumberedseczzz ! \def\unnumberedseczzz #1{\seccheck{unnumberedsec}% \plainsecheading {#1}\gdef\thissection{#1}% - {\chapternofonts% \toks0 = {#1}% ! \edef\temp{{\realbackslash unnumbsecentry{\the\toks0}{\noexpand\folio}}}% ! \escapechar=`\\% ! \write \contentsfile \temp % ! \unnumbnoderef % ! \penalty 10000 % ! }} \outer\def\numberedsubsec{\parsearg\numberedsubsecyyy} \def\numberedsubsecyyy #1{\numhead2{#1}} % normally calls numberedsubseczzz ! \def\numberedsubseczzz #1{\seccheck{subsection}% \gdef\thissection{#1}\subsubsecno=0 \global\advance \subsecno by 1 % \subsecheading {#1}{\the\chapno}{\the\secno}{\the\subsecno}% - {\chapternofonts% \toks0 = {#1}% ! \edef\temp{{\realbackslash subsecentry % ! {\the\toks0}{\the\chapno}{\the\secno}{\the\subsecno}{\noexpand\folio}}}% ! \escapechar=`\\% ! \write \contentsfile \temp % ! \donoderef % ! \penalty 10000 % ! }} \outer\def\appendixsubsec{\parsearg\appendixsubsecyyy} \def\appendixsubsecyyy #1{\apphead2{#1}} % normally calls appendixsubseczzz ! \def\appendixsubseczzz #1{\seccheck{appendixsubsec}% \gdef\thissection{#1}\subsubsecno=0 \global\advance \subsecno by 1 % \subsecheading {#1}{\appendixletter}{\the\secno}{\the\subsecno}% - {\chapternofonts% \toks0 = {#1}% ! \edef\temp{{\realbackslash subsecentry % ! {\the\toks0}{\appendixletter}{\the\secno}{\the\subsecno}{\noexpand\folio}}}% ! \escapechar=`\\% ! \write \contentsfile \temp % ! \appendixnoderef % ! \penalty 10000 % ! }} \outer\def\unnumberedsubsec{\parsearg\unnumberedsubsecyyy} \def\unnumberedsubsecyyy #1{\unnmhead2{#1}} %normally calls unnumberedsubseczzz ! \def\unnumberedsubseczzz #1{\seccheck{unnumberedsubsec}% \plainsubsecheading {#1}\gdef\thissection{#1}% - {\chapternofonts% \toks0 = {#1}% ! \edef\temp{{\realbackslash unnumbsubsecentry{\the\toks0}{\noexpand\folio}}}% ! \escapechar=`\\% ! \write \contentsfile \temp % ! \unnumbnoderef % ! \penalty 10000 % ! }} \outer\def\numberedsubsubsec{\parsearg\numberedsubsubsecyyy} \def\numberedsubsubsecyyy #1{\numhead3{#1}} % normally numberedsubsubseczzz ! \def\numberedsubsubseczzz #1{\seccheck{subsubsection}% \gdef\thissection{#1}\global\advance \subsubsecno by 1 % \subsubsecheading {#1} {\the\chapno}{\the\secno}{\the\subsecno}{\the\subsubsecno}% - {\chapternofonts% \toks0 = {#1}% ! \edef\temp{{\realbackslash subsubsecentry{\the\toks0} ! {\the\chapno}{\the\secno}{\the\subsecno}{\the\subsubsecno} ! {\noexpand\folio}}}% ! \escapechar=`\\% ! \write \contentsfile \temp % ! \donoderef % ! \penalty 10000 % ! }} \outer\def\appendixsubsubsec{\parsearg\appendixsubsubsecyyy} \def\appendixsubsubsecyyy #1{\apphead3{#1}} % normally appendixsubsubseczzz ! \def\appendixsubsubseczzz #1{\seccheck{appendixsubsubsec}% \gdef\thissection{#1}\global\advance \subsubsecno by 1 % \subsubsecheading {#1} {\appendixletter}{\the\secno}{\the\subsecno}{\the\subsubsecno}% - {\chapternofonts% \toks0 = {#1}% ! \edef\temp{{\realbackslash subsubsecentry{\the\toks0}% ! {\appendixletter} ! {\the\secno}{\the\subsecno}{\the\subsubsecno}{\noexpand\folio}}}% ! \escapechar=`\\% ! \write \contentsfile \temp % ! \appendixnoderef % ! \penalty 10000 % ! }} \outer\def\unnumberedsubsubsec{\parsearg\unnumberedsubsubsecyyy} \def\unnumberedsubsubsecyyy #1{\unnmhead3{#1}} %normally unnumberedsubsubseczzz ! \def\unnumberedsubsubseczzz #1{\seccheck{unnumberedsubsubsec}% \plainsubsubsecheading {#1}\gdef\thissection{#1}% - {\chapternofonts% \toks0 = {#1}% ! \edef\temp{{\realbackslash unnumbsubsubsecentry{\the\toks0}{\noexpand\folio}}}% ! \escapechar=`\\% ! \write \contentsfile \temp % ! \unnumbnoderef % ! \penalty 10000 % ! }} % These are variants which are not "outer", so they can appear in @ifinfo. % Actually, they should now be obsolete; ordinary section commands should work. --- 3418,3556 ---- % Anyway, we don't want the fully-expanded definition of @cite to appear % as a result of the \message, we just want `@cite' itself. We use % \the to achieve this: TeX expands \the only once, ! % simply yielding the contents of . (We also do this for ! % the toc entries.) \toks0 = {#1}\message{(\the\toks0)}% % \unnumbchapmacro {#1}% \gdef\thischapter{#1}\gdef\thissection{#1}% \toks0 = {#1}% ! \edef\temp{\noexpand\writetocentry{\realbackslash unnumbchapentry{\the\toks0}}}% ! \temp ! \unnumbnoderef \global\let\section = \unnumberedsec \global\let\subsection = \unnumberedsubsec \global\let\subsubsection = \unnumberedsubsubsec ! } + % Sections. \outer\def\numberedsec{\parsearg\secyyy} \def\secyyy #1{\numhead1{#1}} % normally calls seczzz ! \def\seczzz #1{% \subsecno=0 \subsubsecno=0 \global\advance \secno by 1 % \gdef\thissection{#1}\secheading {#1}{\the\chapno}{\the\secno}% \toks0 = {#1}% ! \edef\temp{\noexpand\writetocentry{\realbackslash secentry{\the\toks0}% ! {\the\chapno}{\the\secno}}}% ! \temp ! \donoderef ! \nobreak ! } \outer\def\appendixsection{\parsearg\appendixsecyyy} \outer\def\appendixsec{\parsearg\appendixsecyyy} \def\appendixsecyyy #1{\apphead1{#1}} % normally calls appendixsectionzzz ! \def\appendixsectionzzz #1{% \subsecno=0 \subsubsecno=0 \global\advance \secno by 1 % \gdef\thissection{#1}\secheading {#1}{\appendixletter}{\the\secno}% \toks0 = {#1}% ! \edef\temp{\noexpand\writetocentry{\realbackslash secentry{\the\toks0}% ! {\appendixletter}{\the\secno}}}% ! \temp ! \appendixnoderef ! \nobreak ! } \outer\def\unnumberedsec{\parsearg\unnumberedsecyyy} \def\unnumberedsecyyy #1{\unnmhead1{#1}} % normally calls unnumberedseczzz ! \def\unnumberedseczzz #1{% \plainsecheading {#1}\gdef\thissection{#1}% \toks0 = {#1}% ! \edef\temp{\noexpand\writetocentry{\realbackslash unnumbsecentry{\the\toks0}}}% ! \temp ! \unnumbnoderef ! \nobreak ! } + % Subsections. \outer\def\numberedsubsec{\parsearg\numberedsubsecyyy} \def\numberedsubsecyyy #1{\numhead2{#1}} % normally calls numberedsubseczzz ! \def\numberedsubseczzz #1{% \gdef\thissection{#1}\subsubsecno=0 \global\advance \subsecno by 1 % \subsecheading {#1}{\the\chapno}{\the\secno}{\the\subsecno}% \toks0 = {#1}% ! \edef\temp{\noexpand\writetocentry{\realbackslash subsecentry{\the\toks0}% ! {\the\chapno}{\the\secno}{\the\subsecno}}}% ! \temp ! \donoderef ! \nobreak ! } \outer\def\appendixsubsec{\parsearg\appendixsubsecyyy} \def\appendixsubsecyyy #1{\apphead2{#1}} % normally calls appendixsubseczzz ! \def\appendixsubseczzz #1{% \gdef\thissection{#1}\subsubsecno=0 \global\advance \subsecno by 1 % \subsecheading {#1}{\appendixletter}{\the\secno}{\the\subsecno}% \toks0 = {#1}% ! \edef\temp{\noexpand\writetocentry{\realbackslash subsecentry{\the\toks0}% ! {\appendixletter}{\the\secno}{\the\subsecno}}}% ! \temp ! \appendixnoderef ! \nobreak ! } \outer\def\unnumberedsubsec{\parsearg\unnumberedsubsecyyy} \def\unnumberedsubsecyyy #1{\unnmhead2{#1}} %normally calls unnumberedsubseczzz ! \def\unnumberedsubseczzz #1{% \plainsubsecheading {#1}\gdef\thissection{#1}% \toks0 = {#1}% ! \edef\temp{\noexpand\writetocentry{\realbackslash unnumbsubsecentry% ! {\the\toks0}}}% ! \temp ! \unnumbnoderef ! \nobreak ! } + % Subsubsections. \outer\def\numberedsubsubsec{\parsearg\numberedsubsubsecyyy} \def\numberedsubsubsecyyy #1{\numhead3{#1}} % normally numberedsubsubseczzz ! \def\numberedsubsubseczzz #1{% \gdef\thissection{#1}\global\advance \subsubsecno by 1 % \subsubsecheading {#1} {\the\chapno}{\the\secno}{\the\subsecno}{\the\subsubsecno}% \toks0 = {#1}% ! \edef\temp{\noexpand\writetocentry{\realbackslash subsubsecentry{\the\toks0}% ! {\the\chapno}{\the\secno}{\the\subsecno}{\the\subsubsecno}}}% ! \temp ! \donoderef ! \nobreak ! } \outer\def\appendixsubsubsec{\parsearg\appendixsubsubsecyyy} \def\appendixsubsubsecyyy #1{\apphead3{#1}} % normally appendixsubsubseczzz ! \def\appendixsubsubseczzz #1{% \gdef\thissection{#1}\global\advance \subsubsecno by 1 % \subsubsecheading {#1} {\appendixletter}{\the\secno}{\the\subsecno}{\the\subsubsecno}% \toks0 = {#1}% ! \edef\temp{\noexpand\writetocentry{\realbackslash subsubsecentry{\the\toks0}% ! {\appendixletter}{\the\secno}{\the\subsecno}{\the\subsubsecno}}}% ! \temp ! \appendixnoderef ! \nobreak ! } \outer\def\unnumberedsubsubsec{\parsearg\unnumberedsubsubsecyyy} \def\unnumberedsubsubsecyyy #1{\unnmhead3{#1}} %normally unnumberedsubsubseczzz ! \def\unnumberedsubsubseczzz #1{% \plainsubsubsecheading {#1}\gdef\thissection{#1}% \toks0 = {#1}% ! \edef\temp{\noexpand\writetocentry{\realbackslash unnumbsubsubsecentry% ! {\the\toks0}}}% ! \temp ! \unnumbnoderef ! \nobreak ! } % These are variants which are not "outer", so they can appear in @ifinfo. % Actually, they should now be obsolete; ordinary section commands should work. *************** *** 3142,3149 **** % Define @majorheading, @heading and @subheading ! % NOTE on use of \vbox for chapter headings, section headings, and ! % such: % 1) We use \vbox rather than the earlier \line to permit % overlong headings to fold. % 2) \hyphenpenalty is set to 10000 because hyphenation in a --- 3579,3585 ---- % Define @majorheading, @heading and @subheading ! % NOTE on use of \vbox for chapter headings, section headings, and such: % 1) We use \vbox rather than the earlier \line to permit % overlong headings to fold. % 2) \hyphenpenalty is set to 10000 because hyphenation in a *************** *** 3190,3201 **** \def\setchapternewpage #1 {\csname CHAPPAG#1\endcsname} ! \def\CHAPPAGoff{ \global\let\contentsalignmacro = \chappager \global\let\pchapsepmacro=\chapbreak \global\let\pagealignmacro=\chappager} ! \def\CHAPPAGon{ \global\let\contentsalignmacro = \chappager \global\let\pchapsepmacro=\chappager \global\let\pagealignmacro=\chappager --- 3626,3637 ---- \def\setchapternewpage #1 {\csname CHAPPAG#1\endcsname} ! \def\CHAPPAGoff{% \global\let\contentsalignmacro = \chappager \global\let\pchapsepmacro=\chapbreak \global\let\pagealignmacro=\chappager} ! \def\CHAPPAGon{% \global\let\contentsalignmacro = \chappager \global\let\pchapsepmacro=\chappager \global\let\pagealignmacro=\chappager *************** *** 3249,3255 **** \def\unnchfopen #1{% \chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 \parindent=0pt\raggedright ! \rm #1\hfill}}\bigskip \par\penalty 10000 % } \def\chfopen #1#2{\chapoddpage {\chapfonts --- 3685,3691 ---- \def\unnchfopen #1{% \chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 \parindent=0pt\raggedright ! \rm #1\hfill}}\bigskip \par\nobreak } \def\chfopen #1#2{\chapoddpage {\chapfonts *************** *** 3260,3266 **** \def\centerchfopen #1{% \chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 \parindent=0pt ! \hfill {\rm #1}\hfill}}\bigskip \par\penalty 10000 % } \def\CHAPFopen{ --- 3696,3702 ---- \def\centerchfopen #1{% \chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000 \parindent=0pt ! \hfill {\rm #1}\hfill}}\bigskip \par\nobreak } \def\CHAPFopen{ *************** *** 3313,3336 **** } ! \message{toc printing,} ! % Finish up the main text and prepare to read what we've written ! % to \contentsfile. \newskip\contentsrightmargin \contentsrightmargin=1in \def\startcontents#1{% % If @setchapternewpage on, and @headings double, the contents should % start on an odd page, unlike chapters. Thus, we maintain % \contentsalignmacro in parallel with \pagealignmacro. % From: Torbjorn Granlund \contentsalignmacro ! \immediate\closeout \contentsfile ! \ifnum \pageno>0 ! \pageno = -1 % Request roman numbered pages. ! \fi % Don't need to put `Contents' or `Short Contents' in the headline. % It is abundantly clear what they are. \unnumbchapmacro{#1}\def\thischapter{}% \begingroup % Set up to handle contents files properly. \catcode`\\=0 \catcode`\{=1 \catcode`\}=2 \catcode`\@=11 % We can't do this, because then an actual ^ in a section --- 3749,3793 ---- } ! \message{toc,} ! % Table of contents. ! \newwrite\tocfile ! ! % Write an entry to the toc file, opening it if necessary. ! % Called from @chapter, etc. We supply {\folio} at the end of the ! % argument, which will end up as the last argument to the \...entry macro. ! % ! % We open the .toc file here instead of at @setfilename or any other ! % given time so that @contents can be put in the document anywhere. ! % ! \newif\iftocfileopened ! \def\writetocentry#1{% ! \iftocfileopened\else ! \immediate\openout\tocfile = \jobname.toc ! \global\tocfileopenedtrue ! \fi ! \iflinks \write\tocfile{#1{\folio}}\fi ! } \newskip\contentsrightmargin \contentsrightmargin=1in + \newcount\savepageno + \newcount\lastnegativepageno \lastnegativepageno = -1 + + % Finish up the main text and prepare to read what we've written + % to \tocfile. + % \def\startcontents#1{% % If @setchapternewpage on, and @headings double, the contents should % start on an odd page, unlike chapters. Thus, we maintain % \contentsalignmacro in parallel with \pagealignmacro. % From: Torbjorn Granlund \contentsalignmacro ! \immediate\closeout\tocfile ! % % Don't need to put `Contents' or `Short Contents' in the headline. % It is abundantly clear what they are. \unnumbchapmacro{#1}\def\thischapter{}% + \savepageno = \pageno \begingroup % Set up to handle contents files properly. \catcode`\\=0 \catcode`\{=1 \catcode`\}=2 \catcode`\@=11 % We can't do this, because then an actual ^ in a section *************** *** 3338,3357 **** %\catcode`\^=7 % to see ^^e4 as \"a etc. juha@piuha.ydi.vtt.fi \raggedbottom % Worry more about breakpoints than the bottom. \advance\hsize by -\contentsrightmargin % Don't use the full line length. } % Normal (long) toc. ! \outer\def\contents{% ! \startcontents{\putwordTableofContents}% ! \input \jobname.toc \endgroup ! \vfill \eject } % And just the chapters. ! \outer\def\summarycontents{% ! \startcontents{\putwordShortContents}% % \let\chapentry = \shortchapentry \let\unnumbchapentry = \shortunnumberedentry --- 3795,3825 ---- %\catcode`\^=7 % to see ^^e4 as \"a etc. juha@piuha.ydi.vtt.fi \raggedbottom % Worry more about breakpoints than the bottom. \advance\hsize by -\contentsrightmargin % Don't use the full line length. + % + % Roman numerals for page numbers. + \ifnum \pageno>0 \pageno = \lastnegativepageno \fi } % Normal (long) toc. ! \def\contents{% ! \startcontents{\putwordTOC}% ! \openin 1 \jobname.toc ! \ifeof 1 \else ! \closein 1 ! \input \jobname.toc ! \fi ! \vfill \eject ! \contentsalignmacro % in case @setchapternewpage odd is in effect ! \pdfmakeoutlines \endgroup ! \lastnegativepageno = \pageno ! \pageno = \savepageno } % And just the chapters. ! \def\summarycontents{% ! \startcontents{\putwordShortTOC}% % \let\chapentry = \shortchapentry \let\unnumbchapentry = \shortunnumberedentry *************** *** 3367,3378 **** \def\unnumbsubsecentry ##1##2{} \def\subsubsecentry ##1##2##3##4##5##6{} \def\unnumbsubsubsecentry ##1##2{} ! \input \jobname.toc \endgroup ! \vfill \eject } \let\shortcontents = \summarycontents % These macros generate individual entries in the table of contents. % The first argument is the chapter or section name. % The last argument is the page number. --- 3835,3857 ---- \def\unnumbsubsecentry ##1##2{} \def\subsubsecentry ##1##2##3##4##5##6{} \def\unnumbsubsubsecentry ##1##2{} ! \openin 1 \jobname.toc ! \ifeof 1 \else ! \closein 1 ! \input \jobname.toc ! \fi ! \vfill \eject ! \contentsalignmacro % in case @setchapternewpage odd is in effect \endgroup ! \lastnegativepageno = \pageno ! \pageno = \savepageno } \let\shortcontents = \summarycontents + \ifpdf + \pdfcatalog{/PageMode /UseOutlines}% + \fi + % These macros generate individual entries in the table of contents. % The first argument is the chapter or section name. % The last argument is the page number. *************** *** 3383,3389 **** % See comments in \dochapentry re vbox and related settings \def\shortchapentry#1#2#3{% ! \tocentry{\shortchaplabel{#2}\labelspace #1}{\doshortpageno{#3}}% } % Typeset the label for a chapter or appendix for the short contents. --- 3862,3868 ---- % See comments in \dochapentry re vbox and related settings \def\shortchapentry#1#2#3{% ! \tocentry{\shortchaplabel{#2}\labelspace #1}{\doshortpageno\bgroup#3\egroup}% } % Typeset the label for a chapter or appendix for the short contents. *************** *** 3391,3400 **** % We could simplify the code here by writing out an \appendixentry % command in the toc file for appendices, instead of using \chapentry % for both, but it doesn't seem worth it. ! \setbox0 = \hbox{\shortcontrm \putwordAppendix } ! \newdimen\shortappendixwidth \shortappendixwidth = \wd0 ! \def\shortchaplabel#1{% % We typeset #1 in a box of constant width, regardless of the text of % #1, so the chapter titles will come out aligned. \setbox0 = \hbox{#1}% --- 3870,3883 ---- % We could simplify the code here by writing out an \appendixentry % command in the toc file for appendices, instead of using \chapentry % for both, but it doesn't seem worth it. ! % ! \newdimen\shortappendixwidth ! % \def\shortchaplabel#1{% + % Compute width of word "Appendix", may change with language. + \setbox0 = \hbox{\shortcontrm \putwordAppendix}% + \shortappendixwidth = \wd0 + % % We typeset #1 in a box of constant width, regardless of the text of % #1, so the chapter titles will come out aligned. \setbox0 = \hbox{#1}% *************** *** 3409,3415 **** } \def\unnumbchapentry#1#2{\dochapentry{#1}{#2}} ! \def\shortunnumberedentry#1#2{\tocentry{#1}{\doshortpageno{#2}}} % Sections. \def\secentry#1#2#3#4{\dosecentry{#2.#3\labelspace#1}{#4}} --- 3892,3898 ---- } \def\unnumbchapentry#1#2{\dochapentry{#1}{#2}} ! \def\shortunnumberedentry#1#2{\tocentry{#1}{\doshortpageno\bgroup#2\egroup}} % Sections. \def\secentry#1#2#3#4{\dosecentry{#2.#3\labelspace#1}{#4}} *************** *** 3436,3459 **** \penalty-300 \vskip1\baselineskip plus.33\baselineskip minus.25\baselineskip \begingroup \chapentryfonts ! \tocentry{#1}{\dopageno{#2}}% \endgroup \nobreak\vskip .25\baselineskip plus.1\baselineskip } \def\dosecentry#1#2{\begingroup \secentryfonts \leftskip=\tocindent ! \tocentry{#1}{\dopageno{#2}}% \endgroup} \def\dosubsecentry#1#2{\begingroup \subsecentryfonts \leftskip=2\tocindent ! \tocentry{#1}{\dopageno{#2}}% \endgroup} \def\dosubsubsecentry#1#2{\begingroup \subsubsecentryfonts \leftskip=3\tocindent ! \tocentry{#1}{\dopageno{#2}}% \endgroup} % Final typesetting of a toc entry; we use the same \entry macro as for --- 3919,3942 ---- \penalty-300 \vskip1\baselineskip plus.33\baselineskip minus.25\baselineskip \begingroup \chapentryfonts ! \tocentry{#1}{\dopageno\bgroup#2\egroup}% \endgroup \nobreak\vskip .25\baselineskip plus.1\baselineskip } \def\dosecentry#1#2{\begingroup \secentryfonts \leftskip=\tocindent ! \tocentry{#1}{\dopageno\bgroup#2\egroup}% \endgroup} \def\dosubsecentry#1#2{\begingroup \subsecentryfonts \leftskip=2\tocindent ! \tocentry{#1}{\dopageno\bgroup#2\egroup}% \endgroup} \def\dosubsubsecentry#1#2{\begingroup \subsubsecentryfonts \leftskip=3\tocindent ! \tocentry{#1}{\dopageno\bgroup#2\egroup}% \endgroup} % Final typesetting of a toc entry; we use the same \entry macro as for *************** *** 3481,3486 **** --- 3964,3970 ---- \message{environments,} + % @foo ... @end foo. % Since these characters are used in examples, it should be an even number of % \tt widths. Each \tt character is 1en, so two makes it 1em. *************** *** 3553,3558 **** --- 4037,4043 ---- \let\!=\ptexexclam \let\i=\ptexi \let\{=\ptexlbrace + \let\+=\tabalign \let\}=\ptexrbrace \let\*=\ptexstar \let\t=\ptext *************** *** 3604,3611 **** % \nonarrowing is a flag. If "set", @lisp etc don't narrow margins. \let\nonarrowing=\relax ! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ! % \cartouche: draw rectangle w/rounded corners around argument \font\circle=lcircle10 \newdimen\circthick \newdimen\cartouter\newdimen\cartinner --- 4089,4096 ---- % \nonarrowing is a flag. If "set", @lisp etc don't narrow margins. \let\nonarrowing=\relax ! % @cartouche ... @end cartouche: draw rectangle w/rounded corners around ! % environment contents. \font\circle=lcircle10 \newdimen\circthick \newdimen\cartouter\newdimen\cartinner *************** *** 3632,3640 **** \cartinner=\hsize \advance\cartinner by-\lskip \advance\cartinner by-\rskip \cartouter=\hsize ! \advance\cartouter by 18pt % allow for 3pt kerns on either % side, and for 6pt waste from ! % each corner char \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip % Flag to tell @lisp, etc., not to narrow margin. \let\nonarrowing=\comment --- 4117,4125 ---- \cartinner=\hsize \advance\cartinner by-\lskip \advance\cartinner by-\rskip \cartouter=\hsize ! \advance\cartouter by 18.4pt % allow for 3pt kerns on either % side, and for 6pt waste from ! % each corner char, and rule thickness \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip % Flag to tell @lisp, etc., not to narrow margin. \let\nonarrowing=\comment *************** *** 3688,3736 **** \fi } ! % To ending an @example-like environment, we first end the paragraph ! % (via \afterenvbreak's vertical glue), and then the group. That way we ! % keep the zero \parskip that the environments set -- \parskip glue ! % will be inserted at the beginning of the next paragraph in the ! % document, after the environment. % ! \def\nonfillfinish{\afterenvbreak\endgroup}% \def\lisp{\begingroup \nonfillstart \let\Elisp = \nonfillfinish \tt ! % Make @kbd do something special, if requested. ! \let\kbdfont\kbdexamplefont ! \rawbackslash % have \ input char produce \ char from current font ! \gobble } ! % Define the \E... control sequence only if we are inside the ! % environment, so the error checking in \end will work. ! % ! % We must call \lisp last in the definition, since it reads the ! % return following the @example (or whatever) command. ! % \def\example{\begingroup \def\Eexample{\nonfillfinish\endgroup}\lisp} - \def\smallexample{\begingroup \def\Esmallexample{\nonfillfinish\endgroup}\lisp} - \def\smalllisp{\begingroup \def\Esmalllisp{\nonfillfinish\endgroup}\lisp} ! % @smallexample and @smalllisp. This is not used unless the @smallbook ! % command is given. Originally contributed by Pavel@xerox. ! % \def\smalllispx{\begingroup ! \nonfillstart ! \let\Esmalllisp = \nonfillfinish ! \let\Esmallexample = \nonfillfinish ! % ! % Smaller fonts for small examples. ! \indexfonts \tt ! \rawbackslash % make \ output the \ character from the current font (tt) ! \gobble } ! % This is @display; same as @lisp except use roman font. % \def\display{\begingroup \nonfillstart --- 4173,4224 ---- \fi } ! % Define the \E... control sequence only if we are inside the particular ! % environment, so the error checking in \end will work. ! % ! % To end an @example-like environment, we first end the paragraph (via ! % \afterenvbreak's vertical glue), and then the group. That way we keep ! % the zero \parskip that the environments set -- \parskip glue will be ! % inserted at the beginning of the next paragraph in the document, after ! % the environment. % ! \def\nonfillfinish{\afterenvbreak\endgroup} + % @lisp: indented, narrowed, typewriter font. \def\lisp{\begingroup \nonfillstart \let\Elisp = \nonfillfinish \tt ! \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special. ! \gobble % eat return } ! % @example: Same as @lisp. \def\example{\begingroup \def\Eexample{\nonfillfinish\endgroup}\lisp} ! % @small... is usually equivalent to the non-small (@smallbook ! % redefines). We must call \example (or whatever) last in the ! % definition, since it reads the return following the @example (or ! % whatever) command. ! % ! % This actually allows (for example) @end display inside an ! % @smalldisplay. Too bad, but makeinfo will catch the error anyway. ! % ! \def\smalldisplay{\begingroup\def\Esmalldisplay{\nonfillfinish\endgroup}\display} ! \def\smallexample{\begingroup\def\Esmallexample{\nonfillfinish\endgroup}\lisp} ! \def\smallformat{\begingroup\def\Esmallformat{\nonfillfinish\endgroup}\format} ! \def\smalllisp{\begingroup\def\Esmalllisp{\nonfillfinish\endgroup}\lisp} ! ! % Real @smallexample and @smalllisp (when @smallbook): use smaller fonts. ! % Originally contributed by Pavel@xerox. \def\smalllispx{\begingroup ! \def\Esmalllisp{\nonfillfinish\endgroup}% ! \def\Esmallexample{\nonfillfinish\endgroup}% ! \smallfonts ! \lisp } ! % @display: same as @lisp except keep current font. % \def\display{\begingroup \nonfillstart *************** *** 3738,3744 **** \gobble } ! % This is @format; same as @display except don't narrow margins. % \def\format{\begingroup \let\nonarrowing = t --- 4226,4240 ---- \gobble } ! % @smalldisplay (when @smallbook): @display plus smaller fonts. ! % ! \def\smalldisplayx{\begingroup ! \def\Esmalldisplay{\nonfillfinish\endgroup}% ! \smallfonts \rm ! \display ! } ! ! % @format: same as @display except don't narrow margins. % \def\format{\begingroup \let\nonarrowing = t *************** *** 3747,3766 **** \gobble } ! % @flushleft (same as @format) and @flushright. % ! \def\flushleft{\begingroup ! \let\nonarrowing = t ! \nonfillstart ! \let\Eflushleft = \nonfillfinish ! \gobble } \def\flushright{\begingroup \let\nonarrowing = t \nonfillstart \let\Eflushright = \nonfillfinish \advance\leftskip by 0pt plus 1fill ! \gobble} % @quotation does normal linebreaking (hence we can't use \nonfillstart) % and narrows the margins. --- 4243,4269 ---- \gobble } ! % @smallformat (when @smallbook): @format plus smaller fonts. % ! \def\smallformatx{\begingroup ! \def\Esmallformat{\nonfillfinish\endgroup}% ! \smallfonts \rm ! \format } + + % @flushleft (same as @format). + % + \def\flushleft{\begingroup \def\Eflushleft{\nonfillfinish\endgroup}\format} + + % @flushright. + % \def\flushright{\begingroup \let\nonarrowing = t \nonfillstart \let\Eflushright = \nonfillfinish \advance\leftskip by 0pt plus 1fill ! \gobble ! } % @quotation does normal linebreaking (hence we can't use \nonfillstart) % and narrows the margins. *************** *** 3783,3791 **** \fi } \message{defuns,} ! % Define formatter for defuns ! % First, allow user to change definition object font (\df) internally \def\setdeffont #1 {\csname DEF#1\endcsname} \newskip\defbodyindent \defbodyindent=.4in --- 4286,4296 ---- \fi } + \message{defuns,} ! % @defun etc. ! ! % Allow user to change definition object font (\df) internally \def\setdeffont #1 {\csname DEF#1\endcsname} \newskip\defbodyindent \defbodyindent=.4in *************** *** 3839,3848 **** %% contained text. This is especially needed for [ and ] \def\opnr{{\sf\char`\(}\global\advance\parencount by 1 } \def\clnr{{\sf\char`\)}\global\advance\parencount by -1 } ! \def\ampnr{\&} \def\lbrb{{\bf\char`\[}} \def\rbrb{{\bf\char`\]}} % First, defname, which formats the header line itself. % #1 should be the function name. % #2 should be the type of definition, such as "Function". --- 4344,4359 ---- %% contained text. This is especially needed for [ and ] \def\opnr{{\sf\char`\(}\global\advance\parencount by 1 } \def\clnr{{\sf\char`\)}\global\advance\parencount by -1 } ! \let\ampnr = \& \def\lbrb{{\bf\char`\[}} \def\rbrb{{\bf\char`\]}} + % Active &'s sneak into the index arguments, so make sure it's defined. + { + \catcode`& = 13 + \global\let& = \ampnr + } + % First, defname, which formats the header line itself. % #1 should be the function name. % #2 should be the type of definition, such as "Function". *************** *** 3852,3871 **** % outside the @def... \dimen2=\leftskip \advance\dimen2 by -\defbodyindent ! \dimen3=\rightskip ! \advance\dimen3 by -\defbodyindent ! \noindent % \setbox0=\hbox{\hskip \deflastargmargin{\rm #2}\hskip \deftypemargin}% \dimen0=\hsize \advance \dimen0 by -\wd0 % compute size for first line \dimen1=\hsize \advance \dimen1 by -\defargsindent %size for continuations ! \parshape 2 0in \dimen0 \defargsindent \dimen1 % % Now output arg 2 ("Function" or some such) % ending at \deftypemargin from the right margin, % but stuck inside a box of width 0 so it does not interfere with linebreaking {% Adjust \hsize to exclude the ambient margins, % so that \rightline will obey them. ! \advance \hsize by -\dimen2 \advance \hsize by -\dimen3 ! \rlap{\rightline{{\rm #2}\hskip \deftypemargin}}}% % Make all lines underfull and no complaints: \tolerance=10000 \hbadness=10000 \advance\leftskip by -\defbodyindent --- 4363,4380 ---- % outside the @def... \dimen2=\leftskip \advance\dimen2 by -\defbodyindent ! \noindent \setbox0=\hbox{\hskip \deflastargmargin{\rm #2}\hskip \deftypemargin}% \dimen0=\hsize \advance \dimen0 by -\wd0 % compute size for first line \dimen1=\hsize \advance \dimen1 by -\defargsindent %size for continuations ! \parshape 2 0in \dimen0 \defargsindent \dimen1 % Now output arg 2 ("Function" or some such) % ending at \deftypemargin from the right margin, % but stuck inside a box of width 0 so it does not interfere with linebreaking {% Adjust \hsize to exclude the ambient margins, % so that \rightline will obey them. ! \advance \hsize by -\dimen2 ! \rlap{\rightline{{\rm #2}\hskip -1.25pc }}}% % Make all lines underfull and no complaints: \tolerance=10000 \hbadness=10000 \advance\leftskip by -\defbodyindent *************** *** 3886,3908 **** \def#1{\endgraf\endgroup\medbreak}% \def#2{\begingroup\obeylines\activeparens\spacesplit#3}% \parindent=0in ! \advance\leftskip by \defbodyindent \advance \rightskip by \defbodyindent \exdentamount=\defbodyindent \begingroup % \catcode 61=\active % 61 is `=' \obeylines\activeparens\spacesplit#3} ! \def\defmethparsebody #1#2#3#4 {\begingroup\inENV % \medbreak % % Define the end token that this defining construct specifies % so that it will exit this group. \def#1{\endgraf\endgroup\medbreak}% \def#2##1 {\begingroup\obeylines\activeparens\spacesplit{#3{##1}}}% \parindent=0in ! \advance\leftskip by \defbodyindent \advance \rightskip by \defbodyindent \exdentamount=\defbodyindent \begingroup\obeylines\activeparens\spacesplit{#3{#4}}} \def\defopparsebody #1#2#3#4#5 {\begingroup\inENV % \medbreak % % Define the end token that this defining construct specifies --- 4395,4456 ---- \def#1{\endgraf\endgroup\medbreak}% \def#2{\begingroup\obeylines\activeparens\spacesplit#3}% \parindent=0in ! \advance\leftskip by \defbodyindent \exdentamount=\defbodyindent \begingroup % \catcode 61=\active % 61 is `=' \obeylines\activeparens\spacesplit#3} ! % #1 is the \E... control sequence to end the definition (which we define). ! % #2 is the \...x control sequence for consecutive fns (which we define). ! % #3 is the control sequence to call to resume processing. ! % #4, delimited by the space, is the class name. ! % ! \def\defmethparsebody#1#2#3#4 {\begingroup\inENV % \medbreak % % Define the end token that this defining construct specifies % so that it will exit this group. \def#1{\endgraf\endgroup\medbreak}% \def#2##1 {\begingroup\obeylines\activeparens\spacesplit{#3{##1}}}% \parindent=0in ! \advance\leftskip by \defbodyindent \exdentamount=\defbodyindent \begingroup\obeylines\activeparens\spacesplit{#3{#4}}} + % Used for @deftypemethod and @deftypeivar. + % #1 is the \E... control sequence to end the definition (which we define). + % #2 is the \...x control sequence for consecutive fns (which we define). + % #3 is the control sequence to call to resume processing. + % #4, delimited by a space, is the class name. + % #5 is the method's return type. + % + \def\deftypemethparsebody#1#2#3#4 #5 {\begingroup\inENV + \medbreak + \def#1{\endgraf\endgroup\medbreak}% + \def#2##1 ##2 {\begingroup\obeylines\activeparens\spacesplit{#3{##1}{##2}}}% + \parindent=0in + \advance\leftskip by \defbodyindent + \exdentamount=\defbodyindent + \begingroup\obeylines\activeparens\spacesplit{#3{#4}{#5}}} + + % Used for @deftypeop. The change from \deftypemethparsebody is an + % extra argument at the beginning which is the `category', instead of it + % being the hardwired string `Method' or `Instance Variable'. We have + % to account for this both in the \...x definition and in parsing the + % input at hand. Thus also need a control sequence (passed as #5) for + % the \E... definition to assign the category name to. + % + \def\deftypeopparsebody#1#2#3#4#5 #6 {\begingroup\inENV + \medbreak + \def#1{\endgraf\endgroup\medbreak}% + \def#2##1 ##2 ##3 {% + \def#4{##1}% + \begingroup\obeylines\activeparens\spacesplit{#3{##2}{##3}}}% + \parindent=0in + \advance\leftskip by \defbodyindent + \exdentamount=\defbodyindent + \begingroup\obeylines\activeparens\spacesplit{#3{#5}{#6}}} + \def\defopparsebody #1#2#3#4#5 {\begingroup\inENV % \medbreak % % Define the end token that this defining construct specifies *************** *** 3911,3917 **** \def#2##1 ##2 {\def#4{##1}% \begingroup\obeylines\activeparens\spacesplit{#3{##2}}}% \parindent=0in ! \advance\leftskip by \defbodyindent \advance \rightskip by \defbodyindent \exdentamount=\defbodyindent \begingroup\obeylines\activeparens\spacesplit{#3{#5}}} --- 4459,4465 ---- \def#2##1 ##2 {\def#4{##1}% \begingroup\obeylines\activeparens\spacesplit{#3{##2}}}% \parindent=0in ! \advance\leftskip by \defbodyindent \exdentamount=\defbodyindent \begingroup\obeylines\activeparens\spacesplit{#3{#5}}} *************** *** 3926,3932 **** \def#1{\endgraf\endgroup\medbreak}% \def#2{\begingroup\obeylines\spacesplit#3}% \parindent=0in ! \advance\leftskip by \defbodyindent \advance \rightskip by \defbodyindent \exdentamount=\defbodyindent \begingroup % \catcode 61=\active % --- 4474,4480 ---- \def#1{\endgraf\endgroup\medbreak}% \def#2{\begingroup\obeylines\spacesplit#3}% \parindent=0in ! \advance\leftskip by \defbodyindent \exdentamount=\defbodyindent \begingroup % \catcode 61=\active % *************** *** 3943,3949 **** \def#1{\endgraf\endgroup\medbreak}% \def#2##1 {\begingroup\obeylines\spacesplit{#3{##1}}}% \parindent=0in ! \advance\leftskip by \defbodyindent \advance \rightskip by \defbodyindent \exdentamount=\defbodyindent \begingroup\obeylines } --- 4491,4497 ---- \def#1{\endgraf\endgroup\medbreak}% \def#2##1 {\begingroup\obeylines\spacesplit{#3{##1}}}% \parindent=0in ! \advance\leftskip by \defbodyindent \exdentamount=\defbodyindent \begingroup\obeylines } *************** *** 3988,3994 **** \def#2##1 ##2 {\def#4{##1}% \begingroup\obeylines\spacesplit{#3{##2}}}% \parindent=0in ! \advance\leftskip by \defbodyindent \advance \rightskip by \defbodyindent \exdentamount=\defbodyindent \begingroup\obeylines\spacesplit{#3{#5}}} --- 4536,4542 ---- \def#2##1 ##2 {\def#4{##1}% \begingroup\obeylines\spacesplit{#3{##2}}}% \parindent=0in ! \advance\leftskip by \defbodyindent \exdentamount=\defbodyindent \begingroup\obeylines\spacesplit{#3{#5}}} *************** *** 4012,4027 **** % First, define the processing that is wanted for arguments of \defun % Use this to expand the args and terminate the paragraph they make up ! \def\defunargs #1{\functionparens \sl % Expand, preventing hyphenation at `-' chars. % Note that groups don't affect changes in \hyphenchar. ! \hyphenchar\tensl=0 #1% ! \hyphenchar\tensl=45 \ifnum\parencount=0 \else \errmessage{Unbalanced parentheses in @def}\fi% \interlinepenalty=10000 \advance\rightskip by 0pt plus 1fil ! \endgraf\penalty 10000\vskip -\parskip\penalty 10000% } \def\deftypefunargs #1{% --- 4560,4576 ---- % First, define the processing that is wanted for arguments of \defun % Use this to expand the args and terminate the paragraph they make up ! \def\defunargs#1{\functionparens \sl % Expand, preventing hyphenation at `-' chars. % Note that groups don't affect changes in \hyphenchar. ! % Set the font temporarily and use \font in case \setfont made \tensl a macro. ! {\tensl\hyphenchar\font=0}% #1% ! {\tensl\hyphenchar\font=45}% \ifnum\parencount=0 \else \errmessage{Unbalanced parentheses in @def}\fi% \interlinepenalty=10000 \advance\rightskip by 0pt plus 1fil ! \endgraf\nobreak\vskip -\parskip\nobreak } \def\deftypefunargs #1{% *************** *** 4032,4038 **** \tclose{#1}% avoid \code because of side effects on active chars \interlinepenalty=10000 \advance\rightskip by 0pt plus 1fil ! \endgraf\penalty 10000\vskip -\parskip\penalty 10000% } % Do complete processing of one @defun or @defunx line already parsed. --- 4581,4587 ---- \tclose{#1}% avoid \code because of side effects on active chars \interlinepenalty=10000 \advance\rightskip by 0pt plus 1fil ! \endgraf\nobreak\vskip -\parskip\nobreak } % Do complete processing of one @defun or @defunx line already parsed. *************** *** 4051,4057 **** \def\defun{\defparsebody\Edefun\defunx\defunheader} \def\defunheader #1#2{\doind {fn}{\code{#1}}% Make entry in function index ! \begingroup\defname {#1}{Function}% \defunargs {#2}\endgroup % \catcode 61=\other % Turn off change made in \defparsebody } --- 4600,4606 ---- \def\defun{\defparsebody\Edefun\defunx\defunheader} \def\defunheader #1#2{\doind {fn}{\code{#1}}% Make entry in function index ! \begingroup\defname {#1}{\putwordDeffunc}% \defunargs {#2}\endgroup % \catcode 61=\other % Turn off change made in \defparsebody } *************** *** 4065,4071 **** % #1 is the data type, #2 the name, #3 the args. \def\deftypefunheaderx #1#2 #3\relax{% \doind {fn}{\code{#2}}% Make entry in function index ! \begingroup\defname {\defheaderxcond#1\relax$$$#2}{Function}% \deftypefunargs {#3}\endgroup % \catcode 61=\other % Turn off change made in \defparsebody } --- 4614,4620 ---- % #1 is the data type, #2 the name, #3 the args. \def\deftypefunheaderx #1#2 #3\relax{% \doind {fn}{\code{#2}}% Make entry in function index ! \begingroup\defname {\defheaderxcond#1\relax$$$#2}{\putwordDeftypefun}% \deftypefunargs {#3}\endgroup % \catcode 61=\other % Turn off change made in \defparsebody } *************** *** 4096,4102 **** \def\defmac{\defparsebody\Edefmac\defmacx\defmacheader} \def\defmacheader #1#2{\doind {fn}{\code{#1}}% Make entry in function index ! \begingroup\defname {#1}{Macro}% \defunargs {#2}\endgroup % \catcode 61=\other % Turn off change made in \defparsebody } --- 4645,4651 ---- \def\defmac{\defparsebody\Edefmac\defmacx\defmacheader} \def\defmacheader #1#2{\doind {fn}{\code{#1}}% Make entry in function index ! \begingroup\defname {#1}{\putwordDefmac}% \defunargs {#2}\endgroup % \catcode 61=\other % Turn off change made in \defparsebody } *************** *** 4106,4158 **** \def\defspec{\defparsebody\Edefspec\defspecx\defspecheader} \def\defspecheader #1#2{\doind {fn}{\code{#1}}% Make entry in function index ! \begingroup\defname {#1}{Special Form}% \defunargs {#2}\endgroup % \catcode 61=\other % Turn off change made in \defparsebody } ! % This definition is run if you use @defunx ! % anywhere other than immediately after a @defun or @defunx. ! ! \def\deffnx #1 {\errmessage{@deffnx in invalid context}} ! \def\defunx #1 {\errmessage{@defunx in invalid context}} ! \def\defmacx #1 {\errmessage{@defmacx in invalid context}} ! \def\defspecx #1 {\errmessage{@defspecx in invalid context}} ! \def\deftypefnx #1 {\errmessage{@deftypefnx in invalid context}} ! \def\deftypemethodx #1 {\errmessage{@deftypemethodx in invalid context}} ! \def\deftypeunx #1 {\errmessage{@deftypeunx in invalid context}} ! ! % @defmethod, and so on ! ! % @defop {Funny Method} foo-class frobnicate argument ! \def\defop #1 {\def\defoptype{#1}% \defopparsebody\Edefop\defopx\defopheader\defoptype} ! ! \def\defopheader #1#2#3{% ! \dosubind {fn}{\code{#2}}{on #1}% Make entry in function index ! \begingroup\defname {#2}{\defoptype{} on #1}% \defunargs {#3}\endgroup % } ! % @deftypemethod foo-class return-type foo-method args % \def\deftypemethod{% ! \defmethparsebody\Edeftypemethod\deftypemethodx\deftypemethodheader} % % #1 is the class name, #2 the data type, #3 the method name, #4 the args. \def\deftypemethodheader#1#2#3#4{% ! \deftypefnheaderx{Method on #1}{#2}#3 #4\relax } ! % @defmethod == @defop Method \def\defmethod{\defmethparsebody\Edefmethod\defmethodx\defmethodheader} ! ! \def\defmethodheader #1#2#3{% ! \dosubind {fn}{\code{#2}}{on #1}% entry in function index ! \begingroup\defname {#2}{Method on #1}% ! \defunargs {#3}\endgroup % } % @defcv {Class Option} foo-class foo-flag --- 4655,4731 ---- \def\defspec{\defparsebody\Edefspec\defspecx\defspecheader} \def\defspecheader #1#2{\doind {fn}{\code{#1}}% Make entry in function index ! \begingroup\defname {#1}{\putwordDefspec}% \defunargs {#2}\endgroup % \catcode 61=\other % Turn off change made in \defparsebody } ! % @defop CATEGORY CLASS OPERATION ARG... ! % \def\defop #1 {\def\defoptype{#1}% \defopparsebody\Edefop\defopx\defopheader\defoptype} ! % ! \def\defopheader#1#2#3{% ! \dosubind {fn}{\code{#2}}{\putwordon\ #1}% Make entry in function index ! \begingroup\defname {#2}{\defoptype\ \putwordon\ #1}% \defunargs {#3}\endgroup % } ! % @deftypeop CATEGORY CLASS TYPE OPERATION ARG... ! % ! \def\deftypeop #1 {\def\deftypeopcategory{#1}% ! \deftypeopparsebody\Edeftypeop\deftypeopx\deftypeopheader ! \deftypeopcategory} ! % ! % #1 is the class name, #2 the data type, #3 the operation name, #4 the args. ! \def\deftypeopheader#1#2#3#4{% ! \dosubind{fn}{\code{#3}}{\putwordon\ \code{#1}}% entry in function index ! \begingroup ! \defname{\defheaderxcond#2\relax$$$#3} ! {\deftypeopcategory\ \putwordon\ \code{#1}}% ! \deftypefunargs{#4}% ! \endgroup ! } ! ! % @deftypemethod CLASS TYPE METHOD ARG... % \def\deftypemethod{% ! \deftypemethparsebody\Edeftypemethod\deftypemethodx\deftypemethodheader} % % #1 is the class name, #2 the data type, #3 the method name, #4 the args. \def\deftypemethodheader#1#2#3#4{% ! \dosubind{fn}{\code{#3}}{\putwordon\ \code{#1}}% entry in function index ! \begingroup ! \defname{\defheaderxcond#2\relax$$$#3}{\putwordMethodon\ \code{#1}}% ! \deftypefunargs{#4}% ! \endgroup } ! % @deftypeivar CLASS TYPE VARNAME ! % ! \def\deftypeivar{% ! \deftypemethparsebody\Edeftypeivar\deftypeivarx\deftypeivarheader} ! % ! % #1 is the class name, #2 the data type, #3 the variable name. ! \def\deftypeivarheader#1#2#3{% ! \dosubind{vr}{\code{#3}}{\putwordof\ \code{#1}}% entry in variable index ! \begingroup ! \defname{#3}{\putwordInstanceVariableof\ \code{#1}}% ! \defvarargs{#3}% ! \endgroup ! } + % @defmethod == @defop Method + % \def\defmethod{\defmethparsebody\Edefmethod\defmethodx\defmethodheader} ! % ! % #1 is the class name, #2 the method name, #3 the args. ! \def\defmethodheader#1#2#3{% ! \dosubind{fn}{\code{#2}}{\putwordon\ \code{#1}}% entry in function index ! \begingroup ! \defname{#2}{\putwordMethodon\ \code{#1}}% ! \defunargs{#3}% ! \endgroup } % @defcv {Class Option} foo-class foo-flag *************** *** 4161,4197 **** \defopvarparsebody\Edefcv\defcvx\defcvarheader\defcvtype} \def\defcvarheader #1#2#3{% ! \dosubind {vr}{\code{#2}}{of #1}% Make entry in var index ! \begingroup\defname {#2}{\defcvtype{} of #1}% \defvarargs {#3}\endgroup % } ! % @defivar == @defcv {Instance Variable} ! \def\defivar{\defvrparsebody\Edefivar\defivarx\defivarheader} ! ! \def\defivarheader #1#2#3{% ! \dosubind {vr}{\code{#2}}{of #1}% Make entry in var index ! \begingroup\defname {#2}{Instance Variable of #1}% ! \defvarargs {#3}\endgroup % } ! % These definitions are run if you use @defmethodx, etc., ! % anywhere other than immediately after a @defmethod, etc. ! ! \def\defopx #1 {\errmessage{@defopx in invalid context}} ! \def\defmethodx #1 {\errmessage{@defmethodx in invalid context}} ! \def\defcvx #1 {\errmessage{@defcvx in invalid context}} ! \def\defivarx #1 {\errmessage{@defivarx in invalid context}} ! ! % Now @defvar ! % First, define the processing that is wanted for arguments of @defvar. % This is actually simple: just print them in roman. % This must expand the args and terminate the paragraph they make up \def\defvarargs #1{\normalparens #1% \interlinepenalty=10000 ! \endgraf\penalty 10000\vskip -\parskip\penalty 10000} % @defvr Counter foo-count --- 4734,4763 ---- \defopvarparsebody\Edefcv\defcvx\defcvarheader\defcvtype} \def\defcvarheader #1#2#3{% ! \dosubind {vr}{\code{#2}}{\putwordof\ #1}% Make entry in var index ! \begingroup\defname {#2}{\defcvtype\ \putwordof\ #1}% \defvarargs {#3}\endgroup % } ! % @defivar CLASS VARNAME == @defcv {Instance Variable} CLASS VARNAME ! % \def\defivar{\defvrparsebody\Edefivar\defivarx\defivarheader} ! % ! \def\defivarheader#1#2#3{% ! \dosubind {vr}{\code{#2}}{\putwordof\ #1}% entry in var index ! \begingroup ! \defname{#2}{\putwordInstanceVariableof\ #1}% ! \defvarargs{#3}% ! \endgroup } ! % @defvar % First, define the processing that is wanted for arguments of @defvar. % This is actually simple: just print them in roman. % This must expand the args and terminate the paragraph they make up \def\defvarargs #1{\normalparens #1% \interlinepenalty=10000 ! \endgraf\nobreak\vskip -\parskip\nobreak} % @defvr Counter foo-count *************** *** 4205,4211 **** \def\defvar{\defvarparsebody\Edefvar\defvarx\defvarheader} \def\defvarheader #1#2{\doind {vr}{\code{#1}}% Make entry in var index ! \begingroup\defname {#1}{Variable}% \defvarargs {#2}\endgroup % } --- 4771,4777 ---- \def\defvar{\defvarparsebody\Edefvar\defvarx\defvarheader} \def\defvarheader #1#2{\doind {vr}{\code{#1}}% Make entry in var index ! \begingroup\defname {#1}{\putwordDefvar}% \defvarargs {#2}\endgroup % } *************** *** 4214,4220 **** \def\defopt{\defvarparsebody\Edefopt\defoptx\defoptheader} \def\defoptheader #1#2{\doind {vr}{\code{#1}}% Make entry in var index ! \begingroup\defname {#1}{User Option}% \defvarargs {#2}\endgroup % } --- 4780,4786 ---- \def\defopt{\defvarparsebody\Edefopt\defoptx\defoptheader} \def\defoptheader #1#2{\doind {vr}{\code{#1}}% Make entry in var index ! \begingroup\defname {#1}{\putwordDefopt}% \defvarargs {#2}\endgroup % } *************** *** 4226,4234 **** % is actually part of the data type, which should not be put into the index. \def\deftypevarheader #1#2{% \dovarind#2 \relax% Make entry in variables index ! \begingroup\defname {\defheaderxcond#1\relax$$$#2}{Variable}% \interlinepenalty=10000 ! \endgraf\penalty 10000\vskip -\parskip\penalty 10000 \endgroup} \def\dovarind#1 #2\relax{\doind{vr}{\code{#1}}} --- 4792,4800 ---- % is actually part of the data type, which should not be put into the index. \def\deftypevarheader #1#2{% \dovarind#2 \relax% Make entry in variables index ! \begingroup\defname {\defheaderxcond#1\relax$$$#2}{\putwordDeftypevar}% \interlinepenalty=10000 ! \endgraf\nobreak\vskip -\parskip\nobreak \endgroup} \def\dovarind#1 #2\relax{\doind{vr}{\code{#1}}} *************** *** 4239,4256 **** \def\deftypevrheader #1#2#3{\dovarind#3 \relax% \begingroup\defname {\defheaderxcond#2\relax$$$#3}{#1} \interlinepenalty=10000 ! \endgraf\penalty 10000\vskip -\parskip\penalty 10000 \endgroup} - % This definition is run if you use @defvarx - % anywhere other than immediately after a @defvar or @defvarx. - - \def\defvrx #1 {\errmessage{@defvrx in invalid context}} - \def\defvarx #1 {\errmessage{@defvarx in invalid context}} - \def\defoptx #1 {\errmessage{@defoptx in invalid context}} - \def\deftypevarx #1 {\errmessage{@deftypevarx in invalid context}} - \def\deftypevrx #1 {\errmessage{@deftypevrx in invalid context}} - % Now define @deftp % Args are printed in bold, a slight difference from @defvar. --- 4805,4813 ---- \def\deftypevrheader #1#2#3{\dovarind#3 \relax% \begingroup\defname {\defheaderxcond#2\relax$$$#3}{#1} \interlinepenalty=10000 ! \endgraf\nobreak\vskip -\parskip\nobreak \endgroup} % Now define @deftp % Args are printed in bold, a slight difference from @defvar. *************** *** 4263,4313 **** \def\deftpheader #1#2#3{\doind {tp}{\code{#2}}% \begingroup\defname {#2}{#1}\deftpargs{#3}\endgroup} ! % This definition is run if you use @deftpx, etc ! % anywhere other than immediately after a @deftp, etc. ! \def\deftpx #1 {\errmessage{@deftpx in invalid context}} ! \message{cross reference,} ! % Define cross-reference macros ! \newwrite \auxfile ! \newif\ifhavexrefs % True if xref values are known. \newif\ifwarnedxrefs % True if we warned once that they aren't known. ! % @inforef is simple. \def\inforef #1{\inforefzzz #1,,,,**} \def\inforefzzz #1,#2,#3,#4**{\putwordSee{} \putwordInfo{} \putwordfile{} \file{\ignorespaces #3{}}, node \samp{\ignorespaces#1{}}} ! % \setref{foo} defines a cross-reference point named foo. ! \def\setref#1{% ! \dosetq{#1-title}{Ytitle}% ! \dosetq{#1-pg}{Ypagenumber}% ! \dosetq{#1-snt}{Ysectionnumberandtype}} ! ! \def\unnumbsetref#1{% ! \dosetq{#1-title}{Ytitle}% ! \dosetq{#1-pg}{Ypagenumber}% ! \dosetq{#1-snt}{Ynothing}} ! ! \def\appendixsetref#1{% ! \dosetq{#1-title}{Ytitle}% ! \dosetq{#1-pg}{Ypagenumber}% ! \dosetq{#1-snt}{Yappendixletterandtype}} ! ! % \xref, \pxref, and \ref generate cross-references to specified points. ! % For \xrefX, #1 is the node name, #2 the name of the Info ! % cross-reference, #3 the printed node name, #4 the name of the Info ! % file, #5 the name of the printed manual. All but the node name can be ! % omitted. % \def\pxref#1{\putwordsee{} \xrefX[#1,,,,,,,]} \def\xref#1{\putwordSee{} \xrefX[#1,,,,,,,]} \def\ref#1{\xrefX[#1,,,,,,,]} \def\xrefX[#1,#2,#3,#4,#5,#6]{\begingroup \def\printedmanual{\ignorespaces #5}% \def\printednodename{\ignorespaces #3}% \setbox1=\hbox{\printedmanual}% --- 4820,5213 ---- \def\deftpheader #1#2#3{\doind {tp}{\code{#2}}% \begingroup\defname {#2}{#1}\deftpargs{#3}\endgroup} ! % These definitions are used if you use @defunx (etc.) ! % anywhere other than immediately after a @defun or @defunx. ! % ! \def\defcvx#1 {\errmessage{@defcvx in invalid context}} ! \def\deffnx#1 {\errmessage{@deffnx in invalid context}} ! \def\defivarx#1 {\errmessage{@defivarx in invalid context}} ! \def\defmacx#1 {\errmessage{@defmacx in invalid context}} ! \def\defmethodx#1 {\errmessage{@defmethodx in invalid context}} ! \def\defoptx #1 {\errmessage{@defoptx in invalid context}} ! \def\defopx#1 {\errmessage{@defopx in invalid context}} ! \def\defspecx#1 {\errmessage{@defspecx in invalid context}} ! \def\deftpx#1 {\errmessage{@deftpx in invalid context}} ! \def\deftypefnx#1 {\errmessage{@deftypefnx in invalid context}} ! \def\deftypefunx#1 {\errmessage{@deftypefunx in invalid context}} ! \def\deftypeivarx#1 {\errmessage{@deftypeivarx in invalid context}} ! \def\deftypemethodx#1 {\errmessage{@deftypemethodx in invalid context}} ! \def\deftypeopx#1 {\errmessage{@deftypeopx in invalid context}} ! \def\deftypevarx#1 {\errmessage{@deftypevarx in invalid context}} ! \def\deftypevrx#1 {\errmessage{@deftypevrx in invalid context}} ! \def\defunx#1 {\errmessage{@defunx in invalid context}} ! \def\defvarx#1 {\errmessage{@defvarx in invalid context}} ! \def\defvrx#1 {\errmessage{@defvrx in invalid context}} ! ! ! \message{macros,} ! % @macro. ! ! % To do this right we need a feature of e-TeX, \scantokens, ! % which we arrange to emulate with a temporary file in ordinary TeX. ! \ifx\eTeXversion\undefined ! \newwrite\macscribble ! \def\scanmacro#1{% ! \begingroup \newlinechar`\^^M ! % Undo catcode changes of \startcontents and \doprintindex ! \catcode`\@=0 \catcode`\\=12 \escapechar=`\@ ! % Append \endinput to make sure that TeX does not see the ending newline. ! \toks0={#1\endinput}% ! \immediate\openout\macscribble=\jobname.tmp ! \immediate\write\macscribble{\the\toks0}% ! \immediate\closeout\macscribble ! \let\xeatspaces\eatspaces ! \input \jobname.tmp ! \endgroup ! } ! \else ! \def\scanmacro#1{% ! \begingroup \newlinechar`\^^M ! % Undo catcode changes of \startcontents and \doprintindex ! \catcode`\@=0 \catcode`\\=12 \escapechar=`\@ ! \let\xeatspaces\eatspaces\scantokens{#1\endinput}\endgroup} ! \fi ! ! \newcount\paramno % Count of parameters ! \newtoks\macname % Macro name ! \newif\ifrecursive % Is it recursive? ! \def\macrolist{} % List of all defined macros in the form ! % \do\macro1\do\macro2... ! ! % Utility routines. ! % Thisdoes \let #1 = #2, except with \csnames. ! \def\cslet#1#2{% ! \expandafter\expandafter ! \expandafter\let ! \expandafter\expandafter ! \csname#1\endcsname ! \csname#2\endcsname} ! ! % Trim leading and trailing spaces off a string. ! % Concepts from aro-bend problem 15 (see CTAN). ! {\catcode`\@=11 ! \gdef\eatspaces #1{\expandafter\trim@\expandafter{#1 }} ! \gdef\trim@ #1{\trim@@ @#1 @ #1 @ @@} ! \gdef\trim@@ #1@ #2@ #3@@{\trim@@@\empty #2 @} ! \def\unbrace#1{#1} ! \unbrace{\gdef\trim@@@ #1 } #2@{#1} ! } ! ! % Trim a single trailing ^^M off a string. ! {\catcode`\^^M=12\catcode`\Q=3% ! \gdef\eatcr #1{\eatcra #1Q^^MQ}% ! \gdef\eatcra#1^^MQ{\eatcrb#1Q}% ! \gdef\eatcrb#1Q#2Q{#1}% ! } ! ! % Macro bodies are absorbed as an argument in a context where ! % all characters are catcode 10, 11 or 12, except \ which is active ! % (as in normal texinfo). It is necessary to change the definition of \. ! ! % It's necessary to have hard CRs when the macro is executed. This is ! % done by making ^^M (\endlinechar) catcode 12 when reading the macro ! % body, and then making it the \newlinechar in \scanmacro. ! ! \def\macrobodyctxt{% ! \catcode`\~=12 ! \catcode`\^=12 ! \catcode`\_=12 ! \catcode`\|=12 ! \catcode`\<=12 ! \catcode`\>=12 ! \catcode`\+=12 ! \catcode`\{=12 ! \catcode`\}=12 ! \catcode`\@=12 ! \catcode`\^^M=12 ! \usembodybackslash} ! ! \def\macroargctxt{% ! \catcode`\~=12 ! \catcode`\^=12 ! \catcode`\_=12 ! \catcode`\|=12 ! \catcode`\<=12 ! \catcode`\>=12 ! \catcode`\+=12 ! \catcode`\@=12 ! \catcode`\\=12} ! ! % \mbodybackslash is the definition of \ in @macro bodies. ! % It maps \foo\ => \csname macarg.foo\endcsname => #N ! % where N is the macro parameter number. ! % We define \csname macarg.\endcsname to be \realbackslash, so ! % \\ in macro replacement text gets you a backslash. ! ! {\catcode`@=0 @catcode`@\=@active ! @gdef@usembodybackslash{@let\=@mbodybackslash} ! @gdef@mbodybackslash#1\{@csname macarg.#1@endcsname} ! } ! \expandafter\def\csname macarg.\endcsname{\realbackslash} ! ! \def\macro{\recursivefalse\parsearg\macroxxx} ! \def\rmacro{\recursivetrue\parsearg\macroxxx} ! ! \def\macroxxx#1{% ! \getargs{#1}% now \macname is the macname and \argl the arglist ! \ifx\argl\empty % no arguments ! \paramno=0% ! \else ! \expandafter\parsemargdef \argl;% ! \fi ! \if1\csname ismacro.\the\macname\endcsname ! \message{Warning: redefining \the\macname}% ! \else ! \expandafter\ifx\csname \the\macname\endcsname \relax ! \else \errmessage{The name \the\macname\space is reserved}\fi ! \global\cslet{macsave.\the\macname}{\the\macname}% ! \global\expandafter\let\csname ismacro.\the\macname\endcsname=1% ! % Add the macroname to \macrolist ! \toks0 = \expandafter{\macrolist\do}% ! \xdef\macrolist{\the\toks0 ! \expandafter\noexpand\csname\the\macname\endcsname}% ! \fi ! \begingroup \macrobodyctxt ! \ifrecursive \expandafter\parsermacbody ! \else \expandafter\parsemacbody ! \fi} ! ! \def\unmacro{\parsearg\unmacroxxx} ! \def\unmacroxxx#1{% ! \if1\csname ismacro.#1\endcsname ! \global\cslet{#1}{macsave.#1}% ! \global\expandafter\let \csname ismacro.#1\endcsname=0% ! % Remove the macro name from \macrolist ! \begingroup ! \edef\tempa{\expandafter\noexpand\csname#1\endcsname}% ! \def\do##1{% ! \def\tempb{##1}% ! \ifx\tempa\tempb ! % remove this ! \else ! \toks0 = \expandafter{\newmacrolist\do}% ! \edef\newmacrolist{\the\toks0\expandafter\noexpand\tempa}% ! \fi}% ! \def\newmacrolist{}% ! % Execute macro list to define \newmacrolist ! \macrolist ! \global\let\macrolist\newmacrolist ! \endgroup ! \else ! \errmessage{Macro #1 not defined}% ! \fi ! } ! ! % This makes use of the obscure feature that if the last token of a ! % is #, then the preceding argument is delimited by ! % an opening brace, and that opening brace is not consumed. ! \def\getargs#1{\getargsxxx#1{}} ! \def\getargsxxx#1#{\getmacname #1 \relax\getmacargs} ! \def\getmacname #1 #2\relax{\macname={#1}} ! \def\getmacargs#1{\def\argl{#1}} ! ! % Parse the optional {params} list. Set up \paramno and \paramlist ! % so \defmacro knows what to do. Define \macarg.blah for each blah ! % in the params list, to be ##N where N is the position in that list. ! % That gets used by \mbodybackslash (above). ! ! % We need to get `macro parameter char #' into several definitions. ! % The technique used is stolen from LaTeX: let \hash be something ! % unexpandable, insert that wherever you need a #, and then redefine ! % it to # just before using the token list produced. ! % ! % The same technique is used to protect \eatspaces till just before ! % the macro is used. ! ! \def\parsemargdef#1;{\paramno=0\def\paramlist{}% ! \let\hash\relax\let\xeatspaces\relax\parsemargdefxxx#1,;,} ! \def\parsemargdefxxx#1,{% ! \if#1;\let\next=\relax ! \else \let\next=\parsemargdefxxx ! \advance\paramno by 1% ! \expandafter\edef\csname macarg.\eatspaces{#1}\endcsname ! {\xeatspaces{\hash\the\paramno}}% ! \edef\paramlist{\paramlist\hash\the\paramno,}% ! \fi\next} ! ! % These two commands read recursive and nonrecursive macro bodies. ! % (They're different since rec and nonrec macros end differently.) ! ! \long\def\parsemacbody#1@end macro% ! {\xdef\temp{\eatcr{#1}}\endgroup\defmacro}% ! \long\def\parsermacbody#1@end rmacro% ! {\xdef\temp{\eatcr{#1}}\endgroup\defmacro}% ! ! % This defines the macro itself. There are six cases: recursive and ! % nonrecursive macros of zero, one, and many arguments. ! % Much magic with \expandafter here. ! % \xdef is used so that macro definitions will survive the file ! % they're defined in; @include reads the file inside a group. ! \def\defmacro{% ! \let\hash=##% convert placeholders to macro parameter chars ! \ifrecursive ! \ifcase\paramno ! % 0 ! \expandafter\xdef\csname\the\macname\endcsname{% ! \noexpand\scanmacro{\temp}}% ! \or % 1 ! \expandafter\xdef\csname\the\macname\endcsname{% ! \bgroup\noexpand\macroargctxt ! \noexpand\braceorline ! \expandafter\noexpand\csname\the\macname xxx\endcsname}% ! \expandafter\xdef\csname\the\macname xxx\endcsname##1{% ! \egroup\noexpand\scanmacro{\temp}}% ! \else % many ! \expandafter\xdef\csname\the\macname\endcsname{% ! \bgroup\noexpand\macroargctxt ! \noexpand\csname\the\macname xx\endcsname}% ! \expandafter\xdef\csname\the\macname xx\endcsname##1{% ! \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}% ! \expandafter\expandafter ! \expandafter\xdef ! \expandafter\expandafter ! \csname\the\macname xxx\endcsname ! \paramlist{\egroup\noexpand\scanmacro{\temp}}% ! \fi ! \else ! \ifcase\paramno ! % 0 ! \expandafter\xdef\csname\the\macname\endcsname{% ! \noexpand\norecurse{\the\macname}% ! \noexpand\scanmacro{\temp}\egroup}% ! \or % 1 ! \expandafter\xdef\csname\the\macname\endcsname{% ! \bgroup\noexpand\macroargctxt ! \noexpand\braceorline ! \expandafter\noexpand\csname\the\macname xxx\endcsname}% ! \expandafter\xdef\csname\the\macname xxx\endcsname##1{% ! \egroup ! \noexpand\norecurse{\the\macname}% ! \noexpand\scanmacro{\temp}\egroup}% ! \else % many ! \expandafter\xdef\csname\the\macname\endcsname{% ! \bgroup\noexpand\macroargctxt ! \expandafter\noexpand\csname\the\macname xx\endcsname}% ! \expandafter\xdef\csname\the\macname xx\endcsname##1{% ! \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}% ! \expandafter\expandafter ! \expandafter\xdef ! \expandafter\expandafter ! \csname\the\macname xxx\endcsname ! \paramlist{% ! \egroup ! \noexpand\norecurse{\the\macname}% ! \noexpand\scanmacro{\temp}\egroup}% ! \fi ! \fi} ! ! \def\norecurse#1{\bgroup\cslet{#1}{macsave.#1}} ! % \braceorline decides whether the next nonwhitespace character is a ! % {. If so it reads up to the closing }, if not, it reads the whole ! % line. Whatever was read is then fed to the next control sequence ! % as an argument (by \parsebrace or \parsearg) ! \def\braceorline#1{\let\next=#1\futurelet\nchar\braceorlinexxx} ! \def\braceorlinexxx{% ! \ifx\nchar\bgroup\else ! \expandafter\parsearg ! \fi \next} ! ! % We mant to disable all macros during \shipout so that they are not ! % expanded by \write. ! \def\turnoffmacros{\begingroup \def\do##1{\let\noexpand##1=\relax}% ! \edef\next{\macrolist}\expandafter\endgroup\next} ! ! ! % @alias. ! % We need some trickery to remove the optional spaces around the equal ! % sign. Just make them active and then expand them all to nothing. ! \def\alias{\begingroup\obeyspaces\parsearg\aliasxxx} ! \def\aliasxxx #1{\aliasyyy#1\relax} ! \def\aliasyyy #1=#2\relax{\ignoreactivespaces ! \edef\next{\global\let\expandafter\noexpand\csname#1\endcsname=% ! \expandafter\noexpand\csname#2\endcsname}% ! \expandafter\endgroup\next} ! \message{cross references,} ! % @xref etc. ! \newwrite\auxfile ! ! \newif\ifhavexrefs % True if xref values are known. \newif\ifwarnedxrefs % True if we warned once that they aren't known. ! % @inforef is relatively simple. \def\inforef #1{\inforefzzz #1,,,,**} \def\inforefzzz #1,#2,#3,#4**{\putwordSee{} \putwordInfo{} \putwordfile{} \file{\ignorespaces #3{}}, node \samp{\ignorespaces#1{}}} ! % @node's job is to define \lastnode. ! \def\node{\ENVcheck\parsearg\nodezzz} ! \def\nodezzz#1{\nodexxx [#1,]} ! \def\nodexxx[#1,#2]{\gdef\lastnode{#1}} ! \let\nwnode=\node ! \let\lastnode=\relax ! ! % The sectioning commands (@chapter, etc.) call these. ! \def\donoderef{% ! \ifx\lastnode\relax\else ! \expandafter\expandafter\expandafter\setref{\lastnode}% ! {Ysectionnumberandtype}% ! \global\let\lastnode=\relax ! \fi ! } ! \def\unnumbnoderef{% ! \ifx\lastnode\relax\else ! \expandafter\expandafter\expandafter\setref{\lastnode}{Ynothing}% ! \global\let\lastnode=\relax ! \fi ! } ! \def\appendixnoderef{% ! \ifx\lastnode\relax\else ! \expandafter\expandafter\expandafter\setref{\lastnode}% ! {Yappendixletterandtype}% ! \global\let\lastnode=\relax ! \fi ! } ! ! % @anchor{NAME} -- define xref target at arbitrary point. ! % ! \newcount\savesfregister ! \gdef\savesf{\relax \ifhmode \savesfregister=\spacefactor \fi} ! \gdef\restoresf{\relax \ifhmode \spacefactor=\savesfregister \fi} ! \gdef\anchor#1{\savesf \setref{#1}{Ynothing}\restoresf \ignorespaces} ! ! % \setref{NAME}{SNT} defines a cross-reference point NAME, namely ! % NAME-title, NAME-pg, and NAME-SNT. Called from \foonoderef. We have ! % to set \indexdummies so commands such as @code in a section title ! % aren't expanded. It would be nicer not to expand the titles in the ! % first place, but there's so many layers that that is hard to do. ! % ! \def\setref#1#2{{% ! \indexdummies ! \pdfmkdest{#1}% ! \dosetq{#1-title}{Ytitle}% ! \dosetq{#1-pg}{Ypagenumber}% ! \dosetq{#1-snt}{#2}% ! }} ! ! % @xref, @pxref, and @ref generate cross-references. For \xrefX, #1 is ! % the node name, #2 the name of the Info cross-reference, #3 the printed ! % node name, #4 the name of the Info file, #5 the name of the printed ! % manual. All but the node name can be omitted. % \def\pxref#1{\putwordsee{} \xrefX[#1,,,,,,,]} \def\xref#1{\putwordSee{} \xrefX[#1,,,,,,,]} \def\ref#1{\xrefX[#1,,,,,,,]} \def\xrefX[#1,#2,#3,#4,#5,#6]{\begingroup + \unsepspaces \def\printedmanual{\ignorespaces #5}% \def\printednodename{\ignorespaces #3}% \setbox1=\hbox{\printedmanual}% *************** *** 4320,4326 **** \else % Use the actual chapter/section title appear inside % the square brackets. Use the real section title if we have it. ! \ifdim \wd1>0pt% % It is in another manual, so we don't have it. \def\printednodename{\ignorespaces #1}% \else --- 5220,5226 ---- \else % Use the actual chapter/section title appear inside % the square brackets. Use the real section title if we have it. ! \ifdim \wd1 > 0pt % It is in another manual, so we don't have it. \def\printednodename{\ignorespaces #1}% \else *************** *** 4341,4367 **** % are best written with fairly long node names, containing hyphens, this % is a loss. Therefore, we give the text of the node name again, so it % is as if TeX is seeing it for the first time. \ifdim \wd1 > 0pt ! \putwordsection{} ``\printednodename'' in \cite{\printedmanual}% \else % _ (for example) has to be the character _ for the purposes of the % control sequence corresponding to the node, but it has to expand % into the usual \leavevmode...\vrule stuff for purposes of % printing. So we \turnoffactive for the \refx-snt, back on for the % printing, back off for the \refx-pg. ! {\turnoffactive \refx{#1-snt}{}}% ! \space [\printednodename],\space \turnoffactive \putwordpage\tie\refx{#1-pg}{}% \fi \endgroup} % \dosetq is the interface for calls from other macros ! % Use \turnoffactive so that punctuation chars such as underscore ! % work in node names. ! \def\dosetq #1#2{{\let\folio=0 \turnoffactive ! \edef\next{\write\auxfile{\internalsetq {#1}{#2}}}% ! \next}} % \internalsetq {foo}{page} expands into % CHARACTERS 'xrdef {foo}{...expansion of \Ypage...} --- 5241,5294 ---- % are best written with fairly long node names, containing hyphens, this % is a loss. Therefore, we give the text of the node name again, so it % is as if TeX is seeing it for the first time. + \ifpdf + \leavevmode + \getfilename{#4}% + \ifnum\filenamelength>0 + \startlink attr{/Border [0 0 0]}% + goto file{\the\filename.pdf} name{#1@}% + \else + \startlink attr{/Border [0 0 0]}% + goto name{#1@}% + \fi + \linkcolor + \fi + % \ifdim \wd1 > 0pt ! \putwordsection{} ``\printednodename'' \putwordin{} \cite{\printedmanual}% \else % _ (for example) has to be the character _ for the purposes of the % control sequence corresponding to the node, but it has to expand % into the usual \leavevmode...\vrule stuff for purposes of % printing. So we \turnoffactive for the \refx-snt, back on for the % printing, back off for the \refx-pg. ! {\normalturnoffactive ! % Only output a following space if the -snt ref is nonempty; for ! % @unnumbered and @anchor, it won't be. ! \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}% ! \ifdim \wd2 > 0pt \refx{#1-snt}\space\fi ! }% ! % [mynode], ! [\printednodename],\space ! % page 3 \turnoffactive \putwordpage\tie\refx{#1-pg}{}% \fi + \endlink \endgroup} % \dosetq is the interface for calls from other macros ! % Use \normalturnoffactive so that punctuation chars such as underscore ! % and backslash work in node names. (\turnoffactive doesn't do \.) ! \def\dosetq#1#2{% ! {\let\folio=0% ! \normalturnoffactive ! \edef\next{\write\auxfile{\internalsetq{#1}{#2}}}% ! \iflinks ! \next ! \fi ! }% ! } % \internalsetq {foo}{page} expands into % CHARACTERS 'xrdef {foo}{...expansion of \Ypage...} *************** *** 4413,4424 **** \expandafter\ifx\csname X#1\endcsname\relax % If not defined, say something at least. \angleleft un\-de\-fined\angleright ! \ifhavexrefs ! \message{\linenumber Undefined cross reference `#1'.}% ! \else ! \ifwarnedxrefs\else ! \global\warnedxrefstrue ! \message{Cross reference values unknown; you must run TeX again.}% \fi \fi \else --- 5340,5353 ---- \expandafter\ifx\csname X#1\endcsname\relax % If not defined, say something at least. \angleleft un\-de\-fined\angleright ! \iflinks ! \ifhavexrefs ! \message{\linenumber Undefined cross reference `#1'.}% ! \else ! \ifwarnedxrefs\else ! \global\warnedxrefstrue ! \message{Cross reference values unknown; you must run TeX again.}% ! \fi \fi \fi \else *************** *** 4429,4435 **** } % This is the macro invoked by entries in the aux file. ! % \def\xrdef#1{\begingroup % Reenable \ as an escape while reading the second argument. \catcode`\\ = 0 --- 5358,5364 ---- } % This is the macro invoked by entries in the aux file. ! % \def\xrdef#1{\begingroup % Reenable \ as an escape while reading the second argument. \catcode`\\ = 0 *************** *** 4492,4499 **** \catcode`\$=\other \catcode`\#=\other \catcode`\&=\other ! % `\+ does not work, so use 43. ! \catcode43=\other % Make the characters 128-255 be printing characters {% \count 1=128 --- 5421,5427 ---- \catcode`\$=\other \catcode`\#=\other \catcode`\&=\other ! \catcode`+=\other % avoid \+ for paranoia even though we've turned it off % Make the characters 128-255 be printing characters {% \count 1=128 *************** *** 4582,4587 **** --- 5510,5517 ---- \xspaceskip\z@skip \parindent\defaultparindent % + \smallfonts \rm + % % Hang the footnote text off the number. \hang \textindent{\thisfootno}% *************** *** 4596,4602 **** \else\let\next\f@t\fi \next} \def\f@@t{\bgroup\aftergroup\@foot\let\next} \def\f@t#1{#1\@foot} ! \def\@foot{\strut\egroup} }%end \catcode `\@=11 --- 5526,5532 ---- \else\let\next\f@t\fi \next} \def\f@@t{\bgroup\aftergroup\@foot\let\next} \def\f@t#1{#1\@foot} ! \def\@foot{\strut\par\egroup} }%end \catcode `\@=11 *************** *** 4655,4677 **** % @image. We use the macros from epsf.tex to support this. % If epsf.tex is not installed and @image is used, we complain. ! % % Check for and read epsf.tex up front. If we read it only at @image % time, we might be inside a group, and then its definitions would get % undone and the next image would fail. \openin 1 = epsf.tex \ifeof 1 \else \closein 1 ! \def\epsfannounce{\toks0 = }% do not bother showing banner \input epsf.tex \fi % \newif\ifwarnednoepsf \newhelp\noepsfhelp{epsf.tex must be installed for images to work. It is also included in the Texinfo distribution, or you can get ! it from ftp://ftp.tug.org/tex/epsf.tex.} % - % Only complain once about lack of epsf.tex. \def\image#1{% \ifx\epsfbox\undefined \ifwarnednoepsf \else --- 5585,5609 ---- % @image. We use the macros from epsf.tex to support this. % If epsf.tex is not installed and @image is used, we complain. ! % % Check for and read epsf.tex up front. If we read it only at @image % time, we might be inside a group, and then its definitions would get % undone and the next image would fail. \openin 1 = epsf.tex \ifeof 1 \else \closein 1 ! % Do not bother showing banner with post-v2.7 epsf.tex (available in ! % doc/epsf.tex until it shows up on ctan). ! \def\epsfannounce{\toks0 = }% \input epsf.tex \fi % + % We will only complain once about lack of epsf.tex. \newif\ifwarnednoepsf \newhelp\noepsfhelp{epsf.tex must be installed for images to work. It is also included in the Texinfo distribution, or you can get ! it from ftp://tug.org/tex/epsf.tex.} % \def\image#1{% \ifx\epsfbox\undefined \ifwarnednoepsf \else *************** *** 4689,4730 **** % #2 is (optional) width, #3 is (optional) height. % #4 is just the usual extra ignored arg for parsing this stuff. \def\imagexxx#1,#2,#3,#4\finish{% ! % \epsfbox itself resets \epsf?size at each figure. ! \setbox0 = \hbox{\ignorespaces #2}\ifdim\wd0 > 0pt \epsfxsize=#2\relax \fi ! \setbox0 = \hbox{\ignorespaces #3}\ifdim\wd0 > 0pt \epsfysize=#3\relax \fi ! \epsfbox{#1.eps}% } - % End of control word definitions. ! \message{and turning on texinfo input format.} ! ! \def\openindices{% ! \newindex{cp}% ! \newcodeindex{fn}% ! \newcodeindex{vr}% ! \newcodeindex{tp}% ! \newcodeindex{ky}% ! \newcodeindex{pg}% } ! % Set some numeric style parameters, for 8.5 x 11 format. ! \hsize = 6in ! \hoffset = .25in \newdimen\defaultparindent \defaultparindent = 15pt - \parindent = \defaultparindent - \parskip 3pt plus 2pt minus 1pt - \setleading{13.2pt} - \advance\topskip by 1.2cm \chapheadingskip = 15pt plus 4pt minus 2pt \secheadingskip = 12pt plus 3pt minus 2pt \subsecheadingskip = 9pt plus 2pt minus 2pt % Prevent underfull vbox error messages. ! \vbadness=10000 % Following George Bush, just get rid of widows and orphans. \widowpenalty=10000 --- 5621,5699 ---- % #2 is (optional) width, #3 is (optional) height. % #4 is just the usual extra ignored arg for parsing this stuff. \def\imagexxx#1,#2,#3,#4\finish{% ! \ifpdf ! \centerline{\dopdfimage{#1}{#2}{#3}}% ! \else ! % \epsfbox itself resets \epsf?size at each figure. ! \setbox0 = \hbox{\ignorespaces #2}\ifdim\wd0 > 0pt \epsfxsize=#2\relax \fi ! \setbox0 = \hbox{\ignorespaces #3}\ifdim\wd0 > 0pt \epsfysize=#3\relax \fi ! \begingroup ! \catcode`\^^M = 5 % in case we're inside an example ! % If the image is by itself, center it. ! \ifvmode ! \nobreak\bigskip ! % Usually we'll have text after the image which will insert ! % \parskip glue, so insert it here too to equalize the space ! % above and below. ! \nobreak\vskip\parskip ! \nobreak ! \centerline{\epsfbox{#1.eps}}% ! \bigbreak ! \else ! % In the middle of a paragraph, no extra space. ! \epsfbox{#1.eps}% ! \fi ! \endgroup ! \fi } + \message{localization,} + % and i18n. ! % @documentlanguage is usually given very early, just after ! % @setfilename. If done too late, it may not override everything ! % properly. Single argument is the language abbreviation. ! % It would be nice if we could set up a hyphenation file here. ! % ! \def\documentlanguage{\parsearg\dodocumentlanguage} ! \def\dodocumentlanguage#1{% ! \tex % read txi-??.tex file in plain TeX. ! % Read the file if it exists. ! \openin 1 txi-#1.tex ! \ifeof1 ! \errhelp = \nolanghelp ! \errmessage{Cannot read language file txi-#1.tex}% ! \let\temp = \relax ! \else ! \def\temp{\input txi-#1.tex }% ! \fi ! \temp ! \endgroup } + \newhelp\nolanghelp{The given language definition file cannot be found or + is empty. Maybe you need to install it? In the current directory + should work if nowhere else does.} + ! % @documentencoding should change something in TeX eventually, most ! % likely, but for now just recognize it. ! \let\documentencoding = \comment ! ! % Page size parameters. ! % \newdimen\defaultparindent \defaultparindent = 15pt \chapheadingskip = 15pt plus 4pt minus 2pt \secheadingskip = 12pt plus 3pt minus 2pt \subsecheadingskip = 9pt plus 2pt minus 2pt % Prevent underfull vbox error messages. ! \vbadness = 10000 ! ! % Don't be so finicky about underfull hboxes, either. ! \hbadness = 2000 % Following George Bush, just get rid of widows and orphans. \widowpenalty=10000 *************** *** 4733,4833 **** % Use TeX 3.0's \emergencystretch to help line breaking, but if we're % using an old version of TeX, don't do anything. We want the amount of % stretch added to depend on the line length, hence the dependence on ! % \hsize. This makes it come to about 9pt for the 8.5x11 format. % ! \ifx\emergencystretch\thisisundefined ! % Allow us to assign to \emergencystretch anyway. ! \def\emergencystretch{\dimen0}% ! \else ! \emergencystretch = \hsize ! \divide\emergencystretch by 45 ! \fi ! ! % Use @smallbook to reset parameters for 7x9.5 format (or else 7x9.25) ! \def\smallbook{ ! \global\chapheadingskip = 15pt plus 4pt minus 2pt ! \global\secheadingskip = 12pt plus 3pt minus 2pt ! \global\subsecheadingskip = 9pt plus 2pt minus 2pt ! % ! \global\lispnarrowing = 0.3in ! \setleading{12pt} ! \advance\topskip by -1cm ! \global\parskip 2pt plus 1pt ! \global\hsize = 5in ! \global\vsize=7.5in ! \global\tolerance=700 ! \global\hfuzz=1pt ! \global\contentsrightmargin=0pt ! \global\deftypemargin=0pt ! \global\defbodyindent=.5cm ! % ! \global\pagewidth=\hsize ! \global\pageheight=\vsize ! % ! \global\let\smalllisp=\smalllispx ! \global\let\smallexample=\smalllispx ! \global\def\Esmallexample{\Esmalllisp} } % Use @afourpaper to print on European A4 paper. ! \def\afourpaper{ ! \global\tolerance=700 ! \global\hfuzz=1pt ! \setleading{12pt} ! \global\parskip 15pt plus 1pt ! ! \global\vsize= 53\baselineskip ! \advance\vsize by \topskip ! %\global\hsize= 5.85in % A4 wide 10pt ! \global\hsize= 6.5in ! \global\outerhsize=\hsize ! \global\advance\outerhsize by 0.5in ! \global\outervsize=\vsize ! \global\advance\outervsize by 0.6in ! ! \global\pagewidth=\hsize ! \global\pageheight=\vsize ! } ! ! \bindingoffset=0pt ! \normaloffset=\hoffset ! \pagewidth=\hsize ! \pageheight=\vsize ! ! % Allow control of the text dimensions. Parameters in order: textheight; ! % textwidth; voffset; hoffset; binding offset; topskip. ! % All require a dimension; ! % header is additional; added length extends the bottom of the page. ! ! \def\changepagesizes#1#2#3#4#5#6{ ! \global\vsize= #1 ! \global\topskip= #6 ! \advance\vsize by \topskip ! \global\voffset= #3 ! \global\hsize= #2 ! \global\outerhsize=\hsize ! \global\advance\outerhsize by 0.5in ! \global\outervsize=\vsize ! \global\advance\outervsize by 0.6in ! \global\pagewidth=\hsize ! \global\pageheight=\vsize ! \global\normaloffset= #4 ! \global\bindingoffset= #5} % A specific text layout, 24x15cm overall, intended for A4 paper. Top margin % 29mm, hence bottom margin 28mm, nominal side margin 3cm. ! \def\afourlatex ! {\global\tolerance=700 ! \global\hfuzz=1pt ! \setleading{12pt} ! \global\parskip 15pt plus 1pt ! \advance\baselineskip by 1.6pt ! \changepagesizes{237mm}{150mm}{3.6mm}{3.6mm}{3mm}{7mm} ! } % Use @afourwide to print on European A4 paper in wide format. ! \def\afourwide{\afourpaper ! \changepagesizes{9.5in}{6.5in}{\hoffset}{\normaloffset}{\bindingoffset}{7mm}} % Define macros to output various characters with catcode for normal text. \catcode`\"=\other --- 5702,5826 ---- % Use TeX 3.0's \emergencystretch to help line breaking, but if we're % using an old version of TeX, don't do anything. We want the amount of % stretch added to depend on the line length, hence the dependence on ! % \hsize. We call this whenever the paper size is set. % ! \def\setemergencystretch{% ! \ifx\emergencystretch\thisisundefined ! % Allow us to assign to \emergencystretch anyway. ! \def\emergencystretch{\dimen0}% ! \else ! \emergencystretch = .15\hsize ! \fi } + % Parameters in order: 1) textheight; 2) textwidth; 3) voffset; + % 4) hoffset; 5) binding offset; 6) topskip. Then whoever calls us can + % set \parskip and call \setleading for \baselineskip. + % + \def\internalpagesizes#1#2#3#4#5#6{% + \voffset = #3\relax + \topskip = #6\relax + \splittopskip = \topskip + % + \vsize = #1\relax + \advance\vsize by \topskip + \outervsize = \vsize + \advance\outervsize by 2\topandbottommargin + \pageheight = \vsize + % + \hsize = #2\relax + \outerhsize = \hsize + \advance\outerhsize by 0.5in + \pagewidth = \hsize + % + \normaloffset = #4\relax + \bindingoffset = #5\relax + % + \parindent = \defaultparindent + \setemergencystretch + } + + % @letterpaper (the default). + \def\letterpaper{{\globaldefs = 1 + \parskip = 3pt plus 2pt minus 1pt + \setleading{13.2pt}% + % + % If page is nothing but text, make it come out even. + \internalpagesizes{46\baselineskip}{6in}{\voffset}{.25in}{\bindingoffset}{36pt}% + }} + + % Use @smallbook to reset parameters for 7x9.5 (or so) format. + \def\smallbook{{\globaldefs = 1 + \parskip = 2pt plus 1pt + \setleading{12pt}% + % + \internalpagesizes{7.5in}{5.in}{\voffset}{.25in}{\bindingoffset}{16pt}% + % + \lispnarrowing = 0.3in + \tolerance = 700 + \hfuzz = 1pt + \contentsrightmargin = 0pt + \deftypemargin = 0pt + \defbodyindent = .5cm + % + \let\smalldisplay = \smalldisplayx + \let\smallexample = \smalllispx + \let\smallformat = \smallformatx + \let\smalllisp = \smalllispx + }} + % Use @afourpaper to print on European A4 paper. ! \def\afourpaper{{\globaldefs = 1 ! \setleading{12pt}% ! \parskip = 3pt plus 2pt minus 1pt ! % ! \internalpagesizes{53\baselineskip}{160mm}{\voffset}{4mm}{\bindingoffset}{44pt}% ! % ! \tolerance = 700 ! \hfuzz = 1pt ! }} % A specific text layout, 24x15cm overall, intended for A4 paper. Top margin % 29mm, hence bottom margin 28mm, nominal side margin 3cm. ! \def\afourlatex{{\globaldefs = 1 ! \setleading{13.6pt}% ! % ! \afourpaper ! \internalpagesizes{237mm}{150mm}{3.6mm}{3.6mm}{3mm}{7mm}% ! % ! \globaldefs = 0 ! }} % Use @afourwide to print on European A4 paper in wide format. ! \def\afourwide{% ! \afourpaper ! \internalpagesizes{6.5in}{9.5in}{\hoffset}{\normaloffset}{\bindingoffset}{7mm}% ! % ! \globaldefs = 0 ! } ! ! % @pagesizes TEXTHEIGHT[,TEXTWIDTH] ! % Perhaps we should allow setting the margins, \topskip, \parskip, ! % and/or leading, also. Or perhaps we should compute them somehow. ! % ! \def\pagesizes{\parsearg\pagesizesxxx} ! \def\pagesizesxxx#1{\pagesizesyyy #1,,\finish} ! \def\pagesizesyyy#1,#2,#3\finish{{% ! \setbox0 = \hbox{\ignorespaces #2}\ifdim\wd0 > 0pt \hsize=#2\relax \fi ! \globaldefs = 1 ! % ! \parskip = 3pt plus 2pt minus 1pt ! \setleading{13.2pt}% ! % ! \internalpagesizes{#1}{\hsize}{\voffset}{\normaloffset}{\bindingoffset}{44pt}% ! }} ! ! % Set default to letter. ! % ! \letterpaper ! ! ! \message{and turning on texinfo input format.} % Define macros to output various characters with catcode for normal text. \catcode`\"=\other *************** *** 4838,4843 **** --- 5831,5837 ---- \catcode`\<=\other \catcode`\>=\other \catcode`\+=\other + \catcode`\$=\other \def\normaldoublequote{"} \def\normaltilde{~} \def\normalcaret{^} *************** *** 4846,4851 **** --- 5840,5846 ---- \def\normalless{<} \def\normalgreater{>} \def\normalplus{+} + \def\normaldollar{$} % This macro is used to make a character print one way in ttfont % where it can probably just be output, and another way in other fonts, *************** *** 4856,4862 **** % interword stretch (and shrink), and it is reasonable to expect all % typewriter fonts to have this, we can check that font parameter. % ! \def\ifusingtt#1#2{\ifdim \fontdimen3\the\font=0pt #1\else #2\fi} % Turn off all special characters except @ % (and those which the user can use as if they were ordinary). --- 5851,5863 ---- % interword stretch (and shrink), and it is reasonable to expect all % typewriter fonts to have this, we can check that font parameter. % ! \def\ifusingtt#1#2{\ifdim \fontdimen3\font=0pt #1\else #2\fi} ! ! % Same as above, but check for italic font. Actually this also catches ! % non-italic slanted fonts since it is impossible to distinguish them from ! % italic fonts. But since this is only used by $ and it uses \sl anyway ! % this is not a problem. ! \def\ifusingit#1#2{\ifdim \fontdimen1\font>0pt #1\else #2\fi} % Turn off all special characters except @ % (and those which the user can use as if they were ordinary). *************** *** 4864,4873 **** % use math or other variants that look better in normal text. \catcode`\"=\active ! \def\activedoublequote{{\tt \char '042}} \let"=\activedoublequote \catcode`\~=\active ! \def~{{\tt \char '176}} \chardef\hat=`\^ \catcode`\^=\active \def^{{\tt \hat}} --- 5865,5874 ---- % use math or other variants that look better in normal text. \catcode`\"=\active ! \def\activedoublequote{{\tt\char34}} \let"=\activedoublequote \catcode`\~=\active ! \def~{{\tt\char126}} \chardef\hat=`\^ \catcode`\^=\active \def^{{\tt \hat}} *************** *** 4878,4884 **** \def\_{\leavevmode \kern.06em \vbox{\hrule width.3em height.1ex}} \catcode`\|=\active ! \def|{{\tt \char '174}} \chardef \less=`\< \catcode`\<=\active \def<{{\tt \less}} --- 5879,5885 ---- \def\_{\leavevmode \kern.06em \vbox{\hrule width.3em height.1ex}} \catcode`\|=\active ! \def|{{\tt\char124}} \chardef \less=`\< \catcode`\<=\active \def<{{\tt \less}} *************** *** 4887,4892 **** --- 5888,5895 ---- \def>{{\tt \gtr}} \catcode`\+=\active \def+{{\tt \char 43}} + \catcode`\$=\active + \def${\ifusingit{{\sl\$}}\normaldollar} %\catcode 27=\active %\def^^[{$\diamondsuit$} *************** *** 4917,4925 **** % \normalbackslash outputs one backslash in fixed width font. \def\normalbackslash{{\tt\rawbackslashxx}} - % Say @foo, not \foo, in error messages. - \escapechar=`\@ - % \catcode 17=0 % Define control-q \catcode`\\=\active --- 5920,5925 ---- *************** *** 4933,4939 **** @let|=@normalverticalbar @let<=@normalless @let>=@normalgreater ! @let+=@normalplus} @def@normalturnoffactive{@let"=@normaldoublequote @let\=@normalbackslash --- 5933,5940 ---- @let|=@normalverticalbar @let<=@normalless @let>=@normalgreater ! @let+=@normalplus ! @let$=@normaldollar} @def@normalturnoffactive{@let"=@normaldoublequote @let\=@normalbackslash *************** *** 4943,4949 **** @let|=@normalverticalbar @let<=@normalless @let>=@normalgreater ! @let+=@normalplus} % Make _ and + \other characters, temporarily. % This is canceled by @fixbackslash. --- 5944,5951 ---- @let|=@normalverticalbar @let<=@normalless @let>=@normalgreater ! @let+=@normalplus ! @let$=@normaldollar} % Make _ and + \other characters, temporarily. % This is canceled by @fixbackslash. *************** *** 4962,4977 **** % Also back turn on active characters that might appear in the input % file name, in case not using a pre-dumped format. % ! @gdef@fixbackslash{@ifx\@eatinput @let\ = @normalbackslash @fi ! @catcode`+=@active @catcode`@_=@active} ! %% These look ok in all fonts, so just make them not special. The @rm below ! %% makes sure that the current font starts out as the newly loaded cmr10 ! @catcode`@$=@other @catcode`@%=@other @catcode`@&=@other @catcode`@#=@other @textfonts @rm @c Local variables: @c page-delimiter: "^\\\\message" @c End: --- 5964,5992 ---- % Also back turn on active characters that might appear in the input % file name, in case not using a pre-dumped format. % ! @gdef@fixbackslash{% ! @ifx\@eatinput @let\ = @normalbackslash @fi ! @catcode`+=@active ! @catcode`@_=@active ! } ! ! % Say @foo, not \foo, in error messages. ! @escapechar = `@@ ! % These look ok in all fonts, so just make them not special. ! @catcode`@& = @other ! @catcode`@# = @other ! @catcode`@% = @other + @c Set initial fonts. @textfonts @rm + @c Local variables: + @c eval: (add-hook 'write-file-hooks 'time-stamp) @c page-delimiter: "^\\\\message" + @c time-stamp-start: "def\\\\texinfoversion{" + @c time-stamp-format: "%:y-%02m-%02d.%02H" + @c time-stamp-end: "}" @c End: diff -cNr gawk-3.0.4/eval.c gawk-3.0.5/eval.c *** gawk-3.0.4/eval.c Wed Jun 30 16:07:12 1999 --- gawk-3.0.5/eval.c Wed Jun 7 11:45:37 2000 *************** *** 3,9 **** */ /* ! * Copyright (C) 1986, 1988, 1989, 1991-1999 the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the * AWK Programming Language. --- 3,9 ---- */ /* ! * Copyright (C) 1986, 1988, 1989, 1991-2000 the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the * AWK Programming Language. *************** *** 225,230 **** --- 225,231 ---- "Node_regex", "Node_hashnode", "Node_ahash", + "Node_array_ref", "Node_NF", "Node_NR", "Node_FNR", *************** *** 659,670 **** if (tree->type == Node_param_list) { int paramnum = tree->param_cnt + 1; tree = stack_ptr[tree->param_cnt]; if (tree == NULL) return Nnull_string; sprintf(namebuf, "parameter #%d", paramnum); tree->vname = namebuf; ! } switch (tree->type) { case Node_var: --- 660,677 ---- if (tree->type == Node_param_list) { int paramnum = tree->param_cnt + 1; + if ((tree->flags & FUNC) != 0) + fatal("can't use function name `%s' as variable or array", + tree->vname); + tree = stack_ptr[tree->param_cnt]; if (tree == NULL) return Nnull_string; sprintf(namebuf, "parameter #%d", paramnum); tree->vname = namebuf; ! } ! if (tree->type == Node_array_ref) ! tree = tree->orig_array; switch (tree->type) { case Node_var: *************** *** 984,994 **** * able to begin and end on a single input record, so this * isn't an ELSE IF, as noted above. */ ! if (! tree->triggered) if (! eval_condition(tree->condpair->lnode)) return FALSE; else tree->triggered = TRUE; /* Else we are triggered */ if (eval_condition(tree->condpair->rnode)) tree->triggered = FALSE; --- 991,1002 ---- * able to begin and end on a single input record, so this * isn't an ELSE IF, as noted above. */ ! if (! tree->triggered) { if (! eval_condition(tree->condpair->lnode)) return FALSE; else tree->triggered = TRUE; + } /* Else we are triggered */ if (eval_condition(tree->condpair->rnode)) tree->triggered = FALSE; *************** *** 1069,1084 **** NODE *tmp; Func_ptr after_assign = NULL; - lhs = get_lhs(tree->lnode, &after_assign); - lval = force_number(*lhs); - /* ! * Can't unref *lhs until we know the type; doing so ! * too early breaks x += x sorts of things. */ switch(tree->type) { case Node_preincrement: case Node_predecrement: unref(*lhs); *lhs = make_number(lval + (tree->type == Node_preincrement ? 1.0 : -1.0)); --- 1077,1093 ---- NODE *tmp; Func_ptr after_assign = NULL; /* ! * For ++ and --, get the lhs when doing the op and then ! * return. For += etc, do the rhs first, since it can ! * rearrange things, and *then* get the lhs. */ + switch(tree->type) { case Node_preincrement: case Node_predecrement: + lhs = get_lhs(tree->lnode, &after_assign); + lval = force_number(*lhs); unref(*lhs); *lhs = make_number(lval + (tree->type == Node_preincrement ? 1.0 : -1.0)); *************** *** 1089,1094 **** --- 1098,1105 ---- case Node_postincrement: case Node_postdecrement: + lhs = get_lhs(tree->lnode, &after_assign); + lval = force_number(*lhs); unref(*lhs); *lhs = make_number(lval + (tree->type == Node_postincrement ? 1.0 : -1.0)); *************** *** 1100,1115 **** break; /* handled below */ } tmp = tree_eval(tree->rnode); rval = force_number(tmp); free_temp(tmp); - /* - * Do this again; the lhs and the rhs could both be fields. - * Accessing the rhs could cause the lhs to have moved around. - * (Yet another special case. Gack.) - */ lhs = get_lhs(tree->lnode, &after_assign); unref(*lhs); switch(tree->type) { --- 1111,1126 ---- break; /* handled below */ } + /* + * It's a += kind of thing. Do the rhs, then the lhs. + */ + tmp = tree_eval(tree->rnode); rval = force_number(tmp); free_temp(tmp); lhs = get_lhs(tree->lnode, &after_assign); + lval = force_number(*lhs); unref(*lhs); switch(tree->type) { *************** *** 1225,1231 **** if (arg->type == Node_param_list) arg = stack_ptr[arg->param_cnt]; n = *sp++; ! if ((arg->type == Node_var || arg->type == Node_var_array) && n->type == Node_var_array) { /* should we free arg->var_value ? */ arg->var_array = n->var_array; --- 1236,1242 ---- if (arg->type == Node_param_list) arg = stack_ptr[arg->param_cnt]; n = *sp++; ! if ((arg->type == Node_var /* || arg->type == Node_var_array */) && n->type == Node_var_array) { /* should we free arg->var_value ? */ arg->var_array = n->var_array; *************** *** 1235,1241 **** arg->flags = n->flags; } /* n->lnode overlays the array size, don't unref it if array */ ! if (n->type != Node_var_array) unref(n->lnode); freenode(n); count--; --- 1246,1252 ---- arg->flags = n->flags; } /* n->lnode overlays the array size, don't unref it if array */ ! if (n->type != Node_var_array && n->type != Node_array_ref) unref(n->lnode); freenode(n); count--; *************** *** 1245,1251 **** /* if n is a local array, all the elements should be freed */ if (n->type == Node_var_array) assoc_clear(n); ! unref(n->lnode); freenode(n); } if (f->stack) --- 1256,1264 ---- /* if n is a local array, all the elements should be freed */ if (n->type == Node_var_array) assoc_clear(n); ! /* n->lnode overlays the array size, don't unref it if array */ ! if (n->type != Node_var_array && n->type != Node_array_ref) ! unref(n->lnode); freenode(n); } if (f->stack) *************** *** 1305,1315 **** r->type = Node_var; /* call by reference for arrays; see below also */ ! if (arg->type == Node_param_list) arg = f->prevstack[arg->param_cnt]; ! if (arg->type == Node_var_array) *r = *arg; ! else { n = tree_eval(arg); r->lnode = dupnode(n); r->rnode = (NODE *) NULL; --- 1318,1336 ---- r->type = Node_var; /* call by reference for arrays; see below also */ ! if (arg->type == Node_param_list) { ! /* we must also reassign f here; see below */ ! f = & fcall_list[curfcall]; arg = f->prevstack[arg->param_cnt]; ! } ! if (arg->type == Node_var_array) { ! r->type = Node_array_ref; ! r->flags &= ~SCALAR; ! r->orig_array = arg; ! r->vname = arg->vname; ! } else if (arg->type == Node_array_ref) { *r = *arg; ! } else { n = tree_eval(arg); r->lnode = dupnode(n); r->rnode = (NODE *) NULL; *************** *** 1443,1448 **** --- 1464,1470 ---- } switch (ptr->type) { + case Node_array_ref: case Node_var_array: fatal("attempt to use array `%s' in a scalar context", ptr->vname); *************** *** 1565,1571 **** n = stack_ptr[n->param_cnt]; if ((n->flags & SCALAR) != 0) fatal("attempt to use scalar parameter %d as an array", i); ! } else if (n->type == Node_func) { fatal("attempt to use function `%s' as array", n->lnode->param); } --- 1587,1598 ---- n = stack_ptr[n->param_cnt]; if ((n->flags & SCALAR) != 0) fatal("attempt to use scalar parameter %d as an array", i); ! } ! if (n->type == Node_array_ref) { ! n = n->orig_array; ! assert(n->type == Node_var_array || n->type == Node_var); ! } ! if (n->type == Node_func) { fatal("attempt to use function `%s' as array", n->lnode->param); } diff -cNr gawk-3.0.4/field.c gawk-3.0.5/field.c *** gawk-3.0.4/field.c Wed Jun 30 16:07:32 1999 --- gawk-3.0.5/field.c Wed Jun 14 13:00:10 2000 *************** *** 3,9 **** */ /* ! * Copyright (C) 1986, 1988, 1989, 1991-1999 the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the * AWK Programming Language. --- 3,9 ---- */ /* ! * Copyright (C) 1986, 1988, 1989, 1991-2000 the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the * AWK Programming Language. *************** *** 219,224 **** --- 219,229 ---- * set_record: * setup $0, but defer parsing rest of line until reference is made to $(>0) * or to NF. At that point, parse only as much as necessary. + * + * Manage a private buffer for the contents of $0. Doing so keeps us safe + * if `getline var' decides to rearrange the contents of the IOBUF that + * $0 might have been pointing into. The cost is the copying of the buffer; + * but better correct than fast. */ void set_record(buf, cnt, freeold) *************** *** 228,233 **** --- 233,242 ---- { register int i; NODE *n; + static char *databuf; + static unsigned long databuf_size; + #define INITIAL_SIZE 512 + #define MAX_SIZE ((unsigned long) ~0) /* maximally portable ... */ NF = -1; for (i = 1; i <= parse_high_water; i++) { *************** *** 248,256 **** save_FS = dupnode(FS_node->var_value); } if (freeold) { unref(fields_arr[0]); getnode(n); ! n->stptr = buf; n->stlen = cnt; n->stref = 1; n->type = Node_val; --- 257,280 ---- save_FS = dupnode(FS_node->var_value); } if (freeold) { + /* buffer management: */ + if (databuf_size == 0) { /* first time */ + emalloc(databuf, char *, INITIAL_SIZE, "set_record"); + databuf_size = INITIAL_SIZE; + } + /* make sure there's enough room */ + if (cnt > databuf_size) { + while (cnt > databuf_size && databuf_size <= MAX_SIZE) + databuf_size *= 2; + erealloc(databuf, char *, databuf_size, "set_record"); + } + /* copy the data */ + memcpy(databuf, buf, cnt); + + /* manage field 0: */ unref(fields_arr[0]); getnode(n); ! n->stptr = databuf; n->stlen = cnt; n->stref = 1; n->type = Node_val; *************** *** 260,265 **** --- 284,292 ---- } fields_arr[0]->flags |= MAYBE_NUM; field0_valid = TRUE; + + #undef INITIAL_SIZE + #undef MAX_SIZE } /* reset_record --- start over again with current $0 */ *************** *** 759,764 **** --- 786,793 ---- if (arr->type == Node_param_list) arr = stack_ptr[arr->param_cnt]; + if (arr->type == Node_array_ref) + arr = arr->orig_array; if (arr->type != Node_var && arr->type != Node_var_array) fatal("second argument of split is not an array"); arr->type = Node_var_array; diff -cNr gawk-3.0.4/gawkmisc.c gawk-3.0.5/gawkmisc.c *** gawk-3.0.4/gawkmisc.c Wed Apr 28 17:11:16 1999 --- gawk-3.0.5/gawkmisc.c Wed Jun 7 11:45:44 2000 *************** *** 3,9 **** */ /* ! * Copyright (C) 1986, 1988, 1989, 1991-1999 the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the * AWK Programming Language. --- 3,9 ---- */ /* ! * Copyright (C) 1986, 1988, 1989, 1991-2000 the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the * AWK Programming Language. diff -cNr gawk-3.0.4/io.c gawk-3.0.5/io.c *** gawk-3.0.4/io.c Wed Jun 30 16:08:17 1999 --- gawk-3.0.5/io.c Wed Jun 7 11:45:47 2000 *************** *** 3,9 **** */ /* ! * Copyright (C) 1976, 1988, 1989, 1991-1999 the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the * AWK Programming Language. --- 3,9 ---- */ /* ! * Copyright (C) 1976, 1988, 1989, 1991-2000 the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the * AWK Programming Language. *************** *** 477,482 **** --- 477,491 ---- } if (rp->fp != NULL && isatty(fd)) rp->flag |= RED_NOBUF; + /* Move rp to the head of the list. */ + if (red_head != rp) { + if ((rp->prev->next = rp->next) != NULL) + rp->next->prev = rp->prev; + red_head->prev = rp; + rp->prev = NULL; + rp->next = red_head; + red_head = rp; + } } } if (rp->fp == NULL && rp->iop == NULL) { *************** *** 626,635 **** what = ((rp->flag & RED_PIPE) != 0) ? "pipe" : "file"; - if (exitwarn) - warning("no explicit close of %s `%s' provided", - what, rp->value); - /* SVR4 awk checks and warns about status of close */ if (status != 0) { char *s = strerror(errno); --- 635,640 ---- *************** *** 648,653 **** --- 653,663 ---- ERRNO_node->var_value = make_string(s, strlen(s)); } } + + if (exitwarn) + warning("no explicit close of %s `%s' provided", + what, rp->value); + if (rp->next != NULL) rp->next->prev = rp->prev; if (rp->prev != NULL) *************** *** 1951,1958 **** } if (RS->stlen == 0) RS_is_null = TRUE; ! else if (RS->stlen > 1) RS_regexp = make_regexp(RS->stptr, RS->stlen, IGNORECASE, TRUE); set_FS_if_not_FIELDWIDTHS(); } --- 1961,1976 ---- } if (RS->stlen == 0) RS_is_null = TRUE; ! else if (RS->stlen > 1) { ! static int warned = FALSE; ! RS_regexp = make_regexp(RS->stptr, RS->stlen, IGNORECASE, TRUE); + + if (do_lint && ! warned) { + warning("multicharacter value of `RS' is not portable"); + warned = TRUE; + } + } set_FS_if_not_FIELDWIDTHS(); } diff -cNr gawk-3.0.4/main.c gawk-3.0.5/main.c *** gawk-3.0.4/main.c Mon May 3 13:24:45 1999 --- gawk-3.0.5/main.c Wed Jun 7 12:44:09 2000 *************** *** 3,9 **** */ /* ! * Copyright (C) 1986, 1988, 1989, 1991-1999 the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the * AWK Programming Language. --- 3,9 ---- */ /* ! * Copyright (C) 1986, 1988, 1989, 1991-2000 the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the * AWK Programming Language. *************** *** 175,184 **** /* Set up the special variables */ /* * Note that this must be done BEFORE arg parsing else -F ! * breaks horribly */ init_vars(); /* worst case */ emalloc(srcfiles, struct src *, argc * sizeof(struct src), "main"); memset(srcfiles, '\0', argc * sizeof(struct src)); --- 175,191 ---- /* Set up the special variables */ /* * Note that this must be done BEFORE arg parsing else -F ! * breaks horribly. */ init_vars(); + /* Set up the field variables */ + /* + * Do this before arg parsing so that `-v NF=blah' won't + * break anything. + */ + init_fields(); + /* worst case */ emalloc(srcfiles, struct src *, argc * sizeof(struct src), "main"); memset(srcfiles, '\0', argc * sizeof(struct src)); *************** *** 377,385 **** (void) alloca(0); #endif - /* Set up the field variables */ - init_fields(); - if (do_lint && begin_block == NULL && expression_value == NULL && end_block == NULL) warning("no program"); --- 384,389 ---- *************** *** 439,446 **** fputs("\t-W traditional\t\t--traditional\n", fp); fputs("\t-W usage\t\t--usage\n", fp); fputs("\t-W version\t\t--version\n", fp); ! fputs("\nReport bugs to bug-gnu-utils@gnu.org,\n", fp); ! fputs("with a Cc: to arnold@gnu.org\n", fp); exit(exitval); } --- 443,451 ---- fputs("\t-W traditional\t\t--traditional\n", fp); fputs("\t-W usage\t\t--usage\n", fp); fputs("\t-W version\t\t--version\n", fp); ! fputs("\nTo report bugs, see node `Bugs' in `gawk.info', which\n", fp); ! fputs("is section `Reporting Problems and Bugs' in the\n", fp); ! fputs("printed version.\n", fp); exit(exitval); } *************** *** 450,456 **** copyleft() { static char blurb_part1[] = ! "Copyright (C) 1989, 1991-1999 Free Software Foundation.\n\ \n\ This program is free software; you can redistribute it and/or modify\n\ it under the terms of the GNU General Public License as published by\n\ --- 455,461 ---- copyleft() { static char blurb_part1[] = ! "Copyright (C) 1989, 1991-2000 Free Software Foundation.\n\ \n\ This program is free software; you can redistribute it and/or modify\n\ it under the terms of the GNU General Public License as published by\n\ *************** *** 652,659 **** badvar = TRUE; break; } ! if (badvar) ! fatal("illegal name `%s' in variable assignment", arg); /* * Recent versions of nawk expand escapes inside assignments. --- 657,669 ---- badvar = TRUE; break; } ! ! if (badvar) { ! if (do_lint) ! warning("illegal name `%s' in variable assignment", arg); ! *--cp = '='; /* restore original text of ARGV */ ! return NULL; ! } /* * Recent versions of nawk expand escapes inside assignments. diff -cNr gawk-3.0.4/missing/strftime.3 gawk-3.0.5/missing/strftime.3 *** gawk-3.0.4/missing/strftime.3 Sun Oct 25 22:55:30 1998 --- gawk-3.0.5/missing/strftime.3 Fri Oct 22 15:39:20 1999 *************** *** 197,202 **** --- 197,244 ---- is replaced by the hour (12-hour clock) as a decimal number .RB ( 1 - 12 ). Single digit numbers are padded with a blank. + .PP + If + .B HPUX_EXT + is defined when the routine is compiled, then the following additional + conversions will be available. + These are borrowed from the HP-UX version of + .IR date . + .TP + .B %E + The combined ``Emporer/Era'' name and year + (same as + .B %Y ). + This is only available if + .B POSIX2_DATE + is + .I not + defined. + .TP + .B %F + Same as + .BR %B . + (Marked as obsolescent in the HP-UX documentation.) + .TP + .B %N + The ``Emporer/Era'' name. + Typically, this is equivalent to the century + (same as + .B %C ). + .TP + .B %o + The ``Emporer/Era'' year. + Typically, this is equivalent to the year + (same as + .B %y ). + .TP + .B %z + The timezone name or abbreviation. + This is only available if + .B MAILHEADER_EXT + is + .I not + defined. .SH POSIX 1003.2 EXTENSIONS If .B POSIX2_DATE *************** *** 340,346 **** .nf Arnold Robbins .sp ! INTERNET: arnold@gnu.org .fi .SH ACKNOWLEDGEMENTS Thanks to Geoff Clare for helping debug earlier --- 382,388 ---- .nf Arnold Robbins .sp ! INTERNET: arnold@skeeve.com .fi .SH ACKNOWLEDGEMENTS Thanks to Geoff Clare for helping debug earlier diff -cNr gawk-3.0.4/missing/strftime.c gawk-3.0.5/missing/strftime.c *** gawk-3.0.4/missing/strftime.c Sun Oct 25 23:00:45 1998 --- gawk-3.0.5/missing/strftime.c Fri Oct 22 15:43:29 1999 *************** *** 10,16 **** * For extensions from SunOS, add SUNOS_EXT. * For stuff needed to implement the P1003.2 date command, add POSIX2_DATE. * For VMS dates, add VMS_EXT. ! * For a an RFC822 time format, add MAILHEADER_EXT. * For ISO week years, add ISO_DATE_EXT. * For complete POSIX semantics, add POSIX_SEMANTICS. * --- 10,16 ---- * For extensions from SunOS, add SUNOS_EXT. * For stuff needed to implement the P1003.2 date command, add POSIX2_DATE. * For VMS dates, add VMS_EXT. ! * For an RFC822 time format, add MAILHEADER_EXT. * For ISO week years, add ISO_DATE_EXT. * For complete POSIX semantics, add POSIX_SEMANTICS. * *************** *** 33,38 **** --- 33,39 ---- * Updated September, 1995 * Updated January, 1996 * Updated July, 1997 + * Updated October, 1999 * * Fixes from ado@elsie.nci.nih.gov * February 1991, May 1992 *************** *** 66,71 **** --- 67,73 ---- #define VMS_EXT 1 /* include %v for VMS date format */ #define MAILHEADER_EXT 1 /* add %z for HHMM format */ #define ISO_DATE_EXT 1 /* %G and %g for year of ISO week */ + #define HPUX_EXT 1 /* stuff in HP-UX date command */ #ifndef GAWK #define POSIX_SEMANTICS 1 /* call tzset() if TZ changes */ #endif *************** *** 126,132 **** extern char *tzname[2]; extern int daylight; #if defined(SOLARIS) || defined(mips) ! extern long timezone, altzone; #else extern int timezone, altzone; #endif --- 128,134 ---- extern char *tzname[2]; extern int daylight; #if defined(SOLARIS) || defined(mips) ! extern long int timezone, altzone; #else extern int timezone, altzone; #endif *************** *** 301,306 **** --- 303,311 ---- strcpy(tbuf, months_a[timeptr->tm_mon]); break; + #ifdef HPUX_EXT + case 'F': + #endif case 'B': /* full month name */ if (timeptr->tm_mon < 0 || timeptr->tm_mon > 11) strcpy(tbuf, "?"); *************** *** 345,350 **** --- 350,370 ---- sprintf(tbuf, "%02d", i); break; + #ifdef HPUX_EXT + case 'N': /* Emperor/Era name */ + /* this is essentially the same as the century */ + goto century; /* %C */ + + case 'o': /* Emperor/Era year */ + goto year; /* %y */ + + #ifndef POSIX2_DATE + case 'E': /* Combined Emporer/Era name and year */ + goto fullyear; /* %Y */ + + #endif /* POSIX2_DATE */ + #endif /* HPUX_EXT */ + case 'p': /* am or pm based on 12-hour clock */ i = range(0, timeptr->tm_hour, 23); if (i < 12) *************** *** 380,390 **** --- 400,412 ---- break; case 'y': /* year without a century, 00 - 99 */ + year: i = timeptr->tm_year % 100; sprintf(tbuf, "%02d", i); break; case 'Y': /* year with century */ + fullyear: sprintf(tbuf, "%d", 1900 + timeptr->tm_year); break; *************** *** 440,445 **** --- 462,470 ---- break; #endif /* MAILHEADER_EXT */ + #if defined(HPUX_EXT) && ! defined(MAILHEADER_EXT) + case 'z': + #endif case 'Z': /* time zone name or abbrevation */ #ifdef HAVE_TZNAME i = (daylight && timeptr->tm_isdst > 0); /* 0 or 1 */ *************** *** 522,527 **** --- 547,553 ---- #ifdef POSIX2_DATE case 'C': + century: sprintf(tbuf, "%02d", (timeptr->tm_year + 1900) / 100); break; *************** *** 826,834 **** --- 852,862 ---- "(%%C) Century %C", "(%%D) date (%%m/%%d/%%y) %D", "(%%E) Locale extensions (ignored) %E", + "(%%F) full month name, var length (January..December) %F", "(%%H) hour (24-hour clock, 00..23) %H", "(%%I) hour (12-hour clock, 01..12) %I", "(%%M) minute (00..59) %M", + "(%%N) Emporer/Era Name %N", "(%%O) Locale extensions (ignored) %O", "(%%R) time, 24-hour (%%H:%%M) %R", "(%%S) second (00..60) %S", *************** *** 849,854 **** --- 877,883 ---- "(%%k) hour, 24-hour clock, blank pad ( 0..23) %k", "(%%l) hour, 12-hour clock, blank pad ( 0..12) %l", "(%%m) month (01..12) %m", + "(%%o) Emporer/Era Year %o", "(%%p) locale's AM or PM based on 12-hour clock %p", "(%%r) time, 12-hour (same as %%I:%%M:%%S %%p) %r", "(%%u) ISO 8601: Weekday as decimal number [1 (Monday) - 7] %u", diff -cNr gawk-3.0.4/msg.c gawk-3.0.5/msg.c *** gawk-3.0.4/msg.c Wed Apr 28 17:11:35 1999 --- gawk-3.0.5/msg.c Wed Jun 7 11:45:53 2000 *************** *** 3,9 **** */ /* ! * Copyright (C) 1986, 1988, 1989, 1991-1999 the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the * AWK Programming Language. --- 3,9 ---- */ /* ! * Copyright (C) 1986, 1988, 1989, 1991-2000 the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the * AWK Programming Language. diff -cNr gawk-3.0.4/node.c gawk-3.0.5/node.c *** gawk-3.0.4/node.c Wed Apr 28 17:11:38 1999 --- gawk-3.0.5/node.c Wed Jun 7 11:45:55 2000 *************** *** 3,9 **** */ /* ! * Copyright (C) 1986, 1988, 1989, 1991-1999 the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the * AWK Programming Language. --- 3,9 ---- */ /* ! * Copyright (C) 1986, 1988, 1989, 1991-2000 the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the * AWK Programming Language. *************** *** 203,210 **** --- 203,212 ---- cant_happen(); if (s->type != Node_val) cant_happen(); + /* if ((s->flags & NUM) == 0) cant_happen(); + */ if (s->stref <= 0) cant_happen(); if ((s->flags & STR) != 0 *************** *** 239,245 **** } getnode(r); *r = *n; ! r->flags &= ~(PERM|TEMP); r->flags |= MALLOC; if (n->type == Node_val && (n->flags & STR) != 0) { r->stref = 1; --- 241,247 ---- } getnode(r); *r = *n; ! r->flags &= ~(PERM|TEMP|FIELD); r->flags |= MALLOC; if (n->type == Node_val && (n->flags & STR) != 0) { r->stref = 1; *************** *** 511,516 **** --- 513,530 ---- } return i; default: + if (do_lint) { + static short warned[256]; + unsigned char uc = (unsigned char) c; + + /* N.B.: use unsigned char here to avoid Latin-1 problems */ + + if (! warned[uc]) { + warned[uc] = TRUE; + + warning("escape sequence `\\%c' treated as plain `%c'", uc, uc); + } + } return c; } } diff -cNr gawk-3.0.4/patchlevel.h gawk-3.0.5/patchlevel.h *** gawk-3.0.4/patchlevel.h Sun Jun 27 12:28:04 1999 --- gawk-3.0.5/patchlevel.h Tue Jun 20 18:17:18 2000 *************** *** 1 **** ! #define PATCHLEVEL 4 --- 1 ---- ! #define PATCHLEVEL 5 diff -cNr gawk-3.0.4/pc/ChangeLog gawk-3.0.5/pc/ChangeLog *** gawk-3.0.4/pc/ChangeLog Wed Jun 30 16:15:12 1999 --- gawk-3.0.5/pc/ChangeLog Sun Jun 25 15:09:13 2000 *************** *** 1,3 **** --- 1,16 ---- + Sun Jun 25 15:08:19 2000 Arnold D. Robbins + + * Release 3.0.5: Release tar file made. + + Wed Jun 21 16:44:54 2000 Scott Deifik + + * Makefile, Makefile.tst: synchronized with main dist, again. + + Thu May 18 14:07:52 2000 Scott Deifik + + * Makefile, Makefile.tst: synchronized with main dist. + * config.h: Define HAVE_LIMITS_H as 1. + Wed Jun 30 16:14:36 1999 Arnold D. Robbins * Release 3.0.4: Release tar file made. This time for sure. diff -cNr gawk-3.0.4/pc/Makefile gawk-3.0.5/pc/Makefile *** gawk-3.0.4/pc/Makefile Thu Jun 24 06:04:49 1999 --- gawk-3.0.5/pc/Makefile Thu May 18 14:07:02 2000 *************** *** 97,109 **** djgpp: $(MAK) all \ ! CC=gcc O=.o CF=-O \ LNK=LDJG LF=-s LF2=-lm \ BIND=BDJG djgpp-debug: $(MAK) all \ ! CC=gcc O=.o CF=-g \ LNK=LDJG LF2=-lm \ BIND=BDJG --- 97,109 ---- djgpp: $(MAK) all \ ! CC=gcc O=.o CF=-O2 \ LNK=LDJG LF=-s LF2=-lm \ BIND=BDJG djgpp-debug: $(MAK) all \ ! CC=gcc O=.o CF='-O2 -g' \ LNK=LDJG LF2=-lm \ BIND=BDJG *************** *** 192,198 **** MSCCL = -FPi #MSCCL = -FPc ! LMSC = link $(LF) $(LNKRSP) $(STDARGV)/NOE,$@,,/NOD:llibce $(MSCLIB)$(LF2)/STACK:0x5270,nul # CLMSC-linking works when building under OS/2 CLMSC = $(CC) -o $@ $(LF) $(GAWKOBJS) $(STDARGV) $(LF2) -link /NOE/NOI/STACK:0x6f00 --- 192,198 ---- MSCCL = -FPi #MSCCL = -FPc ! LMSC = link $(LF) $(LNKRSP) $(STDARGV)/NOE,$@,,/NOD:llibce $(MSCLIB)$(LF2)/STACK:0x4990,nul # CLMSC-linking works when building under OS/2 CLMSC = $(CC) -o $@ $(LF) $(GAWKOBJS) $(STDARGV) $(LF2) -link /NOE/NOI/STACK:0x6f00 diff -cNr gawk-3.0.4/pc/Makefile.tst gawk-3.0.5/pc/Makefile.tst *** gawk-3.0.4/pc/Makefile.tst Sat Jun 26 23:36:29 1999 --- gawk-3.0.5/pc/Makefile.tst Wed Jun 21 16:44:08 2000 *************** *** 1,637 **** ! # Makefile for GNU Awk test suite. ! # ! # Copyright (C) 1988-1999 the Free Software Foundation, Inc. ! # ! # This file is part of GAWK, the GNU implementation of the ! # AWK Programming Language. ! # ! # GAWK is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. ! # ! # GAWK is distributed in the hope that it will be useful, ! # but WITHOUT ANY WARRANTY; without even the implied warranty of ! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! # GNU General Public License for more details. ! # ! # You should have received a copy of the GNU General Public License ! # along with this program; if not, write to the Free Software ! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA ! ! # ============================================================================ ! # MS-DOS & OS/2 Notes: READ THEM! ! # ============================================================================ ! ! # As of version 2.91, efforts to make this makefile run in MS-DOS and OS/2 ! # have started in earnest. The following steps need to be followed in order ! # to run this makefile: ! # ! # 1. The first thing that you will need to do is to convert all of the ! # files ending in ".ok" in the test directory, all of the files ending ! # in ".good" (or ".goo") in the test/reg directory, and mmap8k.in from ! # having a linefeed to having carriage return/linefeed at the end of each ! # line. There are various public domain UNIX to DOS converters and any ! # should work. Alternatively, you can use diff instead of cmp--most ! # versions of diff don't care about how the lines end. ! # ! # 2. You will need an sh-compatible shell. Please refer to the "README.pc" ! # file in the README_d directory for information about obtaining a copy. ! # You will also need various UNIX utilities. At a minimum, you will ! # need: rm, tr, cmp (or diff, see above), cat, wc, and sh. ! # You should also have a UNIX-compatible date program. ! # ! # 3. You will need a \tmp directory on the same drive as the test directory ! # for the poundba (called poundbang in the UNIX makefile) test. ! # ! # The makefile has only been tested with dmake 3.8 and DJGPP Make 3.74 or ! # later. After making all of these changes, typing "dmake bigtest extra" ! # or "make bigtest extra" (with DJGPP Make) should run successfully. ! ! # So far, most of the testing has been with Stewartson's sh 2.3 under ! # MS-DOS & OS/2. That version of sh will sometimes send long ! # command-line arguments to programs using the @ notation. You may need ! # to disable this feature of sh for programs that you have which don't support ! # that feature. The DJGPP response file facility is incompatible with the ! # one used by Stewartson's sh, so you will certainly need to disable it if you ! # use DJGPP tools to run the tests. For more information about the @ notation ! # please refer to the sh documentation. ! # ! # A beta of the Bash shell (compiled with djgpp) was tested for gawk-3.0.1, ! # and worked very well with the djgpp-compiled gawk. See README.pc for ! # more information on OS/2 and DOS shells. ! ! # You will almost certainly need to change some of the values (MACROS) ! # defined on the next few lines. ! ! # .USESHELL is used by dmake. ! .USESHELL = yes ! ! # Using EMXSHELL=/bin/sh with emx versions can exhaust lower mem. ! # Lower mem can also be exhausted on some of the tests even with MSC gawk. ! # The .SWAP setting forces (DOS-only) dmake to swap itself out. ! .SWAP: childin fflush getlnhd tweakfld pipeio1 pipeio2 ! ! # This won't work unless you have "sh" and set SHELL equal to it (Make 3.74 ! # or later which comes with DJGPP will work with SHELL=/bin/sh if you have ! # sh.exe anywhere on your PATH). ! #SHELL = e:\bin\sh.exe ! SHELL = /bin/sh ! ! # Point to gawk ! AWK = ../gawk.exe ! ! # Set your cmp command here (you can use most versions of diff instead of cmp ! # if you don't want to convert the .ok files to the DOS CR/LF format). ! # ! # The following comment is for users of OSs which support long file names ! # (such as Windows 95) for all versions of gawk (both 16 & 32-bit). ! # If you use a shell which doesn't support long filenames, temporary files ! # created by this makefile will be truncated by your shell. "_argarra" is an ! # example of this. If $(CMP) is a DJGPP-compiled program, then it will fail ! # because it looks for the long filename (eg. _argarray). To fix this, you ! # need to set LFN=n in your shell's environment. ! # NOTE: Setting LFN in the makefile most probably won't help you because LFN ! # needs to be an environment variable. ! #CMP = cmp ! # See the comment above for why you might want to set CMP to "env LFN=n diff" ! CMP = env LFN=n diff ! CMP = diff ! #CMP = diff -c ! #CMP = gcmp ! ! # Set your "cp" and "mkdir" commands here. Note: cp must take forward ! # slashes. Using "command -c" may work for MS-DOS with Stewartson's shell ! # (but not bash) if "command=noexpand switch export" is set in extend.lst. ! # `true &&' is needed to force DJGPP Make to call the shell, or else the ! # conversion of `command -c' won't work. ! CP = cp ! #CP = true && command -c copy ! ! MKDIR = mkdir ! #MKDIR = true && command -c mkdir ! ! # Set your unix-style date function here ! DATE = gdate ! #DATE = date ! ! # ============================================================================ ! # You shouldn't need to modify anything below this line. ! # ============================================================================ ! ! srcdir = . ! ! bigtest: basic unix-tests gawk.extensions ! ! basic: msg swaplns messages argarray longwrds \ ! getline fstabplus compare arrayref rs fsrs rand \ ! fsbs negexp asgext anchgsub splitargv awkpath nfset reparse \ ! convfmt arrayparm paramdup nonl defref nofmtch litoct resplit \ ! rswhite prmarscl sclforin sclifin intprec childin noeffect \ ! numsubstr pcntplus prmreuse math fldchg fldchgnf reindops \ ! sprintfc backgsub tweakfld clsflnam mmap8k fnarray \ ! dynlj substr eofsplit prt1eval gsubasgn prtoeval gsubtest splitwht \ ! back89 tradanch nlfldsep splitvar intest nfldstr nors fnarydel \ ! noparms funstack delarprm prdupval nasty zeroflag \ ! getnr2tm getnr2tb ! ! # clobber removed ! ! unix-tests: poundba fflush getlnhd pipeio1 pipeio2 strftlng pid ! ! gawk.extensions: fieldwdth ignrcase posix manyfiles igncfs argtest \ ! badargs strftime gensub gnureops reint ! # add this back for 3.1 ! # nondec ! ! extra: regtes inftest ! ! poundba:: ! # The need for "basename" has been removed for MS-DOS & OS/2 systems which ! # lack it. ! # @cp $(AWK) /tmp/gawk && $(srcdir)/poundbang $(srcdir)/poundbang >_`basename $@` ! $(CP) $(AWK) /tmp/gawk.exe && $(srcdir)/poundbang $(srcdir)/poundbang >_$@ ! # @rm -f /tmp/gawk ! rm -f /tmp/gawk.exe ! # $(CMP) $(srcdir)/poundbang.ok _`basename $@` && rm -f _`basename $@` ! $(CMP) $(srcdir)/poundbang.ok _$@ && rm -f _$@ ! ! msg:: ! @echo 'Any output from "cmp" is bad news, although some differences' ! @echo 'in floating point values are probably benign -- in particular,' ! @echo 'some systems may omit a leading zero and the floating point' ! @echo 'precision may lead to slightly different output in a few cases.' ! ! swaplns:: ! @echo 'If swaplns fails make sure that all of the .ok files have CR/LFs.' ! @$(AWK) -f $(srcdir)/swaplns.awk $(srcdir)/swaplns.in >_$@ ! $(CMP) $(srcdir)/swaplns.ok _$@ && rm -f _$@ ! ! messages:: ! @echo 'If messages fails, set sh to swap to disk only (in sh.rc).' ! @$(AWK) -f $(srcdir)/messages.awk >out2 2>out3 ! # { $(CMP) $(srcdir)/out1.ok out1 && $(CMP) $(srcdir)/out2.ok out2 && \ ! # $(CMP) $(srcdir)/out3.ok out3 && rm -f out1 out2 out3; } || \ ! # { { test -d /dev/fd || test -d /proc/self/fd; } && \ ! # echo IT IS OK THAT THIS TEST FAILED; } ! { $(CMP) $(srcdir)/out1.ok out1 && $(CMP) $(srcdir)/out2.ok out2 && \ ! $(CMP) $(srcdir)/out3.ok out3; } || test -d /dev/fd ! rm -f out1 out2 out3 ! ! argarray:: ! @case $(srcdir) in \ ! .) : ;; \ ! *) cp $(srcdir)/argarray.in . ;; \ ! esac ! @TEST=test echo just a test | $(AWK) -f $(srcdir)/argarray.awk ./argarray.in - >_$@ ! @echo 'If argarray fails, set try setting LFN=n in your environment' ! @echo "before running make. If that still doesn't work, read the" ! @echo 'the comment in this makefile about setting CMP for information' ! @echo 'about what may be happenning.' ! $(CMP) $(srcdir)/argarray.ok _$@ && rm -f _$@ ! ! fstabplus:: ! @echo '1 2' | $(AWK) -f $(srcdir)/fstabplus.awk >_$@ ! $(CMP) $(srcdir)/fstabplus.ok _$@ && rm -f _$@ ! ! fsrs:: ! @$(AWK) -f $(srcdir)/fsrs.awk $(srcdir)/fsrs.in >_$@ ! $(CMP) $(srcdir)/fsrs.ok _$@ && rm -f _$@ ! ! igncfs:: ! @$(AWK) -f $(srcdir)/igncfs.awk $(srcdir)/igncfs.in >_$@ ! $(CMP) $(srcdir)/igncfs.ok _$@ && rm -f _$@ ! ! longwrds:: ! @$(AWK) -f $(srcdir)/longwrds.awk $(srcdir)/manpage | sort >_$@ ! $(CMP) $(srcdir)/longwrds.ok _$@ && rm -f _$@ ! ! fieldwdth:: ! @echo '123456789' | $(AWK) -v FIELDWIDTHS="2 3 4" '{ print $$2}' >_$@ ! $(CMP) $(srcdir)/fieldwdth.ok _$@ && rm -f _$@ ! ! ignrcase:: ! @echo xYz | $(AWK) -v IGNORECASE=1 '{ sub(/y/, ""); print}' >_$@ ! $(CMP) $(srcdir)/ignrcase.ok _$@ && rm -f _$@ ! ! regtes:: ! @echo 'Some of the output from regtest is very system specific, do not' ! @echo 'be distressed if your output differs from that distributed.' ! @echo 'Manual inspection is called for.' ! AWK=`pwd`/$(AWK) CMP="$(CMP)" $(srcdir)/regtest ! ! posix:: ! @echo 'posix test may fail due to 1.500000e+000 not being equal to' ! @echo '1.500000e+00 for MSC gawk.' ! @echo '1:2,3 4' | $(AWK) -f $(srcdir)/posix.awk >_$@ ! # $(CMP) $(srcdir)/posix.ok _$@ && rm -f _$@ ! -$(CMP) $(srcdir)/posix.ok _$@ && rm -f _$@ ! ! manyfiles:: ! @rm -rf junk ! # @mkdir junk ! @$(MKDIR) junk ! @$(AWK) 'BEGIN { for (i = 1; i <= 300; i++) print i, i}' >_$@ ! @$(AWK) -f $(srcdir)/manyfiles.awk _$@ _$@ ! @echo 'If manyfiles says "junk/*: No such file or directory",' ! @echo 'use the line on test/Makefile which invokes wc' ! @echo 'without quoting the "junk/*" argument.' ! # @echo "This number better be 1 ->" | tr -d '\012' ! @echo "This number better be 1 ->" | tr -d '\012\015' ! @wc -l junk/* | $(AWK) '$$1 != 2' | wc -l ! # @wc -l "junk/*" | $(AWK) '$$1 != 2' | wc -l ! # The quotes above are for people with a "wc" that doesn't support sh's "@" ! # argument passing. ! @rm -rf junk _$@ ! ! compare:: ! @$(AWK) -f $(srcdir)/compare.awk 0 1 $(srcdir)/compare.in >_$@ ! $(CMP) $(srcdir)/compare.ok _$@ && rm -f _$@ ! ! arrayref:: ! @$(AWK) -f $(srcdir)/arrayref.awk >_$@ ! $(CMP) $(srcdir)/arrayref.ok _$@ && rm -f _$@ ! ! rs:: ! @$(AWK) -v RS="" '{ print $$1, $$2}' $(srcdir)/rs.in >_$@ ! $(CMP) $(srcdir)/rs.ok _$@ && rm -f _$@ ! ! fsbs:: ! @$(AWK) -v FS='\' '{ print $$1, $$2 }' $(srcdir)/fsbs.in >_$@ ! $(CMP) $(srcdir)/fsbs.ok _$@ && rm -f _$@ ! ! inftest:: ! @echo This test is very machine specific... ! @echo 'MSC 7.0 gawk generates a floating point exception.' ! @echo 'EMX gawk uses #INF rather than Inf.' ! # @$(AWK) -f $(srcdir)/inftest.awk >_$@ ! @-$(AWK) -f $(srcdir)/inftest.awk >_$@ ! # $(CMP) $(srcdir)/inftest.ok _$@ && rm -f _$@ ! -$(CMP) $(srcdir)/inftest.ok _$@ && rm -f _$@ ! ! getline:: ! @$(AWK) -f $(srcdir)/getline.awk $(srcdir)/getline.awk $(srcdir)/getline.awk >_$@ ! $(CMP) $(srcdir)/getline.ok _$@ && rm -f _$@ ! ! rand:: ! @$(AWK) -f $(srcdir)/rand.awk >_$@ ! $(CMP) $(srcdir)/rand.ok _$@ && rm -f _$@ ! ! negexp:: ! @$(AWK) 'BEGIN { a = -2; print 10^a }' >_$@ ! $(CMP) $(srcdir)/negexp.ok _$@ && rm -f _$@ ! ! asgext:: ! @$(AWK) -f $(srcdir)/asgext.awk $(srcdir)/asgext.in >_$@ ! $(CMP) $(srcdir)/asgext.ok _$@ && rm -f _$@ ! ! anchgsub:: ! @$(AWK) -f $(srcdir)/anchgsub.awk $(srcdir)/anchgsub.in >_$@ ! $(CMP) $(srcdir)/anchgsub.ok _$@ && rm -f _$@ ! ! splitargv:: ! @$(AWK) -f $(srcdir)/splitargv.awk $(srcdir)/splitargv.in >_$@ ! $(CMP) $(srcdir)/splitargv.ok _$@ && rm -f _$@ ! ! awkpath:: ! # MS-DOS and OS/2 use ; as a PATH delimiter ! # @AWKPATH="$(srcdir):$(srcdir)/lib" $(AWK) -f awkpath.awk >_$@ ! @AWKPATH="$(srcdir);$(srcdir)/lib" $(AWK) -f awkpath.awk >_$@ ! $(CMP) $(srcdir)/awkpath.ok _$@ && rm -f _$@ ! ! nfset:: ! @$(AWK) -f $(srcdir)/nfset.awk $(srcdir)/nfset.in >_$@ ! $(CMP) $(srcdir)/nfset.ok _$@ && rm -f _$@ ! ! reparse:: ! @$(AWK) -f $(srcdir)/reparse.awk $(srcdir)/reparse.in >_$@ ! $(CMP) $(srcdir)/reparse.ok _$@ && rm -f _$@ ! ! argtest:: ! @$(AWK) -f $(srcdir)/argtest.awk -x -y abc >_$@ ! $(CMP) $(srcdir)/argtest.ok _$@ && rm -f _$@ ! ! badargs:: ! # For MS-DOS & OS/2, we use " rather than ' in the usage statement. ! @-$(AWK) -f 2>&1 | grep -v patchlevel >_$@ ! # Next line converts " to ' for $(CMP) to work with UNIX badargs.ok ! @cat _$@ | tr '\042' '\047' > _$@.2 ! # $(CMP) $(srcdir)/badargs.ok _$@ && rm -f _$@ ! $(CMP) $(srcdir)/badargs.ok _$@.2 && rm -f _$@ _$@.2 ! ! convfmt:: ! @$(AWK) -f $(srcdir)/convfmt.awk >_$@ ! $(CMP) $(srcdir)/convfmt.ok _$@ && rm -f _$@ ! ! arrayparm:: ! @-AWKPATH=$(srcdir) $(AWK) -f arrayparm.awk >_$@ 2>&1 || exit 0 ! $(CMP) $(srcdir)/arrayparm.ok _$@ && rm -f _$@ ! ! paramdup:: ! @-AWKPATH=$(srcdir) $(AWK) -f paramdup.awk >_$@ 2>&1 || exit 0 ! $(CMP) $(srcdir)/paramdup.ok _$@ && rm -f _$@ ! ! nonl:: ! # @-AWKPATH=$(srcdir) $(AWK) --lint -f nonl.awk /dev/null >_$@ 2>&1 ! @-AWKPATH=$(srcdir) $(AWK) --lint -f nonl.awk NUL >_$@ 2>&1 ! $(CMP) $(srcdir)/nonl.ok _$@ && rm -f _$@ ! ! defref:: ! @-AWKPATH=$(srcdir) $(AWK) --lint -f defref.awk >_$@ 2>&1 || exit 0 ! $(CMP) $(srcdir)/defref.ok _$@ && rm -f _$@ ! ! nofmtch:: ! @-AWKPATH=$(srcdir) $(AWK) --lint -f nofmtch.awk >_$@ 2>&1 ! $(CMP) $(srcdir)/nofmtch.ok _$@ && rm -f _$@ ! ! strftime:: ! : this test could fail on slow machines or on a second boundary, ! : so if it does, double check the actual results ! # @LC_ALL=C; export LC_ALL; LANG=C; export LANG; \ ! # date | $(AWK) '{ $$3 = sprintf("%02d", $$3 + 0) ; \ ! # This was changed for DOS to avoid the command-line length limit. ! @LC_ALL=C; export LC_ALL; LANG=C; export LANG; $(DATE) > strf ! @cat strf | $(AWK) '{ $$3 = sprintf("%02d", $$3 + 0) ; \ ! print > "strftime.ok" ; \ ! print strftime() > "'_$@'" }' ! # $(CMP) strftime.ok _$@ && rm -f _$@ strftime.ok || exit 0 ! $(CMP) strftime.ok _$@ && rm -f _$@ strf strftime.ok || exit 0 ! ! litoct:: ! @echo ab | $(AWK) --traditional -f $(srcdir)/litoct.awk >_$@ ! $(CMP) $(srcdir)/litoct.ok _$@ && rm -f _$@ ! ! gensub:: ! @$(AWK) -f $(srcdir)/gensub.awk $(srcdir)/gensub.in >_$@ ! $(CMP) $(srcdir)/gensub.ok _$@ && rm -f _$@ ! ! resplit:: ! @echo 'If resplit fails, check extend.lst and remove "unix" by the "gawk=" line' ! @echo a:b:c d:e:f | $(AWK) '{ FS = ":"; $$0 = $$0; print $$2 }' > _$@ ! $(CMP) $(srcdir)/resplit.ok _$@ && rm -f _$@ ! ! rswhite:: ! @$(AWK) -f $(srcdir)/rswhite.awk $(srcdir)/rswhite.in > _$@ ! $(CMP) $(srcdir)/rswhite.ok _$@ && rm -f _$@ ! ! prmarscl:: ! @-AWKPATH=$(srcdir) $(AWK) -f prmarscl.awk > _$@ 2>&1 || exit 0 ! $(CMP) $(srcdir)/prmarscl.ok _$@ && rm -f _$@ ! ! sclforin:: ! @-AWKPATH=$(srcdir) $(AWK) -f sclforin.awk > _$@ 2>&1 || exit 0 ! $(CMP) $(srcdir)/sclforin.ok _$@ && rm -f _$@ ! ! sclifin:: ! @-AWKPATH=$(srcdir) $(AWK) -f sclifin.awk > _$@ 2>&1 || exit 0 ! $(CMP) $(srcdir)/sclifin.ok _$@ && rm -f _$@ ! ! intprec:: ! @-$(AWK) -f $(srcdir)/intprec.awk > _$@ 2>&1 ! $(CMP) $(srcdir)/intprec.ok _$@ && rm -f _$@ ! ! childin:: ! @echo hi | $(AWK) 'BEGIN { "cat" | getline; print; close("cat") }' > _$@ ! $(CMP) $(srcdir)/childin.ok _$@ && rm -f _$@ ! ! noeffect:: ! @-AWKPATH=$(srcdir) $(AWK) --lint -f noeffect.awk > _$@ 2>&1 ! $(CMP) $(srcdir)/noeffect.ok _$@ && rm -f _$@ ! ! numsubstr:: ! @-AWKPATH=$(srcdir) $(AWK) -f numsubstr.awk $(srcdir)/numsubstr.in >_$@ ! $(CMP) $(srcdir)/numsubstr.ok _$@ && rm -f _$@ ! ! gnureops:: ! @$(AWK) -f $(srcdir)/gnureops.awk >_$@ ! $(CMP) $(srcdir)/gnureops.ok _$@ && rm -f _$@ ! ! pcntplus:: ! @$(AWK) -f $(srcdir)/pcntplus.awk >_$@ ! $(CMP) $(srcdir)/pcntplus.ok _$@ && rm -f _$@ ! ! prmreuse:: ! @$(AWK) -f $(srcdir)/prmreuse.awk >_$@ ! $(CMP) $(srcdir)/prmreuse.ok _$@ && rm -f _$@ ! ! math:: ! @$(AWK) -f $(srcdir)/math.awk >_$@ ! $(CMP) $(srcdir)/math.ok _$@ && rm -f _$@ ! ! fflush:: ! @$(srcdir)/fflush.sh >_$@ ! $(CMP) $(srcdir)/fflush.ok _$@ && rm -f _$@ ! ! fldchg:: ! @$(AWK) -f $(srcdir)/fldchg.awk $(srcdir)/fldchg.in >_$@ ! $(CMP) $(srcdir)/fldchg.ok _$@ && rm -f _$@ ! ! fldchgnf:: ! @$(AWK) -f $(srcdir)/fldchgnf.awk $(srcdir)/fldchgnf.in >_$@ ! $(CMP) $(srcdir)/fldchgnf.ok _$@ && rm -f _$@ ! ! reindops:: ! @$(AWK) -f $(srcdir)/reindops.awk $(srcdir)/reindops.in >_$@ ! $(CMP) $(srcdir)/reindops.ok _$@ && rm -f _$@ ! ! sprintfc:: ! @$(AWK) -f $(srcdir)/sprintfc.awk $(srcdir)/sprintfc.in >_$@ ! $(CMP) $(srcdir)/sprintfc.ok _$@ && rm -f _$@ ! ! getlnhd:: ! @echo 'Getlnhd is set to ignore errors. However, there should not be any.' ! @echo 'If getlnhd fails, set sh to swap to disk only (in sh.rc).' ! @echo 'If it still hangs with EMX gawk type ^C, then try the test when' ! @echo 'not using DPMI and RSX (in particular, run outside MS-Windows).' ! @echo 'If it fails with MSC, run make from the test directory.' ! # In 3.0.3, COMSPEC=$(SHELL) was used for MSC and MINGW32 which do ! # not honor SHELL. ! # COMSPEC=$(SHELL) $(AWK) -f $(srcdir)/getlnhd.awk >_$@ ! @$(AWK) -f $(srcdir)/getlnhd.awk >_$@ ! -$(CMP) $(srcdir)/getlnhd.ok _$@ && rm -f _$@ ! ! backgsub:: ! @$(AWK) -f $(srcdir)/backgsub.awk $(srcdir)/backgsub.in >_$@ ! $(CMP) $(srcdir)/backgsub.ok _$@ && rm -f _$@ ! ! tweakfld:: ! @$(AWK) -f $(srcdir)/tweakfld.awk $(srcdir)/tweakfld.in >_$@ ! @rm -f errors.cleanup ! $(CMP) $(srcdir)/tweakfld.ok _$@ && rm -f _$@ ! ! clsflnam:: ! @$(AWK) -f $(srcdir)/clsflnam.awk $(srcdir)/clsflnam.in >_$@ ! $(CMP) $(srcdir)/clsflnam.ok _$@ && rm -f _$@ ! ! mmap8k:: ! @echo 'If mmap8k fails make sure that mmap8k.in has CR/LFs.' ! @$(AWK) '{ print }' $(srcdir)/mmap8k.in >_$@ ! $(CMP) $(srcdir)/mmap8k.in _$@ && rm -f _$@ ! ! fnarray:: ! @-AWKPATH=$(srcdir) $(AWK) -f fnarray.awk >_$@ 2>&1 || exit 0 ! $(CMP) $(srcdir)/fnarray.ok _$@ && rm -f _$@ ! ! dynlj:: ! @$(AWK) -f $(srcdir)/dynlj.awk >_$@ ! $(CMP) $(srcdir)/dynlj.ok _$@ && rm -f _$@ ! ! substr:: ! @$(AWK) -f $(srcdir)/substr.awk >_$@ ! $(CMP) $(srcdir)/substr.ok _$@ && rm -f _$@ ! ! eofsplit:: ! @$(AWK) -f $(srcdir)/eofsplit.awk >_$@ ! $(CMP) $(srcdir)/eofsplit.ok _$@ && rm -f _$@ ! ! prt1eval:: ! @$(AWK) -f $(srcdir)/prt1eval.awk >_$@ ! $(CMP) $(srcdir)/prt1eval.ok _$@ && rm -f _$@ ! ! gsubasgn:: ! @-AWKPATH=$(srcdir) $(AWK) -f gsubasgn.awk >_$@ 2>&1 || exit 0 ! $(CMP) $(srcdir)/gsubasgn.ok _$@ && rm -f _$@ ! ! prtoeval:: ! @$(AWK) -f $(srcdir)/prtoeval.awk >_$@ ! $(CMP) $(srcdir)/prtoeval.ok _$@ && rm -f _$@ ! ! gsubtest:: ! @$(AWK) -f $(srcdir)/gsubtest.awk >_$@ ! $(CMP) $(srcdir)/gsubtest.ok _$@ && rm -f _$@ ! ! splitwht:: ! @$(AWK) -f $(srcdir)/splitwht.awk >_$@ ! $(CMP) $(srcdir)/splitwht.ok _$@ && rm -f _$@ ! ! back89:: ! @$(AWK) '/a\8b/' $(srcdir)/back89.in >_$@ ! $(CMP) $(srcdir)/back89.ok _$@ && rm -f _$@ ! ! tradanch:: ! @$(AWK) --traditional -f $(srcdir)/tradanch.awk $(srcdir)/tradanch.in >_$@ ! $(CMP) $(srcdir)/tradanch.ok _$@ && rm -f _$@ ! ! nlfldsep:: ! @$(AWK) -f $(srcdir)/nlfldsep.awk $(srcdir)/nlfldsep.in > _$@ ! $(CMP) $(srcdir)/nlfldsep.ok _$@ && rm -f _$@ ! ! splitvar:: ! @$(AWK) -f $(srcdir)/splitvar.awk $(srcdir)/splitvar.in >_$@ ! $(CMP) $(srcdir)/splitvar.ok _$@ && rm -f _$@ ! ! intest:: ! @$(AWK) -f $(srcdir)/intest.awk >_$@ ! $(CMP) $(srcdir)/intest.ok _$@ && rm -f _$@ ! ! # AIX /bin/sh exec's the last command in a list, therefore issue a ":" ! # command so that pid.sh is fork'ed as a child before being exec'ed. ! pid:: ! @echo 'Expect pid to fail in DOS.' ! @AWKPATH=$(srcdir) AWK=$(AWK) $(SHELL) $(srcdir)/pid.sh $$$$ > _`basename $@` ; : ! -$(CMP) $(srcdir)/pid.ok _`basename $@` && rm -f _`basename $@` _`basename $@`.in ! ! strftlng:: ! @echo 'Edit test/Makefile if you use MSC6, since strftlng will fail.' ! @TZ=UTC; export TZ; $(AWK) -f $(srcdir)/strftlng.awk >_$@ ! # @if $(CMP) -s $(srcdir)/strftlng.ok _$@ ; then : ; else \ ! # TZ=UTC0; export TZ; $(AWK) -f $(srcdir)/strftlng.awk >_$@ ; \ ! # fi ! @if $(CMP) -s $(srcdir)/strftlng.ok _$@ ; then : ; else \ ! env TZ=UTC0; $(AWK) -f $(srcdir)/strftlng.awk >_$@ ; \ ! fi ! $(CMP) $(srcdir)/strftlng.ok _$@ && rm -f _$@ ! ! nfldstr:: ! @echo | $(AWK) '$$1 == 0 { print "bug" }' > _$@ ! $(CMP) $(srcdir)/nfldstr.ok _$@ && rm -f _$@ ! ! nors:: ! # @echo A B C D E | tr -d '\12' | $(AWK) '{ print $$NF }' - $(srcdir)/nors.in > _$@ ! @echo A B C D E | tr -d '\15\12' | $(AWK) '{ print $$NF }' - $(srcdir)/nors.in > _$@ ! $(CMP) $(srcdir)/nors.ok _$@ && rm -f _$@ ! ! fnarydel:: ! @$(AWK) -f $(srcdir)/fnarydel.awk >_$@ ! $(CMP) $(srcdir)/fnarydel.ok _$@ && rm -f _$@ ! ! reint:: ! @$(AWK) --re-interval -f $(srcdir)/reint.awk $(srcdir)/reint.in >_$@ ! $(CMP) $(srcdir)/reint.ok _$@ && rm -f _$@ ! ! noparms:: ! @-AWKPATH=$(srcdir) $(AWK) -f noparms.awk >_$@ 2>&1 || exit 0 ! $(CMP) $(srcdir)/noparms.ok _$@ && rm -f _$@ ! ! pipeio1:: ! @echo 'Pipeio1 is set to ignore errors. However, there should not be any.' ! @echo 'If pipeio1 fails, set sh to swap to disk only (in sh.rc).' ! @echo 'If it still hangs with EMX gawk type ^C, then try the test when' ! @echo 'not using DPMI and RSX (in particular, run outside MS-Windows).' ! @$(AWK) -f $(srcdir)/pipeio1.awk >_$@ ! @rm -f test1 test2 ! -$(CMP) $(srcdir)/pipeio1.ok _$@ && rm -f _$@ ! ! pipeio2:: ! # This would fail were it not for the "cat" line due to DOS's ECHO command. ! @echo 'pipeio may fail due to the way that your tr & echo work in DOS' ! @echo 'You may also need to set tr=noexpand switch if you use' ! @echo "Stewartson's sh." ! @$(AWK) -v SRCDIR=$(srcdir) -f $(srcdir)/pipeio2.awk >_$@ ! @cat _$@ | $(AWK) '{ sub("ECHO is.*","",$$0); print $$0 } ' > _$@.2 ! # $(CMP) $(srcdir)/pipeio2.ok _$@ && rm -f _$@ ! -diff -w $(srcdir)/pipeio2.ok _$@.2 && rm -f _$@ _$@.2 ! ! funstack:: ! @echo 'Expect funstack to fail with MSC DOS versions.' ! # @$(AWK) -f $(srcdir)/funstack.awk $(srcdir)/funstack.in >_$@ ! @-$(AWK) -f $(srcdir)/funstack.awk $(srcdir)/funstack.in >_$@ ! # $(CMP) $(srcdir)/funstack.ok _$@ && rm -f _$@ ! -$(CMP) $(srcdir)/funstack.ok _$@ && rm -f _$@ ! ! clobber:: ! # @$(AWK) -f $(srcdir)/clobber.awk >_$@ ! # $(CMP) $(srcdir)/clobber.ok seq && $(CMP) $(srcdir)/clobber.ok _$@ && rm -f _$@ ! # @rm -f seq ! ! delarprm:: ! @$(AWK) -f $(srcdir)/delarprm.awk >_$@ ! $(CMP) $(srcdir)/delarprm.ok _$@ && rm -f _$@ ! ! prdupval:: ! @$(AWK) -f $(srcdir)/prdupval.awk $(srcdir)/prdupval.in >_$@ ! $(CMP) $(srcdir)/prdupval.ok _$@ && rm -f _$@ ! ! nondec:: ! @if grep BITOP ../config.h | grep define > /dev/null; \ ! then \ ! $(AWK) -f $(srcdir)/nondec.awk >_$@; \ ! else \ ! cp $(srcdir)/nondec.ok _$@; \ ! fi ! $(CMP) $(srcdir)/nondec.ok _$@ && rm -f _$@ ! ! nasty:: ! @$(AWK) -f $(srcdir)/nasty.awk >_$@ ! $(CMP) $(srcdir)/nasty.ok _$@ && rm -f _$@ ! ! zeroflag:: ! @$(AWK) -f $(srcdir)/zeroflag.awk >_$@ ! $(CMP) $(srcdir)/zeroflag.ok _$@ && rm -f _$@ ! ! getnr2tm:: ! @$(AWK) -f $(srcdir)/getnr2tm.awk $(srcdir)/getnr2tm.in >_$@ ! $(CMP) $(srcdir)/getnr2tm.ok _$@ && rm -f _$@ ! ! getnr2tb:: ! @$(AWK) -f $(srcdir)/getnr2tb.awk $(srcdir)/getnr2tb.in >_$@ ! $(CMP) $(srcdir)/getnr2tb.ok _$@ && rm -f _$@ ! ! clean: ! rm -fr _* core junk out1 out2 out3 strftime.ok test1 test2 seq *~ ! ! distclean: clean ! rm -f Makefile ! ! maintainer-clean: distclean ! --- 1,672 ---- ! # Makefile for GNU Awk test suite. ! # ! # Copyright (C) 1988-2000 the Free Software Foundation, Inc. ! # ! # This file is part of GAWK, the GNU implementation of the ! # AWK Programming Language. ! # ! # GAWK is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2 of the License, or ! # (at your option) any later version. ! # ! # GAWK is distributed in the hope that it will be useful, ! # but WITHOUT ANY WARRANTY; without even the implied warranty of ! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! # GNU General Public License for more details. ! # ! # You should have received a copy of the GNU General Public License ! # along with this program; if not, write to the Free Software ! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA ! ! # ============================================================================ ! # MS-DOS & OS/2 Notes: READ THEM! ! # ============================================================================ ! ! # As of version 2.91, efforts to make this makefile run in MS-DOS and OS/2 ! # have started in earnest. The following steps need to be followed in order ! # to run this makefile: ! # ! # 1. The first thing that you will need to do is to convert all of the ! # files ending in ".ok" in the test directory, all of the files ending ! # in ".good" (or ".goo") in the test/reg directory, and mmap8k.in from ! # having a linefeed to having carriage return/linefeed at the end of each ! # line. There are various public domain UNIX to DOS converters and any ! # should work. Alternatively, you can use diff instead of cmp--most ! # versions of diff don't care about how the lines end. ! # ! # 2. You will need an sh-compatible shell. Please refer to the "README.pc" ! # file in the README_d directory for information about obtaining a copy. ! # You will also need various UNIX utilities. At a minimum, you will ! # need: rm, tr, cmp (or diff, see above), cat, wc, and sh. ! # You should also have a UNIX-compatible date program. ! # ! # 3. You will need a \tmp directory on the same drive as the test directory ! # for the poundba (called poundbang in the UNIX makefile) test. ! # ! # The makefile has only been tested with dmake 3.8 and DJGPP Make 3.74 or ! # later. After making all of these changes, typing "dmake bigtest extra" ! # or "make bigtest extra" (with DJGPP Make) should run successfully. ! ! # So far, most of the testing has been with Stewartson's sh 2.3 under ! # MS-DOS & OS/2. That version of sh will sometimes send long ! # command-line arguments to programs using the @ notation. You may need ! # to disable this feature of sh for programs that you have which don't support ! # that feature. The DJGPP response file facility is incompatible with the ! # one used by Stewartson's sh, so you will certainly need to disable it if you ! # use DJGPP tools to run the tests. For more information about the @ notation ! # please refer to the sh documentation. ! # ! # A beta of the Bash shell (compiled with djgpp) was tested for gawk-3.0.1, ! # and worked very well with the djgpp-compiled gawk. See README.pc for ! # more information on OS/2 and DOS shells. ! ! # You will almost certainly need to change some of the values (MACROS) ! # defined on the next few lines. ! ! # .USESHELL is used by dmake. ! .USESHELL = yes ! ! # Using EMXSHELL=/bin/sh with emx versions can exhaust lower mem. ! # Lower mem can also be exhausted on some of the tests even with MSC gawk. ! # The .SWAP setting forces (DOS-only) dmake to swap itself out. ! .SWAP: childin fflush getlnhd tweakfld pipeio1 pipeio2 ! ! # This won't work unless you have "sh" and set SHELL equal to it (Make 3.74 ! # or later which comes with DJGPP will work with SHELL=/bin/sh if you have ! # sh.exe anywhere on your PATH). ! #SHELL = e:\bin\sh.exe ! SHELL = /bin/sh ! ! # Point to gawk ! AWK = ../gawk.exe ! ! # Set your cmp command here (you can use most versions of diff instead of cmp ! # if you don't want to convert the .ok files to the DOS CR/LF format). ! # ! # The following comment is for users of OSs which support long file names ! # (such as Windows 95) for all versions of gawk (both 16 & 32-bit). ! # If you use a shell which doesn't support long filenames, temporary files ! # created by this makefile will be truncated by your shell. "_argarra" is an ! # example of this. If $(CMP) is a DJGPP-compiled program, then it will fail ! # because it looks for the long filename (eg. _argarray). To fix this, you ! # need to set LFN=n in your shell's environment. ! # NOTE: Setting LFN in the makefile most probably won't help you because LFN ! # needs to be an environment variable. ! #CMP = cmp ! # See the comment above for why you might want to set CMP to "env LFN=n diff" ! CMP = env LFN=n diff ! #CMP = diff ! #CMP = diff -c ! #CMP = gcmp ! ! # Set your "cp" and "mkdir" commands here. Note: cp must take forward ! # slashes. Using "command -c" may work for MS-DOS with Stewartson's shell ! # (but not bash) if "command=noexpand switch export" is set in extend.lst. ! # `true &&' is needed to force DJGPP Make to call the shell, or else the ! # conversion of `command -c' won't work. ! #CP = cp ! CP = true && command -c copy ! ! #MKDIR = mkdir ! MKDIR = true && command -c mkdir ! ! # Set your unix-style date function here ! DATE = gdate ! #DATE = date ! ! # ============================================================================ ! # You shouldn't need to modify anything below this line. ! # ============================================================================ ! ! srcdir = . ! ! bigtest: basic unix-tests gawk.extensions ! ! basic: msg swaplns messages argarray longwrds \ ! getline fstabplus compare arrayref rs fsrs rand \ ! fsbs negexp asgext anchgsub splitargv awkpath nfset reparse \ ! convfmt arrayparm paramdup nonl defref nofmtch litoct resplit \ ! rswhite prmarscl sclforin sclifin intprec childin noeffect \ ! numsubstr pcntplus prmreuse math fldchg fldchgnf reindops \ ! sprintfc backgsub tweakfld clsflnam mmap8k fnarray \ ! dynlj substr eofsplit prt1eval gsubasgn prtoeval gsubtest splitwht \ ! back89 tradanch nlfldsep splitvar intest nfldstr nors fnarydel \ ! noparms funstack clobber delarprm prdupval nasty zeroflag \ ! getnr2tm getnr2tb printf1 funsmnam fnamedat numindex subslash \ ! opasnslf opasnidx arynocls getlnbuf ! ! unix-tests: poundba fflush getlnhd pipeio1 pipeio2 strftlng pid ! ! gawk.extensions: fieldwdth ignrcase posix manyfiles igncfs argtest \ ! badargs strftime gensub gnureops reint igncdym ! # add this back for 3.1 ! # nondec ! ! extra: regtes inftest ! ! poundba:: ! # The need for "basename" has been removed for MS-DOS & OS/2 systems which ! # lack it. ! # @cp $(AWK) /tmp/gawk && $(srcdir)/poundbang $(srcdir)/poundbang >_`basename $@` ! $(CP) $(AWK) /tmp/gawk.exe && $(srcdir)/poundbang $(srcdir)/poundbang >_$@ ! # @rm -f /tmp/gawk ! rm -f /tmp/gawk.exe ! # $(CMP) $(srcdir)/poundbang.ok _`basename $@` && rm -f _`basename $@` ! $(CMP) $(srcdir)/poundbang.ok _$@ && rm -f _$@ ! ! msg:: ! @echo 'Any output from "cmp" is bad news, although some differences' ! @echo 'in floating point values are probably benign -- in particular,' ! @echo 'some systems may omit a leading zero and the floating point' ! @echo 'precision may lead to slightly different output in a few cases.' ! ! swaplns:: ! @echo 'If swaplns fails make sure that all of the .ok files have CR/LFs.' ! @$(AWK) -f $(srcdir)/swaplns.awk $(srcdir)/swaplns.in >_$@ ! $(CMP) $(srcdir)/swaplns.ok _$@ && rm -f _$@ ! ! messages:: ! @echo 'If messages fails, set sh to swap to disk only (in sh.rc).' ! @$(AWK) -f $(srcdir)/messages.awk >out2 2>out3 ! # { $(CMP) $(srcdir)/out1.ok out1 && $(CMP) $(srcdir)/out2.ok out2 && \ ! # $(CMP) $(srcdir)/out3.ok out3 && rm -f out1 out2 out3; } || \ ! # { { test -d /dev/fd || test -d /proc/self/fd; } && \ ! # echo IT IS OK THAT THIS TEST FAILED; } ! { $(CMP) $(srcdir)/out1.ok out1 && $(CMP) $(srcdir)/out2.ok out2 && \ ! $(CMP) $(srcdir)/out3.ok out3; } || test -d /dev/fd ! rm -f out1 out2 out3 ! ! argarray:: ! @case $(srcdir) in \ ! .) : ;; \ ! *) cp $(srcdir)/argarray.in . ;; \ ! esac ! @TEST=test echo just a test | $(AWK) -f $(srcdir)/argarray.awk ./argarray.in - >_$@ ! @echo 'If argarray fails, set try setting LFN=n in your environment' ! @echo "before running make. If that still doesn't work, read the" ! @echo 'the comment in this makefile about setting CMP for information' ! @echo 'about what may be happenning.' ! $(CMP) $(srcdir)/argarray.ok _$@ && rm -f _$@ ! ! fstabplus:: ! @echo '1 2' | $(AWK) -f $(srcdir)/fstabplus.awk >_$@ ! $(CMP) $(srcdir)/fstabplus.ok _$@ && rm -f _$@ ! ! fsrs:: ! @$(AWK) -f $(srcdir)/fsrs.awk $(srcdir)/fsrs.in >_$@ ! $(CMP) $(srcdir)/fsrs.ok _$@ && rm -f _$@ ! ! igncfs:: ! @$(AWK) -f $(srcdir)/igncfs.awk $(srcdir)/igncfs.in >_$@ ! $(CMP) $(srcdir)/igncfs.ok _$@ && rm -f _$@ ! ! longwrds:: ! @$(AWK) -f $(srcdir)/longwrds.awk $(srcdir)/manpage | (LC_ALL=C sort) >_$@ ! $(CMP) $(srcdir)/longwrds.ok _$@ && rm -f _$@ ! ! fieldwdth:: ! @echo '123456789' | $(AWK) -v FIELDWIDTHS="2 3 4" '{ print $$2}' >_$@ ! $(CMP) $(srcdir)/fieldwdth.ok _$@ && rm -f _$@ ! ! ignrcase:: ! @echo xYz | $(AWK) -v IGNORECASE=1 '{ sub(/y/, ""); print}' >_$@ ! $(CMP) $(srcdir)/ignrcase.ok _$@ && rm -f _$@ ! ! regtes:: ! @echo 'Some of the output from regtest is very system specific, do not' ! @echo 'be distressed if your output differs from that distributed.' ! @echo 'Manual inspection is called for.' ! AWK=`pwd`/$(AWK) CMP="$(CMP)" $(srcdir)/regtest ! ! posix:: ! @echo 'posix test may fail due to 1.500000e+000 not being equal to' ! @echo '1.500000e+00 for MSC gawk.' ! @echo '1:2,3 4' | $(AWK) -f $(srcdir)/posix.awk >_$@ ! # $(CMP) $(srcdir)/posix.ok _$@ && rm -f _$@ ! -$(CMP) $(srcdir)/posix.ok _$@ && rm -f _$@ ! ! manyfiles:: ! @rm -rf junk ! # @mkdir junk ! @$(MKDIR) junk ! @$(AWK) 'BEGIN { for (i = 1; i <= 300; i++) print i, i}' >_$@ ! @$(AWK) -f $(srcdir)/manyfiles.awk _$@ _$@ ! @echo 'If manyfiles says "junk/*: No such file or directory",' ! @echo 'use the line on test/Makefile which invokes wc' ! @echo 'without quoting the "junk/*" argument.' ! # @echo "This number better be 1 ->" | tr -d '\012' ! @echo "This number better be 1 ->" | tr -d '\012\015' ! # @wc -l junk/* | $(AWK) '$$1 != 2' | wc -l ! @wc -l "junk/*" | $(AWK) '$$1 != 2' | wc -l ! # The quotes above are for people with a "wc" that doesn't support sh's "@" ! # argument passing. ! @rm -rf junk _$@ ! ! compare:: ! @$(AWK) -f $(srcdir)/compare.awk 0 1 $(srcdir)/compare.in >_$@ ! $(CMP) $(srcdir)/compare.ok _$@ && rm -f _$@ ! ! arrayref:: ! @$(AWK) -f $(srcdir)/arrayref.awk >_$@ ! $(CMP) $(srcdir)/arrayref.ok _$@ && rm -f _$@ ! ! rs:: ! @$(AWK) -v RS="" '{ print $$1, $$2}' $(srcdir)/rs.in >_$@ ! $(CMP) $(srcdir)/rs.ok _$@ && rm -f _$@ ! ! fsbs:: ! @$(AWK) -v FS='\' '{ print $$1, $$2 }' $(srcdir)/fsbs.in >_$@ ! $(CMP) $(srcdir)/fsbs.ok _$@ && rm -f _$@ ! ! inftest:: ! @echo This test is very machine specific... ! @echo 'MSC 7.0 gawk generates a floating point exception.' ! @echo 'EMX gawk uses #INF rather than Inf.' ! # @$(AWK) -f $(srcdir)/inftest.awk >_$@ ! @-$(AWK) -f $(srcdir)/inftest.awk >_$@ ! # $(CMP) $(srcdir)/inftest.ok _$@ && rm -f _$@ ! -$(CMP) $(srcdir)/inftest.ok _$@ && rm -f _$@ ! ! getline:: ! @$(AWK) -f $(srcdir)/getline.awk $(srcdir)/getline.awk $(srcdir)/getline.awk >_$@ ! $(CMP) $(srcdir)/getline.ok _$@ && rm -f _$@ ! ! rand:: ! @$(AWK) -f $(srcdir)/rand.awk >_$@ ! $(CMP) $(srcdir)/rand.ok _$@ && rm -f _$@ ! ! negexp:: ! @$(AWK) 'BEGIN { a = -2; print 10^a }' >_$@ ! $(CMP) $(srcdir)/negexp.ok _$@ && rm -f _$@ ! ! asgext:: ! @$(AWK) -f $(srcdir)/asgext.awk $(srcdir)/asgext.in >_$@ ! $(CMP) $(srcdir)/asgext.ok _$@ && rm -f _$@ ! ! anchgsub:: ! @$(AWK) -f $(srcdir)/anchgsub.awk $(srcdir)/anchgsub.in >_$@ ! $(CMP) $(srcdir)/anchgsub.ok _$@ && rm -f _$@ ! ! splitargv:: ! @$(AWK) -f $(srcdir)/splitargv.awk $(srcdir)/splitargv.in >_$@ ! $(CMP) $(srcdir)/splitargv.ok _$@ && rm -f _$@ ! ! awkpath:: ! # MS-DOS and OS/2 use ; as a PATH delimiter ! # @AWKPATH="$(srcdir):$(srcdir)/lib" $(AWK) -f awkpath.awk >_$@ ! @AWKPATH="$(srcdir);$(srcdir)/lib" $(AWK) -f awkpath.awk >_$@ ! $(CMP) $(srcdir)/awkpath.ok _$@ && rm -f _$@ ! ! nfset:: ! @$(AWK) -f $(srcdir)/nfset.awk $(srcdir)/nfset.in >_$@ ! $(CMP) $(srcdir)/nfset.ok _$@ && rm -f _$@ ! ! reparse:: ! @$(AWK) -f $(srcdir)/reparse.awk $(srcdir)/reparse.in >_$@ ! $(CMP) $(srcdir)/reparse.ok _$@ && rm -f _$@ ! ! argtest:: ! @$(AWK) -f $(srcdir)/argtest.awk -x -y abc >_$@ ! $(CMP) $(srcdir)/argtest.ok _$@ && rm -f _$@ ! ! badargs:: ! # For MS-DOS & OS/2, we use " rather than ' in the usage statement. ! @-$(AWK) -f 2>&1 | grep -v patchlevel >_$@ ! # Next line converts " to ' for $(CMP) to work with UNIX badargs.ok ! @cat _$@ | tr '\042' '\047' > _$@.2 ! # $(CMP) $(srcdir)/badargs.ok _$@ && rm -f _$@ ! $(CMP) $(srcdir)/badargs.ok _$@.2 && rm -f _$@ _$@.2 ! ! convfmt:: ! @$(AWK) -f $(srcdir)/convfmt.awk >_$@ ! $(CMP) $(srcdir)/convfmt.ok _$@ && rm -f _$@ ! ! arrayparm:: ! @-AWKPATH=$(srcdir) $(AWK) -f arrayparm.awk >_$@ 2>&1 || exit 0 ! $(CMP) $(srcdir)/arrayparm.ok _$@ && rm -f _$@ ! ! paramdup:: ! @-AWKPATH=$(srcdir) $(AWK) -f paramdup.awk >_$@ 2>&1 || exit 0 ! $(CMP) $(srcdir)/paramdup.ok _$@ && rm -f _$@ ! ! nonl:: ! # @-AWKPATH=$(srcdir) $(AWK) --lint -f nonl.awk /dev/null >_$@ 2>&1 ! @-AWKPATH=$(srcdir) $(AWK) --lint -f nonl.awk NUL >_$@ 2>&1 ! $(CMP) $(srcdir)/nonl.ok _$@ && rm -f _$@ ! ! defref:: ! @-AWKPATH=$(srcdir) $(AWK) --lint -f defref.awk >_$@ 2>&1 || exit 0 ! $(CMP) $(srcdir)/defref.ok _$@ && rm -f _$@ ! ! nofmtch:: ! @-AWKPATH=$(srcdir) $(AWK) --lint -f nofmtch.awk >_$@ 2>&1 ! $(CMP) $(srcdir)/nofmtch.ok _$@ && rm -f _$@ ! ! strftime:: ! : this test could fail on slow machines or on a second boundary, ! : so if it does, double check the actual results ! # @LC_ALL=C; export LC_ALL; LANG=C; export LANG; \ ! # date | $(AWK) -v OUTPUT=_$@ -f $(srcdir)/strftime.awk ! @LC_ALL=C; export LC_ALL; LANG=C; export LANG; \ ! $(DATE) | $(AWK) -v OUTPUT=_$@ -f $(srcdir)/strftime.awk ! $(CMP) strftime.ok _$@ && rm -f _$@ strftime.ok || exit 0 ! ! litoct:: ! @echo ab | $(AWK) --traditional -f $(srcdir)/litoct.awk >_$@ ! $(CMP) $(srcdir)/litoct.ok _$@ && rm -f _$@ ! ! gensub:: ! @$(AWK) -f $(srcdir)/gensub.awk $(srcdir)/gensub.in >_$@ ! $(CMP) $(srcdir)/gensub.ok _$@ && rm -f _$@ ! ! resplit:: ! @echo 'If resplit fails, check extend.lst and remove "unix" by the "gawk=" line' ! @echo a:b:c d:e:f | $(AWK) '{ FS = ":"; $$0 = $$0; print $$2 }' > _$@ ! $(CMP) $(srcdir)/resplit.ok _$@ && rm -f _$@ ! ! rswhite:: ! @$(AWK) -f $(srcdir)/rswhite.awk $(srcdir)/rswhite.in > _$@ ! $(CMP) $(srcdir)/rswhite.ok _$@ && rm -f _$@ ! ! prmarscl:: ! @-AWKPATH=$(srcdir) $(AWK) -f prmarscl.awk > _$@ 2>&1 || exit 0 ! $(CMP) $(srcdir)/prmarscl.ok _$@ && rm -f _$@ ! ! sclforin:: ! @-AWKPATH=$(srcdir) $(AWK) -f sclforin.awk > _$@ 2>&1 || exit 0 ! $(CMP) $(srcdir)/sclforin.ok _$@ && rm -f _$@ ! ! sclifin:: ! @-AWKPATH=$(srcdir) $(AWK) -f sclifin.awk > _$@ 2>&1 || exit 0 ! $(CMP) $(srcdir)/sclifin.ok _$@ && rm -f _$@ ! ! intprec:: ! @-$(AWK) -f $(srcdir)/intprec.awk > _$@ 2>&1 ! $(CMP) $(srcdir)/intprec.ok _$@ && rm -f _$@ ! ! childin:: ! @echo hi | $(AWK) 'BEGIN { "cat" | getline; print; close("cat") }' > _$@ ! $(CMP) $(srcdir)/childin.ok _$@ && rm -f _$@ ! ! noeffect:: ! @-AWKPATH=$(srcdir) $(AWK) --lint -f noeffect.awk > _$@ 2>&1 ! $(CMP) $(srcdir)/noeffect.ok _$@ && rm -f _$@ ! ! numsubstr:: ! @-AWKPATH=$(srcdir) $(AWK) -f numsubstr.awk $(srcdir)/numsubstr.in >_$@ ! $(CMP) $(srcdir)/numsubstr.ok _$@ && rm -f _$@ ! ! gnureops:: ! @$(AWK) -f $(srcdir)/gnureops.awk >_$@ ! $(CMP) $(srcdir)/gnureops.ok _$@ && rm -f _$@ ! ! pcntplus:: ! @$(AWK) -f $(srcdir)/pcntplus.awk >_$@ ! $(CMP) $(srcdir)/pcntplus.ok _$@ && rm -f _$@ ! ! prmreuse:: ! @$(AWK) -f $(srcdir)/prmreuse.awk >_$@ ! $(CMP) $(srcdir)/prmreuse.ok _$@ && rm -f _$@ ! ! math:: ! @$(AWK) -f $(srcdir)/math.awk >_$@ ! $(CMP) $(srcdir)/math.ok _$@ && rm -f _$@ ! ! fflush:: ! @$(srcdir)/fflush.sh >_$@ ! $(CMP) $(srcdir)/fflush.ok _$@ && rm -f _$@ ! ! fldchg:: ! @$(AWK) -f $(srcdir)/fldchg.awk $(srcdir)/fldchg.in >_$@ ! $(CMP) $(srcdir)/fldchg.ok _$@ && rm -f _$@ ! ! fldchgnf:: ! @$(AWK) -f $(srcdir)/fldchgnf.awk $(srcdir)/fldchgnf.in >_$@ ! $(CMP) $(srcdir)/fldchgnf.ok _$@ && rm -f _$@ ! ! reindops:: ! @$(AWK) -f $(srcdir)/reindops.awk $(srcdir)/reindops.in >_$@ ! $(CMP) $(srcdir)/reindops.ok _$@ && rm -f _$@ ! ! sprintfc:: ! @$(AWK) -f $(srcdir)/sprintfc.awk $(srcdir)/sprintfc.in >_$@ ! $(CMP) $(srcdir)/sprintfc.ok _$@ && rm -f _$@ ! ! getlnhd:: ! @echo 'Getlnhd is set to ignore errors. However, there should not be any.' ! @echo 'If getlnhd fails, set sh to swap to disk only (in sh.rc).' ! @echo 'If it still hangs with EMX gawk type ^C, then try the test when' ! @echo 'not using DPMI and RSX (in particular, run outside MS-Windows).' ! @echo 'If it fails with MSC, run make from the test directory.' ! # In 3.0.3, COMSPEC=$(SHELL) was used for MSC and MINGW32 which do ! # not honor SHELL. ! # COMSPEC=$(SHELL) $(AWK) -f $(srcdir)/getlnhd.awk >_$@ ! @$(AWK) -f $(srcdir)/getlnhd.awk >_$@ ! -$(CMP) $(srcdir)/getlnhd.ok _$@ && rm -f _$@ ! ! backgsub:: ! @$(AWK) -f $(srcdir)/backgsub.awk $(srcdir)/backgsub.in >_$@ ! $(CMP) $(srcdir)/backgsub.ok _$@ && rm -f _$@ ! ! tweakfld:: ! @$(AWK) -f $(srcdir)/tweakfld.awk $(srcdir)/tweakfld.in >_$@ ! @rm -f errors.cleanup ! $(CMP) $(srcdir)/tweakfld.ok _$@ && rm -f _$@ ! ! clsflnam:: ! @$(AWK) -f $(srcdir)/clsflnam.awk $(srcdir)/clsflnam.in >_$@ ! $(CMP) $(srcdir)/clsflnam.ok _$@ && rm -f _$@ ! ! mmap8k:: ! @echo 'If mmap8k fails make sure that mmap8k.in has CR/LFs.' ! @$(AWK) '{ print }' $(srcdir)/mmap8k.in >_$@ ! $(CMP) $(srcdir)/mmap8k.in _$@ && rm -f _$@ ! ! fnarray:: ! @-AWKPATH=$(srcdir) $(AWK) -f fnarray.awk >_$@ 2>&1 || exit 0 ! $(CMP) $(srcdir)/fnarray.ok _$@ && rm -f _$@ ! ! dynlj:: ! @$(AWK) -f $(srcdir)/dynlj.awk >_$@ ! $(CMP) $(srcdir)/dynlj.ok _$@ && rm -f _$@ ! ! substr:: ! @$(AWK) -f $(srcdir)/substr.awk >_$@ ! $(CMP) $(srcdir)/substr.ok _$@ && rm -f _$@ ! ! eofsplit:: ! @$(AWK) -f $(srcdir)/eofsplit.awk >_$@ ! $(CMP) $(srcdir)/eofsplit.ok _$@ && rm -f _$@ ! ! prt1eval:: ! @$(AWK) -f $(srcdir)/prt1eval.awk >_$@ ! $(CMP) $(srcdir)/prt1eval.ok _$@ && rm -f _$@ ! ! gsubasgn:: ! @-AWKPATH=$(srcdir) $(AWK) -f gsubasgn.awk >_$@ 2>&1 || exit 0 ! $(CMP) $(srcdir)/gsubasgn.ok _$@ && rm -f _$@ ! ! prtoeval:: ! @$(AWK) -f $(srcdir)/prtoeval.awk >_$@ ! $(CMP) $(srcdir)/prtoeval.ok _$@ && rm -f _$@ ! ! gsubtest:: ! @$(AWK) -f $(srcdir)/gsubtest.awk >_$@ ! $(CMP) $(srcdir)/gsubtest.ok _$@ && rm -f _$@ ! ! splitwht:: ! @$(AWK) -f $(srcdir)/splitwht.awk >_$@ ! $(CMP) $(srcdir)/splitwht.ok _$@ && rm -f _$@ ! ! back89:: ! @$(AWK) '/a\8b/' $(srcdir)/back89.in >_$@ ! $(CMP) $(srcdir)/back89.ok _$@ && rm -f _$@ ! ! tradanch:: ! @$(AWK) --traditional -f $(srcdir)/tradanch.awk $(srcdir)/tradanch.in >_$@ ! $(CMP) $(srcdir)/tradanch.ok _$@ && rm -f _$@ ! ! nlfldsep:: ! @$(AWK) -f $(srcdir)/nlfldsep.awk $(srcdir)/nlfldsep.in > _$@ ! $(CMP) $(srcdir)/nlfldsep.ok _$@ && rm -f _$@ ! ! splitvar:: ! @$(AWK) -f $(srcdir)/splitvar.awk $(srcdir)/splitvar.in >_$@ ! $(CMP) $(srcdir)/splitvar.ok _$@ && rm -f _$@ ! ! intest:: ! @$(AWK) -f $(srcdir)/intest.awk >_$@ ! $(CMP) $(srcdir)/intest.ok _$@ && rm -f _$@ ! ! # AIX /bin/sh exec's the last command in a list, therefore issue a ":" ! # command so that pid.sh is fork'ed as a child before being exec'ed. ! pid:: ! @echo 'Expect pid to fail in DOS.' ! @AWKPATH=$(srcdir) AWK=$(AWK) $(SHELL) $(srcdir)/pid.sh $$$$ > _`basename $@` ; : ! -$(CMP) $(srcdir)/pid.ok _`basename $@` && rm -f _`basename $@` _`basename $@`.in ! ! strftlng:: ! @echo 'Edit test/Makefile if you use MSC6, since strftlng will fail.' ! @TZ=UTC; export TZ; $(AWK) -f $(srcdir)/strftlng.awk >_$@ ! # @if $(CMP) -s $(srcdir)/strftlng.ok _$@ ; then : ; else \ ! # TZ=UTC0; export TZ; $(AWK) -f $(srcdir)/strftlng.awk >_$@ ; \ ! # fi ! @if $(CMP) -s $(srcdir)/strftlng.ok _$@ ; then : ; else \ ! env TZ=UTC0; $(AWK) -f $(srcdir)/strftlng.awk >_$@ ; \ ! fi ! $(CMP) $(srcdir)/strftlng.ok _$@ && rm -f _$@ ! ! nfldstr:: ! @echo | $(AWK) '$$1 == 0 { print "bug" }' > _$@ ! $(CMP) $(srcdir)/nfldstr.ok _$@ && rm -f _$@ ! ! nors:: ! # @echo A B C D E | tr -d '\12' | $(AWK) '{ print $$NF }' - $(srcdir)/nors.in > _$@ ! @echo A B C D E | tr -d '\15\12' | $(AWK) '{ print $$NF }' - $(srcdir)/nors.in > _$@ ! $(CMP) $(srcdir)/nors.ok _$@ && rm -f _$@ ! ! fnarydel:: ! @$(AWK) -f $(srcdir)/fnarydel.awk >_$@ ! $(CMP) $(srcdir)/fnarydel.ok _$@ && rm -f _$@ ! ! reint:: ! @$(AWK) --re-interval -f $(srcdir)/reint.awk $(srcdir)/reint.in >_$@ ! $(CMP) $(srcdir)/reint.ok _$@ && rm -f _$@ ! ! noparms:: ! @-AWKPATH=$(srcdir) $(AWK) -f noparms.awk >_$@ 2>&1 || exit 0 ! $(CMP) $(srcdir)/noparms.ok _$@ && rm -f _$@ ! ! pipeio1:: ! @echo 'Pipeio1 is set to ignore errors. However, there should not be any.' ! @echo 'If pipeio1 fails, set sh to swap to disk only (in sh.rc).' ! @echo 'If it still hangs with EMX gawk type ^C, then try the test when' ! @echo 'not using DPMI and RSX (in particular, run outside MS-Windows).' ! @$(AWK) -f $(srcdir)/pipeio1.awk >_$@ ! @rm -f test1 test2 ! -$(CMP) $(srcdir)/pipeio1.ok _$@ && rm -f _$@ ! ! pipeio2:: ! # This would fail were it not for the "cat" line due to DOS's ECHO command. ! @echo 'pipeio may fail due to the way that your tr & echo work in DOS' ! @echo 'You may also need to set tr=noexpand switch if you use' ! @echo "Stewartson's sh." ! @$(AWK) -v SRCDIR=$(srcdir) -f $(srcdir)/pipeio2.awk >_$@ ! @cat _$@ | $(AWK) '{ sub("ECHO is.*","",$$0); print $$0 } ' > _$@.2 ! # $(CMP) $(srcdir)/pipeio2.ok _$@ && rm -f _$@ ! -diff -w $(srcdir)/pipeio2.ok _$@.2 && rm -f _$@ _$@.2 ! ! funstack:: ! @echo 'Expect funstack to fail with MSC DOS versions.' ! # @$(AWK) -f $(srcdir)/funstack.awk $(srcdir)/funstack.in >_$@ ! @-$(AWK) -f $(srcdir)/funstack.awk $(srcdir)/funstack.in >_$@ ! # $(CMP) $(srcdir)/funstack.ok _$@ && rm -f _$@ ! -$(CMP) $(srcdir)/funstack.ok _$@ && rm -f _$@ ! ! clobber:: ! @$(AWK) -f $(srcdir)/clobber.awk >_$@ ! $(CMP) $(srcdir)/clobber.ok seq && $(CMP) $(srcdir)/clobber.ok _$@ && rm -f _$@ ! @rm -f seq ! ! delarprm:: ! @$(AWK) -f $(srcdir)/delarprm.awk >_$@ ! $(CMP) $(srcdir)/delarprm.ok _$@ && rm -f _$@ ! ! prdupval:: ! @$(AWK) -f $(srcdir)/prdupval.awk $(srcdir)/prdupval.in >_$@ ! $(CMP) $(srcdir)/prdupval.ok _$@ && rm -f _$@ ! ! nondec:: ! @if grep BITOP ../config.h | grep define > /dev/null; \ ! then \ ! $(AWK) -f $(srcdir)/nondec.awk >_$@; \ ! else \ ! cp $(srcdir)/nondec.ok _$@; \ ! fi ! $(CMP) $(srcdir)/nondec.ok _$@ && rm -f _$@ ! ! nasty:: ! @$(AWK) -f $(srcdir)/nasty.awk >_$@ ! $(CMP) $(srcdir)/nasty.ok _$@ && rm -f _$@ ! ! zeroflag:: ! @$(AWK) -f $(srcdir)/zeroflag.awk >_$@ ! $(CMP) $(srcdir)/zeroflag.ok _$@ && rm -f _$@ ! ! getnr2tm:: ! @$(AWK) -f $(srcdir)/getnr2tm.awk $(srcdir)/getnr2tm.in >_$@ ! $(CMP) $(srcdir)/getnr2tm.ok _$@ && rm -f _$@ ! ! getnr2tb:: ! @$(AWK) -f $(srcdir)/getnr2tb.awk $(srcdir)/getnr2tb.in >_$@ ! $(CMP) $(srcdir)/getnr2tb.ok _$@ && rm -f _$@ ! ! printf1:: ! @$(AWK) -f $(srcdir)/printf1.awk >_$@ ! $(CMP) $(srcdir)/printf1.ok _$@ && rm -f _$@ ! ! funsmnam:: ! @-AWKPATH=$(srcdir) $(AWK) -f funsmnam.awk >_$@ 2>&1 || exit 0 ! $(CMP) $(srcdir)/funsmnam.ok _$@ && rm -f _$@ ! ! fnamedat:: ! @-AWKPATH=$(srcdir) $(AWK) -f fnamedat.awk < $(srcdir)/fnamedat.in >_$@ 2>&1 || exit 0 ! $(CMP) $(srcdir)/fnamedat.ok _$@ && rm -f _$@ ! ! numindex:: ! @-AWKPATH=$(srcdir) $(AWK) -f numindex.awk < $(srcdir)/numindex.in >_$@ 2>&1 || exit 0 ! $(CMP) $(srcdir)/numindex.ok _$@ && rm -f _$@ ! ! subslash:: ! @-AWKPATH=$(srcdir) $(AWK) -f subslash.awk >_$@ 2>&1 || exit 0 ! $(CMP) $(srcdir)/subslash.ok _$@ && rm -f _$@ ! ! opasnslf:: ! @-AWKPATH=$(srcdir) $(AWK) -f opasnslf.awk >_$@ 2>&1 || exit 0 ! $(CMP) $(srcdir)/opasnslf.ok _$@ && rm -f _$@ ! ! opasnidx:: ! @-AWKPATH=$(srcdir) $(AWK) -f opasnidx.awk >_$@ 2>&1 || exit 0 ! $(CMP) $(srcdir)/opasnidx.ok _$@ && rm -f _$@ ! ! arynocls:: ! @-AWKPATH=$(srcdir) $(AWK) -v INPUT=$(srcdir)/arynocls.in -f arynocls.awk >_$@ ! $(CMP) $(srcdir)/arynocls.ok _$@ && rm -f _$@ ! ! igncdym:: ! @-AWKPATH=$(srcdir) $(AWK) -f igncdym.awk $(srcdir)/igncdym.in >_$@ ! $(CMP) $(srcdir)/igncdym.ok _$@ && rm -f _$@ ! ! getlnbuf:: ! @-AWKPATH=$(srcdir) $(AWK) -f getlnbuf.awk $(srcdir)/getlnbuf.in > _$@ ! @-AWKPATH=$(srcdir) $(AWK) -f gtlnbufv.awk $(srcdir)/getlnbuf.in > _2$@ ! $(CMP) $(srcdir)/getlnbuf.ok _$@ && $(CMP) $(srcdir)/getlnbuf.ok _2$@ && rm -f _$@ _2$@ ! ! clean: ! rm -fr _* core junk out1 out2 out3 strftime.ok test1 test2 seq *~ ! ! distclean: clean ! rm -f Makefile ! ! maintainer-clean: distclean diff -cNr gawk-3.0.4/pc/config.h gawk-3.0.5/pc/config.h *** gawk-3.0.4/pc/config.h Tue Jun 1 01:20:45 1999 --- gawk-3.0.5/pc/config.h Sun Jun 18 14:55:33 2000 *************** *** 5,11 **** */ /* ! * Copyright (C) 1995-1999 the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the * AWK Progamming Language. --- 5,11 ---- */ /* ! * Copyright (C) 1995-2000 the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the * AWK Progamming Language. *************** *** 218,224 **** #endif #if defined(DJGPP) ! # define HAVE_LIMITS_H # undef HAVE_POPEN_H #endif --- 218,224 ---- #endif #if defined(DJGPP) ! # define HAVE_LIMITS_H 1 # undef HAVE_POPEN_H #endif diff -cNr gawk-3.0.4/posix/ChangeLog gawk-3.0.5/posix/ChangeLog *** gawk-3.0.4/posix/ChangeLog Wed Jun 30 16:15:24 1999 --- gawk-3.0.5/posix/ChangeLog Sun Jun 25 15:09:40 2000 *************** *** 1,3 **** --- 1,7 ---- + Sun Jun 25 15:08:19 2000 Arnold D. Robbins + + * Release 3.0.5: Release tar file made. + Wed Jun 30 16:14:36 1999 Arnold D. Robbins * Release 3.0.4: Release tar file made. This time for sure. diff -cNr gawk-3.0.4/protos.h gawk-3.0.5/protos.h *** gawk-3.0.4/protos.h Mon Oct 21 03:14:19 1996 --- gawk-3.0.5/protos.h Sun Jun 18 14:48:47 2000 *************** *** 3,9 **** */ /* ! * Copyright (C) 1991 - 96 the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the * AWK Programming Language. --- 3,9 ---- */ /* ! * Copyright (C) 1991 - 2000 the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the * AWK Programming Language. diff -cNr gawk-3.0.4/re.c gawk-3.0.5/re.c *** gawk-3.0.4/re.c Wed Oct 7 21:04:41 1998 --- gawk-3.0.5/re.c Wed Jun 7 11:46:25 2000 *************** *** 3,9 **** */ /* ! * Copyright (C) 1991-1996 the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the * AWK Programming Language. --- 3,9 ---- */ /* ! * Copyright (C) 1991-2000 the Free Software Foundation, Inc. * * This file is part of GAWK, the GNU implementation of the * AWK Programming Language. *************** *** 216,222 **** { NODE *t1; - /* # define CASE 1 */ if ((t->re_flags & CASE) == IGNORECASE) { if ((t->re_flags & CONST) != 0) return t->re_reg; --- 216,221 ---- *************** *** 237,243 **** t->re_cnt++; if (t->re_cnt > 10) t->re_cnt = 0; ! if (t->re_text == NULL) { t1 = force_string(tree_eval(t->re_exp)); t->re_text = dupnode(t1); free_temp(t1); --- 236,242 ---- t->re_cnt++; if (t->re_cnt > 10) t->re_cnt = 0; ! if (t->re_text == NULL || (t->re_flags & CASE) != IGNORECASE) { t1 = force_string(tree_eval(t->re_exp)); t->re_text = dupnode(t1); free_temp(t1); diff -cNr gawk-3.0.4/regex.c gawk-3.0.5/regex.c *** gawk-3.0.4/regex.c Wed Apr 28 17:15:05 1999 --- gawk-3.0.5/regex.c Wed Jun 7 11:46:52 2000 *************** *** 3,9 **** (Implements POSIX draft P1003.2/D11.2, except for some of the internationalization features.) ! Copyright (C) 1993,1994,1995,1996,1997,1999 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by --- 3,9 ---- (Implements POSIX draft P1003.2/D11.2, except for some of the internationalization features.) ! Copyright (C) 1993,1994,1995,1996,1997,1999,2000 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by *************** *** 124,169 **** #define SWITCH_ENUM_CAST(x) (x) #endif - /* How many characters in the character set. */ - #define CHAR_SET_SIZE 256 - - #ifdef SYNTAX_TABLE - - extern char *re_syntax_table; - - #else /* not SYNTAX_TABLE */ - - static char re_syntax_table[CHAR_SET_SIZE]; - - static void - init_syntax_once () - { - register int c; - static int done = 0; - - if (done) - return; - - bzero (re_syntax_table, sizeof re_syntax_table); - - for (c = 'a'; c <= 'z'; c++) - re_syntax_table[c] = Sword; - - for (c = 'A'; c <= 'Z'; c++) - re_syntax_table[c] = Sword; - - for (c = '0'; c <= '9'; c++) - re_syntax_table[c] = Sword; - - re_syntax_table['_'] = Sword; - - done = 1; - } - - #endif /* not SYNTAX_TABLE */ - - #define SYNTAX(c) re_syntax_table[c] - #endif /* not emacs */ /* Get the interface, including the syntax bits. */ --- 124,129 ---- *************** *** 226,231 **** --- 186,228 ---- /* As in Harbison and Steele. */ #define SIGN_EXTEND_CHAR(c) ((((unsigned char) (c)) ^ 128) - 128) #endif + + #ifndef emacs + /* How many characters in the character set. */ + #define CHAR_SET_SIZE 256 + + #ifdef SYNTAX_TABLE + + extern char *re_syntax_table; + + #else /* not SYNTAX_TABLE */ + + static char re_syntax_table[CHAR_SET_SIZE]; + + static void + init_syntax_once () + { + register int c; + static int done = 0; + + if (done) + return; + bzero (re_syntax_table, sizeof re_syntax_table); + + for (c = 0; c < CHAR_SET_SIZE; c++) + if (ISALNUM (c)) + re_syntax_table[c] = Sword; + + re_syntax_table['_'] = Sword; + + done = 1; + } + + #endif /* not SYNTAX_TABLE */ + + #define SYNTAX(c) re_syntax_table[(unsigned char) (c)] + + #endif /* emacs */ /* Should we use malloc or alloca? If REGEX_MALLOC is not defined, we use `alloca' instead of `malloc'. This is because using malloc in diff -cNr gawk-3.0.4/stamp-h.in gawk-3.0.5/stamp-h.in *** gawk-3.0.4/stamp-h.in Wed Jun 9 11:37:17 1999 --- gawk-3.0.5/stamp-h.in Mon Jun 12 15:56:11 2000 *************** *** 1 **** ! Wed Jun 9 11:37:17 IDT 1999 --- 1 ---- ! Mon Jun 12 15:56:11 IDT 2000 diff -cNr gawk-3.0.4/test/ChangeLog gawk-3.0.5/test/ChangeLog *** gawk-3.0.4/test/ChangeLog Wed Jun 30 16:16:02 1999 --- gawk-3.0.5/test/ChangeLog Sun Jun 25 15:09:47 2000 *************** *** 1,3 **** --- 1,71 ---- + Sun Jun 25 15:08:19 2000 Arnold D. Robbins + + * Release 3.0.5: Release tar file made. + + Wed Jun 14 13:17:59 2000 Arnold D. Robbins + + * Makefile.in (getlnbuf): new test case. + * getlnbuf.awk, gtlnbufv.awk, getlnbuf.in, getlnbuf.ok: new files. + + Mon Jun 5 15:51:39 2000 Arnold D. Robbins + + * pipeio2.awk: Change use of tr to sed, fixes problems + on SCO OS5. + * pipeio2.ok: Updated to reflect use of sed. + + Tue May 2 13:28:04 2000 Arnold D. Robbins + + * Makefile.in (strftime): moved test code into a separate + file for the PC guys. + * strftime.awk: new file. + + Mon Apr 10 15:58:13 2000 Arnold D. Robbins + + * Makefile.in (longwrds): Add setting LC_ALL=C to sort + call to preserve traditional output. (Theme from the + Twilight Zone plays eerily in the background...) + + Sun Apr 2 17:51:40 2000 Arnold D. Robbins + + * Makefile.in (igncdym): new test case. + * igncdym.awk, igncdym.in, igncdym.ok: new files. + + Wed Mar 8 13:43:44 2000 Arnold D. Robbins + + * Makefile.in (arynocls): new test case. + * arynocls.awk, arynocls.in, arynocls.ok: new files. + + Sun Feb 6 11:45:15 2000 Arnold D. Robbins + + * Makefile.in (opasnidx): new test case. + * opasnidx.awk, opasnidx.ok: new files. + + Tue Feb 1 18:40:45 2000 Arnold D. Robbins + + * Makefile.in (opasnslf): new test case. + * opasnslf.awk, opasnslf.ok: new files. + + Thu Jan 27 18:09:18 2000 Arnold D. Robbins + + * Makefile.in (subslash): new test case. + * subslash.awk, subslash.ok: new files. + + Fri Nov 26 11:03:07 1999 Arnold D. Robbins + + * Makefile.in (numindex): new test case. + * numindex.awk, numindex.in, numindex.ok: new files. + + Sun Oct 24 08:46:16 1999 Arnold D. Robbins + + * Makefile.in (strftime): Add tweak for $NF that should + hopefully avoid cygwin problems with lack of timezone. + + Thu Jul 29 19:25:02 1999 Arnold D. Robbins + + * Makefile.in (fsmnam, fnamedat): new test cases. + * fsmnam.awk, fsmnam.ok: new files. + * fnamedat.awk, fnamedat.in, fnamedat.ok: new files. + Wed Jun 30 16:14:36 1999 Arnold D. Robbins * Release 3.0.4: Release tar file made. This time for sure. diff -cNr gawk-3.0.4/test/Makefile.in gawk-3.0.5/test/Makefile.in *** gawk-3.0.4/test/Makefile.in Tue May 25 16:37:41 1999 --- gawk-3.0.5/test/Makefile.in Wed Jun 14 13:18:53 2000 *************** *** 1,6 **** # Makefile for GNU Awk test suite. # ! # Copyright (C) 1988-1998 the Free Software Foundation, Inc. # # This file is part of GAWK, the GNU implementation of the # AWK Programming Language. --- 1,6 ---- # Makefile for GNU Awk test suite. # ! # Copyright (C) 1988-2000 the Free Software Foundation, Inc. # # This file is part of GAWK, the GNU implementation of the # AWK Programming Language. *************** *** 38,49 **** dynlj substr eofsplit prt1eval gsubasgn prtoeval gsubtest splitwht \ back89 tradanch nlfldsep splitvar intest nfldstr nors fnarydel \ noparms funstack clobber delarprm prdupval nasty zeroflag \ ! getnr2tm getnr2tb printf1 unix-tests: poundbang fflush getlnhd pipeio1 pipeio2 strftlng pid gawk.extensions: fieldwdth ignrcase posix manyfiles igncfs argtest \ ! badargs strftime gensub gnureops reint # add this back for 3.1 # nondec --- 38,50 ---- dynlj substr eofsplit prt1eval gsubasgn prtoeval gsubtest splitwht \ back89 tradanch nlfldsep splitvar intest nfldstr nors fnarydel \ noparms funstack clobber delarprm prdupval nasty zeroflag \ ! getnr2tm getnr2tb printf1 funsmnam fnamedat numindex subslash \ ! opasnslf opasnidx arynocls getlnbuf unix-tests: poundbang fflush getlnhd pipeio1 pipeio2 strftlng pid gawk.extensions: fieldwdth ignrcase posix manyfiles igncfs argtest \ ! badargs strftime gensub gnureops reint igncdym # add this back for 3.1 # nondec *************** *** 92,98 **** $(CMP) $(srcdir)/igncfs.ok _$@ && rm -f _$@ longwrds:: ! @$(AWK) -f $(srcdir)/longwrds.awk $(srcdir)/manpage | sort >_$@ $(CMP) $(srcdir)/longwrds.ok _$@ && rm -f _$@ fieldwdth:: --- 93,99 ---- $(CMP) $(srcdir)/igncfs.ok _$@ && rm -f _$@ longwrds:: ! @$(AWK) -f $(srcdir)/longwrds.awk $(srcdir)/manpage | (LC_ALL=C sort) >_$@ $(CMP) $(srcdir)/longwrds.ok _$@ && rm -f _$@ fieldwdth:: *************** *** 215,223 **** : this test could fail on slow machines or on a second boundary, : so if it does, double check the actual results @LC_ALL=C; export LC_ALL; LANG=C; export LANG; \ ! date | $(AWK) '{ $$3 = sprintf("%02d", $$3 + 0) ; \ ! print > "strftime.ok" ; \ ! print strftime() > "'_$@'" }' $(CMP) strftime.ok _$@ && rm -f _$@ strftime.ok || exit 0 litoct:: --- 216,222 ---- : this test could fail on slow machines or on a second boundary, : so if it does, double check the actual results @LC_ALL=C; export LC_ALL; LANG=C; export LANG; \ ! date | $(AWK) -v OUTPUT=_$@ -f $(srcdir)/strftime.awk $(CMP) strftime.ok _$@ && rm -f _$@ strftime.ok || exit 0 litoct:: *************** *** 464,469 **** --- 463,505 ---- printf1:: @$(AWK) -f $(srcdir)/printf1.awk >_$@ $(CMP) $(srcdir)/printf1.ok _$@ && rm -f _$@ + + funsmnam:: + @-AWKPATH=$(srcdir) $(AWK) -f funsmnam.awk >_$@ 2>&1 || exit 0 + $(CMP) $(srcdir)/funsmnam.ok _$@ && rm -f _$@ + + fnamedat:: + @-AWKPATH=$(srcdir) $(AWK) -f fnamedat.awk < $(srcdir)/fnamedat.in >_$@ 2>&1 || exit 0 + $(CMP) $(srcdir)/fnamedat.ok _$@ && rm -f _$@ + + numindex:: + @-AWKPATH=$(srcdir) $(AWK) -f numindex.awk < $(srcdir)/numindex.in >_$@ 2>&1 || exit 0 + $(CMP) $(srcdir)/numindex.ok _$@ && rm -f _$@ + + subslash:: + @-AWKPATH=$(srcdir) $(AWK) -f subslash.awk >_$@ 2>&1 || exit 0 + $(CMP) $(srcdir)/subslash.ok _$@ && rm -f _$@ + + opasnslf:: + @-AWKPATH=$(srcdir) $(AWK) -f opasnslf.awk >_$@ 2>&1 || exit 0 + $(CMP) $(srcdir)/opasnslf.ok _$@ && rm -f _$@ + + opasnidx:: + @-AWKPATH=$(srcdir) $(AWK) -f opasnidx.awk >_$@ 2>&1 || exit 0 + $(CMP) $(srcdir)/opasnidx.ok _$@ && rm -f _$@ + + arynocls:: + @-AWKPATH=$(srcdir) $(AWK) -v INPUT=$(srcdir)/arynocls.in -f arynocls.awk >_$@ + $(CMP) $(srcdir)/arynocls.ok _$@ && rm -f _$@ + + igncdym:: + @-AWKPATH=$(srcdir) $(AWK) -f igncdym.awk $(srcdir)/igncdym.in >_$@ + $(CMP) $(srcdir)/igncdym.ok _$@ && rm -f _$@ + + getlnbuf:: + @-AWKPATH=$(srcdir) $(AWK) -f getlnbuf.awk $(srcdir)/getlnbuf.in > _$@ + @-AWKPATH=$(srcdir) $(AWK) -f gtlnbufv.awk $(srcdir)/getlnbuf.in > _2$@ + $(CMP) $(srcdir)/getlnbuf.ok _$@ && $(CMP) $(srcdir)/getlnbuf.ok _2$@ && rm -f _$@ _2$@ clean: rm -fr _* core junk out1 out2 out3 strftime.ok test1 test2 seq *~ diff -cNr gawk-3.0.4/test/arynocls.awk gawk-3.0.5/test/arynocls.awk *** gawk-3.0.4/test/arynocls.awk Thu Jan 1 02:00:00 1970 --- gawk-3.0.5/test/arynocls.awk Wed Mar 8 13:42:19 2000 *************** *** 0 **** --- 1,95 ---- + #To: bug-gnu-utils@gnu.org + #From: Kristján Jónasson + #Subject: Gawk bug + #Cc: arnold@gnu.org + # + #Hi! + # + #The following seems to be a bug in gawk. I have tried as I could to + #minimize the bug-causing program, so of course it does not seem to do + #anything useful in its present form. The error message received is: + # + #gawk: test.awk:15: fatal error: internal error + #Aborted + # + #Note that there is an attached file that the program reads, called "a". I + #played with the program a fair bit and my feeling is that the error is + #related with the delete statement, and not the reading of the file and the + #close statement. At one point I was able to remove the file reading and + #still obtain the error. If, for example, I remove the close statement and + #make two copies of the file instead, (reading one copy in sub1 and the + #other in sub2), the error still occurs. + # + #The operating system is Red Hat Linux, version 6.0, the gawk is version + #3.0.4, and the gawk was obtained from an rpm file gawk-3.0.4-1.i386.rpm. + # + #The program is: + # + + # Wed Mar 8 13:41:34 IST 2000 + # ADR: modified to use INPUT, so can set it from command line. + # When run, no output is produced, but it shouldn't core + # dump, either. + # + # The program bug is to not close the file in sub2. + + function sub1(x) { + # while (getline < "a" == 1) i++ + while (getline < INPUT == 1) i++ + # close("a") + close(INPUT) + } + + function sub2(x) { + i=0 + delete y + # while (getline < "a" == 1) z[++i] = $1 + while (getline < INPUT == 1) z[++i] = $1 + for(i in z) y[i] = x[i] + z[i] + } + + function sub3(x, y, z) { + sub2(x) + for(i=1; i<=4; i++) z[i] = y[i] + } + + BEGIN { + sub1(x) + sub2(x) + sub3(x, y, z) + } + # + #And the data file is: + # + # 32.440 3.830 3.383700000000000 10.08 298 865 + # 32.440 3.830 3.383700000000000 10.08 298 865 + # 32.440 3.830 3.383700000000000 10.08 298 865 + # 32.440 3.830 3.383700000000000 10.08 298 865 + # 32.440 3.830 3.383700000000000 10.08 298 865 + # 32.440 3.830 3.383700000000000 10.08 298 865 + # 32.440 3.830 3.383700000000000 10.08 298 865 + # 32.440 3.830 3.383700000000000 10.08 298 865 + # 32.440 3.830 3.383700000000000 10.08 298 865 + # 32.440 3.830 3.383700000000000 10.08 298 865 + # 32.440 3.830 3.383700000000000 10.08 298 865 + # 32.440 3.830 3.383700000000000 10.08 298 865 + # 32.440 3.830 3.383700000000000 10.08 298 865 + # 32.440 3.830 3.383700000000000 10.08 298 865 + # 32.440 3.830 3.383700000000000 10.08 298 865 + # 32.440 3.830 3.383700000000000 10.08 298 865 + # 32.440 3.830 3.383700000000000 10.08 298 865 + # 32.440 3.830 3.383700000000000 10.08 298 865 + # 32.440 3.830 3.383700000000000 10.08 298 865 + # 32.440 3.830 3.383700000000000 10.08 298 865 + # 32.440 3.830 3.383700000000000 10.08 298 865 + # 32.440 3.830 3.383700000000000 10.08 298 865 + # 32.440 3.830 3.383700000000000 10.08 298 865 + # 32.440 3.830 3.383700000000000 10.08 298 865 + # 32.440 3.830 3.383700000000000 10.08 298 865 + # 32.440 3.830 3.383700000000000 10.08 298 865 + # 32.440 3.830 3.383700000000000 10.08 298 865 + # 32.440 3.830 3.383700000000000 10.08 298 865 + # 32.440 3.830 3.383700000000000 10.08 298 865 + # 32.440 3.830 3.383700000000000 10.08 298 865 + # + # diff -cNr gawk-3.0.4/test/arynocls.in gawk-3.0.5/test/arynocls.in *** gawk-3.0.4/test/arynocls.in Thu Jan 1 02:00:00 1970 --- gawk-3.0.5/test/arynocls.in Wed Mar 8 13:42:28 2000 *************** *** 0 **** --- 1,30 ---- + 32.440 3.830 3.383700000000000 10.08 298 865 + 32.440 3.830 3.383700000000000 10.08 298 865 + 32.440 3.830 3.383700000000000 10.08 298 865 + 32.440 3.830 3.383700000000000 10.08 298 865 + 32.440 3.830 3.383700000000000 10.08 298 865 + 32.440 3.830 3.383700000000000 10.08 298 865 + 32.440 3.830 3.383700000000000 10.08 298 865 + 32.440 3.830 3.383700000000000 10.08 298 865 + 32.440 3.830 3.383700000000000 10.08 298 865 + 32.440 3.830 3.383700000000000 10.08 298 865 + 32.440 3.830 3.383700000000000 10.08 298 865 + 32.440 3.830 3.383700000000000 10.08 298 865 + 32.440 3.830 3.383700000000000 10.08 298 865 + 32.440 3.830 3.383700000000000 10.08 298 865 + 32.440 3.830 3.383700000000000 10.08 298 865 + 32.440 3.830 3.383700000000000 10.08 298 865 + 32.440 3.830 3.383700000000000 10.08 298 865 + 32.440 3.830 3.383700000000000 10.08 298 865 + 32.440 3.830 3.383700000000000 10.08 298 865 + 32.440 3.830 3.383700000000000 10.08 298 865 + 32.440 3.830 3.383700000000000 10.08 298 865 + 32.440 3.830 3.383700000000000 10.08 298 865 + 32.440 3.830 3.383700000000000 10.08 298 865 + 32.440 3.830 3.383700000000000 10.08 298 865 + 32.440 3.830 3.383700000000000 10.08 298 865 + 32.440 3.830 3.383700000000000 10.08 298 865 + 32.440 3.830 3.383700000000000 10.08 298 865 + 32.440 3.830 3.383700000000000 10.08 298 865 + 32.440 3.830 3.383700000000000 10.08 298 865 + 32.440 3.830 3.383700000000000 10.08 298 865 diff -cNr gawk-3.0.4/test/badargs.ok gawk-3.0.5/test/badargs.ok *** gawk-3.0.4/test/badargs.ok Tue Sep 8 20:47:26 1998 --- gawk-3.0.5/test/badargs.ok Thu Dec 9 17:09:46 1999 *************** *** 19,23 **** -W usage --usage -W version --version ! Report bugs to bug-gnu-utils@gnu.org, ! with a Cc: to arnold@gnu.org --- 19,24 ---- -W usage --usage -W version --version ! To report bugs, see node `Bugs' in `gawk.info', which ! is section `Reporting Problems and Bugs' in the ! printed version. diff -cNr gawk-3.0.4/test/fnamedat.awk gawk-3.0.5/test/fnamedat.awk *** gawk-3.0.4/test/fnamedat.awk Thu Jan 1 02:00:00 1970 --- gawk-3.0.5/test/fnamedat.awk Fri Jul 30 05:20:57 1999 *************** *** 0 **** --- 1 ---- + function foo() { print foo } {foo()} diff -cNr gawk-3.0.4/test/fnamedat.in gawk-3.0.5/test/fnamedat.in *** gawk-3.0.4/test/fnamedat.in Thu Jan 1 02:00:00 1970 --- gawk-3.0.5/test/fnamedat.in Fri Jul 30 05:21:05 1999 *************** *** 0 **** --- 1 ---- + foo diff -cNr gawk-3.0.4/test/fnamedat.ok gawk-3.0.5/test/fnamedat.ok *** gawk-3.0.4/test/fnamedat.ok Thu Jan 1 02:00:00 1970 --- gawk-3.0.5/test/fnamedat.ok Sun Oct 24 17:45:43 1999 *************** *** 0 **** --- 1 ---- + gawk: fnamedat.awk:1: (FILENAME=- FNR=1) fatal: can't use function name `foo' as variable or array diff -cNr gawk-3.0.4/test/funsmnam.awk gawk-3.0.5/test/funsmnam.awk *** gawk-3.0.4/test/funsmnam.awk Thu Jan 1 02:00:00 1970 --- gawk-3.0.5/test/funsmnam.awk Fri Jul 30 05:19:54 1999 *************** *** 0 **** --- 1,6 ---- + function foo( \ + foo) + { + print foo + } + { foo() } diff -cNr gawk-3.0.4/test/funsmnam.ok gawk-3.0.5/test/funsmnam.ok *** gawk-3.0.4/test/funsmnam.ok Thu Jan 1 02:00:00 1970 --- gawk-3.0.5/test/funsmnam.ok Fri Jul 30 05:22:31 1999 *************** *** 0 **** --- 1 ---- + gawk: funsmnam.awk:6: fatal: function `foo': can't use function name as parameter name diff -cNr gawk-3.0.4/test/getlnbuf.awk gawk-3.0.5/test/getlnbuf.awk *** gawk-3.0.4/test/getlnbuf.awk Thu Jan 1 02:00:00 1970 --- gawk-3.0.5/test/getlnbuf.awk Wed Jun 14 13:13:15 2000 *************** *** 0 **** --- 1,18 ---- + #Date: Tue, 21 Dec 1999 16:11:07 +0100 + #From: Daniel Schnell + #To: bug-gnu-utils@gnu.org + #CC: arnold@gnu.org + #Subject: BUG in gawk (version 3.0.4 linux, windows): Text mangeling in between + + # search for "@K@CODE" segment + + $0 ~ /@K@CODE/ { + # get next record + getline temp + printf ("@K@CODE\n") + printf ("%s\n",temp) + } + + $0 !~ /@K@CODE/ { + printf ("%s\n", $0) + } diff -cNr gawk-3.0.4/test/getlnbuf.in gawk-3.0.5/test/getlnbuf.in *** gawk-3.0.4/test/getlnbuf.in Thu Jan 1 02:00:00 1970 --- gawk-3.0.5/test/getlnbuf.in Wed Jun 14 13:12:12 2000 *************** *** 0 **** --- 1,1708 ---- + EXTRA_INFO.TYP3.EC := EC; + EXTRA_INFO.TYP3.TEXT:= 'CONNECT_SERVICE TO OAM FAILED'; + + G9PXYA1S!G9TE500_EHP_P( + 'G9IBSA1C003', /*@@ID*/ + G9PXYA1S!G9TE102_ERR_CLASS_SWERR, /*@@CLASS*/ + ADDR(EXTRA_INFO.ERROR_HANDLER), /* EXTRA-INFO ADDR */ + G9PXYA1S!G9TE100_GB_LM, /* USER-ID */ + NULL /* OPTIONAL-SWET-INFO ADDR */ + ); + /***@@@ END OF ERROR ***/ + + @K@FREEZE + 917596041 + @K@NAME + T_ERR4_1 + @K@INSCRIPT + ERROR_HANDLING: + DB_OVERFLOW + MP/NSEI + @K@CODE + /***@@@ ERROR ***/ + /*@@ERRORTEXT + *@ DB-OVERFLOW + *@ + *@ + *@@DESCRIPTION + *@ THE INSTANCE-CREATION WAS NOT POSSIBLE + *@ BECAUSE THE DATABASE WOULD OVERFLOW + *@ + *@@EXTRA INFO + *@ (EXTRA_INFO_4_STRUCT) + *@ NSEI + *@ NSVCI + *@ TEXT + *@ + */ + + EXTRA_INFO.TYP4.NSEI := EVD_PTR->.KEYS.INT_ARR(0); + EXTRA_INFO.TYP4.NSVCI:= EVD_PTR->.KEYS.INT_ARR(1); + EXTRA_INFO.TYP4.TEXT := 'NSVC-HAND.: MP/NSEI-OVERFLOW'; + + G9PXYA1S!G9TE500_EHP_P( + 'G9IBSA1C004', /*@@ID*/ + G9PXYA1S!G9TE102_ERR_CLASS_ESC_MAX_ANY, /*@@CLASS*/ + ADDR(EXTRA_INFO.ERROR_HANDLER), /* EXTRA-INFO ADDR */ + G9PXYA1S!G9TE100_GB_LM, /* USER-ID */ + NULL /* OPTIONAL-SWET-INFO ADDR */ + ); + /***@@@ END OF ERROR ***/ + + @K@FREEZE + 920903219 + @K@NAME + T_ERR4_2 + @K@INSCRIPT + ERROR_HANDLING: + DB_OVERFLOW + MP/NSVCI + @K@CODE + /***@@@ ERROR ***/ + /*@@ERRORTEXT + *@ DB-OVERFLOW + *@ + *@ + *@@DESCRIPTION + *@ THE INSTANCE-CREATION WAS NOT POSSIBLE + *@ BECAUSE THE DATABASE WOULD OVERFLOW + *@ + *@@EXTRA INFO + *@ (EXTRA_INFO_4_STRUCT) + *@ NSEI + *@ NSVCI + *@ TEXT + *@ + */ + + EXTRA_INFO.TYP4.NSEI := EVD_PTR->.KEYS.INT_ARR(0); + EXTRA_INFO.TYP4.NSVCI:= EVD_PTR->.KEYS.INT_ARR(1); + EXTRA_INFO.TYP4.TEXT := 'NSVC-HAND.: MP/NSVCI-OVERFLOW'; + + G9PXYA1S!G9TE500_EHP_P( + 'G9IBSA1C004', /*@@ID*/ + G9PXYA1S!G9TE102_ERR_CLASS_ESC_MAX_ANY, /*@@CLASS*/ + ADDR(EXTRA_INFO.ERROR_HANDLER), /* EXTRA-INFO ADDR */ + G9PXYA1S!G9TE100_GB_LM, /* USER-ID */ + NULL /* OPTIONAL-SWET-INFO ADDR */ + ); + /***@@@ END OF ERROR ***/ + + @K@FREEZE + 920903222 + @K@NAME + T_ERR4_3 + @K@INSCRIPT + ERROR_HANDLING: + DB_OVERFLOW + NSEI/NSVCI + @K@CODE + /***@@@ ERROR ***/ + /*@@ERRORTEXT + *@ DB-OVERFLOW + *@ + *@ + *@@DESCRIPTION + *@ THE INSTANCE-CREATION WAS NOT POSSIBLE + *@ BECAUSE THE DATABASE WOULD OVERFLOW + *@ + *@@EXTRA INFO + *@ (EXTRA_INFO_4_STRUCT) + *@ NSEI + *@ NSVCI + *@ TEXT + *@ + */ + + EXTRA_INFO.TYP4.NSEI := EVD_PTR->.KEYS.INT_ARR(0); + EXTRA_INFO.TYP4.NSVCI:= EVD_PTR->.KEYS.INT_ARR(1); + EXTRA_INFO.TYP4.TEXT := 'NSVC-HAND.: NSEI/NSVC-OVERFLOW'; + + G9PXYA1S!G9TE500_EHP_P( + 'G9IBSA1C004', /*@@ID*/ + G9PXYA1S!G9TE102_ERR_CLASS_ESC_MAX_ANY, /*@@CLASS*/ + ADDR(EXTRA_INFO.ERROR_HANDLER), /* EXTRA-INFO ADDR */ + G9PXYA1S!G9TE100_GB_LM, /* USER-ID */ + NULL /* OPTIONAL-SWET-INFO ADDR */ + ); + /***@@@ END OF ERROR ***/ + + @K@FREEZE + 920903226 + @K@NAME + TR_RESET + @K@INSCRIPT + RESTART_ + TNS_RESET_ + TIMER + @K@CODE + /* TIMER EVENT DESCRIPTOR STILL THERE */ + + /* INITIALIZATION OF THE TIMER-EVENT-DESCRIPTOR STILL VALID */ + NSVCI_CON_PTR->.TIM_EVD_PTR->.TIMER:= TNS_RESET_MAP; + + /* START TIMER */ + G9PX508_START_TIMER_P + ( + NSVCI_CON_PTR->.TIM_EVD_PTR + ); + + @K@FREEZE + 924684867 + @K@NAME + TX_AUDIT + @K@INSCRIPT + FOR + AUDIT + + @K@NAME + M_BLKOACKM + @K@INSCRIPT + NS_ + BLOCK_ACK + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9IBDF4_NS_LM_M) + G9IBD44_NS_PDU_DATA_OFFSET_C), + TX_EVD_PTR + ); + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9IBD40_NS_LM_PDU_C; + TX_EVD_PTR->.EVENT_DESTINATION:= GBDL_HANDLE; + + IF + /* 'OTHER' ALIVE NSVC TO THIS NSEI EXISTING? */ + NSVCI_CON_PTR->.OWN_NSEI_CON_PTR->.NEXT_ALIV_NSVCI_CON_PTR /= NULL + THEN + /* USE THIS 'OTHER' FOR TRANSPORT */ + TX_EVD_PTR->.KEYS.INT_ARR(0):= + + NSVCI_CON_PTR->.OWN_NSEI_CON_PTR->.NEXT_ALIV_NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSEI; + /* NSEI TO BE USED FOR TRANSPORT */ + TX_EVD_PTR->.KEYS.INT_ARR(1):= + + NSVCI_CON_PTR->.OWN_NSEI_CON_PTR->.NEXT_ALIV_NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; + /* NSVCI TO BE USED FOR TRANSPORT */ + ELSE + /* USE AFFECTED NSVC AGAIN FOR TRANSPORT */ + TX_EVD_PTR->.KEYS.INT_ARR(0):= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSEI; /* NSEI TO BE USED FOR + TRANSPORT */ + TX_EVD_PTR->.KEYS.INT_ARR(1):= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; /* NSVCI TO BE USED FOR + TRANSPORT */ + FI; + + + /* POINTER TO PDU IN POOL-ELEMENT */ + NS_PDU_PTR:= NS_PDU_REF_M (INT(TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT) + + G9IBD44_NS_PDU_DATA_OFFSET_C); + /* OFFSET OF THE PDU IN POOL-ELEMENT */ + TX_EVD_PTR->.BOUND.DATA_OFFSET:= G9IBD44_NS_PDU_DATA_OFFSET_C; + /* LENGTH OF THE PDU IN POOL-ELEMENT */ + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(NS_PDU_PTR->.G9IBDF4_PDU_TYPE) + + SIZE(NS_PDU_PTR->.D3); + + /* NOW THE POOL-ELEMENT */ + NS_PDU_PTR->.G9IBDF4_PDU_TYPE:= G9IBDR2_NS_BLOCK_ACK_C; /* PDU-TYPE */ + + NS_PDU_PTR->.D3.NSVCI_TLV.NSVCI_VAL := + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; /* NSVC TO BE BLOCKED */ + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 938805885 + @K@NAME + T_RCTRUE + @K@INSCRIPT + RC + = + TRUE + @K@CODE + RC:= TRUE; + + @K@FREEZE + 922176328 + @K@NAME + M_AC_SBVCN + @K@INSCRIPT + G9IBME0_ + ACT_ + SIGN_BVC_C + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB512_GET_MSG_LESS_EV_DESCR_P + ( + SID_GBNSVC, + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + TX_EVD_PTR->.EVENT_CMD:= G9IBME0_ACT_SIGN_BVC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= GBBVC_HANDLE; + TX_EVD_PTR->.KEYS.INT_ARR(0):= EVD_PTR->.KEYS.INT_ARR(0); + TX_EVD_PTR->.KEYS.INT_ARR(1):= SIGN_BVCI; + + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 938788211 + @K@NAME + T_RC_EOD + @K@INSCRIPT + RC + = + END OF DATA + + @K@CODE + RC:= G9IBSM4_RC_END_OF_DATA; + + @K@FREEZE + 921083785 + @K@NAME + T_RC_EMP + @K@INSCRIPT + RC + = + EMPTY + + @K@CODE + RC:= G9IBSM4_RC_EMPTY; + + @K@FREEZE + 921083757 + @K@NAME + T_RC_ERR + @K@INSCRIPT + RC + = + ERROR + + @K@CODE + RC:= G9IBSM4_RC_ERROR; + + @K@FREEZE + 921083731 + @K@NAME + S_UNUSED + @K@INSCRIPT + G9IBSM0_ + UNUSED + @K@CODE + + + @K@FREEZE + 919416670 + @K@NAME + TA_UNBLOCK + @K@INSCRIPT + START_ + TNS_UNBLOCK_ + TIMER + @K@CODE + /* GET TIMER-EVENT DESCRIPTOR */ + G9PB513_GET_TIMER_EV_DESCR_P + ( + SID_GBNSVC, + NSVCI_CON_PTR->.TIM_EVD_PTR + ); + + /* INITIALIZATION OF THE TIMER-EVENT-DESCRIPTOR */ + NSVCI_CON_PTR->.TIM_EVD_PTR->.EVENT_CMD:= G9IBSE4_TO_TNS_C; + NSVCI_CON_PTR->.TIM_EVD_PTR->.EVENT_DESTINATION:= GBNSVC_HANDLE; + NSVCI_CON_PTR->.TIM_EVD_PTR->.KEYS.INT_ARR(0):= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSEI; + NSVCI_CON_PTR->.TIM_EVD_PTR->.KEYS.INT_ARR(1):= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; + NSVCI_CON_PTR->.TIM_EVD_PTR->.TIMER:= TNS_UNBLOCK_MAP; + + /* START TIMER */ + G9PX508_START_TIMER_P + ( + NSVCI_CON_PTR->.TIM_EVD_PTR + ); + + @K@FREEZE + 924686210 + @K@NAME + M_BLK_ACKM + @K@INSCRIPT + NS_ + BLOCK_ACK + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9IBDF4_NS_LM_M) + G9IBD44_NS_PDU_DATA_OFFSET_C), + TX_EVD_PTR + ); + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9IBD40_NS_LM_PDU_C; + TX_EVD_PTR->.EVENT_DESTINATION:= GBDL_HANDLE; + TX_EVD_PTR->.KEYS.INT_ARR(0):= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSEI; /* NSEI TO BE USED FOR + TRANSPORT */ + TX_EVD_PTR->.KEYS.INT_ARR(1):= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; /* NSVCI TO BE USED FOR + TRANSPORT */ + /* POINTER TO PDU IN POOL-ELEMENT */ + NS_PDU_PTR:= NS_PDU_REF_M (INT(TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT) + + G9IBD44_NS_PDU_DATA_OFFSET_C); + /* OFFSET OF THE PDU IN POOL-ELEMENT */ + TX_EVD_PTR->.BOUND.DATA_OFFSET:= G9IBD44_NS_PDU_DATA_OFFSET_C; + /* LENGTH OF THE PDU IN POOL-ELEMENT */ + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(NS_PDU_PTR->.G9IBDF4_PDU_TYPE) + + SIZE(NS_PDU_PTR->.D3); + + /* NOW THE POOL-ELEMENT */ + NS_PDU_PTR->.G9IBDF4_PDU_TYPE:= G9IBDR2_NS_BLOCK_ACK_C; /* PDU-TYPE */ + + NS_PDU_PTR->.D3.NSVCI_TLV.NSVCI_VAL := + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; /* NSVC TO BE BLOCKED */ + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 926348442 + @K@NAME + TA_NXTALIV + @K@INSCRIPT + DEFINE + NEW 'NEXT_ + ALIVE' + @K@CODE + IF + /* ALIVE NSVC TO THE NSEI EXISTING? */ + NSVCI_CON_PTR->.OWN_NSEI_CON_PTR->.NEXT_ALIV_NSVCI_CON_PTR /= NULL + + THEN + /* TAKE NEXT ELEMENT IN THE LINKED LIST AS THE NEXT ALIVE NSVC */ + NSVCI_CON_PTR->.OWN_NSEI_CON_PTR->.NEXT_ALIV_NSVCI_CON_PTR:= + + NSVCI_CON_PTR->.OWN_NSEI_CON_PTR->.NEXT_ALIV_NSVCI_CON_PTR->.NEXT_ALV_NSVCI_CON_PTR; + + FI; + + @K@FREEZE + 938801086 + @K@NAME + M_DE_CBVCN + @K@INSCRIPT + G9IBME2_ + DEACT_ + CELL_BVC_C + + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB512_GET_MSG_LESS_EV_DESCR_P + ( + SID_GBNSVC, + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + TX_EVD_PTR->.EVENT_CMD:= G9IBME2_DEACT_CELL_BVC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= GBBVC_HANDLE; + TX_EVD_PTR->.KEYS.INT_ARR(0):= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSEI; + TX_EVD_PTR->.KEYS.INT_ARR(1):= EVD_PTR->.ADD_DATA(3); + + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 933318270 + @K@NAME + TA_NXTRESP + @K@INSCRIPT + DEFINE + NEW 'NEXT_ + RESPONSIBLE' + @K@CODE + NSEI_CON_PTR->.NEXT_RESP_NSVCI_CON_PTR:= + NSEI_CON_PTR->.NEXT_RESP_NSVCI_CON_PTR->.NEXT_LSP_NSVCI_CON_PTR; + + + @K@FREEZE + 938005006 + @K@NAME + TA_NXTSUBS + @K@INSCRIPT + DEFINE + NEW 'NEXT_ + SUBSTITUTE' + @K@CODE + NSEI_CON_PTR->.NEXT_SUBS_NSVCI_CON_PTR:= + NSEI_CON_PTR->.NEXT_SUBS_NSVCI_CON_PTR->.NEXT_UBL_NSVCI_CON_PTR; + + @K@NAME + M_BLK_O__M + @K@INSCRIPT + NS_ + BLOCK + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9IBDF4_NS_LM_M) + G9IBD44_NS_PDU_DATA_OFFSET_C), + TX_EVD_PTR + ); + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9IBD40_NS_LM_PDU_C; + TX_EVD_PTR->.EVENT_DESTINATION:= GBDL_HANDLE; + + IF + /* 'OTHER' ALIVE NSVC TO THIS NSEI EXISTING? */ + NSVCI_CON_PTR->.OWN_NSEI_CON_PTR->.NEXT_ALIV_NSVCI_CON_PTR /= NULL + THEN + /* USE THIS 'OTHER' FOR TRANSPORT */ + TX_EVD_PTR->.KEYS.INT_ARR(0):= + + NSVCI_CON_PTR->.OWN_NSEI_CON_PTR->.NEXT_ALIV_NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSEI; + /* NSEI TO BE USED FOR TRANSPORT */ + TX_EVD_PTR->.KEYS.INT_ARR(1):= + + NSVCI_CON_PTR->.OWN_NSEI_CON_PTR->.NEXT_ALIV_NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; + /* NSVCI TO BE USED FOR TRANSPORT */ + ELSE + /* USE AFFECTED NSVC AGAIN FOR TRANSPORT */ + TX_EVD_PTR->.KEYS.INT_ARR(0):= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSEI; /* NSEI TO BE USED FOR + TRANSPORT */ + TX_EVD_PTR->.KEYS.INT_ARR(1):= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; /* NSVCI TO BE USED FOR + TRANSPORT */ + FI; + + + /* POINTER TO PDU IN POOL-ELEMENT */ + NS_PDU_PTR:= NS_PDU_REF_M (INT(TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT) + + G9IBD44_NS_PDU_DATA_OFFSET_C); + /* OFFSET OF THE PDU IN POOL-ELEMENT */ + TX_EVD_PTR->.BOUND.DATA_OFFSET:= G9IBD44_NS_PDU_DATA_OFFSET_C; + /* LENGTH OF THE PDU IN POOL-ELEMENT */ + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(NS_PDU_PTR->.G9IBDF4_PDU_TYPE) + + SIZE(NS_PDU_PTR->.D2); + + + /* NOW THE POOL-ELEMENT */ + NS_PDU_PTR->.G9IBDF4_PDU_TYPE:= G9IBDR1_NS_BLOCK_C; /* PDU-TYPE */ + + NS_PDU_PTR->.D2.CAUSE_TLV.CAUSE_VAL:= + G9IBBA2_NS_TRANSIT_NETWORK_FAILURE; /* CAUSE FOR BLOCK */ + NS_PDU_PTR->.D2.NSVCI_TLV.NSVCI_VAL := + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; /* NSVC TO BE BLOCKED */ + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@TEXT + GSM 8.16 CHAP. 7.2: + THE NS-BLOCK-PDU MAY BE SENT IN ANY ALIVE + (BLOCKED OR UNBLOCKED) NS-VC... + @K@FREEZE + 938803215 + @K@NAME + M_DE_SBVCN + @K@INSCRIPT + G9IBME1_ + DEACT_ + SIGN_BVC_C + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB512_GET_MSG_LESS_EV_DESCR_P + ( + SID_GBNSVC, + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + TX_EVD_PTR->.EVENT_CMD:= G9IBME1_DEACT_SIGN_BVC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= GBBVC_HANDLE; + TX_EVD_PTR->.KEYS.INT_ARR(0):= EVD_PTR->.KEYS.INT_ARR(0); + TX_EVD_PTR->.KEYS.INT_ARR(1):= SIGN_BVCI; + + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 938788201 + @K@NAME + M_OAME401M + @K@INSCRIPT + ERROR_MESSAGE: + ERRONOUS_PDU + RESET_PDU + + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSE */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSE; + OAM_MSG_PTR->.HANDLED_OBJECT.NSE_ID:= EVD_PTR->.KEYS.INT_ARR(0); /* + USED NSEI (FROM ECI) */ + + /* ERROR-CAUSE = ERRONEOUS_PDU */ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_ERRONEOUS_PDU; + /* ADDITIONAL_PDU_INFO */ + OAM_MSG_PTR->.ADDITIONAL_PDU_INFO.G9OC120_PDU_TYPE:= + G9OC124_RESET_PDU; + OAM_MSG_PTR->.ADDITIONAL_PDU_INFO.G9OC120_REPORTED_NSEI:= + EVD_PTR->.ADD_DATA(0); /* AFFECTED NSEI (FROM PDU) */ + OAM_MSG_PTR->.ADDITIONAL_PDU_INFO.G9OC120_REPORTED_NSVC:= + EVD_PTR->.ADD_DATA(1); /* AFFECTED NSVCI (FROM PDU) */ + + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 935766108 + @K@NAME + M_OAME402M + @K@INSCRIPT + ERROR_MESSAGE: + ERRONOUS_PDU + RESET_PDU + + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSVC */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSVC; + OAM_MSG_PTR->.HANDLED_OBJECT.NSVC_ID:= EVD_PTR->.KEYS.INT_ARR(1); /* + USED NSVCI (FROM ECI) */ + + /* ERROR-CAUSE = ERRONEOUS_PDU */ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_ERRONEOUS_PDU; + /* ADDITIONAL_PDU_INFO */ + OAM_MSG_PTR->.ADDITIONAL_PDU_INFO.G9OC120_PDU_TYPE:= + G9OC124_RESET_PDU; + OAM_MSG_PTR->.ADDITIONAL_PDU_INFO.G9OC120_REPORTED_NSEI:= + EVD_PTR->.ADD_DATA(0); /* NSEI FROM PDU */ + OAM_MSG_PTR->.ADDITIONAL_PDU_INFO.G9OC120_REPORTED_NSVC:= + EVD_PTR->.ADD_DATA(1); /* NSVCI FROM PDU */ + + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 935766407 + @K@NAME + M_OAME411M + @K@INSCRIPT + ERROR_MESSAGE: + ERRONOUS_PDU + RESET_ACK_PDU + + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSE */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSE; + OAM_MSG_PTR->.HANDLED_OBJECT.NSE_ID:= EVD_PTR->.KEYS.INT_ARR(0); /* + USED NSEI (FROM ECI) */ + + /* ERROR-CAUSE = ERRONEOUS_PDU */ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_ERRONEOUS_PDU; + /* ADDITIONAL_PDU_INFO */ + OAM_MSG_PTR->.ADDITIONAL_PDU_INFO.G9OC120_PDU_TYPE:= + G9OC124_RESET_ACK_PDU; + OAM_MSG_PTR->.ADDITIONAL_PDU_INFO.G9OC120_REPORTED_NSEI:= + EVD_PTR->.ADD_DATA(0); /* NSEI FROM PDU */ + OAM_MSG_PTR->.ADDITIONAL_PDU_INFO.G9OC120_REPORTED_NSVC:= + EVD_PTR->.ADD_DATA(1); /* NSVCI FROM PDU */ + + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 935767332 + @K@NAME + M_OAME412M + @K@INSCRIPT + ERROR_MESSAGE: + ERRONOUS_PDU + RESET_ACK_PDU + + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSVC */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSVC; + OAM_MSG_PTR->.HANDLED_OBJECT.NSVC_ID:= EVD_PTR->.KEYS.INT_ARR(1); /* + USED NSVCI (FROM ECI) */ + + /* ERROR-CAUSE = ERRONEOUS_PDU */ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_ERRONEOUS_PDU; + /* ADDITIONAL_PDU_INFO */ + OAM_MSG_PTR->.ADDITIONAL_PDU_INFO.G9OC120_PDU_TYPE:= + G9OC124_RESET_ACK_PDU; + OAM_MSG_PTR->.ADDITIONAL_PDU_INFO.G9OC120_REPORTED_NSEI:= + EVD_PTR->.ADD_DATA(0); /* NSEI FROM PDU */ + OAM_MSG_PTR->.ADDITIONAL_PDU_INFO.G9OC120_REPORTED_NSVC:= + EVD_PTR->.ADD_DATA(1); /* NSVCI FROM PDU */ + + + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 935767189 + @K@NAME + C_CON + @K@INSCRIPT + RC_DB + @K@CODE + RC_DB + + @K@FREEZE + 922176673 + @K@NAME + M_BLK____M + @K@INSCRIPT + NS_ + BLOCK + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9IBDF4_NS_LM_M) + G9IBD44_NS_PDU_DATA_OFFSET_C), + TX_EVD_PTR + ); + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9IBD40_NS_LM_PDU_C; + TX_EVD_PTR->.EVENT_DESTINATION:= GBDL_HANDLE; + TX_EVD_PTR->.KEYS.INT_ARR(0):= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSEI; /* NSEI TO BE USED FOR + TRANSPORT */ + TX_EVD_PTR->.KEYS.INT_ARR(1):= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; /* NSVCI TO BE USED FOR + TRANSPORT */ + /* POINTER TO PDU IN POOL-ELEMENT */ + NS_PDU_PTR:= NS_PDU_REF_M (INT(TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT) + + G9IBD44_NS_PDU_DATA_OFFSET_C); + /* OFFSET OF THE PDU IN POOL-ELEMENT */ + TX_EVD_PTR->.BOUND.DATA_OFFSET:= G9IBD44_NS_PDU_DATA_OFFSET_C; + /* LENGTH OF THE PDU IN POOL-ELEMENT */ + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(NS_PDU_PTR->.G9IBDF4_PDU_TYPE) + + SIZE(NS_PDU_PTR->.D2); + + + /* NOW THE POOL-ELEMENT */ + NS_PDU_PTR->.G9IBDF4_PDU_TYPE:= G9IBDR1_NS_BLOCK_C; /* PDU-TYPE */ + + NS_PDU_PTR->.D2.CAUSE_TLV.CAUSE_VAL:= + G9IBBA2_NS_OAM_INTERVENTION; /* CAUSE FOR BLOCK */ + NS_PDU_PTR->.D2.NSVCI_TLV.NSVCI_VAL := + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; /* NSVC TO BE BLOCKED */ + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@TEXT + GSM 8.16 CHAP. 7.2: + THE NS-BLOCK-PDU MAY BE SENT IN ANY ALIVE + (BLOCKED OR UNBLOCKED) NS-VC... + @K@FREEZE + 926348613 + @K@NAME + S_BLOCKED + @K@INSCRIPT + G9IBSM0_ + BLOCKED + @K@CODE + + + @K@FREEZE + 922176496 + @K@NAME + D_CON + @K@INSCRIPT + CONTEXT + GOT + @K@CODE + RC_DB = G9IBSR0_RC_OK + + @K@FREEZE + 921772339 + @K@NAME + M_OAME901M + @K@INSCRIPT + ERROR_MESSAGE: + OPERATIONAL_STATE_CHANGE + UBL->BLK + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSVC */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSVC; + OAM_MSG_PTR->.HANDLED_OBJECT.NSVC_ID:= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; + + /* ERROR_CAUSE = OPERATIONAL_STATE_CHANGE */ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_OPERATIONAL_STATE_CHANGE; + /* ADDITIONAL_OPERATIONAL_STATE_INFO */ + OAM_MSG_PTR->.ADDITIONAL_OPERATIONAL_STATE_INFO.OPER_STATE_OLD:= + G9OC101_UNBLOCKED; + OAM_MSG_PTR->.ADDITIONAL_OPERATIONAL_STATE_INFO.OPER_STATE_NEW:= + G9OC101_BLOCKED; + OAM_MSG_PTR->.ADDITIONAL_OPERATIONAL_STATE_INFO.ADMIN_STATE_OLD:= + G9OC102_ENABLED; + OAM_MSG_PTR->.ADDITIONAL_OPERATIONAL_STATE_INFO.ADMIN_STATE_NEW:= + G9OC102_ENABLED; + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 925970975 + @K@NAME + M_OAME902M + @K@INSCRIPT + ERROR_MESSAGE: + OPERATIONAL_STATE_CHANGE + UBL->BLK + + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSVC */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSVC; + OAM_MSG_PTR->.HANDLED_OBJECT.NSVC_ID:= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; + + /* ERROR_CAUSE = OPERATIONAL_STATE_CHANGE */ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_OPERATIONAL_STATE_CHANGE; + /* ADDITIONAL_OPERATIONAL_STATE_INFO */ + OAM_MSG_PTR->.ADDITIONAL_OPERATIONAL_STATE_INFO.OPER_STATE_OLD:= + G9OC101_UNBLOCKED; + OAM_MSG_PTR->.ADDITIONAL_OPERATIONAL_STATE_INFO.OPER_STATE_NEW:= + G9OC101_BLOCKED; + OAM_MSG_PTR->.ADDITIONAL_OPERATIONAL_STATE_INFO.ADMIN_STATE_OLD:= + G9OC102_ENABLED; + OAM_MSG_PTR->.ADDITIONAL_OPERATIONAL_STATE_INFO.ADMIN_STATE_NEW:= + G9OC102_DISABLED; + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 925970987 + @K@NAME + M_OAME10SM + @K@INSCRIPT + ERROR_MESSAGE: + ALARM_BEGIN_NS_ALIVE_TEST + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSVC */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSVC; + OAM_MSG_PTR->.HANDLED_OBJECT.NSVC_ID:= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; + + /* ERROR_CAUSE = ALARM_BEGIN_NS_ALIVE_TEST*/ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_ALARM_BEGIN_NS_ALIVE_TEST; + /* ADDITIONAL_ALARM_INFO */ + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.ADMINISTRATIVE_STATE_CHANGED:= + TRUE; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.OPER_STATE_OLD:= + G9OC101_BLOCKED; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.OPER_STATE_NEW:= + G9OC101_BLOCKED; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.AVAIL_STATE_OLD:= + G9OC103_DEAD; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.AVAIL_STATE_NEW:= + G9OC103_DEAD; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.CONFIGURATION_OF_NSVC:= + TRUE; + + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@NAME + M_OAME911M + @K@INSCRIPT + ERROR_MESSAGE: + OPERATIONAL_STATE_CHANGE + BLK->UBL + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSVC */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSVC; + OAM_MSG_PTR->.HANDLED_OBJECT.NSVC_ID:= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; + + /* ERROR_CAUSE = OPERATIONAL_STATE_CHANGE */ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_OPERATIONAL_STATE_CHANGE; + /* ADDITIONAL_OPERATIONAL_STATE_INFO */ + OAM_MSG_PTR->.ADDITIONAL_OPERATIONAL_STATE_INFO.OPER_STATE_OLD:= + G9OC101_BLOCKED; + OAM_MSG_PTR->.ADDITIONAL_OPERATIONAL_STATE_INFO.OPER_STATE_NEW:= + G9OC101_UNBLOCKED; + OAM_MSG_PTR->.ADDITIONAL_OPERATIONAL_STATE_INFO.ADMIN_STATE_OLD:= + G9OC102_ENABLED; + OAM_MSG_PTR->.ADDITIONAL_OPERATIONAL_STATE_INFO.ADMIN_STATE_NEW:= + G9OC102_ENABLED; + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 925970996 + @K@NAME + M_OAME20SM + @K@INSCRIPT + ERROR_MESSAGE: + ALARM_END_NS_ALIVE_TEST + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSVC */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSVC; + OAM_MSG_PTR->.HANDLED_OBJECT.NSVC_ID:= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; + + /* ERROR_CAUSE = ALARM_END_NS_ALIVE_TEST */ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_ALARM_END_NS_ALIVE_TEST; + /* ADDITIONAL_ALARM_INFO */ + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.ADMINISTRATIVE_STATE_CHANGED:= + TRUE; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.OPER_STATE_OLD:= + G9OC101_BLOCKED; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.OPER_STATE_NEW:= + G9OC101_BLOCKED; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.AVAIL_STATE_OLD:= + G9OC103_DEAD; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.AVAIL_STATE_NEW:= + G9OC103_DEAD; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.CONFIGURATION_OF_NSVC:= + TRUE; + + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@NAME + M_OAME10_M + @K@INSCRIPT + ERROR_MESSAGE: + ALARM_BEGIN_NS_ALIVE_TEST + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSVC */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSVC; + OAM_MSG_PTR->.HANDLED_OBJECT.NSVC_ID:= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; + + /* ERROR_CAUSE = ALARM_BEGIN_NS_ALIVE_TEST*/ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_ALARM_BEGIN_NS_ALIVE_TEST; + /* ADDITIONAL_ALARM_INFO */ + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.ADMINISTRATIVE_STATE_CHANGED:= + TRUE; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.OPER_STATE_OLD:= + G9OC101_BLOCKED; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.OPER_STATE_NEW:= + G9OC101_BLOCKED; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.AVAIL_STATE_OLD:= + G9OC103_DEAD; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.AVAIL_STATE_NEW:= + G9OC103_DEAD; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.CONFIGURATION_OF_NSVC:= + TRUE; + + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 922443813 + @K@NAME + D_SEM + @K@INSCRIPT + CALL_SEM + = + TRUE + @K@CODE + CALL_SEM = TRUE + + @K@FREEZE + 922176624 + @K@NAME + D_N_0 + @K@INSCRIPT + N = 0 + + @K@CODE + NSVCI_CON_PTR->.N = 0 + + @K@FREEZE + 921511000 + @K@NAME + M_OAME12_M + @K@INSCRIPT + ERROR_MESSAGE: + ALARM_BEGIN_NS_ALIVE_TEST + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSVC */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSVC; + OAM_MSG_PTR->.HANDLED_OBJECT.NSVC_ID:= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; + + /* ERROR_CAUSE = ALARM_BEGIN_NS_ALIVE_TEST*/ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_ALARM_BEGIN_NS_ALIVE_TEST; + /* ADDITIONAL_ALARM_INFO */ + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.ADMINISTRATIVE_STATE_CHANGED:= + FALSE; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.OPER_STATE_OLD:= + G9OC101_BLOCKED; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.OPER_STATE_NEW:= + G9OC101_BLOCKED; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.AVAIL_STATE_OLD:= + G9OC103_ALIVE; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.AVAIL_STATE_NEW:= + G9OC103_DEAD; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.CONFIGURATION_OF_NSVC:= + TRUE; + + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 922443829 + @K@NAME + M_OAME21_M + @K@INSCRIPT + ERROR_MESSAGE: + ALARM_END_NS_ALIVE_TEST + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSVC */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSVC; + OAM_MSG_PTR->.HANDLED_OBJECT.NSVC_ID:= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; + + /* ERROR_CAUSE = ALARM_END_NS_ALIVE_TEST */ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_ALARM_END_NS_ALIVE_TEST; + /* ADDITIONAL_ALARM_INFO */ + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.ADMINISTRATIVE_STATE_CHANGED:= + TRUE; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.OPER_STATE_OLD:= + G9OC101_BLOCKED; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.OPER_STATE_NEW:= + G9OC101_BLOCKED; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.AVAIL_STATE_OLD:= + G9OC103_DEAD; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.AVAIL_STATE_NEW:= + G9OC103_DEAD; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.CONFIGURATION_OF_NSVC:= + FALSE; + + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 922443856 + @K@NAME + M_OAME13_M + @K@INSCRIPT + ERROR_MESSAGE: + ALARM_BEGIN_NS_ALIVE_TEST + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSVC */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSVC; + OAM_MSG_PTR->.HANDLED_OBJECT.NSVC_ID:= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; + + /* ERROR_CAUSE = ALARM_BEGIN_NS_ALIVE_TEST*/ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_ALARM_BEGIN_NS_ALIVE_TEST; + /* ADDITIONAL_ALARM_INFO */ + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.ADMINISTRATIVE_STATE_CHANGED:= + FALSE; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.OPER_STATE_OLD:= + G9OC101_UNBLOCKED; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.OPER_STATE_NEW:= + G9OC101_BLOCKED; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.AVAIL_STATE_OLD:= + G9OC103_ALIVE; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.AVAIL_STATE_NEW:= + G9OC103_DEAD; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.CONFIGURATION_OF_NSVC:= + TRUE; + + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 922443838 + @K@NAME + M_OAME22_M + @K@INSCRIPT + ERROR_MESSAGE: + ALARM_END_NS_ALIVE_TEST + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSVC */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSVC; + OAM_MSG_PTR->.HANDLED_OBJECT.NSVC_ID:= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; + + /* ERROR_CAUSE = ALARM_END_NS_ALIVE_TEST */ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_ALARM_END_NS_ALIVE_TEST; + /* ADDITIONAL_ALARM_INFO */ + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.ADMINISTRATIVE_STATE_CHANGED:= + FALSE; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.OPER_STATE_OLD:= + G9OC101_BLOCKED; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.OPER_STATE_NEW:= + G9OC101_BLOCKED; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.AVAIL_STATE_OLD:= + G9OC103_DEAD; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.AVAIL_STATE_NEW:= + G9OC103_ALIVE; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.CONFIGURATION_OF_NSVC:= + TRUE; + + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 922443864 + @K@NAME + M_OAME30_M + @K@INSCRIPT + ERROR_MESSAGE: + NO_ANSWER_FORM_BSS + RESET_PROCEDURE + + + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSVC */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSVC; + OAM_MSG_PTR->.HANDLED_OBJECT.NSVC_ID:= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; + + /* ERROR_CAUSE = NO_ANSWER_FROM_BSS */ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_NO_ANSWER_FROM_BSS; + /* INITIATED_PROCEDURE */ + OAM_MSG_PTR->.INITIATED_PROCEDURE:= + G9OC123_RESET_PROCEDURE; + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 922175973 + @K@NAME + M_OAME31_M + @K@INSCRIPT + ERROR_MESSAGE: + NO_ANSWER_FROM_BSS + BLOCK_PROCEDURE + + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSVC */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSVC; + OAM_MSG_PTR->.HANDLED_OBJECT.NSVC_ID:= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; + + /* ERROR_CAUSE = NO_ANSWER_FROM_BSS */ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_NO_ANSWER_FROM_BSS; + /* INITIATED_PROCEDURE */ + OAM_MSG_PTR->.INITIATED_PROCEDURE:= + G9OC123_BLOCK_PROCEDURE; + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 922175976 + @K@NAME + M_OAME32_M + @K@INSCRIPT + ERROR_MESSAGE: + NO_ANSWER_FROM_BSS + UNBLOCK_PROCEDURE + + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSVC */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSVC; + OAM_MSG_PTR->.HANDLED_OBJECT.NSVC_ID:= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; + + /* ERROR_CAUSE = NO_ANSWER_FROM_BSS */ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_NO_ANSWER_FROM_BSS; + /* INITIATED_PROCEDURE */ + OAM_MSG_PTR->.INITIATED_PROCEDURE:= + G9OC123_UNBLOCK_PROCEDURE; + + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 922175980 + @K@NAME + M_OAME42_M + @K@INSCRIPT + ERROR_MESSAGE: + ERRONOUS_PDU + BLOCK_PDU + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSVC */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSVC; + OAM_MSG_PTR->.HANDLED_OBJECT.NSVC_ID:= EVD_PTR->.ADD_DATA(1); /* + USED NSVCI (FROM ECI) */ + + /* ERROR-CAUSE = ERRONEOUS_PDU */ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_ERRONEOUS_PDU; + /* ADDITIONAL_PDU_INFO */ + OAM_MSG_PTR->.ADDITIONAL_PDU_INFO.G9OC120_PDU_TYPE:= + G9OC124_BLOCK_PDU; + OAM_MSG_PTR->.ADDITIONAL_PDU_INFO.G9OC120_REPORTED_NSEI:= + EVD_PTR->.KEYS.INT_ARR(0); /* AFFECTED NSEI (FROM PDU) */ + OAM_MSG_PTR->.ADDITIONAL_PDU_INFO.G9OC120_REPORTED_NSVC:= + EVD_PTR->.KEYS.INT_ARR(1); /* AFFECTED NSVCI (FROM PDU) */ + + + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 934296141 + @K@NAME + M_OAME50_M + @K@INSCRIPT + ERROR_MESSAGE: + STATUS_PDU_CONTAINS_ERROR_INFO + RECEIVED + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSVC */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSVC; + OAM_MSG_PTR->.HANDLED_OBJECT.NSVC_ID:= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; + + /* ERROR-CAUSE = STATUS_PDU_CONTAINS_ERROR_INFO */ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_STATUS_PDU_CONTAINS_ERROR_INFO; + /* ADDITIONAL_STATUS_PDU_INFO */ + INT_CAUSE_PTR.INT_PTR:= ADDR(EVD_PTR->.ADD_DATA(2)); + OAM_MSG_PTR->.ADDITIONAL_STATUS_PDU_INFO:= + INT_CAUSE_PTR.CAUSE_PTR->; /* CAUSE */ + + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@TEXT + NICHT OK + + @K@FREEZE + 934298924 + @K@NAME + M_OAME43_M + @K@INSCRIPT + ERROR_MESSAGE: + ERRONOUS_PDU + BLOCK_ACK_PDU + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSVC */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSVC; + OAM_MSG_PTR->.HANDLED_OBJECT.NSVC_ID:= EVD_PTR->.ADD_DATA(1); /* + USED NSVCI (FROM ECI) */ + + /* ERROR-CAUSE = ERRONEOUS_PDU */ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_ERRONEOUS_PDU; + /* ADDITIONAL_PDU_INFO */ + OAM_MSG_PTR->.ADDITIONAL_PDU_INFO.G9OC120_PDU_TYPE:= + G9OC124_BLOCK_ACK_PDU; + OAM_MSG_PTR->.ADDITIONAL_PDU_INFO.G9OC120_REPORTED_NSEI:= + EVD_PTR->.KEYS.INT_ARR(0); /* AFFECTED NSEI (FROM PDU) */ + OAM_MSG_PTR->.ADDITIONAL_PDU_INFO.G9OC120_REPORTED_NSVC:= + EVD_PTR->.KEYS.INT_ARR(1); /* AFFECTED NSVCI (FROM PDU) */ + + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 934297710 diff -cNr gawk-3.0.4/test/getlnbuf.ok gawk-3.0.5/test/getlnbuf.ok *** gawk-3.0.4/test/getlnbuf.ok Thu Jan 1 02:00:00 1970 --- gawk-3.0.5/test/getlnbuf.ok Wed Jun 14 13:12:25 2000 *************** *** 0 **** --- 1,1708 ---- + EXTRA_INFO.TYP3.EC := EC; + EXTRA_INFO.TYP3.TEXT:= 'CONNECT_SERVICE TO OAM FAILED'; + + G9PXYA1S!G9TE500_EHP_P( + 'G9IBSA1C003', /*@@ID*/ + G9PXYA1S!G9TE102_ERR_CLASS_SWERR, /*@@CLASS*/ + ADDR(EXTRA_INFO.ERROR_HANDLER), /* EXTRA-INFO ADDR */ + G9PXYA1S!G9TE100_GB_LM, /* USER-ID */ + NULL /* OPTIONAL-SWET-INFO ADDR */ + ); + /***@@@ END OF ERROR ***/ + + @K@FREEZE + 917596041 + @K@NAME + T_ERR4_1 + @K@INSCRIPT + ERROR_HANDLING: + DB_OVERFLOW + MP/NSEI + @K@CODE + /***@@@ ERROR ***/ + /*@@ERRORTEXT + *@ DB-OVERFLOW + *@ + *@ + *@@DESCRIPTION + *@ THE INSTANCE-CREATION WAS NOT POSSIBLE + *@ BECAUSE THE DATABASE WOULD OVERFLOW + *@ + *@@EXTRA INFO + *@ (EXTRA_INFO_4_STRUCT) + *@ NSEI + *@ NSVCI + *@ TEXT + *@ + */ + + EXTRA_INFO.TYP4.NSEI := EVD_PTR->.KEYS.INT_ARR(0); + EXTRA_INFO.TYP4.NSVCI:= EVD_PTR->.KEYS.INT_ARR(1); + EXTRA_INFO.TYP4.TEXT := 'NSVC-HAND.: MP/NSEI-OVERFLOW'; + + G9PXYA1S!G9TE500_EHP_P( + 'G9IBSA1C004', /*@@ID*/ + G9PXYA1S!G9TE102_ERR_CLASS_ESC_MAX_ANY, /*@@CLASS*/ + ADDR(EXTRA_INFO.ERROR_HANDLER), /* EXTRA-INFO ADDR */ + G9PXYA1S!G9TE100_GB_LM, /* USER-ID */ + NULL /* OPTIONAL-SWET-INFO ADDR */ + ); + /***@@@ END OF ERROR ***/ + + @K@FREEZE + 920903219 + @K@NAME + T_ERR4_2 + @K@INSCRIPT + ERROR_HANDLING: + DB_OVERFLOW + MP/NSVCI + @K@CODE + /***@@@ ERROR ***/ + /*@@ERRORTEXT + *@ DB-OVERFLOW + *@ + *@ + *@@DESCRIPTION + *@ THE INSTANCE-CREATION WAS NOT POSSIBLE + *@ BECAUSE THE DATABASE WOULD OVERFLOW + *@ + *@@EXTRA INFO + *@ (EXTRA_INFO_4_STRUCT) + *@ NSEI + *@ NSVCI + *@ TEXT + *@ + */ + + EXTRA_INFO.TYP4.NSEI := EVD_PTR->.KEYS.INT_ARR(0); + EXTRA_INFO.TYP4.NSVCI:= EVD_PTR->.KEYS.INT_ARR(1); + EXTRA_INFO.TYP4.TEXT := 'NSVC-HAND.: MP/NSVCI-OVERFLOW'; + + G9PXYA1S!G9TE500_EHP_P( + 'G9IBSA1C004', /*@@ID*/ + G9PXYA1S!G9TE102_ERR_CLASS_ESC_MAX_ANY, /*@@CLASS*/ + ADDR(EXTRA_INFO.ERROR_HANDLER), /* EXTRA-INFO ADDR */ + G9PXYA1S!G9TE100_GB_LM, /* USER-ID */ + NULL /* OPTIONAL-SWET-INFO ADDR */ + ); + /***@@@ END OF ERROR ***/ + + @K@FREEZE + 920903222 + @K@NAME + T_ERR4_3 + @K@INSCRIPT + ERROR_HANDLING: + DB_OVERFLOW + NSEI/NSVCI + @K@CODE + /***@@@ ERROR ***/ + /*@@ERRORTEXT + *@ DB-OVERFLOW + *@ + *@ + *@@DESCRIPTION + *@ THE INSTANCE-CREATION WAS NOT POSSIBLE + *@ BECAUSE THE DATABASE WOULD OVERFLOW + *@ + *@@EXTRA INFO + *@ (EXTRA_INFO_4_STRUCT) + *@ NSEI + *@ NSVCI + *@ TEXT + *@ + */ + + EXTRA_INFO.TYP4.NSEI := EVD_PTR->.KEYS.INT_ARR(0); + EXTRA_INFO.TYP4.NSVCI:= EVD_PTR->.KEYS.INT_ARR(1); + EXTRA_INFO.TYP4.TEXT := 'NSVC-HAND.: NSEI/NSVC-OVERFLOW'; + + G9PXYA1S!G9TE500_EHP_P( + 'G9IBSA1C004', /*@@ID*/ + G9PXYA1S!G9TE102_ERR_CLASS_ESC_MAX_ANY, /*@@CLASS*/ + ADDR(EXTRA_INFO.ERROR_HANDLER), /* EXTRA-INFO ADDR */ + G9PXYA1S!G9TE100_GB_LM, /* USER-ID */ + NULL /* OPTIONAL-SWET-INFO ADDR */ + ); + /***@@@ END OF ERROR ***/ + + @K@FREEZE + 920903226 + @K@NAME + TR_RESET + @K@INSCRIPT + RESTART_ + TNS_RESET_ + TIMER + @K@CODE + /* TIMER EVENT DESCRIPTOR STILL THERE */ + + /* INITIALIZATION OF THE TIMER-EVENT-DESCRIPTOR STILL VALID */ + NSVCI_CON_PTR->.TIM_EVD_PTR->.TIMER:= TNS_RESET_MAP; + + /* START TIMER */ + G9PX508_START_TIMER_P + ( + NSVCI_CON_PTR->.TIM_EVD_PTR + ); + + @K@FREEZE + 924684867 + @K@NAME + TX_AUDIT + @K@INSCRIPT + FOR + AUDIT + + @K@NAME + M_BLKOACKM + @K@INSCRIPT + NS_ + BLOCK_ACK + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9IBDF4_NS_LM_M) + G9IBD44_NS_PDU_DATA_OFFSET_C), + TX_EVD_PTR + ); + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9IBD40_NS_LM_PDU_C; + TX_EVD_PTR->.EVENT_DESTINATION:= GBDL_HANDLE; + + IF + /* 'OTHER' ALIVE NSVC TO THIS NSEI EXISTING? */ + NSVCI_CON_PTR->.OWN_NSEI_CON_PTR->.NEXT_ALIV_NSVCI_CON_PTR /= NULL + THEN + /* USE THIS 'OTHER' FOR TRANSPORT */ + TX_EVD_PTR->.KEYS.INT_ARR(0):= + + NSVCI_CON_PTR->.OWN_NSEI_CON_PTR->.NEXT_ALIV_NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSEI; + /* NSEI TO BE USED FOR TRANSPORT */ + TX_EVD_PTR->.KEYS.INT_ARR(1):= + + NSVCI_CON_PTR->.OWN_NSEI_CON_PTR->.NEXT_ALIV_NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; + /* NSVCI TO BE USED FOR TRANSPORT */ + ELSE + /* USE AFFECTED NSVC AGAIN FOR TRANSPORT */ + TX_EVD_PTR->.KEYS.INT_ARR(0):= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSEI; /* NSEI TO BE USED FOR + TRANSPORT */ + TX_EVD_PTR->.KEYS.INT_ARR(1):= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; /* NSVCI TO BE USED FOR + TRANSPORT */ + FI; + + + /* POINTER TO PDU IN POOL-ELEMENT */ + NS_PDU_PTR:= NS_PDU_REF_M (INT(TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT) + + G9IBD44_NS_PDU_DATA_OFFSET_C); + /* OFFSET OF THE PDU IN POOL-ELEMENT */ + TX_EVD_PTR->.BOUND.DATA_OFFSET:= G9IBD44_NS_PDU_DATA_OFFSET_C; + /* LENGTH OF THE PDU IN POOL-ELEMENT */ + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(NS_PDU_PTR->.G9IBDF4_PDU_TYPE) + + SIZE(NS_PDU_PTR->.D3); + + /* NOW THE POOL-ELEMENT */ + NS_PDU_PTR->.G9IBDF4_PDU_TYPE:= G9IBDR2_NS_BLOCK_ACK_C; /* PDU-TYPE */ + + NS_PDU_PTR->.D3.NSVCI_TLV.NSVCI_VAL := + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; /* NSVC TO BE BLOCKED */ + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 938805885 + @K@NAME + T_RCTRUE + @K@INSCRIPT + RC + = + TRUE + @K@CODE + RC:= TRUE; + + @K@FREEZE + 922176328 + @K@NAME + M_AC_SBVCN + @K@INSCRIPT + G9IBME0_ + ACT_ + SIGN_BVC_C + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB512_GET_MSG_LESS_EV_DESCR_P + ( + SID_GBNSVC, + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + TX_EVD_PTR->.EVENT_CMD:= G9IBME0_ACT_SIGN_BVC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= GBBVC_HANDLE; + TX_EVD_PTR->.KEYS.INT_ARR(0):= EVD_PTR->.KEYS.INT_ARR(0); + TX_EVD_PTR->.KEYS.INT_ARR(1):= SIGN_BVCI; + + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 938788211 + @K@NAME + T_RC_EOD + @K@INSCRIPT + RC + = + END OF DATA + + @K@CODE + RC:= G9IBSM4_RC_END_OF_DATA; + + @K@FREEZE + 921083785 + @K@NAME + T_RC_EMP + @K@INSCRIPT + RC + = + EMPTY + + @K@CODE + RC:= G9IBSM4_RC_EMPTY; + + @K@FREEZE + 921083757 + @K@NAME + T_RC_ERR + @K@INSCRIPT + RC + = + ERROR + + @K@CODE + RC:= G9IBSM4_RC_ERROR; + + @K@FREEZE + 921083731 + @K@NAME + S_UNUSED + @K@INSCRIPT + G9IBSM0_ + UNUSED + @K@CODE + + + @K@FREEZE + 919416670 + @K@NAME + TA_UNBLOCK + @K@INSCRIPT + START_ + TNS_UNBLOCK_ + TIMER + @K@CODE + /* GET TIMER-EVENT DESCRIPTOR */ + G9PB513_GET_TIMER_EV_DESCR_P + ( + SID_GBNSVC, + NSVCI_CON_PTR->.TIM_EVD_PTR + ); + + /* INITIALIZATION OF THE TIMER-EVENT-DESCRIPTOR */ + NSVCI_CON_PTR->.TIM_EVD_PTR->.EVENT_CMD:= G9IBSE4_TO_TNS_C; + NSVCI_CON_PTR->.TIM_EVD_PTR->.EVENT_DESTINATION:= GBNSVC_HANDLE; + NSVCI_CON_PTR->.TIM_EVD_PTR->.KEYS.INT_ARR(0):= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSEI; + NSVCI_CON_PTR->.TIM_EVD_PTR->.KEYS.INT_ARR(1):= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; + NSVCI_CON_PTR->.TIM_EVD_PTR->.TIMER:= TNS_UNBLOCK_MAP; + + /* START TIMER */ + G9PX508_START_TIMER_P + ( + NSVCI_CON_PTR->.TIM_EVD_PTR + ); + + @K@FREEZE + 924686210 + @K@NAME + M_BLK_ACKM + @K@INSCRIPT + NS_ + BLOCK_ACK + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9IBDF4_NS_LM_M) + G9IBD44_NS_PDU_DATA_OFFSET_C), + TX_EVD_PTR + ); + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9IBD40_NS_LM_PDU_C; + TX_EVD_PTR->.EVENT_DESTINATION:= GBDL_HANDLE; + TX_EVD_PTR->.KEYS.INT_ARR(0):= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSEI; /* NSEI TO BE USED FOR + TRANSPORT */ + TX_EVD_PTR->.KEYS.INT_ARR(1):= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; /* NSVCI TO BE USED FOR + TRANSPORT */ + /* POINTER TO PDU IN POOL-ELEMENT */ + NS_PDU_PTR:= NS_PDU_REF_M (INT(TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT) + + G9IBD44_NS_PDU_DATA_OFFSET_C); + /* OFFSET OF THE PDU IN POOL-ELEMENT */ + TX_EVD_PTR->.BOUND.DATA_OFFSET:= G9IBD44_NS_PDU_DATA_OFFSET_C; + /* LENGTH OF THE PDU IN POOL-ELEMENT */ + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(NS_PDU_PTR->.G9IBDF4_PDU_TYPE) + + SIZE(NS_PDU_PTR->.D3); + + /* NOW THE POOL-ELEMENT */ + NS_PDU_PTR->.G9IBDF4_PDU_TYPE:= G9IBDR2_NS_BLOCK_ACK_C; /* PDU-TYPE */ + + NS_PDU_PTR->.D3.NSVCI_TLV.NSVCI_VAL := + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; /* NSVC TO BE BLOCKED */ + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 926348442 + @K@NAME + TA_NXTALIV + @K@INSCRIPT + DEFINE + NEW 'NEXT_ + ALIVE' + @K@CODE + IF + /* ALIVE NSVC TO THE NSEI EXISTING? */ + NSVCI_CON_PTR->.OWN_NSEI_CON_PTR->.NEXT_ALIV_NSVCI_CON_PTR /= NULL + + THEN + /* TAKE NEXT ELEMENT IN THE LINKED LIST AS THE NEXT ALIVE NSVC */ + NSVCI_CON_PTR->.OWN_NSEI_CON_PTR->.NEXT_ALIV_NSVCI_CON_PTR:= + + NSVCI_CON_PTR->.OWN_NSEI_CON_PTR->.NEXT_ALIV_NSVCI_CON_PTR->.NEXT_ALV_NSVCI_CON_PTR; + + FI; + + @K@FREEZE + 938801086 + @K@NAME + M_DE_CBVCN + @K@INSCRIPT + G9IBME2_ + DEACT_ + CELL_BVC_C + + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB512_GET_MSG_LESS_EV_DESCR_P + ( + SID_GBNSVC, + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + TX_EVD_PTR->.EVENT_CMD:= G9IBME2_DEACT_CELL_BVC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= GBBVC_HANDLE; + TX_EVD_PTR->.KEYS.INT_ARR(0):= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSEI; + TX_EVD_PTR->.KEYS.INT_ARR(1):= EVD_PTR->.ADD_DATA(3); + + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 933318270 + @K@NAME + TA_NXTRESP + @K@INSCRIPT + DEFINE + NEW 'NEXT_ + RESPONSIBLE' + @K@CODE + NSEI_CON_PTR->.NEXT_RESP_NSVCI_CON_PTR:= + NSEI_CON_PTR->.NEXT_RESP_NSVCI_CON_PTR->.NEXT_LSP_NSVCI_CON_PTR; + + + @K@FREEZE + 938005006 + @K@NAME + TA_NXTSUBS + @K@INSCRIPT + DEFINE + NEW 'NEXT_ + SUBSTITUTE' + @K@CODE + NSEI_CON_PTR->.NEXT_SUBS_NSVCI_CON_PTR:= + NSEI_CON_PTR->.NEXT_SUBS_NSVCI_CON_PTR->.NEXT_UBL_NSVCI_CON_PTR; + + @K@NAME + M_BLK_O__M + @K@INSCRIPT + NS_ + BLOCK + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9IBDF4_NS_LM_M) + G9IBD44_NS_PDU_DATA_OFFSET_C), + TX_EVD_PTR + ); + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9IBD40_NS_LM_PDU_C; + TX_EVD_PTR->.EVENT_DESTINATION:= GBDL_HANDLE; + + IF + /* 'OTHER' ALIVE NSVC TO THIS NSEI EXISTING? */ + NSVCI_CON_PTR->.OWN_NSEI_CON_PTR->.NEXT_ALIV_NSVCI_CON_PTR /= NULL + THEN + /* USE THIS 'OTHER' FOR TRANSPORT */ + TX_EVD_PTR->.KEYS.INT_ARR(0):= + + NSVCI_CON_PTR->.OWN_NSEI_CON_PTR->.NEXT_ALIV_NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSEI; + /* NSEI TO BE USED FOR TRANSPORT */ + TX_EVD_PTR->.KEYS.INT_ARR(1):= + + NSVCI_CON_PTR->.OWN_NSEI_CON_PTR->.NEXT_ALIV_NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; + /* NSVCI TO BE USED FOR TRANSPORT */ + ELSE + /* USE AFFECTED NSVC AGAIN FOR TRANSPORT */ + TX_EVD_PTR->.KEYS.INT_ARR(0):= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSEI; /* NSEI TO BE USED FOR + TRANSPORT */ + TX_EVD_PTR->.KEYS.INT_ARR(1):= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; /* NSVCI TO BE USED FOR + TRANSPORT */ + FI; + + + /* POINTER TO PDU IN POOL-ELEMENT */ + NS_PDU_PTR:= NS_PDU_REF_M (INT(TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT) + + G9IBD44_NS_PDU_DATA_OFFSET_C); + /* OFFSET OF THE PDU IN POOL-ELEMENT */ + TX_EVD_PTR->.BOUND.DATA_OFFSET:= G9IBD44_NS_PDU_DATA_OFFSET_C; + /* LENGTH OF THE PDU IN POOL-ELEMENT */ + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(NS_PDU_PTR->.G9IBDF4_PDU_TYPE) + + SIZE(NS_PDU_PTR->.D2); + + + /* NOW THE POOL-ELEMENT */ + NS_PDU_PTR->.G9IBDF4_PDU_TYPE:= G9IBDR1_NS_BLOCK_C; /* PDU-TYPE */ + + NS_PDU_PTR->.D2.CAUSE_TLV.CAUSE_VAL:= + G9IBBA2_NS_TRANSIT_NETWORK_FAILURE; /* CAUSE FOR BLOCK */ + NS_PDU_PTR->.D2.NSVCI_TLV.NSVCI_VAL := + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; /* NSVC TO BE BLOCKED */ + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@TEXT + GSM 8.16 CHAP. 7.2: + THE NS-BLOCK-PDU MAY BE SENT IN ANY ALIVE + (BLOCKED OR UNBLOCKED) NS-VC... + @K@FREEZE + 938803215 + @K@NAME + M_DE_SBVCN + @K@INSCRIPT + G9IBME1_ + DEACT_ + SIGN_BVC_C + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB512_GET_MSG_LESS_EV_DESCR_P + ( + SID_GBNSVC, + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + TX_EVD_PTR->.EVENT_CMD:= G9IBME1_DEACT_SIGN_BVC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= GBBVC_HANDLE; + TX_EVD_PTR->.KEYS.INT_ARR(0):= EVD_PTR->.KEYS.INT_ARR(0); + TX_EVD_PTR->.KEYS.INT_ARR(1):= SIGN_BVCI; + + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 938788201 + @K@NAME + M_OAME401M + @K@INSCRIPT + ERROR_MESSAGE: + ERRONOUS_PDU + RESET_PDU + + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSE */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSE; + OAM_MSG_PTR->.HANDLED_OBJECT.NSE_ID:= EVD_PTR->.KEYS.INT_ARR(0); /* + USED NSEI (FROM ECI) */ + + /* ERROR-CAUSE = ERRONEOUS_PDU */ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_ERRONEOUS_PDU; + /* ADDITIONAL_PDU_INFO */ + OAM_MSG_PTR->.ADDITIONAL_PDU_INFO.G9OC120_PDU_TYPE:= + G9OC124_RESET_PDU; + OAM_MSG_PTR->.ADDITIONAL_PDU_INFO.G9OC120_REPORTED_NSEI:= + EVD_PTR->.ADD_DATA(0); /* AFFECTED NSEI (FROM PDU) */ + OAM_MSG_PTR->.ADDITIONAL_PDU_INFO.G9OC120_REPORTED_NSVC:= + EVD_PTR->.ADD_DATA(1); /* AFFECTED NSVCI (FROM PDU) */ + + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 935766108 + @K@NAME + M_OAME402M + @K@INSCRIPT + ERROR_MESSAGE: + ERRONOUS_PDU + RESET_PDU + + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSVC */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSVC; + OAM_MSG_PTR->.HANDLED_OBJECT.NSVC_ID:= EVD_PTR->.KEYS.INT_ARR(1); /* + USED NSVCI (FROM ECI) */ + + /* ERROR-CAUSE = ERRONEOUS_PDU */ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_ERRONEOUS_PDU; + /* ADDITIONAL_PDU_INFO */ + OAM_MSG_PTR->.ADDITIONAL_PDU_INFO.G9OC120_PDU_TYPE:= + G9OC124_RESET_PDU; + OAM_MSG_PTR->.ADDITIONAL_PDU_INFO.G9OC120_REPORTED_NSEI:= + EVD_PTR->.ADD_DATA(0); /* NSEI FROM PDU */ + OAM_MSG_PTR->.ADDITIONAL_PDU_INFO.G9OC120_REPORTED_NSVC:= + EVD_PTR->.ADD_DATA(1); /* NSVCI FROM PDU */ + + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 935766407 + @K@NAME + M_OAME411M + @K@INSCRIPT + ERROR_MESSAGE: + ERRONOUS_PDU + RESET_ACK_PDU + + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSE */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSE; + OAM_MSG_PTR->.HANDLED_OBJECT.NSE_ID:= EVD_PTR->.KEYS.INT_ARR(0); /* + USED NSEI (FROM ECI) */ + + /* ERROR-CAUSE = ERRONEOUS_PDU */ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_ERRONEOUS_PDU; + /* ADDITIONAL_PDU_INFO */ + OAM_MSG_PTR->.ADDITIONAL_PDU_INFO.G9OC120_PDU_TYPE:= + G9OC124_RESET_ACK_PDU; + OAM_MSG_PTR->.ADDITIONAL_PDU_INFO.G9OC120_REPORTED_NSEI:= + EVD_PTR->.ADD_DATA(0); /* NSEI FROM PDU */ + OAM_MSG_PTR->.ADDITIONAL_PDU_INFO.G9OC120_REPORTED_NSVC:= + EVD_PTR->.ADD_DATA(1); /* NSVCI FROM PDU */ + + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 935767332 + @K@NAME + M_OAME412M + @K@INSCRIPT + ERROR_MESSAGE: + ERRONOUS_PDU + RESET_ACK_PDU + + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSVC */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSVC; + OAM_MSG_PTR->.HANDLED_OBJECT.NSVC_ID:= EVD_PTR->.KEYS.INT_ARR(1); /* + USED NSVCI (FROM ECI) */ + + /* ERROR-CAUSE = ERRONEOUS_PDU */ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_ERRONEOUS_PDU; + /* ADDITIONAL_PDU_INFO */ + OAM_MSG_PTR->.ADDITIONAL_PDU_INFO.G9OC120_PDU_TYPE:= + G9OC124_RESET_ACK_PDU; + OAM_MSG_PTR->.ADDITIONAL_PDU_INFO.G9OC120_REPORTED_NSEI:= + EVD_PTR->.ADD_DATA(0); /* NSEI FROM PDU */ + OAM_MSG_PTR->.ADDITIONAL_PDU_INFO.G9OC120_REPORTED_NSVC:= + EVD_PTR->.ADD_DATA(1); /* NSVCI FROM PDU */ + + + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 935767189 + @K@NAME + C_CON + @K@INSCRIPT + RC_DB + @K@CODE + RC_DB + + @K@FREEZE + 922176673 + @K@NAME + M_BLK____M + @K@INSCRIPT + NS_ + BLOCK + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9IBDF4_NS_LM_M) + G9IBD44_NS_PDU_DATA_OFFSET_C), + TX_EVD_PTR + ); + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9IBD40_NS_LM_PDU_C; + TX_EVD_PTR->.EVENT_DESTINATION:= GBDL_HANDLE; + TX_EVD_PTR->.KEYS.INT_ARR(0):= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSEI; /* NSEI TO BE USED FOR + TRANSPORT */ + TX_EVD_PTR->.KEYS.INT_ARR(1):= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; /* NSVCI TO BE USED FOR + TRANSPORT */ + /* POINTER TO PDU IN POOL-ELEMENT */ + NS_PDU_PTR:= NS_PDU_REF_M (INT(TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT) + + G9IBD44_NS_PDU_DATA_OFFSET_C); + /* OFFSET OF THE PDU IN POOL-ELEMENT */ + TX_EVD_PTR->.BOUND.DATA_OFFSET:= G9IBD44_NS_PDU_DATA_OFFSET_C; + /* LENGTH OF THE PDU IN POOL-ELEMENT */ + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(NS_PDU_PTR->.G9IBDF4_PDU_TYPE) + + SIZE(NS_PDU_PTR->.D2); + + + /* NOW THE POOL-ELEMENT */ + NS_PDU_PTR->.G9IBDF4_PDU_TYPE:= G9IBDR1_NS_BLOCK_C; /* PDU-TYPE */ + + NS_PDU_PTR->.D2.CAUSE_TLV.CAUSE_VAL:= + G9IBBA2_NS_OAM_INTERVENTION; /* CAUSE FOR BLOCK */ + NS_PDU_PTR->.D2.NSVCI_TLV.NSVCI_VAL := + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; /* NSVC TO BE BLOCKED */ + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@TEXT + GSM 8.16 CHAP. 7.2: + THE NS-BLOCK-PDU MAY BE SENT IN ANY ALIVE + (BLOCKED OR UNBLOCKED) NS-VC... + @K@FREEZE + 926348613 + @K@NAME + S_BLOCKED + @K@INSCRIPT + G9IBSM0_ + BLOCKED + @K@CODE + + + @K@FREEZE + 922176496 + @K@NAME + D_CON + @K@INSCRIPT + CONTEXT + GOT + @K@CODE + RC_DB = G9IBSR0_RC_OK + + @K@FREEZE + 921772339 + @K@NAME + M_OAME901M + @K@INSCRIPT + ERROR_MESSAGE: + OPERATIONAL_STATE_CHANGE + UBL->BLK + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSVC */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSVC; + OAM_MSG_PTR->.HANDLED_OBJECT.NSVC_ID:= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; + + /* ERROR_CAUSE = OPERATIONAL_STATE_CHANGE */ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_OPERATIONAL_STATE_CHANGE; + /* ADDITIONAL_OPERATIONAL_STATE_INFO */ + OAM_MSG_PTR->.ADDITIONAL_OPERATIONAL_STATE_INFO.OPER_STATE_OLD:= + G9OC101_UNBLOCKED; + OAM_MSG_PTR->.ADDITIONAL_OPERATIONAL_STATE_INFO.OPER_STATE_NEW:= + G9OC101_BLOCKED; + OAM_MSG_PTR->.ADDITIONAL_OPERATIONAL_STATE_INFO.ADMIN_STATE_OLD:= + G9OC102_ENABLED; + OAM_MSG_PTR->.ADDITIONAL_OPERATIONAL_STATE_INFO.ADMIN_STATE_NEW:= + G9OC102_ENABLED; + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 925970975 + @K@NAME + M_OAME902M + @K@INSCRIPT + ERROR_MESSAGE: + OPERATIONAL_STATE_CHANGE + UBL->BLK + + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSVC */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSVC; + OAM_MSG_PTR->.HANDLED_OBJECT.NSVC_ID:= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; + + /* ERROR_CAUSE = OPERATIONAL_STATE_CHANGE */ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_OPERATIONAL_STATE_CHANGE; + /* ADDITIONAL_OPERATIONAL_STATE_INFO */ + OAM_MSG_PTR->.ADDITIONAL_OPERATIONAL_STATE_INFO.OPER_STATE_OLD:= + G9OC101_UNBLOCKED; + OAM_MSG_PTR->.ADDITIONAL_OPERATIONAL_STATE_INFO.OPER_STATE_NEW:= + G9OC101_BLOCKED; + OAM_MSG_PTR->.ADDITIONAL_OPERATIONAL_STATE_INFO.ADMIN_STATE_OLD:= + G9OC102_ENABLED; + OAM_MSG_PTR->.ADDITIONAL_OPERATIONAL_STATE_INFO.ADMIN_STATE_NEW:= + G9OC102_DISABLED; + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 925970987 + @K@NAME + M_OAME10SM + @K@INSCRIPT + ERROR_MESSAGE: + ALARM_BEGIN_NS_ALIVE_TEST + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSVC */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSVC; + OAM_MSG_PTR->.HANDLED_OBJECT.NSVC_ID:= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; + + /* ERROR_CAUSE = ALARM_BEGIN_NS_ALIVE_TEST*/ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_ALARM_BEGIN_NS_ALIVE_TEST; + /* ADDITIONAL_ALARM_INFO */ + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.ADMINISTRATIVE_STATE_CHANGED:= + TRUE; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.OPER_STATE_OLD:= + G9OC101_BLOCKED; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.OPER_STATE_NEW:= + G9OC101_BLOCKED; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.AVAIL_STATE_OLD:= + G9OC103_DEAD; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.AVAIL_STATE_NEW:= + G9OC103_DEAD; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.CONFIGURATION_OF_NSVC:= + TRUE; + + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@NAME + M_OAME911M + @K@INSCRIPT + ERROR_MESSAGE: + OPERATIONAL_STATE_CHANGE + BLK->UBL + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSVC */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSVC; + OAM_MSG_PTR->.HANDLED_OBJECT.NSVC_ID:= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; + + /* ERROR_CAUSE = OPERATIONAL_STATE_CHANGE */ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_OPERATIONAL_STATE_CHANGE; + /* ADDITIONAL_OPERATIONAL_STATE_INFO */ + OAM_MSG_PTR->.ADDITIONAL_OPERATIONAL_STATE_INFO.OPER_STATE_OLD:= + G9OC101_BLOCKED; + OAM_MSG_PTR->.ADDITIONAL_OPERATIONAL_STATE_INFO.OPER_STATE_NEW:= + G9OC101_UNBLOCKED; + OAM_MSG_PTR->.ADDITIONAL_OPERATIONAL_STATE_INFO.ADMIN_STATE_OLD:= + G9OC102_ENABLED; + OAM_MSG_PTR->.ADDITIONAL_OPERATIONAL_STATE_INFO.ADMIN_STATE_NEW:= + G9OC102_ENABLED; + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 925970996 + @K@NAME + M_OAME20SM + @K@INSCRIPT + ERROR_MESSAGE: + ALARM_END_NS_ALIVE_TEST + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSVC */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSVC; + OAM_MSG_PTR->.HANDLED_OBJECT.NSVC_ID:= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; + + /* ERROR_CAUSE = ALARM_END_NS_ALIVE_TEST */ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_ALARM_END_NS_ALIVE_TEST; + /* ADDITIONAL_ALARM_INFO */ + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.ADMINISTRATIVE_STATE_CHANGED:= + TRUE; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.OPER_STATE_OLD:= + G9OC101_BLOCKED; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.OPER_STATE_NEW:= + G9OC101_BLOCKED; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.AVAIL_STATE_OLD:= + G9OC103_DEAD; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.AVAIL_STATE_NEW:= + G9OC103_DEAD; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.CONFIGURATION_OF_NSVC:= + TRUE; + + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@NAME + M_OAME10_M + @K@INSCRIPT + ERROR_MESSAGE: + ALARM_BEGIN_NS_ALIVE_TEST + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSVC */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSVC; + OAM_MSG_PTR->.HANDLED_OBJECT.NSVC_ID:= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; + + /* ERROR_CAUSE = ALARM_BEGIN_NS_ALIVE_TEST*/ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_ALARM_BEGIN_NS_ALIVE_TEST; + /* ADDITIONAL_ALARM_INFO */ + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.ADMINISTRATIVE_STATE_CHANGED:= + TRUE; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.OPER_STATE_OLD:= + G9OC101_BLOCKED; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.OPER_STATE_NEW:= + G9OC101_BLOCKED; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.AVAIL_STATE_OLD:= + G9OC103_DEAD; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.AVAIL_STATE_NEW:= + G9OC103_DEAD; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.CONFIGURATION_OF_NSVC:= + TRUE; + + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 922443813 + @K@NAME + D_SEM + @K@INSCRIPT + CALL_SEM + = + TRUE + @K@CODE + CALL_SEM = TRUE + + @K@FREEZE + 922176624 + @K@NAME + D_N_0 + @K@INSCRIPT + N = 0 + + @K@CODE + NSVCI_CON_PTR->.N = 0 + + @K@FREEZE + 921511000 + @K@NAME + M_OAME12_M + @K@INSCRIPT + ERROR_MESSAGE: + ALARM_BEGIN_NS_ALIVE_TEST + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSVC */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSVC; + OAM_MSG_PTR->.HANDLED_OBJECT.NSVC_ID:= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; + + /* ERROR_CAUSE = ALARM_BEGIN_NS_ALIVE_TEST*/ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_ALARM_BEGIN_NS_ALIVE_TEST; + /* ADDITIONAL_ALARM_INFO */ + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.ADMINISTRATIVE_STATE_CHANGED:= + FALSE; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.OPER_STATE_OLD:= + G9OC101_BLOCKED; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.OPER_STATE_NEW:= + G9OC101_BLOCKED; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.AVAIL_STATE_OLD:= + G9OC103_ALIVE; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.AVAIL_STATE_NEW:= + G9OC103_DEAD; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.CONFIGURATION_OF_NSVC:= + TRUE; + + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 922443829 + @K@NAME + M_OAME21_M + @K@INSCRIPT + ERROR_MESSAGE: + ALARM_END_NS_ALIVE_TEST + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSVC */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSVC; + OAM_MSG_PTR->.HANDLED_OBJECT.NSVC_ID:= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; + + /* ERROR_CAUSE = ALARM_END_NS_ALIVE_TEST */ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_ALARM_END_NS_ALIVE_TEST; + /* ADDITIONAL_ALARM_INFO */ + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.ADMINISTRATIVE_STATE_CHANGED:= + TRUE; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.OPER_STATE_OLD:= + G9OC101_BLOCKED; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.OPER_STATE_NEW:= + G9OC101_BLOCKED; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.AVAIL_STATE_OLD:= + G9OC103_DEAD; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.AVAIL_STATE_NEW:= + G9OC103_DEAD; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.CONFIGURATION_OF_NSVC:= + FALSE; + + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 922443856 + @K@NAME + M_OAME13_M + @K@INSCRIPT + ERROR_MESSAGE: + ALARM_BEGIN_NS_ALIVE_TEST + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSVC */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSVC; + OAM_MSG_PTR->.HANDLED_OBJECT.NSVC_ID:= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; + + /* ERROR_CAUSE = ALARM_BEGIN_NS_ALIVE_TEST*/ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_ALARM_BEGIN_NS_ALIVE_TEST; + /* ADDITIONAL_ALARM_INFO */ + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.ADMINISTRATIVE_STATE_CHANGED:= + FALSE; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.OPER_STATE_OLD:= + G9OC101_UNBLOCKED; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.OPER_STATE_NEW:= + G9OC101_BLOCKED; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.AVAIL_STATE_OLD:= + G9OC103_ALIVE; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.AVAIL_STATE_NEW:= + G9OC103_DEAD; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.CONFIGURATION_OF_NSVC:= + TRUE; + + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 922443838 + @K@NAME + M_OAME22_M + @K@INSCRIPT + ERROR_MESSAGE: + ALARM_END_NS_ALIVE_TEST + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSVC */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSVC; + OAM_MSG_PTR->.HANDLED_OBJECT.NSVC_ID:= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; + + /* ERROR_CAUSE = ALARM_END_NS_ALIVE_TEST */ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_ALARM_END_NS_ALIVE_TEST; + /* ADDITIONAL_ALARM_INFO */ + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.ADMINISTRATIVE_STATE_CHANGED:= + FALSE; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.OPER_STATE_OLD:= + G9OC101_BLOCKED; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.OPER_STATE_NEW:= + G9OC101_BLOCKED; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.AVAIL_STATE_OLD:= + G9OC103_DEAD; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.AVAIL_STATE_NEW:= + G9OC103_ALIVE; + OAM_MSG_PTR->.ADDITIONAL_ALARM_INFO.CONFIGURATION_OF_NSVC:= + TRUE; + + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 922443864 + @K@NAME + M_OAME30_M + @K@INSCRIPT + ERROR_MESSAGE: + NO_ANSWER_FORM_BSS + RESET_PROCEDURE + + + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSVC */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSVC; + OAM_MSG_PTR->.HANDLED_OBJECT.NSVC_ID:= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; + + /* ERROR_CAUSE = NO_ANSWER_FROM_BSS */ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_NO_ANSWER_FROM_BSS; + /* INITIATED_PROCEDURE */ + OAM_MSG_PTR->.INITIATED_PROCEDURE:= + G9OC123_RESET_PROCEDURE; + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 922175973 + @K@NAME + M_OAME31_M + @K@INSCRIPT + ERROR_MESSAGE: + NO_ANSWER_FROM_BSS + BLOCK_PROCEDURE + + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSVC */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSVC; + OAM_MSG_PTR->.HANDLED_OBJECT.NSVC_ID:= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; + + /* ERROR_CAUSE = NO_ANSWER_FROM_BSS */ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_NO_ANSWER_FROM_BSS; + /* INITIATED_PROCEDURE */ + OAM_MSG_PTR->.INITIATED_PROCEDURE:= + G9OC123_BLOCK_PROCEDURE; + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 922175976 + @K@NAME + M_OAME32_M + @K@INSCRIPT + ERROR_MESSAGE: + NO_ANSWER_FROM_BSS + UNBLOCK_PROCEDURE + + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSVC */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSVC; + OAM_MSG_PTR->.HANDLED_OBJECT.NSVC_ID:= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; + + /* ERROR_CAUSE = NO_ANSWER_FROM_BSS */ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_NO_ANSWER_FROM_BSS; + /* INITIATED_PROCEDURE */ + OAM_MSG_PTR->.INITIATED_PROCEDURE:= + G9OC123_UNBLOCK_PROCEDURE; + + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 922175980 + @K@NAME + M_OAME42_M + @K@INSCRIPT + ERROR_MESSAGE: + ERRONOUS_PDU + BLOCK_PDU + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSVC */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSVC; + OAM_MSG_PTR->.HANDLED_OBJECT.NSVC_ID:= EVD_PTR->.ADD_DATA(1); /* + USED NSVCI (FROM ECI) */ + + /* ERROR-CAUSE = ERRONEOUS_PDU */ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_ERRONEOUS_PDU; + /* ADDITIONAL_PDU_INFO */ + OAM_MSG_PTR->.ADDITIONAL_PDU_INFO.G9OC120_PDU_TYPE:= + G9OC124_BLOCK_PDU; + OAM_MSG_PTR->.ADDITIONAL_PDU_INFO.G9OC120_REPORTED_NSEI:= + EVD_PTR->.KEYS.INT_ARR(0); /* AFFECTED NSEI (FROM PDU) */ + OAM_MSG_PTR->.ADDITIONAL_PDU_INFO.G9OC120_REPORTED_NSVC:= + EVD_PTR->.KEYS.INT_ARR(1); /* AFFECTED NSVCI (FROM PDU) */ + + + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 934296141 + @K@NAME + M_OAME50_M + @K@INSCRIPT + ERROR_MESSAGE: + STATUS_PDU_CONTAINS_ERROR_INFO + RECEIVED + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSVC */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSVC; + OAM_MSG_PTR->.HANDLED_OBJECT.NSVC_ID:= + NSVCI_CON_PTR->.DBMS.NSVC_INSTANCE.NSVCI; + + /* ERROR-CAUSE = STATUS_PDU_CONTAINS_ERROR_INFO */ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_STATUS_PDU_CONTAINS_ERROR_INFO; + /* ADDITIONAL_STATUS_PDU_INFO */ + INT_CAUSE_PTR.INT_PTR:= ADDR(EVD_PTR->.ADD_DATA(2)); + OAM_MSG_PTR->.ADDITIONAL_STATUS_PDU_INFO:= + INT_CAUSE_PTR.CAUSE_PTR->; /* CAUSE */ + + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@TEXT + NICHT OK + + @K@FREEZE + 934298924 + @K@NAME + M_OAME43_M + @K@INSCRIPT + ERROR_MESSAGE: + ERRONOUS_PDU + BLOCK_ACK_PDU + @K@CODE + /* GETTING THE EVENT DESCRIPTOR */ + G9PB511_GET_MSG_BOUND_EV_DESCR_P + ( + SID_GBNSVC, + (SIZE(G9OC109_REPORTED_EVENT_STR_M)), + TX_EVD_PTR + ); + + + /* COMPOSING THE EVENT */ + /* FIRST THE DESCRIPTOR */ + TX_EVD_PTR->.EVENT_CMD:= G9PX040_SEND_MBC_C; + TX_EVD_PTR->.EVENT_DESTINATION:= RXTX_HANDLE; + TX_EVD_PTR->.KEYS.UBI_INDEX:= OAM_UBI_INDEX; + TX_EVD_PTR->.BOUND.DATA_OFFSET:= 0; + TX_EVD_PTR->.BOUND.DATA_LENGTH:= SIZE(G9OC109_REPORTED_EVENT_STR_M); + + /* NOW THE POOL-ELEMENT */ + /* INITIALIZATION OF THE POINTER WITH THE POOL-ELEMENT-START */ + OAM_MSG_PTR:= OAM_MSG_PTR_M (TX_EVD_PTR->.BOUND.PTR_TO_POOL_ELEMENT); + + /* COMPOSING THE MESSAGE */ + /* HANDLED OBJECT = AFFECTED INSTANCE, TYPE NSVC */ + OAM_MSG_PTR->.HANDLED_OBJECT.OBJECT_TYPE:= G9OC104_NSVC; + OAM_MSG_PTR->.HANDLED_OBJECT.NSVC_ID:= EVD_PTR->.ADD_DATA(1); /* + USED NSVCI (FROM ECI) */ + + /* ERROR-CAUSE = ERRONEOUS_PDU */ + OAM_MSG_PTR->.ERROR_CAUSE:= G9OC108_ERRONEOUS_PDU; + /* ADDITIONAL_PDU_INFO */ + OAM_MSG_PTR->.ADDITIONAL_PDU_INFO.G9OC120_PDU_TYPE:= + G9OC124_BLOCK_ACK_PDU; + OAM_MSG_PTR->.ADDITIONAL_PDU_INFO.G9OC120_REPORTED_NSEI:= + EVD_PTR->.KEYS.INT_ARR(0); /* AFFECTED NSEI (FROM PDU) */ + OAM_MSG_PTR->.ADDITIONAL_PDU_INFO.G9OC120_REPORTED_NSVC:= + EVD_PTR->.KEYS.INT_ARR(1); /* AFFECTED NSVCI (FROM PDU) */ + + + + /* SENDING */ + G9PX503_POST_EVENT_P(TX_EVD_PTR); + + @K@FREEZE + 934297710 diff -cNr gawk-3.0.4/test/gtlnbufv.awk gawk-3.0.5/test/gtlnbufv.awk *** gawk-3.0.4/test/gtlnbufv.awk Thu Jan 1 02:00:00 1970 --- gawk-3.0.5/test/gtlnbufv.awk Wed Jun 14 13:14:34 2000 *************** *** 0 **** --- 1,2 ---- + /@K@CODE/ { print ; getline temp ; print temp ;next } + {print} diff -cNr gawk-3.0.4/test/igncdym.awk gawk-3.0.5/test/igncdym.awk *** gawk-3.0.4/test/igncdym.awk Thu Jan 1 02:00:00 1970 --- gawk-3.0.5/test/igncdym.awk Sun Apr 2 17:49:22 2000 *************** *** 0 **** --- 1,56 ---- + #From Jeffrey.B.Woodward@Hitchcock.ORG Mon Feb 21 09:33:32 2000 + #Message-id: <12901034@mailbox2.Hitchcock.ORG> + #Date: 20 Feb 2000 18:14:11 EST + #From: Jeffrey.B.Woodward@Hitchcock.ORG (Jeffrey B. Woodward) + #Subject: gawk 3.0.4 bug + #To: bug-gnu-utils@gnu.org + #Cc: arnold@gnu.org + # + #O/S: Digital UNIX 4.0D + # + #C Compiler: DEC C + # + #gawk version: 3.0.4 + # + #Sample Program: + #gawk ' + BEGIN { + pattern[1] = "bar" ; ignore[1] = 1 + pattern[2] = "foo" ; ignore[2] = 0 + } + + { + for (i = 1 ; i <= 2 ; i++) { + IGNORECASE = ignore[i] + print match($0, pattern[i]) " " pattern[i] ":" $0 + } + } + #' << -EOF- + #This is foo + #This is bar + #-EOF- + # + #Program Output: + #0 bar:This is foo + #0 foo:This is foo + #9 bar:This is bar + #9 foo:This is bar + # + # + #**Expected** Output: + #0 bar:This is foo + #9 foo:This is foo + #9 bar:This is bar + #0 foo:This is bar + # + # + #This problem appears to be directly related to IGNORECASE. If + #IGNORECASE remains constant, the program behaves as expected; + #however, switching IGNORECASE seems to causes problems - it is + #almost as though the pattern stored in the variable is treated + #as a constant and the regexp() is not recompiled(?) - just a + #guess... + # + # + #Thanks, + #-Jeff Woodward diff -cNr gawk-3.0.4/test/igncdym.in gawk-3.0.5/test/igncdym.in *** gawk-3.0.4/test/igncdym.in Thu Jan 1 02:00:00 1970 --- gawk-3.0.5/test/igncdym.in Sun Apr 2 17:49:32 2000 *************** *** 0 **** --- 1,2 ---- + This is foo + This is bar diff -cNr gawk-3.0.4/test/igncdym.ok gawk-3.0.5/test/igncdym.ok *** gawk-3.0.4/test/igncdym.ok Thu Jan 1 02:00:00 1970 --- gawk-3.0.5/test/igncdym.ok Sun Apr 2 17:49:43 2000 *************** *** 0 **** --- 1,4 ---- + 0 bar:This is foo + 9 foo:This is foo + 9 bar:This is bar + 0 foo:This is bar diff -cNr gawk-3.0.4/test/numindex.awk gawk-3.0.5/test/numindex.awk *** gawk-3.0.4/test/numindex.awk Thu Jan 1 02:00:00 1970 --- gawk-3.0.5/test/numindex.awk Fri Nov 26 11:02:21 1999 *************** *** 0 **** --- 1,55 ---- + #To: bug-gnu-utils@gnu.org + #cc: arnold@gnu.org + #Subject: Possible bug in GNU Awk 3.0.4 + #Date: Wed, 24 Nov 1999 21:47:24 +0000 + #From: Daniel Elphick + #Message-Id: + # + #This is a multipart MIME message. + # + #--==_Exmh_-11192982200 + #Content-Type: text/plain; charset=us-ascii + # + # + #When I use the attached awk script unique on the attached data file, it + #reports that all 4 lines of the data are the same. Using mawk it correctly + #reports that there are no repeats. + # + #I don't know if there are limits on the size of associative array keys for the + #purposes of reliable indexing but if there is then it is not (obviously) + #documented. + # + # + #--==_Exmh_-11192982200 + #Content-Type: text/plain ; name="data"; charset=us-ascii + #Content-Description: data + #Content-Disposition: attachment; filename="data" + # + #322322111111112232231111 + #322322111111112213223111 + #322322111111112211132231 + #322322111111112211113223 + # + #--==_Exmh_-11192982200 + #Content-Type: text/plain ; name="unique"; charset=us-ascii + #Content-Description: unique + #Content-Disposition: attachment; filename="unique" + # + { + if($0 in a) + { + printf("line %d has been seen before at line %d\n", NR, a[$0]) + repeat_count += 1 + } + else + { + a[$0] = NR + } + count += 1 + } + END { + # printf("%d %f%%\n", repeat_count, (float)repeat_count / count * 100) + printf("%d %f%%\n", repeat_count, repeat_count / count * 100) + } + # + #--==_Exmh_-11192982200-- diff -cNr gawk-3.0.4/test/numindex.in gawk-3.0.5/test/numindex.in *** gawk-3.0.4/test/numindex.in Thu Jan 1 02:00:00 1970 --- gawk-3.0.5/test/numindex.in Fri Nov 26 11:00:32 1999 *************** *** 0 **** --- 1,4 ---- + 322322111111112232231111 + 322322111111112213223111 + 322322111111112211132231 + 322322111111112211113223 diff -cNr gawk-3.0.4/test/numindex.ok gawk-3.0.5/test/numindex.ok *** gawk-3.0.4/test/numindex.ok Thu Jan 1 02:00:00 1970 --- gawk-3.0.5/test/numindex.ok Fri Nov 26 11:02:42 1999 *************** *** 0 **** --- 1 ---- + 0 0.000000% diff -cNr gawk-3.0.4/test/opasnidx.awk gawk-3.0.5/test/opasnidx.awk *** gawk-3.0.4/test/opasnidx.awk Thu Jan 1 02:00:00 1970 --- gawk-3.0.5/test/opasnidx.awk Sun Feb 6 11:44:14 2000 *************** *** 0 **** --- 1 ---- + BEGIN { b = 1; a[b] = 2; a[b++] += 1; print b,a[1] } diff -cNr gawk-3.0.4/test/opasnidx.ok gawk-3.0.5/test/opasnidx.ok *** gawk-3.0.4/test/opasnidx.ok Thu Jan 1 02:00:00 1970 --- gawk-3.0.5/test/opasnidx.ok Sun Feb 6 11:44:20 2000 *************** *** 0 **** --- 1 ---- + 2 3 diff -cNr gawk-3.0.4/test/opasnslf.awk gawk-3.0.5/test/opasnslf.awk *** gawk-3.0.4/test/opasnslf.awk Thu Jan 1 02:00:00 1970 --- gawk-3.0.5/test/opasnslf.awk Wed Feb 2 18:59:34 2000 *************** *** 0 **** --- 1,6 ---- + BEGIN { + print b += b += 1 + b = 6 + print b += b++ + print b + } diff -cNr gawk-3.0.4/test/opasnslf.ok gawk-3.0.5/test/opasnslf.ok *** gawk-3.0.4/test/opasnslf.ok Thu Jan 1 02:00:00 1970 --- gawk-3.0.5/test/opasnslf.ok Wed Feb 2 18:59:57 2000 *************** *** 0 **** --- 1,3 ---- + 2 + 13 + 13 diff -cNr gawk-3.0.4/test/pipeio2.awk gawk-3.0.5/test/pipeio2.awk *** gawk-3.0.4/test/pipeio2.awk Mon May 5 14:25:27 1997 --- gawk-3.0.5/test/pipeio2.awk Mon Jun 5 15:51:34 2000 *************** *** 27,33 **** while ((com | getline fnam) > 0) { ! com_tr = "echo " fnam " | tr [0-9]. ..........." print "\'" com_tr "\'" com_tr | getline nam --- 27,34 ---- while ((com | getline fnam) > 0) { ! # com_tr = "echo " fnam " | tr [0-9]. ..........." ! com_tr = "echo " fnam " | sed 's/[0-9]/./g'" print "\'" com_tr "\'" com_tr | getline nam diff -cNr gawk-3.0.4/test/pipeio2.ok gawk-3.0.5/test/pipeio2.ok *** gawk-3.0.4/test/pipeio2.ok Mon May 5 14:31:30 1997 --- gawk-3.0.5/test/pipeio2.ok Mon Jun 5 15:53:37 2000 *************** *** 1,16 **** ! 'echo January 1997 | tr [0-9]. ...........' January .... ! 'echo S M Tu W Th F S | tr [0-9]. ...........' S M Tu W Th F S ! 'echo 1 2 3 4 | tr [0-9]. ...........' . . . . ! 'echo 5 6 7 8 9 10 11 | tr [0-9]. ...........' . . . . . .. .. ! 'echo 12 13 14 15 16 17 18 | tr [0-9]. ...........' .. .. .. .. .. .. .. ! 'echo 19 20 21 22 23 24 25 | tr [0-9]. ...........' .. .. .. .. .. .. .. ! 'echo 26 27 28 29 30 31 | tr [0-9]. ...........' .. .. .. .. .. .. ! 'echo | tr [0-9]. ...........' --- 1,16 ---- ! 'echo January 1997 | sed 's/[0-9]/./g'' January .... ! 'echo S M Tu W Th F S | sed 's/[0-9]/./g'' S M Tu W Th F S ! 'echo 1 2 3 4 | sed 's/[0-9]/./g'' . . . . ! 'echo 5 6 7 8 9 10 11 | sed 's/[0-9]/./g'' . . . . . .. .. ! 'echo 12 13 14 15 16 17 18 | sed 's/[0-9]/./g'' .. .. .. .. .. .. .. ! 'echo 19 20 21 22 23 24 25 | sed 's/[0-9]/./g'' .. .. .. .. .. .. .. ! 'echo 26 27 28 29 30 31 | sed 's/[0-9]/./g'' .. .. .. .. .. .. ! 'echo | sed 's/[0-9]/./g'' diff -cNr gawk-3.0.4/test/strftime.awk gawk-3.0.5/test/strftime.awk *** gawk-3.0.4/test/strftime.awk Thu Jan 1 02:00:00 1970 --- gawk-3.0.5/test/strftime.awk Tue May 2 13:27:20 2000 *************** *** 0 **** --- 1,15 ---- + # strftime.awk ; test the strftime code + # + # input is the output of `date', see Makefile.in + # + # The mucking about with $0 and $N is to avoid problems + # on cygwin, where the timezone field is empty and there + # are two consecutive blanks. + + { + $3 = sprintf("%02d", $3 + 0) + print > "strftime.ok" + $0 = strftime() + $NF = $NF + print > OUTPUT + } diff -cNr gawk-3.0.4/test/subslash.awk gawk-3.0.5/test/subslash.awk *** gawk-3.0.4/test/subslash.awk Thu Jan 1 02:00:00 1970 --- gawk-3.0.5/test/subslash.awk Thu Jan 27 18:08:07 2000 *************** *** 0 **** --- 1,6 ---- + BEGIN { + i = 2 + a[i] = 5 + a[i] /= 2 + printf "a[%s] = %f\n", i, a[i] + } diff -cNr gawk-3.0.4/test/subslash.ok gawk-3.0.5/test/subslash.ok *** gawk-3.0.4/test/subslash.ok Thu Jan 1 02:00:00 1970 --- gawk-3.0.5/test/subslash.ok Thu Jan 27 18:08:25 2000 *************** *** 0 **** --- 1 ---- + a[2] = 2.500000 diff -cNr gawk-3.0.4/vms/ChangeLog gawk-3.0.5/vms/ChangeLog *** gawk-3.0.4/vms/ChangeLog Wed Jun 30 16:15:20 1999 --- gawk-3.0.5/vms/ChangeLog Sun Jun 25 15:09:38 2000 *************** *** 1,3 **** --- 1,7 ---- + Sun Jun 25 15:08:19 2000 Arnold D. Robbins + + * Release 3.0.5: Release tar file made. + Wed Jun 30 16:14:36 1999 Arnold D. Robbins * Release 3.0.4: Release tar file made. This time for sure. diff -cNr gawk-3.0.4/vms/descrip.mms gawk-3.0.5/vms/descrip.mms *** gawk-3.0.4/vms/descrip.mms Sun May 9 14:22:47 1999 --- gawk-3.0.5/vms/descrip.mms Sun Jun 18 15:01:31 2000 *************** *** 129,135 **** # Release of gawk REL=3.0 ! PATCHLVL=4 # generic target all : gawk --- 129,135 ---- # Release of gawk REL=3.0 ! PATCHLVL=5 # generic target all : gawk diff -cNr gawk-3.0.4/vms/gawk.hlp gawk-3.0.5/vms/gawk.hlp *** gawk-3.0.4/vms/gawk.hlp Wed Apr 28 16:50:17 1999 --- gawk-3.0.5/vms/gawk.hlp Thu May 25 14:15:41 2000 *************** *** 1086,1092 **** Source text for it is present in the file GAWK.TEXI. A postscript version is available via anonymous FTP from host gnudist.gnu.org in directory /gnu/gawk, file gawk-{version}-doc.tar.gz where {version} ! would be the current version number, such as 3.0.4. Another source of documentation is "The AWK Programming Language" by Aho, Weinberger, and Kernighan (1988), published by Addison-Wesley. --- 1086,1092 ---- Source text for it is present in the file GAWK.TEXI. A postscript version is available via anonymous FTP from host gnudist.gnu.org in directory /gnu/gawk, file gawk-{version}-doc.tar.gz where {version} ! would be the current version number, such as 3.0.5. Another source of documentation is "The AWK Programming Language" by Aho, Weinberger, and Kernighan (1988), published by Addison-Wesley. *************** *** 1200,1206 **** failure. The final exit status will be 1 (VMS success) if 0 is used, or even (VMS non-success) if non-zero is used. 3 changes ! Changes between version 3.0.4 and 2.15.6 General RS can contain multiple characters or be a regexp --- 1200,1206 ---- failure. The final exit status will be 1 (VMS success) if 0 is used, or even (VMS non-success) if non-zero is used. 3 changes ! Changes between version 3.0.5 and 2.15.6 General RS can contain multiple characters or be a regexp diff -cNr gawk-3.0.4/vms/vmsbuild.com gawk-3.0.5/vms/vmsbuild.com *** gawk-3.0.4/vms/vmsbuild.com Sun May 9 14:22:37 1999 --- gawk-3.0.5/vms/vmsbuild.com Sun Jun 18 15:00:24 2000 *************** *** 7,13 **** $! gawk 3.0.1 revised, Nov'96 $! $ REL = "3.0" !release version number ! $ PATCHLVL = "4" $! $! $ CCFLAGS = "/noList" ! "/noOpt/Debug" --- 7,13 ---- $! gawk 3.0.1 revised, Nov'96 $! $ REL = "3.0" !release version number ! $ PATCHLVL = "5" $! $! $ CCFLAGS = "/noList" ! "/noOpt/Debug" EOF # Final cleanup touch configure touch test/arynocls.ok # 0-length file