fix cr/lfs and remove trailing whitespaces...

[supertux.git] / src / squirrel / squirrel / sqlexer.h

diff --git a/src/squirrel/squirrel/sqlexer.h b/src/squirrel/squirrel/sqlexer.h
index 3f13c6b..52993e5 100644 (file)
--- a/src/squirrel/squirrel/sqlexer.h
+++ b/src/squirrel/squirrel/sqlexer.h
@@ -1,42 +1,45 @@
-/*     see copyright notice in squirrel.h */\r
-#ifndef _SQLEXER_H_\r
-#define _SQLEXER_H_\r
-\r
-#define MAX_STRING 2024\r
-\r
-struct SQLexer\r
-{\r
-       SQLexer();\r
-       ~SQLexer();\r
-       void Init(SQSharedState *ss,SQLEXREADFUNC rg,SQUserPointer up);\r
-       int Lex();\r
-       SQObjectPtr Tok2Str(int tok);\r
-private:\r
-       int GetIDType(SQChar *s);\r
-       int ReadString(int ndelim,bool verbatim);\r
-       int ReadNumber();\r
-       void LexBlockComment();\r
-       int ReadID();\r
-       void Next();\r
-       int _curtoken;\r
-       SQTable *_keywords;\r
-public:\r
-       int _prevtoken;\r
-       int _currentline;\r
-       int _lasttokenline;\r
-       int _currentcolumn;\r
-       const SQChar *_svalue;\r
-       SQInteger _nvalue;\r
-       SQFloat _fvalue;\r
-       SQLEXREADFUNC _readf;\r
-       SQUserPointer _up;\r
-#ifdef _UNICODE\r
-       SQChar _currdata;\r
-#else\r
-       unsigned char _currdata;\r
-#endif\r
-       SQSharedState *_sharedstate;\r
-       sqvector<SQChar> _longstr;\r
-};\r
-\r
-#endif\r
+/*     see copyright notice in squirrel.h */
+#ifndef _SQLEXER_H_
+#define _SQLEXER_H_
+
+#ifdef _UNICODE
+typedef SQChar LexChar;
+#else
+typedef        unsigned char LexChar;
+#endif
+
+struct SQLexer
+{
+       SQLexer();
+       ~SQLexer();
+       void Init(SQSharedState *ss,SQLEXREADFUNC rg,SQUserPointer up,CompilerErrorFunc efunc,void *ed);
+       void Error(const SQChar *err);
+       SQInteger Lex();
+       const SQChar *Tok2Str(SQInteger tok);
+private:
+       SQInteger GetIDType(SQChar *s);
+       SQInteger ReadString(SQInteger ndelim,bool verbatim);
+       SQInteger ReadNumber();
+       void LexBlockComment();
+       SQInteger ReadID();
+       void Next();
+       SQInteger _curtoken;
+       SQTable *_keywords;
+public:
+       SQInteger _prevtoken;
+       SQInteger _currentline;
+       SQInteger _lasttokenline;
+       SQInteger _currentcolumn;
+       const SQChar *_svalue;
+       SQInteger _nvalue;
+       SQFloat _fvalue;
+       SQLEXREADFUNC _readf;
+       SQUserPointer _up;
+       LexChar _currdata;
+       SQSharedState *_sharedstate;
+       sqvector<SQChar> _longstr;
+       CompilerErrorFunc _errfunc;
+       void *_errtarget;
+};
+
+#endif