From ee76478787428ef7c9c40b419c82b88b7b6efd45 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 24 Sep 2014 17:44:03 +0100
Subject: [PATCH 1/3] spec: in the table of types, classify them

---
 doc/dbus-specification.xml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/doc/dbus-specification.xml b/doc/dbus-specification.xml
index 1830966..5df56df 100644
--- a/doc/dbus-specification.xml
+++ b/doc/dbus-specification.xml
@@ -763,6 +763,7 @@
           <tgroup cols="3">
             <thead>
               <row>
+                <entry>Category</entry>
                 <entry>Conventional Name</entry>
                 <entry>Code</entry>
                 <entry>Description</entry>
@@ -770,62 +771,77 @@
             </thead>
             <tbody>
               <row>
+                <entry>reserved</entry>
                 <entry><literal>INVALID</literal></entry>
                 <entry>0 (ASCII NUL)</entry>
                 <entry>Not a valid type code, used to terminate signatures</entry>
               </row><row>
+                <entry>fixed, basic</entry>
                 <entry><literal>BYTE</literal></entry>
                 <entry>121 (ASCII 'y')</entry>
                 <entry>8-bit unsigned integer</entry>
               </row><row>
+                <entry>fixed, basic</entry>
                 <entry><literal>BOOLEAN</literal></entry>
                 <entry>98 (ASCII 'b')</entry>
                 <entry>Boolean value, 0 is <literal>FALSE</literal> and 1 is <literal>TRUE</literal>. Everything else is invalid.</entry>
               </row><row>
+                <entry>fixed, basic</entry>
                 <entry><literal>INT16</literal></entry>
                 <entry>110 (ASCII 'n')</entry>
                 <entry>16-bit signed integer</entry>
               </row><row>
+                <entry>fixed, basic</entry>
                 <entry><literal>UINT16</literal></entry>
                 <entry>113 (ASCII 'q')</entry>
                 <entry>16-bit unsigned integer</entry>
               </row><row>
+                <entry>fixed, basic</entry>
                 <entry><literal>INT32</literal></entry>
                 <entry>105 (ASCII 'i')</entry>
                 <entry>32-bit signed integer</entry>
               </row><row>
+                <entry>fixed, basic</entry>
                 <entry><literal>UINT32</literal></entry>
                 <entry>117 (ASCII 'u')</entry>
                 <entry>32-bit unsigned integer</entry>
               </row><row>
+                <entry>fixed, basic</entry>
                 <entry><literal>INT64</literal></entry>
                 <entry>120 (ASCII 'x')</entry>
                 <entry>64-bit signed integer</entry>
               </row><row>
+                <entry>fixed, basic</entry>
                 <entry><literal>UINT64</literal></entry>
                 <entry>116 (ASCII 't')</entry>
                 <entry>64-bit unsigned integer</entry>
               </row><row>
+                <entry>fixed, basic</entry>
                 <entry><literal>DOUBLE</literal></entry>
                 <entry>100 (ASCII 'd')</entry>
                 <entry>IEEE 754 double</entry>
               </row><row>
+                <entry>string-like, basic</entry>
                 <entry><literal>STRING</literal></entry>
                 <entry>115 (ASCII 's')</entry>
                 <entry>UTF-8 string (<emphasis>must</emphasis> be valid UTF-8). Must be nul terminated and contain no other nul bytes.</entry>
               </row><row>
+                <entry>string-like, basic</entry>
                 <entry><literal>OBJECT_PATH</literal></entry>
                 <entry>111 (ASCII 'o')</entry>
                 <entry>Name of an object instance</entry>
               </row><row>
+                <entry>string-like, basic</entry>
                 <entry><literal>SIGNATURE</literal></entry>
                 <entry>103 (ASCII 'g')</entry>
                 <entry>A type signature</entry>
               </row><row>
+                <entry>container</entry>
                 <entry><literal>ARRAY</literal></entry>
                 <entry>97 (ASCII 'a')</entry>
                 <entry>Array</entry>
               </row><row>
+                <entry>container</entry>
                 <entry><literal>STRUCT</literal></entry>
                 <entry>114 (ASCII 'r'), 40 (ASCII '('), 41 (ASCII ')')</entry>
                 <entry>Struct; type code 114 'r' is reserved for use in
@@ -833,10 +849,12 @@
                   concept of a struct, and must not appear in signatures
                   used on D-Bus.</entry>
               </row><row>
+                <entry>container</entry>
                 <entry><literal>VARIANT</literal></entry>
                 <entry>118 (ASCII 'v') </entry>
                 <entry>Variant type (the type of the value is part of the value itself)</entry>
               </row><row>
+                <entry>container</entry>
                 <entry><literal>DICT_ENTRY</literal></entry>
                 <entry>101 (ASCII 'e'), 123 (ASCII '{'), 125 (ASCII '}') </entry>
                 <entry>Entry in a dict or map (array of key-value pairs).
@@ -845,11 +863,13 @@
                   dict or dict-entry, and must not appear in signatures
                   used on D-Bus.</entry>
               </row><row>
+                <entry>fixed, basic</entry>
                 <entry><literal>UNIX_FD</literal></entry>
                 <entry>104 (ASCII 'h')</entry>
                 <entry>Unix file descriptor</entry>
               </row>
               <row>
+                <entry>reserved</entry>
                 <entry>(reserved)</entry>
                 <entry>109 (ASCII 'm')</entry>
                 <entry>Reserved for <ulink
@@ -859,6 +879,7 @@
                   specified here</entry>
               </row>
               <row>
+                <entry>reserved</entry>
                 <entry>(reserved)</entry>
                 <entry>42 (ASCII '*')</entry>
                 <entry>Reserved for use in bindings/implementations to
@@ -866,6 +887,7 @@
                   and must not appear in signatures used on D-Bus.</entry>
               </row>
               <row>
+                <entry>reserved</entry>
                 <entry>(reserved)</entry>
                 <entry>63 (ASCII '?')</entry>
                 <entry>Reserved for use in bindings/implementations to
@@ -873,6 +895,7 @@
                   not appear in signatures used on D-Bus.</entry>
               </row>
               <row>
+                <entry>reserved</entry>
                 <entry>(reserved)</entry>
                 <entry>64 (ASCII '@'), 38 (ASCII '&amp;'),
                   94 (ASCII '^')</entry>
-- 
2.1.1