Look for seperator after TO and FROM tokens when exploring nested structures

diff --git a/gas/ChangeLog b/gas/ChangeLog
index edad0dfa00f0f82f6166d03e7a90df2c25330ed6..62002ebcc90a1de6adddbac8d1d3b37e1b447ec3 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+1999-11-11  Nick Clifton  <nickc@cygnus.com>
+
+       * macro.c (buffer_and_nest): Look for seperator after TO and
+       FROM tokens.
+
 1999-11-08  Andrew Haley  <aph@cygnus.com>
 
        * app.c (do_scrub_chars): When in State 10, treat backslash

diff --git a/gas/macro.c b/gas/macro.c
index 2aeb157388ee8d9bfbffc2de0dd411fc7e946524..2ef4cb400f8b8612cf2e14ab1b727daa439085f3 100644 (file)
--- a/gas/macro.c
+++ b/gas/macro.c
@@ -245,9 +245,11 @@ buffer_and_nest (from, to, ptr, get_line)
        {
          if (ptr->ptr[i] == '.')
              i++;
-         if (strncasecmp (ptr->ptr + i, from, from_len) == 0)
+         if (strncasecmp (ptr->ptr + i, from, from_len) == 0
+             && ! isalnum (ptr->ptr[i + from_len]))
            depth++;
-         if (strncasecmp (ptr->ptr + i, to, to_len) == 0)
+         if (strncasecmp (ptr->ptr + i, to, to_len) == 0
+             && ! isalnum (ptr->ptr[i + to_len]))
            {
              depth--;
              if (depth == 0)