Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package CastXML for openSUSE:Factory checked in at 2021-01-18 11:28:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/CastXML (Old) and /work/SRC/openSUSE:Factory/.CastXML.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "CastXML" Mon Jan 18 11:28:47 2021 rev:4 rq:863665 version:0.4.2 Changes: -------- --- /work/SRC/openSUSE:Factory/CastXML/CastXML.changes 2021-01-13 18:36:35.322358217 +0100 +++ /work/SRC/openSUSE:Factory/.CastXML.new.28504/CastXML.changes 2021-01-18 11:32:32.768695927 +0100 @@ -1,0 +2,13 @@ +Fri Jan 15 23:10:56 UTC 2021 - Atri Bhattacharya <[email protected]> + +- Update to version 0.4.2: + * test: Fix expected output on 32-bit architectures + (i686/armv7hl). +- Changes from version 0.4.1: + * schema: allow 'mangled' attributes to be empty. + * test: Tell Git to use LF newlines for test inputs. + * test: Make Function-Argument-default-ns output more + predictable. + * Output: Generate Enumeration underlying integer type. + +------------------------------------------------------------------- Old: ---- CastXML-0.4.0.tar.gz New: ---- CastXML-0.4.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ CastXML.spec ++++++ --- /var/tmp/diff_new_pack.Nx6m3Y/_old 2021-01-18 11:32:33.416696566 +0100 +++ /var/tmp/diff_new_pack.Nx6m3Y/_new 2021-01-18 11:32:33.420696569 +0100 @@ -17,7 +17,7 @@ Name: CastXML -Version: 0.4.0 +Version: 0.4.2 Release: 0 Summary: C-family Abstract Syntax Tree XML Output License: Apache-2.0 ++++++ CastXML-0.4.0.tar.gz -> CastXML-0.4.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.0/doc/manual/castxml.xsd new/CastXML-0.4.2/doc/manual/castxml.xsd --- old/CastXML-0.4.0/doc/manual/castxml.xsd 2021-01-12 18:56:39.000000000 +0100 +++ new/CastXML-0.4.2/doc/manual/castxml.xsd 2021-01-15 17:31:46.000000000 +0100 @@ -98,7 +98,7 @@ <xs:attribute name="extern" type="xs:int" use="optional" fixed="1" /> <xs:attribute name="artificial" type="xs:int" use="optional" fixed="1" /> <xs:attribute name="throw" type="xs:IDREFS" use="optional" /> - <xs:attribute name="mangled" type="name" /> + <xs:attribute name="mangled" type="xs:string" /> <xs:attribute name="deprecation" type="name" use="optional"/> <xs:attribute name="annotation" type="name" use="optional"/> <xs:attribute name="attributes" type="attributes" use="optional" /> @@ -237,6 +237,7 @@ <xs:attribute name="id" type="xs:ID" /> <!-- Anonymous enums might have an empty name. --> <xs:attribute name="name" type="nameOrEmpty" /> + <xs:attribute name="type" type="xs:IDREF" /> <xs:attribute name="context" type="xs:IDREF" use="optional" /> <!-- Access is available for enums in class context. --> <xs:attribute name="access" type="access" use="optional" /> @@ -262,7 +263,7 @@ <xs:attributeGroup ref="location" /> <xs:attribute name="static" type="xs:int" use="optional" fixed="1" /> <xs:attribute name="extern" type="xs:int" use="optional" fixed="1" /> - <xs:attribute name="mangled" type="name" /> + <xs:attribute name="mangled" type="xs:string" /> <xs:attribute name="attributes" type="attributes" use="optional" /> <xs:attribute name="comment" type="xs:IDREF" use="optional" /> <xs:attribute name="deprecation" type="name" use="optional"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.0/src/Output.cxx new/CastXML-0.4.2/src/Output.cxx --- old/CastXML-0.4.0/src/Output.cxx 2021-01-12 18:56:39.000000000 +0100 +++ new/CastXML-0.4.2/src/Output.cxx 2021-01-15 17:31:46.000000000 +0100 @@ -1999,6 +1999,9 @@ } } this->PrintNameAttribute(name); + if (this->Opts.CastXml) { + this->PrintTypeAttribute(d->getIntegerType(), dn->Complete); + } this->PrintContextAttribute(d); this->PrintLocationAttribute(d); if (this->Opts.CastXml && d->isScoped()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.0/src/Version.cmake new/CastXML-0.4.2/src/Version.cmake --- old/CastXML-0.4.0/src/Version.cmake 2021-01-12 18:56:39.000000000 +0100 +++ new/CastXML-0.4.2/src/Version.cmake 2021-01-15 17:31:46.000000000 +0100 @@ -1,7 +1,7 @@ # CastXML version number components. set(CastXML_VERSION_MAJOR 0) set(CastXML_VERSION_MINOR 4) -set(CastXML_VERSION_PATCH 0) +set(CastXML_VERSION_PATCH 2) set(CastXML_VERSION_RC 0) set(CastXML_VERSION_IS_DIRTY 0) @@ -13,7 +13,7 @@ endif() # If this source was exported by 'git archive', use its commit info. -set(git_info "835e442 CastXML 0.4.0") +set(git_info "cf0fd3a CastXML 0.4.2") # Otherwise, try to identify the current development source version. if(NOT git_info MATCHES "^([0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]?[0-9a-f]?)[0-9a-f]* " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.0/test/CMakeLists.txt new/CastXML-0.4.2/test/CMakeLists.txt --- old/CastXML-0.4.0/test/CMakeLists.txt 2021-01-12 18:56:39.000000000 +0100 +++ new/CastXML-0.4.2/test/CMakeLists.txt 2021-01-15 17:31:46.000000000 +0100 @@ -481,6 +481,7 @@ castxml_test_output(Enumeration-deprecated) castxml_test_output(Enumeration-anonymous) castxml_test_output_11(Enumeration-scoped) +castxml_test_output_11(Enumeration-type) castxml_test_output(Field) castxml_test_output(Field-annotate) castxml_test_output(Field-deprecated) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.0/test/expect/castxml1.any.Class-deprecated.xml.txt new/CastXML-0.4.2/test/expect/castxml1.any.Class-deprecated.xml.txt --- old/CastXML-0.4.0/test/expect/castxml1.any.Class-deprecated.xml.txt 2021-01-12 18:56:39.000000000 +0100 +++ new/CastXML-0.4.2/test/expect/castxml1.any.Class-deprecated.xml.txt 2021-01-15 17:31:46.000000000 +0100 @@ -1,6 +1,6 @@ ^<\?xml version="1.0"\?> <CastXML[^>]*> - <Class id="_1" name="start" context="_2" location="f1:1" file="f1" line="1" members="_3 _4 _5 _6" size="8" align="8" deprecation="Class Deprecated" attributes="deprecated"/> + <Class id="_1" name="start" context="_2" location="f1:1" file="f1" line="1" members="_3 _4 _5 _6" size="[0-9]+" align="[0-9]+" deprecation="Class Deprecated" attributes="deprecated"/> <Constructor id="_3" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?/> <Constructor id="_4" name="start" context="_1" access="public" location="f1:1" file="f1" line="1" inline="1" artificial="1"( throw="")?> <Argument type="_7" location="f1:1" file="f1" line="1"/> @@ -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" size="64" align="64"/> + <ReferenceType id="_7" type="_1c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_1c" type="_1" const="1"/> - <ReferenceType id="_8" type="_1" size="64" align="64"/> + <ReferenceType id="_8" type="_1" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Class-deprecated.cxx"/> </CastXML>$ \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.0/test/expect/castxml1.any.Comment-Enumeration.xml.txt new/CastXML-0.4.2/test/expect/castxml1.any.Comment-Enumeration.xml.txt --- old/CastXML-0.4.0/test/expect/castxml1.any.Comment-Enumeration.xml.txt 2021-01-12 18:56:39.000000000 +0100 +++ new/CastXML-0.4.2/test/expect/castxml1.any.Comment-Enumeration.xml.txt 2021-01-15 17:31:46.000000000 +0100 @@ -1,7 +1,8 @@ ^<\?xml version="1.0"\?> <CastXML[^>]*> - <Enumeration id="_1" name="start" context="_2" location="f1:3" file="f1" line="3" size="[0-9]+" align="[0-9]+" comment="c1"/> - <Namespace id="_2" name="::"/> + <Enumeration id="_1" name="start" type="_2" context="_3" location="f1:3" file="f1" line="3" size="[0-9]+" align="[0-9]+" comment="c1"/> + <FundamentalType id="_2" name="(unsigned )?int" size="[0-9]+" align="[0-9]+"/> + <Namespace id="_3" name="::"/> <Comment id="c1" attached="_1" file="f1" begin_line="1" begin_column="1" begin_offset="0" end_line="2" end_column="24" end_offset="40"/> <File id="f1" name=".*/test/input/Comment-Enumeration.cxx"/> </CastXML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.0/test/expect/castxml1.any.Elaborated.xml.txt new/CastXML-0.4.2/test/expect/castxml1.any.Elaborated.xml.txt --- old/CastXML-0.4.0/test/expect/castxml1.any.Elaborated.xml.txt 2021-01-12 18:56:39.000000000 +0100 +++ new/CastXML-0.4.2/test/expect/castxml1.any.Elaborated.xml.txt 2021-01-15 17:31:46.000000000 +0100 @@ -8,91 +8,92 @@ <Variable id="_7" name="s4" type="_38" context="_1" location="f1:9" file="f1" line="9" mangled="[^"]+"/> <Typedef id="_8" name="s5" type="_35" context="_1" location="f1:10" file="f1" line="10"/> <Typedef id="_9" name="s6" type="_36" context="_1" location="f1:11" file="f1" line="11"/> - <Enumeration id="_10" name="Foo2" context="_1" location="f1:14" file="f1" line="14" size="[0-9]+" align="[0-9]+"/> - <Variable id="_11" name="e1" type="_39" context="_1" location="f1:18" file="f1" line="18" mangled="[^"]+"/> - <Variable id="_12" name="e2" type="_40" context="_1" location="f1:19" file="f1" line="19" mangled="[^"]+"/> - <Variable id="_13" name="e3" type="_41" context="_1" location="f1:20" file="f1" line="20" mangled="[^"]+"/> - <Variable id="_14" name="e4" type="_42" context="_1" location="f1:21" file="f1" line="21" mangled="[^"]+"/> - <Typedef id="_15" name="e5" type="_39" context="_1" location="f1:22" file="f1" line="22"/> - <Typedef id="_16" name="e6" type="_40" context="_1" location="f1:23" file="f1" line="23"/> - <Union id="_17" name="Foo3" context="_1" location="f1:26" file="f1" line="26" members="_43 _44 _45 _46" size="[0-9]+" align="[0-9]+"/> - <Variable id="_18" name="u1" type="_47" context="_1" location="f1:30" file="f1" line="30" mangled="[^"]+"/> - <Variable id="_19" name="u2" type="_48" context="_1" location="f1:31" file="f1" line="31" mangled="[^"]+"/> - <Variable id="_20" name="u3" type="_49" context="_1" location="f1:32" file="f1" line="32" mangled="[^"]+"/> - <Variable id="_21" name="u4" type="_50" context="_1" location="f1:33" file="f1" line="33" mangled="[^"]+"/> - <Typedef id="_22" name="u5" type="_47" context="_1" location="f1:34" file="f1" line="34"/> - <Typedef id="_23" name="u6" type="_48" context="_1" location="f1:35" file="f1" line="35"/> - <Class id="_24" name="Foo4" context="_1" location="f1:38" file="f1" line="38" members="_51 _52 _53 _54" size="[0-9]+" align="[0-9]+"/> - <Variable id="_25" name="c1" type="_55" context="_1" location="f1:42" file="f1" line="42" mangled="[^"]+"/> - <Variable id="_26" name="c2" type="_56" context="_1" location="f1:43" file="f1" line="43" mangled="[^"]+"/> - <Variable id="_27" name="c3" type="_49" context="_1" location="f1:44" file="f1" line="44" mangled="[^"]+"/> - <Variable id="_28" name="c4" type="_57" context="_1" location="f1:45" file="f1" line="45" mangled="[^"]+"/> - <Typedef id="_29" name="c5" type="_55" context="_1" location="f1:46" file="f1" line="46"/> - <Typedef id="_30" name="c6" type="_56" context="_1" location="f1:47" file="f1" line="47"/> - <Function id="_31" name="func1" returns="_58" context="_1" location="f1:50" file="f1" line="50" mangled="[^"]+"> + <Enumeration id="_10" name="Foo2" type="_39" context="_1" location="f1:14" file="f1" line="14" size="[0-9]+" align="[0-9]+"/> + <Variable id="_11" name="e1" type="_40" context="_1" location="f1:18" file="f1" line="18" mangled="[^"]+"/> + <Variable id="_12" name="e2" type="_41" context="_1" location="f1:19" file="f1" line="19" mangled="[^"]+"/> + <Variable id="_13" name="e3" type="_42" context="_1" location="f1:20" file="f1" line="20" mangled="[^"]+"/> + <Variable id="_14" name="e4" type="_43" context="_1" location="f1:21" file="f1" line="21" mangled="[^"]+"/> + <Typedef id="_15" name="e5" type="_40" context="_1" location="f1:22" file="f1" line="22"/> + <Typedef id="_16" name="e6" type="_41" context="_1" location="f1:23" file="f1" line="23"/> + <Union id="_17" name="Foo3" context="_1" location="f1:26" file="f1" line="26" members="_44 _45 _46 _47" size="[0-9]+" align="[0-9]+"/> + <Variable id="_18" name="u1" type="_48" context="_1" location="f1:30" file="f1" line="30" mangled="[^"]+"/> + <Variable id="_19" name="u2" type="_49" context="_1" location="f1:31" file="f1" line="31" mangled="[^"]+"/> + <Variable id="_20" name="u3" type="_50" context="_1" location="f1:32" file="f1" line="32" mangled="[^"]+"/> + <Variable id="_21" name="u4" type="_51" context="_1" location="f1:33" file="f1" line="33" mangled="[^"]+"/> + <Typedef id="_22" name="u5" type="_48" context="_1" location="f1:34" file="f1" line="34"/> + <Typedef id="_23" name="u6" type="_49" context="_1" location="f1:35" file="f1" line="35"/> + <Class id="_24" name="Foo4" context="_1" location="f1:38" file="f1" line="38" members="_52 _53 _54 _55" size="[0-9]+" align="[0-9]+"/> + <Variable id="_25" name="c1" type="_56" context="_1" location="f1:42" file="f1" line="42" mangled="[^"]+"/> + <Variable id="_26" name="c2" type="_57" context="_1" location="f1:43" file="f1" line="43" mangled="[^"]+"/> + <Variable id="_27" name="c3" type="_50" context="_1" location="f1:44" file="f1" line="44" mangled="[^"]+"/> + <Variable id="_28" name="c4" type="_58" context="_1" location="f1:45" file="f1" line="45" mangled="[^"]+"/> + <Typedef id="_29" name="c5" type="_56" context="_1" location="f1:46" file="f1" line="46"/> + <Typedef id="_30" name="c6" type="_57" context="_1" location="f1:47" file="f1" line="47"/> + <Function id="_31" name="func1" returns="_59" context="_1" location="f1:50" file="f1" line="50" mangled="[^"]+"> <Argument name="a1" type="_35" location="f1:50" file="f1" line="50"/> <Argument name="a2" type="_36" location="f1:50" file="f1" line="50"/> </Function> - <Function id="_32" name="func2" returns="_58" context="_1" location="f1:51" file="f1" line="51" mangled="[^"]+"> - <Argument name="a3" type="_39" location="f1:51" file="f1" line="51"/> - <Argument name="a4" type="_40" location="f1:51" file="f1" line="51"/> + <Function id="_32" name="func2" returns="_59" context="_1" location="f1:51" file="f1" line="51" mangled="[^"]+"> + <Argument name="a3" type="_40" location="f1:51" file="f1" line="51"/> + <Argument name="a4" type="_41" location="f1:51" file="f1" line="51"/> </Function> - <Function id="_33" name="func3" returns="_58" context="_1" location="f1:52" file="f1" line="52" mangled="[^"]+"> - <Argument name="a5" type="_47" location="f1:52" file="f1" line="52"/> - <Argument name="a6" type="_48" location="f1:52" file="f1" line="52"/> + <Function id="_33" name="func3" returns="_59" context="_1" location="f1:52" file="f1" line="52" mangled="[^"]+"> + <Argument name="a5" type="_48" location="f1:52" file="f1" line="52"/> + <Argument name="a6" type="_49" location="f1:52" file="f1" line="52"/> </Function> - <Function id="_34" name="func4" returns="_58" context="_1" location="f1:53" file="f1" line="53" mangled="[^"]+"> - <Argument name="a7" type="_55" location="f1:53" file="f1" line="53"/> - <Argument name="a8" type="_56" location="f1:53" file="f1" line="53"/> + <Function id="_34" name="func4" returns="_59" context="_1" location="f1:53" file="f1" line="53" mangled="[^"]+"> + <Argument name="a7" type="_56" location="f1:53" file="f1" line="53"/> + <Argument name="a8" type="_57" location="f1:53" file="f1" line="53"/> </Function> <PointerType id="_35" type="_3" size="[0-9]+" align="[0-9]+"/> - <PointerType id="_36" type="_59" size="[0-9]+" align="[0-9]+"/> + <PointerType id="_36" type="_60" size="[0-9]+" align="[0-9]+"/> <PointerType id="_37" type="_3c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_3c" type="_3" const="1"/> - <PointerType id="_38" type="_59c" size="[0-9]+" align="[0-9]+"/> - <PointerType id="_39" type="_10" size="[0-9]+" align="[0-9]+"/> - <PointerType id="_40" type="_60" size="[0-9]+" align="[0-9]+"/> - <PointerType id="_41" type="_10c" size="[0-9]+" align="[0-9]+"/> + <PointerType id="_38" type="_60c" size="[0-9]+" align="[0-9]+"/> + <FundamentalType id="_39" name="(unsigned )?int" size="[0-9]+" align="[0-9]+"/> + <PointerType id="_40" type="_10" size="[0-9]+" align="[0-9]+"/> + <PointerType id="_41" type="_61" size="[0-9]+" align="[0-9]+"/> + <PointerType id="_42" type="_10c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_10c" type="_10" const="1"/> - <PointerType id="_42" type="_60c" size="[0-9]+" align="[0-9]+"/> - <Constructor id="_43" name="Foo3" context="_17" access="public" location="f1:26" file="f1" line="26" inline="1" artificial="1"( throw="")?/> - <Constructor id="_44" name="Foo3" context="_17" access="public" location="f1:26" file="f1" line="26" inline="1" artificial="1"( throw="")?> - <Argument type="_61" location="f1:26" file="f1" line="26"/> + <PointerType id="_43" type="_61c" size="[0-9]+" align="[0-9]+"/> + <Constructor id="_44" name="Foo3" context="_17" access="public" location="f1:26" file="f1" line="26" inline="1" artificial="1"( throw="")?/> + <Constructor id="_45" name="Foo3" context="_17" access="public" location="f1:26" file="f1" line="26" inline="1" artificial="1"( throw="")?> + <Argument type="_62" location="f1:26" file="f1" line="26"/> </Constructor> - <OperatorMethod id="_45" name="=" returns="_62" context="_17" access="public" location="f1:26" file="f1" line="26" inline="1" artificial="1"( throw="")? mangled="[^"]+"> - <Argument type="_61" location="f1:26" file="f1" line="26"/> + <OperatorMethod id="_46" name="=" returns="_63" context="_17" access="public" location="f1:26" file="f1" line="26" inline="1" artificial="1"( throw="")? mangled="[^"]+"> + <Argument type="_62" location="f1:26" file="f1" line="26"/> </OperatorMethod> - <Destructor id="_46" name="Foo3" context="_17" access="public" location="f1:26" file="f1" line="26" inline="1" artificial="1"( throw="")?/> - <PointerType id="_47" type="_17" size="[0-9]+" align="[0-9]+"/> - <PointerType id="_48" type="_63" size="[0-9]+" align="[0-9]+"/> - <PointerType id="_49" type="_17c" size="[0-9]+" align="[0-9]+"/> + <Destructor id="_47" name="Foo3" context="_17" access="public" location="f1:26" file="f1" line="26" inline="1" artificial="1"( throw="")?/> + <PointerType id="_48" type="_17" size="[0-9]+" align="[0-9]+"/> + <PointerType id="_49" type="_64" size="[0-9]+" align="[0-9]+"/> + <PointerType id="_50" type="_17c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_17c" type="_17" const="1"/> - <PointerType id="_50" type="_63c" size="[0-9]+" align="[0-9]+"/> - <Constructor id="_51" name="Foo4" context="_24" access="public" location="f1:38" file="f1" line="38" inline="1" artificial="1"( throw="")?/> - <Constructor id="_52" name="Foo4" context="_24" access="public" location="f1:38" file="f1" line="38" inline="1" artificial="1"( throw="")?> - <Argument type="_64" location="f1:38" file="f1" line="38"/> + <PointerType id="_51" type="_64c" size="[0-9]+" align="[0-9]+"/> + <Constructor id="_52" name="Foo4" context="_24" access="public" location="f1:38" file="f1" line="38" inline="1" artificial="1"( throw="")?/> + <Constructor id="_53" name="Foo4" context="_24" access="public" location="f1:38" file="f1" line="38" inline="1" artificial="1"( throw="")?> + <Argument type="_65" location="f1:38" file="f1" line="38"/> </Constructor> - <OperatorMethod id="_53" name="=" returns="_65" context="_24" access="public" location="f1:38" file="f1" line="38" inline="1" artificial="1"( throw="")? mangled="[^"]+"> - <Argument type="_64" location="f1:38" file="f1" line="38"/> + <OperatorMethod id="_54" name="=" returns="_66" context="_24" access="public" location="f1:38" file="f1" line="38" inline="1" artificial="1"( throw="")? mangled="[^"]+"> + <Argument type="_65" location="f1:38" file="f1" line="38"/> </OperatorMethod> - <Destructor id="_54" name="Foo4" context="_24" access="public" location="f1:38" file="f1" line="38" inline="1" artificial="1"( throw="")?/> - <PointerType id="_55" type="_24" size="[0-9]+" align="[0-9]+"/> - <PointerType id="_56" type="_66" size="[0-9]+" align="[0-9]+"/> - <PointerType id="_57" type="_66c" size="[0-9]+" align="[0-9]+"/> - <FundamentalType id="_58" name="void" size="[0-9]+" align="[0-9]+"/> - <CvQualifiedType id="_59c" type="_59" const="1"/> + <Destructor id="_55" name="Foo4" context="_24" access="public" location="f1:38" file="f1" line="38" inline="1" artificial="1"( throw="")?/> + <PointerType id="_56" type="_24" size="[0-9]+" align="[0-9]+"/> + <PointerType id="_57" type="_67" size="[0-9]+" align="[0-9]+"/> + <PointerType id="_58" type="_67c" size="[0-9]+" align="[0-9]+"/> + <FundamentalType id="_59" name="void" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_60c" type="_60" const="1"/> - <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" size="[0-9]+" align="[0-9]+"/> + <CvQualifiedType id="_61c" type="_61" const="1"/> + <ReferenceType id="_62" type="_17c" size="[0-9]+" align="[0-9]+"/> + <ReferenceType id="_63" type="_17" size="[0-9]+" align="[0-9]+"/> + <CvQualifiedType id="_64c" type="_64" const="1"/> + <ReferenceType id="_65" type="_24c" size="[0-9]+" align="[0-9]+"/> <CvQualifiedType id="_24c" type="_24" const="1"/> - <ReferenceType id="_65" type="_24" size="[0-9]+" align="[0-9]+"/> - <CvQualifiedType id="_66c" type="_66" const="1"/> + <ReferenceType id="_66" type="_24" size="[0-9]+" align="[0-9]+"/> + <CvQualifiedType id="_67c" type="_67" const="1"/> <Namespace id="_2" name="::"/> - <ElaboratedType id="_59" type="_3"/> - <ElaboratedType id="_60" type="_10"/> - <ElaboratedType id="_63" type="_17"/> - <ElaboratedType id="_66" type="_24"/> + <ElaboratedType id="_60" type="_3"/> + <ElaboratedType id="_61" type="_10"/> + <ElaboratedType id="_64" type="_17"/> + <ElaboratedType id="_67" type="_24"/> <File id="f1" name=".*/test/input/Elaborated.cxx"/> </CastXML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.0/test/expect/castxml1.any.Enumeration-annotate.xml.txt new/CastXML-0.4.2/test/expect/castxml1.any.Enumeration-annotate.xml.txt --- old/CastXML-0.4.0/test/expect/castxml1.any.Enumeration-annotate.xml.txt 2021-01-12 18:56:39.000000000 +0100 +++ new/CastXML-0.4.2/test/expect/castxml1.any.Enumeration-annotate.xml.txt 2021-01-15 17:31:46.000000000 +0100 @@ -1,8 +1,9 @@ ^<\?xml version="1.0"\?> <CastXML[^>]*> - <Enumeration id="_1" name="start" context="_2" location="f1:1" file="f1" line="1" size="[0-9]+" align="[0-9]+" annotation="an annotation" attributes="annotate\(an annotation\)"> + <Enumeration id="_1" name="start" type="_2" context="_3" location="f1:1" file="f1" line="1" size="[0-9]+" align="[0-9]+" annotation="an annotation" attributes="annotate\(an annotation\)"> <EnumValue name="ev0" init="0" annotation="an annotation" attributes="annotate\(an annotation\)"/> </Enumeration> - <Namespace id="_2" name="::"/> + <FundamentalType id="_2" name="(unsigned )?int" size="[0-9]+" align="[0-9]+"/> + <Namespace id="_3" name="::"/> <File id="f1" name=".*/test/input/Enumeration-annotate.cxx"/> </CastXML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.0/test/expect/castxml1.any.Enumeration-anonymous.xml.txt new/CastXML-0.4.2/test/expect/castxml1.any.Enumeration-anonymous.xml.txt --- old/CastXML-0.4.0/test/expect/castxml1.any.Enumeration-anonymous.xml.txt 2021-01-12 18:56:39.000000000 +0100 +++ new/CastXML-0.4.2/test/expect/castxml1.any.Enumeration-anonymous.xml.txt 2021-01-15 17:31:46.000000000 +0100 @@ -1,10 +1,11 @@ ^<\?xml version="1.0"\?> <CastXML[^>]*> <Namespace id="_1" name="start" context="_2" members="_3"/> - <Enumeration id="_3" name="" context="_1" location="f1:2" file="f1" line="2" size="[0-9]+" align="[0-9]+"> + <Enumeration id="_3" name="" type="_4" context="_1" location="f1:2" file="f1" line="2" size="[0-9]+" align="[0-9]+"> <EnumValue name="ev0" init="0"/> <EnumValue name="ev1" init="1"/> </Enumeration> + <FundamentalType id="_4" name="(unsigned )?int" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Enumeration-anonymous.cxx"/> </CastXML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.0/test/expect/castxml1.any.Enumeration-deprecated.xml.txt new/CastXML-0.4.2/test/expect/castxml1.any.Enumeration-deprecated.xml.txt --- old/CastXML-0.4.0/test/expect/castxml1.any.Enumeration-deprecated.xml.txt 2021-01-12 18:56:39.000000000 +0100 +++ new/CastXML-0.4.2/test/expect/castxml1.any.Enumeration-deprecated.xml.txt 2021-01-15 17:31:46.000000000 +0100 @@ -1,8 +1,9 @@ ^<\?xml version="1.0"\?> <CastXML[^>]*> - <Enumeration id="_1" name="start" context="_2" location="f1:1" file="f1" line="1" size="[0-9]+" align="[0-9]+" deprecation="Enumeration Deprecated" attributes="deprecated"> + <Enumeration id="_1" name="start" type="_2" context="_3" location="f1:1" file="f1" line="1" size="[0-9]+" align="[0-9]+" deprecation="Enumeration Deprecated" attributes="deprecated"> <EnumValue name="ev0" init="0" deprecation="Enumeration Value Deprecated" attributes="deprecated"/> </Enumeration> - <Namespace id="_2" name="::"/> + <FundamentalType id="_2" name="(unsigned )?int" size="[0-9]+" align="[0-9]+"/> + <Namespace id="_3" name="::"/> <File id="f1" name=".*/test/input/Enumeration-deprecated.cxx"/> </CastXML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.0/test/expect/castxml1.any.Enumeration-scoped.xml.txt new/CastXML-0.4.2/test/expect/castxml1.any.Enumeration-scoped.xml.txt --- old/CastXML-0.4.0/test/expect/castxml1.any.Enumeration-scoped.xml.txt 2021-01-12 18:56:39.000000000 +0100 +++ new/CastXML-0.4.2/test/expect/castxml1.any.Enumeration-scoped.xml.txt 2021-01-15 17:31:46.000000000 +0100 @@ -1,8 +1,9 @@ ^<\?xml version="1.0"\?> <CastXML[^>]*> - <Enumeration id="_1" name="start" context="_2" location="f1:1" file="f1" line="1" scoped="1" size="[0-9]+" align="[0-9]+"> + <Enumeration id="_1" name="start" type="_2" context="_3" location="f1:1" file="f1" line="1" scoped="1" size="[0-9]+" align="[0-9]+"> <EnumValue name="value" init="1"/> </Enumeration> - <Namespace id="_2" name="::"/> + <FundamentalType id="_2" name="int" size="[0-9]+" align="[0-9]+"/> + <Namespace id="_3" name="::"/> <File id="f1" name=".*/test/input/Enumeration-scoped.cxx"/> </CastXML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.0/test/expect/castxml1.any.Enumeration-type.xml.txt new/CastXML-0.4.2/test/expect/castxml1.any.Enumeration-type.xml.txt --- old/CastXML-0.4.0/test/expect/castxml1.any.Enumeration-type.xml.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.4.2/test/expect/castxml1.any.Enumeration-type.xml.txt 2021-01-15 17:31:46.000000000 +0100 @@ -0,0 +1,9 @@ +^<\?xml version="1.0"\?> +<CastXML[^>]*> + <Enumeration id="_1" name="start" type="_2" context="_3" location="f1:1" file="f1" line="1" scoped="1" size="[0-9]+" align="[0-9]+"> + <EnumValue name="value" init="1"/> + </Enumeration> + <FundamentalType id="_2" name="short int" size="[0-9]+" align="[0-9]+"/> + <Namespace id="_3" name="::"/> + <File id="f1" name=".*/test/input/Enumeration-type.cxx"/> +</CastXML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.0/test/expect/castxml1.any.Enumeration.xml.txt new/CastXML-0.4.2/test/expect/castxml1.any.Enumeration.xml.txt --- old/CastXML-0.4.0/test/expect/castxml1.any.Enumeration.xml.txt 2021-01-12 18:56:39.000000000 +0100 +++ new/CastXML-0.4.2/test/expect/castxml1.any.Enumeration.xml.txt 2021-01-15 17:31:46.000000000 +0100 @@ -1,9 +1,10 @@ ^<\?xml version="1.0"\?> <CastXML[^>]*> - <Enumeration id="_1" name="start" context="_2" location="f1:1" file="f1" line="1" size="[0-9]+" align="[0-9]+"> + <Enumeration id="_1" name="start" type="_2" context="_3" location="f1:1" file="f1" line="1" size="[0-9]+" align="[0-9]+"> <EnumValue name="ev0" init="0"/> <EnumValue name="ev2" init="2"/> </Enumeration> - <Namespace id="_2" name="::"/> + <FundamentalType id="_2" name="(unsigned )?int" size="[0-9]+" align="[0-9]+"/> + <Namespace id="_3" name="::"/> <File id="f1" name=".*/test/input/Enumeration.cxx"/> </CastXML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.0/test/expect/castxml1.any.Function-Argument-default-ns.xml.txt new/CastXML-0.4.2/test/expect/castxml1.any.Function-Argument-default-ns.xml.txt --- old/CastXML-0.4.0/test/expect/castxml1.any.Function-Argument-default-ns.xml.txt 2021-01-12 18:56:39.000000000 +0100 +++ new/CastXML-0.4.2/test/expect/castxml1.any.Function-Argument-default-ns.xml.txt 2021-01-15 17:31:46.000000000 +0100 @@ -1,17 +1,21 @@ ^<\?xml version="1.0"\?> <CastXML[^>]*> - <Namespace id="_1" name="start" context="_2" members="_3 _4 _5"/> - <Variable id="_3" name="C" type="_6c" init="0" context="_1" location="f1:2" file="f1" line="2" static="1" mangled="[^"]+"/> - <Enumeration id="_4" name="" context="_1" location="f1:3" file="f1" line="3" size="[0-9]+" align="[0-9]+"> + <Namespace id="_1" name="start" context="_2" members="_3 _4 _5 _6"/> + <Variable id="_3" name="C" type="_7c" init="0" context="_1" location="f1:2" file="f1" line="2" static="1" mangled="[^"]+"/> + <Variable id="_4" name="D" type="_8c" init="0" context="_1" location="f1:3" file="f1" line="3" static="1" mangled="[^"]+"/> + <Enumeration id="_5" name="" type="_(7|8)" context="_1" location="f1:4" file="f1" line="4" size="[0-9]+" align="[0-9]+"> <EnumValue name="E" init="0"/> </Enumeration> - <Function id="_5" name="f" returns="_7" context="_1" location="f1:7" file="f1" line="7" mangled="[^"]+"> - <Argument type="_6" location="f1:7" file="f1" line="7" default="start::C"/> - <Argument type="_6" location="f1:7" file="f1" line="7" default="start::E"/> + <Function id="_6" name="f" returns="_9" context="_1" location="f1:8" file="f1" line="8" mangled="[^"]+"> + <Argument type="_7" location="f1:8" file="f1" line="8" default="start::C"/> + <Argument type="_8" location="f1:8" file="f1" line="8" default="start::D"/> + <Argument type="_7" location="f1:8" file="f1" line="8" default="start::E"/> </Function> - <FundamentalType id="_6" name="int" size="[0-9]+" align="[0-9]+"/> - <CvQualifiedType id="_6c" type="_6" const="1"/> - <FundamentalType id="_7" name="void" size="[0-9]+" align="[0-9]+"/> + <FundamentalType id="_7" name="int" size="[0-9]+" align="[0-9]+"/> + <CvQualifiedType id="_7c" type="_7" const="1"/> + <FundamentalType id="_8" name="unsigned int" size="[0-9]+" align="[0-9]+"/> + <CvQualifiedType id="_8c" type="_8" const="1"/> + <FundamentalType id="_9" name="void" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Function-Argument-default-ns.cxx"/> </CastXML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.0/test/expect/castxml1.any.Typedef-to-Enumeration-anonymous.xml.txt new/CastXML-0.4.2/test/expect/castxml1.any.Typedef-to-Enumeration-anonymous.xml.txt --- old/CastXML-0.4.0/test/expect/castxml1.any.Typedef-to-Enumeration-anonymous.xml.txt 2021-01-12 18:56:39.000000000 +0100 +++ new/CastXML-0.4.2/test/expect/castxml1.any.Typedef-to-Enumeration-anonymous.xml.txt 2021-01-15 17:31:46.000000000 +0100 @@ -3,6 +3,7 @@ <Typedef id="_1" name="start" type="_2" context="_3" location="f1:3" file="f1" line="3"/> <ElaboratedType id="_2" type="_4"/> <Namespace id="_3" name="::"/> - <Enumeration id="_4" name="start" context="_3" location="f1:1" file="f1" line="1" size="[0-9]+" align="[0-9]+"/> + <Enumeration id="_4" name="start" type="_5" context="_3" location="f1:1" file="f1" line="1" size="[0-9]+" align="[0-9]+"/> + <FundamentalType id="_5" name="(unsigned )?int" size="[0-9]+" align="[0-9]+"/> <File id="f1" name=".*/test/input/Typedef-to-Enumeration-anonymous.cxx"/> </CastXML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.0/test/expect/castxml1.any.Typedef-to-Enumeration.xml.txt new/CastXML-0.4.2/test/expect/castxml1.any.Typedef-to-Enumeration.xml.txt --- old/CastXML-0.4.0/test/expect/castxml1.any.Typedef-to-Enumeration.xml.txt 2021-01-12 18:56:39.000000000 +0100 +++ new/CastXML-0.4.2/test/expect/castxml1.any.Typedef-to-Enumeration.xml.txt 2021-01-15 17:31:46.000000000 +0100 @@ -1,7 +1,8 @@ ^<\?xml version="1.0"\?> <CastXML[^>]*> <Typedef id="_1" name="start" type="_2" context="_3" location="f1:4" file="f1" line="4"/> - <Enumeration id="_2" name="E" context="_3" location="f1:1" file="f1" line="1" size="[0-9]+" align="[0-9]+"/> + <Enumeration id="_2" name="E" type="_4" context="_3" location="f1:1" file="f1" line="1" size="[0-9]+" align="[0-9]+"/> + <FundamentalType id="_4" name="(unsigned )?int" size="[0-9]+" align="[0-9]+"/> <Namespace id="_3" name="::"/> <File id="f1" name=".*/test/input/Typedef-to-Enumeration.cxx"/> </CastXML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.0/test/expect/gccxml.any.Enumeration-type.xml.txt new/CastXML-0.4.2/test/expect/gccxml.any.Enumeration-type.xml.txt --- old/CastXML-0.4.0/test/expect/gccxml.any.Enumeration-type.xml.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.4.2/test/expect/gccxml.any.Enumeration-type.xml.txt 2021-01-15 17:31:46.000000000 +0100 @@ -0,0 +1,8 @@ +^<\?xml version="1.0"\?> +<GCC_XML[^>]*> + <Enumeration id="_1" name="start" context="_2" location="f1:1" file="f1" line="1" size="[0-9]+" align="[0-9]+"> + <EnumValue name="value" init="1"/> + </Enumeration> + <Namespace id="_2" name="::"/> + <File id="f1" name=".*/test/input/Enumeration-type.cxx"/> +</GCC_XML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.0/test/expect/gccxml.any.Function-Argument-default-ns.xml.txt new/CastXML-0.4.2/test/expect/gccxml.any.Function-Argument-default-ns.xml.txt --- old/CastXML-0.4.0/test/expect/gccxml.any.Function-Argument-default-ns.xml.txt 2021-01-12 18:56:39.000000000 +0100 +++ new/CastXML-0.4.2/test/expect/gccxml.any.Function-Argument-default-ns.xml.txt 2021-01-15 17:31:46.000000000 +0100 @@ -1,17 +1,21 @@ ^<\?xml version="1.0"\?> <GCC_XML[^>]*> - <Namespace id="_1" name="start" context="_2" members="_3 _4 _5"/> - <Variable id="_3" name="C" type="_6c" init="0" context="_1" location="f1:2" file="f1" line="2" static="1" mangled="[^"]+"/> - <Enumeration id="_4" name="" context="_1" location="f1:3" file="f1" line="3" size="[0-9]+" align="[0-9]+"> + <Namespace id="_1" name="start" context="_2" members="_3 _4 _5 _6"/> + <Variable id="_3" name="C" type="_7c" init="0" context="_1" location="f1:2" file="f1" line="2" static="1" mangled="[^"]+"/> + <Variable id="_4" name="D" type="_8c" init="0" context="_1" location="f1:3" file="f1" line="3" static="1" mangled="[^"]+"/> + <Enumeration id="_5" name="" context="_1" location="f1:4" file="f1" line="4" size="[0-9]+" align="[0-9]+"> <EnumValue name="E" init="0"/> </Enumeration> - <Function id="_5" name="f" returns="_7" context="_1" location="f1:7" file="f1" line="7" mangled="[^"]+"> - <Argument type="_6" location="f1:7" file="f1" line="7" default="start::C"/> - <Argument type="_6" location="f1:7" file="f1" line="7" default="start::E"/> + <Function id="_6" name="f" returns="_9" context="_1" location="f1:8" file="f1" line="8" mangled="[^"]+"> + <Argument type="_7" location="f1:8" file="f1" line="8" default="start::C"/> + <Argument type="_8" location="f1:8" file="f1" line="8" default="start::D"/> + <Argument type="_7" location="f1:8" file="f1" line="8" default="start::E"/> </Function> - <FundamentalType id="_6" name="int" size="[0-9]+" align="[0-9]+"/> - <CvQualifiedType id="_6c" type="_6" const="1"/> - <FundamentalType id="_7" name="void" size="[0-9]+" align="[0-9]+"/> + <FundamentalType id="_7" name="int" size="[0-9]+" align="[0-9]+"/> + <CvQualifiedType id="_7c" type="_7" const="1"/> + <FundamentalType id="_8" name="unsigned int" size="[0-9]+" align="[0-9]+"/> + <CvQualifiedType id="_8c" type="_8" const="1"/> + <FundamentalType id="_9" name="void" size="[0-9]+" align="[0-9]+"/> <Namespace id="_2" name="::"/> <File id="f1" name=".*/test/input/Function-Argument-default-ns.cxx"/> </GCC_XML>$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.0/test/input/Enumeration-type.cxx new/CastXML-0.4.2/test/input/Enumeration-type.cxx --- old/CastXML-0.4.0/test/input/Enumeration-type.cxx 1970-01-01 01:00:00.000000000 +0100 +++ new/CastXML-0.4.2/test/input/Enumeration-type.cxx 2021-01-15 17:31:46.000000000 +0100 @@ -0,0 +1,4 @@ +enum class start: short +{ + value = 1 +}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CastXML-0.4.0/test/input/Function-Argument-default-ns.cxx new/CastXML-0.4.2/test/input/Function-Argument-default-ns.cxx --- old/CastXML-0.4.0/test/input/Function-Argument-default-ns.cxx 2021-01-12 18:56:39.000000000 +0100 +++ new/CastXML-0.4.2/test/input/Function-Argument-default-ns.cxx 2021-01-15 17:31:46.000000000 +0100 @@ -1,8 +1,9 @@ namespace start { static int const C = 0; +static unsigned int const D = 0; enum { E = 0 }; -void f(int = C, int = E); +void f(int = C, unsigned int = D, int = E); }
