Changeset 1119

Timestamp:

Apr 20, 2008, 7:21:53 PM (17 years ago)

Author:

landauf

Message:

small fix

Location:

code/branches/input/src

Files:

• orxonox/Orxonox.cc (modified) (1 diff)
• util/ExprParser.cc (modified) (4 diffs)
• util/ExprParser.h (modified) (1 diff)

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

@@ -128 +128 @@
   {
   public:
-    static void calculate(std::string calculation)
+    static void calculate(const std::string& calculation)
     {
       ExprParser expr(calculation);

code/branches/input/src/util/ExprParser.cc

@@ -44 +44 @@
 #define PARSE_BLANKS while (*reading_stream == ' ') ++reading_stream;
 
-ExprParser::ExprParser(std::string& str)
+ExprParser::ExprParser(const std::string& str)
 {
   this->failed_ = false;
@@ -234 +234 @@
    PARSE_BLANKS
    double value;
-   
+
    unary_operator op = parse_unary_operator();
    PARSE_BLANKS
@@ -299 +299 @@
             value = ceil(parse_last_argument());
          CASE("abs")
-            value = abs(parse_last_argument());
+            value = fabs(parse_last_argument());
          CASE("exp")
             value = exp(parse_last_argument());
@@ -364 +364 @@
      return 0;
    }
- 
+
    PARSE_BLANKS
    switch (op)

code/branches/input/src/util/ExprParser.h

@@ -65 +65 @@
     u_plus,
     u_minus,
-    u_nicht 
+    u_nicht
   };
 
 
-  ExprParser(std::string& str);
+  ExprParser(const std::string& str);
   std::string& getRemains() { return  this->remains_; }
   double       getResult()  { return  this->result_; }