Changeset 1747 for code/trunk/src/core/CommandEvaluation.cc

Timestamp:

Sep 9, 2008, 4:25:52 AM (16 years ago)

Author:

landauf

Message:

merged core3 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/core/CommandEvaluation.cc (modified) (5 diffs)

code/trunk/src/core/CommandEvaluation.cc

@@ -30 +30 @@
 #include "ConsoleCommand.h"
 #include "Identifier.h"
-#include "Debug.h"
+#include "util/Debug.h"
 #include "util/String.h"
 
@@ -218 +218 @@
     }
 
-    void CommandEvaluation::setEvaluatedParameter(unsigned int index, MultiTypeMath param)
+    void CommandEvaluation::setEvaluatedParameter(unsigned int index, MultiType param)
     {
         if (index >= 0 && index < MAX_FUNCTOR_ARGUMENTS)
@@ -224 +224 @@
     }
 
-    MultiTypeMath CommandEvaluation::getEvaluatedParameter(unsigned int index) const
+    MultiType CommandEvaluation::getEvaluatedParameter(unsigned int index) const
     {
         if (index >= 0 && index < MAX_FUNCTOR_ARGUMENTS)
@@ -240 +240 @@
     }
 
-    MultiTypeMath CommandEvaluation::getReturnvalue() const
+    MultiType CommandEvaluation::getReturnvalue() const
     {
         if (this->function_)
             return this->function_->getReturnvalue();
 
-        return MultiTypeMath();
+        return MultiType();
     }
 
@@ -304 +304 @@
 
             if (command->defaultValueSet(i))
-                output += "=" + command->getDefaultValue(i).toString() + "]";
+                output += "=" + command->getDefaultValue(i).getString() + "]";
             else
                 output += "}";