Changeset 1118 for code/branches/input/src/orxonox/Orxonox.cc

Timestamp:

Apr 20, 2008, 4:31:03 PM (16 years ago)

Author:

rgrieder

Message:

• classed FloatParser to ExprParser class

File:

• code/branches/input/src/orxonox/Orxonox.cc (modified) (2 diffs)

code/branches/input/src/orxonox/Orxonox.cc

@@ -54 +54 @@
 //#include "util/Sleep.h"
 #include "util/ArgReader.h"
-#include "util/FloatParser.h"
+#include "util/ExprParser.h"
 
 // core
@@ -130 +130 @@
     static void calculate(std::string calculation)
     {
-      char** useless = 0;
-      double result = 0.0;
-      bool success = parse_float((char* const)calculation.c_str(), useless, &result);
-      if (success)
-      {
-        if (result == 42.0)
+      ExprParser expr(calculation);
+      if (expr.getSuccess())
+      {
+        if (expr.getResult() == 42.0)
           std::cout << "Greetings from the restaurant at the end of the universe." << std::endl;
-        std::cout << "Result is: " << result << std::endl;
+        // FIXME: insert modifier to display in full precision
+        std::cout << "Result is: " << expr.getResult() << std::endl;
+        if (expr.getRemains() != "")
+          std::cout << "Warning: Expression could not be parsed to the end! Remains: '"
+              << expr.getRemains() << "'" << std::endl;
       }
       else