scanner: Merge basic types in `specifier_qualifier_list` production.

This is necessary to parse types like `unsigned char` or `long double`,
and is already done when parsing `declarations_specifiers`. Examples
that are fixed by this change include:

* `GLib.TestLogMsg.nums` previously parsed as `long` but should be `long
  double`.
* `GMime.Encoding.uubuf` previously parsed as `unsigned` but should be
  `unsigned char`.

2 files changed, 10 insertions, 0 deletions

diff --git a/tests/offsets/gitestoffsets.c b/tests/offsets/gitestoffsets.c
index 538f3216..9ce673e9 100644
--- a/tests/offsets/gitestoffsets.c
+++ b/tests/offsets/gitestoffsets.c
@@ -109,6 +109,11 @@ compiled (FILE *outfile)
   PRINT_MEMBER (OffsetsBasic, field_double);
   PRINT_MEMBER (OffsetsBasic, dummy8);
   PRINT_MEMBER (OffsetsBasic, field_size);
+  PRINT_MEMBER (OffsetsBasic, dummy9);
+  PRINT_MEMBER (OffsetsBasic, field_uchar1);
+  PRINT_MEMBER (OffsetsBasic, dummy10);
+  PRINT_MEMBER (OffsetsBasic, field_uchar2);
+  PRINT_MEMBER (OffsetsBasic, dummy11);
   g_fprintf (outfile, "\n");
 
   PRINT_TYPE (OffsetsEnum);
diff --git a/tests/offsets/offsets.h b/tests/offsets/offsets.h
index 10485327..658601f5 100644
--- a/tests/offsets/offsets.h
+++ b/tests/offsets/offsets.h
@@ -30,6 +30,11 @@ struct _OffsetsBasic {
   gdouble field_double;
   char dummy8;
   gsize field_size;
+  char dummy9;
+  guchar field_uchar1;
+  char dummy10;
+  unsigned char field_uchar2;
+  char dummy11;
 };
 
 typedef enum {