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 6068295..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 ===
@@ -38,23 +41,29 @@ enum eTokens
        TOK_INVAL,
        TOK_EOF,
        
+       // Primitives
        TOK_STR,
        TOK_INTEGER,
+       TOK_REAL,
        TOK_VARIABLE,
        TOK_IDENT,
        
+       // Reserved Words
+       // - Definitions
        TOK_RWD_FUNCTION,
        TOK_RWD_NAMESPACE,
-       
+       // - Control Flow
        TOK_RWD_NEW,
        TOK_RWD_RETURN,
-       
+       TOK_RWD_BREAK,
+       TOK_RWD_CONTINUE,
+       // - Blocks
        TOK_RWD_IF,
        TOK_RWD_ELSE,
        TOK_RWD_DO,
        TOK_RWD_WHILE,
        TOK_RWD_FOR,
-       
+       // - Types
        TOK_RWD_VOID,
        TOK_RWD_OBJECT,
        TOK_RWD_OPAQUE,
@@ -62,28 +71,37 @@ enum eTokens
        TOK_RWD_INTEGER,
        TOK_RWD_REAL,
        
+       // 
        TOK_ASSIGN,
        TOK_SEMICOLON,
        TOK_COMMA,
        TOK_SCOPE,
        TOK_ELEMENT,
        
+       // Comparisons
        TOK_EQUALS,
        TOK_LT, TOK_LTE,
        TOK_GT, TOK_GTE,
        
+       // Operations
+       TOK_BWNOT,      TOK_LOGICNOT,
        TOK_DIV,        TOK_MUL,
        TOK_PLUS,       TOK_MINUS,
        TOK_SHL,        TOK_SHR,
        TOK_LOGICAND,   TOK_LOGICOR,    TOK_LOGICXOR,
        TOK_AND,        TOK_OR, TOK_XOR,
        
-       TOK_PAREN_OPEN,
-       TOK_PAREN_CLOSE,
-       TOK_BRACE_OPEN,
-       TOK_BRACE_CLOSE,
-       TOK_SQUARE_OPEN,
-       TOK_SQUARE_CLOSE,
+       // Assignment Operations
+       TOK_INCREMENT,          TOK_DECREMENT,
+       TOK_ASSIGN_DIV,         TOK_ASSIGN_MUL,
+       TOK_ASSIGN_PLUS,        TOK_ASSIGN_MINUS,
+       TOK_ASSIGN_SHL,         TOK_ASSIGN_SHR,
+       TOK_ASSIGN_LOGICAND,    TOK_ASSIGN_LOGICOR,     TOK_ASSIGN_LOGXICOR,
+       TOK_ASSIGN_AND,         TOK_ASSIGN_OR,  TOK_ASSIGN_XOR,
+       
+       TOK_PAREN_OPEN,         TOK_PAREN_CLOSE,
+       TOK_BRACE_OPEN,         TOK_BRACE_CLOSE,
+       TOK_SQUARE_OPEN,        TOK_SQUARE_CLOSE,
        
        TOK_LAST
 };
@@ -103,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)
@@ -115,6 +133,7 @@ const char * const csaTOKEN_NAMES[] = {
        
        "TOK_STR",
        "TOK_INTEGER",
+       "TOK_REAL",
        "TOK_VARIABLE",
        "TOK_IDENT",
        
@@ -123,6 +142,8 @@ const char * const csaTOKEN_NAMES[] = {
        
        "TOK_RWD_NEW",
        "TOK_RWD_RETURN",
+       "TOK_RWD_BREAK",
+       "TOK_RWD_CONTINUE",
        
        "TOK_RWD_IF",
        "TOK_RWD_ELSE",
@@ -147,18 +168,23 @@ 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",
        "TOK_LOGICAND", "TOK_LOGICOR",  "TOK_LOGICXOR",
        "TOK_AND",      "TOK_OR",       "TOK_XOR",
        
-       "TOK_PAREN_OPEN",
-       "TOK_PAREN_CLOSE",
-       "TOK_BRACE_OPEN",
-       "TOK_BRACE_CLOSE",
-       "TOK_SQUARE_OPEN",
-       "TOK_SQUARE_CLOSE",
+       "TOK_INCREMENT",        "TOK_DECREMENT",
+       "TOK_ASSIGN_DIV",       "TOK_ASSIGN_MUL",
+       "TOK_ASSIGN_PLUS",      "TOK_ASSIGN_MINUS",
+       "TOK_ASSIGN_SHL",       "TOK_ASSIGN_SHR",
+       "TOK_ASSIGN_LOGICAND",  "TOK_ASSIGN_LOGICOR",   "TOK_ASSIGN_LOGICXOR",
+       "TOK_ASSIGN_AND",       "TOK_ASSIGN_OR",        "TOK_ASSIGN_XOR",
+       
+       "TOK_PAREN_OPEN",       "TOK_PAREN_CLOSE",
+       "TOK_BRACE_OPEN",       "TOK_BRACE_CLOSE",
+       "TOK_SQUARE_OPEN",      "TOK_SQUARE_CLOSE",
        
        "TOK_LAST"
 };