aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--eval.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bde19e1c..5b063174 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2011-07-26 John Haque <j.eh@mchsi.com>
+ * eval.c (r_interpret): In cases Op_var_assign and Op_field_assign,
+ include Op_K_getline_redir in the test for skipping the routine.
+
+2011-07-26 John Haque <j.eh@mchsi.com>
+
Fix handling of assign routines for 'getline var'.
Rework the previous fix for (g)sub.
diff --git a/eval.c b/eval.c
index bd3e0270..ea45efd9 100644
--- a/eval.c
+++ b/eval.c
@@ -2125,7 +2125,8 @@ post:
*/
break;
- } else if (pc->assign_ctxt == Op_K_getline
+ } else if ((pc->assign_ctxt == Op_K_getline
+ || pc->assign_ctxt == Op_K_getline_redir)
&& TOP()->numbr <= 0.0 /* top of stack has a number <= 0 */
) {
/* getline returned EOF or error */