From: Jan Beulich <jbeulich@suse.com>
Date: Mon, 3 Feb 2025 11:19:17 +0000 (+0100)
Subject: rl78: use is_whitespace()
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2dd0370c433d;p=thirdparty%2Fbinutils-gdb.git

rl78: use is_whitespace()

Replace open-coded checks and convert ISSPACE() uses. At the same time
use is_end_of_stmt() instead of an open-coded check in adjacent code.
---

diff --git a/gas/config/rl78-parse.y b/gas/config/rl78-parse.y
index 006eb7d00df..a2dcacf8f2f 100644
--- a/gas/config/rl78-parse.y
+++ b/gas/config/rl78-parse.y
@@ -1379,7 +1379,7 @@ find_bit_index (char *tok)
 	{
 	  last_digit = tok;
 	}
-      else if (ISSPACE (*tok))
+      else if (is_whitespace (*tok))
 	{
 	  /* skip */
 	}
@@ -1403,7 +1403,7 @@ rl78_lex (void)
   char * save_input_pointer;
   char * bit = NULL;
 
-  while (ISSPACE (*rl78_lex_start)
+  while (is_whitespace (*rl78_lex_start)
 	 && rl78_lex_start != rl78_lex_end)
     rl78_lex_start ++;
 
diff --git a/gas/config/tc-rl78.c b/gas/config/tc-rl78.c
index bcdc87399d3..7492d3ccb3c 100644
--- a/gas/config/tc-rl78.c
+++ b/gas/config/tc-rl78.c
@@ -425,12 +425,11 @@ md_number_to_chars (char * buf, valueT val, int n)
 static void
 require_end_of_expr (const char *fname)
 {
-  while (* input_line_pointer == ' '
-	 || * input_line_pointer == '\t')
+  while (is_whitespace (* input_line_pointer))
     input_line_pointer ++;
 
-  if (! * input_line_pointer
-      || strchr ("\n\r,", * input_line_pointer)
+  if (is_end_of_stmt (* input_line_pointer)
+      || * input_line_pointer == ','
       || strchr (comment_chars, * input_line_pointer)
       || strchr (line_comment_chars, * input_line_pointer)
       || strchr (line_separator_chars, * input_line_pointer))