[0.1.1] Add Comments Support

Author: gmitch215

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16)
 
 project(levelz-cpp 
     LANGUAGES C CXX 
-    VERSION 0.1.0 
+    VERSION 0.1.1
     DESCRIPTION "C/C++ implementation of the LevelZ File Format"
     HOMEPAGE_URL "https://github.com/LevelZ-File/cpp-bindings"
 )

include/levelz.h

@@ -1,6 +1,7 @@
 #include <string>
 #include <vector>
 #include <fstream>
+#include <sstream>
 #include <cstdio>
 #include <unordered_map>
 #include <algorithm>
@@ -249,14 +250,19 @@ namespace LevelZ {
 
         std::vector<LevelObject> blocks;
         for (std::string& line : parts[1]) {
+            if (line[0] == '#') continue;
             if (line == END) break;
 
+            int ci = line.find('#');
+            std::string line0 = ci == std::string::npos ? line : line.substr(0, ci);
+            line0.erase(line0.find_last_not_of(" \n\r\t") + 1);
+
             if (is2D) {
-                std::pair<Block, std::vector<Coordinate2D>> pair = read2DLine(line);
+                std::pair<Block, std::vector<Coordinate2D>> pair = read2DLine(line0);
                 for (Coordinate2D& point : pair.second)
                     blocks.push_back(LevelObject(pair.first, point));
             } else {
-                std::pair<Block, std::vector<Coordinate3D>> pair = read3DLine(line);
+                std::pair<Block, std::vector<Coordinate3D>> pair = read3DLine(line0);
                 for (Coordinate3D& point : pair.second)
                     blocks.push_back(LevelObject(pair.first, point));
             }

test/src/level.cpp

@@ -19,17 +19,32 @@ int main() {
 
     // File Parsing
     std::vector<std::string> l4v = {
-        "@type 2",
-        "@scroll horizontal-right",
-        "@spawn [-2, 4]",
-        "---",
-        "grass: [0, 0]",
-        "stone: [0, 1]*[0, 2]"
+            "@type 2",
+            "@scroll horizontal-right",
+            "@spawn [-2, 4]",
+            "---",
+            "grass: [0, 0]",
+            "stone: [0, 1]*[0, 2]"
     };
     Level2D l4 = static_cast<Level2D>(LevelZ::parseLines(l4v));
     r |= assert(l4.scroll() == Scroll::HORIZONTAL_RIGHT);
     r |= assert(l4.spawn == Coordinate2D(-2, 4));
     r |= assert(l4.blocks().size() == 3);
 
+    std::vector<std::string> l5v = {
+            "@type 2",
+            "@spawn [-10, 4]",
+            "@scroll none",
+            "---",
+            "grass<type=1>: [0, 0]*[0, 1] # Comment 1",
+            "stone<cracked=false>: [-1, 1]*[0, 2] # Comment 2",
+            "end",
+            "Some Comment Here"
+    };
+    Level2D l5 = static_cast<Level2D>(LevelZ::parseLines(l5v));
+    r |= assert(l5.scroll() == Scroll::NONE);
+    r |= assert(l5.spawn == Coordinate2D(-10, 4));
+    r |= assert(l5.blocks().size() == 4);
+
     return r;
 }