From c1eae11499c60c61b6aaa5fa5e316613dcb0b6ad Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Thu, 11 Nov 1999 16:35:12 +0000 Subject: [PATCH] Look for seperator after TO and FROM tokens when exploring nested structures --- gas/ChangeLog | 5 +++++ gas/macro.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index edad0df..62002eb 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +1999-11-11 Nick Clifton + + * macro.c (buffer_and_nest): Look for seperator after TO and + FROM tokens. + 1999-11-08 Andrew Haley * app.c (do_scrub_chars): When in State 10, treat backslash diff --git a/gas/macro.c b/gas/macro.c index 2aeb157..2ef4cb4 100644 --- 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) -- 2.7.4