diff options
-rw-r--r-- | ChangeLog | 60 | ||||
-rw-r--r-- | awk.h | 15 | ||||
-rw-r--r-- | awkgram.c | 6 | ||||
-rw-r--r-- | awkgram.y | 6 | ||||
-rw-r--r-- | awklib/eg/lib/intdiv.awk | 7 | ||||
-rw-r--r-- | builtin.c | 2 | ||||
-rw-r--r-- | configh.in | 3 | ||||
-rwxr-xr-x | configure | 18 | ||||
-rw-r--r-- | configure.ac | 11 | ||||
-rw-r--r-- | doc/ChangeLog | 7 | ||||
-rw-r--r-- | doc/awkcard.in | 6 | ||||
-rw-r--r-- | doc/gawk.1 | 2 | ||||
-rw-r--r-- | doc/gawk.info | 773 | ||||
-rw-r--r-- | doc/gawk.texi | 32 | ||||
-rw-r--r-- | doc/gawktexi.in | 32 | ||||
-rw-r--r-- | extension/ChangeLog | 30 | ||||
-rw-r--r-- | extension/Makefile.am | 5 | ||||
-rw-r--r-- | extension/Makefile.in | 43 | ||||
-rw-r--r-- | extension/aclocal.m4 | 1 | ||||
-rw-r--r-- | extension/configh.in | 6 | ||||
-rwxr-xr-x | extension/configure | 88 | ||||
-rw-r--r-- | extension/configure.ac | 13 | ||||
-rw-r--r-- | extension/intdiv.c | 215 | ||||
-rw-r--r-- | gawkapi.c | 117 | ||||
-rw-r--r-- | gawkapi.h | 97 | ||||
-rw-r--r-- | mpfr.c | 22 | ||||
-rw-r--r-- | node.c | 14 | ||||
-rw-r--r-- | test/ChangeLog | 5 | ||||
-rw-r--r-- | test/dumpvars.ok | 2 | ||||
-rw-r--r-- | test/id.ok | 1 | ||||
-rw-r--r-- | test/mpfrsqrt.awk | 2 | ||||
-rw-r--r-- | test/symtab6.ok | 2 | ||||
-rw-r--r-- | test/symtab8.ok | 2 |
33 files changed, 1134 insertions, 511 deletions
@@ -77,11 +77,27 @@ 2017-04-16 Arnold D. Robbins <arnold@skeeve.com> + Rename intdiv it intdiv0 and require enabling at configure time. + + * awkgram.y (tokentab): Bracket intdiv0 in #ifdef SUPPLY_INTDIV. + (snode): Similar. + * builtin.c (do_intdiv): Bracket in #ifdef SUPPLY_INTDIV. + * mpfr.c (do_mpfr_intdiv): Bracket in #ifdef SUPPLY_INTDIV. + * configure.ac: Add --enable-builtin-intdiv0 option. If enabled, + also revise doc/gawktexi.in. + +2017-04-16 Arnold D. Robbins <arnold@skeeve.com> + * builtin.c (do_intdiv): Use DEREF on the arguments. Thanks to Andrew Schorr for finding the problem. * mpfr.c (do_mpfr_intdiv): Return -1 if numerator or denominator are not valid numbers. Unref various bits first. +2017-04-13 Arnold D. Robbins <arnold@skeeve.com> + + * awk.h (make_number_node): Simplify. + * mpfr.c (mpg_node): Change parameter name to `flags'. + 2017-04-12 Arnold D. Robbins <arnold@skeeve.com> * mpfr.c (mpg_format_val): Set STRCUR flag when we're done. @@ -90,6 +106,9 @@ * builtin.c (do_dcgettext): Move declaration of reslen to outside the ifdefs. Thanks to Hermann Peifer for the report. + * gawkapi.c (awk_value_to_node): Initialize ext_ret_val to NULL + to avoid compiler warnings. + 2017-04-12 Manuel Collado <m-collado@users.sourceforge.net> Fix the FPAT bug reported by Ed Morton in the gawk-bug mailing list. @@ -568,6 +587,47 @@ not updating the node correctly by setting STRING and STRCUR flags and setting stfmt. +2017-01-06 Andrew J. Schorr <aschorr@telemetry-investments.com> + + Enhance API to support extended-precision arithmetic. + * awk.h (enum block_id): Add new values BLOCK_MPFR and BLOCK_MPZ. + (make_number_node): New inline function to reduce code duplication + for creating numeric nodes. + * gawkapi.h (gawk_api_major_version): Bump to 3. + (awk_number_t): New typedef to represent numbers with varying internal + representations. + (awk_value_t): For numbers, replace double with awk_number_t. + (num_value): Redefine. + (num_type, num_ptr): New defines for awk_number_t union members. + (gawk_api_t): Add constants for version checking: gmp_major_version, + gmp_minor_version, mpfr_major_version, and mpfr_minor_version. + Add functions api_get_mpfr and api_get_mpz to allocate memory for + extended-precision numbers to hand to gawk. + (get_mpfr_ptr, get_mpz_ptr): Helper macros to wrap api_get_mpfr and + api_get_mpz. + (make_number): Modify to populate awk_number_t correctly. + (make_number_mpz, make_number_mpfr): New helper functions to create + extended-precision numeric nodes. + (check_mpfr_version): New macro to check GMP/MPFR version compatibility + in extensions that want to support extended-precision math. + * gawkapi.c (getmpfr, freempfr, getmpz, freempz): New macros to + allocate and free memory blocks for extended-precision math. + (awk_value_to_node): For AWK_NUMBER values, support three different + kinds of internal numbers: double, mpz_t, and mpfr_t. + (assign_number): New helper function to convert a numeric node to + an awk_value_t. + (node_to_awk_value): Use assign_number to pass numbers properly. + (api_get_mpfr): Implement new api_get_mpfr hook. + (api_get_mpfz): Implement new api_get_mpz hook. + (api_impl): Add GMP & MPFR versions, api_get_mpfr, and api_get_mpz. + * node.c (r_make_number): Use new make_number_node inline function + to reduce code duplication. + (nextfree): Add block allocators for mpfr_t and mpz_t. + (more_blocks): Add an assert to protect against cases where the block + size is too small to hold our structure. + * mpfr.c (mpg_node): Use new make_number_node inline function + to reduce code duplication. + 2017-01-04 Arnold Robbins <arnold@skeeve.com> * config.guess, config.sub, compile, depcomp: Sync from latest @@ -1065,6 +1065,8 @@ struct block_header { enum block_id { BLOCK_NODE = 0, BLOCK_BUCKET, + BLOCK_MPFR, + BLOCK_MPZ, BLOCK_MAX /* count */ }; @@ -1968,6 +1970,19 @@ erealloc_real(void *ptr, size_t count, const char *where, const char *var, const return ret; } +/* make_number_node --- make node with the given flags */ + +static inline NODE * +make_number_node(unsigned int flags) +{ + NODE *r; + getnode(r); + memset(r, 0, sizeof(*r)); + r->type = Node_val; + r->valref = 1; + r->flags = (flags|MALLOC|NUMBER|NUMCUR); + return r; +} /* * str_terminate_f, str_terminate, str_restore: function and macros to @@ -4547,7 +4547,9 @@ static const struct token tokentab[] = { {"include", Op_symbol, LEX_INCLUDE, GAWKX, 0, 0}, {"index", Op_builtin, LEX_BUILTIN, A(2), do_index, 0}, {"int", Op_builtin, LEX_BUILTIN, A(1), do_int, MPF(int)}, -{"intdiv", Op_builtin, LEX_BUILTIN, GAWKX|A(3), do_intdiv, MPF(intdiv)}, +#ifdef SUPPLY_INTDIV +{"intdiv0", Op_builtin, LEX_BUILTIN, GAWKX|A(3), do_intdiv, MPF(intdiv)}, +#endif {"isarray", Op_builtin, LEX_BUILTIN, GAWKX|A(1), do_isarray, 0}, {"length", Op_builtin, LEX_LENGTH, A(0)|A(1), do_length, 0}, {"load", Op_symbol, LEX_LOAD, GAWKX, 0, 0}, @@ -6864,6 +6866,7 @@ snode(INSTRUCTION *subn, INSTRUCTION *r) arg = subn->nexti; if (arg->nexti == arg->lasti && arg->nexti->opcode == Op_push) arg->nexti->opcode = Op_push_arg_untyped; /* argument may be untyped */ +#ifdef SUPPLY_INTDIV } else if (r->builtin == do_intdiv #ifdef HAVE_MPFR || r->builtin == MPF(intdiv) @@ -6873,6 +6876,7 @@ snode(INSTRUCTION *subn, INSTRUCTION *r) ip = arg->lasti; if (ip->opcode == Op_push) ip->opcode = Op_push_array; +#endif /* SUPPLY_INTDIV */ } else if (r->builtin == do_match) { static bool warned = false; @@ -2127,7 +2127,9 @@ static const struct token tokentab[] = { {"include", Op_symbol, LEX_INCLUDE, GAWKX, 0, 0}, {"index", Op_builtin, LEX_BUILTIN, A(2), do_index, 0}, {"int", Op_builtin, LEX_BUILTIN, A(1), do_int, MPF(int)}, -{"intdiv", Op_builtin, LEX_BUILTIN, GAWKX|A(3), do_intdiv, MPF(intdiv)}, +#ifdef SUPPLY_INTDIV +{"intdiv0", Op_builtin, LEX_BUILTIN, GAWKX|A(3), do_intdiv, MPF(intdiv)}, +#endif {"isarray", Op_builtin, LEX_BUILTIN, GAWKX|A(1), do_isarray, 0}, {"length", Op_builtin, LEX_LENGTH, A(0)|A(1), do_length, 0}, {"load", Op_symbol, LEX_LOAD, GAWKX, 0, 0}, @@ -4444,6 +4446,7 @@ snode(INSTRUCTION *subn, INSTRUCTION *r) arg = subn->nexti; if (arg->nexti == arg->lasti && arg->nexti->opcode == Op_push) arg->nexti->opcode = Op_push_arg_untyped; /* argument may be untyped */ +#ifdef SUPPLY_INTDIV } else if (r->builtin == do_intdiv #ifdef HAVE_MPFR || r->builtin == MPF(intdiv) @@ -4453,6 +4456,7 @@ snode(INSTRUCTION *subn, INSTRUCTION *r) ip = arg->lasti; if (ip->opcode == Op_push) ip->opcode = Op_push_array; +#endif /* SUPPLY_INTDIV */ } else if (r->builtin == do_match) { static bool warned = false; diff --git a/awklib/eg/lib/intdiv.awk b/awklib/eg/lib/intdiv.awk index dbc553b0..9de5978e 100644 --- a/awklib/eg/lib/intdiv.awk +++ b/awklib/eg/lib/intdiv.awk @@ -1,4 +1,4 @@ -# intdiv --- do integer division +# intdiv0 --- do integer division # # Arnold Robbins, arnold@skeeve.com, Public Domain @@ -6,8 +6,11 @@ # # Name changed from div() to intdiv() # April, 2015 +# +# Changed to intdiv0() +# April, 2016 -function intdiv(numerator, denominator, result) +function intdiv0(numerator, denominator, result) { split("", result) @@ -3971,6 +3971,7 @@ do_bindtextdomain(int nargs) return make_string(the_result, strlen(the_result)); } +#ifdef SUPPLY_INTDIV /* do_intdiv --- do integer division, return quotient and remainder in dest array */ /* @@ -4039,6 +4040,7 @@ do_intdiv(int nargs) return make_number((AWKNUM) 0.0); } +#endif /* SUPPLY_INTDIV */ /* do_typeof --- return a string with the type of the arg */ @@ -377,6 +377,9 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS +/* enable built-in intdiv0 function */ +#undef SUPPLY_INTDIV + /* some systems define this type here */ #undef TIME_T_IN_SYS_TYPES_H @@ -766,6 +766,7 @@ enable_silent_rules with_whiny_user_strftime enable_lint enable_severe_portability_problems +enable_builtin_intdiv0 enable_mpfr enable_dependency_tracking enable_largefile @@ -1413,6 +1414,8 @@ Optional Features: --disable-lint do not compile in gawk lint checking --enable-severe-portability-problems allow really nasty portability problems + --enable-builtin-intdiv0 + enable built-in intdiv0 function --disable-mpfr do not check for MPFR --enable-dependency-tracking do not reject slow dependency extractors @@ -3245,6 +3248,21 @@ $as_echo "#define I_DONT_KNOW_WHAT_IM_DOING 1" >>confdefs.h fi +# Check whether --enable-builtin-intdiv0 was given. +if test "${enable_builtin_intdiv0+set}" = set; then : + enableval=$enable_builtin_intdiv0; if test "$enableval" = yes + then + +$as_echo "#define SUPPLY_INTDIV 1" >>confdefs.h + + sed '/^@set PATCHLEVEL/a\ +@set INTDIV' < "$srcdir"/doc/gawktexi.in > foo + cp foo "$srcdir"/doc/gawktexi.in + rm foo + fi + +fi + SKIP_MPFR=no # Check whether --enable-mpfr was given. diff --git a/configure.ac b/configure.ac index 011532f4..79a70e3f 100644 --- a/configure.ac +++ b/configure.ac @@ -67,6 +67,17 @@ AC_ARG_ENABLE([severe-portability-problems], AC_DEFINE(I_DONT_KNOW_WHAT_IM_DOING, 1, [enable severe portability problems]) fi ) +AC_ARG_ENABLE([builtin-intdiv0], + [AS_HELP_STRING([--enable-builtin-intdiv0],[enable built-in intdiv0 function])], + if test "$enableval" = yes + then + AC_DEFINE(SUPPLY_INTDIV, 1, [enable built-in intdiv0 function]) + sed '/^@set PATCHLEVEL/a\ +@set INTDIV' < "$srcdir"/doc/gawktexi.in > foo + cp foo "$srcdir"/doc/gawktexi.in + rm foo + fi +) SKIP_MPFR=no AC_ARG_ENABLE([mpfr], diff --git a/doc/ChangeLog b/doc/ChangeLog index e610a6e3..8249c0be 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -19,6 +19,13 @@ 2017-04-16 Arnold D. Robbins <arnold@skeeve.com> + * awkcard.in: Comment out description of intdiv(). + * gawk.1: Ditto. + * gawktexi.in: References to intdiv changed to intdiv0 and + bracketed inside @ifset INTDIV. Not set by default. + +2017-04-16 Arnold D. Robbins <arnold@skeeve.com> + * gawktexi.in: Improve documentation of the intdiv() function. 2017-04-12 Arnold D. Robbins <arnold@skeeve.com> diff --git a/doc/awkcard.in b/doc/awkcard.in index 86aeee2e..165fca43 100644 --- a/doc/awkcard.in +++ b/doc/awkcard.in @@ -1617,9 +1617,9 @@ l lw(1.9i). \*(FCcos(\*(FIexpr\*(FC)\*(FR The cosine of \*(FIexpr\fP, which is in radians. \*(FCexp(\*(FIexpr\*(FC)\*(FR The exponential function (\*(FIe \*(FC^ \*(FIx\*(FR). \*(FCint(\*(FIexpr\*(FC)\*(FR Truncate to integer. -\*(CB\*(FCintdiv(\*(FIn\*(FR\*(FC,\*(FI d\*(FR\*(FC,\*(FI r\*(FR\*(FC)\*(FR T{ -Return result of integer division in \*(FIr\*(FR.\*(CD -T} +.\" \*(CB\*(FCintdiv(\*(FIn\*(FR\*(FC,\*(FI d\*(FR\*(FC,\*(FI r\*(FR\*(FC)\*(FR T{ +.\" Return result of integer division in \*(FIr\*(FR.\*(CD +.\" T} \*(FClog(\*(FIexpr\*(FC)\*(FR The natural logarithm function (base \*(FIe\^\*(FR). \*(FCrand()\fP A random number \*(FIN\fP such that 0 \(<= \*(FIN\fP < 1. \*(FCsin(\*(FIexpr\*(FC)\*(FR The sine of \*(FIexpr\fP, which is in radians. @@ -2711,6 +2711,7 @@ The exponential function. .TP .BI int( expr ) Truncate to integer. +.ig .TP .BI intdiv( num ", " denom ", " result ) Truncate @@ -2728,6 +2729,7 @@ This is a .I gawk extension, primarily of value when working with arbitrarily large integers. +.. .TP .BI log( expr ) The natural logarithm function. diff --git a/doc/gawk.info b/doc/gawk.info index 2ed1c733..b7b6b48c 100644 --- a/doc/gawk.info +++ b/doc/gawk.info @@ -12381,24 +12381,6 @@ brackets ([ ]): truncated toward zero. For example, 'int(3)' is 3, 'int(3.9)' is 3, 'int(-3.9)' is -3, and 'int(-3)' is -3 as well. -'intdiv(NUMERATOR, DENOMINATOR, RESULT)' - Perform integer division, similar to the standard C 'div()' - function. First, truncate 'numerator' and 'denominator' towards - zero, creating integer values. Clear the 'result' array, and then - set 'result["quotient"]' to the result of 'numerator / - denominator', truncated towards zero to an integer, and set - 'result["remainder"]' to the result of 'numerator % denominator', - truncated towards zero to an integer. Attempting division by zero - causes a fatal error. The function returns zero upon success, and - -1 upon error. - - This function is primarily intended for use with arbitrary length - integers; it avoids creating MPFR arbitrary precision - floating-point values (*note Arbitrary Precision Integers::). - - This function is a 'gawk' extension. It is not available in - compatibility mode (*note Options::). - 'log(X)' Return the natural logarithm of X, if X is positive; otherwise, return 'NaN' ("not a number") on IEEE 754 systems. Additionally, @@ -23196,59 +23178,7 @@ the following: When dividing two arbitrary precision integers with either '/' or '%', the result is typically an arbitrary precision floating point value -(unless the denominator evenly divides into the numerator). In order to -do integer division or remainder with arbitrary precision integers, use -the built-in 'intdiv()' function (*note Numeric Functions::). - - You can simulate the 'intdiv()' function in standard 'awk' using this -user-defined function: - - # intdiv --- do integer division - - function intdiv(numerator, denominator, result) - { - split("", result) - - numerator = int(numerator) - denominator = int(denominator) - result["quotient"] = int(numerator / denominator) - result["remainder"] = int(numerator % denominator) - - return 0.0 - } - - The following example program, contributed by Katie Wasserman, uses -'intdiv()' to compute the digits of pi to as many places as you choose -to set: - - # pi.awk --- compute the digits of pi - - BEGIN { - digits = 100000 - two = 2 * 10 ^ digits - pi = two - for (m = digits * 4; m > 0; --m) { - d = m * 2 + 1 - x = pi * m - intdiv(x, d, result) - pi = result["quotient"] - pi = pi + two - } - print pi - } - - When asked about the algorithm used, Katie replied: - - It's not that well known but it's not that obscure either. It's - Euler's modification to Newton's method for calculating pi. Take a - look at lines (23) - (25) here: - <http://mathworld.wolfram.com/PiFormulas.html>. - - The algorithm I wrote simply expands the multiply by 2 and works - from the innermost expression outwards. I used this to program HP - calculators because it's quite easy to modify for tiny memory - devices with smallish word sizes. See - <http://www.hpmuseum.org/cgi-sys/cgiwrap/hpmuseum/articles.cgi?read=899>. +(unless the denominator evenly divides into the numerator). ---------- Footnotes ---------- @@ -27560,9 +27490,6 @@ current version of 'gawk'. - The 'bindtextdomain()', 'dcgettext()', and 'dcngettext()' functions for internationalization (*note Programmer i18n::) - - The 'intdiv()' function for doing integer division and - remainder (*note Numeric Functions::) - * Changes and/or additions in the command-line options: - The 'AWKPATH' environment variable for specifying a path @@ -28025,8 +27952,6 @@ POSIX 'awk', in the order they were added to 'gawk'. * The 'igawk' program and its manual page are no longer installed when 'gawk' is built. *Note Igawk Program::. - * The 'intdiv()' function. *Note Numeric Functions::. - * The maximum number of hexadecimal digits in '\x' escapes is now two. *Note Escape Sequences::. @@ -34437,8 +34362,6 @@ Index * instruction tracing, in debugger: Debugger Info. (line 90) * int: Numeric Functions. (line 24) * INT signal (MS-Windows): Profiling. (line 212) -* intdiv: Numeric Functions. (line 29) -* intdiv <1>: Numeric Functions. (line 29) * integer array indices: Numeric Array Subscripts. (line 31) * integers, arbitrary precision: Arbitrary Precision Integers. @@ -34588,9 +34511,9 @@ Index * localization: I18N and L10N. (line 6) * localization, See internationalization, localization: I18N and L10N. (line 6) -* log: Numeric Functions. (line 47) +* log: Numeric Functions. (line 29) * log files, timestamps in: Time Functions. (line 6) -* logarithm: Numeric Functions. (line 47) +* logarithm: Numeric Functions. (line 29) * logical false/true: Truth Values. (line 6) * logical operators, See Boolean expressions: Boolean Ops. (line 6) * login information: Passwd Functions. (line 16) @@ -35054,12 +34977,12 @@ Index * Rakitzis, Byron: History Sorting. (line 25) * Ramey, Chet: Acknowledgments. (line 60) * Ramey, Chet <1>: General Data Types. (line 6) -* rand: Numeric Functions. (line 52) +* rand: Numeric Functions. (line 34) * random numbers, Cliff: Cliff Random Function. (line 6) * random numbers, rand()/srand() functions: Numeric Functions. - (line 52) -* random numbers, seed of: Numeric Functions. (line 82) + (line 34) +* random numbers, seed of: Numeric Functions. (line 64) * range expressions (regexps): Bracket Expressions. (line 6) * range patterns: Ranges. (line 6) * range patterns, line continuation and: Ranges. (line 64) @@ -35237,7 +35160,7 @@ Index * sed utility: Full Line Fields. (line 22) * sed utility <1>: Simple Sed. (line 6) * sed utility <2>: Glossary. (line 16) -* seeding random number generator: Numeric Functions. (line 82) +* seeding random number generator: Numeric Functions. (line 64) * semicolon (;), AWKPATH variable and: PC Using. (line 9) * semicolon (;), separating statements in actions: Statements/Lines. (line 90) @@ -35341,8 +35264,8 @@ Index * SIGUSR1 signal, for dynamic profiling: Profiling. (line 186) * silent debugger command: Debugger Execution Control. (line 10) -* sin: Numeric Functions. (line 93) -* sine: Numeric Functions. (line 93) +* sin: Numeric Functions. (line 75) +* sine: Numeric Functions. (line 75) * single quote ('): One-shot. (line 15) * single quote (') in gawk command lines: Long. (line 35) * single quote ('), in shell commands: Quoting. (line 48) @@ -35392,10 +35315,10 @@ Index * sprintf() function, OFMT variable and: User-modified. (line 116) * sprintf() function, print/printf statements and: Round Function. (line 6) -* sqrt: Numeric Functions. (line 96) +* sqrt: Numeric Functions. (line 78) * square brackets ([]), regexp operator: Regexp Operators. (line 56) -* square root: Numeric Functions. (line 96) -* srand: Numeric Functions. (line 100) +* square root: Numeric Functions. (line 78) +* srand: Numeric Functions. (line 82) * stack frame: Debugging Terms. (line 10) * Stallman, Richard: Manual History. (line 6) * Stallman, Richard <1>: Acknowledgments. (line 18) @@ -35960,341 +35883,341 @@ Node: Functions521041 Node: Built-in522079 Node: Calling Built-in523160 Node: Numeric Functions525156 -Ref: Numeric Functions-Footnote-1530101 -Ref: Numeric Functions-Footnote-2530458 -Ref: Numeric Functions-Footnote-3530506 -Node: String Functions530778 -Ref: String Functions-Footnote-1554436 -Ref: String Functions-Footnote-2554564 -Ref: String Functions-Footnote-3554812 -Node: Gory Details554899 -Ref: table-sub-escapes556690 -Ref: table-sub-proposed558209 -Ref: table-posix-sub559572 -Ref: table-gensub-escapes561113 -Ref: Gory Details-Footnote-1561936 -Node: I/O Functions562090 -Ref: table-system-return-values568672 -Ref: I/O Functions-Footnote-1570652 -Ref: I/O Functions-Footnote-2570800 -Node: Time Functions570920 -Ref: Time Functions-Footnote-1581587 -Ref: Time Functions-Footnote-2581655 -Ref: Time Functions-Footnote-3581813 -Ref: Time Functions-Footnote-4581924 -Ref: Time Functions-Footnote-5582036 -Ref: Time Functions-Footnote-6582263 -Node: Bitwise Functions582529 -Ref: table-bitwise-ops583123 -Ref: Bitwise Functions-Footnote-1589156 -Ref: Bitwise Functions-Footnote-2589329 -Node: Type Functions589520 -Node: I18N Functions592195 -Node: User-defined593846 -Node: Definition Syntax594651 -Ref: Definition Syntax-Footnote-1600338 -Node: Function Example600409 -Ref: Function Example-Footnote-1603331 -Node: Function Caveats603353 -Node: Calling A Function603871 -Node: Variable Scope604829 -Node: Pass By Value/Reference607823 -Node: Return Statement611322 -Node: Dynamic Typing614301 -Node: Indirect Calls615231 -Ref: Indirect Calls-Footnote-1625482 -Node: Functions Summary625610 -Node: Library Functions628315 -Ref: Library Functions-Footnote-1631922 -Ref: Library Functions-Footnote-2632065 -Node: Library Names632236 -Ref: Library Names-Footnote-1635696 -Ref: Library Names-Footnote-2635919 -Node: General Functions636005 -Node: Strtonum Function637108 -Node: Assert Function640130 -Node: Round Function643456 -Node: Cliff Random Function644997 -Node: Ordinal Functions646013 -Ref: Ordinal Functions-Footnote-1649076 -Ref: Ordinal Functions-Footnote-2649328 -Node: Join Function649538 -Ref: Join Function-Footnote-1651308 -Node: Getlocaltime Function651508 -Node: Readfile Function655250 -Node: Shell Quoting657222 -Node: Data File Management658623 -Node: Filetrans Function659255 -Node: Rewind Function663351 -Node: File Checking665257 -Ref: File Checking-Footnote-1666591 -Node: Empty Files666792 -Node: Ignoring Assigns668771 -Node: Getopt Function670321 -Ref: Getopt Function-Footnote-1681790 -Node: Passwd Functions681990 -Ref: Passwd Functions-Footnote-1690829 -Node: Group Functions690917 -Ref: Group Functions-Footnote-1698815 -Node: Walking Arrays699022 -Node: Library Functions Summary702030 -Node: Library Exercises703436 -Node: Sample Programs703901 -Node: Running Examples704671 -Node: Clones705399 -Node: Cut Program706623 -Node: Egrep Program716552 -Ref: Egrep Program-Footnote-1724064 -Node: Id Program724174 -Node: Split Program727854 -Ref: Split Program-Footnote-1731313 -Node: Tee Program731442 -Node: Uniq Program734232 -Node: Wc Program741658 -Ref: Wc Program-Footnote-1745913 -Node: Miscellaneous Programs746007 -Node: Dupword Program747220 -Node: Alarm Program749250 -Node: Translate Program754105 -Ref: Translate Program-Footnote-1758670 -Node: Labels Program758940 -Ref: Labels Program-Footnote-1762291 -Node: Word Sorting762375 -Node: History Sorting766447 -Node: Extract Program768282 -Node: Simple Sed775811 -Node: Igawk Program778885 -Ref: Igawk Program-Footnote-1793216 -Ref: Igawk Program-Footnote-2793418 -Ref: Igawk Program-Footnote-3793540 -Node: Anagram Program793655 -Node: Signature Program796717 -Node: Programs Summary797964 -Node: Programs Exercises799178 -Ref: Programs Exercises-Footnote-1803307 -Node: Advanced Features803398 -Node: Nondecimal Data805388 -Node: Array Sorting806979 -Node: Controlling Array Traversal807679 -Ref: Controlling Array Traversal-Footnote-1816046 -Node: Array Sorting Functions816164 -Ref: Array Sorting Functions-Footnote-1821255 -Node: Two-way I/O821451 -Ref: Two-way I/O-Footnote-1828002 -Ref: Two-way I/O-Footnote-2828189 -Node: TCP/IP Networking828271 -Node: Profiling831389 -Ref: Profiling-Footnote-1840061 -Node: Advanced Features Summary840384 -Node: Internationalization842228 -Node: I18N and L10N843708 -Node: Explaining gettext844395 -Ref: Explaining gettext-Footnote-1850287 -Ref: Explaining gettext-Footnote-2850472 -Node: Programmer i18n850637 -Ref: Programmer i18n-Footnote-1855586 -Node: Translator i18n855635 -Node: String Extraction856429 -Ref: String Extraction-Footnote-1857561 -Node: Printf Ordering857647 -Ref: Printf Ordering-Footnote-1860433 -Node: I18N Portability860497 -Ref: I18N Portability-Footnote-1862953 -Node: I18N Example863016 -Ref: I18N Example-Footnote-1865822 -Node: Gawk I18N865895 -Node: I18N Summary866540 -Node: Debugger867881 -Node: Debugging868903 -Node: Debugging Concepts869344 -Node: Debugging Terms871153 -Node: Awk Debugging873728 -Node: Sample Debugging Session874634 -Node: Debugger Invocation875168 -Node: Finding The Bug876554 -Node: List of Debugger Commands883032 -Node: Breakpoint Control884365 -Node: Debugger Execution Control888059 -Node: Viewing And Changing Data891421 -Node: Execution Stack894795 -Node: Debugger Info896432 -Node: Miscellaneous Debugger Commands900503 -Node: Readline Support905591 -Node: Limitations906487 -Node: Debugging Summary908596 -Node: Arbitrary Precision Arithmetic909875 -Node: Computer Arithmetic911360 -Ref: table-numeric-ranges914951 -Ref: Computer Arithmetic-Footnote-1915673 -Node: Math Definitions915730 -Ref: table-ieee-formats919044 -Ref: Math Definitions-Footnote-1919647 -Node: MPFR features919752 -Node: FP Math Caution921469 -Ref: FP Math Caution-Footnote-1922541 -Node: Inexactness of computations922910 -Node: Inexact representation923870 -Node: Comparing FP Values925230 -Node: Errors accumulate926312 -Node: Getting Accuracy927745 -Node: Try To Round930455 -Node: Setting precision931354 -Ref: table-predefined-precision-strings932051 -Node: Setting the rounding mode933881 -Ref: table-gawk-rounding-modes934255 -Ref: Setting the rounding mode-Footnote-1937663 -Node: Arbitrary Precision Integers937842 -Ref: Arbitrary Precision Integers-Footnote-1942747 -Node: Checking for MPFR942896 -Node: POSIX Floating Point Problems944193 -Ref: POSIX Floating Point Problems-Footnote-1948064 -Node: Floating point summary948102 -Node: Dynamic Extensions950292 -Node: Extension Intro951845 -Node: Plugin License953111 -Node: Extension Mechanism Outline953908 -Ref: figure-load-extension954347 -Ref: figure-register-new-function955912 -Ref: figure-call-new-function957004 -Node: Extension API Description959066 -Node: Extension API Functions Introduction960708 -Node: General Data Types966042 -Ref: General Data Types-Footnote-1973247 -Node: Memory Allocation Functions973546 -Ref: Memory Allocation Functions-Footnote-1976391 -Node: Constructor Functions976490 -Node: Registration Functions979489 -Node: Extension Functions980174 -Node: Exit Callback Functions985387 -Node: Extension Version String986637 -Node: Input Parsers987300 -Node: Output Wrappers1000007 -Node: Two-way processors1004519 -Node: Printing Messages1006784 -Ref: Printing Messages-Footnote-11007955 -Node: Updating ERRNO1008108 -Node: Requesting Values1008847 -Ref: table-value-types-returned1009584 -Node: Accessing Parameters1010520 -Node: Symbol Table Access1011755 -Node: Symbol table by name1012267 -Node: Symbol table by cookie1014056 -Ref: Symbol table by cookie-Footnote-11018241 -Node: Cached values1018305 -Ref: Cached values-Footnote-11021841 -Node: Array Manipulation1021932 -Ref: Array Manipulation-Footnote-11023023 -Node: Array Data Types1023060 -Ref: Array Data Types-Footnote-11025718 -Node: Array Functions1025810 -Node: Flattening Arrays1030209 -Node: Creating Arrays1037150 -Node: Redirection API1041919 -Node: Extension API Variables1044761 -Node: Extension Versioning1045394 -Ref: gawk-api-version1045831 -Node: Extension API Informational Variables1047559 -Node: Extension API Boilerplate1048623 -Node: Changes from API V11052485 -Node: Finding Extensions1053145 -Node: Extension Example1053704 -Node: Internal File Description1054502 -Node: Internal File Ops1058582 -Ref: Internal File Ops-Footnote-11069982 -Node: Using Internal File Ops1070122 -Ref: Using Internal File Ops-Footnote-11072505 -Node: Extension Samples1072779 -Node: Extension Sample File Functions1074308 -Node: Extension Sample Fnmatch1081957 -Node: Extension Sample Fork1083444 -Node: Extension Sample Inplace1084662 -Node: Extension Sample Ord1087872 -Node: Extension Sample Readdir1088708 -Ref: table-readdir-file-types1089597 -Node: Extension Sample Revout1090402 -Node: Extension Sample Rev2way1090991 -Node: Extension Sample Read write array1091731 -Node: Extension Sample Readfile1093673 -Node: Extension Sample Time1094768 -Node: Extension Sample API Tests1096116 -Node: gawkextlib1096608 -Node: Extension summary1099055 -Node: Extension Exercises1102757 -Node: Language History1104255 -Node: V7/SVR3.11105911 -Node: SVR41108063 -Node: POSIX1109497 -Node: BTL1110876 -Node: POSIX/GNU1111605 -Node: Feature History1117497 -Node: Common Extensions1131867 -Node: Ranges and Locales1133150 -Ref: Ranges and Locales-Footnote-11137766 -Ref: Ranges and Locales-Footnote-21137793 -Ref: Ranges and Locales-Footnote-31138028 -Node: Contributors1138249 -Node: History summary1143809 -Node: Installation1145189 -Node: Gawk Distribution1146133 -Node: Getting1146617 -Node: Extracting1147578 -Node: Distribution contents1149216 -Node: Unix Installation1155558 -Node: Quick Installation1156240 -Node: Shell Startup Files1158654 -Node: Additional Configuration Options1159743 -Node: Configuration Philosophy1161732 -Node: Non-Unix Installation1164101 -Node: PC Installation1164561 -Node: PC Binary Installation1165399 -Node: PC Compiling1165834 -Node: PC Using1166951 -Node: Cygwin1169996 -Node: MSYS1170766 -Node: VMS Installation1171267 -Node: VMS Compilation1172058 -Ref: VMS Compilation-Footnote-11173287 -Node: VMS Dynamic Extensions1173345 -Node: VMS Installation Details1175030 -Node: VMS Running1177283 -Node: VMS GNV1181562 -Node: VMS Old Gawk1182297 -Node: Bugs1182768 -Node: Bug address1183431 -Node: Usenet1185828 -Node: Maintainers1186605 -Node: Other Versions1187981 -Node: Installation summary1194565 -Node: Notes1195600 -Node: Compatibility Mode1196465 -Node: Additions1197247 -Node: Accessing The Source1198172 -Node: Adding Code1199607 -Node: New Ports1205825 -Node: Derived Files1210313 -Ref: Derived Files-Footnote-11215798 -Ref: Derived Files-Footnote-21215833 -Ref: Derived Files-Footnote-31216431 -Node: Future Extensions1216545 -Node: Implementation Limitations1217203 -Node: Extension Design1218386 -Node: Old Extension Problems1219540 -Ref: Old Extension Problems-Footnote-11221058 -Node: Extension New Mechanism Goals1221115 -Ref: Extension New Mechanism Goals-Footnote-11224479 -Node: Extension Other Design Decisions1224668 -Node: Extension Future Growth1226781 -Node: Old Extension Mechanism1227617 -Node: Notes summary1229380 -Node: Basic Concepts1230562 -Node: Basic High Level1231243 -Ref: figure-general-flow1231525 -Ref: figure-process-flow1232210 -Ref: Basic High Level-Footnote-11235511 -Node: Basic Data Typing1235696 -Node: Glossary1239024 -Node: Copying1270971 -Node: GNU Free Documentation License1308510 -Node: Index1333628 +Ref: Numeric Functions-Footnote-1529184 +Ref: Numeric Functions-Footnote-2529541 +Ref: Numeric Functions-Footnote-3529589 +Node: String Functions529861 +Ref: String Functions-Footnote-1553519 +Ref: String Functions-Footnote-2553647 +Ref: String Functions-Footnote-3553895 +Node: Gory Details553982 +Ref: table-sub-escapes555773 +Ref: table-sub-proposed557292 +Ref: table-posix-sub558655 +Ref: table-gensub-escapes560196 +Ref: Gory Details-Footnote-1561019 +Node: I/O Functions561173 +Ref: table-system-return-values567755 +Ref: I/O Functions-Footnote-1569735 +Ref: I/O Functions-Footnote-2569883 +Node: Time Functions570003 +Ref: Time Functions-Footnote-1580670 +Ref: Time Functions-Footnote-2580738 +Ref: Time Functions-Footnote-3580896 +Ref: Time Functions-Footnote-4581007 +Ref: Time Functions-Footnote-5581119 +Ref: Time Functions-Footnote-6581346 +Node: Bitwise Functions581612 +Ref: table-bitwise-ops582206 +Ref: Bitwise Functions-Footnote-1588239 +Ref: Bitwise Functions-Footnote-2588412 +Node: Type Functions588603 +Node: I18N Functions591278 +Node: User-defined592929 +Node: Definition Syntax593734 +Ref: Definition Syntax-Footnote-1599421 +Node: Function Example599492 +Ref: Function Example-Footnote-1602414 +Node: Function Caveats602436 +Node: Calling A Function602954 +Node: Variable Scope603912 +Node: Pass By Value/Reference606906 +Node: Return Statement610405 +Node: Dynamic Typing613384 +Node: Indirect Calls614314 +Ref: Indirect Calls-Footnote-1624565 +Node: Functions Summary624693 +Node: Library Functions627398 +Ref: Library Functions-Footnote-1631005 +Ref: Library Functions-Footnote-2631148 +Node: Library Names631319 +Ref: Library Names-Footnote-1634779 +Ref: Library Names-Footnote-2635002 +Node: General Functions635088 +Node: Strtonum Function636191 +Node: Assert Function639213 +Node: Round Function642539 +Node: Cliff Random Function644080 +Node: Ordinal Functions645096 +Ref: Ordinal Functions-Footnote-1648159 +Ref: Ordinal Functions-Footnote-2648411 +Node: Join Function648621 +Ref: Join Function-Footnote-1650391 +Node: Getlocaltime Function650591 +Node: Readfile Function654333 +Node: Shell Quoting656305 +Node: Data File Management657706 +Node: Filetrans Function658338 +Node: Rewind Function662434 +Node: File Checking664340 +Ref: File Checking-Footnote-1665674 +Node: Empty Files665875 +Node: Ignoring Assigns667854 +Node: Getopt Function669404 +Ref: Getopt Function-Footnote-1680873 +Node: Passwd Functions681073 +Ref: Passwd Functions-Footnote-1689912 +Node: Group Functions690000 +Ref: Group Functions-Footnote-1697898 +Node: Walking Arrays698105 +Node: Library Functions Summary701113 +Node: Library Exercises702519 +Node: Sample Programs702984 +Node: Running Examples703754 +Node: Clones704482 +Node: Cut Program705706 +Node: Egrep Program715635 +Ref: Egrep Program-Footnote-1723147 +Node: Id Program723257 +Node: Split Program726937 +Ref: Split Program-Footnote-1730396 +Node: Tee Program730525 +Node: Uniq Program733315 +Node: Wc Program740741 +Ref: Wc Program-Footnote-1744996 +Node: Miscellaneous Programs745090 +Node: Dupword Program746303 +Node: Alarm Program748333 +Node: Translate Program753188 +Ref: Translate Program-Footnote-1757753 +Node: Labels Program758023 +Ref: Labels Program-Footnote-1761374 +Node: Word Sorting761458 +Node: History Sorting765530 +Node: Extract Program767365 +Node: Simple Sed774894 +Node: Igawk Program777968 +Ref: Igawk Program-Footnote-1792299 +Ref: Igawk Program-Footnote-2792501 +Ref: Igawk Program-Footnote-3792623 +Node: Anagram Program792738 +Node: Signature Program795800 +Node: Programs Summary797047 +Node: Programs Exercises798261 +Ref: Programs Exercises-Footnote-1802390 +Node: Advanced Features802481 +Node: Nondecimal Data804471 +Node: Array Sorting806062 +Node: Controlling Array Traversal806762 +Ref: Controlling Array Traversal-Footnote-1815129 +Node: Array Sorting Functions815247 +Ref: Array Sorting Functions-Footnote-1820338 +Node: Two-way I/O820534 +Ref: Two-way I/O-Footnote-1827085 +Ref: Two-way I/O-Footnote-2827272 +Node: TCP/IP Networking827354 +Node: Profiling830472 +Ref: Profiling-Footnote-1839144 +Node: Advanced Features Summary839467 +Node: Internationalization841311 +Node: I18N and L10N842791 +Node: Explaining gettext843478 +Ref: Explaining gettext-Footnote-1849370 +Ref: Explaining gettext-Footnote-2849555 +Node: Programmer i18n849720 +Ref: Programmer i18n-Footnote-1854669 +Node: Translator i18n854718 +Node: String Extraction855512 +Ref: String Extraction-Footnote-1856644 +Node: Printf Ordering856730 +Ref: Printf Ordering-Footnote-1859516 +Node: I18N Portability859580 +Ref: I18N Portability-Footnote-1862036 +Node: I18N Example862099 +Ref: I18N Example-Footnote-1864905 +Node: Gawk I18N864978 +Node: I18N Summary865623 +Node: Debugger866964 +Node: Debugging867986 +Node: Debugging Concepts868427 +Node: Debugging Terms870236 +Node: Awk Debugging872811 +Node: Sample Debugging Session873717 +Node: Debugger Invocation874251 +Node: Finding The Bug875637 +Node: List of Debugger Commands882115 +Node: Breakpoint Control883448 +Node: Debugger Execution Control887142 +Node: Viewing And Changing Data890504 +Node: Execution Stack893878 +Node: Debugger Info895515 +Node: Miscellaneous Debugger Commands899586 +Node: Readline Support904674 +Node: Limitations905570 +Node: Debugging Summary907679 +Node: Arbitrary Precision Arithmetic908958 +Node: Computer Arithmetic910443 +Ref: table-numeric-ranges914034 +Ref: Computer Arithmetic-Footnote-1914756 +Node: Math Definitions914813 +Ref: table-ieee-formats918127 +Ref: Math Definitions-Footnote-1918730 +Node: MPFR features918835 +Node: FP Math Caution920552 +Ref: FP Math Caution-Footnote-1921624 +Node: Inexactness of computations921993 +Node: Inexact representation922953 +Node: Comparing FP Values924313 +Node: Errors accumulate925395 +Node: Getting Accuracy926828 +Node: Try To Round929538 +Node: Setting precision930437 +Ref: table-predefined-precision-strings931134 +Node: Setting the rounding mode932964 +Ref: table-gawk-rounding-modes933338 +Ref: Setting the rounding mode-Footnote-1936746 +Node: Arbitrary Precision Integers936925 +Ref: Arbitrary Precision Integers-Footnote-1940100 +Node: Checking for MPFR940249 +Node: POSIX Floating Point Problems941546 +Ref: POSIX Floating Point Problems-Footnote-1945417 +Node: Floating point summary945455 +Node: Dynamic Extensions947645 +Node: Extension Intro949198 +Node: Plugin License950464 +Node: Extension Mechanism Outline951261 +Ref: figure-load-extension951700 +Ref: figure-register-new-function953265 +Ref: figure-call-new-function954357 +Node: Extension API Description956419 +Node: Extension API Functions Introduction958061 +Node: General Data Types963395 +Ref: General Data Types-Footnote-1970600 +Node: Memory Allocation Functions970899 +Ref: Memory Allocation Functions-Footnote-1973744 +Node: Constructor Functions973843 +Node: Registration Functions976842 +Node: Extension Functions977527 +Node: Exit Callback Functions982740 +Node: Extension Version String983990 +Node: Input Parsers984653 +Node: Output Wrappers997360 +Node: Two-way processors1001872 +Node: Printing Messages1004137 +Ref: Printing Messages-Footnote-11005308 +Node: Updating ERRNO1005461 +Node: Requesting Values1006200 +Ref: table-value-types-returned1006937 +Node: Accessing Parameters1007873 +Node: Symbol Table Access1009108 +Node: Symbol table by name1009620 +Node: Symbol table by cookie1011409 +Ref: Symbol table by cookie-Footnote-11015594 +Node: Cached values1015658 +Ref: Cached values-Footnote-11019194 +Node: Array Manipulation1019285 +Ref: Array Manipulation-Footnote-11020376 +Node: Array Data Types1020413 +Ref: Array Data Types-Footnote-11023071 +Node: Array Functions1023163 +Node: Flattening Arrays1027562 +Node: Creating Arrays1034503 +Node: Redirection API1039272 +Node: Extension API Variables1042114 +Node: Extension Versioning1042747 +Ref: gawk-api-version1043184 +Node: Extension API Informational Variables1044912 +Node: Extension API Boilerplate1045976 +Node: Changes from API V11049838 +Node: Finding Extensions1050498 +Node: Extension Example1051057 +Node: Internal File Description1051855 +Node: Internal File Ops1055935 +Ref: Internal File Ops-Footnote-11067335 +Node: Using Internal File Ops1067475 +Ref: Using Internal File Ops-Footnote-11069858 +Node: Extension Samples1070132 +Node: Extension Sample File Functions1071661 +Node: Extension Sample Fnmatch1079310 +Node: Extension Sample Fork1080797 +Node: Extension Sample Inplace1082015 +Node: Extension Sample Ord1085225 +Node: Extension Sample Readdir1086061 +Ref: table-readdir-file-types1086950 +Node: Extension Sample Revout1087755 +Node: Extension Sample Rev2way1088344 +Node: Extension Sample Read write array1089084 +Node: Extension Sample Readfile1091026 +Node: Extension Sample Time1092121 +Node: Extension Sample API Tests1093469 +Node: gawkextlib1093961 +Node: Extension summary1096408 +Node: Extension Exercises1100110 +Node: Language History1101608 +Node: V7/SVR3.11103264 +Node: SVR41105416 +Node: POSIX1106850 +Node: BTL1108229 +Node: POSIX/GNU1108958 +Node: Feature History1114736 +Node: Common Extensions1129047 +Node: Ranges and Locales1130330 +Ref: Ranges and Locales-Footnote-11134946 +Ref: Ranges and Locales-Footnote-21134973 +Ref: Ranges and Locales-Footnote-31135208 +Node: Contributors1135429 +Node: History summary1140989 +Node: Installation1142369 +Node: Gawk Distribution1143313 +Node: Getting1143797 +Node: Extracting1144758 +Node: Distribution contents1146396 +Node: Unix Installation1152738 +Node: Quick Installation1153420 +Node: Shell Startup Files1155834 +Node: Additional Configuration Options1156923 +Node: Configuration Philosophy1158912 +Node: Non-Unix Installation1161281 +Node: PC Installation1161741 +Node: PC Binary Installation1162579 +Node: PC Compiling1163014 +Node: PC Using1164131 +Node: Cygwin1167176 +Node: MSYS1167946 +Node: VMS Installation1168447 +Node: VMS Compilation1169238 +Ref: VMS Compilation-Footnote-11170467 +Node: VMS Dynamic Extensions1170525 +Node: VMS Installation Details1172210 +Node: VMS Running1174463 +Node: VMS GNV1178742 +Node: VMS Old Gawk1179477 +Node: Bugs1179948 +Node: Bug address1180611 +Node: Usenet1183008 +Node: Maintainers1183785 +Node: Other Versions1185161 +Node: Installation summary1191745 +Node: Notes1192780 +Node: Compatibility Mode1193645 +Node: Additions1194427 +Node: Accessing The Source1195352 +Node: Adding Code1196787 +Node: New Ports1203005 +Node: Derived Files1207493 +Ref: Derived Files-Footnote-11212978 +Ref: Derived Files-Footnote-21213013 +Ref: Derived Files-Footnote-31213611 +Node: Future Extensions1213725 +Node: Implementation Limitations1214383 +Node: Extension Design1215566 +Node: Old Extension Problems1216720 +Ref: Old Extension Problems-Footnote-11218238 +Node: Extension New Mechanism Goals1218295 +Ref: Extension New Mechanism Goals-Footnote-11221659 +Node: Extension Other Design Decisions1221848 +Node: Extension Future Growth1223961 +Node: Old Extension Mechanism1224797 +Node: Notes summary1226560 +Node: Basic Concepts1227742 +Node: Basic High Level1228423 +Ref: figure-general-flow1228705 +Ref: figure-process-flow1229390 +Ref: Basic High Level-Footnote-11232691 +Node: Basic Data Typing1232876 +Node: Glossary1236204 +Node: Copying1268151 +Node: GNU Free Documentation License1305690 +Node: Index1330808 End Tag Table diff --git a/doc/gawk.texi b/doc/gawk.texi index e7d75521..87e46a5e 100644 --- a/doc/gawk.texi +++ b/doc/gawk.texi @@ -17564,9 +17564,10 @@ truncated toward zero. For example, @code{int(3)} is 3, @code{int(3.9)} is 3, @code{int(-3.9)} is @minus{}3, and @code{int(-3)} is @minus{}3 as well. -@item @code{intdiv(@var{numerator}, @var{denominator}, @var{result})} -@cindexawkfunc{intdiv} -@cindex intdiv +@ifset INTDIV +@item @code{intdiv0(@var{numerator}, @var{denominator}, @var{result})} +@cindexawkfunc{intdiv0} +@cindex intdiv0 Perform integer division, similar to the standard C @code{div()} function. First, truncate @code{numerator} and @code{denominator} towards zero, creating integer values. Clear the @code{result} @@ -17584,6 +17585,7 @@ Precision Integers}). This function is a @code{gawk} extension. It is not available in compatibility mode (@pxref{Options}). +@end ifset @item @code{log(@var{x})} @cindexawkfunc{log} @@ -32014,16 +32016,18 @@ gawk -M 'BEGIN @{ n = 13; print n % 2 @}' When dividing two arbitrary precision integers with either @samp{/} or @samp{%}, the result is typically an arbitrary precision floating point value (unless the denominator evenly -divides into the numerator). In order to do integer division +divides into the numerator). +@ifset INTDIV +In order to do integer division or remainder with arbitrary precision integers, use the built-in -@code{intdiv()} function (@pxref{Numeric Functions}). +@code{intdiv0()} function (@pxref{Numeric Functions}). -You can simulate the @code{intdiv()} function in standard @command{awk} +You can simulate the @code{intdiv0()} function in standard @command{awk} using this user-defined function: @example @c file eg/lib/intdiv.awk -# intdiv --- do integer division +# intdiv0 --- do integer division @c endfile @ignore @@ -32034,12 +32038,15 @@ using this user-defined function: # # Name changed from div() to intdiv() # April, 2015 +# +# Changed to intdiv0() +# April, 2016 @c endfile @end ignore @c file eg/lib/intdiv.awk -function intdiv(numerator, denominator, result) +function intdiv0(numerator, denominator, result) @{ split("", result) @@ -32126,6 +32133,7 @@ because it's quite easy to modify for tiny memory devices with smallish word sizes. See @uref{http://www.hpmuseum.org/cgi-sys/cgiwrap/hpmuseum/articles.cgi?read=899}. @end quotation +@end ifset @node Checking for MPFR @section How To Check If MPFR Is Available @@ -37226,10 +37234,12 @@ The @code{bindtextdomain()}, @code{dcgettext()}, and @code{dcngettext()} functions for internationalization (@pxref{Programmer i18n}) +@ifset INTDIV @item -The @code{intdiv()} function for doing integer +The @code{intdiv0()} function for doing integer division and remainder (@pxref{Numeric Functions}) +@end ifset @end itemize @item @@ -38021,9 +38031,11 @@ The @command{igawk} program and its manual page are no longer installed when @command{gawk} is built. @xref{Igawk Program}. +@ifset INTDIV @item -The @code{intdiv()} function. +The @code{intdiv0()} function. @xref{Numeric Functions}. +@end ifset @item The maximum number of hexadecimal digits in @samp{\x} escapes diff --git a/doc/gawktexi.in b/doc/gawktexi.in index f95360d2..402caede 100644 --- a/doc/gawktexi.in +++ b/doc/gawktexi.in @@ -16837,9 +16837,10 @@ truncated toward zero. For example, @code{int(3)} is 3, @code{int(3.9)} is 3, @code{int(-3.9)} is @minus{}3, and @code{int(-3)} is @minus{}3 as well. -@item @code{intdiv(@var{numerator}, @var{denominator}, @var{result})} -@cindexawkfunc{intdiv} -@cindex intdiv +@ifset INTDIV +@item @code{intdiv0(@var{numerator}, @var{denominator}, @var{result})} +@cindexawkfunc{intdiv0} +@cindex intdiv0 Perform integer division, similar to the standard C @code{div()} function. First, truncate @code{numerator} and @code{denominator} towards zero, creating integer values. Clear the @code{result} @@ -16857,6 +16858,7 @@ Precision Integers}). This function is a @code{gawk} extension. It is not available in compatibility mode (@pxref{Options}). +@end ifset @item @code{log(@var{x})} @cindexawkfunc{log} @@ -31028,16 +31030,18 @@ gawk -M 'BEGIN @{ n = 13; print n % 2 @}' When dividing two arbitrary precision integers with either @samp{/} or @samp{%}, the result is typically an arbitrary precision floating point value (unless the denominator evenly -divides into the numerator). In order to do integer division +divides into the numerator). +@ifset INTDIV +In order to do integer division or remainder with arbitrary precision integers, use the built-in -@code{intdiv()} function (@pxref{Numeric Functions}). +@code{intdiv0()} function (@pxref{Numeric Functions}). -You can simulate the @code{intdiv()} function in standard @command{awk} +You can simulate the @code{intdiv0()} function in standard @command{awk} using this user-defined function: @example @c file eg/lib/intdiv.awk -# intdiv --- do integer division +# intdiv0 --- do integer division @c endfile @ignore @@ -31048,12 +31052,15 @@ using this user-defined function: # # Name changed from div() to intdiv() # April, 2015 +# +# Changed to intdiv0() +# April, 2016 @c endfile @end ignore @c file eg/lib/intdiv.awk -function intdiv(numerator, denominator, result) +function intdiv0(numerator, denominator, result) @{ split("", result) @@ -31140,6 +31147,7 @@ because it's quite easy to modify for tiny memory devices with smallish word sizes. See @uref{http://www.hpmuseum.org/cgi-sys/cgiwrap/hpmuseum/articles.cgi?read=899}. @end quotation +@end ifset @node Checking for MPFR @section How To Check If MPFR Is Available @@ -36240,10 +36248,12 @@ The @code{bindtextdomain()}, @code{dcgettext()}, and @code{dcngettext()} functions for internationalization (@pxref{Programmer i18n}) +@ifset INTDIV @item -The @code{intdiv()} function for doing integer +The @code{intdiv0()} function for doing integer division and remainder (@pxref{Numeric Functions}) +@end ifset @end itemize @item @@ -37035,9 +37045,11 @@ The @command{igawk} program and its manual page are no longer installed when @command{gawk} is built. @xref{Igawk Program}. +@ifset INTDIV @item -The @code{intdiv()} function. +The @code{intdiv0()} function. @xref{Numeric Functions}. +@end ifset @item The maximum number of hexadecimal digits in @samp{\x} escapes diff --git a/extension/ChangeLog b/extension/ChangeLog index d10dc766..7307a11a 100644 --- a/extension/ChangeLog +++ b/extension/ChangeLog @@ -1,3 +1,23 @@ +2017-04-16 Arnold D. Robbins <arnold@skeeve.com> + + * intdiv.c (func_table): Function is now named intdiv. + +2017-04-14 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * intdiv.c (do_intdiv): On division by zero, return -1 and issue a + warning instead of throwing a fatal error. + +2017-04-13 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * intdiv.c (do_intdiv): On a division by zero fatal error, there's + no need to clear the numerator and denominator and add a fake return. + +2017-04-13 Arnold D. Robbins <arnold@skeeve.com> + + * configure.ac: Alphabetize function list in AC_CHECK_FUNCS. + * intdiv.c: Add descriptive comments to some functions. + (do_intdiv): Make division by zero fatal in MPFR case. + 2017-04-03 Arnold D. Robbins <arnold@skeeve.com> * inplace.c (inplace_end): Correct the function name in the @@ -64,6 +84,16 @@ system headers assume that if this is defined, it must have a numeric value. +2017-01-06 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * intdiv.c: New extension to demonstrate how to implement intdiv + using the new extended-precision math API. + * Makefile.am (pkgextension_LTLIBRARIES): Add intdiv.la. + (intdiv_la_SOURCES, intdiv_la_LDFLAGS, intdiv_la_LIBADD): Add support + for new intdiv library. + * configure.ac (AC_CHECK_FUNCS): Check for fmod needed by intdiv. + (GNUPG_CHECK_MPFR): Add check for MPFR support. + 2016-12-22 Arnold D. Robbins <arnold@skeeve.com> * testext.c (valrep2str): Update for new API types. diff --git a/extension/Makefile.am b/extension/Makefile.am index 6ea16f5d..54975b8e 100644 --- a/extension/Makefile.am +++ b/extension/Makefile.am @@ -39,6 +39,7 @@ pkgextension_LTLIBRARIES = \ fnmatch.la \ fork.la \ inplace.la \ + intdiv.la \ ordchr.la \ readdir.la \ readfile.la \ @@ -72,6 +73,10 @@ inplace_la_SOURCES = inplace.c inplace_la_LDFLAGS = $(MY_MODULE_FLAGS) inplace_la_LIBADD = $(MY_LIBS) +intdiv_la_SOURCES = intdiv.c +intdiv_la_LDFLAGS = $(MY_MODULE_FLAGS) +intdiv_la_LIBADD = $(MY_LIBS) + ordchr_la_SOURCES = ordchr.c ordchr_la_LDFLAGS = $(MY_MODULE_FLAGS) ordchr_la_LIBADD = $(MY_LIBS) diff --git a/extension/Makefile.in b/extension/Makefile.in index c0e2676b..000c3b78 100644 --- a/extension/Makefile.in +++ b/extension/Makefile.in @@ -114,10 +114,10 @@ host_triplet = @host@ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../m4/arch.m4 \ - $(top_srcdir)/m4/dirfd.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/../m4/mpfr.m4 $(top_srcdir)/m4/dirfd.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ @@ -187,6 +187,12 @@ inplace_la_OBJECTS = $(am_inplace_la_OBJECTS) inplace_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(inplace_la_LDFLAGS) $(LDFLAGS) -o $@ +intdiv_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +am_intdiv_la_OBJECTS = intdiv.lo +intdiv_la_OBJECTS = $(am_intdiv_la_OBJECTS) +intdiv_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(intdiv_la_LDFLAGS) $(LDFLAGS) -o $@ ordchr_la_DEPENDENCIES = $(am__DEPENDENCIES_1) am_ordchr_la_OBJECTS = ordchr.lo ordchr_la_OBJECTS = $(am_ordchr_la_OBJECTS) @@ -277,17 +283,17 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = SOURCES = $(filefuncs_la_SOURCES) $(fnmatch_la_SOURCES) \ - $(fork_la_SOURCES) $(inplace_la_SOURCES) $(ordchr_la_SOURCES) \ - $(readdir_la_SOURCES) $(readdir_test_la_SOURCES) \ - $(readfile_la_SOURCES) $(revoutput_la_SOURCES) \ - $(revtwoway_la_SOURCES) $(rwarray_la_SOURCES) \ - $(testext_la_SOURCES) $(time_la_SOURCES) + $(fork_la_SOURCES) $(inplace_la_SOURCES) $(intdiv_la_SOURCES) \ + $(ordchr_la_SOURCES) $(readdir_la_SOURCES) \ + $(readdir_test_la_SOURCES) $(readfile_la_SOURCES) \ + $(revoutput_la_SOURCES) $(revtwoway_la_SOURCES) \ + $(rwarray_la_SOURCES) $(testext_la_SOURCES) $(time_la_SOURCES) DIST_SOURCES = $(filefuncs_la_SOURCES) $(fnmatch_la_SOURCES) \ - $(fork_la_SOURCES) $(inplace_la_SOURCES) $(ordchr_la_SOURCES) \ - $(readdir_la_SOURCES) $(readdir_test_la_SOURCES) \ - $(readfile_la_SOURCES) $(revoutput_la_SOURCES) \ - $(revtwoway_la_SOURCES) $(rwarray_la_SOURCES) \ - $(testext_la_SOURCES) $(time_la_SOURCES) + $(fork_la_SOURCES) $(inplace_la_SOURCES) $(intdiv_la_SOURCES) \ + $(ordchr_la_SOURCES) $(readdir_la_SOURCES) \ + $(readdir_test_la_SOURCES) $(readfile_la_SOURCES) \ + $(revoutput_la_SOURCES) $(revtwoway_la_SOURCES) \ + $(rwarray_la_SOURCES) $(testext_la_SOURCES) $(time_la_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ ctags-recursive dvi-recursive html-recursive info-recursive \ install-data-recursive install-dvi-recursive \ @@ -422,6 +428,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ LDFLAGS = @LDFLAGS@ +LIBMPFR = @LIBMPFR@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -520,6 +527,7 @@ pkgextension_LTLIBRARIES = \ fnmatch.la \ fork.la \ inplace.la \ + intdiv.la \ ordchr.la \ readdir.la \ readfile.la \ @@ -549,6 +557,9 @@ fork_la_LIBADD = $(MY_LIBS) inplace_la_SOURCES = inplace.c inplace_la_LDFLAGS = $(MY_MODULE_FLAGS) inplace_la_LIBADD = $(MY_LIBS) +intdiv_la_SOURCES = intdiv.c +intdiv_la_LDFLAGS = $(MY_MODULE_FLAGS) +intdiv_la_LIBADD = $(MY_LIBS) ordchr_la_SOURCES = ordchr.c ordchr_la_LDFLAGS = $(MY_MODULE_FLAGS) ordchr_la_LIBADD = $(MY_LIBS) @@ -713,6 +724,9 @@ fork.la: $(fork_la_OBJECTS) $(fork_la_DEPENDENCIES) $(EXTRA_fork_la_DEPENDENCIES inplace.la: $(inplace_la_OBJECTS) $(inplace_la_DEPENDENCIES) $(EXTRA_inplace_la_DEPENDENCIES) $(AM_V_CCLD)$(inplace_la_LINK) -rpath $(pkgextensiondir) $(inplace_la_OBJECTS) $(inplace_la_LIBADD) $(LIBS) +intdiv.la: $(intdiv_la_OBJECTS) $(intdiv_la_DEPENDENCIES) $(EXTRA_intdiv_la_DEPENDENCIES) + $(AM_V_CCLD)$(intdiv_la_LINK) -rpath $(pkgextensiondir) $(intdiv_la_OBJECTS) $(intdiv_la_LIBADD) $(LIBS) + ordchr.la: $(ordchr_la_OBJECTS) $(ordchr_la_DEPENDENCIES) $(EXTRA_ordchr_la_DEPENDENCIES) $(AM_V_CCLD)$(ordchr_la_LINK) -rpath $(pkgextensiondir) $(ordchr_la_OBJECTS) $(ordchr_la_LIBADD) $(LIBS) @@ -751,6 +765,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fork.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gawkfts.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inplace.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/intdiv.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ordchr.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readdir.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readdir_test.Plo@am__quote@ diff --git a/extension/aclocal.m4 b/extension/aclocal.m4 index 5665d48e..1e7a343c 100644 --- a/extension/aclocal.m4 +++ b/extension/aclocal.m4 @@ -1211,6 +1211,7 @@ AC_SUBST([am__untar]) ]) # _AM_PROG_TAR m4_include([../m4/arch.m4]) +m4_include([../m4/mpfr.m4]) m4_include([m4/dirfd.m4]) m4_include([m4/libtool.m4]) m4_include([m4/ltoptions.m4]) diff --git a/extension/configh.in b/extension/configh.in index d3a226a5..9d3d9919 100644 --- a/extension/configh.in +++ b/extension/configh.in @@ -27,6 +27,9 @@ /* Define to 1 if you have the `fdopendir' function. */ #undef HAVE_FDOPENDIR +/* Define to 1 if you have the `fmod' function. */ +#undef HAVE_FMOD + /* Define to 1 if you have the `fnmatch' function. */ #undef HAVE_FNMATCH @@ -51,6 +54,9 @@ /* Define to 1 if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H +/* Define to 1 if you have fully functional mpfr and gmp libraries. */ +#undef HAVE_MPFR + /* Define to 1 if you have the `nanosleep' function. */ #undef HAVE_NANOSLEEP diff --git a/extension/configure b/extension/configure index 40601550..7ae66543 100755 --- a/extension/configure +++ b/extension/configure @@ -635,6 +635,7 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +LIBMPFR pkgextensiondir LT_SYS_LIBRARY_PATH OTOOL64 @@ -763,6 +764,7 @@ with_aix_soname with_gnu_ld with_sysroot enable_libtool_lock +with_mpfr ' ac_precious_vars='build_alias host_alias @@ -1416,6 +1418,7 @@ Optional Packages: --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot[=DIR] Search for dependent libraries within DIR (or the compiler's sysroot if not specified). + --with-mpfr=DIR look for the mpfr and gmp libraries in DIR Some influential environment variables: CC C compiler command @@ -12859,8 +12862,89 @@ $as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h fi -for ac_func in fdopendir fnmatch gettimeofday \ - getdtablesize nanosleep select statvfs GetSystemTimeAsFileTime +case `uname -m` in +*'Power Macintosh'*) + : ;; +*) + + +# Check whether --with-mpfr was given. +if test "${with_mpfr+set}" = set; then : + withval=$with_mpfr; _do_mpfr=$withval +else + _do_mpfr=yes +fi + + + if test "$_do_mpfr" != "no" ; then + if test -d "$withval" ; then + CPPFLAGS="${CPPFLAGS} -I$withval/include" + LDFLAGS="${LDFLAGS} -L$withval/lib" + fi + + _mpfr_save_libs=$LIBS + _combo="-lmpfr -lgmp" + LIBS="$LIBS $_combo" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mpfr via \"$_combo\" is present and usable" >&5 +$as_echo_n "checking whether mpfr via \"$_combo\" is present and usable... " >&6; } + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +#include <stdio.h> +#include <mpfr.h> +#include <gmp.h> + +int +main () +{ + +mpfr_t p; +mpz_t z; +mpfr_init(p); +mpz_init(z); +mpfr_printf("%Rf%Zd", p, z); +mpfr_clear(p); +mpz_clear(z); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + _found_mpfr=yes +else + _found_mpfr=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_found_mpfr" >&5 +$as_echo "$_found_mpfr" >&6; } + + LIBS=$_mpfr_save_libs + + if test $_found_mpfr = yes ; then + +$as_echo "#define HAVE_MPFR 1" >>confdefs.h + + LIBMPFR=$_combo + + break + fi + + unset _mpfr_save_libs + unset _combo + unset _found_mpfr + fi + + ;; +esac + +for ac_func in fdopendir fmod fnmatch getdtablesize \ + gettimeofday nanosleep select statvfs GetSystemTimeAsFileTime do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" diff --git a/extension/configure.ac b/extension/configure.ac index b5b27d03..bde6e3d3 100644 --- a/extension/configure.ac +++ b/extension/configure.ac @@ -69,8 +69,17 @@ AC_HEADER_DIRENT AC_HEADER_MAJOR AC_HEADER_TIME -AC_CHECK_FUNCS(fdopendir fnmatch gettimeofday \ - getdtablesize nanosleep select statvfs GetSystemTimeAsFileTime) +dnl check for mpfr support +case `uname -m` in +*'Power Macintosh'*) + : ;; +*) + GNUPG_CHECK_MPFR + ;; +esac + +AC_CHECK_FUNCS(fdopendir fmod fnmatch getdtablesize \ + gettimeofday nanosleep select statvfs GetSystemTimeAsFileTime) GAWK_FUNC_DIRFD GAWK_PREREQ_DIRFD diff --git a/extension/intdiv.c b/extension/intdiv.c new file mode 100644 index 00000000..77b4290b --- /dev/null +++ b/extension/intdiv.c @@ -0,0 +1,215 @@ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include <stdio.h> +#include <assert.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> +#include <math.h> + +#include <sys/types.h> +#include <sys/stat.h> + +#include "gawkapi.h" + +#ifdef HAVE_MPFR +#include <gmp.h> +#include <mpfr.h> +#endif + +#include "gettext.h" +#define _(msgid) gettext(msgid) +#define N_(msgid) msgid + +static const gawk_api_t *api; /* for convenience macros to work */ +static awk_ext_id_t *ext_id; +static const char *ext_version = "intdiv extension: version 1.0"; + +int plugin_is_GPL_compatible; + +/* double_to_int --- get the integer part of a double */ + +static double +double_to_int(double d) +{ + if (d >= 0) + d = floor(d); + else + d = ceil(d); + return d; +} + +/* array_set_number --- set an array element to a numeric value */ + +static void +array_set_number(awk_array_t array, const char *sub, size_t sublen, double num) +{ + awk_value_t index, tmp; + + set_array_element(array, make_const_string(sub, sublen, & index), make_number(num, & tmp)); +} + +#ifdef HAVE_MPFR + +/* mpz_conv --- convert an awk_value_t to an MPZ value */ + +static mpz_ptr +mpz_conv(const awk_value_t *arg, mpz_ptr tmp) +{ + switch (arg->num_type) { + case AWK_NUMBER_TYPE_MPZ: + return arg->num_ptr; + case AWK_NUMBER_TYPE_MPFR: + if (! mpfr_number_p(arg->num_ptr)) + return NULL; + mpz_init(tmp); + mpfr_get_z(tmp, arg->num_ptr, MPFR_RNDZ); + return tmp; + case AWK_NUMBER_TYPE_DOUBLE: /* can this happen? */ + mpz_init(tmp); + mpz_set_d(tmp, double_to_int(arg->num_value)); + return tmp; + default: /* should never happen */ + fatal(ext_id, _("intdiv: invalid numeric type `%d'"), arg->num_type); + return NULL; + } +} + +/* array_set_mpz --- set an array element to an MPZ value */ + +static void +array_set_mpz(awk_array_t array, const char *sub, size_t sublen, mpz_ptr num) +{ + awk_value_t index, tmp; + + set_array_element(array, make_const_string(sub, sublen, & index), make_number_mpz(num, & tmp)); +} + +#endif + +/* do_intdiv --- do integer division, return quotient and remainder in dest array */ + +/* + * We define the semantics as: + * numerator = int(numerator) + * denominator = int(denonmator) + * quotient = int(numerator / denomator) + * remainder = int(numerator % denomator) + */ + +static awk_value_t * +do_intdiv(int nargs, awk_value_t *result, struct awk_ext_func *unused) +{ + awk_value_t nv, dv, array_param; + awk_array_t array; + + if (! get_argument(0, AWK_NUMBER, & nv)) { + warning(ext_id, _("intdiv: first argument must be numeric")); + return make_number(-1, result); + } + if (! get_argument(1, AWK_NUMBER, & dv)) { + warning(ext_id, _("intdiv: second argument must be numeric")); + return make_number(-1, result); + } + if (! get_argument(2, AWK_ARRAY, & array_param)) { + warning(ext_id, _("intdiv: third argument must be an array")); + return make_number(-1, result); + } + array = array_param.array_cookie; + clear_array(array); + +#ifdef HAVE_MPFR + if (nv.num_type == AWK_NUMBER_TYPE_DOUBLE && dv.num_type == AWK_NUMBER_TYPE_DOUBLE) { +#endif + /* regular precision */ + double num, denom, quotient, remainder; + + num = double_to_int(nv.num_value); + denom = double_to_int(dv.num_value); + + if (denom == 0.0) { + warning(ext_id, _("intdiv: division by zero attempted")); + return make_number(-1, result); + } + + quotient = double_to_int(num / denom); +#ifdef HAVE_FMOD + remainder = fmod(num, denom); +#else /* ! HAVE_FMOD */ + (void) modf(num / denom, & remainder); + remainder = num - remainder * denom; +#endif /* ! HAVE_FMOD */ + remainder = double_to_int(remainder); + + array_set_number(array, "quotient", 8, quotient); + array_set_number(array, "remainder", 9, remainder); +#ifdef HAVE_MPFR + } else { + /* extended precision */ + mpz_ptr numer, denom; + mpz_t numer_tmp, denom_tmp; + mpz_ptr quotient, remainder; + + /* convert numerator and denominator to integer */ + if (!(numer = mpz_conv(&nv, numer_tmp))) { + warning(ext_id, _("intdiv: numerator is not finite")); + return make_number(-1, result); + } + if (!(denom = mpz_conv(&dv, denom_tmp))) { + warning(ext_id, _("intdiv: denominator is not finite")); + if (numer == numer_tmp) + mpz_clear(numer); + return make_number(-1, result); + } + if (mpz_sgn(denom) == 0) { + warning(ext_id, _("intdiv: division by zero attempted")); + if (numer == numer_tmp) + mpz_clear(numer); + if (denom == denom_tmp) + mpz_clear(denom); + return make_number(-1, result); + } + + /* ask gawk to allocate return values for us */ + quotient = get_mpz_ptr(); + remainder = get_mpz_ptr(); + + /* do the division */ + mpz_tdiv_qr(quotient, remainder, numer, denom); + + array_set_mpz(array, "quotient", 8, quotient); + array_set_mpz(array, "remainder", 9, remainder); + + /* release temporary variables */ + if (numer == numer_tmp) + mpz_clear(numer); + if (denom == denom_tmp) + mpz_clear(denom); + } +#endif + + return make_number(0, result); +} + +static awk_ext_func_t func_table[] = { + { "intdiv", do_intdiv, 3, 3, awk_false, NULL }, +}; + +/* init_intdiv --- initialization routine */ + +static awk_bool_t +init_intdiv(void) +{ +#ifdef HAVE_MPFR + check_mpfr_version(intdiv) +#endif + return awk_true; +} + +static awk_bool_t (*init_func)(void) = init_intdiv; + +/* define the dl_load function using the boilerplate macro */ + +dl_load_func(func_table, intdiv, "") @@ -25,6 +25,14 @@ #include "awk.h" +#ifdef HAVE_MPFR +#define getmpfr(n) getblock(n, BLOCK_MPFR, mpfr_ptr) +#define freempfr(n) freeblock(n, BLOCK_MPFR) + +#define getmpz(n) getblock(n, BLOCK_MPZ, mpz_ptr) +#define freempz(n) freeblock(n, BLOCK_MPZ) +#endif + /* Declare some globals used by api_get_file: */ extern IOBUF *curfile; extern INSTRUCTION *main_beginfile; @@ -145,7 +153,7 @@ api_set_argument(awk_ext_id_t id, NODE * awk_value_to_node(const awk_value_t *retval) { - NODE *ext_ret_val; + NODE *ext_ret_val = NULL; NODE *v; if (retval == NULL) @@ -159,7 +167,36 @@ awk_value_to_node(const awk_value_t *retval) ext_ret_val = dupnode(Nnull_string); break; case AWK_NUMBER: - ext_ret_val = make_number(retval->num_value); + switch (retval->num_type) { + case AWK_NUMBER_TYPE_DOUBLE: + ext_ret_val = make_number(retval->num_value); + break; + case AWK_NUMBER_TYPE_MPFR: +#ifdef HAVE_MPFR + if (! do_mpfr) + fatal(_("awk_value_to_node: not in MPFR mode")); + ext_ret_val = make_number_node(MPFN); + memcpy(&ext_ret_val->mpg_numbr, retval->num_ptr, sizeof(ext_ret_val->mpg_numbr)); + freempfr(retval->num_ptr); +#else + fatal(_("awk_value_to_node: MPFR not supported")); +#endif + break; + case AWK_NUMBER_TYPE_MPZ: +#ifdef HAVE_MPFR + if (! do_mpfr) + fatal(_("awk_value_to_node: not in MPFR mode")); + ext_ret_val = make_number_node(MPZN); + memcpy(&ext_ret_val->mpg_i, retval->num_ptr, sizeof(ext_ret_val->mpg_i)); + freempz(retval->num_ptr); +#else + fatal(_("awk_value_to_node: MPFR not supported")); +#endif + break; + default: + fatal(_("awk_value_to_node: invalid number type `%d'"), retval->num_type); + break; + } break; case AWK_STRING: ext_ret_val = make_str_node(retval->str_value.str, @@ -450,6 +487,34 @@ assign_string(NODE *node, awk_value_t *val, awk_valtype_t val_type) val->str_value.len = node->stlen; } +/* assign_number -- return a number node */ + +static inline void +assign_number(NODE *node, awk_value_t *val) +{ + val->val_type = AWK_NUMBER; + switch (node->flags & (MPFN|MPZN)) { + case 0: + val->num_value = node->numbr; + val->num_type = AWK_NUMBER_TYPE_DOUBLE; + val->num_ptr = NULL; + break; + case MPFN: + val->num_value = mpfr_get_d(node->mpg_numbr, ROUND_MODE); + val->num_type = AWK_NUMBER_TYPE_MPFR; + val->num_ptr = &node->mpg_numbr; + break; + case MPZN: + val->num_value = mpz_get_d(node->mpg_i); + val->num_type = AWK_NUMBER_TYPE_MPZ; + val->num_ptr = &node->mpg_i; + break; + default: + fatal(_("node_to_awk_value: detected invalid numeric flags combination `%s'; please file a bug report."), flags2str(node->flags)); + break; + } +} + /* assign_regex --- return a regex node */ static inline void @@ -502,9 +567,8 @@ node_to_awk_value(NODE *node, awk_value_t *val, awk_valtype_t wanted) if (node->flags & REGEX) val->val_type = AWK_REGEX; else { - val->val_type = AWK_NUMBER; (void) force_number(node); - val->num_value = get_number_d(node); + assign_number(node, val); ret = awk_true; } break; @@ -606,8 +670,7 @@ node_to_awk_value(NODE *node, awk_value_t *val, awk_valtype_t wanted) ret = awk_true; break; case NUMBER: - val->val_type = AWK_NUMBER; - val->num_value = get_number_d(node); + assign_number(node, val); ret = awk_true; break; case NUMBER|USER_INPUT: @@ -1220,6 +1283,36 @@ api_release_value(awk_ext_id_t id, awk_value_cookie_t value) return awk_true; } +/* api_get_mpfr --- allocate an mpfr_ptr */ + +static void * +api_get_mpfr(awk_ext_id_t id) +{ +#ifdef HAVE_MPFR + mpfr_ptr p; + getmpfr(p); + mpfr_init(p); + return p; +#else + fatal(_("api_get_mpfr: MPFR not supported")); +#endif +} + +/* api_get_mpz --- allocate an mpz_ptr */ + +static void * +api_get_mpz(awk_ext_id_t id) +{ +#ifdef HAVE_MPFR + mpz_ptr p; + getmpz(p); + mpz_init(p); + return p; +#else + fatal(_("api_get_mpfr: MPFR not supported")); +#endif +} + /* api_get_file --- return a handle to an existing or newly opened file */ static awk_bool_t @@ -1347,6 +1440,16 @@ gawk_api_t api_impl = { /* data */ GAWK_API_MAJOR_VERSION, /* major and minor versions */ GAWK_API_MINOR_VERSION, + +#ifdef HAVE_MPFR + __GNU_MP_VERSION, + __GNU_MP_VERSION_MINOR, + MPFR_VERSION_MAJOR, + MPFR_VERSION_MINOR, +#else + 0, 0, 0, 0, +#endif + { 0 }, /* do_flags */ /* registration functions */ @@ -1399,6 +1502,8 @@ gawk_api_t api_impl = { calloc, realloc, free, + api_get_mpfr, + api_get_mpz, /* Find/open a file */ api_get_file, @@ -296,7 +296,7 @@ typedef struct awk_two_way_processor { awk_const struct awk_two_way_processor *awk_const next; /* for use by gawk */ } awk_two_way_processor_t; -#define gawk_api_major_version 2 +#define gawk_api_major_version 3 #define gawk_api_minor_version 0 /* Current version of the API. */ @@ -322,6 +322,16 @@ typedef struct awk_string { size_t len; /* length thereof, in chars */ } awk_string_t; +typedef struct awk_number { + double d; /* always populated in data received from gawk */ + enum AWK_NUMBER_TYPE { + AWK_NUMBER_TYPE_DOUBLE, + AWK_NUMBER_TYPE_MPFR, + AWK_NUMBER_TYPE_MPZ + } type; + void *ptr; /* either NULL or mpfr_ptr or mpz_ptr */ +} awk_number_t; + /* Arrays are represented as an opaque type. */ typedef void *awk_array_t; @@ -357,7 +367,7 @@ typedef struct awk_value { awk_valtype_t val_type; union { awk_string_t s; - double d; + awk_number_t n; awk_array_t a; awk_scalar_t scl; awk_value_cookie_t vc; @@ -365,7 +375,9 @@ typedef struct awk_value { #define str_value u.s #define strnum_value str_value #define regex_value str_value -#define num_value u.d +#define num_value u.n.d +#define num_type u.n.type +#define num_ptr u.n.ptr #define array_cookie u.a #define scalar_cookie u.scl #define value_cookie u.vc @@ -451,6 +463,12 @@ typedef struct gawk_api { awk_const int major_version; awk_const int minor_version; + /* GMP/MPFR versions, if extended-precision is available */ + awk_const int gmp_major_version; + awk_const int gmp_minor_version; + awk_const int mpfr_major_version; + awk_const int mpfr_minor_version; + /* * These can change on the fly as things happen within gawk. * Currently only do_lint is prone to change, but we reserve @@ -747,6 +765,20 @@ typedef struct gawk_api { void *(*api_realloc)(void *ptr, size_t size); void (*api_free)(void *ptr); + /* + * A function that returns mpfr data should call this function + * to allocate and initialize an mpfr_ptr for use in an + * awk_value_t structure that will be handed to gawk. + */ + void *(*api_get_mpfr)(awk_ext_id_t id); + + /* + * A function that returns mpz data should call this function + * to allocate and initialize an mpz_ptr for use in an + * awk_value_t structure that will be handed to gawk. + */ + void *(*api_get_mpz)(awk_ext_id_t id); + /* * Look up a file. If the name is NULL or name_len is 0, it returns * data for the currently open input file corresponding to FILENAME @@ -779,7 +811,6 @@ typedef struct gawk_api { */ const awk_input_buf_t **ibufp, const awk_output_buf_t **obufp); - } gawk_api_t; #ifndef GAWK /* these are not for the gawk code itself! */ @@ -869,6 +900,9 @@ typedef struct gawk_api { #define get_file(name, namelen, filetype, fd, ibuf, obuf) \ (api->api_get_file(ext_id, name, namelen, filetype, fd, ibuf, obuf)) +#define get_mpfr_ptr() (api->api_get_mpfr(ext_id)) +#define get_mpz_ptr() (api->api_get_mpz(ext_id)) + #define register_ext_version(version) \ (api->api_register_ext_version(ext_id, version)) @@ -959,11 +993,39 @@ make_null_string(awk_value_t *result) static inline awk_value_t * make_number(double num, awk_value_t *result) { - memset(result, 0, sizeof(*result)); - result->val_type = AWK_NUMBER; result->num_value = num; + result->num_type = AWK_NUMBER_TYPE_DOUBLE; + return result; +} + +/* + * make_number_mpz --- make an mpz number value in result. + * The mpz_ptr must be from a call to get_mpz_ptr. Gawk will now + * take ownership of this memory. + */ +static inline awk_value_t * +make_number_mpz(void *mpz_ptr, awk_value_t *result) +{ + result->val_type = AWK_NUMBER; + result->num_type = AWK_NUMBER_TYPE_MPZ; + result->num_ptr = mpz_ptr; + return result; +} + +/* + * make_number_mpfr --- make an mpfr number value in result. + * The mpfr_ptr must be from a call to get_mpfr_ptr. Gawk will now + * take ownership of this memory. + */ + +static inline awk_value_t * +make_number_mpfr(void *mpfr_ptr, awk_value_t *result) +{ + result->val_type = AWK_NUMBER; + result->num_type = AWK_NUMBER_TYPE_MPFR; + result->num_ptr = mpfr_ptr; return result; } @@ -1056,6 +1118,29 @@ int dl_load(const gawk_api_t *const api_p, awk_ext_id_t id) \ return (errors == 0); \ } +/* + * If you are using extended-precision calculations in your library, please + * call this macro from your init_func. + */ +#define check_mpfr_version(extension) { \ + if (api->gmp_major_version != __GNU_MP_VERSION \ + || api->gmp_minor_version < __GNU_MP_VERSION_MINOR) { \ + fprintf(stderr, #extension ": GMP version mismatch with gawk!\n"); \ + fprintf(stderr, "\tmy version (%d, %d), gawk version (%d, %d)\n", \ + __GNU_MP_VERSION, __GNU_MP_VERSION_MINOR, \ + api->gmp_major_version, api->gmp_minor_version); \ + exit(1); \ + } \ + if (api->mpfr_major_version != MPFR_VERSION_MAJOR \ + || api->mpfr_minor_version < MPFR_VERSION_MINOR) { \ + fprintf(stderr, #extension ": MPFR version mismatch with gawk!\n"); \ + fprintf(stderr, "\tmy version (%d, %d), gawk version (%d, %d)\n", \ + MPFR_VERSION_MAJOR, MPFR_VERSION_MINOR, \ + api->mpfr_major_version, api->mpfr_minor_version); \ + exit(1); \ + } \ +} + #endif /* GAWK */ #ifdef __cplusplus @@ -103,28 +103,16 @@ cleanup_mpfr(void) /* mpg_node --- allocate a node to store MPFR float or GMP integer */ NODE * -mpg_node(unsigned int tp) +mpg_node(unsigned int flags) { - NODE *r; - getnode(r); - r->type = Node_val; + NODE *r = make_number_node(flags); - if (tp == MPFN) { + if (flags == MPFN) /* Initialize, set precision to the default precision, and value to NaN */ mpfr_init(r->mpg_numbr); - r->flags = MPFN; - } else { + else /* Initialize and set value to 0 */ mpz_init(r->mpg_i); - r->flags = MPZN; - } - - r->valref = 1; - r->flags |= MALLOC|NUMBER|NUMCUR; - r->stptr = NULL; - r->stlen = 0; - r->wstptr = NULL; - r->wstlen = 0; return r; } @@ -1181,6 +1169,7 @@ do_mpfr_srand(int nargs) return res; } +#ifdef SUPPLY_INTDIV /* do_mpfr_intdiv --- do integer division, return quotient and remainder in dest array */ /* @@ -1274,6 +1263,7 @@ do_mpfr_intdiv(int nargs) return make_number((AWKNUM) 0.0); } +#endif /* SUPPLY_INTDIV */ /* * mpg_tofloat --- convert an arbitrary-precision integer operand to @@ -333,16 +333,8 @@ r_dupnode(NODE *n) static NODE * r_make_number(double x) { - NODE *r; - getnode(r); - r->type = Node_val; + NODE *r = make_number_node(0); r->numbr = x; - r->flags = MALLOC|NUMBER|NUMCUR; - r->valref = 1; - r->stptr = NULL; - r->stlen = 0; - r->wstptr = NULL; - r->wstlen = 0; return r; } @@ -1006,6 +998,10 @@ void init_btowc_cache() struct block_header nextfree[BLOCK_MAX] = { { NULL, sizeof(NODE) }, { NULL, sizeof(BUCKET) }, +#ifdef HAVE_MPFR + { NULL, sizeof(mpfr_t) }, + { NULL, sizeof(mpz_t) }, +#endif }; diff --git a/test/ChangeLog b/test/ChangeLog index 0d8978fe..a8f4b307 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -25,6 +25,11 @@ * Makefile.am (charset-msg-start): Document that having el_GR.iso88597 is helpful. +2017-04-16 Arnold D. Robbins <arnold@skeeve.com> + + * mpfrsqrt.awk: Add `@load intdiv'. + * dumpvars.ok, id.ok, symtab6.ok, symtab8.ok: Updated. + 2017-04-12 Manuel Collado <m-collado@users.sourceforge.net> * Makefile.am (fpat6): New test. diff --git a/test/dumpvars.ok b/test/dumpvars.ok index 7caecd35..85d1c859 100644 --- a/test/dumpvars.ok +++ b/test/dumpvars.ok @@ -9,7 +9,7 @@ FILENAME: "-" FNR: 3 FPAT: "[^[:space:]]+" FS: " " -FUNCTAB: array, 42 elements +FUNCTAB: array, 41 elements IGNORECASE: 0 LINT: 0 NF: 1 @@ -47,7 +47,6 @@ gsub -> builtin i -> untyped index -> builtin int -> builtin -intdiv -> builtin isarray -> builtin length -> builtin log -> builtin diff --git a/test/mpfrsqrt.awk b/test/mpfrsqrt.awk index 3fb1f5f8..8cc416bb 100644 --- a/test/mpfrsqrt.awk +++ b/test/mpfrsqrt.awk @@ -9,6 +9,8 @@ # # Running this program (sqrt-bug.awk): # -------------------------------------------------------------------- + +@load "intdiv" BEGIN { a=11111111111111111111111111111111111111111111111111111111111 print sqrt(a^2) diff --git a/test/symtab6.ok b/test/symtab6.ok index 34c10636..7de717a0 100644 --- a/test/symtab6.ok +++ b/test/symtab6.ok @@ -9,7 +9,7 @@ FILENAME: "" FNR: 0 FPAT: "[^[:space:]]+" FS: " " -FUNCTAB: array, 42 elements +FUNCTAB: array, 41 elements IGNORECASE: 0 LINT: 0 NF: 0 diff --git a/test/symtab8.ok b/test/symtab8.ok index 0cf40fe9..da29b585 100644 --- a/test/symtab8.ok +++ b/test/symtab8.ok @@ -9,7 +9,7 @@ FIELDWIDTHS: "" FNR: 1 FPAT: "[^[:space:]]+" FS: " " -FUNCTAB: array, 42 elements +FUNCTAB: array, 41 elements IGNORECASE: 0 LINT: 0 NF: 1 |