Changeset 5190 in orxonox.OLD for trunk/src/lib

Timestamp:

Sep 18, 2005, 12:09:36 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: construct for ShellCommandAlias… have to work some more on this :/

Location:

trunk/src/lib/shell

Files:

• shell_command.cc (modified) (3 diffs)
• shell_command.h (modified) (5 diffs)
• shell_completion.cc (modified) (4 diffs)

trunk/src/lib/shell/shell_command.cc

@@ -61 +61 @@
 }
 
-tList<const char>* ShellCommandClass::getCommandListOfClass(const char* className)
-{
-  tList<const char>* retList;
+bool ShellCommandClass::getCommandListOfClass(const char* className, tList<const char>* stringList)
+{
+  if (stringList == NULL)
+    return false;
+
   tIterator<ShellCommandClass>* iterator = ShellCommandClass::commandClassList->getIterator();
   ShellCommandClass* elem = iterator->firstElement();
@@ -74 +76 @@
       while (command != NULL)
       {
-        retList->add(command->getName());
+        stringList->add(command->getName());
         command = itFkt->nextElement();
       }
@@ -83 +85 @@
   }
   delete iterator;
-  return retList;
+  return true;
 }
 

trunk/src/lib/shell/shell_command.h

@@ -43 +43 @@
 ////////////////
 class ShellCommandBase;
+class ShellCommandAlias;
 
 //! A class to hold all Classes that have (once) registered Commands.
@@ -51 +52 @@
   public:
     static const tList<ShellCommandClass>* getCommandClassList() { return ShellCommandClass::commandClassList; };
-    static tList<const char>* getCommandListOfClass(const char* className);
+    static bool ShellCommandClass::getCommandListOfClass(const char* className, tList<const char>* stringList);
+
     static ShellCommandClass* getCommandClass(const char* className);
     static void unregisterAllCommands();
@@ -67 +69 @@
     tList<ShellCommandBase>*         commandList;               //!< A list of Commands from this Class
     static tList<ShellCommandClass>* commandClassList;          //!< A list of Classes
+    static tList<ShellCommandAlias>* aliasesList;               //!< An Alias to A Command. (only for classes with one Instance)
 };
 
@@ -78 +81 @@
 
     ShellCommandBase* describe(const char* description);
+    ShellCommandBase* setAlias(const char* alias);
 
     /** @returns the CommandList of the Shell */
@@ -312 +316 @@
 };
 
+class ShellCommandAlias
+{
+  public:
+    ShellCommandAlias(const char* aliasName, ShellCommandBase* command) { this->aliasName = aliasName; this->command = command; };
+  private:
+    const char*         aliasName;
+    ShellCommandBase*   command;
+};
+
+
 #endif /* _SHELL_COMMAND_H */

trunk/src/lib/shell/shell_completion.cc

@@ -68 +68 @@
   long classID;                    //< the classID retrieved from the Class.
   tList<BaseObject>* objectList;   //< the list of Objects stored in classID
-  char* classBegin;                //< the beginn of the slass string
-  char* classEnd;                  //< the end of the class string
-  char* objectBegin;               //< the begin of the object string
-  char* objectEnd;                 //< the end of the object string
-  char* functionBegin;             //< the begin of the function string
-  char* functionEnd;               //< the end of the function string
+  bool emptyComplete = false;      //< if the completion input is empty string. e.g ""
+
 
   PRINTF(4)("AutoComplete on input\n");
@@ -85 +81 @@
     return false;
   }
+
+  // Check if we are in a input. eg. the supplied string "class " and now we complete either function or object
+  if (this->input->getInput() == NULL || strlen(this->input->getInput()) == 0 ||
+      (this->input->getInput() != NULL &&
+      strrchr(this->input->getInput(), ' ') >= this->input->getInput() + strlen(this->input->getInput())-1))
+  {
+    emptyComplete = true;
+  }
+
   if (this->input->getInput() == NULL)
+  {
     return this->objectComplete("", CL_SHELL_COMMAND_CLASS);
-
+  }
 
   completionLine = this->input->getInput() + strspn(this->input->getInput(), " \t\n");
@@ -169 +175 @@
     else
       return false;
+    delete classList;
   }
   else
@@ -333 +340 @@
 }
 
+
 void ShellCompletion::emptyCompletionList()
 {