lib: add escaping errors

# hyprlang noerror true fixes #39
hyprwm · Apr 14, 2024 · de5ca2f · de5ca2f
1 parent c140261
commit de5ca2f
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/src/config.cpp b/src/config.cpp
@@ -9,6 +9,8 @@
 #include <sstream>
 #include <cstring>
 
+#include "VarList.hpp"
+
 using namespace Hyprlang;
 
 #ifdef __APPLE__
@@ -510,15 +512,29 @@ CParseResult CConfig::parseVariable(const std::string& lhs, const std::string& r
     return result;
 }
 
+void CConfigImpl::parseComment(const std::string& comment) {
+    const auto COMMENT = removeBeginEndSpacesTabs(comment);
+
+    if (!COMMENT.starts_with("hyprlang"))
+        return;
+
+    CVarList args(COMMENT, 0, 's', true);
+
+    if (args[1] == "noerror")
+        currentFlags.noError = args[2] == "true" || args[2] == "yes" || args[2] == "enable" || args[2] == "enabled" || args[2] == "set";
+}
+
 CParseResult CConfig::parseLine(std::string line, bool dynamic) {
     CParseResult result;
 
     line = removeBeginEndSpacesTabs(line);
 
     auto commentPos = line.find('#');
 
-    if (commentPos == 0)
+    if (commentPos == 0) {
+        impl->parseComment(line.substr(1));
         return result;
+    }
 
     size_t lastHashPos = 0;
 
@@ -737,7 +753,7 @@ CParseResult CConfig::parseFile(const char* file) {
 
         const auto RET = parseLine(line);
 
-        if (RET.error && (impl->parseError.empty() || impl->configOptions.throwAllErrors)) {
+        if (!impl->currentFlags.noError && RET.error && (impl->parseError.empty() || impl->configOptions.throwAllErrors)) {
             if (!impl->parseError.empty())
                 impl->parseError += "\n";
             impl->parseError += std::format("Config error in file {} at line {}: {}", file, linenum, RET.errorStdString);

diff --git a/src/config.hpp b/src/config.hpp
@@ -87,4 +87,10 @@ class CConfigImpl {
     std::string                                              parseError = "";
 
     Hyprlang::SConfigOptions                                 configOptions;
+
+    void parseComment(const std::string& comment);
+
+    struct {
+        bool noError = false;
+    } currentFlags;
 };
diff --git a/tests/config/config.conf b/tests/config/config.conf
@@ -22,6 +22,12 @@ customType = abc
 
 testStringColon = ee:ee:ee
 
+# hyprlang noerror true
+
+errorVariable = true
+
+# hyprlang noerror false
+
 testCategory {
     testValueInt = 123456
     testValueHex = 0xF