fix filter escape and find_path bug

1 files changed, 14 insertions, 1 deletions

diff --git a/xmake/core/base/filter.lua b/xmake/core/base/filter.lua
index f9744bf61..465a55499 100644
--- a/xmake/core/base/filter.lua
+++ b/xmake/core/base/filter.lua
@@ -31,6 +31,10 @@ local table     = require("base/table")
 local utils     = require("base/utils")
 local string    = require("base/string")
 
+-- globals
+local escape_table1 = {["$"] = "\001", ["("] = "\002", [")"] = "\003"}
+local escape_table2 = {["\001"] = "$", ["\002"] = "(", ["\003"] = ")"}
+
 -- new filter instance
 function filter.new()
 
@@ -155,10 +159,19 @@ function filter:handle(value)
     -- check
     assert(type(value) == "string")
 
+    -- escape "%$", "%(", "%)" to "\001", "\002", "\003"
+    value = value:gsub("%%([%$%(%)])", function (ch) return escape_table1[ch] end)
+
     -- filter the builtin variables
     return (value:gsub("%$%((.-)%)", function (variable) 
+        
+        -- escape "%$", "%(", "%)" to "$", "(", ")"
+        variable = variable:gsub("[\001\002\003]", function (ch) return escape_table2[ch] end)
+
+        -- get variable value
         return self:get(variable) or ""
-    end))
+
+    end):gsub("[\001\002\003]", function (ch) return escape_table2[ch] end))
 end
 
 -- return module: filter