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

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

diff --git a/src/lisp/lexer.hpp b/src/lisp/lexer.hpp
index 8128b13..7a79e79 100644 (file)
--- a/src/lisp/lexer.hpp
+++ b/src/lisp/lexer.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux
 //  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
-//  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
@@ -14,14 +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.
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef __LISPLEXER_H__
-#define __LISPLEXER_H__
+#ifndef HEADER_SUPERTUX_LISP_LEXER_HPP
+#define HEADER_SUPERTUX_LISP_LEXER_HPP
 
-namespace lisp
-{
+#include <istream>
+
+namespace lisp {
 
 class Lexer
 {
@@ -37,7 +35,7 @@ public:
     TOKEN_TRUE,
     TOKEN_FALSE
   };
-    
+
   Lexer(std::istream& stream);
   ~Lexer();
 
@@ -46,26 +44,33 @@ public:
   { return token_string; }
   int getLineNumber() const
   { return linenumber; }
-    
+
 private:
   enum {
     MAX_TOKEN_LENGTH = 16384,
     BUFFER_SIZE = 1024
   };
-    
+
   inline void nextChar();
-    
+  inline void addChar();
+
   std::istream& stream;
   bool eof;
   int linenumber;
   char buffer[BUFFER_SIZE+1];
   char* bufend;
-  char* c;
+  char* bufpos;
+  int  c;
   char token_string[MAX_TOKEN_LENGTH + 1];
   int token_length;
+
+private:
+  Lexer(const Lexer&);
+  Lexer & operator=(const Lexer&);
 };
 
 } // end of namespace lisp
 
 #endif
 
+/* EOF */