diff options
| author | Bruno Haible <bruno@clisp.org> | 2008-08-16 10:05:21 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-06-23 12:15:46 +0200 |
| commit | 25360c47bf5554419146fe65855582e393730bcd (patch) | |
| tree | 156a0050aa396071ce05682354aaccd7de6680a7 /gettext-tools/src | |
| parent | 7e30295d9075a9ec8894306380b799bf89193278 (diff) | |
| download | external_gettext-25360c47bf5554419146fe65855582e393730bcd.zip external_gettext-25360c47bf5554419146fe65855582e393730bcd.tar.gz external_gettext-25360c47bf5554419146fe65855582e393730bcd.tar.bz2 | |
Addendum to 2007-03-17 commit.
Diffstat (limited to 'gettext-tools/src')
| -rw-r--r-- | gettext-tools/src/ChangeLog | 4 | ||||
| -rw-r--r-- | gettext-tools/src/x-php.c | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog index 346e291..5bc89d2 100644 --- 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 39d3573..0a86b69 100644 --- 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) |