From: Bruno Haible <bruno@clisp.org>
Date: Mon, 1 Sep 2003 12:59:15 +0000 (+0000)
Subject: Fix confusion about last_token.
X-Git-Tag: v0.13~284
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef217b9273ec50c6574b11f1b26dae25f23905db;p=thirdparty%2Fgettext.git

Fix confusion about last_token.
---

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 6b61caded..9d9c0bfab 100644
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-01  Guido Flohr  <guido@imperia.net>
+
+	* x-perl.c (extract_balanced): Access the global last_token.
+	Initialize last_token and prefer_division_over_regexp here. 
+	(extract_perl): Not here.
+
 2003-08-29  Bruno Haible  <bruno@clisp.org>
 
 	* x-perl.c: Include getline.h.
diff --git a/gettext-tools/src/x-perl.c b/gettext-tools/src/x-perl.c
index 52583be21..57f22b65e 100644
--- a/gettext-tools/src/x-perl.c
+++ b/gettext-tools/src/x-perl.c
@@ -2593,14 +2593,15 @@ extract_balanced (message_list_ty *mlp, int arg_sg, int arg_pl, int state,
   /* Number of left parentheses seen.  */
   int paren_seen = 0;
 
-  token_type_ty last_token = token_type_eof;
-
 #if DEBUG_PERL
   static int nesting_level = 0;
 
   ++nesting_level;
 #endif
 
+  last_token = token_type_semicolon;  /* Safe assumption.  */
+  prefer_division_over_regexp = false;
+
   for (;;)
     {
       int my_last_token = last_token;
@@ -2916,9 +2917,6 @@ extract_perl (FILE *f, const char *real_filename, const char *logical_filename,
   last_comment_line = -1;
   last_non_comment_line = -1;
 
-  last_token = token_type_semicolon;  /* Safe assumption.  */
-  prefer_division_over_regexp = false;
-
   init_keywords ();
 
   token_stack.items = NULL;