msb.gnt.cmd and Expansion fixes

Fixed !con! delayed evaluation when debug=true +disableDelayedExpansion for gntcore Fixed /? +updated readme and added demo vsSolutionBuildEvent.1.16.bat wrapper
3F · Feb 7, 2024 · 6dc9929 · 6dc9929
1 parent 7da4b88
commit 6dc9929
Show file tree

Hide file tree

Showing 6 changed files with 289 additions and 270 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@ obj
 *.nupkg
 /tests/packages
 /tests/T00LS
+/demo/wrappers/packages
diff --git a/.vssbe b/.vssbe
@@ -546,6 +546,7 @@
           "            const string _CORE = @\"$(fCoreMin)\";",
           "            const string _OUTPUT = @\"$(fPacked)\";",
           "            const string _EMBDTPL = @\"$(fEmbd)\";",
+          "            const string _P_VER = @\"$(pVer)\";",
           "",
           "            Func<char, string> quotes = (symbol) =>",
           "            {",
@@ -630,8 +631,8 @@
           "                'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't',",
           "                'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3',",
           "                '4', '5', '6', '7', '8', '9',",
-          "                '$', '#', '@', '!', '?',",
-          "                // '`',",
+          "                '$', '#', '@', '`', '?',",
+          "                // '!',",
           "            };",
           "",
           "            var vdict = gencomb(cdict, 1, (i) => { return !char.IsDigit(cdict[i]); });",
@@ -835,7 +836,7 @@
           "                    content = tplreader.ReadToEnd()",
           "                                .Replace(\"$gnt.core.logic$\", content)",
           "                                .Replace(\"$tpl.corevar$\", corevar)",
-          "                                .Replace(\"$core.version$\", \"$(pVer)\");",
+          "                                .Replace(\"$core.version$\", _P_VER);",
           "                }",
           "",
           "                // ",
@@ -947,7 +948,7 @@
           "            var vdict = gencomb(cdict, 2, (i) => { return char.IsLetter(cdict[i]) || cdict[i] == '_'; });",
           "",
           "            // to skip processing for:",
-          "            var exvar = new[] { \"__p_call\", \"__p_msb\", \"engine\" };",
+          "            var exvar = new[] { \"__p_call\", \"__p_msb\", \"msb.gnt.cmd\" };",
           "",
           "            const string VNAME = \"[a-z_][a-z_0-9]+\";",
           "            using(var reader = new StreamReader(_CORE, System.Text.Encoding.UTF8, true))",
@@ -1081,7 +1082,7 @@
           "                content = Regex.Replace",
           "                (",
           "                    content,",
-          "                    @\"(?'def'call\\s*:|^\\s*:|goto\\s*:?)(?'label'\" + VNAME + @\")(?'eol'\\s|\\r\\n)\", ",
+          "                    @\"(?'def'call\\s*:|^\\s*:|goto\\s*:?)(?'label'\" + VNAME + @\")(?'eol'\\s|&|\\r\\n)\",",
           "                    (m) =>",
           "                    {",
           "                        var def     = m.Groups[\"def\"].Value;",