diff options
| author | Brad King <brad.king@kitware.com> | 2017-09-28 12:26:46 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-09-28 12:26:46 (GMT) |
| commit | 98e2fb964f7e6d23d1b4ea7674f0f83d2b049fcc (patch) | |
| tree | ac0dfb6c435ad4456846eec85bd883ae68c4cf50 /test/expect | |
| parent | bbe3117a26ad11ba74a8f2c3f0a38bf3ef9864bb (diff) | |
| download | CastXML-98e2fb964f7e6d23d1b4ea7674f0f83d2b049fcc.zip CastXML-98e2fb964f7e6d23d1b4ea7674f0f83d2b049fcc.tar.gz CastXML-98e2fb964f7e6d23d1b4ea7674f0f83d2b049fcc.tar.bz2 | |
Output: Add size and align attributes to ReferenceType
These were included by gccxml, and they make sense for a reference
type because its ABI is like a pointer type.
Suggested-by: todoooo@users.noreply.github.com
Issue: #89
Diffstat (limited to 'test/expect')
118 files changed, 322 insertions, 322 deletions
diff --git a/test/expect/castxml1.any.Class-abstract.xml.txt b/test/expect/castxml1.any.Class-abstract.xml.txt index d1774ce..5f1f934 100644 --- a/test/expect/castxml1.any.Class-abstract.xml.txt +++ b/test/expect/castxml1.any.Class-abstract.xml.txt @@ -14,8 +14,8 @@ <Argument type="_11" location="f1:1" file="f1" line="1"/> </Constructor> <FundamentalType id="_9" name="int" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_10" type="_1"/> - <ReferenceType id="_11" type="_1c"/> + <ReferenceType id="_10" type="_1" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_11" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-abstract.cxx"/> diff --git a/test/expect/castxml1.any.Class-annotate.xml.txt b/test/expect/castxml1.any.Class-annotate.xml.txt index 24ac0ea..ad666c9 100644 --- a/test/expect/castxml1.any.Class-annotate.xml.txt +++ b/test/expect/castxml1.any.Class-annotate.xml.txt @@ -9,9 +9,9 @@ <Argument type="_7" location="f1:1" file="f1" line="1"/> </OperatorMethod> <Destructor id="_6" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_7" type="_1c"/> + <ReferenceType id="_7" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_8" type="_1"/> + <ReferenceType id="_8" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-annotate.cxx"/> </CastXML>$ diff --git a/test/expect/castxml1.any.Class-base-typedef.xml.txt b/test/expect/castxml1.any.Class-base-typedef.xml.txt index b5f8e4d..71b39ed 100644 --- a/test/expect/castxml1.any.Class-base-typedef.xml.txt +++ b/test/expect/castxml1.any.Class-base-typedef.xml.txt @@ -12,9 +12,9 @@ </OperatorMethod> <Destructor id="_6" name="start" context="_1" access="public" location="f1:5" file="f1" line="5" inline="1" artificial="1"( throw="")?/> <Class id="_7" name="base" context="_2" location="f1:1" file="f1" line="1" members="_10 _11 _12 _13" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_8" type="_1c"/> + <ReferenceType id="_8" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_9" type="_1"/> + <ReferenceType id="_9" type="_1" size="[0-9]+" align="[0-9]+"/> <Constructor id="_10" name="base" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> <Constructor id="_11" name="base" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?> <Argument type="_14" location="f1:1" file="f1" line="1"/> @@ -23,9 +23,9 @@ <Argument type="_14" location="f1:1" file="f1" line="1"/> </OperatorMethod> <Destructor id="_13" name="base" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_14" type="_7c"/> + <ReferenceType id="_14" type="_7c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_7c" type="_7" const="1"/> - <ReferenceType id="_15" type="_7"/> + <ReferenceType id="_15" type="_7" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-base-typedef.cxx"/> </CastXML>$ diff --git a/test/expect/castxml1.any.Class-forward.xml.txt b/test/expect/castxml1.any.Class-forward.xml.txt index ed93735..32acbf4 100644 --- a/test/expect/castxml1.any.Class-forward.xml.txt +++ b/test/expect/castxml1.any.Class-forward.xml.txt @@ -9,9 +9,9 @@ <Argument type="_7" location="f1:7" file="f1" line="7"/> </OperatorMethod> <Destructor id="_6" name="start" context="_1" access="public" location="f1:8" file="f1" line="8"/> - <ReferenceType id="_7" type="_1c"/> + <ReferenceType id="_7" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_8" type="_1"/> + <ReferenceType id="_8" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-forward.cxx"/> </CastXML>$ diff --git a/test/expect/castxml1.any.Class-friends.xml.txt b/test/expect/castxml1.any.Class-friends.xml.txt index 1e05ca3..39e7415 100644 --- a/test/expect/castxml1.any.Class-friends.xml.txt +++ b/test/expect/castxml1.any.Class-friends.xml.txt @@ -9,9 +9,9 @@ <Argument type="_9" location="f1:5" file="f1" line="5"/> </OperatorMethod> <Destructor id="_6" name="start" context="_1" access="public" location="f1:5" file="f1" line="5" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_9" type="_1c"/> + <ReferenceType id="_9" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_10" type="_1"/> + <ReferenceType id="_10" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <Function id="_7" name="f" returns="_11" context="_2" location="f1:4" file="f1" line="4" mangled="[^"]+"/> <ElaboratedType id="_8" type="_12"/> diff --git a/test/expect/castxml1.any.Class-implicit-member-access-mutable.xml.txt b/test/expect/castxml1.any.Class-implicit-member-access-mutable.xml.txt index 86c7f94..842e68e 100644 --- a/test/expect/castxml1.any.Class-implicit-member-access-mutable.xml.txt +++ b/test/expect/castxml1.any.Class-implicit-member-access-mutable.xml.txt @@ -15,9 +15,9 @@ <Argument type="_11" location="f1:9" file="f1" line="9"/> </OperatorMethod> <Field id="_10" name="data" type="_13" context="_5" access="private" location="f1:10" file="f1" line="10" offset="0" mutable="1"/> - <ReferenceType id="_11" type="_5c"/> + <ReferenceType id="_11" type="_5c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_5c" type="_5" const="1"/> - <ReferenceType id="_12" type="_5"/> + <ReferenceType id="_12" type="_5" size="[0-9]+" align="[0-9]+"/> <FundamentalType id="_13" name="int" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-implicit-member-access-mutable.cxx"/> diff --git a/test/expect/castxml1.any.Class-implicit-member-access.xml.txt b/test/expect/castxml1.any.Class-implicit-member-access.xml.txt index a3ca787..9968a60 100644 --- a/test/expect/castxml1.any.Class-implicit-member-access.xml.txt +++ b/test/expect/castxml1.any.Class-implicit-member-access.xml.txt @@ -14,9 +14,9 @@ <OperatorMethod id="_9" name="=" returns="_11" context="_5" access="private" location="f1:9" file="f1" line="9" mangled="[^"]+"> <Argument type="_10" location="f1:9" file="f1" line="9"/> </OperatorMethod> - <ReferenceType id="_10" type="_5c"/> + <ReferenceType id="_10" type="_5c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_5c" type="_5" const="1"/> - <ReferenceType id="_11" type="_5"/> + <ReferenceType id="_11" type="_5" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-implicit-member-access.cxx"/> </CastXML>$ diff --git a/test/expect/castxml1.any.Class-implicit-member-array.xml.txt b/test/expect/castxml1.any.Class-implicit-member-array.xml.txt index dcf4139..4d85482 100644 --- a/test/expect/castxml1.any.Class-implicit-member-array.xml.txt +++ b/test/expect/castxml1.any.Class-implicit-member-array.xml.txt @@ -11,9 +11,9 @@ </OperatorMethod> <Destructor id="_7" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> <ArrayType id="_8" min="0" max="1" type="_11"/> - <ReferenceType id="_9" type="_1c"/> + <ReferenceType id="_9" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_10" type="_1"/> + <ReferenceType id="_10" type="_1" size="[0-9]+" align="[0-9]+"/> <FundamentalType id="_11" name="int" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-implicit-member-array.cxx"/> diff --git a/test/expect/castxml1.any.Class-implicit-member-bad-base.xml.txt b/test/expect/castxml1.any.Class-implicit-member-bad-base.xml.txt index e55cf63..4f15954 100644 --- a/test/expect/castxml1.any.Class-implicit-member-bad-base.xml.txt +++ b/test/expect/castxml1.any.Class-implicit-member-bad-base.xml.txt @@ -9,7 +9,7 @@ </Constructor> <Destructor id="_5" name="start" context="_1" access="public" location="f1:9" file="f1" line="9" inline="1" artificial="1"( throw="")?/> <Class id="_6" name="base<const int>" context="_2" location="f1:2" file="f1" line="2" members="_8 _9 _10 _11" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_7" type="_1c"/> + <ReferenceType id="_7" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> <Field id="_8" name="data" type="_12c" context="_6" access="protected" location="f1:5" file="f1" line="5" offset="0"/> <Constructor id="_9" name="base" context="_6" access="protected" location="f1:6" file="f1" line="6"/> @@ -19,7 +19,7 @@ <Destructor id="_11" name="base" context="_6" access="public" location="f1:2" file="f1" line="2" inline="1" artificial="1"( throw="")?/> <FundamentalType id="_12" name="int" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_12c" type="_12" const="1"/> - <ReferenceType id="_13" type="_6c"/> + <ReferenceType id="_13" type="_6c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_6c" type="_6" const="1"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-implicit-member-bad-base.cxx"/> diff --git a/test/expect/castxml1.any.Class-implicit-member-const-aggregate.xml.txt b/test/expect/castxml1.any.Class-implicit-member-const-aggregate.xml.txt index 64b1748..523e901 100644 --- a/test/expect/castxml1.any.Class-implicit-member-const-aggregate.xml.txt +++ b/test/expect/castxml1.any.Class-implicit-member-const-aggregate.xml.txt @@ -8,7 +8,7 @@ <Destructor id="_5" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> <FundamentalType id="_6" name="int" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_6c" type="_6" const="1"/> - <ReferenceType id="_7" type="_1c"/> + <ReferenceType id="_7" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-implicit-member-const-aggregate.cxx"/> diff --git a/test/expect/castxml1.any.Class-implicit-member-const.xml.txt b/test/expect/castxml1.any.Class-implicit-member-const.xml.txt index 6cf9176..5842698 100644 --- a/test/expect/castxml1.any.Class-implicit-member-const.xml.txt +++ b/test/expect/castxml1.any.Class-implicit-member-const.xml.txt @@ -9,7 +9,7 @@ <Destructor id="_6" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> <FundamentalType id="_7" name="int" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_7c" type="_7" const="1"/> - <ReferenceType id="_8" type="_1c"/> + <ReferenceType id="_8" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-implicit-member-const.cxx"/> diff --git a/test/expect/castxml1.any.Class-implicit-member-reference.xml.txt b/test/expect/castxml1.any.Class-implicit-member-reference.xml.txt index 82e939d..d405a53 100644 --- a/test/expect/castxml1.any.Class-implicit-member-reference.xml.txt +++ b/test/expect/castxml1.any.Class-implicit-member-reference.xml.txt @@ -7,8 +7,8 @@ <Argument type="_8" location="f1:1" file="f1" line="1"/> </Constructor> <Destructor id="_6" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_7" type="_9"/> - <ReferenceType id="_8" type="_1c"/> + <ReferenceType id="_7" type="_9" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_8" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> <Namespace id="_2" name="::"/> <FundamentalType id="_9" name="int" size="[0-9]+" align="[0-9]+"/> diff --git a/test/expect/castxml1.any.Class-implicit-members.xml.txt b/test/expect/castxml1.any.Class-implicit-members.xml.txt index 21b01b0..807f6cb 100644 --- a/test/expect/castxml1.any.Class-implicit-members.xml.txt +++ b/test/expect/castxml1.any.Class-implicit-members.xml.txt @@ -12,9 +12,9 @@ <Argument type="_8" location="f1:1" file="f1" line="1"/> </OperatorMethod> <Destructor id="_7" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_8" type="_1c"/> + <ReferenceType id="_8" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_9" type="_1"/> + <ReferenceType id="_9" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-implicit-members.cxx"/> </CastXML>$ diff --git a/test/expect/castxml1.any.Class-member-template-access.xml.txt b/test/expect/castxml1.any.Class-member-template-access.xml.txt index 142f073..c166630 100644 --- a/test/expect/castxml1.any.Class-member-template-access.xml.txt +++ b/test/expect/castxml1.any.Class-member-template-access.xml.txt @@ -20,12 +20,12 @@ <Argument type="_16" location="f1:11" file="f1" line="11"/> </OperatorMethod> <Destructor id="_13" name="member" context="_4" access="public" location="f1:11" file="f1" line="11" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_14" type="_1c"/> + <ReferenceType id="_14" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_15" type="_1"/> - <ReferenceType id="_16" type="_4c"/> + <ReferenceType id="_15" type="_1" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_16" type="_4c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_4c" type="_4" const="1"/> - <ReferenceType id="_17" type="_4"/> + <ReferenceType id="_17" type="_4" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-member-template-access.cxx"/> </CastXML>$ diff --git a/test/expect/castxml1.any.Class-member-template.xml.txt b/test/expect/castxml1.any.Class-member-template.xml.txt index 1d36397..60734c6 100644 --- a/test/expect/castxml1.any.Class-member-template.xml.txt +++ b/test/expect/castxml1.any.Class-member-template.xml.txt @@ -13,9 +13,9 @@ </OperatorMethod> <Destructor id="_7" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> <FundamentalType id="_8" name="int" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_9" type="_1c"/> + <ReferenceType id="_9" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_10" type="_1"/> + <ReferenceType id="_10" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-member-template.cxx"/> </CastXML>$ diff --git a/test/expect/castxml1.any.Class-partial-template-member-Typedef.xml.txt b/test/expect/castxml1.any.Class-partial-template-member-Typedef.xml.txt index cb786c6..853e3d8 100644 --- a/test/expect/castxml1.any.Class-partial-template-member-Typedef.xml.txt +++ b/test/expect/castxml1.any.Class-partial-template-member-Typedef.xml.txt @@ -14,9 +14,9 @@ </OperatorMethod> <Destructor id="_8" name="start" context="_1" access="public" location="f1:11" file="f1" line="11" inline="1" artificial="1"( throw="")?/> <FundamentalType id="_9" name="int" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_10" type="_1c"/> + <ReferenceType id="_10" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_11" type="_1"/> + <ReferenceType id="_11" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-partial-template-member-Typedef.cxx"/> </CastXML>$ diff --git a/test/expect/castxml1.any.Class-template-Method-Argument-const.xml.txt b/test/expect/castxml1.any.Class-template-Method-Argument-const.xml.txt index 7819a51..77c4dd7 100644 --- a/test/expect/castxml1.any.Class-template-Method-Argument-const.xml.txt +++ b/test/expect/castxml1.any.Class-template-Method-Argument-const.xml.txt @@ -13,10 +13,10 @@ </OperatorMethod> <Destructor id="_7" name="start" context="_1" access="public" location="f1:6" file="f1" line="6" inline="1" artificial="1"( throw="")?/> <FundamentalType id="_8" name="void" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_9" type="_12c"/> - <ReferenceType id="_10" type="_1c"/> + <ReferenceType id="_9" type="_12c" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_10" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_11" type="_1"/> + <ReferenceType id="_11" type="_1" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_12c" type="_12" const="1"/> <Namespace id="_2" name="::"/> <FundamentalType id="_12" name="int" size="[0-9]+" align="[0-9]+"/> diff --git a/test/expect/castxml1.any.Class-template-Method-Argument-default.xml.txt b/test/expect/castxml1.any.Class-template-Method-Argument-default.xml.txt index 864bbef..f73f1a1 100644 --- a/test/expect/castxml1.any.Class-template-Method-Argument-default.xml.txt +++ b/test/expect/castxml1.any.Class-template-Method-Argument-default.xml.txt @@ -13,9 +13,9 @@ </OperatorMethod> <Destructor id="_7" name="start" context="_1" access="public" location="f1:6" file="f1" line="6" inline="1" artificial="1"( throw="")?/> <FundamentalType id="_8" name="int" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_9" type="_1c"/> + <ReferenceType id="_9" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_10" type="_1"/> + <ReferenceType id="_10" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-template-Method-Argument-default.cxx"/> </CastXML>$ diff --git a/test/expect/castxml1.any.Class-template-Method-return-const.xml.txt b/test/expect/castxml1.any.Class-template-Method-return-const.xml.txt index 85dcfef..96f864b 100644 --- a/test/expect/castxml1.any.Class-template-Method-return-const.xml.txt +++ b/test/expect/castxml1.any.Class-template-Method-return-const.xml.txt @@ -12,9 +12,9 @@ <Destructor id="_7" name="start" context="_1" access="public" location="f1:6" file="f1" line="6" inline="1" artificial="1"( throw="")?/> <FundamentalType id="_8" name="int" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_8c" type="_8" const="1"/> - <ReferenceType id="_9" type="_1c"/> + <ReferenceType id="_9" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_10" type="_1"/> + <ReferenceType id="_10" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-template-Method-return-const.cxx"/> </CastXML>$ diff --git a/test/expect/castxml1.any.Class-template-constructor-template.xml.txt b/test/expect/castxml1.any.Class-template-constructor-template.xml.txt index 4423318..f5682fa 100644 --- a/test/expect/castxml1.any.Class-template-constructor-template.xml.txt +++ b/test/expect/castxml1.any.Class-template-constructor-template.xml.txt @@ -11,10 +11,10 @@ <Argument type="_7" location="f1:2" file="f1" line="2"/> </OperatorMethod> <Destructor id="_6" name="start" context="_1" access="public" location="f1:2" file="f1" line="2" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_7" type="_1c"/> + <ReferenceType id="_7" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_8" type="_1c"/> - <ReferenceType id="_9" type="_1"/> + <ReferenceType id="_8" type="_1c" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_9" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-template-constructor-template.cxx"/> </CastXML>$ diff --git a/test/expect/castxml1.any.Class-template-friends.xml.txt b/test/expect/castxml1.any.Class-template-friends.xml.txt index 7e1119a..6013aa9 100644 --- a/test/expect/castxml1.any.Class-template-friends.xml.txt +++ b/test/expect/castxml1.any.Class-template-friends.xml.txt @@ -9,9 +9,9 @@ <Argument type="_9" location="f1:13" file="f1" line="13"/> </OperatorMethod> <Destructor id="_6" name="start" context="_1" access="public" location="f1:13" file="f1" line="13" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_9" type="_1c"/> + <ReferenceType id="_9" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_10" type="_1"/> + <ReferenceType id="_10" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <Function id="_7" name="f" returns="_11" context="_2" location="f1:9" file="f1" line="9" mangled="[^"]+"> <Argument type="_11" location="f1:4" file="f1" line="4"/> diff --git a/test/expect/castxml1.any.Class-template-member-Typedef-const.xml.txt b/test/expect/castxml1.any.Class-template-member-Typedef-const.xml.txt index 2ee0258..18f874d 100644 --- a/test/expect/castxml1.any.Class-template-member-Typedef-const.xml.txt +++ b/test/expect/castxml1.any.Class-template-member-Typedef-const.xml.txt @@ -15,9 +15,9 @@ <Destructor id="_8" name="start" context="_1" access="public" location="f1:9" file="f1" line="9" inline="1" artificial="1"( throw="")?/> <FundamentalType id="_9" name="int" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_9c" type="_9" const="1"/> - <ReferenceType id="_10" type="_1c"/> + <ReferenceType id="_10" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_11" type="_1"/> + <ReferenceType id="_11" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-template-member-Typedef-const.cxx"/> </CastXML>$ diff --git a/test/expect/castxml1.any.Class-template-member-Typedef.xml.txt b/test/expect/castxml1.any.Class-template-member-Typedef.xml.txt index 1fb29c0..fd49911 100644 --- a/test/expect/castxml1.any.Class-template-member-Typedef.xml.txt +++ b/test/expect/castxml1.any.Class-template-member-Typedef.xml.txt @@ -14,9 +14,9 @@ </OperatorMethod> <Destructor id="_8" name="start" context="_1" access="public" location="f1:9" file="f1" line="9" inline="1" artificial="1"( throw="")?/> <FundamentalType id="_9" name="int" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_10" type="_1c"/> + <ReferenceType id="_10" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_11" type="_1"/> + <ReferenceType id="_11" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-template-member-Typedef.cxx"/> </CastXML>$ diff --git a/test/expect/castxml1.any.Class-template-member-template.xml.txt b/test/expect/castxml1.any.Class-template-member-template.xml.txt index 12740fd..c152051 100644 --- a/test/expect/castxml1.any.Class-template-member-template.xml.txt +++ b/test/expect/castxml1.any.Class-template-member-template.xml.txt @@ -14,9 +14,9 @@ <Destructor id="_7" name="start" context="_1" access="public" location="f1:2" file="f1" line="2" inline="1" artificial="1"( throw="")?/> <FundamentalType id="_8" name="int" size="[0-9]+" align="[0-9]+"/> <FundamentalType id="_9" name="char" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_10" type="_1c"/> + <ReferenceType id="_10" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_11" type="_1"/> + <ReferenceType id="_11" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-template-member-template.cxx"/> </CastXML>$ diff --git a/test/expect/castxml1.any.Class-template-recurse.xml.txt b/test/expect/castxml1.any.Class-template-recurse.xml.txt index 3158042..95cb4f0 100644 --- a/test/expect/castxml1.any.Class-template-recurse.xml.txt +++ b/test/expect/castxml1.any.Class-template-recurse.xml.txt @@ -10,9 +10,9 @@ <Argument type="_8" location="f1:11" file="f1" line="11"/> </OperatorMethod> <Destructor id="_7" name="C" context="_2" access="public" location="f1:11" file="f1" line="11" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_8" type="_2c"/> + <ReferenceType id="_8" type="_2c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_2c" type="_2" const="1"/> - <ReferenceType id="_9" type="_2"/> + <ReferenceType id="_9" type="_2" size="[0-9]+" align="[0-9]+"/> <Namespace id="_3" name="::"/> <File id="f1" name=".*/test/input/Class-template-recurse.cxx"/> </CastXML>$ diff --git a/test/expect/castxml1.any.Class-template.xml.txt b/test/expect/castxml1.any.Class-template.xml.txt index 617a12b..327e461 100644 --- a/test/expect/castxml1.any.Class-template.xml.txt +++ b/test/expect/castxml1.any.Class-template.xml.txt @@ -19,12 +19,12 @@ <Argument type="_15" location="f1:12" file="f1" line="12"/> </OperatorMethod> <Destructor id="_12" name="start" context="_3" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_13" type="_2c"/> + <ReferenceType id="_13" type="_2c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_2c" type="_2" const="1"/> - <ReferenceType id="_14" type="_2"/> - <ReferenceType id="_15" type="_3c"/> + <ReferenceType id="_14" type="_2" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_15" type="_3c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_3c" type="_3" const="1"/> - <ReferenceType id="_16" type="_3"/> + <ReferenceType id="_16" type="_3" size="[0-9]+" align="[0-9]+"/> <Namespace id="_4" name="::"/> <File id="f1" name=".*/test/input/Class-template.cxx"/> </CastXML>$ diff --git a/test/expect/castxml1.any.Class.xml.txt b/test/expect/castxml1.any.Class.xml.txt index 6b270fd..99017e5 100644 --- a/test/expect/castxml1.any.Class.xml.txt +++ b/test/expect/castxml1.any.Class.xml.txt @@ -9,9 +9,9 @@ <Argument type="_7" location="f1:1" file="f1" line="1"/> </OperatorMethod> <Destructor id="_6" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_7" type="_1c"/> + <ReferenceType id="_7" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_8" type="_1"/> + <ReferenceType id="_8" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class.cxx"/> </CastXML>$ diff --git a/test/expect/castxml1.any.Constructor-annotate.xml.txt b/test/expect/castxml1.any.Constructor-annotate.xml.txt index e4f9b54..c5cae36 100644 --- a/test/expect/castxml1.any.Constructor-annotate.xml.txt +++ b/test/expect/castxml1.any.Constructor-annotate.xml.txt @@ -9,9 +9,9 @@ <Argument type="_7" location="f1:1" file="f1" line="1"/> </OperatorMethod> <Destructor id="_6" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_7" type="_1c"/> + <ReferenceType id="_7" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_8" type="_1"/> + <ReferenceType id="_8" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Constructor-annotate.cxx"/> </CastXML>$ diff --git a/test/expect/castxml1.any.Constructor.xml.txt b/test/expect/castxml1.any.Constructor.xml.txt index 23460b4..8c457b0 100644 --- a/test/expect/castxml1.any.Constructor.xml.txt +++ b/test/expect/castxml1.any.Constructor.xml.txt @@ -9,9 +9,9 @@ <Argument type="_7" location="f1:1" file="f1" line="1"/> </OperatorMethod> <Destructor id="_6" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_7" type="_1c"/> + <ReferenceType id="_7" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_8" type="_1"/> + <ReferenceType id="_8" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Constructor.cxx"/> </CastXML>$ diff --git a/test/expect/castxml1.any.Converter-annotate.xml.txt b/test/expect/castxml1.any.Converter-annotate.xml.txt index 37e05ea..3d10d95 100644 --- a/test/expect/castxml1.any.Converter-annotate.xml.txt +++ b/test/expect/castxml1.any.Converter-annotate.xml.txt @@ -11,9 +11,9 @@ </OperatorMethod> <Destructor id="_7" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> <FundamentalType id="_8" name="int" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_9" type="_1c"/> + <ReferenceType id="_9" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_10" type="_1"/> + <ReferenceType id="_10" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Converter-annotate.cxx"/> </CastXML>$ diff --git a/test/expect/castxml1.any.Converter.xml.txt b/test/expect/castxml1.any.Converter.xml.txt index 98bdda8..93bed6a 100644 --- a/test/expect/castxml1.any.Converter.xml.txt +++ b/test/expect/castxml1.any.Converter.xml.txt @@ -11,9 +11,9 @@ </OperatorMethod> <Destructor id="_7" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> <FundamentalType id="_8" name="int" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_9" type="_1c"/> + <ReferenceType id="_9" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_10" type="_1"/> + <ReferenceType id="_10" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Converter.cxx"/> </CastXML>$ diff --git a/test/expect/castxml1.any.Destructor-annotate.xml.txt b/test/expect/castxml1.any.Destructor-annotate.xml.txt index b21a772..ecc3bf0 100644 --- a/test/expect/castxml1.any.Destructor-annotate.xml.txt +++ b/test/expect/castxml1.any.Destructor-annotate.xml.txt @@ -9,9 +9,9 @@ <OperatorMethod id="_6" name="=" returns="_8" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")? mangled="[^"]+"> <Argument type="_7" location="f1:1" file="f1" line="1"/> </OperatorMethod> - <ReferenceType id="_7" type="_1c"/> + <ReferenceType id="_7" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_8" type="_1"/> + <ReferenceType id="_8" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Destructor-annotate.cxx"/> </CastXML>$ diff --git a/test/expect/castxml1.any.Destructor.xml.txt b/test/expect/castxml1.any.Destructor.xml.txt index 5298fb4..4204468 100644 --- a/test/expect/castxml1.any.Destructor.xml.txt +++ b/test/expect/castxml1.any.Destructor.xml.txt @@ -9,9 +9,9 @@ <OperatorMethod id="_6" name="=" returns="_8" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")? mangled="[^"]+"> <Argument type="_7" location="f1:1" file="f1" line="1"/> </OperatorMethod> - <ReferenceType id="_7" type="_1c"/> + <ReferenceType id="_7" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_8" type="_1"/> + <ReferenceType id="_8" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Destructor.cxx"/> </CastXML>$ diff --git a/test/expect/castxml1.any.Elaborated.xml.txt b/test/expect/castxml1.any.Elaborated.xml.txt index 61362f8..008289b 100644 --- a/test/expect/castxml1.any.Elaborated.xml.txt +++ b/test/expect/castxml1.any.Elaborated.xml.txt @@ -82,12 +82,12 @@ <FundamentalType id="_58" name="void" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_59c" type="_59" const="1"/> <CvQualifiedType id="_60c" type="_60" const="1"/> - <ReferenceType id="_61" type="_17c"/> - <ReferenceType id="_62" type="_17"/> + <ReferenceType id="_61" type="_17c" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_62" type="_17" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_63c" type="_63" const="1"/> - <ReferenceType id="_64" type="_24c"/> + <ReferenceType id="_64" type="_24c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_24c" type="_24" const="1"/> - <ReferenceType id="_65" type="_24"/> + <ReferenceType id="_65" type="_24" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_66c" type="_66" const="1"/> <Namespace id="_2" name="::"/> <ElaboratedType id="_59" type="_3"/> diff --git a/test/expect/castxml1.any.Field-annotate.xml.txt b/test/expect/castxml1.any.Field-annotate.xml.txt index f8fd8c2..23099cf 100644 --- a/test/expect/castxml1.any.Field-annotate.xml.txt +++ b/test/expect/castxml1.any.Field-annotate.xml.txt @@ -11,9 +11,9 @@ </OperatorMethod> <Destructor id="_7" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> <FundamentalType id="_8" name="int" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_9" type="_1c"/> + <ReferenceType id="_9" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_10" type="_1"/> + <ReferenceType id="_10" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Field-annotate.cxx"/> </CastXML>$ diff --git a/test/expect/castxml1.any.Field.xml.txt b/test/expect/castxml1.any.Field.xml.txt index 0bf7a8a..46a5386 100644 --- a/test/expect/castxml1.any.Field.xml.txt +++ b/test/expect/castxml1.any.Field.xml.txt @@ -14,9 +14,9 @@ <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]+"/> <FundamentalType id="_11" name="unsigned int" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_12" type="_1c"/> + <ReferenceType id="_12" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_13" type="_1"/> + <ReferenceType id="_13" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Field.cxx"/> </CastXML>$ 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 1f1b51c..23ec16a 100644 --- a/test/expect/castxml1.any.Function-Argument-default-cast.xml.txt +++ b/test/expect/castxml1.any.Function-Argument-default-cast.xml.txt @@ -38,11 +38,11 @@ <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" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_22" type="_3"/> - <ReferenceType id="_23" type="_3c"/> - <ReferenceType id="_24" type="_4c"/> + <ReferenceType id="_22" type="_3" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_23" type="_3c" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_24" type="_4c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_4c" type="_4" const="1"/> - <ReferenceType id="_25" type="_4"/> + <ReferenceType id="_25" type="_4" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Function-Argument-default-cast.cxx"/> </CastXML>$ 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 739dbb2..4af326d 100644 --- a/test/expect/castxml1.any.Method-Argument-default-cast.xml.txt +++ b/test/expect/castxml1.any.Method-Argument-default-cast.xml.txt @@ -19,9 +19,9 @@ <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" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_12" type="_1c"/> + <ReferenceType id="_12" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_13" type="_1"/> + <ReferenceType id="_13" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Method-Argument-default-cast.cxx"/> </CastXML>$ diff --git a/test/expect/castxml1.any.Method-Argument-default.xml.txt b/test/expect/castxml1.any.Method-Argument-default.xml.txt index e7481e3..159d9b6 100644 --- a/test/expect/castxml1.any.Method-Argument-default.xml.txt +++ b/test/expect/castxml1.any.Method-Argument-default.xml.txt @@ -15,9 +15,9 @@ <Destructor id="_8" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> <FundamentalType id="_9" name="int" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_9c" type="_9" const="1"/> - <ReferenceType id="_10" type="_1c"/> + <ReferenceType id="_10" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_11" type="_1"/> + <ReferenceType id="_11" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Method-Argument-default.cxx"/> </CastXML>$ diff --git a/test/expect/castxml1.any.Method-annotate.xml.txt b/test/expect/castxml1.any.Method-annotate.xml.txt index 66cdb40..46c8b8f 100644 --- a/test/expect/castxml1.any.Method-annotate.xml.txt +++ b/test/expect/castxml1.any.Method-annotate.xml.txt @@ -13,9 +13,9 @@ </OperatorMethod> <Destructor id="_7" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> <FundamentalType id="_8" name="int" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_9" type="_1c"/> + <ReferenceType id="_9" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_10" type="_1"/> + <ReferenceType id="_10" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Method-annotate.cxx"/> </CastXML>$ diff --git a/test/expect/castxml1.any.Method-overrides.xml.txt b/test/expect/castxml1.any.Method-overrides.xml.txt index d3ffc30..9dde848 100644 --- a/test/expect/castxml1.any.Method-overrides.xml.txt +++ b/test/expect/castxml1.any.Method-overrides.xml.txt @@ -19,8 +19,8 @@ <Method id="_10" name="method" returns="_9" context="_8" access="private" location="f1:3" file="f1" line="3" virtual="1" mangled="[^"]+"> <Argument type="_9" location="f1:3" file="f1" line="3"/> </Method> - <ReferenceType id="_11" type="_1"/> - <ReferenceType id="_12" type="_1c"/> + <ReferenceType id="_11" type="_1" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_12" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> <OperatorMethod id="_13" name="=" returns="_17" context="_8" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")? mangled="[^"]+"> <Argument type="_18" location="f1:1" file="f1" line="1"/> @@ -30,8 +30,8 @@ <Constructor id="_16" name="base" context="_8" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?> <Argument type="_18" location="f1:1" file="f1" line="1"/> </Constructor> - <ReferenceType id="_17" type="_8"/> - <ReferenceType id="_18" type="_8c"/> + <ReferenceType id="_17" type="_8" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_18" type="_8c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_8c" type="_8" const="1"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Method-overrides.cxx"/> diff --git a/test/expect/castxml1.any.Method-rvalue-reference.xml.txt b/test/expect/castxml1.any.Method-rvalue-reference.xml.txt index 039564d..6470a7d 100644 --- a/test/expect/castxml1.any.Method-rvalue-reference.xml.txt +++ b/test/expect/castxml1.any.Method-rvalue-reference.xml.txt @@ -11,7 +11,7 @@ <Argument type="_8" location="f1:7" file="f1" line="7"/> </Method> <Destructor id="_6" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_7" type="_1"/> + <ReferenceType id="_7" type="_1" size="[0-9]+" align="[0-9]+"/> <FundamentalType id="_8" name="int" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Method-rvalue-reference.cxx"/> diff --git a/test/expect/castxml1.any.Method.xml.txt b/test/expect/castxml1.any.Method.xml.txt index ba942c4..4f3b149 100644 --- a/test/expect/castxml1.any.Method.xml.txt +++ b/test/expect/castxml1.any.Method.xml.txt @@ -13,9 +13,9 @@ </OperatorMethod> <Destructor id="_7" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> <FundamentalType id="_8" name="int" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_9" type="_1c"/> + <ReferenceType id="_9" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_10" type="_1"/> + <ReferenceType id="_10" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Method.cxx"/> </CastXML>$ diff --git a/test/expect/castxml1.any.Namespace-Class-members.xml.txt b/test/expect/castxml1.any.Namespace-Class-members.xml.txt index 90a81fa..1753560 100644 --- a/test/expect/castxml1.any.Namespace-Class-members.xml.txt +++ b/test/expect/castxml1.any.Namespace-Class-members.xml.txt @@ -12,9 +12,9 @@ </OperatorMethod> <Destructor id="_8" name="A" context="_3" access="public" location="f1:2" file="f1" line="2" inline="1" artificial="1"( throw="")?/> <FundamentalType id="_9" name="int" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_10" type="_3c"/> + <ReferenceType id="_10" type="_3c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_3c" type="_3" const="1"/> - <ReferenceType id="_11" type="_3"/> + <ReferenceType id="_11" type="_3" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Namespace-Class-members.cxx"/> </CastXML>$ diff --git a/test/expect/castxml1.any.OperatorFunction-annotate.xml.txt b/test/expect/castxml1.any.OperatorFunction-annotate.xml.txt index 1d71226..15ed232 100644 --- a/test/expect/castxml1.any.OperatorFunction-annotate.xml.txt +++ b/test/expect/castxml1.any.OperatorFunction-annotate.xml.txt @@ -5,7 +5,7 @@ <Argument type="_4" location="f1:3" file="f1" line="3"/> <Argument type="_5" location="f1:3" file="f1" line="3"/> </OperatorFunction> - <ReferenceType id="_4" type="_6"/> + <ReferenceType id="_4" type="_6" size="[0-9]+" align="[0-9]+"/> <FundamentalType id="_5" name="int" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <Class id="_6" name="A" context="_2" location="f1:1" file="f1" line="1" incomplete="1"/> diff --git a/test/expect/castxml1.any.OperatorFunction.xml.txt b/test/expect/castxml1.any.OperatorFunction.xml.txt index 5c2f5bc..f28bb93 100644 --- a/test/expect/castxml1.any.OperatorFunction.xml.txt +++ b/test/expect/castxml1.any.OperatorFunction.xml.txt @@ -5,7 +5,7 @@ <Argument type="_4" location="f1:3" file="f1" line="3"/> <Argument type="_5" location="f1:3" file="f1" line="3"/> </OperatorFunction> - <ReferenceType id="_4" type="_6"/> + <ReferenceType id="_4" type="_6" size="[0-9]+" align="[0-9]+"/> <FundamentalType id="_5" name="int" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <Class id="_6" name="A" context="_2" location="f1:1" file="f1" line="1" incomplete="1"/> diff --git a/test/expect/castxml1.any.OperatorMethod-annotate.xml.txt b/test/expect/castxml1.any.OperatorMethod-annotate.xml.txt index cefeba6..06b9db2 100644 --- a/test/expect/castxml1.any.OperatorMethod-annotate.xml.txt +++ b/test/expect/castxml1.any.OperatorMethod-annotate.xml.txt @@ -12,9 +12,9 @@ <Argument type="_10" location="f1:1" file="f1" line="1"/> </OperatorMethod> <Destructor id="_7" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_8" type="_1"/> + <ReferenceType id="_8" type="_1" size="[0-9]+" align="[0-9]+"/> <FundamentalType id="_9" name="int" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_10" type="_1c"/> + <ReferenceType id="_10" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/OperatorMethod-annotate.cxx"/> diff --git a/test/expect/castxml1.any.OperatorMethod.xml.txt b/test/expect/castxml1.any.OperatorMethod.xml.txt index 3435b94..d0dd84f 100644 --- a/test/expect/castxml1.any.OperatorMethod.xml.txt +++ b/test/expect/castxml1.any.OperatorMethod.xml.txt @@ -12,9 +12,9 @@ <Argument type="_10" location="f1:1" file="f1" line="1"/> </OperatorMethod> <Destructor id="_7" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_8" type="_1"/> + <ReferenceType id="_8" type="_1" size="[0-9]+" align="[0-9]+"/> <FundamentalType id="_9" name="int" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_10" type="_1c"/> + <ReferenceType id="_10" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/OperatorMethod.cxx"/> diff --git a/test/expect/castxml1.any.ReferenceType.xml.txt b/test/expect/castxml1.any.ReferenceType.xml.txt index 16e8809..e3e2c32 100644 --- a/test/expect/castxml1.any.ReferenceType.xml.txt +++ b/test/expect/castxml1.any.ReferenceType.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"/> - <ReferenceType id="_2" type="_4"/> + <ReferenceType 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/ReferenceType.cxx"/> diff --git a/test/expect/castxml1.any.Variable-in-Class.xml.txt b/test/expect/castxml1.any.Variable-in-Class.xml.txt index 60e7b70..48c9399 100644 --- a/test/expect/castxml1.any.Variable-in-Class.xml.txt +++ b/test/expect/castxml1.any.Variable-in-Class.xml.txt @@ -11,9 +11,9 @@ </OperatorMethod> <Destructor id="_7" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> <FundamentalType id="_8" name="int" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_9" type="_1c"/> + <ReferenceType id="_9" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_10" type="_1"/> + <ReferenceType id="_10" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Variable-in-Class.cxx"/> </CastXML>$ diff --git a/test/expect/castxml1.any.invalid-decl-for-type.xml.txt b/test/expect/castxml1.any.invalid-decl-for-type.xml.txt index c7cdaf5..6758215 100644 --- a/test/expect/castxml1.any.invalid-decl-for-type.xml.txt +++ b/test/expect/castxml1.any.invalid-decl-for-type.xml.txt @@ -13,9 +13,9 @@ <Destructor id="_8" name="start" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1"( throw="")?/> <Struct id="_9" name="B<Incomplete>" context="_2" location="f1:7" file="f1" line="7" members="_13 _14 _15 _16" size="[0-9]+" align="[0-9]+"/> <Struct id="_10" name="A<Incomplete>" context="_2" location="f1:2" file="f1" line="2" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_11" type="_1c"/> + <ReferenceType id="_11" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_12" type="_1"/> + <ReferenceType id="_12" type="_1" size="[0-9]+" align="[0-9]+"/> <Constructor id="_13" name="B" context="_9" access="public" location="f1:9" file="f1" line="9" inline="1"/> <Constructor id="_14" name="B" context="_9" access="public" location="f1:7" file="f1" line="7" inline="1" artificial="1"( throw="")?> <Argument type="_17" location="f1:7" file="f1" line="7"/> @@ -24,9 +24,9 @@ <Argument type="_17" location="f1:7" file="f1" line="7"/> </OperatorMethod> <Destructor id="_16" name="B" context="_9" access="public" location="f1:7" file="f1" line="7" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_17" type="_9c"/> + <ReferenceType id="_17" type="_9c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_9c" type="_9" const="1"/> - <ReferenceType id="_18" type="_9"/> + <ReferenceType id="_18" type="_9" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/invalid-decl-for-type.cxx"/> </CastXML>$ diff --git a/test/expect/castxml1.any.using-declaration-class.xml.txt b/test/expect/castxml1.any.using-declaration-class.xml.txt index bce3add..b49d08a 100644 --- a/test/expect/castxml1.any.using-declaration-class.xml.txt +++ b/test/expect/castxml1.any.using-declaration-class.xml.txt @@ -20,9 +20,9 @@ <Class id="_9" name="base" context="_2" location="f1:1" file="f1" line="1" members="_3 _14 _15 _16 _17" size="[0-9]+" align="[0-9]+"/> <FundamentalType id="_10" name="int" size="[0-9]+" align="[0-9]+"/> <FundamentalType id="_11" name="char" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_12" type="_1c"/> + <ReferenceType id="_12" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_13" type="_1"/> + <ReferenceType id="_13" type="_1" size="[0-9]+" align="[0-9]+"/> <Constructor id="_14" name="base" context="_9" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> <Constructor id="_15" name="base" context="_9" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?> <Argument type="_18" location="f1:1" file="f1" line="1"/> @@ -31,9 +31,9 @@ <Argument type="_18" location="f1:1" file="f1" line="1"/> </OperatorMethod> <Destructor id="_17" name="base" context="_9" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_18" type="_9c"/> + <ReferenceType id="_18" type="_9c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_9c" type="_9" const="1"/> - <ReferenceType id="_19" type="_9"/> + <ReferenceType id="_19" type="_9" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/using-declaration-class.cxx"/> </CastXML>$ diff --git a/test/expect/castxml1.broken.any.ReferenceType-to-Class-template.xml.txt b/test/expect/castxml1.broken.any.ReferenceType-to-Class-template.xml.txt index 58379a5..635cea8 100644 --- a/test/expect/castxml1.broken.any.ReferenceType-to-Class-template.xml.txt +++ b/test/expect/castxml1.broken.any.ReferenceType-to-Class-template.xml.txt @@ -13,11 +13,11 @@ <Argument type="_11" location="f1:7" file="f1" line="7"/> </Function> <FundamentalType id="_4" name="void" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_6" type="_12"/> + <ReferenceType id="_6" type="_12" size="[0-9]+" align="[0-9]+"/> <FundamentalType id="_7" name="short int" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_8" type="_12"/>(broken: duplicate ReferenceType)? + <ReferenceType id="_8" type="_12" size="[0-9]+" align="[0-9]+"/>(broken: duplicate ReferenceType)? <FundamentalType id="_9" name="int" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_10" type="_12"/>(broken: duplicate ReferenceType)? + <ReferenceType id="_10" type="_12" size="[0-9]+" align="[0-9]+"/>(broken: duplicate ReferenceType)? <FundamentalType id="_11" name="long int" size="[0-9]+" align="[0-9]+"/> <Namespace id="_5" name="::"/> <Class id="_12" name="A<int>" context="_5" location="f1:2" file="f1" line="2" incomplete="1"/> diff --git a/test/expect/castxml1.c++11.Class-bases.xml.txt b/test/expect/castxml1.c++11.Class-bases.xml.txt index 7b2c6cc..0a2b97a 100644 --- a/test/expect/castxml1.c++11.Class-bases.xml.txt +++ b/test/expect/castxml1.c++11.Class-bases.xml.txt @@ -16,8 +16,8 @@ <Class id="_7" name="base_public" context="_2" location="f1:1" file="f1" line="1" members="_12 _13 _14 _15" size="[0-9]+" align="[0-9]+"/> <Class id="_8" name="base_private" context="_2" location="f1:4" file="f1" line="4" members="_16 _17 _18 _19" size="[0-9]+" align="[0-9]+"/> <Class id="_9" name="base_protected" context="_2" location="f1:7" file="f1" line="7" members="_20 _21 _22 _23" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_10" type="_1"/> - <ReferenceType id="_11" type="_1c"/> + <ReferenceType id="_10" type="_1" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_11" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> <OperatorMethod id="_12" name="=" returns="_24" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1" mangled="[^"]+"> <Argument type="_25" location="f1:1" file="f1" line="1"/> @@ -43,14 +43,14 @@ <Constructor id="_23" name="base_protected" context="_9" access="public" location="f1:7" file="f1" line="7" inline="1" artificial="1"> <Argument type="_29" location="f1:7" file="f1" line="7"/> </Constructor> - <ReferenceType id="_24" type="_7"/> - <ReferenceType id="_25" type="_7c"/> + <ReferenceType id="_24" type="_7" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_25" type="_7c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_7c" type="_7" const="1"/> - <ReferenceType id="_26" type="_8"/> - <ReferenceType id="_27" type="_8c"/> + <ReferenceType id="_26" type="_8" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_27" type="_8c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_8c" type="_8" const="1"/> - <ReferenceType id="_28" type="_9"/> - <ReferenceType id="_29" type="_9c"/> + <ReferenceType id="_28" type="_9" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_29" type="_9c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_9c" type="_9" const="1"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-bases.cxx"/> diff --git a/test/expect/castxml1.c++11.Class-template-bases.xml.txt b/test/expect/castxml1.c++11.Class-template-bases.xml.txt index 2245a4e..72b4cac 100644 --- a/test/expect/castxml1.c++11.Class-template-bases.xml.txt +++ b/test/expect/castxml1.c++11.Class-template-bases.xml.txt @@ -14,9 +14,9 @@ <Destructor id="_6" name="start" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1"/> <Class id="_7" name="non_dependent_base" context="_2" location="f1:1" file="f1" line="1" members="_11 _12 _13 _14" size="[0-9]+" align="[0-9]+"/> <Class id="_8" name="dependent_base<int>" context="_2" location="f1:5" file="f1" line="5" members="_15 _16 _17 _18" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_9" type="_1c"/> + <ReferenceType id="_9" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_10" type="_1"/> + <ReferenceType id="_10" type="_1" size="[0-9]+" align="[0-9]+"/> <Constructor id="_11" name="non_dependent_base" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"/> <Constructor id="_12" name="non_dependent_base" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"> <Argument type="_19" location="f1:1" file="f1" line="1"/> @@ -33,12 +33,12 @@ <Argument type="_21" location="f1:5" file="f1" line="5"/> </OperatorMethod> <Destructor id="_18" name="dependent_base" context="_8" access="public" location="f1:5" file="f1" line="5" inline="1" artificial="1"/> - <ReferenceType id="_19" type="_7c"/> + <ReferenceType id="_19" type="_7c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_7c" type="_7" const="1"/> - <ReferenceType id="_20" type="_7"/> - <ReferenceType id="_21" type="_8c"/> + <ReferenceType id="_20" type="_7" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_21" type="_8c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_8c" type="_8" const="1"/> - <ReferenceType id="_22" type="_8"/> + <ReferenceType id="_22" type="_8" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-template-bases.cxx"/> </CastXML>$ diff --git a/test/expect/castxml1.c++14.Class-bases.xml.txt b/test/expect/castxml1.c++14.Class-bases.xml.txt index 7b2c6cc..0a2b97a 100644 --- a/test/expect/castxml1.c++14.Class-bases.xml.txt +++ b/test/expect/castxml1.c++14.Class-bases.xml.txt @@ -16,8 +16,8 @@ <Class id="_7" name="base_public" context="_2" location="f1:1" file="f1" line="1" members="_12 _13 _14 _15" size="[0-9]+" align="[0-9]+"/> <Class id="_8" name="base_private" context="_2" location="f1:4" file="f1" line="4" members="_16 _17 _18 _19" size="[0-9]+" align="[0-9]+"/> <Class id="_9" name="base_protected" context="_2" location="f1:7" file="f1" line="7" members="_20 _21 _22 _23" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_10" type="_1"/> - <ReferenceType id="_11" type="_1c"/> + <ReferenceType id="_10" type="_1" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_11" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> <OperatorMethod id="_12" name="=" returns="_24" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1" mangled="[^"]+"> <Argument type="_25" location="f1:1" file="f1" line="1"/> @@ -43,14 +43,14 @@ <Constructor id="_23" name="base_protected" context="_9" access="public" location="f1:7" file="f1" line="7" inline="1" artificial="1"> <Argument type="_29" location="f1:7" file="f1" line="7"/> </Constructor> - <ReferenceType id="_24" type="_7"/> - <ReferenceType id="_25" type="_7c"/> + <ReferenceType id="_24" type="_7" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_25" type="_7c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_7c" type="_7" const="1"/> - <ReferenceType id="_26" type="_8"/> - <ReferenceType id="_27" type="_8c"/> + <ReferenceType id="_26" type="_8" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_27" type="_8c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_8c" type="_8" const="1"/> - <ReferenceType id="_28" type="_9"/> - <ReferenceType id="_29" type="_9c"/> + <ReferenceType id="_28" type="_9" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_29" type="_9c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_9c" type="_9" const="1"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-bases.cxx"/> diff --git a/test/expect/castxml1.c++14.Class-template-bases.xml.txt b/test/expect/castxml1.c++14.Class-template-bases.xml.txt index 2245a4e..72b4cac 100644 --- a/test/expect/castxml1.c++14.Class-template-bases.xml.txt +++ b/test/expect/castxml1.c++14.Class-template-bases.xml.txt @@ -14,9 +14,9 @@ <Destructor id="_6" name="start" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1"/> <Class id="_7" name="non_dependent_base" context="_2" location="f1:1" file="f1" line="1" members="_11 _12 _13 _14" size="[0-9]+" align="[0-9]+"/> <Class id="_8" name="dependent_base<int>" context="_2" location="f1:5" file="f1" line="5" members="_15 _16 _17 _18" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_9" type="_1c"/> + <ReferenceType id="_9" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_10" type="_1"/> + <ReferenceType id="_10" type="_1" size="[0-9]+" align="[0-9]+"/> <Constructor id="_11" name="non_dependent_base" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"/> <Constructor id="_12" name="non_dependent_base" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"> <Argument type="_19" location="f1:1" file="f1" line="1"/> @@ -33,12 +33,12 @@ <Argument type="_21" location="f1:5" file="f1" line="5"/> </OperatorMethod> <Destructor id="_18" name="dependent_base" context="_8" access="public" location="f1:5" file="f1" line="5" inline="1" artificial="1"/> - <ReferenceType id="_19" type="_7c"/> + <ReferenceType id="_19" type="_7c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_7c" type="_7" const="1"/> - <ReferenceType id="_20" type="_7"/> - <ReferenceType id="_21" type="_8c"/> + <ReferenceType id="_20" type="_7" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_21" type="_8c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_8c" type="_8" const="1"/> - <ReferenceType id="_22" type="_8"/> + <ReferenceType id="_22" type="_8" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-template-bases.cxx"/> </CastXML>$ diff --git a/test/expect/castxml1.c++98.Class-bases.xml.txt b/test/expect/castxml1.c++98.Class-bases.xml.txt index c82141f..fc56f60 100644 --- a/test/expect/castxml1.c++98.Class-bases.xml.txt +++ b/test/expect/castxml1.c++98.Class-bases.xml.txt @@ -16,8 +16,8 @@ <Class id="_7" name="base_public" context="_2" location="f1:1" file="f1" line="1" members="_12 _13 _14 _15" size="[0-9]+" align="[0-9]+"/> <Class id="_8" name="base_private" context="_2" location="f1:4" file="f1" line="4" members="_16 _17 _18 _19" size="[0-9]+" align="[0-9]+"/> <Class id="_9" name="base_protected" context="_2" location="f1:7" file="f1" line="7" members="_20 _21 _22 _23" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_10" type="_1"/> - <ReferenceType id="_11" type="_1c"/> + <ReferenceType id="_10" type="_1" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_11" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> <Constructor id="_12" name="base_public" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1" throw=""/> <Constructor id="_13" name="base_public" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1" throw=""> @@ -43,15 +43,15 @@ <Argument type="_28" location="f1:7" file="f1" line="7"/> </OperatorMethod> <Destructor id="_23" name="base_protected" context="_9" access="public" location="f1:7" file="f1" line="7" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_24" type="_7c"/> + <ReferenceType id="_24" type="_7c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_7c" type="_7" const="1"/> - <ReferenceType id="_25" type="_7"/> - <ReferenceType id="_26" type="_8c"/> + <ReferenceType id="_25" type="_7" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_26" type="_8c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_8c" type="_8" const="1"/> - <ReferenceType id="_27" type="_8"/> - <ReferenceType id="_28" type="_9c"/> + <ReferenceType id="_27" type="_8" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_28" type="_9c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_9c" type="_9" const="1"/> - <ReferenceType id="_29" type="_9"/> + <ReferenceType id="_29" type="_9" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-bases.cxx"/> </CastXML>$ diff --git a/test/expect/castxml1.c++98.Class-template-bases.xml.txt b/test/expect/castxml1.c++98.Class-template-bases.xml.txt index 0883c53..f1a527c 100644 --- a/test/expect/castxml1.c++98.Class-template-bases.xml.txt +++ b/test/expect/castxml1.c++98.Class-template-bases.xml.txt @@ -14,9 +14,9 @@ <Destructor id="_6" name="start" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1"( throw="")?/> <Class id="_7" name="non_dependent_base" context="_2" location="f1:1" file="f1" line="1" members="_11 _12 _13 _14" size="[0-9]+" align="[0-9]+"/> <Class id="_8" name="dependent_base<int>" context="_2" location="f1:5" file="f1" line="5" members="_15 _16 _17 _18" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_9" type="_1c"/> + <ReferenceType id="_9" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_10" type="_1"/> + <ReferenceType id="_10" type="_1" size="[0-9]+" align="[0-9]+"/> <Constructor id="_11" name="non_dependent_base" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> <Constructor id="_12" name="non_dependent_base" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1" throw=""> <Argument type="_19" location="f1:1" file="f1" line="1"/> @@ -33,12 +33,12 @@ <Argument type="_21" location="f1:5" file="f1" line="5"/> </OperatorMethod> <Destructor id="_18" name="dependent_base" context="_8" access="public" location="f1:5" file="f1" line="5" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_19" type="_7c"/> + <ReferenceType id="_19" type="_7c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_7c" type="_7" const="1"/> - <ReferenceType id="_20" type="_7"/> - <ReferenceType id="_21" type="_8c"/> + <ReferenceType id="_20" type="_7" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_21" type="_8c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_8c" type="_8" const="1"/> - <ReferenceType id="_22" type="_8"/> + <ReferenceType id="_22" type="_8" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-template-bases.cxx"/> </CastXML>$ diff --git a/test/expect/gccxml.any.Class-abstract.xml.txt b/test/expect/gccxml.any.Class-abstract.xml.txt index 0072787..e838bfb 100644 --- a/test/expect/gccxml.any.Class-abstract.xml.txt +++ b/test/expect/gccxml.any.Class-abstract.xml.txt @@ -14,8 +14,8 @@ <Argument type="_11" location="f1:1" file="f1" line="1"/> </Constructor> <FundamentalType id="_9" name="int" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_10" type="_1"/> - <ReferenceType id="_11" type="_1c"/> + <ReferenceType id="_10" type="_1" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_11" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-abstract.cxx"/> diff --git a/test/expect/gccxml.any.Class-annotate.xml.txt b/test/expect/gccxml.any.Class-annotate.xml.txt index e8a645c..e8554fb 100644 --- a/test/expect/gccxml.any.Class-annotate.xml.txt +++ b/test/expect/gccxml.any.Class-annotate.xml.txt @@ -9,9 +9,9 @@ <Argument type="_7" location="f1:1" file="f1" line="1"/> </OperatorMethod> <Destructor id="_6" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_7" type="_1c"/> + <ReferenceType id="_7" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_8" type="_1"/> + <ReferenceType id="_8" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-annotate.cxx"/> </GCC_XML>$ diff --git a/test/expect/gccxml.any.Class-base-typedef.xml.txt b/test/expect/gccxml.any.Class-base-typedef.xml.txt index e4cad62..e082c64 100644 --- a/test/expect/gccxml.any.Class-base-typedef.xml.txt +++ b/test/expect/gccxml.any.Class-base-typedef.xml.txt @@ -12,9 +12,9 @@ </OperatorMethod> <Destructor id="_6" name="start" context="_1" access="public" location="f1:5" file="f1" line="5" inline="1" artificial="1"( throw="")?/> <Class id="_7" name="base" context="_2" location="f1:1" file="f1" line="1" members="_10 _11 _12 _13" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_8" type="_1c"/> + <ReferenceType id="_8" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_9" type="_1"/> + <ReferenceType id="_9" type="_1" size="[0-9]+" align="[0-9]+"/> <Constructor id="_10" name="base" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> <Constructor id="_11" name="base" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?> <Argument type="_14" location="f1:1" file="f1" line="1"/> @@ -23,9 +23,9 @@ <Argument type="_14" location="f1:1" file="f1" line="1"/> </OperatorMethod> <Destructor id="_13" name="base" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_14" type="_7c"/> + <ReferenceType id="_14" type="_7c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_7c" type="_7" const="1"/> - <ReferenceType id="_15" type="_7"/> + <ReferenceType id="_15" type="_7" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-base-typedef.cxx"/> </GCC_XML>$ diff --git a/test/expect/gccxml.any.Class-forward.xml.txt b/test/expect/gccxml.any.Class-forward.xml.txt index 313e06b..2dfe8e1 100644 --- a/test/expect/gccxml.any.Class-forward.xml.txt +++ b/test/expect/gccxml.any.Class-forward.xml.txt @@ -9,9 +9,9 @@ <Argument type="_7" location="f1:7" file="f1" line="7"/> </OperatorMethod> <Destructor id="_6" name="start" context="_1" access="public" location="f1:8" file="f1" line="8"/> - <ReferenceType id="_7" type="_1c"/> + <ReferenceType id="_7" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_8" type="_1"/> + <ReferenceType id="_8" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-forward.cxx"/> </GCC_XML>$ diff --git a/test/expect/gccxml.any.Class-friends.xml.txt b/test/expect/gccxml.any.Class-friends.xml.txt index bac3cc2..0fee416 100644 --- a/test/expect/gccxml.any.Class-friends.xml.txt +++ b/test/expect/gccxml.any.Class-friends.xml.txt @@ -9,9 +9,9 @@ <Argument type="_9" location="f1:5" file="f1" line="5"/> </OperatorMethod> <Destructor id="_6" name="start" context="_1" access="public" location="f1:5" file="f1" line="5" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_9" type="_1c"/> + <ReferenceType id="_9" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_10" type="_1"/> + <ReferenceType id="_10" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <Function id="_7" name="f" returns="_11" context="_2" location="f1:4" file="f1" line="4" mangled="[^"]+"/> <Class id="_8" name="A" context="_2" location="f1:1" file="f1" line="1" size="[0-9]+" align="[0-9]+"/> diff --git a/test/expect/gccxml.any.Class-implicit-member-access-mutable.xml.txt b/test/expect/gccxml.any.Class-implicit-member-access-mutable.xml.txt index bacc2fc..7613ff9 100644 --- a/test/expect/gccxml.any.Class-implicit-member-access-mutable.xml.txt +++ b/test/expect/gccxml.any.Class-implicit-member-access-mutable.xml.txt @@ -15,9 +15,9 @@ <Argument type="_11" location="f1:9" file="f1" line="9"/> </OperatorMethod> <Field id="_10" name="data" type="_13" context="_5" access="private" location="f1:10" file="f1" line="10" offset="0" mutable="1"/> - <ReferenceType id="_11" type="_5c"/> + <ReferenceType id="_11" type="_5c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_5c" type="_5" const="1"/> - <ReferenceType id="_12" type="_5"/> + <ReferenceType id="_12" type="_5" size="[0-9]+" align="[0-9]+"/> <FundamentalType id="_13" name="int" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-implicit-member-access-mutable.cxx"/> diff --git a/test/expect/gccxml.any.Class-implicit-member-access.xml.txt b/test/expect/gccxml.any.Class-implicit-member-access.xml.txt index 035cb7d..0f003a4 100644 --- a/test/expect/gccxml.any.Class-implicit-member-access.xml.txt +++ b/test/expect/gccxml.any.Class-implicit-member-access.xml.txt @@ -14,9 +14,9 @@ <OperatorMethod id="_9" name="=" returns="_11" context="_5" access="private" location="f1:9" file="f1" line="9" mangled="[^"]+"> <Argument type="_10" location="f1:9" file="f1" line="9"/> </OperatorMethod> - <ReferenceType id="_10" type="_5c"/> + <ReferenceType id="_10" type="_5c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_5c" type="_5" const="1"/> - <ReferenceType id="_11" type="_5"/> + <ReferenceType id="_11" type="_5" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-implicit-member-access.cxx"/> </GCC_XML>$ diff --git a/test/expect/gccxml.any.Class-implicit-member-array.xml.txt b/test/expect/gccxml.any.Class-implicit-member-array.xml.txt index 586011f..8f4442f 100644 --- a/test/expect/gccxml.any.Class-implicit-member-array.xml.txt +++ b/test/expect/gccxml.any.Class-implicit-member-array.xml.txt @@ -11,9 +11,9 @@ </OperatorMethod> <Destructor id="_7" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> <ArrayType id="_8" min="0" max="1" type="_11"/> - <ReferenceType id="_9" type="_1c"/> + <ReferenceType id="_9" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_10" type="_1"/> + <ReferenceType id="_10" type="_1" size="[0-9]+" align="[0-9]+"/> <FundamentalType id="_11" name="int" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-implicit-member-array.cxx"/> diff --git a/test/expect/gccxml.any.Class-implicit-member-bad-base.xml.txt b/test/expect/gccxml.any.Class-implicit-member-bad-base.xml.txt index 5bf41e3..e246e8d 100644 --- a/test/expect/gccxml.any.Class-implicit-member-bad-base.xml.txt +++ b/test/expect/gccxml.any.Class-implicit-member-bad-base.xml.txt @@ -9,7 +9,7 @@ </Constructor> <Destructor id="_5" name="start" context="_1" access="public" location="f1:9" file="f1" line="9" inline="1" artificial="1"( throw="")?/> <Class id="_6" name="base<const int>" context="_2" location="f1:2" file="f1" line="2" members="_8 _9 _10 _11" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_7" type="_1c"/> + <ReferenceType id="_7" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> <Field id="_8" name="data" type="_12c" context="_6" access="protected" location="f1:5" file="f1" line="5" offset="0"/> <Constructor id="_9" name="base" context="_6" access="protected" location="f1:6" file="f1" line="6"/> @@ -19,7 +19,7 @@ <Destructor id="_11" name="base" context="_6" access="public" location="f1:2" file="f1" line="2" inline="1" artificial="1"( throw="")?/> <FundamentalType id="_12" name="int" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_12c" type="_12" const="1"/> - <ReferenceType id="_13" type="_6c"/> + <ReferenceType id="_13" type="_6c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_6c" type="_6" const="1"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-implicit-member-bad-base.cxx"/> diff --git a/test/expect/gccxml.any.Class-implicit-member-const-aggregate.xml.txt b/test/expect/gccxml.any.Class-implicit-member-const-aggregate.xml.txt index 0c678f9..9be5cb2 100644 --- a/test/expect/gccxml.any.Class-implicit-member-const-aggregate.xml.txt +++ b/test/expect/gccxml.any.Class-implicit-member-const-aggregate.xml.txt @@ -8,7 +8,7 @@ <Destructor id="_5" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> <FundamentalType id="_6" name="int" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_6c" type="_6" const="1"/> - <ReferenceType id="_7" type="_1c"/> + <ReferenceType id="_7" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-implicit-member-const-aggregate.cxx"/> diff --git a/test/expect/gccxml.any.Class-implicit-member-const.xml.txt b/test/expect/gccxml.any.Class-implicit-member-const.xml.txt index 38edff8..8bb9dc0 100644 --- a/test/expect/gccxml.any.Class-implicit-member-const.xml.txt +++ b/test/expect/gccxml.any.Class-implicit-member-const.xml.txt @@ -9,7 +9,7 @@ <Destructor id="_6" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> <FundamentalType id="_7" name="int" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_7c" type="_7" const="1"/> - <ReferenceType id="_8" type="_1c"/> + <ReferenceType id="_8" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-implicit-member-const.cxx"/> diff --git a/test/expect/gccxml.any.Class-implicit-member-reference.xml.txt b/test/expect/gccxml.any.Class-implicit-member-reference.xml.txt index d522d6c..7c9f89c 100644 --- a/test/expect/gccxml.any.Class-implicit-member-reference.xml.txt +++ b/test/expect/gccxml.any.Class-implicit-member-reference.xml.txt @@ -7,8 +7,8 @@ <Argument type="_8" location="f1:1" file="f1" line="1"/> </Constructor> <Destructor id="_6" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_7" type="_9"/> - <ReferenceType id="_8" type="_1c"/> + <ReferenceType id="_7" type="_9" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_8" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> <Namespace id="_2" name="::"/> <FundamentalType id="_9" name="int" size="[0-9]+" align="[0-9]+"/> diff --git a/test/expect/gccxml.any.Class-implicit-members.xml.txt b/test/expect/gccxml.any.Class-implicit-members.xml.txt index bd2dc9f..909fd2d 100644 --- a/test/expect/gccxml.any.Class-implicit-members.xml.txt +++ b/test/expect/gccxml.any.Class-implicit-members.xml.txt @@ -12,9 +12,9 @@ <Argument type="_8" location="f1:1" file="f1" line="1"/> </OperatorMethod> <Destructor id="_7" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_8" type="_1c"/> + <ReferenceType id="_8" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_9" type="_1"/> + <ReferenceType id="_9" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-implicit-members.cxx"/> </GCC_XML>$ diff --git a/test/expect/gccxml.any.Class-member-template-access.xml.txt b/test/expect/gccxml.any.Class-member-template-access.xml.txt index 1dcefc5..44937f7 100644 --- a/test/expect/gccxml.any.Class-member-template-access.xml.txt +++ b/test/expect/gccxml.any.Class-member-template-access.xml.txt @@ -20,12 +20,12 @@ <Argument type="_16" location="f1:11" file="f1" line="11"/> </OperatorMethod> <Destructor id="_13" name="member" context="_4" access="public" location="f1:11" file="f1" line="11" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_14" type="_1c"/> + <ReferenceType id="_14" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_15" type="_1"/> - <ReferenceType id="_16" type="_4c"/> + <ReferenceType id="_15" type="_1" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_16" type="_4c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_4c" type="_4" const="1"/> - <ReferenceType id="_17" type="_4"/> + <ReferenceType id="_17" type="_4" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-member-template-access.cxx"/> </GCC_XML>$ diff --git a/test/expect/gccxml.any.Class-member-template.xml.txt b/test/expect/gccxml.any.Class-member-template.xml.txt index ffdea37..4757ee4 100644 --- a/test/expect/gccxml.any.Class-member-template.xml.txt +++ b/test/expect/gccxml.any.Class-member-template.xml.txt @@ -13,9 +13,9 @@ </OperatorMethod> <Destructor id="_7" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> <FundamentalType id="_8" name="int" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_9" type="_1c"/> + <ReferenceType id="_9" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_10" type="_1"/> + <ReferenceType id="_10" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-member-template.cxx"/> </GCC_XML>$ diff --git a/test/expect/gccxml.any.Class-partial-template-member-Typedef.xml.txt b/test/expect/gccxml.any.Class-partial-template-member-Typedef.xml.txt index 6ec6fe1..c593ca5 100644 --- a/test/expect/gccxml.any.Class-partial-template-member-Typedef.xml.txt +++ b/test/expect/gccxml.any.Class-partial-template-member-Typedef.xml.txt @@ -14,9 +14,9 @@ </OperatorMethod> <Destructor id="_8" name="start" context="_1" access="public" location="f1:11" file="f1" line="11" inline="1" artificial="1"( throw="")?/> <FundamentalType id="_9" name="int" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_10" type="_1c"/> + <ReferenceType id="_10" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_11" type="_1"/> + <ReferenceType id="_11" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-partial-template-member-Typedef.cxx"/> </GCC_XML>$ diff --git a/test/expect/gccxml.any.Class-template-Method-Argument-const.xml.txt b/test/expect/gccxml.any.Class-template-Method-Argument-const.xml.txt index 8ecd5b2..00bf51e 100644 --- a/test/expect/gccxml.any.Class-template-Method-Argument-const.xml.txt +++ b/test/expect/gccxml.any.Class-template-Method-Argument-const.xml.txt @@ -13,10 +13,10 @@ </OperatorMethod> <Destructor id="_7" name="start" context="_1" access="public" location="f1:6" file="f1" line="6" inline="1" artificial="1"( throw="")?/> <FundamentalType id="_8" name="void" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_9" type="_12c"/> - <ReferenceType id="_10" type="_1c"/> + <ReferenceType id="_9" type="_12c" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_10" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_11" type="_1"/> + <ReferenceType id="_11" type="_1" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_12c" type="_12" const="1"/> <Namespace id="_2" name="::"/> <FundamentalType id="_12" name="int" size="[0-9]+" align="[0-9]+"/> diff --git a/test/expect/gccxml.any.Class-template-Method-Argument-default.xml.txt b/test/expect/gccxml.any.Class-template-Method-Argument-default.xml.txt index 70cfe24..a5c1f82 100644 --- a/test/expect/gccxml.any.Class-template-Method-Argument-default.xml.txt +++ b/test/expect/gccxml.any.Class-template-Method-Argument-default.xml.txt @@ -13,9 +13,9 @@ </OperatorMethod> <Destructor id="_7" name="start" context="_1" access="public" location="f1:6" file="f1" line="6" inline="1" artificial="1"( throw="")?/> <FundamentalType id="_8" name="int" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_9" type="_1c"/> + <ReferenceType id="_9" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_10" type="_1"/> + <ReferenceType id="_10" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-template-Method-Argument-default.cxx"/> </GCC_XML>$ diff --git a/test/expect/gccxml.any.Class-template-Method-return-const.xml.txt b/test/expect/gccxml.any.Class-template-Method-return-const.xml.txt index b44a4a4..af52aec 100644 --- a/test/expect/gccxml.any.Class-template-Method-return-const.xml.txt +++ b/test/expect/gccxml.any.Class-template-Method-return-const.xml.txt @@ -12,9 +12,9 @@ <Destructor id="_7" name="start" context="_1" access="public" location="f1:6" file="f1" line="6" inline="1" artificial="1"( throw="")?/> <FundamentalType id="_8" name="int" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_8c" type="_8" const="1"/> - <ReferenceType id="_9" type="_1c"/> + <ReferenceType id="_9" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_10" type="_1"/> + <ReferenceType id="_10" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-template-Method-return-const.cxx"/> </GCC_XML>$ diff --git a/test/expect/gccxml.any.Class-template-constructor-template.xml.txt b/test/expect/gccxml.any.Class-template-constructor-template.xml.txt index 1b32202..643bc26 100644 --- a/test/expect/gccxml.any.Class-template-constructor-template.xml.txt +++ b/test/expect/gccxml.any.Class-template-constructor-template.xml.txt @@ -11,10 +11,10 @@ <Argument type="_7" location="f1:2" file="f1" line="2"/> </OperatorMethod> <Destructor id="_6" name="start" context="_1" access="public" location="f1:2" file="f1" line="2" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_7" type="_1c"/> + <ReferenceType id="_7" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_8" type="_1c"/> - <ReferenceType id="_9" type="_1"/> + <ReferenceType id="_8" type="_1c" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_9" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-template-constructor-template.cxx"/> </GCC_XML>$ diff --git a/test/expect/gccxml.any.Class-template-friends.xml.txt b/test/expect/gccxml.any.Class-template-friends.xml.txt index da38882..e6c7a60 100644 --- a/test/expect/gccxml.any.Class-template-friends.xml.txt +++ b/test/expect/gccxml.any.Class-template-friends.xml.txt @@ -9,9 +9,9 @@ <Argument type="_9" location="f1:13" file="f1" line="13"/> </OperatorMethod> <Destructor id="_6" name="start" context="_1" access="public" location="f1:13" file="f1" line="13" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_9" type="_1c"/> + <ReferenceType id="_9" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_10" type="_1"/> + <ReferenceType id="_10" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <Function id="_7" name="f" returns="_11" context="_2" location="f1:9" file="f1" line="9" mangled="[^"]+"> <Argument type="_11" location="f1:4" file="f1" line="4"/> diff --git a/test/expect/gccxml.any.Class-template-member-Typedef-const.xml.txt b/test/expect/gccxml.any.Class-template-member-Typedef-const.xml.txt index 964c82c..7d587f0 100644 --- a/test/expect/gccxml.any.Class-template-member-Typedef-const.xml.txt +++ b/test/expect/gccxml.any.Class-template-member-Typedef-const.xml.txt @@ -15,9 +15,9 @@ <Destructor id="_8" name="start" context="_1" access="public" location="f1:9" file="f1" line="9" inline="1" artificial="1"( throw="")?/> <FundamentalType id="_9" name="int" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_9c" type="_9" const="1"/> - <ReferenceType id="_10" type="_1c"/> + <ReferenceType id="_10" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_11" type="_1"/> + <ReferenceType id="_11" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-template-member-Typedef-const.cxx"/> </GCC_XML>$ diff --git a/test/expect/gccxml.any.Class-template-member-Typedef.xml.txt b/test/expect/gccxml.any.Class-template-member-Typedef.xml.txt index e767040..54862d0 100644 --- a/test/expect/gccxml.any.Class-template-member-Typedef.xml.txt +++ b/test/expect/gccxml.any.Class-template-member-Typedef.xml.txt @@ -14,9 +14,9 @@ </OperatorMethod> <Destructor id="_8" name="start" context="_1" access="public" location="f1:9" file="f1" line="9" inline="1" artificial="1"( throw="")?/> <FundamentalType id="_9" name="int" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_10" type="_1c"/> + <ReferenceType id="_10" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_11" type="_1"/> + <ReferenceType id="_11" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-template-member-Typedef.cxx"/> </GCC_XML>$ diff --git a/test/expect/gccxml.any.Class-template-member-template.xml.txt b/test/expect/gccxml.any.Class-template-member-template.xml.txt index 00c7ac5..6b58695 100644 --- a/test/expect/gccxml.any.Class-template-member-template.xml.txt +++ b/test/expect/gccxml.any.Class-template-member-template.xml.txt @@ -14,9 +14,9 @@ <Destructor id="_7" name="start" context="_1" access="public" location="f1:2" file="f1" line="2" inline="1" artificial="1"( throw="")?/> <FundamentalType id="_8" name="int" size="[0-9]+" align="[0-9]+"/> <FundamentalType id="_9" name="char" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_10" type="_1c"/> + <ReferenceType id="_10" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_11" type="_1"/> + <ReferenceType id="_11" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-template-member-template.cxx"/> </GCC_XML>$ diff --git a/test/expect/gccxml.any.Class-template-recurse.xml.txt b/test/expect/gccxml.any.Class-template-recurse.xml.txt index 627b844..056e24d 100644 --- a/test/expect/gccxml.any.Class-template-recurse.xml.txt +++ b/test/expect/gccxml.any.Class-template-recurse.xml.txt @@ -10,9 +10,9 @@ <Argument type="_8" location="f1:11" file="f1" line="11"/> </OperatorMethod> <Destructor id="_7" name="C" context="_2" access="public" location="f1:11" file="f1" line="11" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_8" type="_2c"/> + <ReferenceType id="_8" type="_2c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_2c" type="_2" const="1"/> - <ReferenceType id="_9" type="_2"/> + <ReferenceType id="_9" type="_2" size="[0-9]+" align="[0-9]+"/> <Namespace id="_3" name="::"/> <File id="f1" name=".*/test/input/Class-template-recurse.cxx"/> </GCC_XML>$ diff --git a/test/expect/gccxml.any.Class-template.xml.txt b/test/expect/gccxml.any.Class-template.xml.txt index fcc577a..3aa8ab1 100644 --- a/test/expect/gccxml.any.Class-template.xml.txt +++ b/test/expect/gccxml.any.Class-template.xml.txt @@ -19,12 +19,12 @@ <Argument type="_15" location="f1:12" file="f1" line="12"/> </OperatorMethod> <Destructor id="_12" name="start" context="_3" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_13" type="_2c"/> + <ReferenceType id="_13" type="_2c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_2c" type="_2" const="1"/> - <ReferenceType id="_14" type="_2"/> - <ReferenceType id="_15" type="_3c"/> + <ReferenceType id="_14" type="_2" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_15" type="_3c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_3c" type="_3" const="1"/> - <ReferenceType id="_16" type="_3"/> + <ReferenceType id="_16" type="_3" size="[0-9]+" align="[0-9]+"/> <Namespace id="_4" name="::"/> <File id="f1" name=".*/test/input/Class-template.cxx"/> </GCC_XML>$ diff --git a/test/expect/gccxml.any.Class.xml.txt b/test/expect/gccxml.any.Class.xml.txt index 467e2a6..c3dd708 100644 --- a/test/expect/gccxml.any.Class.xml.txt +++ b/test/expect/gccxml.any.Class.xml.txt @@ -9,9 +9,9 @@ <Argument type="_7" location="f1:1" file="f1" line="1"/> </OperatorMethod> <Destructor id="_6" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_7" type="_1c"/> + <ReferenceType id="_7" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_8" type="_1"/> + <ReferenceType id="_8" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class.cxx"/> </GCC_XML>$ diff --git a/test/expect/gccxml.any.Constructor-annotate.xml.txt b/test/expect/gccxml.any.Constructor-annotate.xml.txt index e9e250e..f6c9ce7 100644 --- a/test/expect/gccxml.any.Constructor-annotate.xml.txt +++ b/test/expect/gccxml.any.Constructor-annotate.xml.txt @@ -9,9 +9,9 @@ <Argument type="_7" location="f1:1" file="f1" line="1"/> </OperatorMethod> <Destructor id="_6" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_7" type="_1c"/> + <ReferenceType id="_7" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_8" type="_1"/> + <ReferenceType id="_8" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Constructor-annotate.cxx"/> </GCC_XML>$ diff --git a/test/expect/gccxml.any.Constructor.xml.txt b/test/expect/gccxml.any.Constructor.xml.txt index f52ca65..4d7cf6c 100644 --- a/test/expect/gccxml.any.Constructor.xml.txt +++ b/test/expect/gccxml.any.Constructor.xml.txt @@ -9,9 +9,9 @@ <Argument type="_7" location="f1:1" file="f1" line="1"/> </OperatorMethod> <Destructor id="_6" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_7" type="_1c"/> + <ReferenceType id="_7" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_8" type="_1"/> + <ReferenceType id="_8" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Constructor.cxx"/> </GCC_XML>$ diff --git a/test/expect/gccxml.any.Converter-annotate.xml.txt b/test/expect/gccxml.any.Converter-annotate.xml.txt index b07160e..39610c2 100644 --- a/test/expect/gccxml.any.Converter-annotate.xml.txt +++ b/test/expect/gccxml.any.Converter-annotate.xml.txt @@ -11,9 +11,9 @@ </OperatorMethod> <Destructor id="_7" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> <FundamentalType id="_8" name="int" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_9" type="_1c"/> + <ReferenceType id="_9" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_10" type="_1"/> + <ReferenceType id="_10" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Converter-annotate.cxx"/> </GCC_XML>$ diff --git a/test/expect/gccxml.any.Converter.xml.txt b/test/expect/gccxml.any.Converter.xml.txt index 90218dd..aa8d019 100644 --- a/test/expect/gccxml.any.Converter.xml.txt +++ b/test/expect/gccxml.any.Converter.xml.txt @@ -11,9 +11,9 @@ </OperatorMethod> <Destructor id="_7" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> <FundamentalType id="_8" name="int" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_9" type="_1c"/> + <ReferenceType id="_9" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_10" type="_1"/> + <ReferenceType id="_10" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Converter.cxx"/> </GCC_XML>$ diff --git a/test/expect/gccxml.any.Destructor-annotate.xml.txt b/test/expect/gccxml.any.Destructor-annotate.xml.txt index c7898d2..fbc201d 100644 --- a/test/expect/gccxml.any.Destructor-annotate.xml.txt +++ b/test/expect/gccxml.any.Destructor-annotate.xml.txt @@ -9,9 +9,9 @@ <OperatorMethod id="_6" name="=" returns="_8" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")? mangled="[^"]+"> <Argument type="_7" location="f1:1" file="f1" line="1"/> </OperatorMethod> - <ReferenceType id="_7" type="_1c"/> + <ReferenceType id="_7" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_8" type="_1"/> + <ReferenceType id="_8" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Destructor-annotate.cxx"/> </GCC_XML>$ diff --git a/test/expect/gccxml.any.Destructor.xml.txt b/test/expect/gccxml.any.Destructor.xml.txt index 1e2be84..b61ba1b 100644 --- a/test/expect/gccxml.any.Destructor.xml.txt +++ b/test/expect/gccxml.any.Destructor.xml.txt @@ -9,9 +9,9 @@ <OperatorMethod id="_6" name="=" returns="_8" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")? mangled="[^"]+"> <Argument type="_7" location="f1:1" file="f1" line="1"/> </OperatorMethod> - <ReferenceType id="_7" type="_1c"/> + <ReferenceType id="_7" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_8" type="_1"/> + <ReferenceType id="_8" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Destructor.cxx"/> </GCC_XML>$ diff --git a/test/expect/gccxml.any.Elaborated.xml.txt b/test/expect/gccxml.any.Elaborated.xml.txt index 253f0cc..f44a4be 100644 --- a/test/expect/gccxml.any.Elaborated.xml.txt +++ b/test/expect/gccxml.any.Elaborated.xml.txt @@ -81,10 +81,10 @@ <PointerType id="_57" type="_24c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_24c" type="_24" const="1"/> <FundamentalType id="_58" name="void" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_59" type="_17c"/> - <ReferenceType id="_60" type="_17"/> - <ReferenceType id="_61" type="_24c"/> - <ReferenceType id="_62" type="_24"/> + <ReferenceType id="_59" type="_17c" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_60" type="_17" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_61" type="_24c" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_62" type="_24" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Elaborated.cxx"/> </GCC_XML>$ diff --git a/test/expect/gccxml.any.Field-annotate.xml.txt b/test/expect/gccxml.any.Field-annotate.xml.txt index 3e52277..6b109ab 100644 --- a/test/expect/gccxml.any.Field-annotate.xml.txt +++ b/test/expect/gccxml.any.Field-annotate.xml.txt @@ -11,9 +11,9 @@ </OperatorMethod> <Destructor id="_7" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> <FundamentalType id="_8" name="int" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_9" type="_1c"/> + <ReferenceType id="_9" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_10" type="_1"/> + <ReferenceType id="_10" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Field-annotate.cxx"/> </GCC_XML>$ diff --git a/test/expect/gccxml.any.Field.xml.txt b/test/expect/gccxml.any.Field.xml.txt index 8b695f0..27d5098 100644 --- a/test/expect/gccxml.any.Field.xml.txt +++ b/test/expect/gccxml.any.Field.xml.txt @@ -14,9 +14,9 @@ <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]+"/> <FundamentalType id="_11" name="unsigned int" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_12" type="_1c"/> + <ReferenceType id="_12" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_13" type="_1"/> + <ReferenceType id="_13" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Field.cxx"/> </GCC_XML>$ 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 72b1155..ccf1213 100644 --- a/test/expect/gccxml.any.Function-Argument-default-cast.xml.txt +++ b/test/expect/gccxml.any.Function-Argument-default-cast.xml.txt @@ -38,11 +38,11 @@ <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" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_22" type="_3"/> - <ReferenceType id="_23" type="_3c"/> - <ReferenceType id="_24" type="_4c"/> + <ReferenceType id="_22" type="_3" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_23" type="_3c" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_24" type="_4c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_4c" type="_4" const="1"/> - <ReferenceType id="_25" type="_4"/> + <ReferenceType id="_25" type="_4" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Function-Argument-default-cast.cxx"/> </GCC_XML>$ 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 01883d9..3b9bc82 100644 --- a/test/expect/gccxml.any.Method-Argument-default-cast.xml.txt +++ b/test/expect/gccxml.any.Method-Argument-default-cast.xml.txt @@ -19,9 +19,9 @@ <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" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_12" type="_1c"/> + <ReferenceType id="_12" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_13" type="_1"/> + <ReferenceType id="_13" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Method-Argument-default-cast.cxx"/> </GCC_XML>$ diff --git a/test/expect/gccxml.any.Method-Argument-default.xml.txt b/test/expect/gccxml.any.Method-Argument-default.xml.txt index ee5a364..525fa06 100644 --- a/test/expect/gccxml.any.Method-Argument-default.xml.txt +++ b/test/expect/gccxml.any.Method-Argument-default.xml.txt @@ -15,9 +15,9 @@ <Destructor id="_8" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> <FundamentalType id="_9" name="int" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_9c" type="_9" const="1"/> - <ReferenceType id="_10" type="_1c"/> + <ReferenceType id="_10" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_11" type="_1"/> + <ReferenceType id="_11" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Method-Argument-default.cxx"/> </GCC_XML>$ diff --git a/test/expect/gccxml.any.Method-annotate.xml.txt b/test/expect/gccxml.any.Method-annotate.xml.txt index 4362819..849f0a9 100644 --- a/test/expect/gccxml.any.Method-annotate.xml.txt +++ b/test/expect/gccxml.any.Method-annotate.xml.txt @@ -13,9 +13,9 @@ </OperatorMethod> <Destructor id="_7" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> <FundamentalType id="_8" name="int" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_9" type="_1c"/> + <ReferenceType id="_9" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_10" type="_1"/> + <ReferenceType id="_10" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Method-annotate.cxx"/> </GCC_XML>$ diff --git a/test/expect/gccxml.any.Method-overrides.xml.txt b/test/expect/gccxml.any.Method-overrides.xml.txt index 5fd9f52..98c247b 100644 --- a/test/expect/gccxml.any.Method-overrides.xml.txt +++ b/test/expect/gccxml.any.Method-overrides.xml.txt @@ -19,8 +19,8 @@ <Method id="_10" name="method" returns="_9" context="_8" access="private" location="f1:3" file="f1" line="3" virtual="1" mangled="[^"]+"> <Argument type="_9" location="f1:3" file="f1" line="3"/> </Method> - <ReferenceType id="_11" type="_1"/> - <ReferenceType id="_12" type="_1c"/> + <ReferenceType id="_11" type="_1" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_12" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> <OperatorMethod id="_13" name="=" returns="_17" context="_8" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")? mangled="[^"]+"> <Argument type="_18" location="f1:1" file="f1" line="1"/> @@ -30,8 +30,8 @@ <Constructor id="_16" name="base" context="_8" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?> <Argument type="_18" location="f1:1" file="f1" line="1"/> </Constructor> - <ReferenceType id="_17" type="_8"/> - <ReferenceType id="_18" type="_8c"/> + <ReferenceType id="_17" type="_8" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_18" type="_8c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_8c" type="_8" const="1"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Method-overrides.cxx"/> diff --git a/test/expect/gccxml.any.Method-rvalue-reference.xml.txt b/test/expect/gccxml.any.Method-rvalue-reference.xml.txt index bf9d6a9..77e69f0 100644 --- a/test/expect/gccxml.any.Method-rvalue-reference.xml.txt +++ b/test/expect/gccxml.any.Method-rvalue-reference.xml.txt @@ -11,7 +11,7 @@ <Argument type="_8" location="f1:7" file="f1" line="7"/> </Method> <Destructor id="_6" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_7" type="_1"/> + <ReferenceType id="_7" type="_1" size="[0-9]+" align="[0-9]+"/> <FundamentalType id="_8" name="int" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Method-rvalue-reference.cxx"/> diff --git a/test/expect/gccxml.any.Method.xml.txt b/test/expect/gccxml.any.Method.xml.txt index d9ab112..075273d 100644 --- a/test/expect/gccxml.any.Method.xml.txt +++ b/test/expect/gccxml.any.Method.xml.txt @@ -13,9 +13,9 @@ </OperatorMethod> <Destructor id="_7" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> <FundamentalType id="_8" name="int" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_9" type="_1c"/> + <ReferenceType id="_9" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_10" type="_1"/> + <ReferenceType id="_10" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Method.cxx"/> </GCC_XML>$ diff --git a/test/expect/gccxml.any.Namespace-Class-members.xml.txt b/test/expect/gccxml.any.Namespace-Class-members.xml.txt index 4f9a34d..ba48d58 100644 --- a/test/expect/gccxml.any.Namespace-Class-members.xml.txt +++ b/test/expect/gccxml.any.Namespace-Class-members.xml.txt @@ -12,9 +12,9 @@ </OperatorMethod> <Destructor id="_8" name="A" context="_3" access="public" location="f1:2" file="f1" line="2" inline="1" artificial="1"( throw="")?/> <FundamentalType id="_9" name="int" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_10" type="_3c"/> + <ReferenceType id="_10" type="_3c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_3c" type="_3" const="1"/> - <ReferenceType id="_11" type="_3"/> + <ReferenceType id="_11" type="_3" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Namespace-Class-members.cxx"/> </GCC_XML>$ diff --git a/test/expect/gccxml.any.OperatorFunction-annotate.xml.txt b/test/expect/gccxml.any.OperatorFunction-annotate.xml.txt index 8393bd2..581ef81 100644 --- a/test/expect/gccxml.any.OperatorFunction-annotate.xml.txt +++ b/test/expect/gccxml.any.OperatorFunction-annotate.xml.txt @@ -5,7 +5,7 @@ <Argument type="_4" location="f1:3" file="f1" line="3"/> <Argument type="_5" location="f1:3" file="f1" line="3"/> </OperatorFunction> - <ReferenceType id="_4" type="_6"/> + <ReferenceType id="_4" type="_6" size="[0-9]+" align="[0-9]+"/> <FundamentalType id="_5" name="int" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <Class id="_6" name="A" context="_2" location="f1:1" file="f1" line="1" incomplete="1"/> diff --git a/test/expect/gccxml.any.OperatorFunction.xml.txt b/test/expect/gccxml.any.OperatorFunction.xml.txt index 831e1bf..3ed2c04 100644 --- a/test/expect/gccxml.any.OperatorFunction.xml.txt +++ b/test/expect/gccxml.any.OperatorFunction.xml.txt @@ -5,7 +5,7 @@ <Argument type="_4" location="f1:3" file="f1" line="3"/> <Argument type="_5" location="f1:3" file="f1" line="3"/> </OperatorFunction> - <ReferenceType id="_4" type="_6"/> + <ReferenceType id="_4" type="_6" size="[0-9]+" align="[0-9]+"/> <FundamentalType id="_5" name="int" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <Class id="_6" name="A" context="_2" location="f1:1" file="f1" line="1" incomplete="1"/> diff --git a/test/expect/gccxml.any.OperatorMethod-annotate.xml.txt b/test/expect/gccxml.any.OperatorMethod-annotate.xml.txt index ad6fb5a..b32d3cd 100644 --- a/test/expect/gccxml.any.OperatorMethod-annotate.xml.txt +++ b/test/expect/gccxml.any.OperatorMethod-annotate.xml.txt @@ -12,9 +12,9 @@ <Argument type="_10" location="f1:1" file="f1" line="1"/> </OperatorMethod> <Destructor id="_7" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_8" type="_1"/> + <ReferenceType id="_8" type="_1" size="[0-9]+" align="[0-9]+"/> <FundamentalType id="_9" name="int" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_10" type="_1c"/> + <ReferenceType id="_10" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/OperatorMethod-annotate.cxx"/> diff --git a/test/expect/gccxml.any.OperatorMethod.xml.txt b/test/expect/gccxml.any.OperatorMethod.xml.txt index 3dceaf5..12b9fc0 100644 --- a/test/expect/gccxml.any.OperatorMethod.xml.txt +++ b/test/expect/gccxml.any.OperatorMethod.xml.txt @@ -12,9 +12,9 @@ <Argument type="_10" location="f1:1" file="f1" line="1"/> </OperatorMethod> <Destructor id="_7" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_8" type="_1"/> + <ReferenceType id="_8" type="_1" size="[0-9]+" align="[0-9]+"/> <FundamentalType id="_9" name="int" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_10" type="_1c"/> + <ReferenceType id="_10" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/OperatorMethod.cxx"/> diff --git a/test/expect/gccxml.any.ReferenceType.xml.txt b/test/expect/gccxml.any.ReferenceType.xml.txt index ca74690..968d447 100644 --- a/test/expect/gccxml.any.ReferenceType.xml.txt +++ b/test/expect/gccxml.any.ReferenceType.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"/> - <ReferenceType id="_2" type="_4"/> + <ReferenceType 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/ReferenceType.cxx"/> diff --git a/test/expect/gccxml.any.Variable-in-Class.xml.txt b/test/expect/gccxml.any.Variable-in-Class.xml.txt index ea92a1e..927644e 100644 --- a/test/expect/gccxml.any.Variable-in-Class.xml.txt +++ b/test/expect/gccxml.any.Variable-in-Class.xml.txt @@ -11,9 +11,9 @@ </OperatorMethod> <Destructor id="_7" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> <FundamentalType id="_8" name="int" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_9" type="_1c"/> + <ReferenceType id="_9" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_10" type="_1"/> + <ReferenceType id="_10" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Variable-in-Class.cxx"/> </GCC_XML>$ diff --git a/test/expect/gccxml.any.invalid-decl-for-type.xml.txt b/test/expect/gccxml.any.invalid-decl-for-type.xml.txt index f7905c3..a9fd002 100644 --- a/test/expect/gccxml.any.invalid-decl-for-type.xml.txt +++ b/test/expect/gccxml.any.invalid-decl-for-type.xml.txt @@ -13,9 +13,9 @@ <Destructor id="_8" name="start" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1"( throw="")?/> <Struct id="_9" name="B<Incomplete>" context="_2" location="f1:7" file="f1" line="7" members="_13 _14 _15 _16" size="[0-9]+" align="[0-9]+"/> <Struct id="_10" name="A<Incomplete>" context="_2" location="f1:2" file="f1" line="2" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_11" type="_1c"/> + <ReferenceType id="_11" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_12" type="_1"/> + <ReferenceType id="_12" type="_1" size="[0-9]+" align="[0-9]+"/> <Constructor id="_13" name="B" context="_9" access="public" location="f1:9" file="f1" line="9" inline="1"/> <Constructor id="_14" name="B" context="_9" access="public" location="f1:7" file="f1" line="7" inline="1" artificial="1"( throw="")?> <Argument type="_17" location="f1:7" file="f1" line="7"/> @@ -24,9 +24,9 @@ <Argument type="_17" location="f1:7" file="f1" line="7"/> </OperatorMethod> <Destructor id="_16" name="B" context="_9" access="public" location="f1:7" file="f1" line="7" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_17" type="_9c"/> + <ReferenceType id="_17" type="_9c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_9c" type="_9" const="1"/> - <ReferenceType id="_18" type="_9"/> + <ReferenceType id="_18" type="_9" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/invalid-decl-for-type.cxx"/> </GCC_XML>$ diff --git a/test/expect/gccxml.any.using-declaration-class.xml.txt b/test/expect/gccxml.any.using-declaration-class.xml.txt index 2cd4661..ade1fce 100644 --- a/test/expect/gccxml.any.using-declaration-class.xml.txt +++ b/test/expect/gccxml.any.using-declaration-class.xml.txt @@ -20,9 +20,9 @@ <Class id="_9" name="base" context="_2" location="f1:1" file="f1" line="1" members="_3 _14 _15 _16 _17" size="[0-9]+" align="[0-9]+"/> <FundamentalType id="_10" name="int" size="[0-9]+" align="[0-9]+"/> <FundamentalType id="_11" name="char" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_12" type="_1c"/> + <ReferenceType id="_12" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_13" type="_1"/> + <ReferenceType id="_13" type="_1" size="[0-9]+" align="[0-9]+"/> <Constructor id="_14" name="base" context="_9" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> <Constructor id="_15" name="base" context="_9" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?> <Argument type="_18" location="f1:1" file="f1" line="1"/> @@ -31,9 +31,9 @@ <Argument type="_18" location="f1:1" file="f1" line="1"/> </OperatorMethod> <Destructor id="_17" name="base" context="_9" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_18" type="_9c"/> + <ReferenceType id="_18" type="_9c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_9c" type="_9" const="1"/> - <ReferenceType id="_19" type="_9"/> + <ReferenceType id="_19" type="_9" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/using-declaration-class.cxx"/> </GCC_XML>$ diff --git a/test/expect/gccxml.broken.any.ReferenceType-to-Class-template.xml.txt b/test/expect/gccxml.broken.any.ReferenceType-to-Class-template.xml.txt index 9e64c22..8b6813b 100644 --- a/test/expect/gccxml.broken.any.ReferenceType-to-Class-template.xml.txt +++ b/test/expect/gccxml.broken.any.ReferenceType-to-Class-template.xml.txt @@ -13,11 +13,11 @@ <Argument type="_11" location="f1:7" file="f1" line="7"/> </Function> <FundamentalType id="_4" name="void" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_6" type="_12"/> + <ReferenceType id="_6" type="_12" size="[0-9]+" align="[0-9]+"/> <FundamentalType id="_7" name="short int" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_8" type="_12"/>(broken: duplicate ReferenceType)? + <ReferenceType id="_8" type="_12" size="[0-9]+" align="[0-9]+"/>(broken: duplicate ReferenceType)? <FundamentalType id="_9" name="int" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_10" type="_12"/>(broken: duplicate ReferenceType)? + <ReferenceType id="_10" type="_12" size="[0-9]+" align="[0-9]+"/>(broken: duplicate ReferenceType)? <FundamentalType id="_11" name="long int" size="[0-9]+" align="[0-9]+"/> <Namespace id="_5" name="::"/> <Class id="_12" name="A<int>" context="_5" location="f1:2" file="f1" line="2" incomplete="1"/> diff --git a/test/expect/gccxml.c++11.Class-bases.xml.txt b/test/expect/gccxml.c++11.Class-bases.xml.txt index 189f65a..d446622 100644 --- a/test/expect/gccxml.c++11.Class-bases.xml.txt +++ b/test/expect/gccxml.c++11.Class-bases.xml.txt @@ -16,8 +16,8 @@ <Class id="_7" name="base_public" context="_2" location="f1:1" file="f1" line="1" members="_12 _13 _14 _15" size="[0-9]+" align="[0-9]+"/> <Class id="_8" name="base_private" context="_2" location="f1:4" file="f1" line="4" members="_16 _17 _18 _19" size="[0-9]+" align="[0-9]+"/> <Class id="_9" name="base_protected" context="_2" location="f1:7" file="f1" line="7" members="_20 _21 _22 _23" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_10" type="_1"/> - <ReferenceType id="_11" type="_1c"/> + <ReferenceType id="_10" type="_1" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_11" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> <OperatorMethod id="_12" name="=" returns="_24" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1" mangled="[^"]+"> <Argument type="_25" location="f1:1" file="f1" line="1"/> @@ -43,14 +43,14 @@ <Constructor id="_23" name="base_protected" context="_9" access="public" location="f1:7" file="f1" line="7" inline="1" artificial="1"> <Argument type="_29" location="f1:7" file="f1" line="7"/> </Constructor> - <ReferenceType id="_24" type="_7"/> - <ReferenceType id="_25" type="_7c"/> + <ReferenceType id="_24" type="_7" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_25" type="_7c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_7c" type="_7" const="1"/> - <ReferenceType id="_26" type="_8"/> - <ReferenceType id="_27" type="_8c"/> + <ReferenceType id="_26" type="_8" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_27" type="_8c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_8c" type="_8" const="1"/> - <ReferenceType id="_28" type="_9"/> - <ReferenceType id="_29" type="_9c"/> + <ReferenceType id="_28" type="_9" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_29" type="_9c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_9c" type="_9" const="1"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-bases.cxx"/> diff --git a/test/expect/gccxml.c++11.Class-template-bases.xml.txt b/test/expect/gccxml.c++11.Class-template-bases.xml.txt index d213494..e09f577 100644 --- a/test/expect/gccxml.c++11.Class-template-bases.xml.txt +++ b/test/expect/gccxml.c++11.Class-template-bases.xml.txt @@ -14,9 +14,9 @@ <Destructor id="_6" name="start" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1"/> <Class id="_7" name="non_dependent_base" context="_2" location="f1:1" file="f1" line="1" members="_11 _12 _13 _14" size="[0-9]+" align="[0-9]+"/> <Class id="_8" name="dependent_base<int>" context="_2" location="f1:5" file="f1" line="5" members="_15 _16 _17 _18" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_9" type="_1c"/> + <ReferenceType id="_9" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_10" type="_1"/> + <ReferenceType id="_10" type="_1" size="[0-9]+" align="[0-9]+"/> <Constructor id="_11" name="non_dependent_base" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"/> <Constructor id="_12" name="non_dependent_base" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"> <Argument type="_19" location="f1:1" file="f1" line="1"/> @@ -33,12 +33,12 @@ <Argument type="_21" location="f1:5" file="f1" line="5"/> </OperatorMethod> <Destructor id="_18" name="dependent_base" context="_8" access="public" location="f1:5" file="f1" line="5" inline="1" artificial="1"/> - <ReferenceType id="_19" type="_7c"/> + <ReferenceType id="_19" type="_7c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_7c" type="_7" const="1"/> - <ReferenceType id="_20" type="_7"/> - <ReferenceType id="_21" type="_8c"/> + <ReferenceType id="_20" type="_7" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_21" type="_8c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_8c" type="_8" const="1"/> - <ReferenceType id="_22" type="_8"/> + <ReferenceType id="_22" type="_8" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-template-bases.cxx"/> </GCC_XML>$ diff --git a/test/expect/gccxml.c++14.Class-bases.xml.txt b/test/expect/gccxml.c++14.Class-bases.xml.txt index 189f65a..d446622 100644 --- a/test/expect/gccxml.c++14.Class-bases.xml.txt +++ b/test/expect/gccxml.c++14.Class-bases.xml.txt @@ -16,8 +16,8 @@ <Class id="_7" name="base_public" context="_2" location="f1:1" file="f1" line="1" members="_12 _13 _14 _15" size="[0-9]+" align="[0-9]+"/> <Class id="_8" name="base_private" context="_2" location="f1:4" file="f1" line="4" members="_16 _17 _18 _19" size="[0-9]+" align="[0-9]+"/> <Class id="_9" name="base_protected" context="_2" location="f1:7" file="f1" line="7" members="_20 _21 _22 _23" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_10" type="_1"/> - <ReferenceType id="_11" type="_1c"/> + <ReferenceType id="_10" type="_1" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_11" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> <OperatorMethod id="_12" name="=" returns="_24" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1" mangled="[^"]+"> <Argument type="_25" location="f1:1" file="f1" line="1"/> @@ -43,14 +43,14 @@ <Constructor id="_23" name="base_protected" context="_9" access="public" location="f1:7" file="f1" line="7" inline="1" artificial="1"> <Argument type="_29" location="f1:7" file="f1" line="7"/> </Constructor> - <ReferenceType id="_24" type="_7"/> - <ReferenceType id="_25" type="_7c"/> + <ReferenceType id="_24" type="_7" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_25" type="_7c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_7c" type="_7" const="1"/> - <ReferenceType id="_26" type="_8"/> - <ReferenceType id="_27" type="_8c"/> + <ReferenceType id="_26" type="_8" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_27" type="_8c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_8c" type="_8" const="1"/> - <ReferenceType id="_28" type="_9"/> - <ReferenceType id="_29" type="_9c"/> + <ReferenceType id="_28" type="_9" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_29" type="_9c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_9c" type="_9" const="1"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-bases.cxx"/> diff --git a/test/expect/gccxml.c++14.Class-template-bases.xml.txt b/test/expect/gccxml.c++14.Class-template-bases.xml.txt index d213494..e09f577 100644 --- a/test/expect/gccxml.c++14.Class-template-bases.xml.txt +++ b/test/expect/gccxml.c++14.Class-template-bases.xml.txt @@ -14,9 +14,9 @@ <Destructor id="_6" name="start" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1"/> <Class id="_7" name="non_dependent_base" context="_2" location="f1:1" file="f1" line="1" members="_11 _12 _13 _14" size="[0-9]+" align="[0-9]+"/> <Class id="_8" name="dependent_base<int>" context="_2" location="f1:5" file="f1" line="5" members="_15 _16 _17 _18" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_9" type="_1c"/> + <ReferenceType id="_9" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_10" type="_1"/> + <ReferenceType id="_10" type="_1" size="[0-9]+" align="[0-9]+"/> <Constructor id="_11" name="non_dependent_base" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"/> <Constructor id="_12" name="non_dependent_base" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"> <Argument type="_19" location="f1:1" file="f1" line="1"/> @@ -33,12 +33,12 @@ <Argument type="_21" location="f1:5" file="f1" line="5"/> </OperatorMethod> <Destructor id="_18" name="dependent_base" context="_8" access="public" location="f1:5" file="f1" line="5" inline="1" artificial="1"/> - <ReferenceType id="_19" type="_7c"/> + <ReferenceType id="_19" type="_7c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_7c" type="_7" const="1"/> - <ReferenceType id="_20" type="_7"/> - <ReferenceType id="_21" type="_8c"/> + <ReferenceType id="_20" type="_7" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_21" type="_8c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_8c" type="_8" const="1"/> - <ReferenceType id="_22" type="_8"/> + <ReferenceType id="_22" type="_8" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-template-bases.cxx"/> </GCC_XML>$ diff --git a/test/expect/gccxml.c++98.Class-bases.xml.txt b/test/expect/gccxml.c++98.Class-bases.xml.txt index df98ded..3a7a86f 100644 --- a/test/expect/gccxml.c++98.Class-bases.xml.txt +++ b/test/expect/gccxml.c++98.Class-bases.xml.txt @@ -16,8 +16,8 @@ <Class id="_7" name="base_public" context="_2" location="f1:1" file="f1" line="1" members="_12 _13 _14 _15" size="[0-9]+" align="[0-9]+"/> <Class id="_8" name="base_private" context="_2" location="f1:4" file="f1" line="4" members="_16 _17 _18 _19" size="[0-9]+" align="[0-9]+"/> <Class id="_9" name="base_protected" context="_2" location="f1:7" file="f1" line="7" members="_20 _21 _22 _23" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_10" type="_1"/> - <ReferenceType id="_11" type="_1c"/> + <ReferenceType id="_10" type="_1" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_11" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> <Constructor id="_12" name="base_public" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1" throw=""/> <Constructor id="_13" name="base_public" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1" throw=""> @@ -43,15 +43,15 @@ <Argument type="_28" location="f1:7" file="f1" line="7"/> </OperatorMethod> <Destructor id="_23" name="base_protected" context="_9" access="public" location="f1:7" file="f1" line="7" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_24" type="_7c"/> + <ReferenceType id="_24" type="_7c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_7c" type="_7" const="1"/> - <ReferenceType id="_25" type="_7"/> - <ReferenceType id="_26" type="_8c"/> + <ReferenceType id="_25" type="_7" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_26" type="_8c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_8c" type="_8" const="1"/> - <ReferenceType id="_27" type="_8"/> - <ReferenceType id="_28" type="_9c"/> + <ReferenceType id="_27" type="_8" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_28" type="_9c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_9c" type="_9" const="1"/> - <ReferenceType id="_29" type="_9"/> + <ReferenceType id="_29" type="_9" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-bases.cxx"/> </GCC_XML>$ diff --git a/test/expect/gccxml.c++98.Class-template-bases.xml.txt b/test/expect/gccxml.c++98.Class-template-bases.xml.txt index d5f0339..aefed78 100644 --- a/test/expect/gccxml.c++98.Class-template-bases.xml.txt +++ b/test/expect/gccxml.c++98.Class-template-bases.xml.txt @@ -14,9 +14,9 @@ <Destructor id="_6" name="start" context="_1" access="public" location="f1:12" file="f1" line="12" inline="1" artificial="1"( throw="")?/> <Class id="_7" name="non_dependent_base" context="_2" location="f1:1" file="f1" line="1" members="_11 _12 _13 _14" size="[0-9]+" align="[0-9]+"/> <Class id="_8" name="dependent_base<int>" context="_2" location="f1:5" file="f1" line="5" members="_15 _16 _17 _18" size="[0-9]+" align="[0-9]+"/> - <ReferenceType id="_9" type="_1c"/> + <ReferenceType id="_9" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_10" type="_1"/> + <ReferenceType id="_10" type="_1" size="[0-9]+" align="[0-9]+"/> <Constructor id="_11" name="non_dependent_base" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> <Constructor id="_12" name="non_dependent_base" context="_7" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1" throw=""> <Argument type="_19" location="f1:1" file="f1" line="1"/> @@ -33,12 +33,12 @@ <Argument type="_21" location="f1:5" file="f1" line="5"/> </OperatorMethod> <Destructor id="_18" name="dependent_base" context="_8" access="public" location="f1:5" file="f1" line="5" inline="1" artificial="1"( throw="")?/> - <ReferenceType id="_19" type="_7c"/> + <ReferenceType id="_19" type="_7c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_7c" type="_7" const="1"/> - <ReferenceType id="_20" type="_7"/> - <ReferenceType id="_21" type="_8c"/> + <ReferenceType id="_20" type="_7" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_21" type="_8c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_8c" type="_8" const="1"/> - <ReferenceType id="_22" type="_8"/> + <ReferenceType id="_22" type="_8" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-template-bases.cxx"/> </GCC_XML>$ |