Fixed issue with detoken not handling deferred joins correctly

src/base/detoken.lua

@@ -187,6 +187,9 @@
 			else
 				local res = expand_cache[value]
 				if res == nil then
+					if type(value) == "string" and path.hasdeferredjoin(value) then
+						value = path.resolvedeferredjoin(value)
+					end
 					res = expandvalue(value, e, f)
 					expand_cache[value] = res
 				end

tests/base/test_detoken.lua

@@ -104,6 +104,18 @@
 	end
 
 
+--
+-- If a path field contains a token that expands to a deferred join,
+-- it should be resolved before performing detoken.
+--
+
+	function suite.canExpandWithDeferredJoin()
+		local cwd = os.getcwd()
+		x = detoken.expand(path.deferredjoin(os.getcwd(), "%{_ACTION}"), environ,  {}, cwd)
+		test.isequal(os.getcwd() .. "/test", x)
+	end
+
+
 --
 -- If the value being expanded is a table, iterate over all of its values.
 --