[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU M4 source repository branch, branch-1.6, updated. v1.5.89a-19-
From: |
Eric Blake |
Subject: |
[SCM] GNU M4 source repository branch, branch-1.6, updated. v1.5.89a-19-gc8a2c29 |
Date: |
Wed, 07 May 2008 17:17:51 +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 "GNU M4 source repository".
http://git.sv.gnu.org/gitweb/?p=m4.git;a=commitdiff;h=c8a2c296df00c2e8b1b3b0372cea10d0d0a0b621
The branch, branch-1.6 has been updated
via c8a2c296df00c2e8b1b3b0372cea10d0d0a0b621 (commit)
from 50fabc46c235da6682f1bd76b1b43151e147c7bc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c8a2c296df00c2e8b1b3b0372cea10d0d0a0b621
Author: Eric Blake <address@hidden>
Date: Wed May 7 10:55:33 2008 -0600
Fix traceon regression introduced 2006-06-06.
* src/builtin.m4 (traceon): Only perform insertion if lookup
fails.
* doc/m4.texinfo (Trace): Test for the bug.
* NEWS: Document it.
Signed-off-by: Eric Blake <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 8 ++++++++
NEWS | 4 ++++
doc/m4.texinfo | 10 ++++++++++
src/builtin.c | 4 +++-
4 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 91c1845..d5b23b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-05-07 Eric Blake <address@hidden>
+
+ Fix traceon regression introduced 2006-06-06.
+ * src/builtin.m4 (traceon): Only perform insertion if lookup
+ fails.
+ * doc/m4.texinfo (Trace): Test for the bug.
+ * NEWS: Document it.
+
2008-05-05 Eric Blake <address@hidden>
Stage 22: allow builtin token concatenation outside address@hidden
diff --git a/NEWS b/NEWS
index 052cbbc..9bde89c 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,10 @@ Foundation, Inc.
* Noteworthy changes in Version 1.6 (????-??-??) [stable]
Released by ????, based on git version 1.4.10b.x-*
+** Fix regression introduced in 1.4.4b where using `traceon' could delete
+ a macro. This was most noticeable with `traceon(`traceon')', but
+ would also happen in cases such as `foo(traceon(`foo'))'.
+
** Fix regression introduced in 1.4.10b (but not present in 1.4.11) where
using `builtin' or `indir' to perform nested `shift' calls triggered an
assertion failure.
diff --git a/doc/m4.texinfo b/doc/m4.texinfo
index fd04622..30db58a 100644
--- a/doc/m4.texinfo
+++ b/doc/m4.texinfo
@@ -3708,6 +3708,16 @@ does not transfer tracing status.
@example
$ @kbd{m4 -d}
+traceon(`traceon')
address@hidden
+traceon(`traceoff')
address@hidden: -1- traceon(`traceoff')
address@hidden
+traceoff(`traceoff')
address@hidden: -1- traceoff(`traceoff')
address@hidden
+traceoff(`traceon')
address@hidden
traceon(`eval', `m4_divnum')
@result{}
define(`m4_eval', defn(`eval'))
diff --git a/src/builtin.c b/src/builtin.c
index 8ce6cf7..0549745 100644
--- a/src/builtin.c
+++ b/src/builtin.c
@@ -1672,7 +1672,9 @@ m4_traceon (struct obstack *obs, int argc,
macro_arguments *argv)
m4_warn (0, me, _("invalid macro name ignored"));
continue;
}
- s = lookup_symbol (ARG (i), SYMBOL_INSERT);
+ s = lookup_symbol (ARG (i), SYMBOL_LOOKUP);
+ if (!s)
+ s = lookup_symbol (ARG (i), SYMBOL_INSERT);
set_trace (s, obs);
}
}
hooks/post-receive
--
GNU M4 source repository
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU M4 source repository branch, branch-1.6, updated. v1.5.89a-19-gc8a2c29,
Eric Blake <=