diff options
Diffstat (limited to 'libxsd/xsd/cxx/parser')
45 files changed, 15 insertions, 48 deletions
diff --git a/libxsd/xsd/cxx/parser/document.hxx b/libxsd/xsd/cxx/parser/document.hxx index c493edc..7c136c0 100644 --- a/libxsd/xsd/cxx/parser/document.hxx +++ b/libxsd/xsd/cxx/parser/document.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/document.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_PARSER_DOCUMENT_HXX diff --git a/libxsd/xsd/cxx/parser/document.txx b/libxsd/xsd/cxx/parser/document.txx index aa2b75c..cee73b1 100644 --- a/libxsd/xsd/cxx/parser/document.txx +++ b/libxsd/xsd/cxx/parser/document.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/document.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <cassert> diff --git a/libxsd/xsd/cxx/parser/elements.hxx b/libxsd/xsd/cxx/parser/elements.hxx index c116f68..baf180f 100644 --- a/libxsd/xsd/cxx/parser/elements.hxx +++ b/libxsd/xsd/cxx/parser/elements.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/elements.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_PARSER_ELEMENTS_HXX diff --git a/libxsd/xsd/cxx/parser/elements.txx b/libxsd/xsd/cxx/parser/elements.txx index c85a2ba..aa0b979 100644 --- a/libxsd/xsd/cxx/parser/elements.txx +++ b/libxsd/xsd/cxx/parser/elements.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/elements.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file namespace xsd diff --git a/libxsd/xsd/cxx/parser/error-handler.hxx b/libxsd/xsd/cxx/parser/error-handler.hxx index 794eede..b0a04ff 100644 --- a/libxsd/xsd/cxx/parser/error-handler.hxx +++ b/libxsd/xsd/cxx/parser/error-handler.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/error-handler.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_PARSER_ERROR_HANDLER_HXX diff --git a/libxsd/xsd/cxx/parser/error-handler.txx b/libxsd/xsd/cxx/parser/error-handler.txx index 00756d1..5d3e50f 100644 --- a/libxsd/xsd/cxx/parser/error-handler.txx +++ b/libxsd/xsd/cxx/parser/error-handler.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/error-handler.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file namespace xsd diff --git a/libxsd/xsd/cxx/parser/exceptions.hxx b/libxsd/xsd/cxx/parser/exceptions.hxx index 0df9584..acb613f 100644 --- a/libxsd/xsd/cxx/parser/exceptions.hxx +++ b/libxsd/xsd/cxx/parser/exceptions.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/exceptions.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_PARSER_EXCEPTIONS_HXX diff --git a/libxsd/xsd/cxx/parser/exceptions.ixx b/libxsd/xsd/cxx/parser/exceptions.ixx index 27b62e5..08859b1 100644 --- a/libxsd/xsd/cxx/parser/exceptions.ixx +++ b/libxsd/xsd/cxx/parser/exceptions.ixx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/exceptions.ixx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #if defined(XSD_CXX_PARSER_USE_CHAR) || !defined(XSD_CXX_PARSER_USE_WCHAR) diff --git a/libxsd/xsd/cxx/parser/exceptions.txx b/libxsd/xsd/cxx/parser/exceptions.txx index 1d32a03..5d94f95 100644 --- a/libxsd/xsd/cxx/parser/exceptions.txx +++ b/libxsd/xsd/cxx/parser/exceptions.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/exceptions.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file namespace xsd diff --git a/libxsd/xsd/cxx/parser/expat/elements.hxx b/libxsd/xsd/cxx/parser/expat/elements.hxx index 284be5c..bd0b84c 100644 --- a/libxsd/xsd/cxx/parser/expat/elements.hxx +++ b/libxsd/xsd/cxx/parser/expat/elements.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/expat/elements.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_PARSER_EXPAT_ELEMENTS_HXX @@ -87,6 +86,12 @@ namespace xsd return parser_; } + void + reset (XML_Parser parser) + { + *this = parser; + } + private: parser_auto_ptr (const parser_auto_ptr&); diff --git a/libxsd/xsd/cxx/parser/expat/elements.txx b/libxsd/xsd/cxx/parser/expat/elements.txx index 11ea281..803c53c 100644 --- a/libxsd/xsd/cxx/parser/expat/elements.txx +++ b/libxsd/xsd/cxx/parser/expat/elements.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/expat/elements.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <new> // std::bad_alloc @@ -313,7 +312,7 @@ namespace xsd if (XML_Parse (parser.get (), buf, - is.gcount (), + static_cast<int> (is.gcount ()), is.eof ()) == XML_STATUS_ERROR) { r = false; @@ -338,7 +337,8 @@ namespace xsd // if (auto_xml_parser_.get () == 0) { - auto_xml_parser_ = XML_ParserCreateNS (0, XML_Char (' ')); + auto_xml_parser_.reset ( + XML_ParserCreateNS (0, XML_Char (' '))); if (auto_xml_parser_.get () == 0) throw std::bad_alloc (); diff --git a/libxsd/xsd/cxx/parser/map.hxx b/libxsd/xsd/cxx/parser/map.hxx index f0abd7e..3394c40 100644 --- a/libxsd/xsd/cxx/parser/map.hxx +++ b/libxsd/xsd/cxx/parser/map.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/map.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_PARSER_MAP_HXX diff --git a/libxsd/xsd/cxx/parser/map.ixx b/libxsd/xsd/cxx/parser/map.ixx index 8e48696..c885be0 100644 --- a/libxsd/xsd/cxx/parser/map.ixx +++ b/libxsd/xsd/cxx/parser/map.ixx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/map.ixx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file namespace xsd diff --git a/libxsd/xsd/cxx/parser/map.txx b/libxsd/xsd/cxx/parser/map.txx index ca55230..3c1433e 100644 --- a/libxsd/xsd/cxx/parser/map.txx +++ b/libxsd/xsd/cxx/parser/map.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/map.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file namespace xsd diff --git a/libxsd/xsd/cxx/parser/non-validating/parser.hxx b/libxsd/xsd/cxx/parser/non-validating/parser.hxx index 754c4ac..79b11d9 100644 --- a/libxsd/xsd/cxx/parser/non-validating/parser.hxx +++ b/libxsd/xsd/cxx/parser/non-validating/parser.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/non-validating/parser.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_PARSER_NON_VALIDATING_PARSER_HXX diff --git a/libxsd/xsd/cxx/parser/non-validating/parser.txx b/libxsd/xsd/cxx/parser/non-validating/parser.txx index 95c4e11..eed2756 100644 --- a/libxsd/xsd/cxx/parser/non-validating/parser.txx +++ b/libxsd/xsd/cxx/parser/non-validating/parser.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/non-validating/parser.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <cassert> diff --git a/libxsd/xsd/cxx/parser/non-validating/xml-schema-pimpl.hxx b/libxsd/xsd/cxx/parser/non-validating/xml-schema-pimpl.hxx index 14111a3..0ce04cc 100644 --- a/libxsd/xsd/cxx/parser/non-validating/xml-schema-pimpl.hxx +++ b/libxsd/xsd/cxx/parser/non-validating/xml-schema-pimpl.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/non-validating/xml-schema-pimpl.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_PARSER_NON_VALIDATING_XML_SCHEMA_PIMPL_HXX diff --git a/libxsd/xsd/cxx/parser/non-validating/xml-schema-pimpl.ixx b/libxsd/xsd/cxx/parser/non-validating/xml-schema-pimpl.ixx index 5f295d2..6082654 100644 --- a/libxsd/xsd/cxx/parser/non-validating/xml-schema-pimpl.ixx +++ b/libxsd/xsd/cxx/parser/non-validating/xml-schema-pimpl.ixx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/non-validating/xml-schema-pimpl.ixx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #if defined(XSD_CXX_PARSER_USE_CHAR) || !defined(XSD_CXX_PARSER_USE_WCHAR) diff --git a/libxsd/xsd/cxx/parser/non-validating/xml-schema-pimpl.txx b/libxsd/xsd/cxx/parser/non-validating/xml-schema-pimpl.txx index 6e695a9..9f56f7f 100644 --- a/libxsd/xsd/cxx/parser/non-validating/xml-schema-pimpl.txx +++ b/libxsd/xsd/cxx/parser/non-validating/xml-schema-pimpl.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/non-validating/xml-schema-pimpl.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <limits> diff --git a/libxsd/xsd/cxx/parser/non-validating/xml-schema-pskel.hxx b/libxsd/xsd/cxx/parser/non-validating/xml-schema-pskel.hxx index 54acbbe..cac9d27 100644 --- a/libxsd/xsd/cxx/parser/non-validating/xml-schema-pskel.hxx +++ b/libxsd/xsd/cxx/parser/non-validating/xml-schema-pskel.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/non-validating/xml-schema-pskel.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_PARSER_NON_VALIDATING_XML_SCHEMA_PSKEL_HXX diff --git a/libxsd/xsd/cxx/parser/non-validating/xml-schema-pskel.ixx b/libxsd/xsd/cxx/parser/non-validating/xml-schema-pskel.ixx index 19d35d6..e6db6cb 100644 --- a/libxsd/xsd/cxx/parser/non-validating/xml-schema-pskel.ixx +++ b/libxsd/xsd/cxx/parser/non-validating/xml-schema-pskel.ixx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/non-validating/xml-schema-pskel.ixx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #if defined(XSD_CXX_PARSER_USE_CHAR) || !defined(XSD_CXX_PARSER_USE_WCHAR) diff --git a/libxsd/xsd/cxx/parser/non-validating/xml-schema-pskel.txx b/libxsd/xsd/cxx/parser/non-validating/xml-schema-pskel.txx index 37ea650..fb166d0 100644 --- a/libxsd/xsd/cxx/parser/non-validating/xml-schema-pskel.txx +++ b/libxsd/xsd/cxx/parser/non-validating/xml-schema-pskel.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/non-validating/xml-schema-pskel.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file namespace xsd diff --git a/libxsd/xsd/cxx/parser/schema-exceptions.hxx b/libxsd/xsd/cxx/parser/schema-exceptions.hxx index f6bfdd4..6145167 100644 --- a/libxsd/xsd/cxx/parser/schema-exceptions.hxx +++ b/libxsd/xsd/cxx/parser/schema-exceptions.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/schema-exceptions.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_PARSER_SCHEMA_EXCEPTIONS_HXX diff --git a/libxsd/xsd/cxx/parser/schema-exceptions.ixx b/libxsd/xsd/cxx/parser/schema-exceptions.ixx index e13b1d1..fdf0e99 100644 --- a/libxsd/xsd/cxx/parser/schema-exceptions.ixx +++ b/libxsd/xsd/cxx/parser/schema-exceptions.ixx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/schema-exceptions.ixx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #if defined(XSD_CXX_PARSER_USE_CHAR) || !defined(XSD_CXX_PARSER_USE_WCHAR) diff --git a/libxsd/xsd/cxx/parser/schema-exceptions.txx b/libxsd/xsd/cxx/parser/schema-exceptions.txx index 0ae5a08..2e548ab 100644 --- a/libxsd/xsd/cxx/parser/schema-exceptions.txx +++ b/libxsd/xsd/cxx/parser/schema-exceptions.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/schema-exceptions.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file namespace xsd diff --git a/libxsd/xsd/cxx/parser/substitution-map.hxx b/libxsd/xsd/cxx/parser/substitution-map.hxx index bb9c3f8..07619b7 100644 --- a/libxsd/xsd/cxx/parser/substitution-map.hxx +++ b/libxsd/xsd/cxx/parser/substitution-map.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/substitution-map.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_PARSER_SUBSTITUTION_MAP_HXX diff --git a/libxsd/xsd/cxx/parser/substitution-map.txx b/libxsd/xsd/cxx/parser/substitution-map.txx index a9a7627..5e9e92d 100644 --- a/libxsd/xsd/cxx/parser/substitution-map.txx +++ b/libxsd/xsd/cxx/parser/substitution-map.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/substitution-map.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file namespace xsd diff --git a/libxsd/xsd/cxx/parser/validating/exceptions.hxx b/libxsd/xsd/cxx/parser/validating/exceptions.hxx index 111376d..2201a8b 100644 --- a/libxsd/xsd/cxx/parser/validating/exceptions.hxx +++ b/libxsd/xsd/cxx/parser/validating/exceptions.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/validating/exceptions.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_PARSER_VALIDATING_EXCEPTIONS_HXX diff --git a/libxsd/xsd/cxx/parser/validating/exceptions.ixx b/libxsd/xsd/cxx/parser/validating/exceptions.ixx index 1cb67b5..f46dcd1 100644 --- a/libxsd/xsd/cxx/parser/validating/exceptions.ixx +++ b/libxsd/xsd/cxx/parser/validating/exceptions.ixx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/validating/exceptions.ixx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #if defined(XSD_CXX_PARSER_USE_CHAR) || !defined(XSD_CXX_PARSER_USE_WCHAR) diff --git a/libxsd/xsd/cxx/parser/validating/exceptions.txx b/libxsd/xsd/cxx/parser/validating/exceptions.txx index 2a5016b..f6b39e8 100644 --- a/libxsd/xsd/cxx/parser/validating/exceptions.txx +++ b/libxsd/xsd/cxx/parser/validating/exceptions.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/validating/exceptions.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file namespace xsd diff --git a/libxsd/xsd/cxx/parser/validating/inheritance-map.hxx b/libxsd/xsd/cxx/parser/validating/inheritance-map.hxx index 5a8ce50..1b338ec 100644 --- a/libxsd/xsd/cxx/parser/validating/inheritance-map.hxx +++ b/libxsd/xsd/cxx/parser/validating/inheritance-map.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/validating/inheritance-map.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_PARSER_VALIDATING_INHERITANCE_MAP_HXX diff --git a/libxsd/xsd/cxx/parser/validating/inheritance-map.txx b/libxsd/xsd/cxx/parser/validating/inheritance-map.txx index 2490c07..f141d9e 100644 --- a/libxsd/xsd/cxx/parser/validating/inheritance-map.txx +++ b/libxsd/xsd/cxx/parser/validating/inheritance-map.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/validating/inheritance-map.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file namespace xsd diff --git a/libxsd/xsd/cxx/parser/validating/parser.hxx b/libxsd/xsd/cxx/parser/validating/parser.hxx index f3738b7..4ababce 100644 --- a/libxsd/xsd/cxx/parser/validating/parser.hxx +++ b/libxsd/xsd/cxx/parser/validating/parser.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/validating/parser.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_PARSER_VALIDATING_PARSER_HXX diff --git a/libxsd/xsd/cxx/parser/validating/parser.txx b/libxsd/xsd/cxx/parser/validating/parser.txx index 5cda58e..fa1d1c4 100644 --- a/libxsd/xsd/cxx/parser/validating/parser.txx +++ b/libxsd/xsd/cxx/parser/validating/parser.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/validating/parser.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <cassert> diff --git a/libxsd/xsd/cxx/parser/validating/xml-schema-pimpl.hxx b/libxsd/xsd/cxx/parser/validating/xml-schema-pimpl.hxx index 67cf4cf..5f9133a 100644 --- a/libxsd/xsd/cxx/parser/validating/xml-schema-pimpl.hxx +++ b/libxsd/xsd/cxx/parser/validating/xml-schema-pimpl.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/validating/xml-schema-pimpl.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_PARSER_VALIDATING_XML_SCHEMA_PIMPL_HXX diff --git a/libxsd/xsd/cxx/parser/validating/xml-schema-pimpl.ixx b/libxsd/xsd/cxx/parser/validating/xml-schema-pimpl.ixx index fcfcf07..5875b57 100644 --- a/libxsd/xsd/cxx/parser/validating/xml-schema-pimpl.ixx +++ b/libxsd/xsd/cxx/parser/validating/xml-schema-pimpl.ixx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/validating/xml-schema-pimpl.ixx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #if defined(XSD_CXX_PARSER_USE_CHAR) || !defined(XSD_CXX_PARSER_USE_WCHAR) diff --git a/libxsd/xsd/cxx/parser/validating/xml-schema-pimpl.txx b/libxsd/xsd/cxx/parser/validating/xml-schema-pimpl.txx index 1624f8c..7bf2523 100644 --- a/libxsd/xsd/cxx/parser/validating/xml-schema-pimpl.txx +++ b/libxsd/xsd/cxx/parser/validating/xml-schema-pimpl.txx @@ -1,11 +1,11 @@ // file : xsd/cxx/parser/validating/xml-schema-pimpl.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <limits> #include <locale> #ifdef XSD_CXX11 +# include <cmath> // std::isfinite # include <utility> // std::move #endif @@ -717,9 +717,13 @@ namespace xsd zc_istream<C> is (str); is.imbue (std::locale::classic ()); - //@@ TODO: now we accept scientific notations and INF/NaN. + // Note that std::isfinite() returns false for INF/NaN. // +#ifdef XSD_CXX11 + if (!(is >> value_ && std::isfinite (value_) && is.exhausted ())) +#else if (!(is >> value_ && is.exhausted ())) +#endif throw invalid_value<C> (bits::decimal<C> (), str); } diff --git a/libxsd/xsd/cxx/parser/validating/xml-schema-pskel.hxx b/libxsd/xsd/cxx/parser/validating/xml-schema-pskel.hxx index d7ff8b9..1ad6528 100644 --- a/libxsd/xsd/cxx/parser/validating/xml-schema-pskel.hxx +++ b/libxsd/xsd/cxx/parser/validating/xml-schema-pskel.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/validating/xml-schema-pskel.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_PARSER_VALIDATING_XML_SCHEMA_PSKEL_HXX diff --git a/libxsd/xsd/cxx/parser/validating/xml-schema-pskel.ixx b/libxsd/xsd/cxx/parser/validating/xml-schema-pskel.ixx index 11b9fcd..7133a6c 100644 --- a/libxsd/xsd/cxx/parser/validating/xml-schema-pskel.ixx +++ b/libxsd/xsd/cxx/parser/validating/xml-schema-pskel.ixx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/validating/xml-schema-pskel.ixx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #if defined(XSD_CXX_PARSER_USE_CHAR) || !defined(XSD_CXX_PARSER_USE_WCHAR) diff --git a/libxsd/xsd/cxx/parser/validating/xml-schema-pskel.txx b/libxsd/xsd/cxx/parser/validating/xml-schema-pskel.txx index d92ebf8..eb2fe0d 100644 --- a/libxsd/xsd/cxx/parser/validating/xml-schema-pskel.txx +++ b/libxsd/xsd/cxx/parser/validating/xml-schema-pskel.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/validating/xml-schema-pskel.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file namespace xsd diff --git a/libxsd/xsd/cxx/parser/xerces/elements.hxx b/libxsd/xsd/cxx/parser/xerces/elements.hxx index 8a9c8a2..292b689 100644 --- a/libxsd/xsd/cxx/parser/xerces/elements.hxx +++ b/libxsd/xsd/cxx/parser/xerces/elements.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/xerces/elements.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_PARSER_XERCES_ELEMENTS_HXX diff --git a/libxsd/xsd/cxx/parser/xerces/elements.txx b/libxsd/xsd/cxx/parser/xerces/elements.txx index 6831609..a0a808f 100644 --- a/libxsd/xsd/cxx/parser/xerces/elements.txx +++ b/libxsd/xsd/cxx/parser/xerces/elements.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/xerces/elements.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <istream> diff --git a/libxsd/xsd/cxx/parser/xml-schema.hxx b/libxsd/xsd/cxx/parser/xml-schema.hxx index 916ccd1..be6c46e 100644 --- a/libxsd/xsd/cxx/parser/xml-schema.hxx +++ b/libxsd/xsd/cxx/parser/xml-schema.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/xml-schema.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_PARSER_XML_SCHEMA_HXX diff --git a/libxsd/xsd/cxx/parser/xml-schema.ixx b/libxsd/xsd/cxx/parser/xml-schema.ixx index d25bdb7..1989384 100644 --- a/libxsd/xsd/cxx/parser/xml-schema.ixx +++ b/libxsd/xsd/cxx/parser/xml-schema.ixx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/xml-schema.ixx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <new> // operator new/delete diff --git a/libxsd/xsd/cxx/parser/xml-schema.txx b/libxsd/xsd/cxx/parser/xml-schema.txx index b55bc9f..7ace2d7 100644 --- a/libxsd/xsd/cxx/parser/xml-schema.txx +++ b/libxsd/xsd/cxx/parser/xml-schema.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/xml-schema.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file namespace xsd |