Changeset 5329 in orxonox.OLD for trunk

Timestamp:

Oct 8, 2005, 11:07:21 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: executing static commands work

Location:

trunk/src

Files:

• defs/functor_list.h (modified) (1 diff)
• lib/lang/class_list.cc (modified) (1 diff)
• lib/shell/shell.cc (modified) (1 diff)
• lib/shell/shell_command.cc (modified) (4 diffs)
• lib/shell/shell_command.h (modified) (2 diffs)
• lib/shell/shell_completion.cc (modified) (1 diff)
• lib/util/helper_functions.cc (modified) (3 diffs)

trunk/src/defs/functor_list.h

@@ -149 +149 @@
   //! mixed values:
   FUNCTOR_LIST(2)(l_STRING, l_FLOAT);
+  FUNCTOR_LIST(2)(l_UINT, l_LONG);
 #endif /* FUNCTOR_LIST */
 

trunk/src/lib/lang/class_list.cc

@@ -24 +24 @@
 #include <string.h>
 #include <math.h>
+#include "shell_command.h"
 
 using namespace std;
 
+SHELL_COMMAND_STATIC(debug, ClassList, ClassList::debug);
 
 /**

trunk/src/lib/shell/shell.cc

@@ -65 +65 @@
   // Element2D and generals
   this->setAbsCoor2D(3, -400);
-  this->textSize = 15;
+  this->textSize = 20;
   this->lineSpacing = 0;
   this->bActive = false;

trunk/src/lib/shell/shell_command.cc

@@ -422 +422 @@
   if (ShellCommandClass::commandClassList == NULL)
     return false;
-
 
   long classID = CL_NULL;                 //< the classID retrieved from the Class.
@@ -482 +481 @@
     }
 
-    if (classID != CL_NULL && inputSplits.getCount() >= 2 && objectList != NULL)
-    {
-      // Checking for a Match in the Objects of classID (else take the first)
-      tIterator<BaseObject>* itBO = objectList->getIterator();
-      BaseObject* enumBO = itBO->firstElement();
-      while(enumBO)
+    if (commandClass != NULL && inputSplits.getCount() >= 2)
+    {
+      if (objectList != NULL)
       {
-        if (enumBO->getName() != NULL && !strcasecmp(enumBO->getName(), inputSplits.getString(1)))
+        // Checking for a Match in the Objects of classID (else take the first)
+        tIterator<BaseObject>* itBO = objectList->getIterator();
+        BaseObject* enumBO = itBO->firstElement();
+        while(enumBO)
         {
-          objectPointer = enumBO;
-          fktPos++;
-          break;
-        }
-        enumBO = itBO->nextElement();
+          if (enumBO->getName() != NULL && !strcasecmp(enumBO->getName(), inputSplits.getString(1)))
+          {
+            objectPointer = enumBO;
+            fktPos = 2;
+            break;
+          }
+          enumBO = itBO->nextElement();
+         }
+         delete itBO;
+
+      //
+        if (objectPointer == NULL)
+          objectPointer = objectList->firstElement();
       }
-      delete itBO;
-
-      //
-      if (objectPointer == NULL)
-        objectPointer = objectList->firstElement();
-
+      printf("test\n");
       // match a function.
-      if (commandClass != NULL && objectPointer != NULL && (fktPos == 1 || (fktPos == 2 && inputSplits.getCount() >= 3)))
+      if (commandClass != NULL && (fktPos == 1 || (fktPos == 2 && inputSplits.getCount() >= 3)))
       {
         tIterator<ShellCommandBase>* itCMD = commandClass->commandList->getIterator();
@@ -512 +514 @@
           if (!strcmp(enumCMD->getName(), inputSplits.getString(fktPos)))
           {
+            if (objectPointer == NULL && enumCMD->functorType == ShellCommand_Objective)
+            {
+              delete itCMD;
+              return false;
+            }
             if (inputSplits.getCount() > fktPos+1)
               enumCMD->executeCommand(objectPointer, executionString+inputSplits.getOffset(fktPos +1));
@@ -622 +629 @@
 
   return this;
-}
-
-
-/**
- * see ShellCommandBase::debug()
- */
-void ShellCommandBase::debugDyn()
-{
-  this->debug();
 }
 

trunk/src/lib/shell/shell_command.h

@@ -39 +39 @@
 #define SHELL_COMMAND(command, class, function) \
         ShellCommandBase* shell_command_##class##_##command = ShellCommand<class>::registerCommand(#command, #class, &class::function)
+/**
+ * an easy to use Macro to create a Command
+ * @param command the name of the command (without "" around the string)
+ * @param class the name of the class to apply this command to (without the "" around the string)
+ * @param function the function to call
+ *
+ * MEANING:
+ *  ShellCommandBase* someUniqueVarName =
+ *       ShellCommand<ClassName>::registerCommand("commandNameInShell", "ClassName", &ClassName::FunctionToCall);
+ *
+ * In the Shell you would call this Command using:
+ * $ ClassName [ObjectName] commandNameInShell [parameters]
+ */
+#define SHELL_COMMAND_STATIC(command, class, function) \
+                         ShellCommandBase* shell_command_##class##_##command = ShellCommandStatic<class>::registerCommand(#command, #class, function)
 
 
@@ -110 +125 @@
     static bool isRegistered(const char* commandName, const char* className, unsigned int paramCount, ...);
     static const char* paramToString(long parameter);
-
-    void debugDyn();
 
   private:

trunk/src/lib/shell/shell_completion.cc

@@ -107 +107 @@
     completeType |= SHELLC_CLASS;
     completeType |= SHELLC_ALIAS;
-
   }
   else if (inputSplits.getCount() == 1 && emptyComplete == false)

trunk/src/lib/util/helper_functions.cc

@@ -29 +29 @@
 bool isBool(const char* BOOL, bool defaultValue)
 {
+  if (BOOL == NULL)
+    return defaultValue;
   if(!strcmp(BOOL, "1") || !strcmp( BOOL,"true") || !strcmp(BOOL,"TRUE"))
     return true;
@@ -40 +42 @@
 int isInt(const char* INT, int defaultValue)
 {
+  if (INT == NULL)
+    return defaultValue;
   char* endPtr = NULL;
+
   int result = strtol(INT, &endPtr, 10);
 
@@ -51 +56 @@
 float isFloat(const char* FLOAT, float defaultValue)
 {
+  if (FLOAT == NULL)
+    return defaultValue;
   char* endPtr = NULL;
   double result = strtod(FLOAT, &endPtr);