[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gawk-diffs] [SCM] gawk branch, gawk_mpfr, created. 06a6f16495e2a3d0cb66
|
From: |
John Haque |
|
Subject: |
[gawk-diffs] [SCM] gawk branch, gawk_mpfr, created. 06a6f16495e2a3d0cb664fc473107d3cdbe6f11e |
|
Date: |
Tue, 14 Feb 2012 14:27:16 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".
The branch, gawk_mpfr has been created
at 06a6f16495e2a3d0cb664fc473107d3cdbe6f11e (commit)
- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=06a6f16495e2a3d0cb664fc473107d3cdbe6f11e
commit 06a6f16495e2a3d0cb664fc473107d3cdbe6f11e
Author: john haque <address@hidden>
Date: Tue Feb 14 08:13:19 2012 -0600
Add infrastructure for MPFR/GMP support.
diff --git a/Makefile.am b/Makefile.am
index b947061..4e483e4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -110,6 +110,7 @@ base_sources = \
io.c \
mbsupport.h \
main.c \
+ mpfr.c \
msg.c \
node.c \
profile.c \
@@ -128,7 +129,7 @@ base_sources = \
gawk_SOURCES = $(base_sources)
# Get extra libs as needed, Automake will supply LIBINTL and SOCKET_LIBS.
-LDADD = $(LIBSIGSEGV) $(LIBINTL) $(SOCKET_LIBS) @LIBREADLINE@
+LDADD = $(LIBSIGSEGV) $(LIBINTL) $(SOCKET_LIBS) @LIBREADLINE@ -lmpfr -lgmp
# Directory for gawk's data files. Automake supplies datadir.
pkgdatadir = $(datadir)/awk
diff --git a/Makefile.in b/Makefile.in
index 3083c4c..4643feb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -92,10 +92,10 @@ am__objects_1 = array.$(OBJEXT) awkgram.$(OBJEXT)
builtin.$(OBJEXT) \
dfa.$(OBJEXT) eval.$(OBJEXT) ext.$(OBJEXT) field.$(OBJEXT) \
floatcomp.$(OBJEXT) gawkmisc.$(OBJEXT) getopt.$(OBJEXT) \
getopt1.$(OBJEXT) int_array.$(OBJEXT) io.$(OBJEXT) \
- main.$(OBJEXT) msg.$(OBJEXT) node.$(OBJEXT) profile.$(OBJEXT) \
- random.$(OBJEXT) re.$(OBJEXT) regex.$(OBJEXT) \
- replace.$(OBJEXT) str_array.$(OBJEXT) symbol.$(OBJEXT) \
- version.$(OBJEXT)
+ main.$(OBJEXT) mpfr.$(OBJEXT) msg.$(OBJEXT) node.$(OBJEXT) \
+ profile.$(OBJEXT) random.$(OBJEXT) re.$(OBJEXT) \
+ regex.$(OBJEXT) replace.$(OBJEXT) str_array.$(OBJEXT) \
+ symbol.$(OBJEXT) version.$(OBJEXT)
am_gawk_OBJECTS = $(am__objects_1)
gawk_OBJECTS = $(am_gawk_OBJECTS)
gawk_LDADD = $(LDADD)
@@ -375,6 +375,7 @@ base_sources = \
io.c \
mbsupport.h \
main.c \
+ mpfr.c \
msg.c \
node.c \
profile.c \
@@ -393,7 +394,7 @@ base_sources = \
gawk_SOURCES = $(base_sources)
# Get extra libs as needed, Automake will supply LIBINTL and SOCKET_LIBS.
-LDADD = $(LIBSIGSEGV) $(LIBINTL) $(SOCKET_LIBS) @LIBREADLINE@
+LDADD = $(LIBSIGSEGV) $(LIBINTL) $(SOCKET_LIBS) @LIBREADLINE@ -lmpfr -lgmp
# stuff for compiling gawk/pgawk
DEFPATH = '".$(PATH_SEPARATOR)$(pkgdatadir)"'
@@ -524,6 +525,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @address@hidden/$(DEPDIR)/address@hidden@
@AMDEP_TRUE@@am__include@ @address@hidden/$(DEPDIR)/address@hidden@
@AMDEP_TRUE@@am__include@ @address@hidden/$(DEPDIR)/address@hidden@
address@hidden@@am__include@ @address@hidden/$(DEPDIR)/address@hidden@
@AMDEP_TRUE@@am__include@ @address@hidden/$(DEPDIR)/address@hidden@
@AMDEP_TRUE@@am__include@ @address@hidden/$(DEPDIR)/address@hidden@
@AMDEP_TRUE@@am__include@ @address@hidden/$(DEPDIR)/address@hidden@
diff --git a/awk.h b/awk.h
index 7259390..f08c10b 100644
--- a/awk.h
+++ b/awk.h
@@ -25,6 +25,8 @@
/* ------------------------------ Includes ------------------------------ */
+#define HAVE_MPFR 1
+
/*
* config.h absolutely, positively, *M*U*S*T* be included before
* any system headers. Otherwise, extreme death, destruction
@@ -195,6 +197,17 @@ typedef void *stackoverflow_context_t;
this is a hack but it gives us the right semantics */
#define lintwarn (*(set_loc(__FILE__, __LINE__),lintfunc))
+#ifdef HAVE_MPFR
+#include <gmp.h>
+#include <mpfr.h>
+#ifndef MPFR_RNDN
+#define MPFR_RNDN GMP_RNDN
+#define MPFR_RNDZ GMP_RNDZ
+#define MPFR_RNDU GMP_RNDU
+#define MPFR_RNDD GMP_RNDD
+#endif
+#endif
+
#include "regex.h"
#include "dfa.h"
typedef struct Regexp {
@@ -369,9 +382,14 @@ typedef struct exp_node {
} nodep;
struct {
- AWKNUM fltnum; /* this is here for optimal packing of
- * the structure on many machines
- */
+ union {
+ AWKNUM fltnum; /* this is here for optimal
packing of
+ * the structure on many
machines
+ */
+#ifdef HAVE_MPFR
+ mpfr_t mpnum;
+#endif
+ } nm;
char *sp;
size_t slen;
long sref;
@@ -402,12 +420,13 @@ typedef struct exp_node {
* lazy conversion to string.
*/
# define WSTRCUR 0x0400 /* wide str value is current */
+# define MPFN 0x0800 /* multiple precision
floating-point number */
/* type = Node_var_array */
-# define ARRAYMAXED 0x0800 /* array is at max size */
-# define HALFHAT 0x1000 /* half-capacity Hashed
Array Tree;
+# define ARRAYMAXED 0x1000 /* array is at max size */
+# define HALFHAT 0x2000 /* half-capacity Hashed
Array Tree;
* See cint_array.c */
-# define XARRAY 0x2000
+# define XARRAY 0x4000
} NODE;
#define vname sub.nodep.name
@@ -446,7 +465,10 @@ typedef struct exp_node {
#define stfmt sub.val.idx
#define wstptr sub.val.wsp
#define wstlen sub.val.wslen
-#define numbr sub.val.fltnum
+#define numbr sub.val.nm.fltnum
+#ifdef HAVE_MPFR
+#define mpfr_numbr sub.val.nm.mpnum
+#endif
/* Node_arrayfor */
#define for_list sub.nodep.r.av
@@ -990,13 +1012,15 @@ extern NODE *FNR_node, *FS_node, *IGNORECASE_node,
*NF_node;
extern NODE *NR_node, *OFMT_node, *OFS_node, *ORS_node, *RLENGTH_node;
extern NODE *RSTART_node, *RS_node, *RT_node, *SUBSEP_node, *PROCINFO_node;
extern NODE *LINT_node, *ERRNO_node, *TEXTDOMAIN_node, *FPAT_node;
+extern NODE *PREC_node, *RNDMODE_node;
extern NODE *Nnull_string;
extern NODE *Null_field;
extern NODE **fields_arr;
extern int sourceline;
extern char *source;
extern int (*interpret)(INSTRUCTION *); /* interpreter routine */
-
+extern NODE *(*make_number)(AWKNUM );
+extern AWKNUM (*m_force_number)(NODE *);
#if __GNUC__ < 2
extern NODE *_t; /* used as temporary in macros */
@@ -1036,7 +1060,8 @@ extern int do_flags;
#define DO_PROFILE 0x1000
/* debug the program */
#define DO_DEBUG 0x2000
-
+/* mpfr */
+#define DO_MPFR 0x4000
#define do_traditional (do_flags & DO_TRADITIONAL)
#define do_posix (do_flags & DO_POSIX)
@@ -1049,7 +1074,7 @@ extern int do_flags;
#define do_tidy_mem (do_flags & DO_TIDY_MEM)
#define do_sandbox (do_flags & DO_SANDBOX)
#define do_debug (do_flags & DO_DEBUG)
-
+#define do_mpfr (do_flags & DO_MPFR)
extern int do_optimize;
extern int use_lc_numeric;
@@ -1077,6 +1102,12 @@ extern int ngroups;
extern struct lconv loc;
#endif /* HAVE_LOCALE_H */
+#ifdef HAVE_MPFR
+extern mpfr_prec_t PRECISION;
+extern mpfr_rnd_t RND_MODE;
+#endif
+
+
extern const char *myname;
extern const char def_strftime_format[];
@@ -1167,6 +1198,28 @@ extern STACK_ITEM *stack_top;
#endif /* __GNUC__ */
/* ------------------------- Pseudo-functions ------------------------- */
+#ifdef HAVE_MPFR
+/* conversion to C types */
+#define get_number_ui(n) (((n)->flags & MPFN) ?
mpfr_get_ui((n)->mpfr_numbr, RND_MODE) \
+ : (unsigned long) (n)->numbr)
+#define get_number_si(n) (((n)->flags & MPFN) ?
mpfr_get_si((n)->mpfr_numbr, RND_MODE) \
+ : (long) (n)->numbr)
+#define get_number_d(n) (((n)->flags & MPFN) ?
mpfr_get_d((n)->mpfr_numbr, RND_MODE) \
+ : (double) (n)->numbr)
+#define get_number_uj(n) (((n)->flags & MPFN) ?
mpfr_get_uj((n)->mpfr_numbr, RND_MODE) \
+ : (uintmax_t) (n)->numbr)
+
+#define is_nonzero_num(n) (((n)->flags & MPFN) ? (!
mpfr_zero_p((n)->mpfr_numbr)) \
+ : ((n)->numbr != 0.0))
+#else
+#define get_number_ui(n) (unsigned long) (n)->numbr
+#define get_number_si(n) (long) (n)->numbr
+#define get_number_d(n) (double) (n)->numbr
+#define get_number_uj(n) (uintmax_t) (n)->numbr
+
+#define is_nonzero_num(n) ((n)->numbr != 0.0)
+#endif
+
#define is_identchar(c) (isalnum(c) || (c) == '_')
#define var_uninitialized(n) ((n)->var_value == Nnull_string)
@@ -1206,7 +1259,7 @@ extern STACK_ITEM *stack_top;
#define efree(p) free(p)
#ifdef GAWKDEBUG
-#define force_number r_force_number
+#define force_number m_force_number
#define dupnode r_dupnode
#define unref r_unref
#define m_force_string r_force_string
@@ -1225,7 +1278,7 @@ extern NODE *r_force_string(NODE *s);
(_tn->flags & MALLOC) ? (_tn->valref++, _tn) : r_dupnode(_tn); })
#define force_number(n) __extension__ ({ NODE *_tn = (n);\
- (_tn->flags & NUMCUR) ? _tn->numbr : r_force_number(_tn); })
+ (_tn->flags & NUMCUR) ? _tn->numbr : m_force_number(_tn); })
#define force_string(s) __extension__ ({ NODE *_ts = (s);
m_force_string(_ts); })
@@ -1233,7 +1286,7 @@ extern NODE *r_force_string(NODE *s);
#define dupnode(n) (_t = (n), \
(_t->flags & MALLOC) ? (_t->valref++, _t) : r_dupnode(_t))
-#define force_number r_force_number
+#define force_number m_force_number
#define force_string(s) (_t = (s), m_force_string(_t))
#endif /* __GNUC__ */
#endif /* GAWKDEBUG */
@@ -1462,6 +1515,32 @@ extern int is_std_var(const char *var);
extern char *estrdup(const char *str, size_t len);
extern void update_global_values();
extern long getenv_long(const char *name);
+
+/* mpfr.c */
+#ifdef HAVE_MPFR
+extern void set_PREC(void);
+extern void set_RNDMODE(void);
+extern NODE *do_and_mpfr(int);
+extern NODE *do_atan2_mpfr(int);
+extern NODE *do_compl_mpfr(int);
+extern NODE *do_cos_mpfr(int);
+extern NODE *do_exp_mpfr(int);
+extern NODE *do_int_mpfr(int);
+extern NODE *do_log_mpfr(int);
+extern NODE *do_lshift_mpfr(int);
+extern NODE *do_or_mpfr(int);
+extern NODE *do_rand_mpfr(int);
+extern NODE *do_rhift_mpfr(int);
+extern NODE *do_sin_mpfr(int);
+extern NODE *do_sqrt_mpfr(int);
+extern NODE *do_srand_mpfr(int);
+extern NODE *do_strtonum_mpfr(int);
+extern NODE *do_xor_mpfr(int);
+extern void init_mpfr(const char *);
+extern AWKNUM force_mpfr_number(NODE *n);
+extern NODE *mpfr_node();
+extern NODE *make_mpfr_number(double x);
+#endif
/* msg.c */
extern void gawk_exit(int status);
extern void err(const char *s, const char *emsg, va_list argp)
ATTRIBUTE_PRINTF(2, 0);
@@ -1490,7 +1569,7 @@ extern void pp_string_fp(Func_print print_func, FILE *fp,
const char *str,
extern AWKNUM r_force_number(NODE *n);
extern NODE *format_val(const char *format, int index, NODE *s);
extern NODE *r_dupnode(NODE *n);
-extern NODE *make_number(AWKNUM x);
+extern NODE *r_make_number(AWKNUM x);
extern NODE *r_make_str_node(const char *s, size_t len, int flags);
extern void *more_blocks(int id);
extern void r_unref(NODE *tmp);
@@ -1522,7 +1601,7 @@ extern void resetup(void);
extern int avoid_dfa(NODE *re, char *str, size_t len);
extern int reisstring(const char *text, size_t len, Regexp *re, const char
*buf);
extern int remaybelong(const char *text, size_t len);
-extern int isnondecimal(const char *str, int use_locale);
+extern int get_numbase(const char *str, int use_locale);
/* symbol.c */
extern NODE *install_symbol(char *name, NODETYPE type);
diff --git a/awkgram.c b/awkgram.c
index 24c102d..f7c74f3 100644
--- a/awkgram.c
+++ b/awkgram.c
@@ -78,6 +78,10 @@
#define signed /**/
#endif
+#ifndef HAVE_MPFR
+#define mpfr_setsign(u,v,w,x) /* nothing */
+#endif
+
static void yyerror(const char *m, ...) ATTRIBUTE_PRINTF_1;
static void error_ln(int line, const char *m, ...) ATTRIBUTE_PRINTF_2;
static void lintwarn_ln(int line, const char *m, ...) ATTRIBUTE_PRINTF_2;
@@ -195,7 +199,7 @@ extern double fmod(double x, double y);
/* Line 268 of yacc.c */
-#line 199 "awkgram.c"
+#line 203 "awkgram.c"
/* Enabling traces. */
#ifndef YYDEBUG
@@ -341,7 +345,7 @@ typedef int YYSTYPE;
/* Line 343 of yacc.c */
-#line 345 "awkgram.c"
+#line 349 "awkgram.c"
#ifdef short
# undef short
@@ -703,25 +707,25 @@ static const yytype_int16 yyrhs[] =
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 192, 192, 194, 199, 200, 204, 216, 220, 231,
- 237, 245, 253, 255, 261, 262, 264, 290, 301, 312,
- 318, 327, 337, 339, 341, 347, 352, 353, 357, 376,
- 375, 409, 411, 416, 417, 430, 435, 436, 440, 442,
- 444, 451, 541, 583, 625, 738, 745, 752, 762, 771,
- 780, 789, 804, 820, 819, 843, 855, 855, 949, 949,
- 974, 997, 1003, 1004, 1010, 1011, 1018, 1023, 1035, 1049,
- 1051, 1057, 1062, 1064, 1072, 1074, 1083, 1084, 1092, 1097,
- 1097, 1108, 1112, 1120, 1121, 1124, 1126, 1131, 1132, 1141,
- 1142, 1147, 1152, 1158, 1160, 1162, 1169, 1170, 1176, 1177,
- 1182, 1184, 1189, 1191, 1193, 1195, 1201, 1208, 1210, 1212,
- 1228, 1238, 1245, 1247, 1252, 1254, 1256, 1264, 1266, 1271,
- 1273, 1278, 1280, 1282, 1332, 1334, 1336, 1338, 1340, 1342,
- 1344, 1346, 1369, 1374, 1379, 1404, 1410, 1412, 1414, 1416,
- 1418, 1420, 1425, 1429, 1460, 1462, 1468, 1474, 1487, 1488,
- 1489, 1494, 1499, 1503, 1507, 1520, 1533, 1538, 1574, 1592,
- 1593, 1599, 1600, 1605, 1607, 1614, 1631, 1648, 1650, 1657,
- 1662, 1670, 1680, 1692, 1701, 1705, 1709, 1713, 1717, 1721,
- 1724, 1726, 1730, 1734, 1738
+ 0, 196, 196, 198, 203, 204, 208, 220, 224, 235,
+ 241, 249, 257, 259, 265, 266, 268, 294, 305, 316,
+ 322, 331, 341, 343, 345, 351, 356, 357, 361, 380,
+ 379, 413, 415, 420, 421, 434, 439, 440, 444, 446,
+ 448, 455, 545, 587, 629, 742, 749, 756, 766, 775,
+ 784, 793, 808, 824, 823, 847, 859, 859, 953, 953,
+ 978, 1001, 1007, 1008, 1014, 1015, 1022, 1027, 1039, 1053,
+ 1055, 1066, 1071, 1073, 1081, 1083, 1092, 1093, 1101, 1106,
+ 1106, 1117, 1121, 1129, 1130, 1133, 1135, 1140, 1141, 1150,
+ 1151, 1156, 1161, 1167, 1169, 1171, 1178, 1179, 1185, 1186,
+ 1191, 1193, 1198, 1200, 1202, 1204, 1210, 1217, 1219, 1221,
+ 1237, 1247, 1254, 1256, 1261, 1263, 1265, 1273, 1275, 1280,
+ 1282, 1287, 1289, 1291, 1341, 1343, 1345, 1347, 1349, 1351,
+ 1353, 1355, 1378, 1383, 1388, 1413, 1419, 1421, 1423, 1425,
+ 1427, 1429, 1434, 1438, 1469, 1471, 1477, 1483, 1496, 1497,
+ 1498, 1503, 1508, 1512, 1516, 1534, 1547, 1552, 1588, 1606,
+ 1607, 1613, 1614, 1619, 1621, 1628, 1645, 1662, 1664, 1671,
+ 1676, 1684, 1694, 1706, 1715, 1719, 1723, 1727, 1731, 1735,
+ 1738, 1740, 1744, 1748, 1752
};
#endif
@@ -2039,8 +2043,8 @@ yyreduce:
{
case 3:
-/* Line 1806 of yacc.c */
-#line 195 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 199 "awkgram.y"
{
rule = 0;
yyerrok;
@@ -2049,8 +2053,8 @@ yyreduce:
case 5:
-/* Line 1806 of yacc.c */
-#line 201 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 205 "awkgram.y"
{
next_sourcefile();
}
@@ -2058,8 +2062,8 @@ yyreduce:
case 6:
-/* Line 1806 of yacc.c */
-#line 205 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 209 "awkgram.y"
{
rule = 0;
/*
@@ -2072,8 +2076,8 @@ yyreduce:
case 7:
-/* Line 1806 of yacc.c */
-#line 217 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 221 "awkgram.y"
{
(void) append_rule((yyvsp[(1) - (2)]), (yyvsp[(2) - (2)]));
}
@@ -2081,8 +2085,8 @@ yyreduce:
case 8:
-/* Line 1806 of yacc.c */
-#line 221 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 225 "awkgram.y"
{
if (rule != Rule) {
msg(_("%s blocks must have an action part"),
ruletab[rule]);
@@ -2097,8 +2101,8 @@ yyreduce:
case 9:
-/* Line 1806 of yacc.c */
-#line 232 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 236 "awkgram.y"
{
in_function = NULL;
(void) mk_function((yyvsp[(1) - (2)]), (yyvsp[(2) - (2)]));
@@ -2108,8 +2112,8 @@ yyreduce:
case 10:
-/* Line 1806 of yacc.c */
-#line 238 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 242 "awkgram.y"
{
want_source = FALSE;
yyerrok;
@@ -2118,8 +2122,8 @@ yyreduce:
case 11:
-/* Line 1806 of yacc.c */
-#line 246 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 250 "awkgram.y"
{
if (include_source((yyvsp[(1) - (1)])) < 0)
YYABORT;
@@ -2131,36 +2135,36 @@ yyreduce:
case 12:
-/* Line 1806 of yacc.c */
-#line 254 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 258 "awkgram.y"
{ (yyval) = NULL; }
break;
case 13:
-/* Line 1806 of yacc.c */
-#line 256 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 260 "awkgram.y"
{ (yyval) = NULL; }
break;
case 14:
-/* Line 1806 of yacc.c */
-#line 261 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 265 "awkgram.y"
{ (yyval) = NULL; rule = Rule; }
break;
case 15:
-/* Line 1806 of yacc.c */
-#line 263 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 267 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); rule = Rule; }
break;
case 16:
-/* Line 1806 of yacc.c */
-#line 265 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 269 "awkgram.y"
{
INSTRUCTION *tp;
@@ -2190,8 +2194,8 @@ yyreduce:
case 17:
-/* Line 1806 of yacc.c */
-#line 291 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 295 "awkgram.y"
{
static int begin_seen = 0;
if (do_lint_old && ++begin_seen == 2)
@@ -2206,8 +2210,8 @@ yyreduce:
case 18:
-/* Line 1806 of yacc.c */
-#line 302 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 306 "awkgram.y"
{
static int end_seen = 0;
if (do_lint_old && ++end_seen == 2)
@@ -2222,8 +2226,8 @@ yyreduce:
case 19:
-/* Line 1806 of yacc.c */
-#line 313 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 317 "awkgram.y"
{
(yyvsp[(1) - (1)])->in_rule = rule = BEGINFILE;
(yyvsp[(1) - (1)])->source_file = source;
@@ -2233,8 +2237,8 @@ yyreduce:
case 20:
-/* Line 1806 of yacc.c */
-#line 319 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 323 "awkgram.y"
{
(yyvsp[(1) - (1)])->in_rule = rule = ENDFILE;
(yyvsp[(1) - (1)])->source_file = source;
@@ -2244,8 +2248,8 @@ yyreduce:
case 21:
-/* Line 1806 of yacc.c */
-#line 328 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 332 "awkgram.y"
{
if ((yyvsp[(2) - (5)]) == NULL)
(yyval) = list_create(instruction(Op_no_op));
@@ -2256,22 +2260,22 @@ yyreduce:
case 22:
-/* Line 1806 of yacc.c */
-#line 338 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 342 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 23:
-/* Line 1806 of yacc.c */
-#line 340 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 344 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 24:
-/* Line 1806 of yacc.c */
-#line 342 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 346 "awkgram.y"
{
yyerror(_("`%s' is a built-in function, it cannot be
redefined"),
tokstart);
@@ -2281,15 +2285,15 @@ yyreduce:
case 25:
-/* Line 1806 of yacc.c */
-#line 348 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 352 "awkgram.y"
{ (yyval) = (yyvsp[(2) - (2)]); }
break;
case 28:
-/* Line 1806 of yacc.c */
-#line 358 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 362 "awkgram.y"
{
(yyvsp[(1) - (6)])->source_file = source;
if (install_function((yyvsp[(2) - (6)])->lextok, (yyvsp[(1) -
(6)]), (yyvsp[(4) - (6)])) < 0)
@@ -2304,15 +2308,15 @@ yyreduce:
case 29:
-/* Line 1806 of yacc.c */
-#line 376 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 380 "awkgram.y"
{ ++want_regexp; }
break;
case 30:
-/* Line 1806 of yacc.c */
-#line 378 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 382 "awkgram.y"
{
NODE *n, *exp;
char *re;
@@ -2345,22 +2349,22 @@ yyreduce:
case 31:
-/* Line 1806 of yacc.c */
-#line 410 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 414 "awkgram.y"
{ bcfree((yyvsp[(1) - (1)])); }
break;
case 33:
-/* Line 1806 of yacc.c */
-#line 416 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 420 "awkgram.y"
{ (yyval) = NULL; }
break;
case 34:
-/* Line 1806 of yacc.c */
-#line 418 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 422 "awkgram.y"
{
if ((yyvsp[(2) - (2)]) == NULL)
(yyval) = (yyvsp[(1) - (2)]);
@@ -2377,29 +2381,29 @@ yyreduce:
case 35:
-/* Line 1806 of yacc.c */
-#line 431 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 435 "awkgram.y"
{ (yyval) = NULL; }
break;
case 38:
-/* Line 1806 of yacc.c */
-#line 441 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 445 "awkgram.y"
{ (yyval) = NULL; }
break;
case 39:
-/* Line 1806 of yacc.c */
-#line 443 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 447 "awkgram.y"
{ (yyval) = (yyvsp[(2) - (3)]); }
break;
case 40:
-/* Line 1806 of yacc.c */
-#line 445 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 449 "awkgram.y"
{
if (do_pretty_print)
(yyval) = list_prepend((yyvsp[(1) - (1)]),
instruction(Op_exec_count));
@@ -2410,8 +2414,8 @@ yyreduce:
case 41:
-/* Line 1806 of yacc.c */
-#line 452 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 456 "awkgram.y"
{
INSTRUCTION *dflt, *curr = NULL, *cexp, *cstmt;
INSTRUCTION *ip, *nextc, *tbreak;
@@ -2505,8 +2509,8 @@ yyreduce:
case 42:
-/* Line 1806 of yacc.c */
-#line 542 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 546 "awkgram.y"
{
/*
* -----------------
@@ -2552,8 +2556,8 @@ yyreduce:
case 43:
-/* Line 1806 of yacc.c */
-#line 584 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 588 "awkgram.y"
{
/*
* -----------------
@@ -2599,8 +2603,8 @@ yyreduce:
case 44:
-/* Line 1806 of yacc.c */
-#line 626 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 630 "awkgram.y"
{
INSTRUCTION *ip;
char *var_name = (yyvsp[(3) - (8)])->lextok;
@@ -2717,8 +2721,8 @@ regular_loop:
case 45:
-/* Line 1806 of yacc.c */
-#line 739 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 743 "awkgram.y"
{
(yyval) = mk_for_loop((yyvsp[(1) - (12)]), (yyvsp[(3) - (12)]),
(yyvsp[(6) - (12)]), (yyvsp[(9) - (12)]), (yyvsp[(12) - (12)]));
@@ -2729,8 +2733,8 @@ regular_loop:
case 46:
-/* Line 1806 of yacc.c */
-#line 746 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 750 "awkgram.y"
{
(yyval) = mk_for_loop((yyvsp[(1) - (11)]), (yyvsp[(3) - (11)]),
(INSTRUCTION *) NULL, (yyvsp[(8) - (11)]), (yyvsp[(11) - (11)]));
@@ -2741,8 +2745,8 @@ regular_loop:
case 47:
-/* Line 1806 of yacc.c */
-#line 753 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 757 "awkgram.y"
{
if (do_pretty_print)
(yyval) = list_prepend((yyvsp[(1) - (1)]),
instruction(Op_exec_count));
@@ -2753,8 +2757,8 @@ regular_loop:
case 48:
-/* Line 1806 of yacc.c */
-#line 763 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 767 "awkgram.y"
{
if (! break_allowed)
error_ln((yyvsp[(1) - (2)])->source_line,
@@ -2767,8 +2771,8 @@ regular_loop:
case 49:
-/* Line 1806 of yacc.c */
-#line 772 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 776 "awkgram.y"
{
if (! continue_allowed)
error_ln((yyvsp[(1) - (2)])->source_line,
@@ -2781,8 +2785,8 @@ regular_loop:
case 50:
-/* Line 1806 of yacc.c */
-#line 781 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 785 "awkgram.y"
{
/* if inside function (rule = 0), resolve context at run-time */
if (rule && rule != Rule)
@@ -2795,8 +2799,8 @@ regular_loop:
case 51:
-/* Line 1806 of yacc.c */
-#line 790 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 794 "awkgram.y"
{
if (do_traditional)
error_ln((yyvsp[(1) - (2)])->source_line,
@@ -2815,8 +2819,8 @@ regular_loop:
case 52:
-/* Line 1806 of yacc.c */
-#line 805 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 809 "awkgram.y"
{
/* Initialize the two possible jump targets, the actual target
* is resolved at run-time.
@@ -2835,8 +2839,8 @@ regular_loop:
case 53:
-/* Line 1806 of yacc.c */
-#line 820 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 824 "awkgram.y"
{
if (! in_function)
yyerror(_("`return' used outside function context"));
@@ -2845,8 +2849,8 @@ regular_loop:
case 54:
-/* Line 1806 of yacc.c */
-#line 823 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 827 "awkgram.y"
{
if ((yyvsp[(3) - (4)]) == NULL) {
(yyval) = list_create((yyvsp[(1) - (4)]));
@@ -2871,15 +2875,15 @@ regular_loop:
case 56:
-/* Line 1806 of yacc.c */
-#line 855 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 859 "awkgram.y"
{ in_print = TRUE; in_parens = 0; }
break;
case 57:
-/* Line 1806 of yacc.c */
-#line 856 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 860 "awkgram.y"
{
/*
* Optimization: plain `print' has no expression list, so $3 is
null.
@@ -2976,15 +2980,15 @@ regular_loop:
case 58:
-/* Line 1806 of yacc.c */
-#line 949 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 953 "awkgram.y"
{ sub_counter = 0; }
break;
case 59:
-/* Line 1806 of yacc.c */
-#line 950 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 954 "awkgram.y"
{
char *arr = (yyvsp[(2) - (4)])->lextok;
@@ -3013,8 +3017,8 @@ regular_loop:
case 60:
-/* Line 1806 of yacc.c */
-#line 979 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 983 "awkgram.y"
{
static short warned = FALSE;
char *arr = (yyvsp[(3) - (4)])->lextok;
@@ -3037,36 +3041,36 @@ regular_loop:
case 61:
-/* Line 1806 of yacc.c */
-#line 998 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1002 "awkgram.y"
{ (yyval) = optimize_assignment((yyvsp[(1) - (1)])); }
break;
case 62:
-/* Line 1806 of yacc.c */
-#line 1003 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1007 "awkgram.y"
{ (yyval) = NULL; }
break;
case 63:
-/* Line 1806 of yacc.c */
-#line 1005 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1009 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 64:
-/* Line 1806 of yacc.c */
-#line 1010 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1014 "awkgram.y"
{ (yyval) = NULL; }
break;
case 65:
-/* Line 1806 of yacc.c */
-#line 1012 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1016 "awkgram.y"
{
if ((yyvsp[(1) - (2)]) == NULL)
(yyval) = list_create((yyvsp[(2) - (2)]));
@@ -3077,15 +3081,15 @@ regular_loop:
case 66:
-/* Line 1806 of yacc.c */
-#line 1019 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1023 "awkgram.y"
{ (yyval) = NULL; }
break;
case 67:
-/* Line 1806 of yacc.c */
-#line 1024 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1028 "awkgram.y"
{
INSTRUCTION *casestmt = (yyvsp[(5) - (5)]);
if ((yyvsp[(5) - (5)]) == NULL)
@@ -3101,8 +3105,8 @@ regular_loop:
case 68:
-/* Line 1806 of yacc.c */
-#line 1036 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1040 "awkgram.y"
{
INSTRUCTION *casestmt = (yyvsp[(4) - (4)]);
if ((yyvsp[(4) - (4)]) == NULL)
@@ -3117,17 +3121,22 @@ regular_loop:
case 69:
-/* Line 1806 of yacc.c */
-#line 1050 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1054 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 70:
-/* Line 1806 of yacc.c */
-#line 1052 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1056 "awkgram.y"
{
- (yyvsp[(2) - (2)])->memory->numbr = -(force_number((yyvsp[(2) -
(2)])->memory));
+ NODE *n = (yyvsp[(2) - (2)])->memory;
+ (void) force_number(n);
+ if (n->flags & MPFN)
+ mpfr_setsign(n->mpfr_numbr, n->mpfr_numbr, TRUE,
RND_MODE);
+ else
+ n->numbr = -n->numbr;
bcfree((yyvsp[(1) - (2)]));
(yyval) = (yyvsp[(2) - (2)]);
}
@@ -3135,8 +3144,8 @@ regular_loop:
case 71:
-/* Line 1806 of yacc.c */
-#line 1058 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1067 "awkgram.y"
{
bcfree((yyvsp[(1) - (2)]));
(yyval) = (yyvsp[(2) - (2)]);
@@ -3145,15 +3154,15 @@ regular_loop:
case 72:
-/* Line 1806 of yacc.c */
-#line 1063 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1072 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 73:
-/* Line 1806 of yacc.c */
-#line 1065 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1074 "awkgram.y"
{
(yyvsp[(1) - (1)])->opcode = Op_push_re;
(yyval) = (yyvsp[(1) - (1)]);
@@ -3162,22 +3171,22 @@ regular_loop:
case 74:
-/* Line 1806 of yacc.c */
-#line 1073 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1082 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 75:
-/* Line 1806 of yacc.c */
-#line 1075 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1084 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 77:
-/* Line 1806 of yacc.c */
-#line 1085 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1094 "awkgram.y"
{
(yyval) = (yyvsp[(2) - (3)]);
}
@@ -3185,8 +3194,8 @@ regular_loop:
case 78:
-/* Line 1806 of yacc.c */
-#line 1092 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1101 "awkgram.y"
{
in_print = FALSE;
in_parens = 0;
@@ -3196,15 +3205,15 @@ regular_loop:
case 79:
-/* Line 1806 of yacc.c */
-#line 1097 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1106 "awkgram.y"
{ in_print = FALSE; in_parens = 0; }
break;
case 80:
-/* Line 1806 of yacc.c */
-#line 1098 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1107 "awkgram.y"
{
if ((yyvsp[(1) - (3)])->redir_type == redirect_twoway
&& (yyvsp[(3) - (3)])->lasti->opcode ==
Op_K_getline_redir
@@ -3216,8 +3225,8 @@ regular_loop:
case 81:
-/* Line 1806 of yacc.c */
-#line 1109 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1118 "awkgram.y"
{
(yyval) = mk_condition((yyvsp[(3) - (6)]), (yyvsp[(1) - (6)]),
(yyvsp[(6) - (6)]), NULL, NULL);
}
@@ -3225,8 +3234,8 @@ regular_loop:
case 82:
-/* Line 1806 of yacc.c */
-#line 1114 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1123 "awkgram.y"
{
(yyval) = mk_condition((yyvsp[(3) - (9)]), (yyvsp[(1) - (9)]),
(yyvsp[(6) - (9)]), (yyvsp[(7) - (9)]), (yyvsp[(9) - (9)]));
}
@@ -3234,15 +3243,15 @@ regular_loop:
case 87:
-/* Line 1806 of yacc.c */
-#line 1131 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1140 "awkgram.y"
{ (yyval) = NULL; }
break;
case 88:
-/* Line 1806 of yacc.c */
-#line 1133 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1142 "awkgram.y"
{
bcfree((yyvsp[(1) - (2)]));
(yyval) = (yyvsp[(2) - (2)]);
@@ -3251,22 +3260,22 @@ regular_loop:
case 89:
-/* Line 1806 of yacc.c */
-#line 1141 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1150 "awkgram.y"
{ (yyval) = NULL; }
break;
case 90:
-/* Line 1806 of yacc.c */
-#line 1143 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1152 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]) ; }
break;
case 91:
-/* Line 1806 of yacc.c */
-#line 1148 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1157 "awkgram.y"
{
(yyvsp[(1) - (1)])->param_count = 0;
(yyval) = list_create((yyvsp[(1) - (1)]));
@@ -3275,8 +3284,8 @@ regular_loop:
case 92:
-/* Line 1806 of yacc.c */
-#line 1153 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1162 "awkgram.y"
{
(yyvsp[(3) - (3)])->param_count = (yyvsp[(1) -
(3)])->lasti->param_count + 1;
(yyval) = list_append((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]));
@@ -3286,64 +3295,64 @@ regular_loop:
case 93:
-/* Line 1806 of yacc.c */
-#line 1159 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1168 "awkgram.y"
{ (yyval) = NULL; }
break;
case 94:
-/* Line 1806 of yacc.c */
-#line 1161 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1170 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (2)]); }
break;
case 95:
-/* Line 1806 of yacc.c */
-#line 1163 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1172 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (3)]); }
break;
case 96:
-/* Line 1806 of yacc.c */
-#line 1169 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1178 "awkgram.y"
{ (yyval) = NULL; }
break;
case 97:
-/* Line 1806 of yacc.c */
-#line 1171 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1180 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 98:
-/* Line 1806 of yacc.c */
-#line 1176 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1185 "awkgram.y"
{ (yyval) = NULL; }
break;
case 99:
-/* Line 1806 of yacc.c */
-#line 1178 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1187 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 100:
-/* Line 1806 of yacc.c */
-#line 1183 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1192 "awkgram.y"
{ (yyval) = mk_expression_list(NULL, (yyvsp[(1) - (1)])); }
break;
case 101:
-/* Line 1806 of yacc.c */
-#line 1185 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1194 "awkgram.y"
{
(yyval) = mk_expression_list((yyvsp[(1) - (3)]), (yyvsp[(3) -
(3)]));
yyerrok;
@@ -3352,36 +3361,36 @@ regular_loop:
case 102:
-/* Line 1806 of yacc.c */
-#line 1190 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1199 "awkgram.y"
{ (yyval) = NULL; }
break;
case 103:
-/* Line 1806 of yacc.c */
-#line 1192 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1201 "awkgram.y"
{ (yyval) = NULL; }
break;
case 104:
-/* Line 1806 of yacc.c */
-#line 1194 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1203 "awkgram.y"
{ (yyval) = NULL; }
break;
case 105:
-/* Line 1806 of yacc.c */
-#line 1196 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1205 "awkgram.y"
{ (yyval) = NULL; }
break;
case 106:
-/* Line 1806 of yacc.c */
-#line 1202 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1211 "awkgram.y"
{
if (do_lint && (yyvsp[(3) - (3)])->lasti->opcode ==
Op_match_rec)
lintwarn_ln((yyvsp[(2) - (3)])->source_line,
@@ -3392,22 +3401,22 @@ regular_loop:
case 107:
-/* Line 1806 of yacc.c */
-#line 1209 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1218 "awkgram.y"
{ (yyval) = mk_boolean((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2)
- (3)])); }
break;
case 108:
-/* Line 1806 of yacc.c */
-#line 1211 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1220 "awkgram.y"
{ (yyval) = mk_boolean((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2)
- (3)])); }
break;
case 109:
-/* Line 1806 of yacc.c */
-#line 1213 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1222 "awkgram.y"
{
if ((yyvsp[(1) - (3)])->lasti->opcode == Op_match_rec)
warning_ln((yyvsp[(2) - (3)])->source_line,
@@ -3427,8 +3436,8 @@ regular_loop:
case 110:
-/* Line 1806 of yacc.c */
-#line 1229 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1238 "awkgram.y"
{
if (do_lint_old)
warning_ln((yyvsp[(2) - (3)])->source_line,
@@ -3442,8 +3451,8 @@ regular_loop:
case 111:
-/* Line 1806 of yacc.c */
-#line 1239 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1248 "awkgram.y"
{
if (do_lint && (yyvsp[(3) - (3)])->lasti->opcode ==
Op_match_rec)
lintwarn_ln((yyvsp[(2) - (3)])->source_line,
@@ -3454,36 +3463,36 @@ regular_loop:
case 112:
-/* Line 1806 of yacc.c */
-#line 1246 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1255 "awkgram.y"
{ (yyval) = mk_condition((yyvsp[(1) - (5)]), (yyvsp[(2) - (5)]),
(yyvsp[(3) - (5)]), (yyvsp[(4) - (5)]), (yyvsp[(5) - (5)])); }
break;
case 113:
-/* Line 1806 of yacc.c */
-#line 1248 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1257 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 114:
-/* Line 1806 of yacc.c */
-#line 1253 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1262 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 115:
-/* Line 1806 of yacc.c */
-#line 1255 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1264 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 116:
-/* Line 1806 of yacc.c */
-#line 1257 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1266 "awkgram.y"
{
(yyvsp[(2) - (2)])->opcode = Op_assign_quotient;
(yyval) = (yyvsp[(2) - (2)]);
@@ -3492,50 +3501,50 @@ regular_loop:
case 117:
-/* Line 1806 of yacc.c */
-#line 1265 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1274 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 118:
-/* Line 1806 of yacc.c */
-#line 1267 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1276 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 119:
-/* Line 1806 of yacc.c */
-#line 1272 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1281 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 120:
-/* Line 1806 of yacc.c */
-#line 1274 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1283 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 121:
-/* Line 1806 of yacc.c */
-#line 1279 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1288 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 122:
-/* Line 1806 of yacc.c */
-#line 1281 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1290 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 123:
-/* Line 1806 of yacc.c */
-#line 1283 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1292 "awkgram.y"
{
int count = 2;
int is_simple_var = FALSE;
@@ -3586,50 +3595,50 @@ regular_loop:
case 125:
-/* Line 1806 of yacc.c */
-#line 1335 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1344 "awkgram.y"
{ (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) -
(3)])); }
break;
case 126:
-/* Line 1806 of yacc.c */
-#line 1337 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1346 "awkgram.y"
{ (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) -
(3)])); }
break;
case 127:
-/* Line 1806 of yacc.c */
-#line 1339 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1348 "awkgram.y"
{ (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) -
(3)])); }
break;
case 128:
-/* Line 1806 of yacc.c */
-#line 1341 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1350 "awkgram.y"
{ (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) -
(3)])); }
break;
case 129:
-/* Line 1806 of yacc.c */
-#line 1343 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1352 "awkgram.y"
{ (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) -
(3)])); }
break;
case 130:
-/* Line 1806 of yacc.c */
-#line 1345 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1354 "awkgram.y"
{ (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) -
(3)])); }
break;
case 131:
-/* Line 1806 of yacc.c */
-#line 1347 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1356 "awkgram.y"
{
/*
* In BEGINFILE/ENDFILE, allow `getline var < file'
@@ -3656,8 +3665,8 @@ regular_loop:
case 132:
-/* Line 1806 of yacc.c */
-#line 1370 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1379 "awkgram.y"
{
(yyvsp[(2) - (2)])->opcode = Op_postincrement;
(yyval) = mk_assignment((yyvsp[(1) - (2)]), NULL, (yyvsp[(2) -
(2)]));
@@ -3666,8 +3675,8 @@ regular_loop:
case 133:
-/* Line 1806 of yacc.c */
-#line 1375 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1384 "awkgram.y"
{
(yyvsp[(2) - (2)])->opcode = Op_postdecrement;
(yyval) = mk_assignment((yyvsp[(1) - (2)]), NULL, (yyvsp[(2) -
(2)]));
@@ -3676,8 +3685,8 @@ regular_loop:
case 134:
-/* Line 1806 of yacc.c */
-#line 1380 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1389 "awkgram.y"
{
if (do_lint_old) {
warning_ln((yyvsp[(4) - (5)])->source_line,
@@ -3701,8 +3710,8 @@ regular_loop:
case 135:
-/* Line 1806 of yacc.c */
-#line 1405 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1414 "awkgram.y"
{
(yyval) = mk_getline((yyvsp[(3) - (4)]), (yyvsp[(4) - (4)]),
(yyvsp[(1) - (4)]), (yyvsp[(2) - (4)])->redir_type);
bcfree((yyvsp[(2) - (4)]));
@@ -3711,50 +3720,50 @@ regular_loop:
case 136:
-/* Line 1806 of yacc.c */
-#line 1411 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1420 "awkgram.y"
{ (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) -
(3)])); }
break;
case 137:
-/* Line 1806 of yacc.c */
-#line 1413 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1422 "awkgram.y"
{ (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) -
(3)])); }
break;
case 138:
-/* Line 1806 of yacc.c */
-#line 1415 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1424 "awkgram.y"
{ (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) -
(3)])); }
break;
case 139:
-/* Line 1806 of yacc.c */
-#line 1417 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1426 "awkgram.y"
{ (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) -
(3)])); }
break;
case 140:
-/* Line 1806 of yacc.c */
-#line 1419 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1428 "awkgram.y"
{ (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) -
(3)])); }
break;
case 141:
-/* Line 1806 of yacc.c */
-#line 1421 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1430 "awkgram.y"
{ (yyval) = mk_binary((yyvsp[(1) - (3)]), (yyvsp[(3) - (3)]), (yyvsp[(2) -
(3)])); }
break;
case 142:
-/* Line 1806 of yacc.c */
-#line 1426 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1435 "awkgram.y"
{
(yyval) = list_create((yyvsp[(1) - (1)]));
}
@@ -3762,8 +3771,8 @@ regular_loop:
case 143:
-/* Line 1806 of yacc.c */
-#line 1430 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1439 "awkgram.y"
{
if ((yyvsp[(2) - (2)])->opcode == Op_match_rec) {
(yyvsp[(2) - (2)])->opcode = Op_nomatch;
@@ -3798,15 +3807,15 @@ regular_loop:
case 144:
-/* Line 1806 of yacc.c */
-#line 1461 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1470 "awkgram.y"
{ (yyval) = (yyvsp[(2) - (3)]); }
break;
case 145:
-/* Line 1806 of yacc.c */
-#line 1463 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1472 "awkgram.y"
{
(yyval) = snode((yyvsp[(3) - (4)]), (yyvsp[(1) - (4)]));
if ((yyval) == NULL)
@@ -3816,8 +3825,8 @@ regular_loop:
case 146:
-/* Line 1806 of yacc.c */
-#line 1469 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1478 "awkgram.y"
{
(yyval) = snode((yyvsp[(3) - (4)]), (yyvsp[(1) - (4)]));
if ((yyval) == NULL)
@@ -3827,8 +3836,8 @@ regular_loop:
case 147:
-/* Line 1806 of yacc.c */
-#line 1475 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1484 "awkgram.y"
{
static short warned1 = FALSE;
@@ -3845,8 +3854,8 @@ regular_loop:
case 150:
-/* Line 1806 of yacc.c */
-#line 1490 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1499 "awkgram.y"
{
(yyvsp[(1) - (2)])->opcode = Op_preincrement;
(yyval) = mk_assignment((yyvsp[(2) - (2)]), NULL, (yyvsp[(1) -
(2)]));
@@ -3855,8 +3864,8 @@ regular_loop:
case 151:
-/* Line 1806 of yacc.c */
-#line 1495 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1504 "awkgram.y"
{
(yyvsp[(1) - (2)])->opcode = Op_predecrement;
(yyval) = mk_assignment((yyvsp[(2) - (2)]), NULL, (yyvsp[(1) -
(2)]));
@@ -3865,8 +3874,8 @@ regular_loop:
case 152:
-/* Line 1806 of yacc.c */
-#line 1500 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1509 "awkgram.y"
{
(yyval) = list_create((yyvsp[(1) - (1)]));
}
@@ -3874,8 +3883,8 @@ regular_loop:
case 153:
-/* Line 1806 of yacc.c */
-#line 1504 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1513 "awkgram.y"
{
(yyval) = list_create((yyvsp[(1) - (1)]));
}
@@ -3883,13 +3892,18 @@ regular_loop:
case 154:
-/* Line 1806 of yacc.c */
-#line 1508 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1517 "awkgram.y"
{
if ((yyvsp[(2) - (2)])->lasti->opcode == Op_push_i
&& ((yyvsp[(2) - (2)])->lasti->memory->flags &
(STRCUR|STRING)) == 0
) {
- (yyvsp[(2) - (2)])->lasti->memory->numbr =
-(force_number((yyvsp[(2) - (2)])->lasti->memory));
+ NODE *n = (yyvsp[(2) - (2)])->lasti->memory;
+ (void) force_number(n);
+ if (n->flags & MPFN)
+ mpfr_setsign(n->mpfr_numbr, n->mpfr_numbr,
TRUE, RND_MODE);
+ else
+ n->numbr = -n->numbr;
(yyval) = (yyvsp[(2) - (2)]);
bcfree((yyvsp[(1) - (2)]));
} else {
@@ -3901,8 +3915,8 @@ regular_loop:
case 155:
-/* Line 1806 of yacc.c */
-#line 1521 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1535 "awkgram.y"
{
/*
* was: $$ = $2
@@ -3916,8 +3930,8 @@ regular_loop:
case 156:
-/* Line 1806 of yacc.c */
-#line 1534 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1548 "awkgram.y"
{
func_use((yyvsp[(1) - (1)])->lasti->func_name, FUNC_USE);
(yyval) = (yyvsp[(1) - (1)]);
@@ -3926,8 +3940,8 @@ regular_loop:
case 157:
-/* Line 1806 of yacc.c */
-#line 1539 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1553 "awkgram.y"
{
/* indirect function call */
INSTRUCTION *f, *t;
@@ -3964,8 +3978,8 @@ regular_loop:
case 158:
-/* Line 1806 of yacc.c */
-#line 1575 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1589 "awkgram.y"
{
param_sanity((yyvsp[(3) - (4)]));
(yyvsp[(1) - (4)])->opcode = Op_func_call;
@@ -3983,43 +3997,43 @@ regular_loop:
case 159:
-/* Line 1806 of yacc.c */
-#line 1592 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1606 "awkgram.y"
{ (yyval) = NULL; }
break;
case 160:
-/* Line 1806 of yacc.c */
-#line 1594 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1608 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 161:
-/* Line 1806 of yacc.c */
-#line 1599 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1613 "awkgram.y"
{ (yyval) = NULL; }
break;
case 162:
-/* Line 1806 of yacc.c */
-#line 1601 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1615 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (2)]); }
break;
case 163:
-/* Line 1806 of yacc.c */
-#line 1606 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1620 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 164:
-/* Line 1806 of yacc.c */
-#line 1608 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1622 "awkgram.y"
{
(yyval) = list_merge((yyvsp[(1) - (2)]), (yyvsp[(2) - (2)]));
}
@@ -4027,8 +4041,8 @@ regular_loop:
case 165:
-/* Line 1806 of yacc.c */
-#line 1615 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1629 "awkgram.y"
{
INSTRUCTION *ip = (yyvsp[(1) - (1)])->lasti;
int count = ip->sub_count; /* # of SUBSEP-seperated
expressions */
@@ -4046,8 +4060,8 @@ regular_loop:
case 166:
-/* Line 1806 of yacc.c */
-#line 1632 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1646 "awkgram.y"
{
INSTRUCTION *t = (yyvsp[(2) - (3)]);
if ((yyvsp[(2) - (3)]) == NULL) {
@@ -4065,15 +4079,15 @@ regular_loop:
case 167:
-/* Line 1806 of yacc.c */
-#line 1649 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1663 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); }
break;
case 168:
-/* Line 1806 of yacc.c */
-#line 1651 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1665 "awkgram.y"
{
(yyval) = list_merge((yyvsp[(1) - (2)]), (yyvsp[(2) - (2)]));
}
@@ -4081,15 +4095,15 @@ regular_loop:
case 169:
-/* Line 1806 of yacc.c */
-#line 1658 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1672 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (2)]); }
break;
case 170:
-/* Line 1806 of yacc.c */
-#line 1663 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1677 "awkgram.y"
{
char *var_name = (yyvsp[(1) - (1)])->lextok;
@@ -4101,8 +4115,8 @@ regular_loop:
case 171:
-/* Line 1806 of yacc.c */
-#line 1671 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1685 "awkgram.y"
{
char *arr = (yyvsp[(1) - (2)])->lextok;
(yyvsp[(1) - (2)])->memory = variable((yyvsp[(1) -
(2)])->source_line, arr, Node_var_new);
@@ -4113,8 +4127,8 @@ regular_loop:
case 172:
-/* Line 1806 of yacc.c */
-#line 1681 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1695 "awkgram.y"
{
INSTRUCTION *ip = (yyvsp[(1) - (1)])->nexti;
if (ip->opcode == Op_push
@@ -4130,8 +4144,8 @@ regular_loop:
case 173:
-/* Line 1806 of yacc.c */
-#line 1693 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1707 "awkgram.y"
{
(yyval) = list_append((yyvsp[(2) - (3)]), (yyvsp[(1) - (3)]));
if ((yyvsp[(3) - (3)]) != NULL)
@@ -4141,8 +4155,8 @@ regular_loop:
case 174:
-/* Line 1806 of yacc.c */
-#line 1702 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1716 "awkgram.y"
{
(yyvsp[(1) - (1)])->opcode = Op_postincrement;
}
@@ -4150,8 +4164,8 @@ regular_loop:
case 175:
-/* Line 1806 of yacc.c */
-#line 1706 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1720 "awkgram.y"
{
(yyvsp[(1) - (1)])->opcode = Op_postdecrement;
}
@@ -4159,50 +4173,50 @@ regular_loop:
case 176:
-/* Line 1806 of yacc.c */
-#line 1709 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1723 "awkgram.y"
{ (yyval) = NULL; }
break;
case 178:
-/* Line 1806 of yacc.c */
-#line 1717 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1731 "awkgram.y"
{ yyerrok; }
break;
case 179:
-/* Line 1806 of yacc.c */
-#line 1721 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1735 "awkgram.y"
{ yyerrok; }
break;
case 182:
-/* Line 1806 of yacc.c */
-#line 1730 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1744 "awkgram.y"
{ yyerrok; }
break;
case 183:
-/* Line 1806 of yacc.c */
-#line 1734 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1748 "awkgram.y"
{ (yyval) = (yyvsp[(1) - (1)]); yyerrok; }
break;
case 184:
-/* Line 1806 of yacc.c */
-#line 1738 "awkgram.y"
+/* Line 1821 of yacc.c */
+#line 1752 "awkgram.y"
{ yyerrok; }
break;
-/* Line 1806 of yacc.c */
-#line 4218 "awkgram.c"
+/* Line 1821 of yacc.c */
+#line 4232 "awkgram.c"
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
@@ -4433,7 +4447,7 @@ yyreturn:
/* Line 2067 of yacc.c */
-#line 1740 "awkgram.y"
+#line 1754 "awkgram.y"
struct token {
@@ -4452,6 +4466,7 @@ struct token {
# define CONTINUE 0x2000 /* continue allowed inside */
NODE *(*ptr)(int); /* function that implements this keyword */
+ NODE *(*ptr2)(int); /* alternate MPFR function implementing this
keyword */
};
#if 'a' == 0x81 /* it's EBCDIC */
@@ -4475,81 +4490,87 @@ tokcompare(const void *l, const void *r)
* Function pointers come from declarations in awk.h.
*/
+#ifdef HAVE_MPFR
+#define MPF(F) F##_mpfr
+#else
+#define MPF(F) 0
+#endif
+
static const struct token tokentab[] = {
-{"BEGIN", Op_rule, LEX_BEGIN, 0, 0},
-{"BEGINFILE", Op_rule, LEX_BEGINFILE, GAWKX, 0},
-{"END", Op_rule, LEX_END, 0, 0},
-{"ENDFILE", Op_rule, LEX_ENDFILE, GAWKX, 0},
+{"BEGIN", Op_rule, LEX_BEGIN, 0, 0, 0},
+{"BEGINFILE", Op_rule, LEX_BEGINFILE, GAWKX, 0, 0},
+{"END", Op_rule, LEX_END, 0, 0,
0},
+{"ENDFILE", Op_rule, LEX_ENDFILE, GAWKX, 0,
0},
#ifdef ARRAYDEBUG
-{"adump", Op_builtin, LEX_BUILTIN, GAWKX|A(1)|A(2),
do_adump},
+{"adump", Op_builtin, LEX_BUILTIN, GAWKX|A(1)|A(2),
do_adump, 0},
#endif
-{"and", Op_builtin, LEX_BUILTIN, GAWKX|A(2), do_and},
+{"and", Op_builtin, LEX_BUILTIN, GAWKX|A(2), do_and,
MPF(do_and)},
#ifdef ARRAYDEBUG
-{"aoption", Op_builtin, LEX_BUILTIN, GAWKX|A(2), do_aoption},
+{"aoption", Op_builtin, LEX_BUILTIN, GAWKX|A(2), do_aoption,
0},
#endif
-{"asort", Op_builtin, LEX_BUILTIN, GAWKX|A(1)|A(2)|A(3),
do_asort},
-{"asorti", Op_builtin, LEX_BUILTIN, GAWKX|A(1)|A(2)|A(3),
do_asorti},
-{"atan2", Op_builtin, LEX_BUILTIN, NOT_OLD|A(2), do_atan2},
-{"bindtextdomain", Op_builtin, LEX_BUILTIN, GAWKX|A(1)|A(2),
do_bindtextdomain},
-{"break", Op_K_break, LEX_BREAK, 0, 0},
-{"case", Op_K_case, LEX_CASE, GAWKX, 0},
-{"close", Op_builtin, LEX_BUILTIN, NOT_OLD|A(1)|A(2),
do_close},
-{"compl", Op_builtin, LEX_BUILTIN, GAWKX|A(1), do_compl},
-{"continue", Op_K_continue, LEX_CONTINUE, 0, 0},
-{"cos", Op_builtin, LEX_BUILTIN, NOT_OLD|A(1), do_cos},
-{"dcgettext", Op_builtin, LEX_BUILTIN, GAWKX|A(1)|A(2)|A(3),
do_dcgettext},
-{"dcngettext", Op_builtin, LEX_BUILTIN, GAWKX|A(1)|A(2)|A(3)|A(4)|A(5),
do_dcngettext},
-{"default", Op_K_default, LEX_DEFAULT, GAWKX, 0},
-{"delete", Op_K_delete, LEX_DELETE, NOT_OLD, 0},
-{"do", Op_K_do, LEX_DO, NOT_OLD|BREAK|CONTINUE, 0},
-{"else", Op_K_else, LEX_ELSE, 0, 0},
-{"eval", Op_symbol, LEX_EVAL, 0, 0},
-{"exit", Op_K_exit, LEX_EXIT, 0, 0},
-{"exp", Op_builtin, LEX_BUILTIN, A(1), do_exp},
-{"extension", Op_builtin, LEX_BUILTIN, GAWKX|A(2), do_ext},
-{"fflush", Op_builtin, LEX_BUILTIN, RESX|A(0)|A(1), do_fflush},
-{"for", Op_K_for, LEX_FOR, BREAK|CONTINUE, 0},
-{"func", Op_func, LEX_FUNCTION, NOT_POSIX|NOT_OLD, 0},
-{"function",Op_func, LEX_FUNCTION, NOT_OLD, 0},
-{"gensub", Op_sub_builtin, LEX_BUILTIN, GAWKX|A(3)|A(4), 0},
-{"getline", Op_K_getline_redir, LEX_GETLINE, NOT_OLD, 0},
-{"gsub", Op_sub_builtin, LEX_BUILTIN, NOT_OLD|A(2)|A(3), 0},
-{"if", Op_K_if, LEX_IF, 0, 0},
-{"in", Op_symbol, LEX_IN, 0, 0},
-{"include", Op_symbol, LEX_INCLUDE, GAWKX, 0},
-{"index", Op_builtin, LEX_BUILTIN, A(2), do_index},
-{"int", Op_builtin, LEX_BUILTIN, A(1), do_int},
-{"isarray", Op_builtin, LEX_BUILTIN, GAWKX|A(1), do_isarray},
-{"length", Op_builtin, LEX_LENGTH, A(0)|A(1), do_length},
-{"log", Op_builtin, LEX_BUILTIN, A(1), do_log},
-{"lshift", Op_builtin, LEX_BUILTIN, GAWKX|A(2), do_lshift},
-{"match", Op_builtin, LEX_BUILTIN, NOT_OLD|A(2)|A(3), do_match},
-{"mktime", Op_builtin, LEX_BUILTIN, GAWKX|A(1), do_mktime},
-{"next", Op_K_next, LEX_NEXT, 0, 0},
-{"nextfile", Op_K_nextfile, LEX_NEXTFILE, GAWKX, 0},
-{"or", Op_builtin, LEX_BUILTIN, GAWKX|A(2), do_or},
-{"patsplit", Op_builtin, LEX_BUILTIN, GAWKX|A(2)|A(3)|A(4),
do_patsplit},
-{"print", Op_K_print, LEX_PRINT, 0, 0},
-{"printf", Op_K_printf, LEX_PRINTF, 0, 0},
-{"rand", Op_builtin, LEX_BUILTIN, NOT_OLD|A(0), do_rand},
-{"return", Op_K_return, LEX_RETURN, NOT_OLD, 0},
-{"rshift", Op_builtin, LEX_BUILTIN, GAWKX|A(2), do_rshift},
-{"sin", Op_builtin, LEX_BUILTIN, NOT_OLD|A(1), do_sin},
-{"split", Op_builtin, LEX_BUILTIN, A(2)|A(3)|A(4), do_split},
-{"sprintf", Op_builtin, LEX_BUILTIN, 0, do_sprintf},
-{"sqrt", Op_builtin, LEX_BUILTIN, A(1), do_sqrt},
-{"srand", Op_builtin, LEX_BUILTIN, NOT_OLD|A(0)|A(1), do_srand},
-{"strftime", Op_builtin, LEX_BUILTIN, GAWKX|A(0)|A(1)|A(2)|A(3),
do_strftime},
-{"strtonum", Op_builtin, LEX_BUILTIN, GAWKX|A(1), do_strtonum},
-{"sub", Op_sub_builtin, LEX_BUILTIN, NOT_OLD|A(2)|A(3), 0},
-{"substr", Op_builtin, LEX_BUILTIN, A(2)|A(3), do_substr},
-{"switch", Op_K_switch, LEX_SWITCH, GAWKX|BREAK, 0},
-{"system", Op_builtin, LEX_BUILTIN, NOT_OLD|A(1), do_system},
-{"systime", Op_builtin, LEX_BUILTIN, GAWKX|A(0), do_systime},
-{"tolower", Op_builtin, LEX_BUILTIN, NOT_OLD|A(1), do_tolower},
-{"toupper", Op_builtin, LEX_BUILTIN, NOT_OLD|A(1), do_toupper},
-{"while", Op_K_while, LEX_WHILE, BREAK|CONTINUE, 0},
-{"xor", Op_builtin, LEX_BUILTIN, GAWKX|A(2), do_xor},
+{"asort", Op_builtin, LEX_BUILTIN, GAWKX|A(1)|A(2)|A(3),
do_asort, 0},
+{"asorti", Op_builtin, LEX_BUILTIN, GAWKX|A(1)|A(2)|A(3),
do_asorti, 0},
+{"atan2", Op_builtin, LEX_BUILTIN, NOT_OLD|A(2), do_atan2,
MPF(do_atan2)},
+{"bindtextdomain", Op_builtin, LEX_BUILTIN, GAWKX|A(1)|A(2),
do_bindtextdomain, 0},
+{"break", Op_K_break, LEX_BREAK, 0, 0, 0},
+{"case", Op_K_case, LEX_CASE, GAWKX, 0, 0},
+{"close", Op_builtin, LEX_BUILTIN, NOT_OLD|A(1)|A(2),
do_close, 0},
+{"compl", Op_builtin, LEX_BUILTIN, GAWKX|A(1), do_compl,
MPF(do_compl)},
+{"continue", Op_K_continue, LEX_CONTINUE, 0, 0, 0},
+{"cos", Op_builtin, LEX_BUILTIN, NOT_OLD|A(1), do_cos,
MPF(do_cos)},
+{"dcgettext", Op_builtin, LEX_BUILTIN, GAWKX|A(1)|A(2)|A(3),
do_dcgettext, 0},
+{"dcngettext", Op_builtin, LEX_BUILTIN, GAWKX|A(1)|A(2)|A(3)|A(4)|A(5),
do_dcngettext, 0},
+{"default", Op_K_default, LEX_DEFAULT, GAWKX, 0, 0},
+{"delete", Op_K_delete, LEX_DELETE, NOT_OLD, 0, 0},
+{"do", Op_K_do, LEX_DO, NOT_OLD|BREAK|CONTINUE, 0,
0},
+{"else", Op_K_else, LEX_ELSE, 0, 0, 0},
+{"eval", Op_symbol, LEX_EVAL, 0, 0, 0},
+{"exit", Op_K_exit, LEX_EXIT, 0, 0, 0},
+{"exp", Op_builtin, LEX_BUILTIN, A(1), do_exp,
MPF(do_exp)},
+{"extension", Op_builtin, LEX_BUILTIN, GAWKX|A(2), do_ext, 0},
+{"fflush", Op_builtin, LEX_BUILTIN, RESX|A(0)|A(1), do_fflush,
0},
+{"for", Op_K_for, LEX_FOR, BREAK|CONTINUE, 0,
0},
+{"func", Op_func, LEX_FUNCTION, NOT_POSIX|NOT_OLD, 0, 0},
+{"function",Op_func, LEX_FUNCTION, NOT_OLD, 0, 0},
+{"gensub", Op_sub_builtin, LEX_BUILTIN, GAWKX|A(3)|A(4), 0, 0},
+{"getline", Op_K_getline_redir, LEX_GETLINE, NOT_OLD, 0,
0},
+{"gsub", Op_sub_builtin, LEX_BUILTIN, NOT_OLD|A(2)|A(3), 0, 0},
+{"if", Op_K_if, LEX_IF, 0, 0, 0},
+{"in", Op_symbol, LEX_IN, 0, 0, 0},
+{"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(do_int)},
+{"isarray", Op_builtin, LEX_BUILTIN, GAWKX|A(1), do_isarray,
0},
+{"length", Op_builtin, LEX_LENGTH, A(0)|A(1), do_length,
0},
+{"log", Op_builtin, LEX_BUILTIN, A(1), do_log,
MPF(do_log)},
+{"lshift", Op_builtin, LEX_BUILTIN, GAWKX|A(2), do_lshift,
MPF(do_lshift)},
+{"match", Op_builtin, LEX_BUILTIN, NOT_OLD|A(2)|A(3), do_match,
0},
+{"mktime", Op_builtin, LEX_BUILTIN, GAWKX|A(1), do_mktime,
0},
+{"next", Op_K_next, LEX_NEXT, 0, 0, 0},
+{"nextfile", Op_K_nextfile, LEX_NEXTFILE, GAWKX, 0, 0},
+{"or", Op_builtin, LEX_BUILTIN, GAWKX|A(2), do_or,
MPF(do_or)},
+{"patsplit", Op_builtin, LEX_BUILTIN, GAWKX|A(2)|A(3)|A(4),
do_patsplit, 0},
+{"print", Op_K_print, LEX_PRINT, 0, 0, 0},
+{"printf", Op_K_printf, LEX_PRINTF, 0, 0, 0},
+{"rand", Op_builtin, LEX_BUILTIN, NOT_OLD|A(0), do_rand,
MPF(do_rand)},
+{"return", Op_K_return, LEX_RETURN, NOT_OLD, 0, 0},
+{"rshift", Op_builtin, LEX_BUILTIN, GAWKX|A(2), do_rshift,
MPF(do_rhift)},
+{"sin", Op_builtin, LEX_BUILTIN, NOT_OLD|A(1), do_sin,
MPF(do_sin)},
+{"split", Op_builtin, LEX_BUILTIN, A(2)|A(3)|A(4), do_split,
0},
+{"sprintf", Op_builtin, LEX_BUILTIN, 0, do_sprintf,
0},
+{"sqrt", Op_builtin, LEX_BUILTIN, A(1), do_sqrt,
MPF(do_sqrt)},
+{"srand", Op_builtin, LEX_BUILTIN, NOT_OLD|A(0)|A(1), do_srand,
MPF(do_srand)},
+{"strftime", Op_builtin, LEX_BUILTIN, GAWKX|A(0)|A(1)|A(2)|A(3),
do_strftime, 0},
+{"strtonum", Op_builtin, LEX_BUILTIN, GAWKX|A(1), do_strtonum,
MPF(do_strtonum)},
+{"sub", Op_sub_builtin, LEX_BUILTIN, NOT_OLD|A(2)|A(3), 0,
0},
+{"substr", Op_builtin, LEX_BUILTIN, A(2)|A(3), do_substr,
0},
+{"switch", Op_K_switch, LEX_SWITCH, GAWKX|BREAK, 0, 0},
+{"system", Op_builtin, LEX_BUILTIN, NOT_OLD|A(1), do_system,
0},
+{"systime", Op_builtin, LEX_BUILTIN, GAWKX|A(0), do_systime,
0},
+{"tolower", Op_builtin, LEX_BUILTIN, NOT_OLD|A(1), do_tolower,
0},
+{"toupper", Op_builtin, LEX_BUILTIN, NOT_OLD|A(1), do_toupper,
0},
+{"while", Op_K_while, LEX_WHILE, BREAK|CONTINUE, 0, 0},
+{"xor", Op_builtin, LEX_BUILTIN, GAWKX|A(2), do_xor,
MPF(do_xor)},
};
#if MBS_SUPPORT
@@ -5460,6 +5481,7 @@ yylex(void)
int seen_point = FALSE;
int esc_seen; /* for literal strings */
int mid;
+ int base;
static int did_newline = FALSE;
char *tokkey;
int inhex = FALSE;
@@ -6036,17 +6058,32 @@ retry:
tokadd('\0');
yylval = GET_INSTRUCTION(Op_push_i);
- if (! do_traditional && isnondecimal(tokstart, FALSE)) {
+
+ base = 10;
+ if (! do_traditional) {
+ base = get_numbase(tokstart, FALSE);
if (do_lint) {
- if (isdigit((unsigned char) tokstart[1]))
/* not an 'x' or 'X' */
+ if (base == 8)
lintwarn("numeric constant `%.*s'
treated as octal",
(int) strlen(tokstart)-1,
tokstart);
- else if (tokstart[1] == 'x' || tokstart[1] ==
'X')
+ else if (base == 16)
lintwarn("numeric constant `%.*s'
treated as hexadecimal",
(int) strlen(tokstart)-1,
tokstart);
}
+ }
+
+#ifdef HAVE_MPFR
+ if (do_mpfr) {
+ NODE *r;
+ r = mpfr_node();
+ (void) mpfr_set_str(r->mpfr_numbr, tokstart, base,
RND_MODE);
+ yylval->memory = r;
+ return lasttok = YNUMBER;
+ }
+#endif
+ if (base != 10)
d = nondec2awknum(tokstart, strlen(tokstart));
- } else
+ else
d = atof(tokstart);
yylval->memory = make_number(d);
if (d <= INT32_MAX && d >= INT32_MIN && d == (int32_t) d)
@@ -6332,7 +6369,13 @@ snode(INSTRUCTION *subn, INSTRUCTION *r)
}
}
- r->builtin = tokentab[idx].ptr;
+#ifdef HAVE_MPFR
+ /* N.B.: There isn't any special processing for an alternate function
below */
+ if (do_mpfr && tokentab[idx].ptr2)
+ r->builtin = tokentab[idx].ptr2;
+ else
+#endif
+ r->builtin = tokentab[idx].ptr;
/* special case processing for a few builtins */
@@ -8048,3 +8091,4 @@ one_line_close(int fd)
}
+
diff --git a/awkgram.y b/awkgram.y
index a64fff0..74a5611 100644
--- a/awkgram.y
+++ b/awkgram.y
@@ -34,6 +34,10 @@
#define signed /**/
#endif
+#ifndef HAVE_MPFR
+#define mpfr_setsign(u,v,w,x) /* nothing */
+#endif
+
static void yyerror(const char *m, ...) ATTRIBUTE_PRINTF_1;
static void error_ln(int line, const char *m, ...) ATTRIBUTE_PRINTF_2;
static void lintwarn_ln(int line, const char *m, ...) ATTRIBUTE_PRINTF_2;
@@ -1050,7 +1054,12 @@ case_value
{ $$ = $1; }
| '-' YNUMBER %prec UNARY
{
- $2->memory->numbr = -(force_number($2->memory));
+ NODE *n = $2->memory;
+ (void) force_number(n);
+ if (n->flags & MPFN)
+ mpfr_setsign(n->mpfr_numbr, n->mpfr_numbr, TRUE,
RND_MODE);
+ else
+ n->numbr = -n->numbr;
bcfree($1);
$$ = $2;
}
@@ -1509,7 +1518,12 @@ non_post_simp_exp
if ($2->lasti->opcode == Op_push_i
&& ($2->lasti->memory->flags & (STRCUR|STRING)) == 0
) {
- $2->lasti->memory->numbr =
-(force_number($2->lasti->memory));
+ NODE *n = $2->lasti->memory;
+ (void) force_number(n);
+ if (n->flags & MPFN)
+ mpfr_setsign(n->mpfr_numbr, n->mpfr_numbr,
TRUE, RND_MODE);
+ else
+ n->numbr = -n->numbr;
$$ = $2;
bcfree($1);
} else {
@@ -1755,6 +1769,7 @@ struct token {
# define CONTINUE 0x2000 /* continue allowed inside */
NODE *(*ptr)(int); /* function that implements this keyword */
+ NODE *(*ptr2)(int); /* alternate MPFR function implementing this
keyword */
};
#if 'a' == 0x81 /* it's EBCDIC */
@@ -1778,81 +1793,87 @@ tokcompare(const void *l, const void *r)
* Function pointers come from declarations in awk.h.
*/
+#ifdef HAVE_MPFR
+#define MPF(F) F##_mpfr
+#else
+#define MPF(F) 0
+#endif
+
static const struct token tokentab[] = {
-{"BEGIN", Op_rule, LEX_BEGIN, 0, 0},
-{"BEGINFILE", Op_rule, LEX_BEGINFILE, GAWKX, 0},
-{"END", Op_rule, LEX_END, 0, 0},
-{"ENDFILE", Op_rule, LEX_ENDFILE, GAWKX, 0},
+{"BEGIN", Op_rule, LEX_BEGIN, 0, 0, 0},
+{"BEGINFILE", Op_rule, LEX_BEGINFILE, GAWKX, 0, 0},
+{"END", Op_rule, LEX_END, 0, 0,
0},
+{"ENDFILE", Op_rule, LEX_ENDFILE, GAWKX, 0,
0},
#ifdef ARRAYDEBUG
-{"adump", Op_builtin, LEX_BUILTIN, GAWKX|A(1)|A(2),
do_adump},
+{"adump", Op_builtin, LEX_BUILTIN, GAWKX|A(1)|A(2),
do_adump, 0},
#endif
-{"and", Op_builtin, LEX_BUILTIN, GAWKX|A(2), do_and},
+{"and", Op_builtin, LEX_BUILTIN, GAWKX|A(2), do_and,
MPF(do_and)},
#ifdef ARRAYDEBUG
-{"aoption", Op_builtin, LEX_BUILTIN, GAWKX|A(2), do_aoption},
+{"aoption", Op_builtin, LEX_BUILTIN, GAWKX|A(2), do_aoption,
0},
#endif
-{"asort", Op_builtin, LEX_BUILTIN, GAWKX|A(1)|A(2)|A(3),
do_asort},
-{"asorti", Op_builtin, LEX_BUILTIN, GAWKX|A(1)|A(2)|A(3),
do_asorti},
-{"atan2", Op_builtin, LEX_BUILTIN, NOT_OLD|A(2), do_atan2},
-{"bindtextdomain", Op_builtin, LEX_BUILTIN, GAWKX|A(1)|A(2),
do_bindtextdomain},
-{"break", Op_K_break, LEX_BREAK, 0, 0},
-{"case", Op_K_case, LEX_CASE, GAWKX, 0},
-{"close", Op_builtin, LEX_BUILTIN, NOT_OLD|A(1)|A(2),
do_close},
-{"compl", Op_builtin, LEX_BUILTIN, GAWKX|A(1), do_compl},
-{"continue", Op_K_continue, LEX_CONTINUE, 0, 0},
-{"cos", Op_builtin, LEX_BUILTIN, NOT_OLD|A(1), do_cos},
-{"dcgettext", Op_builtin, LEX_BUILTIN, GAWKX|A(1)|A(2)|A(3),
do_dcgettext},
-{"dcngettext", Op_builtin, LEX_BUILTIN, GAWKX|A(1)|A(2)|A(3)|A(4)|A(5),
do_dcngettext},
-{"default", Op_K_default, LEX_DEFAULT, GAWKX, 0},
-{"delete", Op_K_delete, LEX_DELETE, NOT_OLD, 0},
-{"do", Op_K_do, LEX_DO, NOT_OLD|BREAK|CONTINUE, 0},
-{"else", Op_K_else, LEX_ELSE, 0, 0},
-{"eval", Op_symbol, LEX_EVAL, 0, 0},
-{"exit", Op_K_exit, LEX_EXIT, 0, 0},
-{"exp", Op_builtin, LEX_BUILTIN, A(1), do_exp},
-{"extension", Op_builtin, LEX_BUILTIN, GAWKX|A(2), do_ext},
-{"fflush", Op_builtin, LEX_BUILTIN, RESX|A(0)|A(1), do_fflush},
-{"for", Op_K_for, LEX_FOR, BREAK|CONTINUE, 0},
-{"func", Op_func, LEX_FUNCTION, NOT_POSIX|NOT_OLD, 0},
-{"function",Op_func, LEX_FUNCTION, NOT_OLD, 0},
-{"gensub", Op_sub_builtin, LEX_BUILTIN, GAWKX|A(3)|A(4), 0},
-{"getline", Op_K_getline_redir, LEX_GETLINE, NOT_OLD, 0},
-{"gsub", Op_sub_builtin, LEX_BUILTIN, NOT_OLD|A(2)|A(3), 0},
-{"if", Op_K_if, LEX_IF, 0, 0},
-{"in", Op_symbol, LEX_IN, 0, 0},
-{"include", Op_symbol, LEX_INCLUDE, GAWKX, 0},
-{"index", Op_builtin, LEX_BUILTIN, A(2), do_index},
-{"int", Op_builtin, LEX_BUILTIN, A(1), do_int},
-{"isarray", Op_builtin, LEX_BUILTIN, GAWKX|A(1), do_isarray},
-{"length", Op_builtin, LEX_LENGTH, A(0)|A(1), do_length},
-{"log", Op_builtin, LEX_BUILTIN, A(1), do_log},
-{"lshift", Op_builtin, LEX_BUILTIN, GAWKX|A(2), do_lshift},
-{"match", Op_builtin, LEX_BUILTIN, NOT_OLD|A(2)|A(3), do_match},
-{"mktime", Op_builtin, LEX_BUILTIN, GAWKX|A(1), do_mktime},
-{"next", Op_K_next, LEX_NEXT, 0, 0},
-{"nextfile", Op_K_nextfile, LEX_NEXTFILE, GAWKX, 0},
-{"or", Op_builtin, LEX_BUILTIN, GAWKX|A(2), do_or},
-{"patsplit", Op_builtin, LEX_BUILTIN, GAWKX|A(2)|A(3)|A(4),
do_patsplit},
-{"print", Op_K_print, LEX_PRINT, 0, 0},
-{"printf", Op_K_printf, LEX_PRINTF, 0, 0},
-{"rand", Op_builtin, LEX_BUILTIN, NOT_OLD|A(0), do_rand},
-{"return", Op_K_return, LEX_RETURN, NOT_OLD, 0},
-{"rshift", Op_builtin, LEX_BUILTIN, GAWKX|A(2), do_rshift},
-{"sin", Op_builtin, LEX_BUILTIN, NOT_OLD|A(1), do_sin},
-{"split", Op_builtin, LEX_BUILTIN, A(2)|A(3)|A(4), do_split},
-{"sprintf", Op_builtin, LEX_BUILTIN, 0, do_sprintf},
-{"sqrt", Op_builtin, LEX_BUILTIN, A(1), do_sqrt},
-{"srand", Op_builtin, LEX_BUILTIN, NOT_OLD|A(0)|A(1), do_srand},
-{"strftime", Op_builtin, LEX_BUILTIN, GAWKX|A(0)|A(1)|A(2)|A(3),
do_strftime},
-{"strtonum", Op_builtin, LEX_BUILTIN, GAWKX|A(1), do_strtonum},
-{"sub", Op_sub_builtin, LEX_BUILTIN, NOT_OLD|A(2)|A(3), 0},
-{"substr", Op_builtin, LEX_BUILTIN, A(2)|A(3), do_substr},
-{"switch", Op_K_switch, LEX_SWITCH, GAWKX|BREAK, 0},
-{"system", Op_builtin, LEX_BUILTIN, NOT_OLD|A(1), do_system},
-{"systime", Op_builtin, LEX_BUILTIN, GAWKX|A(0), do_systime},
-{"tolower", Op_builtin, LEX_BUILTIN, NOT_OLD|A(1), do_tolower},
-{"toupper", Op_builtin, LEX_BUILTIN, NOT_OLD|A(1), do_toupper},
-{"while", Op_K_while, LEX_WHILE, BREAK|CONTINUE, 0},
-{"xor", Op_builtin, LEX_BUILTIN, GAWKX|A(2), do_xor},
+{"asort", Op_builtin, LEX_BUILTIN, GAWKX|A(1)|A(2)|A(3),
do_asort, 0},
+{"asorti", Op_builtin, LEX_BUILTIN, GAWKX|A(1)|A(2)|A(3),
do_asorti, 0},
+{"atan2", Op_builtin, LEX_BUILTIN, NOT_OLD|A(2), do_atan2,
MPF(do_atan2)},
+{"bindtextdomain", Op_builtin, LEX_BUILTIN, GAWKX|A(1)|A(2),
do_bindtextdomain, 0},
+{"break", Op_K_break, LEX_BREAK, 0, 0, 0},
+{"case", Op_K_case, LEX_CASE, GAWKX, 0, 0},
+{"close", Op_builtin, LEX_BUILTIN, NOT_OLD|A(1)|A(2),
do_close, 0},
+{"compl", Op_builtin, LEX_BUILTIN, GAWKX|A(1), do_compl,
MPF(do_compl)},
+{"continue", Op_K_continue, LEX_CONTINUE, 0, 0, 0},
+{"cos", Op_builtin, LEX_BUILTIN, NOT_OLD|A(1), do_cos,
MPF(do_cos)},
+{"dcgettext", Op_builtin, LEX_BUILTIN, GAWKX|A(1)|A(2)|A(3),
do_dcgettext, 0},
+{"dcngettext", Op_builtin, LEX_BUILTIN, GAWKX|A(1)|A(2)|A(3)|A(4)|A(5),
do_dcngettext, 0},
+{"default", Op_K_default, LEX_DEFAULT, GAWKX, 0, 0},
+{"delete", Op_K_delete, LEX_DELETE, NOT_OLD, 0, 0},
+{"do", Op_K_do, LEX_DO, NOT_OLD|BREAK|CONTINUE, 0,
0},
+{"else", Op_K_else, LEX_ELSE, 0, 0, 0},
+{"eval", Op_symbol, LEX_EVAL, 0, 0, 0},
+{"exit", Op_K_exit, LEX_EXIT, 0, 0, 0},
+{"exp", Op_builtin, LEX_BUILTIN, A(1), do_exp,
MPF(do_exp)},
+{"extension", Op_builtin, LEX_BUILTIN, GAWKX|A(2), do_ext, 0},
+{"fflush", Op_builtin, LEX_BUILTIN, RESX|A(0)|A(1), do_fflush,
0},
+{"for", Op_K_for, LEX_FOR, BREAK|CONTINUE, 0,
0},
+{"func", Op_func, LEX_FUNCTION, NOT_POSIX|NOT_OLD, 0, 0},
+{"function",Op_func, LEX_FUNCTION, NOT_OLD, 0, 0},
+{"gensub", Op_sub_builtin, LEX_BUILTIN, GAWKX|A(3)|A(4), 0, 0},
+{"getline", Op_K_getline_redir, LEX_GETLINE, NOT_OLD, 0,
0},
+{"gsub", Op_sub_builtin, LEX_BUILTIN, NOT_OLD|A(2)|A(3), 0, 0},
+{"if", Op_K_if, LEX_IF, 0, 0, 0},
+{"in", Op_symbol, LEX_IN, 0, 0, 0},
+{"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(do_int)},
+{"isarray", Op_builtin, LEX_BUILTIN, GAWKX|A(1), do_isarray,
0},
+{"length", Op_builtin, LEX_LENGTH, A(0)|A(1), do_length,
0},
+{"log", Op_builtin, LEX_BUILTIN, A(1), do_log,
MPF(do_log)},
+{"lshift", Op_builtin, LEX_BUILTIN, GAWKX|A(2), do_lshift,
MPF(do_lshift)},
+{"match", Op_builtin, LEX_BUILTIN, NOT_OLD|A(2)|A(3), do_match,
0},
+{"mktime", Op_builtin, LEX_BUILTIN, GAWKX|A(1), do_mktime,
0},
+{"next", Op_K_next, LEX_NEXT, 0, 0, 0},
+{"nextfile", Op_K_nextfile, LEX_NEXTFILE, GAWKX, 0, 0},
+{"or", Op_builtin, LEX_BUILTIN, GAWKX|A(2), do_or,
MPF(do_or)},
+{"patsplit", Op_builtin, LEX_BUILTIN, GAWKX|A(2)|A(3)|A(4),
do_patsplit, 0},
+{"print", Op_K_print, LEX_PRINT, 0, 0, 0},
+{"printf", Op_K_printf, LEX_PRINTF, 0, 0, 0},
+{"rand", Op_builtin, LEX_BUILTIN, NOT_OLD|A(0), do_rand,
MPF(do_rand)},
+{"return", Op_K_return, LEX_RETURN, NOT_OLD, 0, 0},
+{"rshift", Op_builtin, LEX_BUILTIN, GAWKX|A(2), do_rshift,
MPF(do_rhift)},
+{"sin", Op_builtin, LEX_BUILTIN, NOT_OLD|A(1), do_sin,
MPF(do_sin)},
+{"split", Op_builtin, LEX_BUILTIN, A(2)|A(3)|A(4), do_split,
0},
+{"sprintf", Op_builtin, LEX_BUILTIN, 0, do_sprintf,
0},
+{"sqrt", Op_builtin, LEX_BUILTIN, A(1), do_sqrt,
MPF(do_sqrt)},
+{"srand", Op_builtin, LEX_BUILTIN, NOT_OLD|A(0)|A(1), do_srand,
MPF(do_srand)},
+{"strftime", Op_builtin, LEX_BUILTIN, GAWKX|A(0)|A(1)|A(2)|A(3),
do_strftime, 0},
+{"strtonum", Op_builtin, LEX_BUILTIN, GAWKX|A(1), do_strtonum,
MPF(do_strtonum)},
+{"sub", Op_sub_builtin, LEX_BUILTIN, NOT_OLD|A(2)|A(3), 0,
0},
+{"substr", Op_builtin, LEX_BUILTIN, A(2)|A(3), do_substr,
0},
+{"switch", Op_K_switch, LEX_SWITCH, GAWKX|BREAK, 0, 0},
+{"system", Op_builtin, LEX_BUILTIN, NOT_OLD|A(1), do_system,
0},
+{"systime", Op_builtin, LEX_BUILTIN, GAWKX|A(0), do_systime,
0},
+{"tolower", Op_builtin, LEX_BUILTIN, NOT_OLD|A(1), do_tolower,
0},
+{"toupper", Op_builtin, LEX_BUILTIN, NOT_OLD|A(1), do_toupper,
0},
+{"while", Op_K_while, LEX_WHILE, BREAK|CONTINUE, 0, 0},
+{"xor", Op_builtin, LEX_BUILTIN, GAWKX|A(2), do_xor,
MPF(do_xor)},
};
#if MBS_SUPPORT
@@ -2763,6 +2784,7 @@ yylex(void)
int seen_point = FALSE;
int esc_seen; /* for literal strings */
int mid;
+ int base;
static int did_newline = FALSE;
char *tokkey;
int inhex = FALSE;
@@ -3339,17 +3361,32 @@ retry:
tokadd('\0');
yylval = GET_INSTRUCTION(Op_push_i);
- if (! do_traditional && isnondecimal(tokstart, FALSE)) {
+
+ base = 10;
+ if (! do_traditional) {
+ base = get_numbase(tokstart, FALSE);
if (do_lint) {
- if (isdigit((unsigned char) tokstart[1]))
/* not an 'x' or 'X' */
+ if (base == 8)
lintwarn("numeric constant `%.*s'
treated as octal",
(int) strlen(tokstart)-1,
tokstart);
- else if (tokstart[1] == 'x' || tokstart[1] ==
'X')
+ else if (base == 16)
lintwarn("numeric constant `%.*s'
treated as hexadecimal",
(int) strlen(tokstart)-1,
tokstart);
}
+ }
+
+#ifdef HAVE_MPFR
+ if (do_mpfr) {
+ NODE *r;
+ r = mpfr_node();
+ (void) mpfr_set_str(r->mpfr_numbr, tokstart, base,
RND_MODE);
+ yylval->memory = r;
+ return lasttok = YNUMBER;
+ }
+#endif
+ if (base != 10)
d = nondec2awknum(tokstart, strlen(tokstart));
- } else
+ else
d = atof(tokstart);
yylval->memory = make_number(d);
if (d <= INT32_MAX && d >= INT32_MIN && d == (int32_t) d)
@@ -3635,7 +3672,13 @@ snode(INSTRUCTION *subn, INSTRUCTION *r)
}
}
- r->builtin = tokentab[idx].ptr;
+#ifdef HAVE_MPFR
+ /* N.B.: There isn't any special processing for an alternate function
below */
+ if (do_mpfr && tokentab[idx].ptr2)
+ r->builtin = tokentab[idx].ptr2;
+ else
+#endif
+ r->builtin = tokentab[idx].ptr;
/* special case processing for a few builtins */
@@ -5350,3 +5393,4 @@ one_line_close(int fd)
return ret;
}
+
diff --git a/builtin.c b/builtin.c
index 1da8a4f..0c9553a 100644
--- a/builtin.c
+++ b/builtin.c
@@ -643,6 +643,10 @@ format_tree(
int ii, jj;
char *chp;
size_t copy_count, char_count;
+#ifdef HAVE_MPFR
+ extern mpz_t mpzval; /* initialized in mpfr.c */
+ enum { MPFR_INT_WITH_PREC = 1, MPFR_INT_WITHOUT_PREC, MPFR_FLOAT }
mpfr_fmt_type;
+#endif
static const char sp[] = " ";
static const char zero_string[] = "0";
static const char lchbuf[] = "0123456789abcdef";
@@ -733,6 +737,7 @@ format_tree(
signchar = FALSE;
zero_flag = FALSE;
quote_flag = FALSE;
+
lj = alt = big_flag = bigbig_flag = small_flag = FALSE;
fill = sp;
cp = cend;
@@ -1055,7 +1060,15 @@ out2:
case 'i':
need_format = FALSE;
parse_next_arg();
- tmpval = force_number(arg);
+ (void) force_number(arg);
+
+#ifdef HAVE_MPFR
+ if (arg->flags & MPFN)
+ goto mpfr_int;
+ else
+#endif
+ tmpval = arg->numbr;
+
/*
* Check for Nan or Inf.
*/
@@ -1166,8 +1179,21 @@ out2:
base += 8;
need_format = FALSE;
parse_next_arg();
- tmpval = force_number(arg);
-
+ (void) force_number(arg);
+
+#ifdef HAVE_MPFR
+ if (arg->flags & MPFN) {
+mpfr_int:
+ if (have_prec && prec == 0)
+ zero_flag = FALSE;
+
+ (void) mpfr_get_z(mpzval, arg->mpfr_numbr,
MPFR_RNDZ);
+ mpfr_fmt_type = have_prec ? MPFR_INT_WITH_PREC
: MPFR_INT_WITHOUT_PREC;
+ goto format_int;
+ } else
+#endif
+ tmpval = arg->numbr;
+
/*
* ``The result of converting a zero value with a
* precision of zero is no characters.''
@@ -1289,11 +1315,16 @@ out2:
case 'E':
need_format = FALSE;
parse_next_arg();
- tmpval = force_number(arg);
+ (void) force_number(arg);
format_float:
+ if ((arg->flags & MPFN) == 0)
+ tmpval = arg->numbr;
+ else
+ mpfr_fmt_type = MPFR_FLOAT;
if (! have_prec)
prec = DEFAULT_G_PRECISION;
- chksize(fw + prec + 9); /* 9 == slop */
+ format_int:
+ chksize(fw + prec + 11); /* 11 == slop */
cp = cpbuf;
*cp++ = '%';
if (lj)
@@ -1306,8 +1337,26 @@ out2:
*cp++ = '0';
if (quote_flag)
*cp++ = '\'';
- strcpy(cp, "*.*");
- cp += 3;
+
+#ifdef HAVE_MPFR
+ if (do_mpfr) {
+ if (mpfr_fmt_type == MPFR_INT_WITH_PREC) {
+ strcpy(cp, "*.*Z");
+ cp += 4;
+ } else if (mpfr_fmt_type ==
MPFR_INT_WITHOUT_PREC) {
+ strcpy(cp, "*Z");
+ cp += 2;
+ } else {
+ strcpy(cp, "*.*R*");
+ cp += 5;
+ }
+ } else
+#endif
+ {
+ strcpy(cp, "*.*");
+ cp += 3;
+ }
+
*cp++ = cs1;
*cp = '\0';
#if defined(LC_NUMERIC)
@@ -1316,10 +1365,30 @@ out2:
#endif
{
int n;
- while ((n = snprintf(obufout, ofre, cpbuf,
+#ifdef HAVE_MPFR
+ if (arg->flags & MPFN) {
+ if (mpfr_fmt_type ==
MPFR_INT_WITH_PREC) {
+ while ((n =
mpfr_snprintf(obufout, ofre, cpbuf,
+ (int) fw, (int)
prec, mpzval)) >= ofre)
+ chksize(n)
+ } else if (mpfr_fmt_type ==
MPFR_INT_WITHOUT_PREC) {
+ while ((n =
mpfr_snprintf(obufout, ofre, cpbuf,
+ (int) fw, mpzval))
>= ofre)
+ chksize(n)
+ } else {
+ while ((n =
mpfr_snprintf(obufout, ofre, cpbuf,
+ (int) fw, (int)
prec, RND_MODE,
+ arg->mpfr_numbr))
>= ofre)
+ chksize(n)
+ }
+ } else
+#endif
+ {
+ while ((n = snprintf(obufout, ofre,
cpbuf,
(int) fw, (int) prec,
(double) tmpval)) >= ofre)
- chksize(n)
+ chksize(n)
+ }
}
#if defined(LC_NUMERIC)
if (quote_flag && ! use_lc_numeric)
@@ -1365,6 +1434,7 @@ out:
if (obuf != NULL)
efree(obuf);
}
+
if (r == NULL)
gawk_exit(EXIT_FATAL);
return r;
@@ -2983,7 +3053,7 @@ do_strtonum(int nargs)
tmp = POP_SCALAR();
if ((tmp->flags & (NUMBER|NUMCUR)) != 0)
d = (AWKNUM) force_number(tmp);
- else if (isnondecimal(tmp->stptr, use_lc_numeric))
+ else if (get_numbase(tmp->stptr, use_lc_numeric) != 10)
d = nondec2awknum(tmp->stptr, tmp->stlen);
else
d = (AWKNUM) force_number(tmp);
diff --git a/eval.c b/eval.c
index 78598b2..ffe7bdd 100644
--- a/eval.c
+++ b/eval.c
@@ -437,6 +437,7 @@ flags2str(int flagval)
{ NUMINT, "NUMINT" },
{ INTIND, "INTIND" },
{ WSTRCUR, "WSTRCUR" },
+ { MPFN, "MPFN" },
{ ARRAYMAXED, "ARRAYMAXED" },
{ HALFHAT, "HALFHAT" },
{ XARRAY, "XARRAY" },
@@ -700,6 +701,7 @@ void
set_IGNORECASE()
{
static short warned = FALSE;
+ NODE *n = IGNORECASE_node->var_value;
if ((do_lint || do_traditional) && ! warned) {
warned = TRUE;
@@ -708,17 +710,19 @@ set_IGNORECASE()
load_casetable();
if (do_traditional)
IGNORECASE = FALSE;
- else if ((IGNORECASE_node->var_value->flags & (STRING|STRCUR)) != 0) {
- if ((IGNORECASE_node->var_value->flags & MAYBE_NUM) == 0) {
- IGNORECASE_node->var_value =
force_string(IGNORECASE_node->var_value);
- IGNORECASE = (IGNORECASE_node->var_value->stlen > 0);
- } else
- IGNORECASE = (force_number(IGNORECASE_node->var_value)
!= 0.0);
- } else if ((IGNORECASE_node->var_value->flags & (NUMCUR|NUMBER)) != 0)
- IGNORECASE = (force_number(IGNORECASE_node->var_value) != 0.0);
+ else if ((n->flags & (STRING|STRCUR)) != 0) {
+ if ((n->flags & MAYBE_NUM) == 0) {
+ (void) force_string(n);
+ IGNORECASE = (n->stlen > 0);
+ } else {
+ (void) force_number(n);
+ IGNORECASE = is_nonzero_num(n);
+ }
+ } else if ((n->flags & (NUMCUR|NUMBER)) != 0)
+ IGNORECASE = is_nonzero_num(n);
else
IGNORECASE = FALSE; /* shouldn't happen */
-
+
set_RS(); /* set_RS() calls set_FS() if need be, for us */
}
@@ -729,7 +733,7 @@ set_BINMODE()
{
static short warned = FALSE;
char *p;
- NODE *v;
+ NODE *v = BINMODE_node->var_value;
if ((do_lint || do_traditional) && ! warned) {
warned = TRUE;
@@ -737,8 +741,9 @@ set_BINMODE()
}
if (do_traditional)
BINMODE = 0;
- else if ((BINMODE_node->var_value->flags & NUMBER) != 0) {
- BINMODE = (int) force_number(BINMODE_node->var_value);
+ else if ((v->flags & NUMBER) != 0) {
+ (void) force_number(v);
+ BINMODE = get_number_si(v);
/* Make sure the value is rational. */
if (BINMODE < 0)
BINMODE = 0;
@@ -746,7 +751,6 @@ set_BINMODE()
BINMODE = 3;
}
else if ((BINMODE_node->var_value->flags & STRING) != 0) {
- v = BINMODE_node->var_value;
p = v->stptr;
/*
@@ -922,16 +926,16 @@ set_LINT()
{
#ifndef NO_LINT
int old_lint = do_lint;
+ NODE *n = LINT_node->var_value;
- if ((LINT_node->var_value->flags & (STRING|STRCUR)) != 0) {
- if ((LINT_node->var_value->flags & MAYBE_NUM) == 0) {
+ if ((n->flags & (STRING|STRCUR)) != 0) {
+ if ((n->flags & MAYBE_NUM) == 0) {
const char *lintval;
size_t lintlen;
- NODE *tmp;
- tmp = LINT_node->var_value =
force_string(LINT_node->var_value);
- lintval = tmp->stptr;
- lintlen = tmp->stlen;
+ n = force_string(LINT_node->var_value);
+ lintval = n->stptr;
+ lintlen = n->stlen;
if (lintlen > 0) {
do_flags |= DO_LINT_ALL;
if (lintlen == 5 && strncmp(lintval, "fatal",
5) == 0)
@@ -946,14 +950,16 @@ set_LINT()
lintfunc = warning;
}
} else {
- if (force_number(LINT_node->var_value) != 0.0)
+ (void) force_number(n);
+ if (is_nonzero_num(n))
do_flags |= DO_LINT_ALL;
else
do_flags &= ~(DO_LINT_ALL|DO_LINT_INVALID);
lintfunc = warning;
}
- } else if ((LINT_node->var_value->flags & (NUMCUR|NUMBER)) != 0) {
- if (force_number(LINT_node->var_value) != 0.0)
+ } else if ((n->flags & (NUMCUR|NUMBER)) != 0) {
+ (void) force_number(n);
+ if (is_nonzero_num(n))
do_flags |= DO_LINT_ALL;
else
do_flags &= ~(DO_LINT_ALL|DO_LINT_INVALID);
@@ -1017,7 +1023,10 @@ update_ERRNO()
void
update_NR()
{
- if (NR_node->var_value->numbr != NR) {
+ double d;
+
+ d = get_number_d(NR_node->var_value);
+ if (d != NR) {
unref(NR_node->var_value);
NR_node->var_value = make_number((AWKNUM) NR);
}
@@ -1028,7 +1037,10 @@ update_NR()
void
update_NF()
{
- if (NF == -1 || NF_node->var_value->numbr != NF) {
+ double d;
+
+ d = get_number_d(NF_node->var_value);
+ if (NF == -1 || d != NF) {
if (NF == -1)
(void) get_field(UNLIMITED - 1, NULL); /* parse record
*/
unref(NF_node->var_value);
@@ -1041,7 +1053,10 @@ update_NF()
void
update_FNR()
{
- if (FNR_node->var_value->numbr != FNR) {
+ double d;
+
+ d = get_number_d(FNR_node->var_value);
+ if (d != FNR) {
unref(FNR_node->var_value);
FNR_node->var_value = make_number((AWKNUM) FNR);
}
diff --git a/field.c b/field.c
index 91789d2..1a0f4f4 100644
--- a/field.c
+++ b/field.c
@@ -323,7 +323,8 @@ set_NF()
assert(NF != -1);
- nf = (long) force_number(NF_node->var_value);
+ (void) force_number(NF_node->var_value);
+ nf = get_number_si(NF_node->var_value);
if (nf < 0)
fatal(_("NF set to negative value"));
NF = nf;
diff --git a/io.c b/io.c
index 25f32e2..3eaceb8 100644
--- a/io.c
+++ b/io.c
@@ -233,6 +233,7 @@ extern NODE *ARGIND_node;
extern NODE *ERRNO_node;
extern NODE **fields_arr;
+/* init_io --- set up timeout related variables */
void
init_io()
@@ -340,6 +341,7 @@ nextfile(IOBUF **curfile, int skipping)
int fd = INVALID_HANDLE;
int errcode;
IOBUF *iop = *curfile;
+ long argc;
if (skipping) { /* for 'nextfile' call */
errcode = 0;
@@ -361,7 +363,9 @@ nextfile(IOBUF **curfile, int skipping)
return 0;
}
- for (; i < (long) (ARGC_node->lnode->numbr); i++) {
+ argc = get_number_si(ARGC_node->var_value);
+
+ for (; i < argc; i++) {
tmp = make_number((AWKNUM) i);
(void) force_string(tmp);
arg = in_array(ARGV_node, tmp);
@@ -432,7 +436,8 @@ nextfile(IOBUF **curfile, int skipping)
void
set_FNR()
{
- FNR = (long) FNR_node->var_value->numbr;
+ (void) force_number(FNR_node->var_value);
+ FNR = get_number_si(FNR_node->var_value);
}
/* set_NR --- update internal NR from awk variable */
@@ -440,7 +445,8 @@ set_FNR()
void
set_NR()
{
- NR = (long) NR_node->var_value->numbr;
+ (void) force_number(NR_node->var_value);
+ NR = get_number_si(NR_node->var_value);
}
/* inrec --- This reads in a record from the input file */
@@ -3378,7 +3384,7 @@ get_read_timeout(IOBUF *iop)
if (full_idx == NULL || strcmp(name, last_name) != 0) {
val = in_PROCINFO(name, "READ_TIMEOUT", & full_idx);
if (last_name != NULL)
- efree(last_name);
+ efree((char *) last_name);
last_name = estrdup(name, strlen(name));
} else /* use cached full index */
val = in_array(PROCINFO_node, full_idx);
diff --git a/main.c b/main.c
index 8899db5..a7ebb29 100644
--- a/main.c
+++ b/main.c
@@ -35,6 +35,8 @@
#define DEFAULT_PROFILE "awkprof.out" /* where to put profile
*/
#define DEFAULT_VARFILE "awkvars.out" /* where to put vars */
+#define DEFAULT_PREC 53
+#define DEFAULT_RNDMODE "RNDN"
static const char *varfile = DEFAULT_VARFILE;
const char *command_file = NULL; /* debugger commands */
@@ -55,7 +57,6 @@ static void nostalgia(void) ATTRIBUTE_NORETURN;
static void version(void) ATTRIBUTE_NORETURN;
static void init_fds(void);
static void init_groupset(void);
-
static void save_argv(int, char **);
extern int debug_prog(INSTRUCTION *pc); /* debug.c */
@@ -67,10 +68,16 @@ NODE *ENVIRON_node, *ERRNO_node, *FIELDWIDTHS_node,
*FILENAME_node;
NODE *FNR_node, *FPAT_node, *FS_node, *IGNORECASE_node, *LINT_node;
NODE *NF_node, *NR_node, *OFMT_node, *OFS_node, *ORS_node, *PROCINFO_node;
NODE *RLENGTH_node, *RSTART_node, *RS_node, *RT_node, *SUBSEP_node;
+NODE *PREC_node, *RNDMODE_node;
NODE *TEXTDOMAIN_node;
NODE *_r; /* used as temporary in stack macros */
+#ifdef HAVE_MPFR
+mpfr_prec_t PRECISION = DEFAULT_PREC;
+mpfr_rnd_t RND_MODE = MPFR_RNDN;
+#endif
+
long NF;
long NR;
long FNR;
@@ -184,6 +191,7 @@ static const struct option optab[] = {
{ "use-lc-numeric", no_argument, & use_lc_numeric, 1 },
{ "characters-as-bytes", no_argument, & do_binary, 'b' },
{ "sandbox", no_argument, NULL, 'S' },
+ { "mpfr", no_argument, NULL, 'M' },
#if defined(YYDEBUG) || defined(GAWKDEBUG)
{ "parsedebug", no_argument, NULL, 'Y' },
#endif
@@ -198,9 +206,8 @@ main(int argc, char **argv)
{
/*
* The + on the front tells GNU getopt not to rearrange argv.
- * Note: reserve -l for future use, for xgawk's -l option.
*/
- const char *optlist = "+F:f:v:W;m:bcCd::D::e:E:gh:l:L:nNo::Op::PrStVY";
+ const char *optlist = "+F:f:v:W;m:bcCd::D::e:E:gh:l:L:nNo::Op::MPrStVY";
int stopped_early = FALSE;
int old_optind;
int i;
@@ -442,6 +449,10 @@ main(int argc, char **argv)
set_prof_file(DEFAULT_PROFILE);
break;
+ case 'M':
+ do_flags |= DO_MPFR;
+ break;
+
case 'P':
do_flags |= DO_POSIX;
break;
@@ -558,13 +569,27 @@ out:
}
#endif
+#ifdef HAVE_MPFR
+ if (do_mpfr)
+ init_mpfr(DEFAULT_RNDMODE);
+#endif
+
/* load group set */
init_groupset();
/* initialize the null string */
Nnull_string = make_string("", 0);
- Nnull_string->numbr = 0.0;
- Nnull_string->flags = (MALLOC|STRCUR|STRING|NUMCUR|NUMBER);
+#ifdef HAVE_MPFR
+ if (do_mpfr) {
+ mpfr_init(Nnull_string->mpfr_numbr);
+ mpfr_set_d(Nnull_string->mpfr_numbr, 0.0, RND_MODE);
+ Nnull_string->flags = (MALLOC|STRCUR|STRING|MPFN|NUMCUR|NUMBER);
+ } else
+#endif
+ {
+ Nnull_string->numbr = 0.0;
+ Nnull_string->flags = (MALLOC|STRCUR|STRING|NUMCUR|NUMBER);
+ }
/*
* Tell the regex routines how they should work.
@@ -756,6 +781,7 @@ usage(int exitval, FILE *fp)
fputs(_("\t-l library\t\t--load=library\n"), fp);
fputs(_("\t-L [fatal]\t\t--lint[=fatal]\n"), fp);
fputs(_("\t-n\t\t\t--non-decimal-data\n"), fp);
+ fputs(_("\t-M\t\t\t--mpfr\n"), fp);
fputs(_("\t-N\t\t\t--use-lc-numeric\n"), fp);
fputs(_("\t-o[file]\t\t--pretty-print[=file]\n"), fp);
fputs(_("\t-O\t\t\t--optimize\n"), fp);
@@ -930,6 +956,9 @@ static const struct varinit varinit[] = {
{&FPAT_node, "FPAT", "[^[:space:]]+", 0, NULL, set_FPAT, FALSE,
NON_STANDARD },
{&IGNORECASE_node, "IGNORECASE", NULL, 0, NULL, set_IGNORECASE, FALSE,
NON_STANDARD },
{&LINT_node, "LINT", NULL, 0, NULL, set_LINT, FALSE,
NON_STANDARD },
+#ifdef HAVE_MPFR
+{&PREC_node, "PREC", NULL, DEFAULT_PREC, NULL, set_PREC,
FALSE, NON_STANDARD},
+#endif
{&NF_node, "NF", NULL, -1, update_NF, set_NF, FALSE, 0 },
{&NR_node, "NR", NULL, 0, update_NR, set_NR, TRUE, 0 },
{&OFMT_node, "OFMT", "%.6g", 0, NULL, set_OFMT, TRUE, 0 },
@@ -937,6 +966,9 @@ static const struct varinit varinit[] = {
{&ORS_node, "ORS", "\n", 0, NULL, set_ORS, TRUE, 0 },
{NULL, "PROCINFO", NULL, 0, NULL, NULL, FALSE, NO_INSTALL |
NON_STANDARD },
{&RLENGTH_node, "RLENGTH", NULL, 0, NULL, NULL, FALSE, 0 },
+#ifdef HAVE_MPFR
+{&RNDMODE_node, "RNDMODE", DEFAULT_RNDMODE, 0, NULL, set_RNDMODE,
FALSE, NON_STANDARD },
+#endif
{&RS_node, "RS", "\n", 0, NULL, set_RS, TRUE, 0 },
{&RSTART_node, "RSTART", NULL, 0, NULL, NULL, FALSE, 0 },
{&RT_node, "RT", "", 0, NULL, NULL, FALSE, NON_STANDARD },
@@ -957,8 +989,10 @@ init_vars()
if ((vp->flags & NO_INSTALL) != 0)
continue;
n = *(vp->spec) = install_symbol(estrdup(vp->name,
strlen(vp->name)), Node_var);
- n->var_value = vp->strval == NULL ? make_number(vp->numval)
- :
make_string(vp->strval, strlen(vp->strval));
+ if (vp->strval != NULL)
+ n->var_value = make_string(vp->strval,
strlen(vp->strval));
+ else
+ n->var_value = make_number(vp->numval);
n->var_assign = (Func_ptr) vp->assign;
n->var_update = (Func_ptr) vp->update;
if (vp->do_assign)
diff --git a/mpfr.c b/mpfr.c
new file mode 100644
index 0000000..677bdcd
--- /dev/null
+++ b/mpfr.c
@@ -0,0 +1,585 @@
+/*
+ * mpfr.c - routines for MPFR number support in gawk.
+ */
+
+/*
+ * Copyright (C) 1986, 1988, 1989, 1991-2012 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 3 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA
+ */
+
+#include "awk.h"
+
+#ifdef HAVE_MPFR
+
+#ifndef mp_bitcnt_t
+#define mp_bitcnt_t unsigned long
+#endif
+
+#define POP_TWO_SCALARS(s1, s2) \
+s2 = POP_SCALAR(); \
+s1 = POP(); \
+do { if (s1->type == Node_var_array) { \
+DEREF(s2); \
+fatal(_("attempt to use array `%s' in a scalar context"), array_vname(s1)); \
+}} while (FALSE)
+
+mpz_t mpzval; /* GMP integer type; used as temporary in many places */
+
+static mpfr_rnd_t mpfr_rnd_mode(const char *mode, size_t mode_len);
+
+
+/* init_mpfr --- set up MPFR related variables */
+
+void
+init_mpfr(const char *rnd_mode)
+{
+ mpfr_set_default_prec(PRECISION);
+ RND_MODE = mpfr_rnd_mode(rnd_mode, strlen(rnd_mode));
+ mpfr_set_default_rounding_mode(RND_MODE);
+ make_number = make_mpfr_number;
+ m_force_number = force_mpfr_number;
+ mpz_init(mpzval);
+}
+
+/* mpfr_node --- allocate a node to store a MPFR number */
+
+NODE *
+mpfr_node()
+{
+ NODE *r;
+ getnode(r);
+ r->type = Node_val;
+ mpfr_init(r->mpfr_numbr);
+ r->valref = 1;
+ r->flags = MALLOC|MPFN|NUMBER|NUMCUR;
+ r->stptr = NULL;
+ r->stlen = 0;
+#if MBS_SUPPORT
+ r->wstptr = NULL;
+ r->wstlen = 0;
+#endif /* defined MBS_SUPPORT */
+ return r;
+}
+
+/* mpfr_make_number --- make a MPFR number node and initialize with a double */
+
+NODE *
+make_mpfr_number(double x)
+{
+ NODE *r;
+ r = mpfr_node();
+ mpfr_set_d(r->mpfr_numbr, x, RND_MODE);
+ return r;
+}
+
+/* mpfr_force_number --- force a value to be a MPFR number */
+
+AWKNUM
+force_mpfr_number(NODE *n)
+{
+ char *cp, *cpend, *ptr;
+ char save;
+ int base = 10;
+ unsigned int newflags = 0;
+
+ if ((n->flags & (MPFN|NUMCUR)) == (MPFN|NUMCUR))
+ return 0;
+
+ if (n->flags & MAYBE_NUM) {
+ n->flags &= ~MAYBE_NUM;
+ newflags = NUMBER;
+ }
+
+ if ((n->flags & MPFN) == 0) {
+ n->flags |= MPFN;
+ mpfr_init(n->mpfr_numbr);
+ }
+
+ mpfr_set_d(n->mpfr_numbr, 0.0, RND_MODE); /* initialize to 0.0 */
+
+ if (n->stlen == 0)
+ return 0;
+
+ cp = n->stptr;
+ cpend = n->stptr + n->stlen;
+ while (cp < cpend && isspace((unsigned char) *cp))
+ cp++;
+ if (cp == cpend) /* only spaces */
+ return 0;
+
+ save = *cpend;
+ *cpend = '\0';
+
+ if (do_non_decimal_data && ! do_traditional)
+ base = get_numbase(cp, TRUE);
+
+ errno = 0;
+ (void) mpfr_strtofr(n->mpfr_numbr, cp, & ptr, base, RND_MODE);
+
+ /* trailing space is OK for NUMBER */
+ while (isspace((unsigned char) *ptr))
+ ptr++;
+ *cpend = save;
+ if (errno == 0 && ptr == cpend) {
+ n->flags |= newflags;
+ n->flags |= NUMCUR;
+ }
+ errno = 0;
+ return 0;
+}
+
+/* set_PREC --- update MPFR PRECISION related variables when PREC assigned to
*/
+
+void
+set_PREC()
+{
+ if (do_mpfr) {
+ long l;
+ NODE *val = PREC_node->var_value;
+
+ l = (long) force_number(val);
+ if ((val->flags & MPFN) != 0)
+ l = mpfr_get_si(val->mpfr_numbr, RND_MODE);
+
+ if (l >= MPFR_PREC_MIN && l <= MPFR_PREC_MAX) {
+ mpfr_set_default_prec(l);
+ PRECISION = mpfr_get_default_prec();
+ } else
+ warning(_("Invalid PREC value: %ld"), l);
+ }
+}
+
+/* mpfr_rnd_mode --- convert string to MPFR rounding mode */
+
+static mpfr_rnd_t
+mpfr_rnd_mode(const char *mode, size_t mode_len)
+{
+ if (mode_len != 4 || strncmp(mode, "RND", 3) != 0)
+ return -1;
+
+ switch (mode[3]) {
+ case 'N':
+ return MPFR_RNDN;
+ case 'Z':
+ return MPFR_RNDZ;
+ case 'U':
+ return MPFR_RNDU;
+ case 'D':
+ return MPFR_RNDD;
+#ifdef MPFR_RNDA
+ case 'A':
+ return MPFR_RNDA;
+#endif
+ default:
+ break;
+ }
+ return -1;
+}
+
+/* set_RNDMODE --- update MPFR rounding mode related variables when RNDMODE
assigned to */
+
+void
+set_RNDMODE()
+{
+ if (do_mpfr) {
+ mpfr_rnd_t rnd;
+ NODE *n;
+ n = force_string( RNDMODE_node->var_value);
+ rnd = mpfr_rnd_mode(n->stptr, n->stlen);
+ if (rnd != -1) {
+ mpfr_set_default_rounding_mode(rnd);
+ RND_MODE = rnd;
+ } else
+ warning(_("Invalid value for RNDMODE: `%s'"), n->stptr);
+ }
+}
+
+
+/* do_and_mpfr --- perform an & operation */
+
+NODE *
+do_and_mpfr(int nargs)
+{
+ NODE *t1, *t2;
+
+ POP_TWO_SCALARS(t1, t2);
+
+ DEREF(t1);
+ DEREF(t2);
+ return dupnode(Nnull_string);
+}
+
+/* do_atan2 --- do the atan2 function */
+
+NODE *
+do_atan2_mpfr(int nargs)
+{
+ NODE *t1, *t2;
+
+ POP_TWO_SCALARS(t1, t2);
+
+ DEREF(t1);
+ DEREF(t2);
+ return dupnode(Nnull_string);
+}
+
+
+/* do_compl --- perform a ~ operation */
+
+NODE *
+do_compl_mpfr(int nargs)
+{
+ NODE *tmp;
+
+ tmp = POP_SCALAR();
+
+ DEREF(tmp);
+ return dupnode(Nnull_string);
+}
+
+/* do_cos --- do the cos function */
+
+NODE *
+do_cos_mpfr(int nargs)
+{
+ NODE *tmp;
+
+ tmp = POP_SCALAR();
+
+ DEREF(tmp);
+ return dupnode(Nnull_string);
+}
+
+/* do_exp --- exponential function */
+
+NODE *
+do_exp_mpfr(int nargs)
+{
+ NODE *tmp;
+
+ tmp = POP_SCALAR();
+
+ DEREF(tmp);
+ return dupnode(Nnull_string);
+}
+
+/* do_int --- convert double to int for awk */
+
+NODE *
+do_int_mpfr(int nargs)
+{
+ NODE *tmp;
+
+ tmp = POP_SCALAR();
+
+ DEREF(tmp);
+ return dupnode(Nnull_string);
+}
+
+/* do_log --- the log function */
+
+NODE *
+do_log_mpfr(int nargs)
+{
+ NODE *tmp;
+
+ tmp = POP_SCALAR();
+
+ DEREF(tmp);
+ return dupnode(Nnull_string);
+}
+
+
+/* do_lshift --- perform a << operation */
+
+/*
+ * Test:
+ * $ ./gawk 'BEGIN { print lshift(1, 52) }'
+ * 4503599627370496
+ * $ ./gawk 'BEGIN { print lshift(1, 53) }'
+ * 0
+ * $ ./gawk -M 'BEGIN { print lshift(1, 53) }'
+ * 9007199254740992
+ */
+
+NODE *
+do_lshift_mpfr(int nargs)
+{
+ NODE *t1, *t2, *res;
+ mpfr_ptr left, right;
+ mp_bitcnt_t shift;
+
+ POP_TWO_SCALARS(t1, t2);
+ if (do_lint) {
+ if ((t1->flags & (NUMCUR|NUMBER)) == 0)
+ lintwarn(_("lshift: received non-numeric first
argument"));
+ if ((t2->flags & (NUMCUR|NUMBER)) == 0)
+ lintwarn(_("lshift: received non-numeric second
argument"));
+ }
+
+ (void) force_number(t1);
+ (void) force_number(t2);
+
+ assert((t1->flags & MPFN) != 0);
+ assert((t2->flags & MPFN) != 0);
+
+ left = t1->mpfr_numbr;
+ right = t2->mpfr_numbr; /* shift */
+
+ if (! mpfr_number_p(left)) {
+ /* [+-]inf or NaN */
+ res = dupnode(t1);
+ goto finish;
+ }
+
+ if (! mpfr_number_p(right)) {
+ /* [+-]inf or NaN */
+ res = dupnode(t2);
+ goto finish;
+ }
+
+ if (do_lint) {
+ char *tmp = NULL;
+ if (mpfr_signbit(left) || mpfr_signbit(right)) {
+ (void) mpfr_asprintf(& tmp,
+ _("lshift(%Rg, %Rg): negative values will give
strange results"), left, right);
+ if (tmp != NULL) {
+ lintwarn("%s", tmp);
+ mpfr_free_str(tmp);
+ tmp = NULL;
+ }
+ }
+ if (! mpfr_integer_p(left) || ! mpfr_integer_p(right)) {
+ (void) mpfr_asprintf(& tmp,
+ _("lshift(%Rg, %Rg): fractional values will be
truncated"), left, right);
+ if (tmp != NULL) {
+ lintwarn("%s", tmp);
+ mpfr_free_str(tmp);
+ }
+ }
+ }
+
+ (void) mpfr_get_z(mpzval, left, MPFR_RNDZ); /* mpfr_t (float) =>
mpz_t (integer) conversion */
+ shift = mpfr_get_ui(right, MPFR_RNDZ); /* mpfr_t (float) =>
unsigned long conversion */
+ mpz_mul_2exp(mpzval, mpzval, shift); /* mpzval = mpzval *
2^shift */
+
+ res = mpfr_node();
+ (void) mpfr_set_z(res->mpfr_numbr, mpzval, RND_MODE); /* mpz_t =>
mpfr_t conversion */
+
+finish:
+ DEREF(t1);
+ DEREF(t2);
+ return res;
+}
+
+
+/* do_or --- perform an | operation */
+
+NODE *
+do_or_mpfr(int nargs)
+{
+ NODE *s1, *s2;
+
+ POP_TWO_SCALARS(s1, s2);
+
+ DEREF(s1);
+ DEREF(s2);
+ return dupnode(Nnull_string);
+}
+
+/* do_rand --- do the rand function */
+
+NODE *
+do_rand_mpfr(int nargs ATTRIBUTE_UNUSED)
+{
+ return dupnode(Nnull_string);
+}
+
+
+/* do_rshift --- perform a >> operation */
+
+/*
+ * $ ./gawk 'BEGIN { print rshift(0xFFFF, 1)}'
+ * 32767
+ * $ ./gawk -M 'BEGIN { print rshift(0xFFFF, 1)}'
+ * 32767
+ * $ ./gawk 'BEGIN { print rshift(-0xFFFF, 1)}'
+ * 9007199254708224
+ * $ ./gawk -M 'BEGIN { print rshift(-0xFFFF, 1) }'
+ * -32768
+ *
+ * $ ./gawk 'BEGIN { print rshift(lshift(123456789012345678, 45), 45)}'
+ * 80
+ * $ ./gawk -M 'BEGIN { print rshift(lshift(123456789012345678, 45), 45)}'
+ * 123456789012345680
+ * $ ./gawk -M -vPREC=80 'BEGIN { print rshift(lshift(123456789012345678, 45),
45)}'
+ * 123456789012345678
+ *
+ * $ ./gawk -M 'BEGIN { print rshift(lshift(1, 999999999), 999999999)}'
+ * 1
+ * $ ./gawk -M 'BEGIN { print rshift(lshift(1, 9999999999), 9999999999)}'
+ * gmp: overflow in mpz type
+ * Aborted
+ */
+
+NODE *
+do_rhift_mpfr(int nargs)
+{
+ NODE *t1, *t2, *res;
+ mpfr_ptr left, right;
+ mp_bitcnt_t shift;
+
+ POP_TWO_SCALARS(t1, t2);
+ if (do_lint) {
+ if ((t1->flags & (NUMCUR|NUMBER)) == 0)
+ lintwarn(_("rshift: received non-numeric first
argument"));
+ if ((t2->flags & (NUMCUR|NUMBER)) == 0)
+ lintwarn(_("rshift: received non-numeric second
argument"));
+ }
+
+ (void) force_number(t1);
+ (void) force_number(t2);
+
+ assert((t1->flags & MPFN) != 0);
+ assert((t2->flags & MPFN) != 0);
+
+ left = t1->mpfr_numbr;
+ right = t2->mpfr_numbr; /* shift */
+
+ if (! mpfr_number_p(left)) {
+ /* [+-]inf or NaN */
+ res = dupnode(t1);
+ goto finish;
+ }
+
+ if (! mpfr_number_p(right)) {
+ /* [+-]inf or NaN */
+ res = dupnode(t2);
+ goto finish;
+ }
+
+ if (do_lint) {
+ char *tmp = NULL;
+ if (mpfr_signbit(left) || mpfr_signbit(right)) {
+ (void) mpfr_asprintf(& tmp,
+ _("rshift(%Rg, %Rg): negative values will give
strange results"), left, right);
+ if (tmp != NULL) {
+ lintwarn("%s", tmp);
+ mpfr_free_str(tmp);
+ tmp = NULL;
+ }
+ }
+
+ if (! mpfr_integer_p(left) || ! mpfr_integer_p(right)) {
+ (void) mpfr_asprintf(& tmp,
+ _("rshift(%Rg, %Rg): fractional values will be
truncated"), left, right);
+ if (tmp != NULL) {
+ lintwarn("%s", tmp);
+ mpfr_free_str(tmp);
+ }
+ }
+ }
+
+ (void) mpfr_get_z(mpzval, left, MPFR_RNDZ); /* mpfr_t (float) =>
mpz_t (integer) conversion */
+ shift = mpfr_get_ui(right, MPFR_RNDZ); /* mpfr_t (float) =>
unsigned long conversion */
+ mpz_fdiv_q_2exp(mpzval, mpzval, shift); /* mpzval = mpzval /
2^shift, round towards âinf */
+
+ res = mpfr_node();
+ (void) mpfr_set_z(res->mpfr_numbr, mpzval, RND_MODE); /* mpz_t =>
mpfr_t conversion */
+
+finish:
+ DEREF(t1);
+ DEREF(t2);
+ return res;
+}
+
+
+/* do_sin --- do the sin function */
+
+NODE *
+do_sin_mpfr(int nargs)
+{
+ NODE *tmp;
+
+ tmp = POP_SCALAR();
+
+ DEREF(tmp);
+ return dupnode(Nnull_string);
+}
+
+/* do_sqrt --- do the sqrt function */
+
+NODE *
+do_sqrt_mpfr(int nargs)
+{
+ NODE *tmp;
+
+ tmp = POP_SCALAR();
+
+ DEREF(tmp);
+ return dupnode(Nnull_string);
+}
+
+/* do_srand --- seed the random number generator */
+
+NODE *
+do_srand_mpfr(int nargs)
+{
+ NODE *tmp;
+
+ if (nargs == 0)
+ ;
+ else {
+ tmp = POP_SCALAR();
+ DEREF(tmp);
+ }
+
+ return dupnode(Nnull_string);
+}
+
+/* do_strtonum --- the strtonum function */
+
+NODE *
+do_strtonum_mpfr(int nargs)
+{
+ NODE *tmp;
+
+ tmp = POP_SCALAR();
+ DEREF(tmp);
+
+ return dupnode(Nnull_string);
+}
+
+
+/* do_xor --- perform an ^ operation */
+
+NODE *
+do_xor_mpfr(int nargs)
+{
+ NODE *s1, *s2;
+
+ POP_TWO_SCALARS(s1, s2);
+
+ DEREF(s1);
+ DEREF(s2);
+ return dupnode(Nnull_string);
+}
+
+#endif
+
diff --git a/node.c b/node.c
index 73d3ec4..e917da0 100644
--- a/node.c
+++ b/node.c
@@ -31,6 +31,8 @@ static int is_ieee_magic_val(const char *val);
static AWKNUM get_ieee_magic_val(const char *val);
extern NODE **fmt_list; /* declared in eval.c */
+NODE *(*make_number)(AWKNUM ) = r_make_number;
+AWKNUM (*m_force_number)(NODE *) = r_force_number;
/* force_number --- force a value to be numeric */
@@ -114,7 +116,7 @@ r_force_number(NODE *n)
if (do_non_decimal_data) { /* main.c assures false if do_posix */
errno = 0;
- if (! do_traditional && isnondecimal(cp, TRUE)) {
+ if (! do_traditional && get_numbase(cp, TRUE) != 10) {
n->numbr = nondec2awknum(cp, cpend - cp);
n->flags |= NUMCUR;
ptr = cpend;
@@ -189,8 +191,13 @@ format_val(const char *format, int index, NODE *s)
*/
/* not an integral value, or out of range */
- if ((val = double_to_int(s->numbr)) != s->numbr
- || val <= LONG_MIN || val >= LONG_MAX) {
+ if (
+#ifdef HAVE_MPFR
+ (s->flags & MPFN) != 0 ||
+#endif
+ (val = double_to_int(s->numbr)) != s->numbr
+ || val <= LONG_MIN || val >= LONG_MAX
+ ) {
/*
* Once upon a time, we just blindly did this:
* sprintf(sp, format, s->numbr);
@@ -206,7 +213,13 @@ format_val(const char *format, int index, NODE *s)
/* create dummy node for a sole use of format_tree */
dummy[1] = s;
oflags = s->flags;
- if (val == s->numbr) {
+
+ if (
+#ifdef HAVE_MPFR
+ ((s->flags & MPFN) != 0 &&
mpfr_integer_p(s->mpfr_numbr)) ||
+#endif
+ ((s->flags & MPFN) == 0 && val == s->numbr)
+ ) {
/* integral value, but outside range of %ld, use %.0f */
r = format_tree("%.0f", 4, dummy, 2);
s->stfmt = -1;
@@ -319,14 +332,14 @@ r_dupnode(NODE *n)
/* make_number --- allocate a node with defined number */
NODE *
-make_number(AWKNUM x)
+r_make_number(AWKNUM x)
{
NODE *r;
getnode(r);
r->type = Node_val;
r->numbr = x;
- r->valref = 1;
r->flags = MALLOC|NUMBER|NUMCUR;
+ r->valref = 1;
r->stptr = NULL;
r->stlen = 0;
#if MBS_SUPPORT
@@ -437,6 +450,11 @@ r_unref(NODE *tmp)
efree(tmp->stptr);
#endif
+#ifdef HAVE_MPFR
+ if ((tmp->flags & MPFN) != 0)
+ mpfr_clear(tmp->mpfr_numbr);
+#endif
+
free_wstr(tmp);
freenode(tmp);
}
@@ -577,12 +595,14 @@ parse_escape(const char **string_ptr)
}
}
-/* isnondecimal --- return true if number is not a decimal number */
+/* get_numbase --- return the base to use for the number in 's' */
int
-isnondecimal(const char *str, int use_locale)
+get_numbase(const char *s, int use_locale)
{
int dec_point = '.';
+ const char *str = s;
+
#if defined(HAVE_LOCALE_H)
/*
* loc.decimal_point may not have been initialized yet,
@@ -593,11 +613,11 @@ isnondecimal(const char *str, int use_locale)
#endif
if (str[0] != '0')
- return FALSE;
+ return 10;
/* leading 0x or 0X */
if (str[1] == 'x' || str[1] == 'X')
- return TRUE;
+ return 16;
/*
* Numbers with '.', 'e', or 'E' are decimal.
@@ -607,12 +627,16 @@ isnondecimal(const char *str, int use_locale)
*/
for (; *str != '\0'; str++) {
if (*str == 'e' || *str == 'E' || *str == dec_point)
- return FALSE;
+ return 10;
else if (! isdigit((unsigned char) *str))
break;
}
- return TRUE;
+ if (! isdigit((unsigned char) s[1])
+ || s[1] == '8' || s[1] == '9'
+ )
+ return 10;
+ return 8;
}
#if MBS_SUPPORT
diff --git a/test/badargs.ok b/test/badargs.ok
index cb14016..b7bbff0 100644
--- a/test/badargs.ok
+++ b/test/badargs.ok
@@ -18,6 +18,7 @@ Short options: GNU long options: (extensions)
-l library --load=library
-L [fatal] --lint[=fatal]
-n --non-decimal-data
+ -M --mpfr
-N --use-lc-numeric
-o[file] --pretty-print[=file]
-O --optimize
diff --git a/test/dumpvars.ok b/test/dumpvars.ok
index 01d5fb7..aa49388 100644
--- a/test/dumpvars.ok
+++ b/test/dumpvars.ok
@@ -16,7 +16,9 @@ NR: 3
OFMT: "%.6g"
OFS: " "
ORS: "\n"
+PREC: 53
RLENGTH: 0
+RNDMODE: "RNDN"
RS: "\n"
RSTART: 0
RT: "\n"
-----------------------------------------------------------------------
hooks/post-receive
--
gawk
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gawk-diffs] [SCM] gawk branch, gawk_mpfr, created. 06a6f16495e2a3d0cb664fc473107d3cdbe6f11e,
John Haque <=