SpiderScript - Fixing order of operations, improved error handling and cleanup

[tpg/acess2.git] / Usermode / Libraries / libspiderscript.so_src / tokens.h

diff --git a/Usermode/Libraries/libspiderscript.so_src/tokens.h b/Usermode/Libraries/libspiderscript.so_src/tokens.h
index 5a529f7..8d041e9 100644 (file)
--- a/Usermode/Libraries/libspiderscript.so_src/tokens.h
+++ b/Usermode/Libraries/libspiderscript.so_src/tokens.h
@@ -9,22 +9,25 @@
 typedef struct
 {      
        // Lexer State
-       char    *BufStart;
-       char    *CurPos;
+       const char      *BufStart;
+       const char      *CurPos;
+       
+       const char      *Filename;
        
         int    LastLine;
         int    LastToken, LastTokenLen;
-       char    *LastTokenStr;
+       const char      *LastTokenStr;
        
         int    NextLine;
         int    NextToken, NextTokenLen;
-       char    *NextTokenStr;
+       const char      *NextTokenStr;
        
         int    CurLine;
         int    Token, TokenLen;
-       char    *TokenStr;
+       const char      *TokenStr;
        
        jmp_buf JmpTarget;
+        int    ErrorHit;
 }      tParser;
 
 // === FUNCTIONS ===
@@ -41,6 +44,7 @@ enum eTokens
        // Primitives
        TOK_STR,
        TOK_INTEGER,
+       TOK_REAL,
        TOK_VARIABLE,
        TOK_IDENT,
        
@@ -80,6 +84,7 @@ enum eTokens
        TOK_GT, TOK_GTE,
        
        // Operations
+       TOK_BWNOT,      TOK_LOGICNOT,
        TOK_DIV,        TOK_MUL,
        TOK_PLUS,       TOK_MINUS,
        TOK_SHL,        TOK_SHR,
@@ -116,7 +121,7 @@ enum eTokens
        case TOK_RWD_OBJECT: _type = SS_DATATYPE_OBJECT;        break;\
        case TOK_RWD_REAL:   _type = SS_DATATYPE_REAL;  break;\
        case TOK_RWD_STRING: _type = SS_DATATYPE_STRING;        break;\
-       default:fprintf(stderr,\
+       default:_type=SS_DATATYPE_UNDEF;fprintf(stderr,\
        "ERROR: Unexpected %s, expected "TOKEN_GROUP_TYPES_STR"\n",csaTOKEN_NAMES[Parser->Token]);\
        break;\
        } } while(0)
@@ -128,6 +133,7 @@ const char * const csaTOKEN_NAMES[] = {
        
        "TOK_STR",
        "TOK_INTEGER",
+       "TOK_REAL",
        "TOK_VARIABLE",
        "TOK_IDENT",
        
@@ -162,6 +168,7 @@ const char * const csaTOKEN_NAMES[] = {
        "TOK_LT",       "TOK_LTE",
        "TOK_GT",       "TOK_GTE",
        
+       "TOK_BWNOT",    "TOK_LOGICNOT",
        "TOK_DIV",      "TOK_MUL",
        "TOK_PLUS",     "TOK_MINUS",
        "TOK_SHL",      "TOK_SHR",