mergelines flag for the lexer to handle a backslash-newline

[xonotic/gmqcc.git] / lexer.h

diff --git a/lexer.h b/lexer.h
index 0fbe61fc2e0cc45dfde13987a7ca0edc718a918d..b8e2e01f8449c1654ae298ffcff3181f6d58d5cb 100644 (file)
--- a/lexer.h
+++ b/lexer.h
@@ -8,7 +8,7 @@ typedef struct token_s token;
 struct token_s {
        int ttype;
 
-       MEM_VECTOR_MAKE(char, value);
+       char *value;
 
        union {
                vector v;
@@ -119,15 +119,14 @@ typedef struct {
            bool noops;
            bool nodigraphs; /* used when lexing string constants */
            bool preprocessing; /* whitespace and EOLs become actual tokens */
+           bool mergelines; /* backslash at the end of a line escapes the newline */
        } flags;
 
     int framevalue;
-       MEM_VECTOR_MAKE(frame_macro, frames);
+       frame_macro *frames;
        char *modelname;
 } lex_file;
 
-MEM_VECTOR_PROTO(lex_file, char, token);
-
 lex_file* lex_open (const char *file);
 lex_file* lex_open_string(const char *str, size_t len, const char *name);
 void      lex_close(lex_file   *lex);
@@ -167,6 +166,7 @@ static const oper_info c_operators[] = {
 
     { ".",   2, opid1('.'),         ASSOC_LEFT,  15, 0 },
     { "(",   0, opid1('('),         ASSOC_LEFT,  15, 0 }, /* function call */
+    { "[",   2, opid1('['),         ASSOC_LEFT,  15, 0 }, /* array subscript */
 
     { "!",   1, opid2('!', 'P'),    ASSOC_RIGHT, 14, OP_PREFIX },
     { "~",   1, opid2('~', 'P'),    ASSOC_RIGHT, 14, OP_PREFIX },
@@ -227,6 +227,7 @@ static const oper_info qcc_operators[] = {
 
     { ".",   2, opid1('.'),         ASSOC_LEFT,  15, 0 },
     { "(",   0, opid1('('),         ASSOC_LEFT,  15, 0 }, /* function call */
+    { "[",   2, opid1('['),         ASSOC_LEFT,  15, 0 }, /* array subscript */
 
     { "!",   1, opid2('!', 'P'),    ASSOC_RIGHT, 14, OP_PREFIX },
     { "+",   1, opid2('+','P'),     ASSOC_RIGHT, 14, OP_PREFIX },