lib/inlineNode.cpp

@@ -23,5 +23,3 @@ string BoldItalicNode::ToHtml() const {
 }
 
 string CodeNode::ToHtml() const { return "<code>" + this->content + "</code>"; }
-
-string RawTextNode::ToHtml() const { return this->content; };

lib/inlineNode.h

@@ -117,17 +117,4 @@ public:
   std::string ToHtml() const;
 };
 
-/**
- * @desc A raw text node.
- *
- * This node returns only it content, with no formatting at all.
- *
- * @author Hayden Hargreaves (hhargreaves2006@gmail.com)
- */
-class RawTextNode : public InlineNode {
-public:
-  RawTextNode(std::string content) : InlineNode(content) {};
-  std::string ToHtml() const;
-};
-
 #endif

lib/parser.cpp

@@ -4,7 +4,6 @@
 #include "structureNode.h"
 #include <algorithm>
 #include <cctype>
-#include <iostream>
 #include <memory>
 #include <string>
 
@@ -77,35 +76,11 @@ std::unique_ptr<Node> Parser::ParseBlock() {
   // std::unique_ptr<Node> block = std::make_unique<TextNode>(ch);
   // Consume();
 
-  char c = Peek();
+  if (Peek() == '#') {
-  char c_next = Peek(1);
-
-  // 1. Parse heading
-  if (c == '#') {
     return ParseHeading();
   }
 
-  // 2. Parser unordered list
+  // this is the default case
-  if (c == '*' || c == '-' || c == '+') {
-    // Next character must be space or tab
-    if (c_next == ' ' || c_next == '\t') {
-      return ParseList(false);
-    }
-  }
-
-  // 3. Parse ordered list
-  // TODO: This only checks a single digit, should check for 'n' digits
-  if (std::isdigit(c) && c_next == '.') {
-    // TODO: Do we need to check for white space?
-    return ParseList(true);
-  }
-
-  // 4. Parse code block
-  if (c == '`' && c_next == '`' && Peek(2) == '`') {
-    return ParseCodeBlock();
-  }
-
-  // 5. Parser paragraph
   return ParseParagraph();
 }
 
@@ -149,75 +124,6 @@ std::unique_ptr<Node> Parser::ParseHeading() {
   return node;
 }
 
-std::unique_ptr<Node> Parser::ParseList(bool ordered) {
-  auto node = std::make_unique<ListNode>(ordered);
-
-  // Consume the required white space and list char ('* ' or '1.')
-  while (true) {
-
-    Consume(ordered ? 2 : 1);
-    ConsumeWhiteSpace();
-
-    // Parse until either '\n\n' (exit) or the next list element is found ('* '
-    // or '1.') If '\n\n', then create a node and exit
-    auto children = ParseInlineListContent();
-    for (auto &child : children) {
-      node->AddChild(std::move(child));
-    }
-
-    char c = Peek();
-    char c_next = Peek(1);
-
-    // 2. Parser unordered list
-    if (c == '*' || c == '-' || c == '+') {
-      if (c_next == ' ' || c_next == '\t') {
-        continue;
-      }
-    }
-
-    // 3. Parse ordered list
-    // TODO: This only checks a single digit, should check for 'n' digits
-    if (std::isdigit(c) && c_next == '.') {
-      continue;
-    }
-
-    break;
-  }
-
-  return node;
-};
-
-std::unique_ptr<Node> Parser::ParseCodeBlock() {
-  auto node = std::make_unique<CodeBlockNode>();
-  string str;
-
-  // Remove the first three characters, the '```'
-  Consume(3);
-
-  // Parse text into a single text node until '```' is found, include everything
-  // else
-  while (!IsEOF()) {
-    char c = Peek();
-    if (c == '`' && Peek(1) == '`' && Peek(2) == '`') {
-      Consume(3);
-      break;
-    }
-
-    // Swap any '\n' with BR tags, so it will visually break
-    if (c == '\n')
-      str += "\n<br>\n";
-    else
-      str += c;
-
-    Consume();
-  }
-
-  auto text_node = std::make_unique<RawTextNode>(str);
-  node->AddChild(std::move(text_node));
-
-  return node;
-}
-
 vector<std::unique_ptr<Node>> Parser::ParseInline() {
   vector<std::unique_ptr<Node>> nodes;
   string str;
@@ -315,63 +221,6 @@ vector<std::unique_ptr<Node>> Parser::ParseInlineHeading() {
   return nodes;
 }
 
-vector<std::unique_ptr<Node>> Parser::ParseInlineListContent() {
-  vector<std::unique_ptr<Node>> nodes;
-  string str;
-
-  while (!IsEOF()) {
-    char c = Peek();
-    char c_next = Peek(1);
-    // If this char and next char are both newlines: then we have an empty line,
-    // we should stop.
-    if (c == '\n' && Peek(1) == '\n')
-      break;
-
-    // Check if a list block has been found
-    if ((c == '*' || c == '-' || c == '+') && (c_next == ' ' || c_next == '\t'))
-      break;
-
-    if (std::isdigit(c) && c_next == '.')
-      break;
-
-    if (c == '*' && Peek(1) == '*' && Peek(2) == '*') {
-      PushTextNode(nodes, str);
-      auto node = ParseBoldItalic();
-      if (!node->IsEmpty())
-        nodes.push_back(std::move(node));
-      continue;
-    } else if (c == '*' && Peek(1) == '*') {
-      PushTextNode(nodes, str);
-      auto node = ParseBold();
-      if (!node->IsEmpty())
-        nodes.push_back(std::move(node));
-      continue;
-    } else if (c == '*') {
-      PushTextNode(nodes, str);
-      auto node = ParseItalic();
-      if (!node->IsEmpty())
-        nodes.push_back(std::move(node));
-      continue;
-    }
-
-    if (c == '`') {
-      PushTextNode(nodes, str);
-      auto node = ParseCode();
-      if (!node->IsEmpty())
-        nodes.push_back(std::move(node));
-      continue;
-    }
-
-    // If a newline, use a space instead
-    str += (c == '\n' ? ' ' : c);
-    Consume();
-  }
-
-  // Push the last node, if the string is not empty
-  PushTextNode(nodes, str);
-  return nodes;
-}
-
 std::unique_ptr<Node> Parser::ParseItalic() {
   string str;
   Consume(1);

lib/parser.h

@@ -121,13 +121,10 @@ private:
 
   std::unique_ptr<Node> ParseParagraph();
   std::unique_ptr<Node> ParseHeading();
-  std::unique_ptr<Node> ParseList(bool ordered);
-  std::unique_ptr<Node> ParseCodeBlock();
   vector<std::unique_ptr<Node>> ParseInline();
 
-  // The only differences are the exit condition
+  // The only difference is the exit condition
   vector<std::unique_ptr<Node>> ParseInlineHeading();
-  vector<std::unique_ptr<Node>> ParseInlineListContent();
 
   void PushTextNode(vector<std::unique_ptr<Node>> &nodes, string &str);
 

lib/structureNode.cpp

@@ -55,28 +55,11 @@ string ParagraphNode::ToHtml() const {
   return ss.str();
 }
 
+// TODO: Implement
 string ListNode::ToHtml() const {
   std::stringstream ss;
+  ss << (this->ordered ? "<ol>NOT YET IMPLEMENTED</ol>"
+                       : "<ul>NOT YET IMPLEMENTED</ul>");
 
-  ss << (this->ordered ? "<ol>" : "<ul>") << "\n";
-
-  for (const auto &child : this->GetChilren()) {
-    ss << "<li>" << child->ToHtml() << "</li>" << "\n";
-  }
-
-  ss << (this->ordered ? "</ol>" : "</ul>") << "\n";
-  return ss.str();
-}
-
-string CodeBlockNode::ToHtml() const {
-  std::stringstream ss;
-
-  ss << "<code>\n";
-
-  for (const auto &child : this->GetChilren()) {
-    ss << child->ToHtml() << "\n";
-  }
-
-  ss << "</code>\n";
   return ss.str();
 }

lib/structureNode.h

@@ -111,19 +111,4 @@ public:
   std::string ToHtml() const;
 };
 
-/**
- * @desc A code block container node.
- *
- * This node is used to wrap a code block node. When three '`' are used a
- * code block should be created. This node's children are expected to be simple
- * text nodes - containing no formatting at all. Since code blocks are not
- * parsed any deeper then their parents.
- *
- * @author Hayden Hargreaves (hhargreaves2006@gmail.com)
- */
-class CodeBlockNode : public StructureNode {
-public:
-  std::string ToHtml() const;
-};
-
 #endif