use newer cmark node kind names

QuietMisdreavus · QuietMisdreavus · commit 57475013c9a4 · 2022-07-21T08:13:06.000-06:00
the older names were kept in the cmark header for compatibility, but
these are the ones that are actually defined in the main enum
diff --git a/lib/Markup/Markup.cpp b/lib/Markup/Markup.cpp
@@ -137,7 +137,7 @@ ParseResult<Strong> parseStrong(MarkupContext &MC, ParseState State) {
 }
 
 ParseResult<Header> parseHeader(MarkupContext &MC, ParseState State) {
-  assert(cmark_node_get_type(State.Node) == CMARK_NODE_HEADER
+  assert(cmark_node_get_type(State.Node) == CMARK_NODE_HEADING
       && State.Event == CMARK_EVENT_ENTER);
   auto Level = cmark_node_get_header_level(State.Node);
   SmallVector<MarkupASTNode *, 2> Children;
@@ -149,19 +149,19 @@ ParseResult<Header> parseHeader(MarkupContext &MC, ParseState State) {
 }
 
 ParseResult<HRule> parseHRule(MarkupContext &MC, ParseState State) {
-  assert(cmark_node_get_type(State.Node) == CMARK_NODE_HRULE
+  assert(cmark_node_get_type(State.Node) == CMARK_NODE_THEMATIC_BREAK
       && State.Event == CMARK_EVENT_ENTER);
   return { HRule::create(MC), State.next() };
 }
 
 ParseResult<HTML> parseHTML(MarkupContext &MC, ParseState State) {
-  assert(cmark_node_get_type(State.Node) == CMARK_NODE_HTML
+  assert(cmark_node_get_type(State.Node) == CMARK_NODE_HTML_BLOCK
       && State.Event == CMARK_EVENT_ENTER);
   return {HTML::create(MC, getLiteralContent(MC, State.Node)), State.next()};
 }
 
 ParseResult<InlineHTML> parseInlineHTML(MarkupContext &MC, ParseState State) {
-  assert(cmark_node_get_type(State.Node) == CMARK_NODE_INLINE_HTML
+  assert(cmark_node_get_type(State.Node) == CMARK_NODE_HTML_INLINE
       && State.Event == CMARK_EVENT_ENTER);
   return {InlineHTML::create(MC, getLiteralContent(MC, State.Node)),
           State.next()};
@@ -257,21 +257,18 @@ ParseResult<MarkupASTNode> parseElement(MarkupContext &MC, ParseState State) {
   case CMARK_NODE_EMPH: {
     return parseEmphasis(MC, State);
   }
-  case CMARK_NODE_HEADER: {
+  case CMARK_NODE_HEADING: {
     return parseHeader(MC, State);
   }
-  case CMARK_NODE_HRULE: {
-    return parseHRule(MC, State);
-  }
-  case CMARK_NODE_HTML: {
+  case CMARK_NODE_HTML_BLOCK: {
     return parseHTML(MC, State);
   }
+  case CMARK_NODE_HTML_INLINE: {
+    return parseInlineHTML(MC, State);
+  }
   case CMARK_NODE_IMAGE: {
     return parseImage(MC, State);
   }
-  case CMARK_NODE_INLINE_HTML: {
-    return parseInlineHTML(MC, State);
-  }
   case CMARK_NODE_ITEM: {
     return parseItem(MC, State);
   }
@@ -296,6 +293,9 @@ ParseResult<MarkupASTNode> parseElement(MarkupContext &MC, ParseState State) {
   case CMARK_NODE_TEXT: {
     return parseText(MC, State);
   }
+  case CMARK_NODE_THEMATIC_BREAK: {
+    return parseHRule(MC, State);
+  }
   default: {
     llvm_unreachable("Can't parse a Markup node of type 'None'");
   }
