cp-demangle.c (d_print_mod): Add a space before printing `complex` and `imaginary...

	* cp-demangle.c (d_print_mod): Add a space before printing `complex`
	and `imaginary`, as opposed to after.
	* testsuite/demangle-expected: Adjust test.

From-SVN: r277535

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 97d9767c2ea9fa18e9942bdf5dd21202db04cce3..bba2be8b81bed0afea5197fbb1d583bfc685d6a8 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,9 @@
+2019-10-28  Miguel Saldivar  <saldivarcher@gmail.com>
+
+       * cp-demangle.c (d_print_mod): Add a space before printing `complex`
+       and `imaginary`, as opposed to after.
+       * testsuite/demangle-expected: Adjust test.
+
 2019-10-03  Eduard-Mihai Burtescu  <eddyb@lyken.rs>
 
        * rust-demangle.c (looks_like_rust): Remove.

diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c
index aa78c86dd443c5078c5f440ebeaafd01ae3cd8ec..877ad359be115b716a8467f1d1d4aa8f23971c2b 100644 (file)
--- a/libiberty/cp-demangle.c
+++ b/libiberty/cp-demangle.c
@@ -5977,10 +5977,10 @@ d_print_mod (struct d_print_info *dpi, int options,
       d_append_string (dpi, "&&");
       return;
     case DEMANGLE_COMPONENT_COMPLEX:
-      d_append_string (dpi, "complex ");
+      d_append_string (dpi, " _Complex");
       return;
     case DEMANGLE_COMPONENT_IMAGINARY:
-      d_append_string (dpi, "imaginary ");
+      d_append_string (dpi, " _Imaginary");
       return;
     case DEMANGLE_COMPONENT_PTRMEM_TYPE:
       if (d_last_char (dpi) != '(')

diff --git a/libiberty/testsuite/demangle-expected b/libiberty/testsuite/demangle-expected
index f21ed00e559a235d5d6183ac7bc44f7495e2f3ce..61681484d0e658068b2186d62a74d96628c4373b 100644 (file)
--- a/libiberty/testsuite/demangle-expected
+++ b/libiberty/testsuite/demangle-expected
@@ -1278,7 +1278,7 @@ int& int_if_addable<Y>(A<sizeof ((*((Y*)(0)))+(*((Y*)(0))))>*)
 #
 --format=gnu-v3
 _Z3bazIiEvP1AIXszcl3foocvT__ELCf00000000_00000000EEEE
-void baz<int>(A<sizeof (foo((int)(), (floatcomplex )00000000_00000000))>*)
+void baz<int>(A<sizeof (foo((int)(), (float Complex)00000000_00000000))>*)
 #
 --format=gnu-v3
 _Z3fooI1FEN1XIXszdtcl1PclcvT__EEE5arrayEE4TypeEv