Output: Add size and align attributes to PointerType

The GCC-XML output included these attributes, so CastXML should too.

Closes: #80

18 files changed, 36 insertions, 36 deletions

diff --git a/test/expect/castxml1.any.Function-Argument-decay.xml.txt b/test/expect/castxml1.any.Function-Argument-decay.xml.txt
index 9d1d6f6..cb58afc 100644
--- a/test/expect/castxml1.any.Function-Argument-decay.xml.txt
+++ b/test/expect/castxml1.any.Function-Argument-decay.xml.txt
@@ -6,8 +6,8 @@
     <Argument type="_5" location="f1:1" file="f1" line="1"/>
   </Function>
   <FundamentalType id="_2" name="void" size="[0-9]+" align="[0-9]+"/>
-  <PointerType id="_4" type="_6"/>
-  <PointerType id="_5" type="_7"/>
+  <PointerType id="_4" type="_6" size="[0-9]+" align="[0-9]+"/>
+  <PointerType id="_5" type="_7" size="[0-9]+" align="[0-9]+"/>
   <Namespace id="_3" name="::"/>
   <FundamentalType id="_6" name="int" size="[0-9]+" align="[0-9]+"/>
   <FunctionType id="_7" returns="_6">
diff --git a/test/expect/castxml1.any.Function-Argument-default-cast.xml.txt b/test/expect/castxml1.any.Function-Argument-default-cast.xml.txt
index e2b7051..ca78669 100644
--- a/test/expect/castxml1.any.Function-Argument-default-cast.xml.txt
+++ b/test/expect/castxml1.any.Function-Argument-default-cast.xml.txt
@@ -32,12 +32,12 @@
   <Constructor id="_16" name="Derived" context="_4" access="public" location="f1:7" file="f1" line="7" inline="1" artificial="1"( throw="")?>
     <Argument type="_25" location="f1:7" file="f1" line="7"/>
   </Constructor>
-  <PointerType id="_17" type="_3"/>
-  <PointerType id="_18" type="_3c"/>
+  <PointerType id="_17" type="_3" size="[0-9]+" align="[0-9]+"/>
+  <PointerType id="_18" type="_3c" size="[0-9]+" align="[0-9]+"/>
   <CvQualifiedType id="_3c" type="_3" const="1"/>
   <FundamentalType id="_19" name="int" size="[0-9]+" align="[0-9]+"/>
   <FundamentalType id="_20" name="void" size="[0-9]+" align="[0-9]+"/>
-  <PointerType id="_21" type="_4"/>
+  <PointerType id="_21" type="_4" size="[0-9]+" align="[0-9]+"/>
   <ReferenceType id="_22" type="_3"/>
   <ReferenceType id="_23" type="_3c"/>
   <ReferenceType id="_24" type="_4"/>
diff --git a/test/expect/castxml1.any.Function-Argument-default.xml.txt b/test/expect/castxml1.any.Function-Argument-default.xml.txt
index 98d8079..2aa3b3b 100644
--- a/test/expect/castxml1.any.Function-Argument-default.xml.txt
+++ b/test/expect/castxml1.any.Function-Argument-default.xml.txt
@@ -6,7 +6,7 @@
   </Function>
   <FundamentalType id="_2" name="void" size="[0-9]+" align="[0-9]+"/>
   <FundamentalType id="_4" name="int" size="[0-9]+" align="[0-9]+"/>
-  <PointerType id="_5" type="_6c"/>
+  <PointerType id="_5" type="_6c" size="[0-9]+" align="[0-9]+"/>
   <CvQualifiedType id="_6c" type="_6" const="1"/>
   <Namespace id="_3" name="::"/>
   <FundamentalType id="_6" name="char" size="[0-9]+" align="[0-9]+"/>
diff --git a/test/expect/castxml1.any.Function-calling-convention-ms-annotate.xml.txt b/test/expect/castxml1.any.Function-calling-convention-ms-annotate.xml.txt
index 7512e13..878bc88 100644
--- a/test/expect/castxml1.any.Function-calling-convention-ms-annotate.xml.txt
+++ b/test/expect/castxml1.any.Function-calling-convention-ms-annotate.xml.txt
@@ -13,10 +13,10 @@
     <Argument type="_10" location="f1:8" file="f1" line="8"/>
   </Function>
   <FundamentalType id="_5" name="void" size="[0-9]+" align="[0-9]+"/>
-  <PointerType id="_7" type="_11"/>
-  <PointerType id="_8" type="_12"/>
-  <PointerType id="_9" type="_13"/>
-  <PointerType id="_10" type="_14"/>
+  <PointerType id="_7" type="_11" size="[0-9]+" align="[0-9]+"/>
+  <PointerType id="_8" type="_12" size="[0-9]+" align="[0-9]+"/>
+  <PointerType id="_9" type="_13" size="[0-9]+" align="[0-9]+"/>
+  <PointerType id="_10" type="_14" size="[0-9]+" align="[0-9]+"/>
   <Namespace id="_6" name="::"/>
   <FunctionType id="_11" returns="_5"/>
   <FunctionType id="_12" returns="_5" attributes="__stdcall__"/>
diff --git a/test/expect/castxml1.any.Function-calling-convention-ms.xml.txt b/test/expect/castxml1.any.Function-calling-convention-ms.xml.txt
index 450b3da..1b3b587 100644
--- a/test/expect/castxml1.any.Function-calling-convention-ms.xml.txt
+++ b/test/expect/castxml1.any.Function-calling-convention-ms.xml.txt
@@ -13,10 +13,10 @@
     <Argument type="_10" location="f1:4" file="f1" line="4"/>
   </Function>
   <FundamentalType id="_5" name="void" size="[0-9]+" align="[0-9]+"/>
-  <PointerType id="_7" type="_11"/>
-  <PointerType id="_8" type="_12"/>
-  <PointerType id="_9" type="_13"/>
-  <PointerType id="_10" type="_14"/>
+  <PointerType id="_7" type="_11" size="[0-9]+" align="[0-9]+"/>
+  <PointerType id="_8" type="_12" size="[0-9]+" align="[0-9]+"/>
+  <PointerType id="_9" type="_13" size="[0-9]+" align="[0-9]+"/>
+  <PointerType id="_10" type="_14" size="[0-9]+" align="[0-9]+"/>
   <Namespace id="_6" name="::"/>
   <FunctionType id="_11" returns="_5"/>
   <FunctionType id="_12" returns="_5" attributes="__stdcall__"/>
diff --git a/test/expect/castxml1.any.GNU-float128.xml.txt b/test/expect/castxml1.any.GNU-float128.xml.txt
index 1f0d86f..8d41d58 100644
--- a/test/expect/castxml1.any.GNU-float128.xml.txt
+++ b/test/expect/castxml1.any.GNU-float128.xml.txt
@@ -7,7 +7,7 @@
   <Variable id="_4" name="v" type="_6" init="" context="_1" location="f1:5" file="f1" line="5" mangled="[^"]*"/>
   <Variable id="_5" name="pa" type="_7" context="_1" location="f1:6" file="f1" line="6" mangled="[^"]*"/>
   <FundamentalType id="_6" name="__float128" size="128" align="128"/>
-  <PointerType id="_7" type="_8"/>
+  <PointerType id="_7" type="_8" size="[0-9]+" align="[0-9]+"/>
   <Namespace id="_2" name="::"/>
   <Struct id="_8" name="A&lt;__float128&gt;" context="_2" location="f1:2" file="f1" line="2" incomplete="1"/>
   <File id="f1" name=".*/test/input/GNU-float128.cxx"/>
diff --git a/test/expect/castxml1.any.Method-Argument-default-cast.xml.txt b/test/expect/castxml1.any.Method-Argument-default-cast.xml.txt
index e3ef009..739dbb2 100644
--- a/test/expect/castxml1.any.Method-Argument-default-cast.xml.txt
+++ b/test/expect/castxml1.any.Method-Argument-default-cast.xml.txt
@@ -18,7 +18,7 @@
   </OperatorMethod>
   <Destructor id="_9" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/>
   <FundamentalType id="_10" name="int" size="[0-9]+" align="[0-9]+"/>
-  <PointerType id="_11" type="_3"/>
+  <PointerType id="_11" type="_3" size="[0-9]+" align="[0-9]+"/>
   <ReferenceType id="_12" type="_1c"/>
   <CvQualifiedType id="_1c" type="_1" const="1"/>
   <ReferenceType id="_13" type="_1"/>
diff --git a/test/expect/castxml1.any.PointerType.xml.txt b/test/expect/castxml1.any.PointerType.xml.txt
index e6c5cb2..1161800 100644
--- a/test/expect/castxml1.any.PointerType.xml.txt
+++ b/test/expect/castxml1.any.PointerType.xml.txt
@@ -1,7 +1,7 @@
 ^<\?xml version="1.0"\?>
 <CastXML[^>]*>
   <Typedef id="_1" name="start" type="_2" context="_3" location="f1:1" file="f1" line="1"/>
-  <PointerType id="_2" type="_4"/>
+  <PointerType id="_2" type="_4" size="[0-9]+" align="[0-9]+"/>
   <Namespace id="_3" name="::"/>
   <FundamentalType id="_4" name="int" size="[0-9]+" align="[0-9]+"/>
   <File id="f1" name=".*/test/input/PointerType.cxx"/>
diff --git a/test/expect/castxml1.any.Variable-init.xml.txt b/test/expect/castxml1.any.Variable-init.xml.txt
index 263c572..228390e 100644
--- a/test/expect/castxml1.any.Variable-init.xml.txt
+++ b/test/expect/castxml1.any.Variable-init.xml.txt
@@ -4,7 +4,7 @@
   <Variable id="_3" name="var_int" type="_5" init="123" context="_1" location="f1:2" file="f1" line="2" mangled="[^"]+"/>
   <Variable id="_4" name="var_str" type="_6" init="&quot;abc&quot;" context="_1" location="f1:3" file="f1" line="3" mangled="[^"]+"/>
   <FundamentalType id="_5" name="int" size="[0-9]+" align="[0-9]+"/>
-  <PointerType id="_6" type="_7c"/>
+  <PointerType id="_6" type="_7c" size="[0-9]+" align="[0-9]+"/>
   <CvQualifiedType id="_7c" type="_7" const="1"/>
   <Namespace id="_2" name="::"/>
   <FundamentalType id="_7" name="char" size="[0-9]+" align="[0-9]+"/>
diff --git a/test/expect/gccxml.any.Function-Argument-decay.xml.txt b/test/expect/gccxml.any.Function-Argument-decay.xml.txt
index 53a0f21..b33aeb1 100644
--- a/test/expect/gccxml.any.Function-Argument-decay.xml.txt
+++ b/test/expect/gccxml.any.Function-Argument-decay.xml.txt
@@ -6,8 +6,8 @@
     <Argument type="_5" location="f1:1" file="f1" line="1"/>
   </Function>
   <FundamentalType id="_2" name="void" size="[0-9]+" align="[0-9]+"/>
-  <PointerType id="_4" type="_6"/>
-  <PointerType id="_5" type="_7"/>
+  <PointerType id="_4" type="_6" size="[0-9]+" align="[0-9]+"/>
+  <PointerType id="_5" type="_7" size="[0-9]+" align="[0-9]+"/>
   <Namespace id="_3" name="::"/>
   <FundamentalType id="_6" name="int" size="[0-9]+" align="[0-9]+"/>
   <FunctionType id="_7" returns="_6">
diff --git a/test/expect/gccxml.any.Function-Argument-default-cast.xml.txt b/test/expect/gccxml.any.Function-Argument-default-cast.xml.txt
index d4c40d4..247dffd 100644
--- a/test/expect/gccxml.any.Function-Argument-default-cast.xml.txt
+++ b/test/expect/gccxml.any.Function-Argument-default-cast.xml.txt
@@ -32,12 +32,12 @@
   <Constructor id="_16" name="Derived" context="_4" access="public" location="f1:7" file="f1" line="7" inline="1" artificial="1"( throw="")?>
     <Argument type="_25" location="f1:7" file="f1" line="7"/>
   </Constructor>
-  <PointerType id="_17" type="_3"/>
-  <PointerType id="_18" type="_3c"/>
+  <PointerType id="_17" type="_3" size="[0-9]+" align="[0-9]+"/>
+  <PointerType id="_18" type="_3c" size="[0-9]+" align="[0-9]+"/>
   <CvQualifiedType id="_3c" type="_3" const="1"/>
   <FundamentalType id="_19" name="int" size="[0-9]+" align="[0-9]+"/>
   <FundamentalType id="_20" name="void" size="[0-9]+" align="[0-9]+"/>
-  <PointerType id="_21" type="_4"/>
+  <PointerType id="_21" type="_4" size="[0-9]+" align="[0-9]+"/>
   <ReferenceType id="_22" type="_3"/>
   <ReferenceType id="_23" type="_3c"/>
   <ReferenceType id="_24" type="_4"/>
diff --git a/test/expect/gccxml.any.Function-Argument-default.xml.txt b/test/expect/gccxml.any.Function-Argument-default.xml.txt
index 7bb944c..d24849c 100644
--- a/test/expect/gccxml.any.Function-Argument-default.xml.txt
+++ b/test/expect/gccxml.any.Function-Argument-default.xml.txt
@@ -6,7 +6,7 @@
   </Function>
   <FundamentalType id="_2" name="void" size="[0-9]+" align="[0-9]+"/>
   <FundamentalType id="_4" name="int" size="[0-9]+" align="[0-9]+"/>
-  <PointerType id="_5" type="_6c"/>
+  <PointerType id="_5" type="_6c" size="[0-9]+" align="[0-9]+"/>
   <CvQualifiedType id="_6c" type="_6" const="1"/>
   <Namespace id="_3" name="::"/>
   <FundamentalType id="_6" name="char" size="[0-9]+" align="[0-9]+"/>
diff --git a/test/expect/gccxml.any.Function-calling-convention-ms-annotate.xml.txt b/test/expect/gccxml.any.Function-calling-convention-ms-annotate.xml.txt
index 89668b5..35fece0 100644
--- a/test/expect/gccxml.any.Function-calling-convention-ms-annotate.xml.txt
+++ b/test/expect/gccxml.any.Function-calling-convention-ms-annotate.xml.txt
@@ -13,10 +13,10 @@
     <Argument type="_10" location="f1:8" file="f1" line="8"/>
   </Function>
   <FundamentalType id="_5" name="void" size="[0-9]+" align="[0-9]+"/>
-  <PointerType id="_7" type="_11"/>
-  <PointerType id="_8" type="_12"/>
-  <PointerType id="_9" type="_13"/>
-  <PointerType id="_10" type="_14"/>
+  <PointerType id="_7" type="_11" size="[0-9]+" align="[0-9]+"/>
+  <PointerType id="_8" type="_12" size="[0-9]+" align="[0-9]+"/>
+  <PointerType id="_9" type="_13" size="[0-9]+" align="[0-9]+"/>
+  <PointerType id="_10" type="_14" size="[0-9]+" align="[0-9]+"/>
   <Namespace id="_6" name="::"/>
   <FunctionType id="_11" returns="_5"/>
   <FunctionType id="_12" returns="_5" attributes="__stdcall__"/>
diff --git a/test/expect/gccxml.any.Function-calling-convention-ms.xml.txt b/test/expect/gccxml.any.Function-calling-convention-ms.xml.txt
index 732d970..a68588b 100644
--- a/test/expect/gccxml.any.Function-calling-convention-ms.xml.txt
+++ b/test/expect/gccxml.any.Function-calling-convention-ms.xml.txt
@@ -13,10 +13,10 @@
     <Argument type="_10" location="f1:4" file="f1" line="4"/>
   </Function>
   <FundamentalType id="_5" name="void" size="[0-9]+" align="[0-9]+"/>
-  <PointerType id="_7" type="_11"/>
-  <PointerType id="_8" type="_12"/>
-  <PointerType id="_9" type="_13"/>
-  <PointerType id="_10" type="_14"/>
+  <PointerType id="_7" type="_11" size="[0-9]+" align="[0-9]+"/>
+  <PointerType id="_8" type="_12" size="[0-9]+" align="[0-9]+"/>
+  <PointerType id="_9" type="_13" size="[0-9]+" align="[0-9]+"/>
+  <PointerType id="_10" type="_14" size="[0-9]+" align="[0-9]+"/>
   <Namespace id="_6" name="::"/>
   <FunctionType id="_11" returns="_5"/>
   <FunctionType id="_12" returns="_5" attributes="__stdcall__"/>
diff --git a/test/expect/gccxml.any.GNU-float128.xml.txt b/test/expect/gccxml.any.GNU-float128.xml.txt
index 24520eb..9873ab4 100644
--- a/test/expect/gccxml.any.GNU-float128.xml.txt
+++ b/test/expect/gccxml.any.GNU-float128.xml.txt
@@ -7,7 +7,7 @@
   <Variable id="_4" name="v" type="_6" init="" context="_1" location="f1:5" file="f1" line="5" mangled="[^"]*"/>
   <Variable id="_5" name="pa" type="_7" context="_1" location="f1:6" file="f1" line="6" mangled="[^"]*"/>
   <FundamentalType id="_6" name="__float128" size="128" align="128"/>
-  <PointerType id="_7" type="_8"/>
+  <PointerType id="_7" type="_8" size="[0-9]+" align="[0-9]+"/>
   <Namespace id="_2" name="::"/>
   <Struct id="_8" name="A&lt;__float128&gt;" context="_2" location="f1:2" file="f1" line="2" incomplete="1"/>
   <File id="f1" name=".*/test/input/GNU-float128.cxx"/>
diff --git a/test/expect/gccxml.any.Method-Argument-default-cast.xml.txt b/test/expect/gccxml.any.Method-Argument-default-cast.xml.txt
index 809b667..01883d9 100644
--- a/test/expect/gccxml.any.Method-Argument-default-cast.xml.txt
+++ b/test/expect/gccxml.any.Method-Argument-default-cast.xml.txt
@@ -18,7 +18,7 @@
   </OperatorMethod>
   <Destructor id="_9" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/>
   <FundamentalType id="_10" name="int" size="[0-9]+" align="[0-9]+"/>
-  <PointerType id="_11" type="_3"/>
+  <PointerType id="_11" type="_3" size="[0-9]+" align="[0-9]+"/>
   <ReferenceType id="_12" type="_1c"/>
   <CvQualifiedType id="_1c" type="_1" const="1"/>
   <ReferenceType id="_13" type="_1"/>
diff --git a/test/expect/gccxml.any.PointerType.xml.txt b/test/expect/gccxml.any.PointerType.xml.txt
index e1c9fa9..b7f4c32 100644
--- a/test/expect/gccxml.any.PointerType.xml.txt
+++ b/test/expect/gccxml.any.PointerType.xml.txt
@@ -1,7 +1,7 @@
 ^<\?xml version="1.0"\?>
 <GCC_XML[^>]*>
   <Typedef id="_1" name="start" type="_2" context="_3" location="f1:1" file="f1" line="1"/>
-  <PointerType id="_2" type="_4"/>
+  <PointerType id="_2" type="_4" size="[0-9]+" align="[0-9]+"/>
   <Namespace id="_3" name="::"/>
   <FundamentalType id="_4" name="int" size="[0-9]+" align="[0-9]+"/>
   <File id="f1" name=".*/test/input/PointerType.cxx"/>
diff --git a/test/expect/gccxml.any.Variable-init.xml.txt b/test/expect/gccxml.any.Variable-init.xml.txt
index 96ed031..f8c1533 100644
--- a/test/expect/gccxml.any.Variable-init.xml.txt
+++ b/test/expect/gccxml.any.Variable-init.xml.txt
@@ -4,7 +4,7 @@
   <Variable id="_3" name="var_int" type="_5" init="123" context="_1" location="f1:2" file="f1" line="2" mangled="[^"]+"/>
   <Variable id="_4" name="var_str" type="_6" init="&quot;abc&quot;" context="_1" location="f1:3" file="f1" line="3" mangled="[^"]+"/>
   <FundamentalType id="_5" name="int" size="[0-9]+" align="[0-9]+"/>
-  <PointerType id="_6" type="_7c"/>
+  <PointerType id="_6" type="_7c" size="[0-9]+" align="[0-9]+"/>
   <CvQualifiedType id="_7c" type="_7" const="1"/>
   <Namespace id="_2" name="::"/>
   <FundamentalType id="_7" name="char" size="[0-9]+" align="[0-9]+"/>