X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=xmltooling%2Fbase.h;h=03930625769166b0e75ee75bdae69c3c6cc27b0f;hb=d1c1478d26cfd9b87a4deb80c3638dc42e111735;hp=237f79830b57e83d1136b1ac10f2e5eb435b693a;hpb=bb0c520dfdbe4c889508b0869edad550e8388605;p=shibboleth%2Fcpp-xmltooling.git diff --git a/xmltooling/base.h b/xmltooling/base.h index 237f798..0393062 100644 --- a/xmltooling/base.h +++ b/xmltooling/base.h @@ -1,29 +1,38 @@ -/* - * Copyright 2001-2007 Internet2 - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at +/** + * Licensed to the University Corporation for Advanced Internet + * Development, Inc. (UCAID) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + * + * UCAID licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the + * License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific + * language governing permissions and limitations under the License. */ /** * @file xmltooling/base.h - * - * Base header file definitions - * Must be included prior to including any other header + * + * Base header file definitions. + * Must be included prior to including any other header. */ #ifndef __xmltooling_base_h__ #define __xmltooling_base_h__ +#include + +/* Required for sprintf, used by integer XML attribute macros. */ +#include + #if defined (_MSC_VER) || defined(__BORLANDC__) #include #else @@ -34,6 +43,19 @@ # define XMLTOOLING_NO_XMLSEC 1 #endif +#ifndef HAVE_NULLPTR +# define nullptr 0 +#endif + +#if defined(XMLTOOLING_NO_XMLSEC) || !defined(HAVE_XSECSIZE_T) +# ifdef XMLTOOLING_XERCESC_64BITSAFE +# include + typedef XMLSize_t xsecsize_t; +# else + typedef unsigned int xsecsize_t; +# endif +#endif + // Windows and GCC4 Symbol Visibility Macros #ifdef WIN32 #define XMLTOOL_IMPORT __declspec(dllimport) @@ -200,13 +222,133 @@ xercesc::chLatin_##j, xercesc::chLatin_##k, xercesc::chLatin_##l, xercesc::chLatin_##m, xercesc::chLatin_##n, xercesc::chLatin_##o, xercesc::chLatin_##p, xercesc::chLatin_##q, xercesc::chLatin_##r, \ xercesc::chLatin_##s, xercesc::chLatin_##t, xercesc::chLatin_##u, xercesc::chLatin_##v, xercesc::chLatin_##w, xercesc::chLatin_##x, xercesc::chLatin_##y, xercesc::chLatin_##z, \ xercesc::chLatin_##aa, xercesc::chLatin_##bb, xercesc::chLatin_##cc, xercesc::chLatin_##dd, xercesc::chLatin_##ee, xercesc::chLatin_##ff, xercesc::chLatin_##gg, xercesc::chLatin_##hh, xercesc::chNull} +#define UNICODE_LITERAL_35(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,aa,bb,cc,dd,ee,ff,gg,hh,ii) \ + {xercesc::chLatin_##a, xercesc::chLatin_##b, xercesc::chLatin_##c, xercesc::chLatin_##d, xercesc::chLatin_##e, xercesc::chLatin_##f, xercesc::chLatin_##g, xercesc::chLatin_##h, xercesc::chLatin_##i, \ + xercesc::chLatin_##j, xercesc::chLatin_##k, xercesc::chLatin_##l, xercesc::chLatin_##m, xercesc::chLatin_##n, xercesc::chLatin_##o, xercesc::chLatin_##p, xercesc::chLatin_##q, xercesc::chLatin_##r, \ + xercesc::chLatin_##s, xercesc::chLatin_##t, xercesc::chLatin_##u, xercesc::chLatin_##v, xercesc::chLatin_##w, xercesc::chLatin_##x, xercesc::chLatin_##y, xercesc::chLatin_##z, \ + xercesc::chLatin_##aa, xercesc::chLatin_##bb, xercesc::chLatin_##cc, xercesc::chLatin_##dd, xercesc::chLatin_##ee, xercesc::chLatin_##ff, xercesc::chLatin_##gg, xercesc::chLatin_##hh, \ + xercesc::chLatin_##ii, xercesc::chNull} +#define UNICODE_LITERAL_36(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,aa,bb,cc,dd,ee,ff,gg,hh,ii,jj) \ + {xercesc::chLatin_##a, xercesc::chLatin_##b, xercesc::chLatin_##c, xercesc::chLatin_##d, xercesc::chLatin_##e, xercesc::chLatin_##f, xercesc::chLatin_##g, xercesc::chLatin_##h, xercesc::chLatin_##i, \ + xercesc::chLatin_##j, xercesc::chLatin_##k, xercesc::chLatin_##l, xercesc::chLatin_##m, xercesc::chLatin_##n, xercesc::chLatin_##o, xercesc::chLatin_##p, xercesc::chLatin_##q, xercesc::chLatin_##r, \ + xercesc::chLatin_##s, xercesc::chLatin_##t, xercesc::chLatin_##u, xercesc::chLatin_##v, xercesc::chLatin_##w, xercesc::chLatin_##x, xercesc::chLatin_##y, xercesc::chLatin_##z, \ + xercesc::chLatin_##aa, xercesc::chLatin_##bb, xercesc::chLatin_##cc, xercesc::chLatin_##dd, xercesc::chLatin_##ee, xercesc::chLatin_##ff, xercesc::chLatin_##gg, xercesc::chLatin_##hh, \ + xercesc::chLatin_##ii, xercesc::chLatin_##jj, xercesc::chNull} +#define UNICODE_LITERAL_37(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,aa,bb,cc,dd,ee,ff,gg,hh,ii,jj,kk) \ + {xercesc::chLatin_##a, xercesc::chLatin_##b, xercesc::chLatin_##c, xercesc::chLatin_##d, xercesc::chLatin_##e, xercesc::chLatin_##f, xercesc::chLatin_##g, xercesc::chLatin_##h, xercesc::chLatin_##i, \ + xercesc::chLatin_##j, xercesc::chLatin_##k, xercesc::chLatin_##l, xercesc::chLatin_##m, xercesc::chLatin_##n, xercesc::chLatin_##o, xercesc::chLatin_##p, xercesc::chLatin_##q, xercesc::chLatin_##r, \ + xercesc::chLatin_##s, xercesc::chLatin_##t, xercesc::chLatin_##u, xercesc::chLatin_##v, xercesc::chLatin_##w, xercesc::chLatin_##x, xercesc::chLatin_##y, xercesc::chLatin_##z, \ + xercesc::chLatin_##aa, xercesc::chLatin_##bb, xercesc::chLatin_##cc, xercesc::chLatin_##dd, xercesc::chLatin_##ee, xercesc::chLatin_##ff, xercesc::chLatin_##gg, xercesc::chLatin_##hh, \ + xercesc::chLatin_##ii, xercesc::chLatin_##jj, xercesc::chLatin_##kk, xercesc::chNull} +#define UNICODE_LITERAL_38(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,aa,bb,cc,dd,ee,ff,gg,hh,ii,jj,kk,ll) \ + {xercesc::chLatin_##a, xercesc::chLatin_##b, xercesc::chLatin_##c, xercesc::chLatin_##d, xercesc::chLatin_##e, xercesc::chLatin_##f, xercesc::chLatin_##g, xercesc::chLatin_##h, xercesc::chLatin_##i, \ + xercesc::chLatin_##j, xercesc::chLatin_##k, xercesc::chLatin_##l, xercesc::chLatin_##m, xercesc::chLatin_##n, xercesc::chLatin_##o, xercesc::chLatin_##p, xercesc::chLatin_##q, xercesc::chLatin_##r, \ + xercesc::chLatin_##s, xercesc::chLatin_##t, xercesc::chLatin_##u, xercesc::chLatin_##v, xercesc::chLatin_##w, xercesc::chLatin_##x, xercesc::chLatin_##y, xercesc::chLatin_##z, \ + xercesc::chLatin_##aa, xercesc::chLatin_##bb, xercesc::chLatin_##cc, xercesc::chLatin_##dd, xercesc::chLatin_##ee, xercesc::chLatin_##ff, xercesc::chLatin_##gg, xercesc::chLatin_##hh, \ + xercesc::chLatin_##ii, xercesc::chLatin_##jj, xercesc::chLatin_##kk, xercesc::chLatin_##ll, xercesc::chNull} +#define UNICODE_LITERAL_39(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,aa,bb,cc,dd,ee,ff,gg,hh,ii,jj,kk,ll,mm) \ + {xercesc::chLatin_##a, xercesc::chLatin_##b, xercesc::chLatin_##c, xercesc::chLatin_##d, xercesc::chLatin_##e, xercesc::chLatin_##f, xercesc::chLatin_##g, xercesc::chLatin_##h, xercesc::chLatin_##i, \ + xercesc::chLatin_##j, xercesc::chLatin_##k, xercesc::chLatin_##l, xercesc::chLatin_##m, xercesc::chLatin_##n, xercesc::chLatin_##o, xercesc::chLatin_##p, xercesc::chLatin_##q, xercesc::chLatin_##r, \ + xercesc::chLatin_##s, xercesc::chLatin_##t, xercesc::chLatin_##u, xercesc::chLatin_##v, xercesc::chLatin_##w, xercesc::chLatin_##x, xercesc::chLatin_##y, xercesc::chLatin_##z, \ + xercesc::chLatin_##aa, xercesc::chLatin_##bb, xercesc::chLatin_##cc, xercesc::chLatin_##dd, xercesc::chLatin_##ee, xercesc::chLatin_##ff, xercesc::chLatin_##gg, xercesc::chLatin_##hh, \ + xercesc::chLatin_##ii, xercesc::chLatin_##jj, xercesc::chLatin_##kk, xercesc::chLatin_##ll, xercesc::chLatin_##mm, xercesc::chNull} +#define UNICODE_LITERAL_40(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,aa,bb,cc,dd,ee,ff,gg,hh,ii,jj,kk,ll,mm,nn) \ + {xercesc::chLatin_##a, xercesc::chLatin_##b, xercesc::chLatin_##c, xercesc::chLatin_##d, xercesc::chLatin_##e, xercesc::chLatin_##f, xercesc::chLatin_##g, xercesc::chLatin_##h, xercesc::chLatin_##i, \ + xercesc::chLatin_##j, xercesc::chLatin_##k, xercesc::chLatin_##l, xercesc::chLatin_##m, xercesc::chLatin_##n, xercesc::chLatin_##o, xercesc::chLatin_##p, xercesc::chLatin_##q, xercesc::chLatin_##r, \ + xercesc::chLatin_##s, xercesc::chLatin_##t, xercesc::chLatin_##u, xercesc::chLatin_##v, xercesc::chLatin_##w, xercesc::chLatin_##x, xercesc::chLatin_##y, xercesc::chLatin_##z, \ + xercesc::chLatin_##aa, xercesc::chLatin_##bb, xercesc::chLatin_##cc, xercesc::chLatin_##dd, xercesc::chLatin_##ee, xercesc::chLatin_##ff, xercesc::chLatin_##gg, xercesc::chLatin_##hh, \ + xercesc::chLatin_##ii, xercesc::chLatin_##jj, xercesc::chLatin_##kk, xercesc::chLatin_##ll, xercesc::chLatin_##mm, xercesc::chLatin_##nn, xercesc::chNull} +#define UNICODE_LITERAL_41(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,aa,bb,cc,dd,ee,ff,gg,hh,ii,jj,kk,ll,mm,nn,oo) \ + {xercesc::chLatin_##a, xercesc::chLatin_##b, xercesc::chLatin_##c, xercesc::chLatin_##d, xercesc::chLatin_##e, xercesc::chLatin_##f, xercesc::chLatin_##g, xercesc::chLatin_##h, xercesc::chLatin_##i, \ + xercesc::chLatin_##j, xercesc::chLatin_##k, xercesc::chLatin_##l, xercesc::chLatin_##m, xercesc::chLatin_##n, xercesc::chLatin_##o, xercesc::chLatin_##p, xercesc::chLatin_##q, xercesc::chLatin_##r, \ + xercesc::chLatin_##s, xercesc::chLatin_##t, xercesc::chLatin_##u, xercesc::chLatin_##v, xercesc::chLatin_##w, xercesc::chLatin_##x, xercesc::chLatin_##y, xercesc::chLatin_##z, \ + xercesc::chLatin_##aa, xercesc::chLatin_##bb, xercesc::chLatin_##cc, xercesc::chLatin_##dd, xercesc::chLatin_##ee, xercesc::chLatin_##ff, xercesc::chLatin_##gg, xercesc::chLatin_##hh, \ + xercesc::chLatin_##ii, xercesc::chLatin_##jj, xercesc::chLatin_##kk, xercesc::chLatin_##ll, xercesc::chLatin_##mm, xercesc::chLatin_##nn, xercesc::chLatin_##oo, xercesc::chNull} +#define UNICODE_LITERAL_42(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,aa,bb,cc,dd,ee,ff,gg,hh,ii,jj,kk,ll,mm,nn,oo,pp) \ + {xercesc::chLatin_##a, xercesc::chLatin_##b, xercesc::chLatin_##c, xercesc::chLatin_##d, xercesc::chLatin_##e, xercesc::chLatin_##f, xercesc::chLatin_##g, xercesc::chLatin_##h, xercesc::chLatin_##i, \ + xercesc::chLatin_##j, xercesc::chLatin_##k, xercesc::chLatin_##l, xercesc::chLatin_##m, xercesc::chLatin_##n, xercesc::chLatin_##o, xercesc::chLatin_##p, xercesc::chLatin_##q, xercesc::chLatin_##r, \ + xercesc::chLatin_##s, xercesc::chLatin_##t, xercesc::chLatin_##u, xercesc::chLatin_##v, xercesc::chLatin_##w, xercesc::chLatin_##x, xercesc::chLatin_##y, xercesc::chLatin_##z, \ + xercesc::chLatin_##aa, xercesc::chLatin_##bb, xercesc::chLatin_##cc, xercesc::chLatin_##dd, xercesc::chLatin_##ee, xercesc::chLatin_##ff, xercesc::chLatin_##gg, xercesc::chLatin_##hh, \ + xercesc::chLatin_##ii, xercesc::chLatin_##jj, xercesc::chLatin_##kk, xercesc::chLatin_##ll, xercesc::chLatin_##mm, xercesc::chLatin_##nn, xercesc::chLatin_##oo, xercesc::chLatin_##pp, xercesc::chNull} +#define UNICODE_LITERAL_43(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,aa,bb,cc,dd,ee,ff,gg,hh,ii,jj,kk,ll,mm,nn,oo,pp,qq) \ + {xercesc::chLatin_##a, xercesc::chLatin_##b, xercesc::chLatin_##c, xercesc::chLatin_##d, xercesc::chLatin_##e, xercesc::chLatin_##f, xercesc::chLatin_##g, xercesc::chLatin_##h, xercesc::chLatin_##i, \ + xercesc::chLatin_##j, xercesc::chLatin_##k, xercesc::chLatin_##l, xercesc::chLatin_##m, xercesc::chLatin_##n, xercesc::chLatin_##o, xercesc::chLatin_##p, xercesc::chLatin_##q, xercesc::chLatin_##r, \ + xercesc::chLatin_##s, xercesc::chLatin_##t, xercesc::chLatin_##u, xercesc::chLatin_##v, xercesc::chLatin_##w, xercesc::chLatin_##x, xercesc::chLatin_##y, xercesc::chLatin_##z, \ + xercesc::chLatin_##aa, xercesc::chLatin_##bb, xercesc::chLatin_##cc, xercesc::chLatin_##dd, xercesc::chLatin_##ee, xercesc::chLatin_##ff, xercesc::chLatin_##gg, xercesc::chLatin_##hh, \ + xercesc::chLatin_##ii, xercesc::chLatin_##jj, xercesc::chLatin_##kk, xercesc::chLatin_##ll, xercesc::chLatin_##mm, xercesc::chLatin_##nn, xercesc::chLatin_##oo, xercesc::chLatin_##pp, \ + xercesc::chLatin_##qq, xercesc::chNull} +#define UNICODE_LITERAL_44(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,aa,bb,cc,dd,ee,ff,gg,hh,ii,jj,kk,ll,mm,nn,oo,pp,qq,rr) \ + {xercesc::chLatin_##a, xercesc::chLatin_##b, xercesc::chLatin_##c, xercesc::chLatin_##d, xercesc::chLatin_##e, xercesc::chLatin_##f, xercesc::chLatin_##g, xercesc::chLatin_##h, xercesc::chLatin_##i, \ + xercesc::chLatin_##j, xercesc::chLatin_##k, xercesc::chLatin_##l, xercesc::chLatin_##m, xercesc::chLatin_##n, xercesc::chLatin_##o, xercesc::chLatin_##p, xercesc::chLatin_##q, xercesc::chLatin_##r, \ + xercesc::chLatin_##s, xercesc::chLatin_##t, xercesc::chLatin_##u, xercesc::chLatin_##v, xercesc::chLatin_##w, xercesc::chLatin_##x, xercesc::chLatin_##y, xercesc::chLatin_##z, \ + xercesc::chLatin_##aa, xercesc::chLatin_##bb, xercesc::chLatin_##cc, xercesc::chLatin_##dd, xercesc::chLatin_##ee, xercesc::chLatin_##ff, xercesc::chLatin_##gg, xercesc::chLatin_##hh, \ + xercesc::chLatin_##ii, xercesc::chLatin_##jj, xercesc::chLatin_##kk, xercesc::chLatin_##ll, xercesc::chLatin_##mm, xercesc::chLatin_##nn, xercesc::chLatin_##oo, xercesc::chLatin_##pp, \ + xercesc::chLatin_##qq, xercesc::chLatin_##rr, xercesc::chNull} +#define UNICODE_LITERAL_45(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,aa,bb,cc,dd,ee,ff,gg,hh,ii,jj,kk,ll,mm,nn,oo,pp,qq,rr,ss) \ + {xercesc::chLatin_##a, xercesc::chLatin_##b, xercesc::chLatin_##c, xercesc::chLatin_##d, xercesc::chLatin_##e, xercesc::chLatin_##f, xercesc::chLatin_##g, xercesc::chLatin_##h, xercesc::chLatin_##i, \ + xercesc::chLatin_##j, xercesc::chLatin_##k, xercesc::chLatin_##l, xercesc::chLatin_##m, xercesc::chLatin_##n, xercesc::chLatin_##o, xercesc::chLatin_##p, xercesc::chLatin_##q, xercesc::chLatin_##r, \ + xercesc::chLatin_##s, xercesc::chLatin_##t, xercesc::chLatin_##u, xercesc::chLatin_##v, xercesc::chLatin_##w, xercesc::chLatin_##x, xercesc::chLatin_##y, xercesc::chLatin_##z, \ + xercesc::chLatin_##aa, xercesc::chLatin_##bb, xercesc::chLatin_##cc, xercesc::chLatin_##dd, xercesc::chLatin_##ee, xercesc::chLatin_##ff, xercesc::chLatin_##gg, xercesc::chLatin_##hh, \ + xercesc::chLatin_##ii, xercesc::chLatin_##jj, xercesc::chLatin_##kk, xercesc::chLatin_##ll, xercesc::chLatin_##mm, xercesc::chLatin_##nn, xercesc::chLatin_##oo, xercesc::chLatin_##pp, \ + xercesc::chLatin_##qq, xercesc::chLatin_##rr, xercesc::chLatin_##ss, xercesc::chNull} +#define UNICODE_LITERAL_46(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,aa,bb,cc,dd,ee,ff,gg,hh,ii,jj,kk,ll,mm,nn,oo,pp,qq,rr,ss,tt) \ + {xercesc::chLatin_##a, xercesc::chLatin_##b, xercesc::chLatin_##c, xercesc::chLatin_##d, xercesc::chLatin_##e, xercesc::chLatin_##f, xercesc::chLatin_##g, xercesc::chLatin_##h, xercesc::chLatin_##i, \ + xercesc::chLatin_##j, xercesc::chLatin_##k, xercesc::chLatin_##l, xercesc::chLatin_##m, xercesc::chLatin_##n, xercesc::chLatin_##o, xercesc::chLatin_##p, xercesc::chLatin_##q, xercesc::chLatin_##r, \ + xercesc::chLatin_##s, xercesc::chLatin_##t, xercesc::chLatin_##u, xercesc::chLatin_##v, xercesc::chLatin_##w, xercesc::chLatin_##x, xercesc::chLatin_##y, xercesc::chLatin_##z, \ + xercesc::chLatin_##aa, xercesc::chLatin_##bb, xercesc::chLatin_##cc, xercesc::chLatin_##dd, xercesc::chLatin_##ee, xercesc::chLatin_##ff, xercesc::chLatin_##gg, xercesc::chLatin_##hh, \ + xercesc::chLatin_##ii, xercesc::chLatin_##jj, xercesc::chLatin_##kk, xercesc::chLatin_##ll, xercesc::chLatin_##mm, xercesc::chLatin_##nn, xercesc::chLatin_##oo, xercesc::chLatin_##pp, \ + xercesc::chLatin_##qq, xercesc::chLatin_##rr, xercesc::chLatin_##ss, xercesc::chLatin_##tt, xercesc::chNull} +#define UNICODE_LITERAL_47(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,aa,bb,cc,dd,ee,ff,gg,hh,ii,jj,kk,ll,mm,nn,oo,pp,qq,rr,ss,tt,uu) \ + {xercesc::chLatin_##a, xercesc::chLatin_##b, xercesc::chLatin_##c, xercesc::chLatin_##d, xercesc::chLatin_##e, xercesc::chLatin_##f, xercesc::chLatin_##g, xercesc::chLatin_##h, xercesc::chLatin_##i, \ + xercesc::chLatin_##j, xercesc::chLatin_##k, xercesc::chLatin_##l, xercesc::chLatin_##m, xercesc::chLatin_##n, xercesc::chLatin_##o, xercesc::chLatin_##p, xercesc::chLatin_##q, xercesc::chLatin_##r, \ + xercesc::chLatin_##s, xercesc::chLatin_##t, xercesc::chLatin_##u, xercesc::chLatin_##v, xercesc::chLatin_##w, xercesc::chLatin_##x, xercesc::chLatin_##y, xercesc::chLatin_##z, \ + xercesc::chLatin_##aa, xercesc::chLatin_##bb, xercesc::chLatin_##cc, xercesc::chLatin_##dd, xercesc::chLatin_##ee, xercesc::chLatin_##ff, xercesc::chLatin_##gg, xercesc::chLatin_##hh, \ + xercesc::chLatin_##ii, xercesc::chLatin_##jj, xercesc::chLatin_##kk, xercesc::chLatin_##ll, xercesc::chLatin_##mm, xercesc::chLatin_##nn, xercesc::chLatin_##oo, xercesc::chLatin_##pp, \ + xercesc::chLatin_##qq, xercesc::chLatin_##rr, xercesc::chLatin_##ss, xercesc::chLatin_##tt, xercesc::chLatin_##uu, xercesc::chNull} +#define UNICODE_LITERAL_48(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,aa,bb,cc,dd,ee,ff,gg,hh,ii,jj,kk,ll,mm,nn,oo,pp,qq,rr,ss,tt,uu,vv) \ + {xercesc::chLatin_##a, xercesc::chLatin_##b, xercesc::chLatin_##c, xercesc::chLatin_##d, xercesc::chLatin_##e, xercesc::chLatin_##f, xercesc::chLatin_##g, xercesc::chLatin_##h, xercesc::chLatin_##i, \ + xercesc::chLatin_##j, xercesc::chLatin_##k, xercesc::chLatin_##l, xercesc::chLatin_##m, xercesc::chLatin_##n, xercesc::chLatin_##o, xercesc::chLatin_##p, xercesc::chLatin_##q, xercesc::chLatin_##r, \ + xercesc::chLatin_##s, xercesc::chLatin_##t, xercesc::chLatin_##u, xercesc::chLatin_##v, xercesc::chLatin_##w, xercesc::chLatin_##x, xercesc::chLatin_##y, xercesc::chLatin_##z, \ + xercesc::chLatin_##aa, xercesc::chLatin_##bb, xercesc::chLatin_##cc, xercesc::chLatin_##dd, xercesc::chLatin_##ee, xercesc::chLatin_##ff, xercesc::chLatin_##gg, xercesc::chLatin_##hh, \ + xercesc::chLatin_##ii, xercesc::chLatin_##jj, xercesc::chLatin_##kk, xercesc::chLatin_##ll, xercesc::chLatin_##mm, xercesc::chLatin_##nn, xercesc::chLatin_##oo, xercesc::chLatin_##pp, \ + xercesc::chLatin_##qq, xercesc::chLatin_##rr, xercesc::chLatin_##ss, xercesc::chLatin_##tt, xercesc::chLatin_##uu, xercesc::chLatin_##vv, xercesc::chNull} +#define UNICODE_LITERAL_49(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,aa,bb,cc,dd,ee,ff,gg,hh,ii,jj,kk,ll,mm,nn,oo,pp,qq,rr,ss,tt,uu,vv,ww) \ + {xercesc::chLatin_##a, xercesc::chLatin_##b, xercesc::chLatin_##c, xercesc::chLatin_##d, xercesc::chLatin_##e, xercesc::chLatin_##f, xercesc::chLatin_##g, xercesc::chLatin_##h, xercesc::chLatin_##i, \ + xercesc::chLatin_##j, xercesc::chLatin_##k, xercesc::chLatin_##l, xercesc::chLatin_##m, xercesc::chLatin_##n, xercesc::chLatin_##o, xercesc::chLatin_##p, xercesc::chLatin_##q, xercesc::chLatin_##r, \ + xercesc::chLatin_##s, xercesc::chLatin_##t, xercesc::chLatin_##u, xercesc::chLatin_##v, xercesc::chLatin_##w, xercesc::chLatin_##x, xercesc::chLatin_##y, xercesc::chLatin_##z, \ + xercesc::chLatin_##aa, xercesc::chLatin_##bb, xercesc::chLatin_##cc, xercesc::chLatin_##dd, xercesc::chLatin_##ee, xercesc::chLatin_##ff, xercesc::chLatin_##gg, xercesc::chLatin_##hh, \ + xercesc::chLatin_##ii, xercesc::chLatin_##jj, xercesc::chLatin_##kk, xercesc::chLatin_##ll, xercesc::chLatin_##mm, xercesc::chLatin_##nn, xercesc::chLatin_##oo, xercesc::chLatin_##pp, \ + xercesc::chLatin_##qq, xercesc::chLatin_##rr, xercesc::chLatin_##ss, xercesc::chLatin_##tt, xercesc::chLatin_##uu, xercesc::chLatin_##vv, xercesc::chLatin_##ww, xercesc::chNull} +#define UNICODE_LITERAL_50(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,aa,bb,cc,dd,ee,ff,gg,hh,ii,jj,kk,ll,mm,nn,oo,pp,qq,rr,ss,tt,uu,vv,ww,xx) \ + {xercesc::chLatin_##a, xercesc::chLatin_##b, xercesc::chLatin_##c, xercesc::chLatin_##d, xercesc::chLatin_##e, xercesc::chLatin_##f, xercesc::chLatin_##g, xercesc::chLatin_##h, xercesc::chLatin_##i, \ + xercesc::chLatin_##j, xercesc::chLatin_##k, xercesc::chLatin_##l, xercesc::chLatin_##m, xercesc::chLatin_##n, xercesc::chLatin_##o, xercesc::chLatin_##p, xercesc::chLatin_##q, xercesc::chLatin_##r, \ + xercesc::chLatin_##s, xercesc::chLatin_##t, xercesc::chLatin_##u, xercesc::chLatin_##v, xercesc::chLatin_##w, xercesc::chLatin_##x, xercesc::chLatin_##y, xercesc::chLatin_##z, \ + xercesc::chLatin_##aa, xercesc::chLatin_##bb, xercesc::chLatin_##cc, xercesc::chLatin_##dd, xercesc::chLatin_##ee, xercesc::chLatin_##ff, xercesc::chLatin_##gg, xercesc::chLatin_##hh, \ + xercesc::chLatin_##ii, xercesc::chLatin_##jj, xercesc::chLatin_##kk, xercesc::chLatin_##ll, xercesc::chLatin_##mm, xercesc::chLatin_##nn, xercesc::chLatin_##oo, xercesc::chLatin_##pp, \ + xercesc::chLatin_##qq, xercesc::chLatin_##rr, xercesc::chLatin_##ss, xercesc::chLatin_##tt, xercesc::chLatin_##uu, xercesc::chLatin_##vv, xercesc::chLatin_##ww, xercesc::chLatin_##xx, xercesc::chNull} +#define UNICODE_LITERAL_51(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,aa,bb,cc,dd,ee,ff,gg,hh,ii,jj,kk,ll,mm,nn,oo,pp,qq,rr,ss,tt,uu,vv,ww,xx,yy) \ + {xercesc::chLatin_##a, xercesc::chLatin_##b, xercesc::chLatin_##c, xercesc::chLatin_##d, xercesc::chLatin_##e, xercesc::chLatin_##f, xercesc::chLatin_##g, xercesc::chLatin_##h, xercesc::chLatin_##i, \ + xercesc::chLatin_##j, xercesc::chLatin_##k, xercesc::chLatin_##l, xercesc::chLatin_##m, xercesc::chLatin_##n, xercesc::chLatin_##o, xercesc::chLatin_##p, xercesc::chLatin_##q, xercesc::chLatin_##r, \ + xercesc::chLatin_##s, xercesc::chLatin_##t, xercesc::chLatin_##u, xercesc::chLatin_##v, xercesc::chLatin_##w, xercesc::chLatin_##x, xercesc::chLatin_##y, xercesc::chLatin_##z, \ + xercesc::chLatin_##aa, xercesc::chLatin_##bb, xercesc::chLatin_##cc, xercesc::chLatin_##dd, xercesc::chLatin_##ee, xercesc::chLatin_##ff, xercesc::chLatin_##gg, xercesc::chLatin_##hh, \ + xercesc::chLatin_##ii, xercesc::chLatin_##jj, xercesc::chLatin_##kk, xercesc::chLatin_##ll, xercesc::chLatin_##mm, xercesc::chLatin_##nn, xercesc::chLatin_##oo, xercesc::chLatin_##pp, \ + xercesc::chLatin_##qq, xercesc::chLatin_##rr, xercesc::chLatin_##ss, xercesc::chLatin_##tt, xercesc::chLatin_##uu, xercesc::chLatin_##vv, xercesc::chLatin_##ww, xercesc::chLatin_##xx, \ + xercesc::chLatin_##yy, xercesc::chNull} +#define UNICODE_LITERAL_52(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,aa,bb,cc,dd,ee,ff,gg,hh,ii,jj,kk,ll,mm,nn,oo,pp,qq,rr,ss,tt,uu,vv,ww,xx,yy,zz) \ + {xercesc::chLatin_##a, xercesc::chLatin_##b, xercesc::chLatin_##c, xercesc::chLatin_##d, xercesc::chLatin_##e, xercesc::chLatin_##f, xercesc::chLatin_##g, xercesc::chLatin_##h, xercesc::chLatin_##i, \ + xercesc::chLatin_##j, xercesc::chLatin_##k, xercesc::chLatin_##l, xercesc::chLatin_##m, xercesc::chLatin_##n, xercesc::chLatin_##o, xercesc::chLatin_##p, xercesc::chLatin_##q, xercesc::chLatin_##r, \ + xercesc::chLatin_##s, xercesc::chLatin_##t, xercesc::chLatin_##u, xercesc::chLatin_##v, xercesc::chLatin_##w, xercesc::chLatin_##x, xercesc::chLatin_##y, xercesc::chLatin_##z, \ + xercesc::chLatin_##aa, xercesc::chLatin_##bb, xercesc::chLatin_##cc, xercesc::chLatin_##dd, xercesc::chLatin_##ee, xercesc::chLatin_##ff, xercesc::chLatin_##gg, xercesc::chLatin_##hh, \ + xercesc::chLatin_##ii, xercesc::chLatin_##jj, xercesc::chLatin_##kk, xercesc::chLatin_##ll, xercesc::chLatin_##mm, xercesc::chLatin_##nn, xercesc::chLatin_##oo, xercesc::chLatin_##pp, \ + xercesc::chLatin_##qq, xercesc::chLatin_##rr, xercesc::chLatin_##ss, xercesc::chLatin_##tt, xercesc::chLatin_##uu, xercesc::chLatin_##vv, xercesc::chLatin_##ww, xercesc::chLatin_##xx, \ + xercesc::chLatin_##yy, xercesc::chLatin_##zz, xercesc::chNull} #endif /* DOXYGEN_SKIP */ /** * Begins the declaration of an XMLObject specialization for an abstract element/type. * Basic boilerplate includes a protected constructor, empty virtual destructor, * and Unicode constants for the default associated element's name and prefix. - * + * * @param linkage linkage specifier for the class * @param cname the name of the class to declare * @param base the base class to derive from using public virtual inheritance @@ -227,7 +369,7 @@ * Begins the declaration of an XMLObject specialization. * Basic boilerplate includes a protected constructor, empty virtual destructor, * and Unicode constants for the default associated element's name and prefix. - * + * * @param linkage linkage specifier for the class * @param cname the name of the class to declare * @param base the base class to derive from using public virtual inheritance @@ -249,7 +391,7 @@ * Begins the declaration of an XMLObject specialization with two base classes. * Basic boilerplate includes a protected constructor, empty virtual destructor, * and Unicode constants for the default associated element's name and prefix. - * + * * @param linkage linkage specifier for the class * @param cname the name of the class to declare * @param base the first base class to derive from using public virtual inheritance @@ -272,7 +414,7 @@ * Begins the declaration of an XMLObject specialization with three base classes. * Basic boilerplate includes a protected constructor, empty virtual destructor, * and Unicode constants for the default associated element's name and prefix. - * + * * @param linkage linkage specifier for the class * @param cname the name of the class to declare * @param base the first base class to derive from using public virtual inheritance @@ -296,7 +438,7 @@ * Begins the declaration of an XMLObject specialization with four base classes. * Basic boilerplate includes a protected constructor, empty virtual destructor, * and Unicode constants for the default associated element's name and prefix. - * + * * @param linkage linkage specifier for the class * @param cname the name of the class to declare * @param base the first base class to derive from using public virtual inheritance @@ -321,7 +463,7 @@ * Begins the declaration of an XMLObject specialization with five base classes. * Basic boilerplate includes a protected constructor, empty virtual destructor, * and Unicode constants for the default associated element's name and prefix. - * + * * @param linkage linkage specifier for the class * @param cname the name of the class to declare * @param base the first base class to derive from using public virtual inheritance @@ -349,9 +491,45 @@ #define END_XMLOBJECT } /** + * Declares a static variable holding the XMLObject's element QName. + */ +#define DECL_ELEMENT_QNAME \ + public: \ + XMLTOOLING_DOXYGEN(Element QName) \ + static xmltooling::QName ELEMENT_QNAME + +/** + * Declares a static variable holding the XMLObject's schema type QName. + */ +#define DECL_TYPE_QNAME \ + public: \ + XMLTOOLING_DOXYGEN(Type QName) \ + static xmltooling::QName TYPE_QNAME + +/** + * Implements a static variable holding an XMLObject's element QName. + * + * @param cname the name of the XMLObject specialization + * @param namespaceURI the XML namespace of the default associated element + * @param namespacePrefix the XML namespace prefix of the default associated element + */ +#define IMPL_ELEMENT_QNAME(cname,namespaceURI,namespacePrefix) \ + xmltooling::QName cname::ELEMENT_QNAME(namespaceURI,cname::LOCAL_NAME,namespacePrefix) + +/** + * Implements a static variable holding an XMLObject's schema type QName. + * + * @param cname the name of the XMLObject specialization + * @param namespaceURI the XML namespace of the default associated element + * @param namespacePrefix the XML namespace prefix of the default associated element + */ +#define IMPL_TYPE_QNAME(cname,namespaceURI,namespacePrefix) \ + xmltooling::QName cname::TYPE_QNAME(namespaceURI,cname::TYPE_NAME,namespacePrefix) + +/** * Declares abstract set method for a typed XML attribute. * The get method is omitted. - * + * * @param proper the proper name of the attribute * @param upcased the upcased name of the attribute * @param type the attribute's data type @@ -365,7 +543,7 @@ /** * Declares abstract get/set methods for a typed XML attribute. - * + * * @param proper the proper name of the attribute * @param upcased the upcased name of the attribute * @param type the attribute's data type @@ -382,7 +560,7 @@ /** * Declares abstract set method for a string XML attribute. * The get method is omitted. - * + * * @param proper the proper name of the attribute * @param upcased the upcased name of the attribute */ @@ -391,7 +569,7 @@ /** * Declares abstract get/set methods for a string XML attribute. - * + * * @param proper the proper name of the attribute * @param upcased the upcased name of the attribute */ @@ -401,7 +579,7 @@ /** * Declares abstract set method for a DateTime XML attribute. * The get method is omitted. - * + * * @param proper the proper name of the attribute * @param upcased the upcased name of the attribute */ @@ -414,7 +592,7 @@ /** * Declares abstract get/set methods for a DateTime XML attribute. - * + * * @param proper the proper name of the attribute * @param upcased the upcased name of the attribute */ @@ -430,7 +608,7 @@ /** * Declares abstract set method for an integer XML attribute. * The get method is omitted. - * + * * @param proper the proper name of the attribute * @param upcased the upcased name of the attribute */ @@ -445,7 +623,7 @@ /** * Declares abstract get/set methods for an integer XML attribute. - * + * * @param proper the proper name of the attribute * @param upcased the upcased name of the attribute */ @@ -462,7 +640,7 @@ /** * Declares abstract get/set methods for a boolean XML attribute. - * + * * @param proper the proper name of the attribute * @param upcased the upcased name of the attribute * @param def the default/presumed value, if no explicit value has been set @@ -518,7 +696,7 @@ /** * Implements get/set methods and a private member for a typed XML attribute. - * + * * @param proper the proper name of the attribute * @param type the attribute's data type */ @@ -535,7 +713,7 @@ /** * Implements get/set methods and a private member for a string XML attribute. - * + * * @param proper the proper name of the attribute */ #define IMPL_STRING_ATTRIB(proper) \ @@ -544,7 +722,7 @@ /** * Implements get/set methods and a private member for a string XML attribute, * plus a getXMLID override. - * + * * @param proper the proper name of the attribute */ #define IMPL_ID_ATTRIB(proper) \ @@ -554,12 +732,50 @@ } /** + * Implements get/set methods and a private member for a string XML attribute, + * plus a getXMLID override and attribute node clearance when DOM is dropped. + * + * @param proper the proper name of the attribute + * @param ucase the upcased name of the attribute + * @param namespaceURI the XML namespace of the attribute + */ +#define IMPL_ID_ATTRIB_EX(proper, ucase, namespaceURI) \ + IMPL_XMLOBJECT_ATTRIB(proper,XMLCh) \ + const XMLCh* getXMLID() const { \ + return m_##proper; \ + } \ + void releaseDOM() const { \ + if (getDOM()) \ + getDOM()->removeAttributeNS(namespaceURI, ucase##_ATTRIB_NAME); \ + AbstractDOMCachingXMLObject::releaseDOM(); \ + } + +/** * Implements get/set methods and a private member for a DateTime XML attribute. - * + * * @param proper the proper name of the attribute * @param fallback epoch to return when attribute is NULL */ #define IMPL_DATETIME_ATTRIB(proper,fallback) \ + IMPL_DATETIME_ATTRIB_EX(proper,fallback,false) + +/** + * Implements get/set methods and a private member for a duration-valued DateTime XML attribute. + * + * @param proper the proper name of the attribute + * @param fallback epoch to return when attribute is NULL + */ +#define IMPL_DURATION_ATTRIB(proper,fallback) \ + IMPL_DATETIME_ATTRIB_EX(proper,fallback,true) + +/** + * Implements get/set methods and a private member for a DateTime XML attribute. + * + * @param proper the proper name of the attribute + * @param fallback epoch to return when attribute is NULL + * @param duration true iff the attribute should be handled as a duration + */ +#define IMPL_DATETIME_ATTRIB_EX(proper,fallback,duration) \ protected: \ DateTime* m_##proper; \ time_t m_##proper##Epoch; \ @@ -573,21 +789,21 @@ void set##proper(const DateTime* proper) { \ m_##proper = prepareForAssignment(m_##proper,proper); \ if (m_##proper) \ - m_##proper##Epoch=m_##proper->getEpoch(); \ + m_##proper##Epoch=m_##proper->getEpoch(duration); \ } \ void set##proper(time_t proper) { \ - m_##proper = prepareForAssignment(m_##proper,proper); \ + m_##proper = prepareForAssignment(m_##proper,proper,duration); \ m_##proper##Epoch = proper; \ } \ void set##proper(const XMLCh* proper) { \ - m_##proper = prepareForAssignment(m_##proper,proper); \ + m_##proper = prepareForAssignment(m_##proper,proper,duration); \ if (m_##proper) \ - m_##proper##Epoch=m_##proper->getEpoch(); \ + m_##proper##Epoch=m_##proper->getEpoch(duration); \ } /** * Implements get/set methods and a private member for an integer XML attribute. - * + * * @param proper the proper name of the attribute */ #define IMPL_INTEGER_ATTRIB(proper) \ @@ -595,21 +811,24 @@ XMLCh* m_##proper; \ public: \ pair get##proper() const { \ - return make_pair((m_##proper!=NULL),(m_##proper!=NULL ? xercesc::XMLString::parseInt(m_##proper): 0)); \ + return make_pair((m_##proper!=nullptr),(m_##proper!=nullptr ? xercesc::XMLString::parseInt(m_##proper): 0)); \ } \ void set##proper(const XMLCh* proper) { \ m_##proper = prepareForAssignment(m_##proper,proper); \ } \ void set##proper(int proper) { \ - char buf##proper[64]; \ - sprintf(buf##proper,"%d",proper); \ - auto_ptr_XMLCh wide##proper(buf##proper); \ - set##proper(wide##proper.get()); \ + try { \ + std::string buf(boost::lexical_cast(proper)); \ + xmltooling::auto_ptr_XMLCh widen(buf.c_str()); \ + set##proper(widen.get()); \ + } \ + catch (boost::bad_lexical_cast&) { \ + } \ } /** * Implements get/set methods and a private member for a boolean XML attribute. - * + * * @param proper the proper name of the attribute */ #define IMPL_BOOLEAN_ATTRIB(proper) \ @@ -627,9 +846,29 @@ } /** + * Implements get/set methods and a private member for a typed, qualified XML attribute. + * + * @param proper the proper name of the attribute + * @param type the attribute's data type + */ +#define IMPL_XMLOBJECT_FOREIGN_ATTRIB(proper,type) \ + protected: \ + XMLCh* m_##proper##Prefix; \ + type* m_##proper; \ + public: \ + const type* get##proper() const { \ + return m_##proper; \ + } \ + void set##proper(const type* proper) { \ + m_##proper = prepareForAssignment(m_##proper,proper); \ + xercesc::XMLString::release(&m_##proper##Prefix); \ + m_##proper##Prefix = nullptr; \ + } + +/** * Declares abstract set method for a typed XML child object in a foreign namespace. * The get method is omitted. - * + * * @param proper the proper name of the child type * @param ns the C++ namespace for the type */ @@ -640,7 +879,7 @@ /** * Declares abstract get/set methods for a typed XML child object in a foreign namespace. - * + * * @param proper the proper name of the child type * @param ns the C++ namespace for the type */ @@ -654,7 +893,7 @@ /** * Declares abstract set method for a typed XML child object. * The get method is omitted. - * + * * @param proper the proper name of the child type */ #define DECL_INHERITED_TYPED_CHILD(proper) \ @@ -664,7 +903,7 @@ /** * Declares abstract get/set methods for a typed XML child object. - * + * * @param proper the proper name of the child type */ #define DECL_TYPED_CHILD(proper) \ @@ -676,7 +915,7 @@ /** * Declares abstract get/set methods for a generic XML child object. - * + * * @param proper the proper name of the child */ #define DECL_XMLOBJECT_CHILD(proper) \ @@ -689,7 +928,7 @@ /** * Implements get/set methods and a private list iterator member for a typed XML child object. - * + * * @param proper the proper name of the child type */ #define IMPL_TYPED_CHILD(proper) \ @@ -708,7 +947,7 @@ /** * Implements get/set methods and a private list iterator member for * a typed XML child object in a foreign namespace - * + * * @param proper the proper name of the child type * @param ns the C++ namespace for the type */ @@ -727,7 +966,7 @@ /** * Implements get/set methods and a private list iterator member for a generic XML child object. - * + * * @param proper the proper name of the child */ #define IMPL_XMLOBJECT_CHILD(proper) \ @@ -745,7 +984,7 @@ /** * Declares abstract get/set methods for a typed XML child collection. - * + * * @param proper the proper name of the child type */ #define DECL_TYPED_CHILDREN(proper) \ @@ -757,7 +996,7 @@ /** * Declares abstract get/set methods for a typed XML child collection in a foreign namespace. - * + * * @param proper the proper name of the child type * @param ns the C++ namespace for the type */ @@ -770,7 +1009,7 @@ /** * Declares abstract get/set methods for a generic XML child collection. - * + * * @param proper the proper name of the child */ #define DECL_XMLOBJECT_CHILDREN(proper) \ @@ -782,7 +1021,7 @@ /** * Implements get method and a private vector member for a typed XML child collection. - * + * * @param proper the proper name of the child type * @param fence insertion fence for new objects of the child collection in backing list */ @@ -795,12 +1034,12 @@ } \ const std::vector& get##proper##s() const { \ return m_##proper##s; \ - } + } /** * Implements get method and a private vector member for a typed XML child collection * in a foreign namespace. - * + * * @param proper the proper name of the child type * @param ns the C++ namespace for the type * @param fence insertion fence for new objects of the child collection in backing list @@ -814,11 +1053,11 @@ } \ const std::vector& get##proper##s() const { \ return m_##proper##s; \ - } + } /** * Implements get method and a private vector member for a generic XML child collection. - * + * * @param proper the proper name of the child * @param fence insertion fence for new objects of the child collection in backing list */ @@ -831,23 +1070,23 @@ } \ const std::vector& get##proper##s() const { \ return m_##proper##s; \ - } + } /** * Implements marshalling for a string attribute - * + * * @param proper the proper name of the attribute * @param ucase the upcased name of the attribute * @param namespaceURI the XML namespace of the attribute */ #define MARSHALL_STRING_ATTRIB(proper,ucase,namespaceURI) \ - if (m_##proper) { \ + if (m_##proper && *m_##proper) { \ domElement->setAttributeNS(namespaceURI, ucase##_ATTRIB_NAME, m_##proper); \ } /** * Implements marshalling for a DateTime attribute - * + * * @param proper the proper name of the attribute * @param ucase the upcased name of the attribute * @param namespaceURI the XML namespace of the attribute @@ -859,19 +1098,19 @@ /** * Implements marshalling for an integer attribute - * + * * @param proper the proper name of the attribute * @param ucase the upcased name of the attribute * @param namespaceURI the XML namespace of the attribute */ #define MARSHALL_INTEGER_ATTRIB(proper,ucase,namespaceURI) \ - if (m_##proper) { \ + if (m_##proper && *m_##proper) { \ domElement->setAttributeNS(namespaceURI, ucase##_ATTRIB_NAME, m_##proper); \ } /** * Implements marshalling for a boolean attribute - * + * * @param proper the proper name of the attribute * @param ucase the upcased name of the attribute * @param namespaceURI the XML namespace of the attribute @@ -896,33 +1135,48 @@ /** * Implements marshalling for a QName attribute - * + * * @param proper the proper name of the attribute * @param ucase the upcased name of the attribute * @param namespaceURI the XML namespace of the attribute */ #define MARSHALL_QNAME_ATTRIB(proper,ucase,namespaceURI) \ if (m_##proper) { \ - auto_ptr_XMLCh qstr(m_##proper->toString().c_str()); \ + xmltooling::auto_ptr_XMLCh qstr(m_##proper->toString().c_str()); \ domElement->setAttributeNS(namespaceURI, ucase##_ATTRIB_NAME, qstr.get()); \ } +#ifdef XMLTOOLING_XERCESC_BOOLSETIDATTRIBUTE /** * Implements marshalling for an ID attribute - * + * * @param proper the proper name of the attribute * @param ucase the upcased name of the attribute * @param namespaceURI the XML namespace of the attribute */ -#define MARSHALL_ID_ATTRIB(proper,ucase,namespaceURI) \ - if (m_##proper) { \ +# define MARSHALL_ID_ATTRIB(proper,ucase,namespaceURI) \ + if (m_##proper && *m_##proper) { \ + domElement->setAttributeNS(namespaceURI, ucase##_ATTRIB_NAME, m_##proper); \ + domElement->setIdAttributeNS(namespaceURI, ucase##_ATTRIB_NAME, true); \ + } +#else +/** + * Implements marshalling for an ID attribute + * + * @param proper the proper name of the attribute + * @param ucase the upcased name of the attribute + * @param namespaceURI the XML namespace of the attribute + */ +# define MARSHALL_ID_ATTRIB(proper,ucase,namespaceURI) \ + if (m_##proper && *m_##proper) { \ domElement->setAttributeNS(namespaceURI, ucase##_ATTRIB_NAME, m_##proper); \ domElement->setIdAttributeNS(namespaceURI, ucase##_ATTRIB_NAME); \ } +#endif /** * Implements unmarshalling process branch for a string attribute - * + * * @param proper the proper name of the attribute * @param ucase the upcased name of the attribute * @param namespaceURI the XML namespace of the attribute @@ -933,23 +1187,39 @@ return; \ } +#ifdef XMLTOOLING_XERCESC_BOOLSETIDATTRIBUTE /** * Implements unmarshalling process branch for an ID attribute - * + * + * @param proper the proper name of the attribute + * @param ucase the upcased name of the attribute + * @param namespaceURI the XML namespace of the attribute + */ +# define PROC_ID_ATTRIB(proper,ucase,namespaceURI) \ + if (xmltooling::XMLHelper::isNodeNamed(attribute, namespaceURI, ucase##_ATTRIB_NAME)) { \ + set##proper(attribute->getValue()); \ + attribute->getOwnerElement()->setIdAttributeNode(attribute, true); \ + return; \ + } +#else +/** + * Implements unmarshalling process branch for an ID attribute + * * @param proper the proper name of the attribute * @param ucase the upcased name of the attribute * @param namespaceURI the XML namespace of the attribute */ -#define PROC_ID_ATTRIB(proper,ucase,namespaceURI) \ +# define PROC_ID_ATTRIB(proper,ucase,namespaceURI) \ if (xmltooling::XMLHelper::isNodeNamed(attribute, namespaceURI, ucase##_ATTRIB_NAME)) { \ set##proper(attribute->getValue()); \ attribute->getOwnerElement()->setIdAttributeNode(attribute); \ return; \ } +#endif /** * Implements unmarshalling process branch for a DateTime attribute - * + * * @param proper the proper name of the attribute * @param ucase the upcased name of the attribute * @param namespaceURI the XML namespace of the attribute @@ -959,20 +1229,21 @@ /** * Implements unmarshalling process branch for a DateTime attribute - * + * * @param proper the proper name of the attribute * @param ucase the upcased name of the attribute * @param namespaceURI the XML namespace of the attribute */ #define PROC_QNAME_ATTRIB(proper,ucase,namespaceURI) \ if (xmltooling::XMLHelper::isNodeNamed(attribute, namespaceURI, ucase##_ATTRIB_NAME)) { \ - set##proper(XMLHelper::getAttributeValueAsQName(attribute)); \ + std::auto_ptr q(xmltooling::XMLHelper::getAttributeValueAsQName(attribute)); \ + set##proper(q.get()); \ return; \ } /** * Implements unmarshalling process branch for an integer attribute - * + * * @param proper the proper name of the attribute * @param ucase the upcased name of the attribute * @param namespaceURI the XML namespace of the attribute @@ -982,7 +1253,7 @@ /** * Implements unmarshalling process branch for a boolean attribute - * + * * @param proper the proper name of the attribute * @param ucase the upcased name of the attribute * @param namespaceURI the XML namespace of the attribute @@ -992,7 +1263,7 @@ /** * Implements unmarshalling process branch for typed child collection element - * + * * @param proper the proper name of the child type * @param namespaceURI the XML namespace of the child element * @param force bypass use of hint and just cast down to check child @@ -1009,7 +1280,7 @@ /** * Implements unmarshalling process branch for typed child collection element * in a foreign namespace. - * + * * @param proper the proper name of the child type * @param ns the C++ namespace for the type * @param namespaceURI the XML namespace of the child element @@ -1026,7 +1297,7 @@ /** * Implements unmarshalling process branch for typed child singleton element - * + * * @param proper the proper name of the child type * @param namespaceURI the XML namespace of the child element * @param force bypass use of hint and just cast down to check child @@ -1034,8 +1305,9 @@ #define PROC_TYPED_CHILD(proper,namespaceURI,force) \ if (force || xmltooling::XMLHelper::isNodeNamed(root,namespaceURI,proper::LOCAL_NAME)) { \ proper* typesafe=dynamic_cast(childXMLObject); \ - if (typesafe) { \ - set##proper(typesafe); \ + if (typesafe && !m_##proper) { \ + typesafe->setParent(this); \ + *m_pos_##proper = m_##proper = typesafe; \ return; \ } \ } @@ -1043,7 +1315,7 @@ /** * Implements unmarshalling process branch for typed child singleton element * in a foreign namespace. - * + * * @param proper the proper name of the child type * @param ns the C++ namespace for the type * @param namespaceURI the XML namespace of the child element @@ -1052,27 +1324,31 @@ #define PROC_TYPED_FOREIGN_CHILD(proper,ns,namespaceURI,force) \ if (force || xmltooling::XMLHelper::isNodeNamed(root,namespaceURI,ns::proper::LOCAL_NAME)) { \ ns::proper* typesafe=dynamic_cast(childXMLObject); \ - if (typesafe) { \ - set##proper(typesafe); \ + if (typesafe && !m_##proper) { \ + typesafe->setParent(this); \ + *m_pos_##proper = m_##proper = typesafe; \ return; \ } \ } /** * Implements unmarshalling process branch for a generic child singleton element - * + * * @param proper the proper name of the child type * @param namespaceURI the XML namespace of the child element */ #define PROC_XMLOBJECT_CHILD(proper,namespaceURI) \ if (xmltooling::XMLHelper::isNodeNamed(root,namespaceURI,proper::LOCAL_NAME)) { \ - set##proper(childXMLObject); \ - return; \ + if (!m_##proper) { \ + childXMLObject->setParent(this); \ + *m_pos_##proper = m_##proper = childXMLObject; \ + return; \ + } \ } /** * Declares aliased get/set methods for named XML element simple content. - * + * * @param proper the proper name to label the element's content */ #define DECL_SIMPLE_CONTENT(proper) \ @@ -1087,20 +1363,23 @@ /** * Declares aliased get/set methods for named integer XML element content. - * + * * @param proper the proper name to label the element's content */ #define DECL_INTEGER_CONTENT(proper) \ XMLTOOLING_DOXYGEN(Returns proper in integer form after a NULL indicator.) \ std::pair get##proper() const { \ - return std::make_pair((getTextContent()!=NULL), (getTextContent()!=NULL ? xercesc::XMLString::parseInt(getTextContent()) : NULL)); \ + return std::make_pair((getTextContent()!=nullptr), (getTextContent()!=nullptr ? xercesc::XMLString::parseInt(getTextContent()) : 0)); \ } \ XMLTOOLING_DOXYGEN(Sets proper.) \ void set##proper(int proper) { \ - char buf[64]; \ - sprintf(buf,"%d",proper); \ - xmltooling::auto_ptr_XMLCh widebuf(buf); \ - setTextContent(widebuf.get()); \ + try { \ + std::string buf(boost::lexical_cast(proper)); \ + xmltooling::auto_ptr_XMLCh widen(buf.c_str()); \ + setTextContent(widen.get()); \ + } \ + catch (boost::bad_lexical_cast&) { \ + } \ } \ XMLTOOLING_DOXYGEN(Sets or clears proper.) \ void set##proper(const XMLCh* proper) { \ @@ -1109,8 +1388,8 @@ /** * Implements cloning methods for an XMLObject specialization implementation class. - * - * @param cname the name of the XMLObject specialization + * + * @param cname the name of the XMLObject specialization */ #define IMPL_XMLOBJECT_CLONE(cname) \ cname* clone##cname() const { \ @@ -1127,9 +1406,232 @@ } /** + * Implements cloning methods for an XMLObject specialization implementation class + * that must override a base class clone method. + * + * @param cname the name of the XMLObject specialization + * @param base name of base type. + */ +#define IMPL_XMLOBJECT_CLONE2(cname,base) \ + cname* clone##cname() const { \ + return dynamic_cast(clone()); \ + } \ + base* clone##base() const { \ + return dynamic_cast(clone()); \ + } \ + xmltooling::XMLObject* clone() const { \ + std::auto_ptr domClone(xmltooling::AbstractDOMCachingXMLObject::clone()); \ + cname##Impl* ret=dynamic_cast(domClone.get()); \ + if (ret) { \ + domClone.release(); \ + return ret; \ + } \ + return new cname##Impl(*this); \ + } + +/** + * Implements cloning methods for an XMLObject specialization implementation class that + * needs two stage duplication to avoid invoking virtual methods during construction. + * + * @param cname the name of the XMLObject specialization + */ +#define IMPL_XMLOBJECT_CLONE_EX(cname) \ + cname* clone##cname() const { \ + return dynamic_cast(clone()); \ + } \ + xmltooling::XMLObject* clone() const { \ + std::auto_ptr domClone(xmltooling::AbstractDOMCachingXMLObject::clone()); \ + cname##Impl* ret=dynamic_cast(domClone.get()); \ + if (ret) { \ + domClone.release(); \ + return ret; \ + } \ + std::auto_ptr ret2(new cname##Impl(*this)); \ + ret2->_clone(*this); \ + return ret2.release(); \ + } + +/** + * Implements cloning methods for an XMLObject specialization implementation class that + * needs two stage duplication to avoid invoking virtual methods during construction, + * and must override a base class clone method. + * + * @param cname the name of the XMLObject specialization + * @param base name of base type + */ +#define IMPL_XMLOBJECT_CLONE_EX2(cname,base) \ + cname* clone##cname() const { \ + return dynamic_cast(clone()); \ + } \ + base* clone##base() const { \ + return dynamic_cast(clone()); \ + } \ + xmltooling::XMLObject* clone() const { \ + std::auto_ptr domClone(xmltooling::AbstractDOMCachingXMLObject::clone()); \ + cname##Impl* ret=dynamic_cast(domClone.get()); \ + if (ret) { \ + domClone.release(); \ + return ret; \ + } \ + std::auto_ptr ret2(new cname##Impl(*this)); \ + ret2->_clone(*this); \ + return ret2.release(); \ + } + +/** + * Implements cloning of a child attribute, for use in copy constructor or + * deferred clone methods. + * + * proper the proper name of the attribute to clone + */ +#define IMPL_CLONE_ATTRIB(proper) \ + set##proper(src.get##proper()) + +/** + * Implements cloning of a child attribute in a foreign namespace, for use in copy constructor or + * deferred clone methods. + * + * proper the proper name of the attribute to clone + */ +#define IMPL_CLONE_FOREIGN_ATTRIB(proper) \ + set##proper(src.get##proper()); \ + if (src.m_##proper##Prefix) \ + m_##proper##Prefix = xercesc::XMLString::replicate(src.m_##proper##Prefix) + +/** + * Implements cloning of an integer child attribute, for use in copy constructor or + * deferred clone methods. + * + * proper the proper name of the attribute to clone + */ +#define IMPL_CLONE_INTEGER_ATTRIB(proper) \ + set##proper(src.m_##proper) + +/** + * Implements cloning of a boolean child attribute, for use in copy constructor or + * deferred clone methods. + * + * proper the proper name of the attribute to clone + */ +#define IMPL_CLONE_BOOLEAN_ATTRIB(proper) \ + proper(src.m_##proper) + +/** + * Implements cloning of a child object, for use in copy constructor or + * deferred clone methods. + * + * proper the proper name of the child object to clone + */ +#define IMPL_CLONE_XMLOBJECT_CHILD(proper) \ + if (src.get##proper()) \ + set##proper(src.get##proper()->clone()) + +/** + * Implements cloning of a typed child object, for use in copy constructor or + * deferred clone methods. + * + * proper the proper name of the child type to clone + */ +#define IMPL_CLONE_TYPED_CHILD(proper) \ + if (src.get##proper()) \ + set##proper(src.get##proper()->clone##proper()) + +/** + * Implements cloning of an untyped child collection, for use in copy constructor or + * deferred clone methods. + * + * proper the proper name of the child type to clone + */ +#define IMPL_CLONE_XMLOBJECT_CHILDREN(proper) \ + static void (VectorOf(XMLObject)::* XMLObject_push_back)(XMLObject* const&) = &VectorOf(XMLObject)::push_back; \ + VectorOf(XMLObject) c##proper = get##proper##s(); \ + std::for_each( \ + src.m_##proper##s.begin(), src.m_##proper##s.end(), \ + boost::lambda::if_(boost::lambda::_1 != ((XMLObject*)nullptr)) \ + [boost::lambda::bind(XMLObject_push_back, boost::ref(c##proper), boost::lambda::bind(&XMLObject::clone, boost::lambda::_1))] \ + ) + +/** + * Implements cloning of a child collection, for use in copy constructor or + * deferred clone methods. + * + * proper the proper name of the child type to clone + */ +#define IMPL_CLONE_TYPED_CHILDREN(proper) \ + static void (VectorOf(proper)::* proper##_push_back)(proper* const&) = &VectorOf(proper)::push_back; \ + VectorOf(proper) c##proper = get##proper##s(); \ + std::for_each( \ + src.m_##proper##s.begin(), src.m_##proper##s.end(), \ + boost::lambda::if_(boost::lambda::_1 != ((proper*)nullptr)) \ + [boost::lambda::bind(proper##_push_back, boost::ref(c##proper), boost::lambda::bind(&proper::clone##proper, boost::lambda::_1))] \ + ) + +/** + * Implements cloning of a child collection in a foreign namespace, for use in copy constructor or + * deferred clone methods. + * + * proper the proper name of the child type to clone + * ns the namespace of the child type + */ +#define IMPL_CLONE_TYPED_FOREIGN_CHILDREN(proper,ns) \ + static void (VectorOf(ns::proper)::* proper##_push_back)(ns::proper* const&) = &VectorOf(ns::proper)::push_back; \ + VectorOf(ns::proper) c##proper = get##proper##s(); \ + std::for_each( \ + src.m_##proper##s.begin(), src.m_##proper##s.end(), \ + boost::lambda::if_(boost::lambda::_1 != ((ns::proper*)nullptr)) \ + [boost::lambda::bind(proper##_push_back, boost::ref(c##proper), boost::lambda::bind(&ns::proper::clone##proper, boost::lambda::_1))] \ + ) + +/** + * Opens an iteration loop over all of the children of an object. + */ +#define IMPL_CLONE_CHILDBAG_BEGIN \ + for (list::const_iterator _bagit = src.m_children.begin(); _bagit != src.m_children.end(); ++_bagit) { + +/** + * Closes an iteration loop over all of the children of an object. + */ +#define IMPL_CLONE_CHILDBAG_END } + +/** + * Implements cloning of a typed child in a bag iteration loop based on a cast check. + * + * @param proper the proper name of the child type to clone + */ +#define IMPL_CLONE_TYPED_CHILD_IN_BAG(proper) \ + proper* _##proper##cast = dynamic_cast(*_bagit); \ + if (_##proper##cast) { \ + get##proper##s().push_back(_##proper##cast->clone##proper()); \ + continue; \ + } + +/** + * Implements cloning of a typed child in a forign namespace in a bag iteration loop based on a cast check. + * + * @param proper the proper name of the child type to clone + * @param ns the namespace of the child type + */ +#define IMPL_CLONE_TYPED_FOREIGN_CHILD_IN_BAG(proper,ns) \ + ns::proper* _##proper##cast = dynamic_cast(*_bagit); \ + if (_##proper##cast) { \ + get##proper##s().push_back(_##proper##cast->clone##proper()); \ + continue; \ + } + +/** + * Implements cloning of an XMLObject child in a bag iteration loop. + * + * @param proper the proper name of the child to clone + */ +#define IMPL_CLONE_XMLOBJECT_CHILD_IN_BAG(proper) \ + if (*_bagit) { \ + get##proper##s().push_back((*_bagit)->clone()); \ + } + +/** * Declares an XMLObject specialization with a simple content model and type, * handling it as string data. - * + * * @param linkage linkage specifier for the class * @param cname the name of the XMLObject specialization * @param proper the proper name to label the element's content @@ -1143,7 +1645,7 @@ /** * Declares and defines an implementation class for an XMLObject with * a simple content model and type, handling it as string data. - * + * * @param linkage linkage specifier for the class * @param cname the name of the XMLObject specialization */ @@ -1157,7 +1659,7 @@ { \ public: \ virtual ~cname##Impl() {} \ - cname##Impl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType) \ + cname##Impl(const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType) \ : xmltooling::AbstractXMLObject(nsURI, localName, prefix, schemaType) { \ } \ cname##Impl(const cname##Impl& src) \ @@ -1173,7 +1675,7 @@ * Begins the declaration of an XMLObjectBuilder specialization. * Basic boilerplate includes an empty virtual destructor, and * a default builder that defaults the element name. - * + * * @param linkage linkage specifier for the class * @param cname the name of the XMLObject specialization * @param namespaceURI the XML namespace of the default associated element @@ -1181,7 +1683,7 @@ */ #define BEGIN_XMLOBJECTBUILDER(linkage,cname,namespaceURI,namespacePrefix) \ XMLTOOLING_DOXYGEN(Builder for cname objects.) \ - class linkage cname##Builder : public xmltooling::XMLObjectBuilder { \ + class linkage cname##Builder : public xmltooling::ConcreteXMLObjectBuilder { \ public: \ virtual ~cname##Builder() {} \ XMLTOOLING_DOXYGEN(Default builder.) \ @@ -1190,7 +1692,7 @@ } \ XMLTOOLING_DOXYGEN(Builder that allows element/type override.) \ virtual cname* buildObject( \ - const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix=NULL, const xmltooling::QName* schemaType=NULL \ + const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix=nullptr, const xmltooling::QName* schemaType=nullptr \ ) const /** @@ -1200,7 +1702,7 @@ /** * Declares a generic XMLObjectBuilder specialization. - * + * * @param linkage linkage specifier for the class * @param cname the name of the XMLObject specialization * @param namespaceURI the XML namespace of the default associated element @@ -1220,13 +1722,13 @@ END_XMLOBJECTBUILDER /** - * Implements the standard XMLObjectBuilder specialization function. - * + * Implements the standard XMLObjectBuilder specialization function. + * * @param cname the name of the XMLObject specialization */ #define IMPL_XMLOBJECTBUILDER(cname) \ cname* cname##Builder::buildObject( \ - const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType \ + const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType \ ) const \ { \ return new cname##Impl(nsURI,localName,prefix,schemaType); \ @@ -1238,7 +1740,7 @@ * Begins the declaration of an XMLObjectBuilder specialization. * Basic boilerplate includes an empty virtual destructor, and * a default builder that defaults the element name. - * + * * @param linkage linkage specifier for the class * @param cname the name of the XMLObject specialization * @param namespaceURI the XML namespace of the default associated element @@ -1246,7 +1748,7 @@ */ #define BEGIN_XMLOBJECTBUILDER(linkage,cname,namespaceURI,namespacePrefix) \ XMLTOOLING_DOXYGEN(Builder for cname objects.) \ - class linkage cname##Builder : public xmltooling::XMLObjectBuilder { \ + class linkage cname##Builder : public xmltooling::ConcreteXMLObjectBuilder { \ public: \ virtual ~cname##Builder() {} \ XMLTOOLING_DOXYGEN(Default builder.) \ @@ -1255,7 +1757,7 @@ } \ XMLTOOLING_DOXYGEN(Builder that allows element/type override.) \ virtual xmltooling::XMLObject* buildObject( \ - const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix=NULL, const xmltooling::QName* schemaType=NULL \ + const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix=nullptr, const xmltooling::QName* schemaType=nullptr \ ) const /** @@ -1265,7 +1767,7 @@ /** * Declares a generic XMLObjectBuilder specialization. - * + * * @param linkage linkage specifier for the class * @param cname the name of the XMLObject specialization * @param namespaceURI the XML namespace of the default associated element @@ -1285,13 +1787,13 @@ END_XMLOBJECTBUILDER /** - * Implements the standard XMLObjectBuilder specialization function. - * + * Implements the standard XMLObjectBuilder specialization function. + * * @param cname the name of the XMLObject specialization */ #define IMPL_XMLOBJECTBUILDER(cname) \ xmltooling::XMLObject* cname##Builder::buildObject( \ - const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const QName* schemaType \ + const XMLCh* nsURI, const XMLCh* localName, const XMLCh* prefix, const xmltooling::QName* schemaType \ ) const \ { \ return new cname##Impl(nsURI,localName,prefix,schemaType); \ @@ -1301,7 +1803,7 @@ /** * Begins the declaration of a Schema Validator specialization. - * + * * @param linkage linkage specifier for the class * @param cname the base name of the Validator specialization */ @@ -1313,11 +1815,13 @@ virtual void validate(const xmltooling::XMLObject* xmlObject) const { \ const cname* ptr=dynamic_cast(xmlObject); \ if (!ptr) \ - throw xmltooling::ValidationException(#cname"SchemaValidator: unsupported object type ($1).",xmltooling::params(1,typeid(xmlObject).name())) + throw xmltooling::ValidationException(#cname"SchemaValidator: unsupported object type ($1).",xmltooling::params(1,typeid(xmlObject).name())); \ + if (ptr->nil() && (ptr->hasChildren() || ptr->getTextContent())) \ + throw xmltooling::ValidationException("Object has nil property but with children or content.") /** * Begins the declaration of a Schema Validator specialization subclass. - * + * * @param linkage linkage specifier for the class * @param cname the base name of the Validator specialization * @param base base class for the validator @@ -1330,7 +1834,7 @@ virtual void validate(const xmltooling::XMLObject* xmlObject) const { \ const cname* ptr=dynamic_cast(xmlObject); \ if (!ptr) \ - throw xmltooling::ValidationException(#cname"SchemaValidator: unsupported object type ($1).",xmltooling::params(1,typeid(xmlObject).name())) + throw xmltooling::ValidationException(#cname"SchemaValidator: unsupported object type ($1).",xmltooling::params(1,typeid(xmlObject).name())); /** * Ends the declaration of a Validator specialization. @@ -1339,7 +1843,7 @@ /** * Validator code that checks the object type. - * + * * @param cname the name of the XMLObject specialization */ #define XMLOBJECTVALIDATOR_CHECKTYPE(cname) \ @@ -1349,9 +1853,9 @@ /** * Validator code that checks for a required attribute, content, or singleton. - * + * * @param cname the name of the XMLObject specialization - * @param proper the proper name of the attribute, content, or singleton member + * @param proper the proper name of the attribute, content, or singleton member */ #define XMLOBJECTVALIDATOR_REQUIRE(cname,proper) \ if (!ptr->get##proper()) \ @@ -1359,9 +1863,9 @@ /** * Validator code that checks for a required integer attribute - * + * * @param cname the name of the XMLObject specialization - * @param proper the proper name of the attribute, content, or singleton member + * @param proper the proper name of the attribute, content, or singleton member */ #define XMLOBJECTVALIDATOR_REQUIRE_INTEGER(cname,proper) \ if (!ptr->get##proper().first) \ @@ -1370,10 +1874,10 @@ /** * Validator code that checks for one of a pair of * required attributes, content, or singletons. - * + * * @param cname the name of the XMLObject specialization - * @param proper1 the proper name of the first attribute, content, or singleton member - * @param proper2 the proper name of the second attribute, content, or singleton member + * @param proper1 the proper name of the first attribute, content, or singleton member + * @param proper2 the proper name of the second attribute, content, or singleton member */ #define XMLOBJECTVALIDATOR_ONEOF(cname,proper1,proper2) \ if (!ptr->get##proper1() && !ptr->get##proper2()) \ @@ -1382,10 +1886,10 @@ /** * Validator code that checks for one of a pair of * required attributes, content, or singletons, but disallows both. - * + * * @param cname the name of the XMLObject specialization - * @param proper1 the proper name of the first attribute, content, or singleton member - * @param proper2 the proper name of the second attribute, content, or singleton member + * @param proper1 the proper name of the first attribute, content, or singleton member + * @param proper2 the proper name of the second attribute, content, or singleton member */ #define XMLOBJECTVALIDATOR_ONLYONEOF(cname,proper1,proper2) \ if ((!ptr->get##proper1() && !ptr->get##proper2()) || (ptr->get##proper1() && ptr->get##proper2())) \ @@ -1394,7 +1898,7 @@ /** * Validator code that checks for one of a set of three * required attributes, content, or singletons. - * + * * @param cname the name of the XMLObject specialization * @param proper1 the proper name of the first attribute, content, or singleton member * @param proper2 the proper name of the second attribute, content, or singleton member @@ -1407,7 +1911,7 @@ /** * Validator code that checks for one of a set of three * required attributes, content, or singletons but disallows more than one. - * + * * @param cname the name of the XMLObject specialization * @param proper1 the proper name of the first attribute, content, or singleton member * @param proper2 the proper name of the second attribute, content, or singleton member @@ -1415,11 +1919,11 @@ */ #define XMLOBJECTVALIDATOR_ONLYONEOF3(cname,proper1,proper2,proper3) \ int c##proper1##proper2##proper3=0; \ - if (ptr->get##proper1()!=NULL) \ + if (ptr->get##proper1()!=nullptr) \ c##proper1##proper2##proper3++; \ - if (ptr->get##proper2()!=NULL) \ + if (ptr->get##proper2()!=nullptr) \ c##proper1##proper2##proper3++; \ - if (ptr->get##proper3()!=NULL) \ + if (ptr->get##proper3()!=nullptr) \ c##proper1##proper2##proper3++; \ if (c##proper1##proper2##proper3 != 1) \ throw xmltooling::ValidationException(#cname" must have only one of "#proper1", "#proper2", or "#proper3".") @@ -1427,10 +1931,10 @@ /** * Validator code that checks a co-constraint (if one present, the other must be) * between a pair of attributes, content, or singletons. - * + * * @param cname the name of the XMLObject specialization - * @param proper1 the proper name of the first attribute, content, or singleton member - * @param proper2 the proper name of the second attribute, content, or singleton member + * @param proper1 the proper name of the first attribute, content, or singleton member + * @param proper2 the proper name of the second attribute, content, or singleton member */ #define XMLOBJECTVALIDATOR_NONEORBOTH(cname,proper1,proper2) \ if ((ptr->get##proper1() && !ptr->get##proper2()) || (!ptr->get##proper1() && ptr->get##proper2())) \ @@ -1438,9 +1942,9 @@ /** * Validator code that checks for a non-empty collection. - * + * * @param cname the name of the XMLObject specialization - * @param proper the proper name of the collection item + * @param proper the proper name of the collection item */ #define XMLOBJECTVALIDATOR_NONEMPTY(cname,proper) \ if (ptr->get##proper##s().empty()) \ @@ -1449,7 +1953,7 @@ /** * Declares/defines a Validator specialization that checks object type and * a non-empty simple content model. - * + * * @param linkage linkage specifier for the class * @param cname the name of the XMLObject specialization */ @@ -1470,7 +1974,7 @@ namespace xmltooling { * Template function for cloning a sequence of XMLObjects. * Invokes the clone() member on each element of the input sequence and adds the copy to * the output sequence. Order is preserved. - * + * * @param in input sequence to clone * @param out output sequence to copy cloned pointers into */ @@ -1490,14 +1994,14 @@ namespace xmltooling { { /** * Function operator to delete an object. - * + * * @param ptr object to delete */ void operator()(T* ptr) {delete ptr;} - + /** * Function operator to delete an object stored as const. - * + * * @param ptr object to delete after casting away const */ void operator()(const T* ptr) {delete const_cast(ptr);} @@ -1510,7 +2014,7 @@ namespace xmltooling { { /** * Function operator to delete an object. - * + * * @param p a pair in which the second component is the object to delete */ void operator()(const std::pair& p) {delete p.second;} @@ -1523,7 +2027,7 @@ namespace xmltooling { { /** * Function operator to delete an object stored as const - * + * * @param p a pair in which the second component is the const object to delete */ void operator()(const std::pair& p) {delete const_cast(p.second);}