m4-commit
[Top][All Lists]
Advanced

[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-89-


From: Eric Blake
Subject: [SCM] GNU M4 source repository branch, branch-1.6, updated. v1.5.89a-89-gf352248
Date: Wed, 11 Feb 2009 17:27:10 +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=f35224878771517f1d7c13568c1b65a59e7908a4

The branch, branch-1.6 has been updated
       via  f35224878771517f1d7c13568c1b65a59e7908a4 (commit)
      from  b9c165b394c06d2da657caae33efd5843689ff3b (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 f35224878771517f1d7c13568c1b65a59e7908a4
Author: Eric Blake <address@hidden>
Date:   Wed Feb 11 08:49:43 2009 -0700

    Warn when popping traced but undefined macro.
    
    * src/symtab.c (lookup_symbol): Recognize traced placeholder when
    delete is requested.  Bug introduced 2008-07-18.
    * doc/m4.texinfo (Trace): Test it.
    
    Signed-off-by: Eric Blake <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog      |    7 +++++++
 doc/m4.texinfo |   12 +++++++++++-
 src/symtab.c   |    8 +++++---
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b96dccc..2aa09b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-02-11  Eric Blake  <address@hidden>
+
+       Warn when popping traced but undefined macro.
+       * src/symtab.c (lookup_symbol): Recognize traced placeholder when
+       delete is requested.  Bug introduced 2008-07-18.
+       * doc/m4.texinfo (Trace): Test it.
+
 2009-02-09  Eric Blake  <address@hidden>
 
        Enhance index to support starting offset.
diff --git a/doc/m4.texinfo b/doc/m4.texinfo
index 8341cc9..b337e5e 100644
--- a/doc/m4.texinfo
+++ b/doc/m4.texinfo
@@ -4134,6 +4134,16 @@ foo
 defn(`foo')
 @error{}m4:stdin:4: Warning: defn: undefined macro `foo'
 @result{}
+undefine(`foo')
address@hidden:stdin:5: Warning: undefine: undefined macro `foo'
address@hidden
+pushdef(`foo')
address@hidden
+popdef(`foo')
address@hidden
+popdef(`foo')
address@hidden:stdin:8: Warning: popdef: undefined macro `foo'
address@hidden
 define(`foo', `bar')
 @result{}
 foo
@@ -4144,7 +4154,7 @@ undefine(`foo')
 ifdef(`foo', `yes', `no')
 @result{}no
 indir(`foo')
address@hidden:stdin:9: Warning: indir: undefined macro `foo'
address@hidden:stdin:13: Warning: indir: undefined macro `foo'
 @result{}
 define(`foo', `blah')
 @result{}
diff --git a/src/symtab.c b/src/symtab.c
index a9160c8..6631e9c 100644
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -1,7 +1,7 @@
 /* GNU m4 -- A simple macro processor
 
-   Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2003, 2006, 2007, 2008
-   Free Software Foundation, Inc.
+   Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2003, 2006, 2007,
+   2008, 2009 Free Software Foundation, Inc.
 
    This file is part of GNU M4.
 
@@ -333,7 +333,9 @@ lookup_symbol (const char *name, size_t len, symbol_lookup 
mode)
         definition is still in use, let the caller free the memory
         after it is done with the symbol.  */
 
-      if (!entry)
+      if (!entry
+         || (SYMBOL_TYPE (entry) == TOKEN_VOID && entry->stack == entry
+             && SYMBOL_TRACED (entry)))
        return NULL;
       {
        bool traced = false;


hooks/post-receive
--
GNU M4 source repository




reply via email to

[Prev in Thread] Current Thread [Next in Thread]