Prevent alias substitution in strings

houmain · Jan 16, 2024 · 61c2661 · 61c2661
1 parent 1e1ab17
commit 61c2661
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 26 deletions.
diff --git a/src/config/ParseConfig.cpp b/src/config/ParseConfig.cpp
@@ -99,7 +99,7 @@ Config ParseConfig::operator()(std::istream& is) {
   return std::move(m_config);
 }
 
-void ParseConfig::error(std::string message) {
+void ParseConfig::error(std::string message) const {
   throw ParseError(std::move(message) +
     " in line " + std::to_string(m_line_no));
 }
@@ -164,7 +164,7 @@ std::string ParseConfig::read_filter_string(It* it, const It end) {
   }
   else if (skip(it, end, "'") || skip(it, end, "\"")) {
     // a string
-    const char mark[2] = { *(*it - 1), '\0' };
+    const char mark[2] = { *std::prev(*it), '\0' };
     if (!skip_until(it, end, mark))
       error("Unterminated string");
     return std::string(begin + 1, *it - 1);
@@ -402,24 +402,33 @@ std::string ParseConfig::preprocess(It it, const It end) const {
       // match read ident
       result.append(preprocess_ident(std::string(begin, it)));
     }
-    else {
+    else if (*it == '\'' || *it == '\"') {
+      // a string
+      const char mark[2] = { *it++, '\0' };
+      if (!skip_until(&it, end, mark))
+        error("Unterminated string");
+
       // interpret escape sequence
-      if (*it == '\\' && std::next(it) != end) {
-        const auto c = [&]() {
-          switch (*std::next(it)) {
-            case 'n': return '\n';
-            case 't': return '\t';
-            case '\\': return '\\';
-            default: return '\0';
-          }
-        }();
-        if (c) {
-          result.push_back(c); 
-          it += 2;
-          continue;
+      auto prev = char{ };
+      std::for_each(begin, it, [&](char c) {
+        if (prev == '\\') {
+          c = [&]() {
+            switch (c) {
+              case 'n': return '\n';
+              case 't': return '\t';
+            }
+            result.push_back('\\');
+            return c;
+          }();
+          prev = { };
         }
-      }
-
+        else {
+          prev = c;
+        }
+        result.push_back(c);
+      });
+    }
+    else {
       // output single character
       result.append(begin, ++it);
     }

diff --git a/src/config/ParseConfig.h b/src/config/ParseConfig.h
@@ -26,7 +26,7 @@ class ParseConfig {
 
   using It = std::string::const_iterator;
 
-  [[noreturn]] void error(std::string message);
+  [[noreturn]] void error(std::string message) const;
   void parse_line(It begin, It end);
   void parse_context(It* begin, It end);
   void parse_macro(std::string name, It begin, It end);

diff --git a/src/test/test1_ParseConfig.cpp b/src/test/test1_ParseConfig.cpp
@@ -376,8 +376,8 @@ TEST_CASE("Context macro", "[ParseConfig]") {
 TEST_CASE("Macros", "[ParseConfig]") {
   auto string = R"(
     MyMacro = A{B}
-    MyMacro >> C
-    C >> MyMacro
+    MyMacro >> C # MyMacro
+    C >> MyMacro   # MyMacro
   )";
   auto config = Config{ };
   REQUIRE_NOTHROW(config = parse_config(string));
@@ -390,9 +390,9 @@ TEST_CASE("Macros", "[ParseConfig]") {
   CHECK(format_sequence(config.contexts[0].outputs[1]) == "+A +B -B -A");
 
   string = R"(
-    Macro1 = F
-    Macro2 = E Macro1 G
-    Macro3 =
+    Macro1 = F   # >
+    Macro2 = E Macro1 G  # Macro1
+    Macro3 =     # -
     Macro1 A Macro2 Macro3 >> Macro3 Macro2 B Macro1
   )";
   REQUIRE_NOTHROW(config = parse_config(string));
@@ -402,6 +402,19 @@ TEST_CASE("Macros", "[ParseConfig]") {
   CHECK(format_sequence(config.contexts[0].inputs[0].input) == "+F ~F +A ~A +E ~E +F ~F +G ~G");
   CHECK(format_sequence(config.contexts[0].outputs[0]) == "+E -E +F -F +G -G +B -B +F -F");
 
+  // do not substitute in string
+  string = R"(
+    ab = E F
+    X >> ab 'ab' ab
+  )";
+  REQUIRE_NOTHROW(config = parse_config(string));
+  REQUIRE(config.contexts[0].inputs.size() == 1);
+  REQUIRE(config.contexts[0].outputs.size() == 1);
+  REQUIRE(config.contexts[0].command_outputs.size() == 0);
+  CHECK(format_sequence(config.contexts[0].inputs[0].input) == "+X ~X");
+  CHECK(format_sequence(config.contexts[0].outputs[0]) == 
+    "+E -E +F -F !MetaLeft !MetaRight !ShiftLeft !ShiftRight !AltLeft !AltRight !ControlLeft !ControlRight +A -A +B -B +E -E +F -F");
+
   // not allowed macro name
   string = R"(
     Space = Enter
@@ -512,13 +525,13 @@ TEST_CASE("Logical keys 2", "[ParseConfig]") {
 
 TEST_CASE("String escape sequence", "[ParseConfig]") {
   auto string = R"(
-    A >> 'n\n\tt'
+    A >> '\nnt\t'
   )";
 
   auto config = parse_config(string);
   REQUIRE(config.contexts.size() == 1);
   REQUIRE(config.contexts[0].outputs.size() == 1);
   REQUIRE(format_sequence(config.contexts[0].outputs[0]) == 
     "!MetaLeft !MetaRight !ShiftLeft !ShiftRight !AltLeft !AltRight !ControlLeft "
-    "!ControlRight +N -N +Enter -Enter +Tab -Tab +T -T");
+    "!ControlRight +Enter -Enter +N -N +T -T +Tab -Tab");
 }