kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

consolidated IF handling and added checks for bad arguments

This commit is contained in:
Ken Martin 2002-07-01 08:49:36 -04:00
parent e0c3d1e959
commit a43a65bf34
3 changed files with 175 additions and 273 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

145
Source/cmElseCommand.cxx
View File

@ -19,148 +19,19 @@
bool cmElseCommand::InitialPass(std::vector<std::string> const& args)
{
if(args.size() < 1 )
bool isValid;
bool isTrue = cmIfCommand::IsTrue(args,isValid,m_Makefile);
if (!isValid)
{
this->SetError("called with incorrect number of arguments");
this->SetError("An ELSE command had incorrect arguments");
return false;
}
// create a function blocker
cmIfFunctionBlocker *f = NULL;
// check for the different signatures
const char *def;
const char *def2;
if (args.size() == 1)
{
def = m_Makefile->GetDefinition(args[0].c_str());
if(!cmSystemTools::IsOff(def))
{
f = new cmIfFunctionBlocker();
}
}
if (args.size() == 2 && (args[0] == "COMMAND"))
{
if(m_Makefile->CommandExists(args[1].c_str()))
{
f = new cmIfFunctionBlocker();
}
}
if (args.size() == 2 && (args[0] == "EXISTS"))
{
if(cmSystemTools::FileExists(args[1].c_str()))
{
f = new cmIfFunctionBlocker();
}
}
if (args.size() == 2 && (args[0] == "NOT"))
{
def = m_Makefile->GetDefinition(args[1].c_str());
if(cmSystemTools::IsOff(def))
{
f = new cmIfFunctionBlocker();
}
}
if (args.size() == 3 && (args[1] == "AND"))
{
def = m_Makefile->GetDefinition(args[0].c_str());
def2 = m_Makefile->GetDefinition(args[2].c_str());
if(!cmSystemTools::IsOff(def) && !cmSystemTools::IsOff(def2))
{
f = new cmIfFunctionBlocker();
}
}
if (args.size() == 3 && (args[1] == "OR"))
{
def = m_Makefile->GetDefinition(args[0].c_str());
def2 = m_Makefile->GetDefinition(args[2].c_str());
if(!cmSystemTools::IsOff(def) || !cmSystemTools::IsOff(def2))
{
f = new cmIfFunctionBlocker();
}
}
if (args.size() == 3 && (args[1] == "LESS"))
{
def = m_Makefile->GetDefinition(args[0].c_str());
def2 = m_Makefile->GetDefinition(args[2].c_str());
if (!def)
{
def = args[0].c_str();
}
if (!def2)
{
def2 = args[2].c_str();
}
if(atof(def) < atof(def2))
{
f = new cmIfFunctionBlocker();
}
}
if (args.size() == 3 && (args[1] == "GREATER"))
{
def = m_Makefile->GetDefinition(args[0].c_str());
def2 = m_Makefile->GetDefinition(args[2].c_str());
if (!def)
{
def = args[0].c_str();
}
if (!def2)
{
def2 = args[2].c_str();
}
if(atof(def) > atof(def2))
{
f = new cmIfFunctionBlocker();
}
}
if (args.size() == 3 && (args[1] == "STRLESS"))
{
def = m_Makefile->GetDefinition(args[0].c_str());
def2 = m_Makefile->GetDefinition(args[2].c_str());
if(strcmp(def,def2) < 0)
{
f = new cmIfFunctionBlocker();
}
}
if (args.size() == 3 && (args[1] == "STRGREATER"))
{
def = m_Makefile->GetDefinition(args[0].c_str());
def2 = m_Makefile->GetDefinition(args[2].c_str());
if(strcmp(def,def2) > 0)
{
f = new cmIfFunctionBlocker();
}
}
if (args.size() == 3 && (args[1] == "MATCHES"))
{
def = m_Makefile->GetDefinition(args[0].c_str());
if (!def)
{
def = args[0].c_str();
}
cmRegularExpression regEntry(args[2].c_str());
// check for black line or comment
if (regEntry.find(def))
{
f = new cmIfFunctionBlocker();
}
}
// if we created a function blocker then set its args
if (f)
// if is true create a blocker for the else
if (isTrue)
{
cmIfFunctionBlocker *f = new cmIfFunctionBlocker();
for(std::vector<std::string>::const_iterator j = args.begin();
j != args.end(); ++j)
{

298
Source/cmIfCommand.cxx
View File

@ -71,147 +71,19 @@ ScopeEnded(cmMakefile &mf)
bool cmIfCommand::InitialPass(std::vector<std::string> const& args)
{
if(args.size() < 1 )
bool isValid;
bool isTrue = cmIfCommand::IsTrue(args,isValid,m_Makefile);
if (!isValid)
{
this->SetError("called with incorrect number of arguments");
this->SetError("An IF command had incorrect arguments");
return false;
}
// create a function blocker
cmIfFunctionBlocker *f = NULL;
// check for the different signatures
const char *def;
const char *def2;
if (args.size() == 1)
{
def = m_Makefile->GetDefinition(args[0].c_str());
if(cmSystemTools::IsOff(def))
{
f = new cmIfFunctionBlocker();
}
}
if (args.size() == 2 && (args[0] == "NOT"))
{
def = m_Makefile->GetDefinition(args[1].c_str());
if(!cmSystemTools::IsOff(def))
{
f = new cmIfFunctionBlocker();
}
}
if (args.size() == 2 && (args[0] == "COMMAND"))
{
if(!m_Makefile->CommandExists(args[1].c_str()))
{
f = new cmIfFunctionBlocker();
}
}
if (args.size() == 2 && (args[0] == "EXISTS"))
{
if(!cmSystemTools::FileExists(args[1].c_str()))
{
f = new cmIfFunctionBlocker();
}
}
if (args.size() == 3 && (args[1] == "AND"))
{
def = m_Makefile->GetDefinition(args[0].c_str());
def2 = m_Makefile->GetDefinition(args[2].c_str());
if(cmSystemTools::IsOff(def) || cmSystemTools::IsOff(def2))
{
f = new cmIfFunctionBlocker();
}
}
if (args.size() == 3 && (args[1] == "OR"))
{
def = m_Makefile->GetDefinition(args[0].c_str());
def2 = m_Makefile->GetDefinition(args[2].c_str());
if(cmSystemTools::IsOff(def) && cmSystemTools::IsOff(def2))
{
f = new cmIfFunctionBlocker();
}
}
if (args.size() == 3 && (args[1] == "MATCHES"))
{
def = m_Makefile->GetDefinition(args[0].c_str());
if (!def)
{
def = args[0].c_str();
}
cmRegularExpression regEntry(args[2].c_str());
// check for black line or comment
if (!regEntry.find(def))
{
f = new cmIfFunctionBlocker();
}
}
if (args.size() == 3 && (args[1] == "LESS"))
{
def = m_Makefile->GetDefinition(args[0].c_str());
def2 = m_Makefile->GetDefinition(args[2].c_str());
if (!def)
{
def = args[0].c_str();
}
if (!def2)
{
def2 = args[2].c_str();
}
if(atof(def) >= atof(def2))
{
f = new cmIfFunctionBlocker();
}
}
if (args.size() == 3 && (args[1] == "GREATER"))
{
def = m_Makefile->GetDefinition(args[0].c_str());
def2 = m_Makefile->GetDefinition(args[2].c_str());
if (!def)
{
def = args[0].c_str();
}
if (!def2)
{
def2 = args[2].c_str();
}
if(atof(def) <= atof(def2))
{
f = new cmIfFunctionBlocker();
}
}
if (args.size() == 3 && (args[1] == "STRLESS"))
{
def = m_Makefile->GetDefinition(args[0].c_str());
def2 = m_Makefile->GetDefinition(args[2].c_str());
if(strcmp(def,def2) >= 0)
{
f = new cmIfFunctionBlocker();
}
}
if (args.size() == 3 && (args[1] == "STRGREATER"))
{
def = m_Makefile->GetDefinition(args[0].c_str());
def2 = m_Makefile->GetDefinition(args[2].c_str());
if(strcmp(def,def2) <= 0)
{
f = new cmIfFunctionBlocker();
}
}
// if we created a function blocker then set its args
if (f)
// if is isn't true create a blocker
if (!isTrue)
{
cmIfFunctionBlocker *f = new cmIfFunctionBlocker();
for(std::vector<std::string>::const_iterator j = args.begin();
j != args.end(); ++j)
{
@ -223,3 +95,157 @@ bool cmIfCommand::InitialPass(std::vector<std::string> const& args)
return true;
}
bool cmIfCommand::IsTrue(const std::vector<std::string> &args, bool &isValid,
const cmMakefile *makefile)
{
// check for the different signatures
bool isTrue = true;
isValid = false;
const char *def;
const char *def2;
if(args.size() < 1 )
{
return false;
}
if (args.size() == 1)
{
def = makefile->GetDefinition(args[0].c_str());
if(cmSystemTools::IsOff(def))
{
isTrue = false;
}
isValid = true;
}
if (args.size() == 2 && (args[0] == "NOT"))
{
def = makefile->GetDefinition(args[1].c_str());
if(!cmSystemTools::IsOff(def))
{
isTrue = false;
}
isValid = true;
}
if (args.size() == 2 && (args[0] == "COMMAND"))
{
if(!makefile->CommandExists(args[1].c_str()))
{
isTrue = false;
}
isValid = true;
}
if (args.size() == 2 && (args[0] == "EXISTS"))
{
if(!cmSystemTools::FileExists(args[1].c_str()))
{
isTrue = false;
}
isValid = true;
}
if (args.size() == 3 && (args[1] == "AND"))
{
def = makefile->GetDefinition(args[0].c_str());
def2 = makefile->GetDefinition(args[2].c_str());
if(cmSystemTools::IsOff(def) || cmSystemTools::IsOff(def2))
{
isTrue = false;
}
isValid = true;
}
if (args.size() == 3 && (args[1] == "OR"))
{
def = makefile->GetDefinition(args[0].c_str());
def2 = makefile->GetDefinition(args[2].c_str());
if(cmSystemTools::IsOff(def) && cmSystemTools::IsOff(def2))
{
isTrue = false;
}
isValid = true;
}
if (args.size() == 3 && (args[1] == "MATCHES"))
{
def = makefile->GetDefinition(args[0].c_str());
if (!def)
{
def = args[0].c_str();
}
cmRegularExpression regEntry(args[2].c_str());
// check for black line or comment
if (!regEntry.find(def))
{
isTrue = false;
}
isValid = true;
}
if (args.size() == 3 && (args[1] == "LESS"))
{
def = makefile->GetDefinition(args[0].c_str());
def2 = makefile->GetDefinition(args[2].c_str());
if (!def)
{
def = args[0].c_str();
}
if (!def2)
{
def2 = args[2].c_str();
}
if(atof(def) >= atof(def2))
{
isTrue = false;
}
isValid = true;
}
if (args.size() == 3 && (args[1] == "GREATER"))
{
def = makefile->GetDefinition(args[0].c_str());
def2 = makefile->GetDefinition(args[2].c_str());
if (!def)
{
def = args[0].c_str();
}
if (!def2)
{
def2 = args[2].c_str();
}
if(atof(def) <= atof(def2))
{
isTrue = false;
}
isValid = true;
}
if (args.size() == 3 && (args[1] == "STRLESS"))
{
def = makefile->GetDefinition(args[0].c_str());
def2 = makefile->GetDefinition(args[2].c_str());
if(strcmp(def,def2) >= 0)
{
isTrue = false;
}
isValid = true;
}
if (args.size() == 3 && (args[1] == "STRGREATER"))
{
def = makefile->GetDefinition(args[0].c_str());
def2 = makefile->GetDefinition(args[2].c_str());
if(strcmp(def,def2) <= 0)
{
isTrue = false;
}
isValid = true;
}
return isTrue;
}

5
Source/cmIfCommand.h
View File

@ -98,6 +98,11 @@ public:
"and STRGREATER. LESS and GREATER do numeric comparison while "
"STRLESS and STRGREATER do string comparisons.";
}
// this is a shared function for both If and Else to determine if
// the arguments were valid, and if so, was the response true
static bool IsTrue(const std::vector<std::string> &args,
bool &isValid, const cmMakefile *mf);
cmTypeMacro(cmIfCommand, cmCommand);
};