Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/

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

diff --git a/src/lisp/lisp.cpp b/src/lisp/lisp.cpp
index aa7bca9..b02b50f 100644 (file)
--- a/src/lisp/lisp.cpp
+++ b/src/lisp/lisp.cpp
@@ -1,13 +1,10 @@
-//  $Id$
+//  SuperTux
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
-//  TuxKart - a fun racing game with go-kart
-//  Copyright (C) 2004 Matthias Braun <matze@braunis.de>
-//  code in this file based on lispreader from Mark Probst
-//
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
 //
 //  This program is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,15 +12,14 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#include <config.h>
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "lisp.h"
+#include "lisp/lisp.hpp"
+
+#include <stdio.h>
+
+namespace lisp {
 
-namespace lisp
-{
-    
 Lisp::Lisp(LispType newtype)
   : type(newtype)
 {
@@ -31,22 +27,17 @@ Lisp::Lisp(LispType newtype)
 
 Lisp::~Lisp()
 {
-  if(type == TYPE_SYMBOL || type == TYPE_STRING)
-    delete[] v.string;
-  if(type == TYPE_CONS) {
-    delete v.cons.cdr;
-    delete v.cons.car;
-  }
+  // resources should be on parser obstack, so no need to delete anything
 }
 
-Lisp*
+const Lisp*
 Lisp::get_lisp(const char* name) const
 {
   for(const Lisp* p = this; p != 0; p = p->get_cdr()) {
-    Lisp* child = p->get_car();
+    const Lisp* child = p->get_car();
     if(!child || child->get_type() != TYPE_CONS)
       continue;
-    Lisp* childname = child->get_car();
+    const Lisp* childname = child->get_car();
     if(!childname)
       continue;
     std::string childName;
@@ -65,7 +56,7 @@ Lisp::print(int indent) const
 {
   for(int i = 0; i < indent; ++i)
     printf(" ");
-  
+
   if(type == TYPE_CONS) {
     printf("(\n");
     const Lisp* lisp = this;
@@ -97,3 +88,5 @@ Lisp::print(int indent) const
 }
 
 } // end of namespace lisp
+
+/* EOF */