Add alternative template syntax

psiberx · Aug 8, 2023 · 1fbec8b · 1fbec8b
1 parent 98cbf85
commit 1fbec8b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 10 deletions.
diff --git a/src/App/Project.hpp b/src/App/Project.hpp
@@ -12,5 +12,5 @@ constexpr auto Author = "psiberx";
 constexpr auto NameW = L"TweakXL";
 constexpr auto AuthorW = L"psiberx";
 
-constexpr auto Version = semver::from_string_noexcept("1.2.0").value();
+constexpr auto Version = semver::from_string_noexcept("1.2.1").value();
 }
diff --git a/src/App/Tweaks/Declarative/Yaml/YamlReader.Template.cpp b/src/App/Tweaks/Declarative/Yaml/YamlReader.Template.cpp
@@ -5,8 +5,8 @@ namespace
 constexpr auto InstanceAttrKey = "$instances";
 
 constexpr auto AttrMark = '$';
-constexpr auto AttrOpen = '{';
-constexpr auto AttrClose = '}';
+constexpr auto AttrOpen = "({";
+constexpr auto AttrClose = ")}";
 
 struct InstanceValue
 {
@@ -55,15 +55,24 @@ std::string FormatString(const std::string& aInput, const InstanceData& aData)
             break;
         }
 
-        if (*(attrOpen + 1) != AttrOpen)
+        int attCloseChr;
+        if (*(attrOpen + 1) == AttrOpen[0])
+        {
+            attCloseChr = AttrClose[0];
+        }
+        else if (*(attrOpen + 1) == AttrOpen[1])
+        {
+            attCloseChr = AttrClose[1];
+        }
+        else
         {
             *out = *str;
             ++out;
             ++str;
             continue;
         }
 
-        auto* attrClose = strchr(str, AttrClose);
+        auto* attrClose = strchr(str, attCloseChr);
 
         if (!attrClose)
         {

diff --git a/src/App/Version.rc b/src/App/Version.rc
@@ -1,9 +1,9 @@
-#define VER_PRODUCTVERSION     1,2,0,0
-#define VER_FILEVERSION        1,2,0,2308081605
+#define VER_PRODUCTVERSION     1,2,1,0
+#define VER_FILEVERSION        1,2,1,2308081607
 
 #define VER_PRODUCTNAME_STR    "TweakXL\0"
-#define VER_PRODUCTVERSION_STR "1.2.0\0"
-#define VER_FILEVERSION_STR    "1.2.0.2308081605\0"
+#define VER_PRODUCTVERSION_STR "1.2.1\0"
+#define VER_FILEVERSION_STR    "1.2.1.2308081607\0"
 
 1 VERSIONINFO
 FILEVERSION     VER_FILEVERSION

diff --git a/xmake.lua b/xmake.lua
@@ -1,7 +1,7 @@
 set_xmakever("2.5.9")
 
 set_project("TweakXL")
-set_version("1.2.0", {build = "%y%m%d%H%M"})
+set_version("1.2.1", {build = "%y%m%d%H%M"})
 
 set_arch("x64")
 set_languages("cxx20", "cxx2a")