Merge branch 'master' into array-iface

1 files changed, 47 insertions, 35 deletions

diff --git a/eval.c b/eval.c
index dc491943..2cf22129 100644
--- a/eval.c
+++ b/eval.c
@@ -33,7 +33,7 @@ NODE **fcall_list = NULL;
 long fcall_count = 0;
 int currule = 0;
 IOBUF *curfile = NULL;		/* current data file */
-int exiting = FALSE;
+bool exiting = false;
 
 int (*interpret)(INSTRUCTION *);
 #define MAX_EXEC_HOOKS	10
@@ -43,9 +43,7 @@ static Func_post_exec post_execute = NULL;
 
 extern void frame_popped();
 
-#if __GNUC__ < 2
 NODE *_t;		/* used as a temporary in macros */
-#endif
 int OFSlen;
 int ORSlen;
 int OFMTidx;
@@ -206,12 +204,12 @@ load_casetable(void)
 #if defined(LC_CTYPE)
 	int i;
 	char *cp;
-	static int loaded = FALSE;
+	static bool loaded = false;
 
 	if (loaded || do_traditional)
 		return;
 
-	loaded = TRUE;
+	loaded = true;
 	cp = setlocale(LC_CTYPE, NULL);
 
 	/* this is not per standard, but it's pretty safe */
@@ -243,7 +241,6 @@ static const char *const nodetypes[] = {
 	"Node_param_list",
 	"Node_func",
 	"Node_ext_func",
-	"Node_hashnode",
 	"Node_array_ref",
 	"Node_array_tree",
 	"Node_array_leaf",
@@ -697,16 +694,16 @@ dump_fcall_stack(FILE *fp)
 void
 set_IGNORECASE()
 {
-	static short warned = FALSE;
+	static bool warned = false;
 	NODE *n = IGNORECASE_node->var_value;
 
 	if ((do_lint || do_traditional) && ! warned) {
-		warned = TRUE;
+		warned = true;
 		lintwarn(_("`IGNORECASE' is a gawk extension"));
 	}
 	load_casetable();
 	if (do_traditional)
-		IGNORECASE = FALSE;
+		IGNORECASE = false;
 	else if ((n->flags & (STRING|STRCUR)) != 0) {
 		if ((n->flags & MAYBE_NUM) == 0) {
 			(void) force_string(n);
@@ -718,7 +715,7 @@ set_IGNORECASE()
 	} else if ((n->flags & (NUMCUR|NUMBER)) != 0)
 		IGNORECASE = ! iszero(n);
 	else
-		IGNORECASE = FALSE;		/* shouldn't happen */
+		IGNORECASE = false;		/* shouldn't happen */
                  
 	set_RS();	/* set_RS() calls set_FS() if need be, for us */
 }
@@ -728,12 +725,12 @@ set_IGNORECASE()
 void
 set_BINMODE()
 {
-	static short warned = FALSE;
+	static bool warned = false;
 	char *p;
 	NODE *v = BINMODE_node->var_value;
 
 	if ((do_lint || do_traditional) && ! warned) {
-		warned = TRUE;
+		warned = true;
 		lintwarn(_("`BINMODE' is a gawk extension"));
 	}
 	if (do_traditional)
@@ -968,6 +965,9 @@ set_LINT()
 	/* explicitly use warning() here, in case lintfunc == r_fatal */
 	if (old_lint != do_lint && old_lint && ! do_lint)
 		warning(_("turning off `--lint' due to assignment to `LINT'"));
+
+	/* inform plug-in api of change */
+	update_ext_api();
 #endif /* ! NO_LINT */
 }
 
@@ -989,10 +989,10 @@ set_TEXTDOMAIN()
 	 */
 }
 
-/* update_ERRNO_saved --- update the value of ERRNO based on argument */
+/* update_ERRNO_int --- update the value of ERRNO based on argument */
 
 void
-update_ERRNO_saved(int errcode)
+update_ERRNO_int(int errcode)
 {
 	char *cp;
 
@@ -1005,12 +1005,22 @@ update_ERRNO_saved(int errcode)
 	ERRNO_node->var_value = make_string(cp, strlen(cp));
 }
 
-/* update_ERRNO --- update the value of ERRNO based on errno */
+/* update_ERRNO_string --- update ERRNO */
 
 void
-update_ERRNO()
+update_ERRNO_string(const char *string)
 {
-	update_ERRNO_saved(errno);
+	unref(ERRNO_node->var_value);
+	ERRNO_node->var_value = make_string(string, strlen(string));
+}
+
+/* unset_ERRNO --- eliminate the value of ERRNO */
+
+void
+unset_ERRNO(void)
+{
+	unref(ERRNO_node->var_value);
+	ERRNO_node->var_value = dupnode(Nnull_string);
 }
 
 /* update_NR --- update the value of NR */
@@ -1096,12 +1106,12 @@ grow_stack()
  */
 
 NODE **
-r_get_lhs(NODE *n, int reference)
+r_get_lhs(NODE *n, bool reference)
 {
-	int isparam = FALSE;
+	bool isparam = false;
 
 	if (n->type == Node_param_list) {
-		isparam = TRUE;
+		isparam = true;
 		n = GET_PARAM(n->param_cnt);
 	}
 
@@ -1140,7 +1150,7 @@ r_get_lhs(NODE *n, int reference)
 /* r_get_field --- get the address of a field node */
  
 static inline NODE **
-r_get_field(NODE *n, Func_ptr *assign, int reference)
+r_get_field(NODE *n, Func_ptr *assign, bool reference)
 {
 	long field_num;
 	NODE **lhs;
@@ -1219,7 +1229,7 @@ setup_frame(INSTRUCTION *pc)
 	NODE *m, *f, *fp;
 	NODE **sp = NULL;
 	int pcount, arg_count, i, j;
-	int tail_optimize = FALSE;
+	bool tail_optimize = false;
 
 	f = pc->func_body;
 	pcount = f->param_cnt;
@@ -1479,14 +1489,16 @@ unwind_stack(long n)
 static inline int
 eval_condition(NODE *t)
 {
-	if (t == node_Boolean[FALSE])
-		return FALSE;
+	if (t == node_Boolean[false])
+		return false;
 
-	if (t == node_Boolean[TRUE])
-		return TRUE;
+	if (t == node_Boolean[true])
+		return true;
 
 	if ((t->flags & MAYBE_NUM) != 0)
 		force_number(t);
+	else if ((t->flags & INTIND) != 0)
+		force_string(t);
 
 	if ((t->flags & NUMBER) != 0)
 		return ! iszero(t);
@@ -1688,10 +1700,10 @@ register_exec_hook(Func_pre_exec preh, Func_post_exec posth)
 	 */ 
 
 	if (! preh || (post_execute && posth))
-		return FALSE;
+		return false;
 
 	if (num_exec_hook == MAX_EXEC_HOOKS)
-		return FALSE;
+		return false;
 
 	/*
 	 * Add to the beginning of the array but do not displace the
@@ -1709,7 +1721,7 @@ register_exec_hook(Func_pre_exec preh, Func_post_exec posth)
 	if (posth)
 		post_execute = posth;
 
-	return TRUE;
+	return true;
 }
 
 
@@ -1744,12 +1756,12 @@ init_interpret()
 	frame_ptr->num_tail_calls = 0;
 	frame_ptr->vname = NULL;
 
-	/* initialize TRUE and FALSE nodes */
-	node_Boolean[FALSE] = make_number(0.0);
-	node_Boolean[TRUE] = make_number(1.0);
-	if (! is_mpg_number(node_Boolean[FALSE])) {
-		node_Boolean[FALSE]->flags |= NUMINT;
-		node_Boolean[TRUE]->flags |= NUMINT;
+	/* initialize true and false nodes */
+	node_Boolean[false] = make_number(0.0);
+	node_Boolean[true] = make_number(1.0);
+	if (! is_mpg_number(node_Boolean[false])) {
+		node_Boolean[false]->flags |= NUMINT;
+		node_Boolean[true]->flags |= NUMINT;
 	}
 
 	/*