Fix string concatenation with '+' in Python.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 6fe4548bdde1a5e39de81815e8817817f3d8c1aa..5077d86fd06968090fed0546d6e03329f979cb13 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-27  Daiki Ueno  <ueno@gnu.org>
+
+       * x-python.c (phase5_pushback): Increment size to 2.
+
 2013-06-25  Daiki Ueno  <ueno@gnu.org>
 
        Fix handling of \u escape sequences in Tcl.

diff --git a/gettext-tools/src/x-python.c b/gettext-tools/src/x-python.c
index faafa503ec51f1bf448056e97e16048882ba1dbe..4ebe0d71472dfb133992ace98b9ad68bef8da39c 100644 (file)
--- a/gettext-tools/src/x-python.c
+++ b/gettext-tools/src/x-python.c
@@ -1403,7 +1403,7 @@ phase7_getuc (int quote_char,
 /* Number of pending open parentheses/braces/brackets.  */
 static int open_pbb;
 
-static token_ty phase5_pushback[1];
+static token_ty phase5_pushback[2];
 static int phase5_pushback_length;
 
 static void

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index 12e4c78133dcec83456dd1a417101377747c5d65..35ce7746a44849b21ae274b8b7caa2d15f325fe2 100644 (file)
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-27  Daiki Ueno  <ueno@gnu.org>
+
+       * xgettext-python-1: Test non-literal string concatenation with
+       '+' to the test script.
+
 2013-06-25  Daiki Ueno  <ueno@gnu.org>
 
        Fix handling of \u escape sequences in Tcl.

diff --git a/gettext-tools/tests/xgettext-python-1 b/gettext-tools/tests/xgettext-python-1
index a649b3d244f5dcb3a05166a30c8048af2bcbd5d2..227774c48a90cbc8f876823cb119df610b48d8dc 100755 (executable)
--- a/gettext-tools/tests/xgettext-python-1
+++ b/gettext-tools/tests/xgettext-python-1
@@ -28,7 +28,7 @@ _(CATEGORIES["default"]["name"]);
 
 # string concatenation
 _("abc" "def" + "ghi"
-"jkl")
+"jkl" + mno)
 EOF
 
 tmpfiles="$tmpfiles xg-py-1.err xg-py-1.tmp xg-py-1.pot"