libcdecl: Fix spacing after pointer qualifiers (again).

[cdecl99.git] / src / declare.c

diff --git a/src/declare.c b/src/declare.c
index 172c0a9345c398905b1aafcc4b4cd25c8033b438..5c11381d150b92ad20ccfc3f93d4a4d0a56ac8f9 100644 (file)
--- a/src/declare.c
+++ b/src/declare.c
@@ -1,6 +1,6 @@
 /*
  *  Render C declarations.
- *  Copyright © 2011, 2021, 2023 Nick Bowler
+ *  Copyright © 2011, 2021, 2023-2024 Nick Bowler
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -30,35 +30,37 @@ declare_declarator(struct output_state *dst, struct cdecl_declarator *d);
 
 static void declare_decl(struct output_state *dst, struct cdecl *decl)
 {
+       struct cdecl_declarator *d = decl->declarators;
        const char *sep;
 
        sep = cdecl__emit_specs(dst, decl->specifiers, -1);
-       if (decl->declarators->type != CDECL_DECL_NULL)
+       if (d->type != CDECL_DECL_NULL)
                cdecl__emit(dst, sep);
 
-       declare_declarator(dst, decl->declarators);
+       declare_declarator(dst, d);
 }
 
 static void
 declare_postfix_child(struct output_state *dst, struct cdecl_declarator *d)
 {
-       if (d->type == CDECL_DECL_POINTER)
-               cdecl__emit(dst, "(");
+       bool need_parens = (d->type == CDECL_DECL_POINTER);
 
+       if (need_parens) cdecl__emit(dst, "(");
        declare_declarator(dst, d);
-
-       if (d->type == CDECL_DECL_POINTER)
-               cdecl__emit(dst, ")");
+       if (need_parens) cdecl__emit(dst, ")");
 }
 
-static void declare_pointer(struct output_state *dst, struct cdecl_pointer *p)
+static void declare_pointer(struct output_state *dst, struct cdecl_declarator *d)
 {
-       struct cdecl_declspec *q = p->qualifiers;
+       struct cdecl_declspec *q = d->u.pointer.qualifiers;
 
        if (q) {
+               const char *sep;
+
                cdecl__emit(dst, "* ");
-               cdecl__emit_specs(dst, q, -1);
-               cdecl__emit(dst, " ");
+               sep = cdecl__emit_specs(dst, q, -1);
+               if (d->child->type != CDECL_DECL_NULL)
+                       cdecl__emit(dst, sep);
        } else {
                cdecl__emit(dst, "*");
        }
@@ -108,7 +110,7 @@ declare_declarator(struct output_state *dst, struct cdecl_declarator *d)
                        cdecl__emit(dst, d->u.ident);
                        break;
                case CDECL_DECL_POINTER:
-                       declare_pointer(dst, &d->u.pointer);
+                       declare_pointer(dst, d);
                        break;
                /*
                 * Arrays and functions are special: since they are postfix,