Changeset 1430

Timestamp:

May 26, 2008, 8:30:33 PM (16 years ago)

Author:

landauf

Message:

I start to like it

Location:

code/branches/console/src/core

Files:

• ArgumentCompleter.h (added)
• ArgumentCompletionFunctions.cc (modified) (1 diff)
• ArgumentCompletionFunctions.h (modified) (1 diff)
• CommandEvaluation.cc (modified) (4 diffs)
• CommandExecutor.cc (modified) (4 diffs)
• CommandExecutor.h (modified) (1 diff)
• ConsoleCommand.cc (modified) (2 diffs)
• ConsoleCommand.h (modified) (3 diffs)
• CorePrereqs.h (modified) (1 diff)

code/branches/console/src/core/ArgumentCompletionFunctions.cc

@@ -35 +35 @@
     namespace autocompletion
     {
-        std::list<std::pair<std::string, std::string> > fallback()
+        ARGUMENT_COMPLETION_FUNCTION_IMPLEMENTATION(fallback)()
         {
-            static std::list<std::pair<std::string, std::string> > list(1, std::pair<std::string, std::string>("muh", "MUH"));
-            return list;
+            return std::list<std::pair<std::string, std::string> >();
         }
     }

code/branches/console/src/core/ArgumentCompletionFunctions.h

@@ -33 +33 @@
 #include <string>
 
+#include "ArgumentCompleter.h"
+#include "CorePrereqs.h"
+
+
+#define ARGUMENT_COMPLETION_FUNCTION_DECLARATION(functionname) \
+    ArgumentCompleter* functionname(); \
+    _CoreExport std::list<std::pair<std::string, std::string> > acf_##functionname
+
+#define ARGUMENT_COMPLETION_FUNCTION_IMPLEMENTATION(functionname) \
+    ArgumentCompleter* functionname() \
+    { \
+        static ArgumentCompleter completer = ArgumentCompleter(&acf_##functionname); \
+        return &completer; \
+    } \
+    \
+    std::list<std::pair<std::string, std::string> > acf_##functionname
+
 namespace orxonox
 {
     namespace autocompletion
     {
-        std::list<std::pair<std::string, std::string> > fallback();
+        ARGUMENT_COMPLETION_FUNCTION_DECLARATION(fallback)();
     }
 }

code/branches/console/src/core/CommandEvaluation.cc

@@ -110 +110 @@
                     {
                         if (this->function_->getParamCount() == 0)
-                            return /*CommandExecutor::complete*/(this->command_ = this->function_->getName());
+                            return (this->command_ = this->function_->getName());
                         else
-                            return /*CommandExecutor::complete*/(this->command_ = this->function_->getName() + " ");
+                            return (this->command_ = this->function_->getName() + " ");
                     }
                     else if (this->functionclass_)
-                        return /*CommandExecutor::complete*/(this->command_ = this->functionclass_->getName() + " ");
+                        return (this->command_ = this->functionclass_->getName() + " ");
                     break;
                 case CS_Function:
@@ -121 +121 @@
                     {
                         if (this->function_->getParamCount() == 0)
-                            return /*CommandExecutor::complete*/(this->command_ = this->functionclass_->getName() + " " + this->function_->getName());
+                            return (this->command_ = this->functionclass_->getName() + " " + this->function_->getName());
                         else
-                            return /*CommandExecutor::complete*/(this->command_ = this->functionclass_->getName() + " " + this->function_->getName() + " ");
+                            return (this->command_ = this->functionclass_->getName() + " " + this->function_->getName() + " ");
                     }
                     break;
@@ -129 +129 @@
                 case CS_Params:
                 {
+                    if (this->argument_ == "" && this->possibleArgument_ == "")
+                        break;
+
                     unsigned int maxIndex = this->commandTokens_.size();
                     if (this->command_[this->command_.size() - 1] != ' ')
@@ -142 +145 @@
                     }
 
-                    return /*CommandExecutor::complete*/(this->command_ = this->commandTokens_.subSet(0, maxIndex).join() + " " + this->argument_ + whitespace);
+                    return (this->command_ = this->commandTokens_.subSet(0, maxIndex).join() + " " + this->argument_ + whitespace);
                     break;
                 }

code/branches/console/src/core/CommandExecutor.cc

@@ -355 +355 @@
                 else
                 {
-                    unsigned int argumentNumber = CommandExecutor::argumentsGiven() - 1;
+                    unsigned int argumentNumber = CommandExecutor::argumentsGiven() - 2;
                     if (CommandExecutor::getEvaluation().functionclass_)
                         argumentNumber -= 1;
 
+std::cout << "arglist: " << CommandExecutor::getLastArgument() << ", " << CommandExecutor::getEvaluation().function_->getName() << ", " << argumentNumber << std::endl;
                     CommandExecutor::createListOfPossibleArguments(CommandExecutor::getLastArgument(), CommandExecutor::getEvaluation().function_, argumentNumber);
                     CommandExecutor::getEvaluation().state_ = CS_Params;
@@ -488 +489 @@
     void CommandExecutor::createListOfPossibleArguments(const std::string& fragment, ConsoleCommand* command, unsigned int param)
     {
+        CommandExecutor::createArgumentCompletionList(command, param);
+
         CommandExecutor::getEvaluation().listOfPossibleArguments_.clear();
         std::string lowercase = getLowercase(fragment);
-        for (std::list<std::pair<std::string, std::string> >::const_iterator it = command->getArgumentCompletionListBegin(param); it != command->getArgumentCompletionListEnd(param); ++it)
+        for (std::list<std::pair<std::string, std::string> >::const_iterator it = command->getArgumentCompletionListBegin(); it != command->getArgumentCompletionListEnd(); ++it)
             if ((*it).first.find(lowercase) == 0 || fragment == "")
                 CommandExecutor::getEvaluation().listOfPossibleArguments_.push_back(std::pair<const std::string*, const std::string*>(&(*it).first, &(*it).second));
@@ -527 +530 @@
     std::string CommandExecutor::getPossibleArgument(const std::string& name, ConsoleCommand* command, unsigned int param)
     {
+        CommandExecutor::createArgumentCompletionList(command, param);
+
         std::string lowercase = getLowercase(name);
-        for (std::list<std::pair<std::string, std::string> >::const_iterator it = command->getArgumentCompletionListBegin(param); it != command->getArgumentCompletionListEnd(param); ++it)
+        for (std::list<std::pair<std::string, std::string> >::const_iterator it = command->getArgumentCompletionListBegin(); it != command->getArgumentCompletionListEnd(); ++it)
             if ((*it).first == lowercase)
                 return (*it).second;
@@ -535 +540 @@
     }
 
+    void CommandExecutor::createArgumentCompletionList(ConsoleCommand* command, unsigned int param)
+    {
+        std::string params[5];
+
+        unsigned int index = 0;
+        unsigned int lowestIndex = 1 + (CommandExecutor::getEvaluation().functionclass_ != 0);
+
+        for (unsigned int i = CommandExecutor::argumentsGiven() - 2; i >= lowestIndex; --i)
+        {
+            params[index] = CommandExecutor::getArgument(i);
+            ++index;
+            if (index >= 5)
+                break;
+        }
+
+        command->createArgumentCompletionList(param, params[0], params[1], params[2], params[3], params[4]);
+    }
+
     std::string CommandExecutor::getCommonBegin(const std::list<std::pair<const std::string*, const std::string*> >& list)
     {

code/branches/console/src/core/CommandExecutor.h

@@ -93 +93 @@
             static std::string getPossibleArgument(const std::string& name, ConsoleCommand* command, unsigned int param);
 
+            static void createArgumentCompletionList(ConsoleCommand* command, unsigned int param);
             static std::string getCommonBegin(const std::list<std::pair<const std::string*, const std::string*> >& list);
             static bool compareStringsInList(const std::pair<const std::string*, const std::string*>& first, const std::pair<const std::string*, const std::string*>& second);

code/branches/console/src/core/ConsoleCommand.cc

@@ -34 +34 @@
     {
         this->accessLevel_ = AccessLevel::None;
-        this->autocompletionFunction_[0] = &autocompletion::fallback;
-        this->autocompletionFunction_[1] = &autocompletion::fallback;
-        this->autocompletionFunction_[2] = &autocompletion::fallback;
-        this->autocompletionFunction_[3] = &autocompletion::fallback;
-        this->autocompletionFunction_[4] = &autocompletion::fallback;
+        this->argumentCompleter_[0] = 0;
+        this->argumentCompleter_[1] = 0;
+        this->argumentCompleter_[2] = 0;
+        this->argumentCompleter_[3] = 0;
+        this->argumentCompleter_[4] = 0;
     }
 
-    ConsoleCommand& ConsoleCommand::setArgumentCompletionList(unsigned int param, std::list<std::pair<std::string, std::string> > (*function) (void))
+    ConsoleCommand& ConsoleCommand::setArgumentCompletionList(unsigned int param, ArgumentCompleter* completer)
     {
         if (param < 5)
-            this->autocompletionFunction_[param] = function;
+            this->argumentCompleter_[param] = completer;
         else
         {
@@ -52 +52 @@
     }
 
-    const std::list<std::pair<std::string, std::string> >& ConsoleCommand::getArgumentCompletionList(unsigned int param)
+    void ConsoleCommand::createArgumentCompletionList(unsigned int param, const std::string& param1, const std::string& param2, const std::string& param3, const std::string& param4, const std::string& param5)
     {
-        if (param < 5)
-            this->argumentList_ = (*this->autocompletionFunction_[param])();
+        if (param < 5 && this->argumentCompleter_[param])
+            this->argumentList_ = (*this->argumentCompleter_[param])(param1, param2, param3, param4, param5);
         else
-            this->argumentList_ = autocompletion::fallback();
-
-        return this->argumentList_;
-    }
-
-    std::list<std::pair<std::string, std::string> >::const_iterator ConsoleCommand::getArgumentCompletionListBegin(unsigned int param)
-    {
-        if (param < 5)
-            this->argumentList_ = (*this->autocompletionFunction_[param])();
-        else
-            this->argumentList_ = autocompletion::fallback();
-
-        return this->argumentList_.begin();
-    }
-
-    std::list<std::pair<std::string, std::string> >::const_iterator ConsoleCommand::getArgumentCompletionListEnd(unsigned int param)
-    {
-        if (param < 5)
-            this->argumentList_ = (*this->autocompletionFunction_[param])();
-        else
-            this->argumentList_ = autocompletion::fallback();
-
-        return this->argumentList_.end();
+            this->argumentList_.clear();
     }
 }

code/branches/console/src/core/ConsoleCommand.h

@@ -43 +43 @@
 
 #define SetConsoleCommandGeneric(fakevariable, classname, command, bCreateShortcut) \
-    ConsoleCommand& fakevariable = ClassManager<classname>::getIdentifier()->addConsoleCommand((ConsoleCommand*)command, bCreateShortcut)
+    ConsoleCommand& fakevariable = ClassManager<classname>::getIdentifier()->addConsoleCommand(command, bCreateShortcut)
 
 
@@ -53 +53 @@
 
 #define SetConsoleCommandShortcutGeneric(fakevariable, command) \
-    ConsoleCommand& fakevariable = CommandExecutor::addConsoleCommandShortcut((ConsoleCommand*)command)
+    ConsoleCommand& fakevariable = CommandExecutor::addConsoleCommandShortcut(command)
 
 
@@ -100 +100 @@
                 { return this->accessLevel_; }
 
-            ConsoleCommand& setArgumentCompletionList(unsigned int param, std::list<std::pair<std::string, std::string> > (*function) (void));
-
-            const std::list<std::pair<std::string, std::string> >& getArgumentCompletionList(unsigned int param);
-            std::list<std::pair<std::string, std::string> >::const_iterator getArgumentCompletionListBegin(unsigned int param);
-            std::list<std::pair<std::string, std::string> >::const_iterator getArgumentCompletionListEnd(unsigned int param);
+            ConsoleCommand& setArgumentCompletionList(unsigned int param, ArgumentCompleter* completer);
+            void createArgumentCompletionList(unsigned int param, const std::string& param1 = "", const std::string& param2 = "", const std::string& param3 = "", const std::string& param4 = "", const std::string& param5 = "");
+            const std::list<std::pair<std::string, std::string> >& getArgumentCompletionList() const
+                { return this->argumentList_; }
+            std::list<std::pair<std::string, std::string> >::const_iterator getArgumentCompletionListBegin() const
+                { return this->argumentList_.begin(); }
+            std::list<std::pair<std::string, std::string> >::const_iterator getArgumentCompletionListEnd() const
+                { return this->argumentList_.end(); }
 
         private:
             AccessLevel::Level accessLevel_;
-            std::list<std::pair<std::string, std::string> > (*autocompletionFunction_[5]) (void);
+            ArgumentCompleter* argumentCompleter_[5];
             std::list<std::pair<std::string, std::string> > argumentList_;
     };

code/branches/console/src/core/CorePrereqs.h

@@ -77 +77 @@
   typedef std::string LanguageEntryLabel;
 
+  class ArgumentCompleter;
   class BaseFactory;
   class BaseMetaObjectListElement;