From 37df4c2f486ec0ff1f75b6f2a42453b77b0b4ad8 Mon Sep 17 00:00:00 2001 From: BlackMATov Date: Sat, 19 Oct 2019 00:12:57 +0700 Subject: [PATCH] update pugixml to 1.10 --- headers/3rdparty/pugixml/pugiconfig.hpp | 2 +- headers/3rdparty/pugixml/pugixml.cpp | 16 +++++++++++----- headers/3rdparty/pugixml/pugixml.hpp | 7 ++++--- modules/pugixml | 2 +- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/headers/3rdparty/pugixml/pugiconfig.hpp b/headers/3rdparty/pugixml/pugiconfig.hpp index ff897168..2fb69180 100644 --- a/headers/3rdparty/pugixml/pugiconfig.hpp +++ b/headers/3rdparty/pugixml/pugiconfig.hpp @@ -1,5 +1,5 @@ /** - * pugixml parser - version 1.9 + * pugixml parser - version 1.10 * -------------------------------------------------------- * Copyright (C) 2006-2019, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com) * Report bugs and download new versions at https://pugixml.org/ diff --git a/headers/3rdparty/pugixml/pugixml.cpp b/headers/3rdparty/pugixml/pugixml.cpp index 87e58fbe..90c48b21 100644 --- a/headers/3rdparty/pugixml/pugixml.cpp +++ b/headers/3rdparty/pugixml/pugixml.cpp @@ -1,5 +1,5 @@ /** - * pugixml parser - version 1.9 + * pugixml parser - version 1.10 * -------------------------------------------------------- * Copyright (C) 2006-2019, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com) * Report bugs and download new versions at https://pugixml.org/ @@ -1861,7 +1861,7 @@ PUGI__NS_BEGIN enum chartypex_t { ctx_special_pcdata = 1, // Any symbol >= 0 and < 32 (except \t, \r, \n), &, <, > - ctx_special_attr = 2, // Any symbol >= 0 and < 32, &, <, >, ", ' + ctx_special_attr = 2, // Any symbol >= 0 and < 32, &, <, ", ' ctx_start_symbol = 4, // Any symbol > 127, a-z, A-Z, _ ctx_digit = 8, // 0-9 ctx_symbol = 16 // Any symbol > 127, a-z, A-Z, 0-9, _, -, . @@ -1872,7 +1872,7 @@ PUGI__NS_BEGIN 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 3, 3, 2, 3, 3, // 0-15 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 16-31 0, 0, 2, 0, 0, 0, 3, 2, 0, 0, 0, 0, 0, 16, 16, 0, // 32-47 - 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 0, 0, 3, 0, 3, 0, // 48-63 + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 0, 0, 3, 0, 1, 0, // 48-63 0, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, // 64-79 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 0, 0, 0, 0, 20, // 80-95 @@ -3930,11 +3930,17 @@ PUGI__NS_BEGIN ++s; break; case '"': - writer.write('&', 'q', 'u', 'o', 't', ';'); + if (flags & format_attribute_single_quote) + writer.write('"'); + else + writer.write('&', 'q', 'u', 'o', 't', ';'); ++s; break; case '\'': - writer.write('&', 'a', 'p', 'o', 's', ';'); + if (flags & format_attribute_single_quote) + writer.write('&', 'a', 'p', 'o', 's', ';'); + else + writer.write('\''); ++s; break; default: // s is not a usual symbol diff --git a/headers/3rdparty/pugixml/pugixml.hpp b/headers/3rdparty/pugixml/pugixml.hpp index 972f8a35..da8ff36c 100644 --- a/headers/3rdparty/pugixml/pugixml.hpp +++ b/headers/3rdparty/pugixml/pugixml.hpp @@ -1,5 +1,5 @@ /** - * pugixml parser - version 1.9 + * pugixml parser - version 1.10 * -------------------------------------------------------- * Copyright (C) 2006-2019, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com) * Report bugs and download new versions at https://pugixml.org/ @@ -12,8 +12,9 @@ */ #ifndef PUGIXML_VERSION -// Define version macro; evaluates to major * 100 + minor * 10 + patch so that it's safe to use in less-than comparisons -# define PUGIXML_VERSION 190 +// Define version macro; evaluates to major * 1000 + minor * 10 + patch so that it's safe to use in less-than comparisons +// Note: pugixml used major * 100 + minor * 10 + patch format up until 1.9 (which had version identifier 190); starting from pugixml 1.10, the minor version number is two digits +# define PUGIXML_VERSION 1100 #endif // Include user configuration file (this can define various configuration macros) diff --git a/modules/pugixml b/modules/pugixml index fdf02957..3c59df55 160000 --- a/modules/pugixml +++ b/modules/pugixml @@ -1 +1 @@ -Subproject commit fdf02957533645069bbea7cd2ed85a3014b42cf3 +Subproject commit 3c59df555b93a7650ae0056da34bacde93f4ef8f