diff --git a/CMakeSettings.json b/CMakeSettings.json index 9204f06..944b567 100644 --- a/CMakeSettings.json +++ b/CMakeSettings.json @@ -4,7 +4,7 @@ "name": "x64-Debug", "generator": "Ninja", "configurationType": "Debug", - "inheritEnvironments": [ "msvc_x64_x64" ], + "inheritEnvironments": [ "clang_cl_x64_x64" ], "buildRoot": "${projectDir}\\out\\build\\${name}", "installRoot": "${projectDir}\\out\\install\\${name}", "cmakeCommandArgs": "", diff --git a/NouVeL/NVL.cpp b/NouVeL/NVL.cpp index 8a5ef35..ab52be6 100644 --- a/NouVeL/NVL.cpp +++ b/NouVeL/NVL.cpp @@ -111,8 +111,6 @@ namespace NVL Context this_context = parent_context; this_context.Scope_Hierarchy.push_back(this_object); - char start = nvl.peek(); - nvl >> std::ws; std::streampos end; // unused if object is not scoped @@ -204,7 +202,7 @@ namespace NVL parse_Object(this_context, nvl); - while (nvl.peek() != '!n' && nvl.peek() != '}') + while (nvl.peek() != '\n' && nvl.peek() != '}') { parse_Object(this_context, nvl); } diff --git a/NouVeL/NouVeL.cpp b/NouVeL/NouVeL.cpp index 877aab9..3e5767a 100644 --- a/NouVeL/NouVeL.cpp +++ b/NouVeL/NouVeL.cpp @@ -1,12 +1,12 @@ #include "NVL.h" + int main() { const std::string PJ_DIR = "E:\\Archive\\Projects\\NouVeL\\"; NVL::Tree tree; - NVL::parse_NVL(tree, PJ_DIR + "test.nvl"); - + NVL::parse_NVL(tree, PJ_DIR + "test_j.nvl"); tree.Print(0); return 0; diff --git a/test.nvl b/test.nvl index 11ec514..7a75b28 100644 --- a/test.nvl +++ b/test.nvl @@ -1,3 +1,3 @@ mmawesome { - lmao [gkepokge hee hee [2323.4 535 3434]] + lmao [gkeposkge hee hee [2323.4 535 3434]] } diff --git a/test_j.nvl b/test_j.nvl new file mode 100644 index 0000000..fd369ae --- /dev/null +++ b/test_j.nvl @@ -0,0 +1,3 @@ +mmawesome { + lmao [gkedddadadだsdadge hee hee [2323.4 535 3434]] +}