Fix generate.pl for Perl 5.6.1.

diff --git a/src/ChangeLog b/src/ChangeLog
index 0f9838871e77e166277be0a4838b2521f60fae45..02b64b9cd9a98609a07a2aefdb4b71b0cbcddc00 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+Mon May  2 22:02:52 2005  Ben Pfaff  <blp@gnu.org>
+
+       * expressions/generate.pl: (get_token) Make use of /g
+       backward-compatible with Perl 5.6.1.
+
 Sun May  1 23:00:19 2005  Ben Pfaff  <blp@gnu.org>
 
        * var-display.c: (cmd_variable_alignment) Fix memory leak.

diff --git a/src/expressions/generate.pl b/src/expressions/generate.pl
index 9cfb07ed71cc9a8187b27329c68054dc59247979..9d753867cc1f72865e8d251d289748fa21e0926b 100644 (file)
--- a/src/expressions/generate.pl
+++ b/src/expressions/generate.pl
@@ -378,9 +378,9 @@ sub get_token {
     our ($line);
     lookahead ();
     return if defined ($toktype) && $toktype eq 'eof';
-    $toktype = 'id', return
-       if ($token) = $line =~ /\G([a-zA-Z_][a-zA-Z_.0-9]*)/gc;
-    $toktype = 'int', return if ($token) = $line =~ /\G[0-9]+/gc;
+    $toktype = 'id', $token = $1, return
+       if $line =~ /\G([a-zA-Z_][a-zA-Z_.0-9]*)/gc;
+    $toktype = 'int', $token = $1, return if $line =~ /\G([0-9]+)/gc;
     $toktype = 'punct', $token = $1, return if $line =~ /\G([][(),*;.])/gc;
     if ($line =~ /\G=/gc) {
        $toktype = "expression";