consolidated IF handling and added checks for bad arguments

1 files changed, 8 insertions, 137 deletions

diff --git a/Source/cmElseCommand.cxx b/Source/cmElseCommand.cxx
index ad11fe7677..dd396901f7 100644
--- a/Source/cmElseCommand.cxx
+++ b/Source/cmElseCommand.cxx
@@ -19,148 +19,19 @@
 
 bool cmElseCommand::InitialPass(std::vector<std::string> const& args)
 {
-  if(args.size() < 1 )
-    {
-    this->SetError("called with incorrect number of 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();
-      }
-    }
+  bool isValid;
+  bool isTrue = cmIfCommand::IsTrue(args,isValid,m_Makefile);
   
-  if (args.size() == 3 && (args[1] == "OR"))
+  if (!isValid)
     {
-    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();
-      }
+    this->SetError("An ELSE command had incorrect arguments");
+    return false;
     }
   
-  // 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)
       {