[SCM] GNU M4 source repository branch, branch-1_4, updated. branch-cvs-readonly-12-gb0f7df5

[Eric Blake]

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=b0f7df5d4b9ebb8dcf9500a88607516f4a9a0e44

The branch, branch-1_4 has been updated
       via  b0f7df5d4b9ebb8dcf9500a88607516f4a9a0e44 (commit)
      from  6bfe1ba306cacd8d9316647f3b9f276cf56b31a8 (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 b0f7df5d4b9ebb8dcf9500a88607516f4a9a0e44
Author: Eric Blake <address@hidden>
Date:   Tue Nov 13 15:21:10 2007 -0700

    Simplify previous patch.
    
    * src/input.c (pop_input): Change signature.
    (push_string_init, next_char_1): Adjust callers.
    
    Signed-off-by: Eric Blake <address@hidden>

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

Summary of changes:
 ChangeLog   |    4 +++
 src/input.c |   65 ++++++++++++++++++++++++----------------------------------
 2 files changed, 31 insertions(+), 38 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b52f3e0..068148d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-11-13  Eric Blake  <address@hidden>
 
+       Simplify previous patch.
+       * src/input.c (pop_input): Change signature.
+       (push_string_init, next_char_1): Adjust callers.
+
        Fix memory leak in tail recursion.
        * src/input.c (push_string_init): Let go of memory earlier.
        (next_char_1): Make end of string detection reliable.
diff --git a/src/input.c b/src/input.c
index 3ef7b83..091d108 100644
--- a/src/input.c
+++ b/src/input.c
@@ -160,6 +160,8 @@ static struct re_registers regs;
 # define default_word_regexp 1
 #endif /* !ENABLE_CHANGEWORD */
 
+static bool pop_input (bool);
+
 #ifdef DEBUG_INPUT
 static const char *token_type_string (token_type);
 #endif
@@ -242,34 +244,8 @@ struct obstack *
 push_string_init (void)
 {
   /* Free any memory occupied by completely parsed strings.  */
-  bool pruning = true;
   assert (next == NULL);
-  while (isp && pruning)
-    {
-      switch (isp->type)
-       {
-       case INPUT_STRING:
-         if (*isp->u.u_s.string)
-           pruning = false;
-         break;
-
-       case INPUT_FILE:
-       case INPUT_MACRO:
-         pruning = false;
-         break;
-
-       default:
-         assert (!"push_string_init");
-         abort ();
-       }
-      if (pruning)
-       {
-         next = isp;
-         isp = isp->prev;
-       }
-    }
-  if (next)
-    obstack_free (current_input, next);
+  while (isp && pop_input (false));
 
   /* Reserve the next location on the obstack.  */
   next = (input_block *) obstack_alloc (current_input,
@@ -337,24 +313,36 @@ push_wrapup (const char *s)
 }
 
 
-/*-------------------------------------------------------------------------.
-| The function pop_input () pops one level of input sources.  If the      |
-| popped input_block is a file, current_file and current_line are reset to |
-| the saved values before the memory for the input_block are released.    |
-`-------------------------------------------------------------------------*/
+/*-------------------------------------------------------------------.
+| The function pop_input () pops one level of input sources.  If     |
+| CLEANUP, and the popped input_block is a file, current_file and    |
+| current_line are reset to the saved values before the memory for   |
+| the input_block is released.  The return value is false if cleanup |
+| is still required, or if the current input source is not           |
+| exhausted.                                                         |
+`-------------------------------------------------------------------*/
 
-static void
-pop_input (void)
+static bool
+pop_input (bool cleanup)
 {
   input_block *tmp = isp->prev;
 
   switch (isp->type)
     {
     case INPUT_STRING:
+      assert (!cleanup || !*isp->u.u_s.string);
+      if (*isp->u.u_s.string)
+       return false;
+      break;
+
     case INPUT_MACRO:
+      if (!cleanup)
+       return false;
       break;
 
     case INPUT_FILE:
+      if (!cleanup)
+       return false;
       if (debug_level & DEBUG_TRACE_INPUT)
        {
          if (tmp)
@@ -389,6 +377,7 @@ pop_input (void)
 
   isp = tmp;
   input_change = true;
+  return true;
 }
 
 /*------------------------------------------------------------------------.
@@ -530,7 +519,7 @@ next_char_1 (void)
          ch = to_uchar (*isp->u.u_s.string);
          if (ch != '\0')
            {
-             *isp->u.u_s.string++;
+             isp->u.u_s.string++;
              return ch;
            }
          break;
@@ -555,8 +544,8 @@ next_char_1 (void)
          break;
 
        case INPUT_MACRO:
-         pop_input ();         /* INPUT_MACRO input sources has only one
-                                  token */
+         /* INPUT_MACRO input sources has only one token */
+         pop_input (true);
          return CHAR_MACRO;
 
        default:
@@ -565,7 +554,7 @@ next_char_1 (void)
        }
 
       /* End of input source --- pop one level.  */
-      pop_input ();
+      pop_input (true);
     }
 }
 


hooks/post-receive
--
GNU M4 source repository