Changeset 6185 for code

Timestamp:

Nov 30, 2009, 11:32:53 PM (15 years ago)

Author:

rgrieder

Message:

Extended ExprParser to support arbitrary variables. You can set them with ExprParser::setVariable.

Location:

code/branches/presentation2/src/libraries

Files:

• core/ConsoleCommandCompilation.cc (modified) (1 diff)
• util/ExprParser.cc (modified) (3 diffs)
• util/ExprParser.h (modified) (3 diffs)

code/branches/presentation2/src/libraries/core/ConsoleCommandCompilation.cc

@@ -158 +158 @@
     float calculate(const std::string& calculation)
     {
-        ExprParser expr(calculation);
+        ExprParser expr;
+        expr.parse(calculation);
         if (expr.getSuccess())
         {

code/branches/presentation2/src/libraries/util/ExprParser.cc

@@ -47 +47 @@
 namespace orxonox
 {
-    ExprParser::ExprParser(const std::string& str)
+    ExprParser::ExprParser()
     {
         this->failed_ = false;
+        this->variables_["pi"] = 3.1415926535897932;
+        this->variables_["e"] = 2.7182818284590452;
+    }
+
+    void ExprParser::setVariable(const std::string& varname, double value)
+    {
+        this->variables_[varname] = value;
+    }
+
+    void ExprParser::parse(const std::string& str)
+    {
         this->reading_stream = str.c_str();
         if (str.size() == 0 || *reading_stream == '\0')
@@ -343 +354 @@
             else
             {
-#define SWITCH word
-                CASE_1("pi")
-                    value = 3.1415926535897932;
-                CASE("e")
-                    value = 2.7182818284590452;
-                CASE_ELSE
+                std::map<std::string, double>::const_iterator it = this->variables_.find(word);
+                if (it != this->variables_.end())
+                    value = it->second;
+                else
                 {
                     this->failed_ = true;
@@ -358 +367 @@
         }
         else if (*reading_stream == 40)
-        {  // expresion in paranthesis
+        {  // expression in parenthesis
             ++reading_stream;
             value = parse_last_argument();

code/branches/presentation2/src/libraries/util/ExprParser.h

@@ -36 +36 @@
 
 #include "UtilPrereqs.h"
+
+#include <map>
 #include <string>
 
@@ -71 +73 @@
 
 
-        ExprParser(const std::string& str);
+        ExprParser();
+        void parse(const std::string& str);
         const std::string& getRemains() { return  this->remains_; }
         double             getResult()  { return  this->result_; }
         bool               getSuccess() { return !this->failed_; }
+
+        void setVariable(const std::string& varname, double value);
 
     private:
@@ -97 +102 @@
         double result_;
         std::string remains_;
-
+        std::map<std::string, double> variables_;
     };