AuroraPipeline/premake
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 1 Wiki Activity

Avoid file filter term tests when matching against non-file configurations

Browse Source
This commit is contained in:
Jason Perkins 2014-04-09 16:14:59 -04:00
parent 7dd9f4b041
commit d6a8aa05fe
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/host/criteria_matches.c
View File

@ -100,14 +100,13 @@ static int testContext(lua_State* L, const char* prefix, const char* part,
{
/*
if prefix then
local isFiles = (prefix == "files")
if isFiles and not filename then
return false
end
local result = testValue(context[prefix], part, wildcard)
if prefix == "files" then
if not filename then
return false
end
if result == assertion then
filematched = true
end
if isFiles and result == assertion then
filematched = true
end
if result then
return assertion
@ -128,16 +127,16 @@ static int testContext(lua_State* L, const char* prefix, const char* part,
int result;
if (prefix) {
int isFiles = (strcmp(prefix, "files") == 0);
if (isFiles && filename == NULL) {
return 0;
}
lua_getfield(L, 2, prefix);
result = testValue(L, part, wildcard);
lua_pop(L, 1);
if (strcmp(prefix, "files") == 0) {
if (filename == NULL) {
return 0;
}
if (result == assertion) {
(*fileMatched) = 1;
}
if (isFiles && result == assertion) {
(*fileMatched) = 1;
}
if (result) {
return assertion;