From: Daiki Ueno <ueno@gnu.org>
Date: Thu, 27 Jun 2013 03:00:30 +0000 (+0900)
Subject: Fix string concatenation with '+' in Python.
X-Git-Tag: v0.18.3~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f473f3991e5e56e24654dcb07de6d5e600d74462;p=thirdparty%2Fgettext.git

Fix string concatenation with '+' in Python.
---

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 6fe4548bd..5077d86fd 100644
--- 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 faafa503e..4ebe0d714 100644
--- 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 12e4c7813..35ce7746a 100644
--- 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 a649b3d24..227774c48 100755
--- 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"