Changeset 7221 for code/branches/consolecommands3/src/libraries/core/command/CommandExecutor.cc

Timestamp:

Aug 26, 2010, 2:06:16 AM (14 years ago)

Author:

landauf

Message:

adapted CommandExecutor and CommandEvaluation to make it compile again, but it doesn't run yet. ready for refactoring.

File:

• code/branches/consolecommands3/src/libraries/core/command/CommandExecutor.cc (modified) (13 diffs)

code/branches/consolecommands3/src/libraries/core/command/CommandExecutor.cc

@@ -49 +49 @@
     }
 
-    const CommandEvaluation& CommandExecutor::getLastEvaluation()
-    {
-        return CommandExecutor::getInstance().evaluation_;
-    }
-
     bool CommandExecutor::execute(const std::string& command, bool useTcl)
     {
@@ -216 +211 @@
                         CommandExecutor::getEvaluation().functionclass_ = 0;
                         CommandExecutor::getEvaluation().command_ = CommandExecutor::getEvaluation().function_->getName();
-                        if (CommandExecutor::getEvaluation().function_->getParamCount() > 0)
+                        if (CommandExecutor::getEvaluation().function_->getExecutor()->getParamCount() > 0)
                         {
                             CommandExecutor::getEvaluation().command_ += ' ';
@@ -303 +298 @@
                             CommandExecutor::getEvaluation().state_ = CommandState::ParamPreparation;
                             CommandExecutor::getEvaluation().command_ = CommandExecutor::getEvaluation().functionclass_->getName() + ' ' + CommandExecutor::getEvaluation().function_->getName();
-                            if (CommandExecutor::getEvaluation().function_->getParamCount() > 0)
+                            if (CommandExecutor::getEvaluation().function_->getExecutor()->getParamCount() > 0)
                             {
                                 CommandExecutor::getEvaluation().command_ += ' ';
@@ -335 +330 @@
             case CommandState::ParamPreparation:
             {
-                if (CommandExecutor::getEvaluation().function_->getParamCount() == 0 || CommandExecutor::enoughArgumentsGiven(CommandExecutor::getEvaluation().function_))
+                if (CommandExecutor::getEvaluation().function_->getExecutor()->getParamCount() == 0 || CommandExecutor::enoughArgumentsGiven(CommandExecutor::getEvaluation().function_))
                 {
                     CommandExecutor::getEvaluation().state_ = CommandState::Finished;
@@ -418 +413 @@
     }
 
-    bool CommandExecutor::enoughArgumentsGiven(ConsoleCommand* command)
+    bool CommandExecutor::enoughArgumentsGiven(_ConsoleCommand* command)
     {
         if (CommandExecutor::getEvaluation().functionclass_)
-            return (CommandExecutor::argumentsGiven() > (2 + command->getParamCount()));
-        else
-            return (CommandExecutor::argumentsGiven() > (1 + command->getParamCount()));
+            return (CommandExecutor::argumentsGiven() > (2 + command->getExecutor()->getParamCount()));
+        else
+            return (CommandExecutor::argumentsGiven() > (1 + command->getExecutor()->getParamCount()));
     }
 
@@ -441 +436 @@
     void CommandExecutor::createListOfPossibleIdentifiers(const std::string& fragment)
     {
+/*
         CommandExecutor::getEvaluation().listOfPossibleIdentifiers_.clear();
         const std::string& lowercase = getLowercase(fragment);
@@ -447 +443 @@
                 if (it->first.find(lowercase) == 0 || fragment.empty())
                     CommandExecutor::getEvaluation().listOfPossibleIdentifiers_.push_back(std::pair<const std::string*, const std::string*>(&it->first, &it->second->getName()));
+*/
     }
 
     void CommandExecutor::createListOfPossibleFunctions(const std::string& fragment, Identifier* identifier)
     {
+/*
         CommandExecutor::getEvaluation().listOfPossibleFunctions_.clear();
         const std::string& lowercase = getLowercase(fragment);
         if (!identifier)
         {
-            for (std::map<std::string, ConsoleCommand*>::const_iterator it = CommandExecutor::getLowercaseConsoleCommandShortcutMapBegin(); it != CommandExecutor::getLowercaseConsoleCommandShortcutMapEnd(); ++it)
+            for (std::map<std::string, _ConsoleCommand*>::const_iterator it = CommandExecutor::getLowercaseConsoleCommandShortcutMapBegin(); it != CommandExecutor::getLowercaseConsoleCommandShortcutMapEnd(); ++it)
                 if (it->first.find(lowercase) == 0 || fragment.empty())
                     CommandExecutor::getEvaluation().listOfPossibleFunctions_.push_back(std::pair<const std::string*, const std::string*>(&it->first, &it->second->getName()));
@@ -461 +459 @@
         else
         {
-            for (std::map<std::string, ConsoleCommand*>::const_iterator it = identifier->getLowercaseConsoleCommandMapBegin(); it != identifier->getLowercaseConsoleCommandMapEnd(); ++it)
+            for (std::map<std::string, _ConsoleCommand*>::const_iterator it = identifier->getLowercaseConsoleCommandMapBegin(); it != identifier->getLowercaseConsoleCommandMapEnd(); ++it)
                 if (it->first.find(lowercase) == 0 || fragment.empty())
                     CommandExecutor::getEvaluation().listOfPossibleFunctions_.push_back(std::pair<const std::string*, const std::string*>(&it->first, &it->second->getName()));
         }
-    }
-
-    void CommandExecutor::createListOfPossibleArguments(const std::string& fragment, ConsoleCommand* command, unsigned int param)
-    {
+*/
+    }
+
+    void CommandExecutor::createListOfPossibleArguments(const std::string& fragment, _ConsoleCommand* command, unsigned int param)
+    {
+/*
         CommandExecutor::createArgumentCompletionList(command, param);
 
@@ -486 +486 @@
             }
         }
+*/
     }
 
     Identifier* CommandExecutor::getPossibleIdentifier(const std::string& name)
     {
+/*
         const std::string& lowercase = getLowercase(name);
         std::map<std::string, Identifier*>::const_iterator it = Identifier::getLowercaseStringIdentifierMap().find(lowercase);
         if ((it != Identifier::getLowercaseStringIdentifierMapEnd()) && it->second->hasConsoleCommands())
             return it->second;
-
+*/
         return 0;
     }
 
-    ConsoleCommand* CommandExecutor::getPossibleCommand(const std::string& name, Identifier* identifier)
-    {
+    _ConsoleCommand* CommandExecutor::getPossibleCommand(const std::string& name, Identifier* identifier)
+    {
+/*
         const std::string& lowercase = getLowercase(name);
         if (!identifier)
         {
-            std::map<std::string, ConsoleCommand*>::const_iterator it = CommandExecutor::getLowercaseConsoleCommandShortcutMap().find(lowercase);
+            std::map<std::string, _ConsoleCommand*>::const_iterator it = CommandExecutor::getLowercaseConsoleCommandShortcutMap().find(lowercase);
             if (it != CommandExecutor::getLowercaseConsoleCommandShortcutMapEnd())
                 return it->second;
@@ -509 +512 @@
         else
         {
-            std::map<std::string, ConsoleCommand*>::const_iterator it = identifier->getLowercaseConsoleCommandMap().find(lowercase);
+            std::map<std::string, _ConsoleCommand*>::const_iterator it = identifier->getLowercaseConsoleCommandMap().find(lowercase);
             if (it != identifier->getLowercaseConsoleCommandMapEnd())
                 return it->second;
         }
+*/
         return 0;
     }
 
-    const std::string& CommandExecutor::getPossibleArgument(const std::string& name, ConsoleCommand* command, unsigned int param)
-    {
+    const std::string& CommandExecutor::getPossibleArgument(const std::string& name, _ConsoleCommand* command, unsigned int param)
+    {
+/*
         CommandExecutor::createArgumentCompletionList(command, param);
 
@@ -534 +539 @@
             }
         }
-
+*/
         return BLANKSTRING;
     }
 
-    void CommandExecutor::createArgumentCompletionList(ConsoleCommand* command, unsigned int param)
-    {
+    void CommandExecutor::createArgumentCompletionList(_ConsoleCommand* command, unsigned int param)
+    {
+/*
         std::string params[5];
 
@@ -554 +560 @@
 
         command->createArgumentCompletionList(param, params[0], params[1], params[2], params[3], params[4]);
+*/
     }
 
@@ -643 +650 @@
         }
     }
-
-    void CommandExecutor::destroyExternalCommands()
-    {
-        for (std::set<ConsoleCommand*>::const_iterator it = CommandExecutor::getInstance().consoleCommandExternals_.begin();
-            it != CommandExecutor::getInstance().consoleCommandExternals_.end(); ++it)
-            delete *it;
-    }
 }