Addendum to 2007-03-17 commit.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 346e2910d1bc66b3004cc625282ac9342f0892be..5bc89d21275fb63be2efed817caa976f63b059a1 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-16  Bruno Haible  <bruno@clisp.org>
+
+       * x-php.c (extract_balanced): Fix small bug in 2007-03-17 commit.
+
 2008-08-15  Bruno Haible  <bruno@clisp.org>
 
        * format-python.c (format_parse): For %.0s and %.0r, set the type to

diff --git a/gettext-tools/src/x-php.c b/gettext-tools/src/x-php.c
index 39d357394bc3c819bbdc27351c16a9d4e0cfe12b..0a86b697fda21769fe1b1fc0bae25826edbaa1f6 100644 (file)
--- a/gettext-tools/src/x-php.c
+++ b/gettext-tools/src/x-php.c
@@ -1,5 +1,5 @@
 /* xgettext PHP backend.
-   Copyright (C) 2001-2003, 2005-2007 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2008 Free Software Foundation, Inc.
 
    This file was written by Bruno Haible <bruno@clisp.org>, 2002.
 
@@ -1409,7 +1409,7 @@ static flag_context_list_table_ty *flag_context_list_table;
    Extracted messages are added to MLP.
    DELIM can be either token_type_rparen or token_type_rbracket, or
    token_type_eof to accept both.
-   Return true upon eof, false upon closing parenthesis.  */
+   Return true upon eof, false upon closing parenthesis or bracket.  */
 static bool
 extract_balanced (message_list_ty *mlp,
                  token_type_ty delim,
@@ -1504,6 +1504,9 @@ extract_balanced (message_list_ty *mlp,
              arglist_parser_done (argparser, arg);
              return true;
            }
+         next_context_iter = null_context_list_iterator;
+         state = 0;
+         continue;
 
        case token_type_rbracket:
          if (delim == token_type_rbracket || delim == token_type_eof)