Patchs by Matt McCutche to fix Treeboss related Bugs 469 and 504.

[supertux.git] / src / lisp / lisp.hpp

diff --git a/src/lisp/lisp.hpp b/src/lisp/lisp.hpp
index 2f14625..099e13b 100644 (file)
--- a/src/lisp/lisp.hpp
+++ b/src/lisp/lisp.hpp
@@ -31,7 +31,7 @@ class Lisp
 {
 public:
   ~Lisp();
-    
+
   enum LispType {
     TYPE_CONS,
     TYPE_SYMBOL,
@@ -42,27 +42,33 @@ public:
   };
 
   LispType get_type() const
-  { return type; } 
+  { return type; }
 
-  Lisp* get_car() const
+  const Lisp* get_car() const
   { return v.cons.car; }
-  Lisp* get_cdr() const
+  const Lisp* get_cdr() const
   { return v.cons.cdr; }
-  
+
   bool get(std::string& val) const
-  { 
+  {
     if(type != TYPE_STRING && type != TYPE_SYMBOL)
       return false;
     val = v.string;
     return true;
   }
-  
+
+  std::string get_symbol() const
+  {
+    assert(type == TYPE_SYMBOL);
+    return v.string;
+  }
+
   std::string get_string() const
   {
     assert(type == TYPE_STRING);
     return v.string;
   }
-  
+
   bool get(unsigned int& val) const
   {
     if(type != TYPE_INTEGER)
@@ -70,7 +76,7 @@ public:
     val = v.integer;
     return true;
   }
-  
+
   bool get(int& val) const
   {
     if(type != TYPE_INTEGER)
@@ -84,12 +90,12 @@ public:
     assert(type == TYPE_INTEGER);
     return v.integer;
   }
-  
+
   bool get(float& val) const
   {
     if(type != TYPE_REAL) {
       if(type == TYPE_INTEGER) {
-        val = v.integer;
+        val = (float) v.integer;
         return true;
       }
       return false;
@@ -118,13 +124,13 @@ public:
     return v.boolean;
   }
 
-  /** conveniance functions which traverse the list until a child with a
+  /** convenience functions which traverse the list until a child with a
    * specified name is found. The value part is then interpreted in a specific
    * way. The functions return true, if a child was found and could be
    * interpreted correctly, otherwise false is returned and the variable value
    * is not changed.
    * (Please note that searching the lisp structure is O(n) so these functions
-   *  are no good idea for performance critical areas)
+   *  are not a good idea for performance critical areas)
    */
   template<class T>
   bool get(const char* name, T& val) const
@@ -142,14 +148,14 @@ public:
   }
 
   template<class T>
-  bool get_vector(const char* name, std::vector<T>& vec) const
+  bool get(const char* name, std::vector<T>& vec) const
   {
     vec.clear();
-    
+
     const Lisp* child = get_lisp(name);
     if(!child)
       return false;
-    
+
     for( ; child != 0; child = child->get_cdr()) {
       T val;
       if(!child->get_car())
@@ -158,12 +164,12 @@ public:
         vec.push_back(val);
       }
     }
-    
+
     return true;
   }
-  
-  Lisp* get_lisp(const char* name) const;
-  Lisp* get_lisp(const std::string& name) const
+
+  const Lisp* get_lisp(const char* name) const;
+  const Lisp* get_lisp(const std::string& name) const
   { return get_lisp(name.c_str()); }
 
   // for debugging
@@ -178,8 +184,8 @@ private:
   {
     struct
     {
-      Lisp* car;
-      Lisp* cdr;
+      const Lisp* car;
+      const Lisp* cdr;
     } cons;
 
     char* string;
@@ -192,4 +198,3 @@ private:
 } // end of namespace lisp
 
 #endif
-