Merge pull request #242 from bbbgan/master

fix parse comment[xml]
qicosmos · Apr 26, 2024 · 5d848f9 · 5d848f9
2 parents d545d69 + 8b3c02e
commit 5d848f9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/iguana/xml_reader.hpp b/iguana/xml_reader.hpp
@@ -235,7 +235,10 @@ IGUANA_INLINE auto skip_till_key(T &value, It &&it, It &&end) {
     else if (*it == '?')
       IGUANA_UNLIKELY {
         // <? ... ?>
-        skip_till<'>'>(it, end);
+        while (*(it - 1) != '?') {
+          ++it;
+          skip_till<'>'>(it, end);
+        }
         ++it;
         skip_sapces_and_newline(it, end);
         continue;
@@ -275,8 +278,17 @@ IGUANA_INLINE auto skip_till_key(T &value, It &&it, It &&end) {
             continue;
           }
         }
-        else {
+        else if (*it == '-') {
           // <!-- -->
+          while (*(it - 1) != '-' || *(it - 2) != '-') {
+            ++it;
+            skip_till<'>'>(it, end);
+          }
+          ++it;
+          skip_sapces_and_newline(it, end);
+          continue;
+        }
+        else {
           // <!D
           skip_till<'>'>(it, end);
           ++it;

diff --git a/test/test_xml.cpp b/test/test_xml.cpp
@@ -373,6 +373,8 @@ TEST_CASE("test example cdata") {
       </description>
       <!DOCTYPE test node>
       <?myapp instruction?>
+      <!-- <price>3.25</price> -->
+      <!-- <price a="b"/> -->
       <![CDATA[<p>this is a  cdata node</p>]]>
     </node_t>
   )";