Implemented "reverse" enum attribute, e.g enum : reverse { A, B, C, D } -> A,B,C...

[xonotic/gmqcc.git] / parser.c

diff --git a/parser.c b/parser.c
index 970837ffdcab15b7f4cb4f78cd9515db781739ed..a5c039a4c2691a688af8b540256d64a7a651ba34 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -3960,6 +3960,7 @@ static bool parse_statement(parser_t *parser, ast_block *block, ast_expression *
 static bool parse_enum(parser_t *parser)
 {
     bool        flag = false;
 static bool parse_enum(parser_t *parser)
 {
     bool        flag = false;

+    bool        reverse = false;

     qcfloat     num = 0;
     ast_value **values = NULL;
     ast_value  *var = NULL;
     qcfloat     num = 0;
     ast_value **values = NULL;
     ast_value  *var = NULL;


@@ -3974,19 +3975,28 @@ static bool parse_enum(parser_t *parser)
 
     /* enumeration attributes (can add more later) */
     if (parser->tok == ':') {
 
     /* enumeration attributes (can add more later) */
     if (parser->tok == ':') {

-        if (!parser_next(parser) || parser->tok != TOKEN_IDENT || strcmp(parser_tokval(parser), "flag")) {
-            parseerror(parser, "expected `flag` after enumeration attribute ':'");
+        if (!parser_next(parser) || parser->tok != TOKEN_IDENT){
+            parseerror(parser, "expected `flag` or `reverse` for enumeration attribute");

             return false;
         }
 
             return false;
         }
 

-        if (!parser_next(parser) || parser->tok != '{') {
-            parseerror(parser, "expected `{` after enum attribute `flag`");
+        /* attributes? */
+        if (!strcmp(parser_tokval(parser), "flag")) {
+            num  = 1;
+            flag = true;
+        }
+        else if (!strcmp(parser_tokval(parser), "reverse")) {
+            reverse = true;
+        }
+        else {
+            parseerror(parser, "invalid attribute `%s` for enumeration", parser_tokval(parser));

             return false;
         }
 
             return false;
         }
 

-        /* flagged enumeration start from 1 */
-        num  = 1;
-        flag = true;
+        if (!parser_next(parser) || parser->tok != '{') {
+            parseerror(parser, "expected `{` after enum attribute ");
+            return false;
+        }

     }
 
     while (true) {
     }
 
     while (true) {


@@ -4015,7 +4025,6 @@ static bool parse_enum(parser_t *parser)
 
         /* for flagged enumerations increment in POTs of TWO */
         var->constval.vfloat = (flag) ? (num *= 2) : (num ++);
 
         /* for flagged enumerations increment in POTs of TWO */
         var->constval.vfloat = (flag) ? (num *= 2) : (num ++);

-

         parser_addglobal(parser, var->name, (ast_expression*)var);
 
         if (!parser_next(parser)) {
         parser_addglobal(parser, var->name, (ast_expression*)var);
 
         if (!parser_next(parser)) {


@@ -4054,6 +4063,13 @@ static bool parse_enum(parser_t *parser)
         }
     }
 
         }
     }
 

+    /* patch them all (for reversed attribute) */
+    if (reverse) {
+        size_t i;
+        for (i = 0; i < vec_size(values); i++)
+            values[i]->constval.vfloat = vec_size(values) - i - 1;
+    }
+

     if (parser->tok != '}') {
         parseerror(parser, "internal error: breaking without `}`");
         goto onerror;
     if (parser->tok != '}') {
         parseerror(parser, "internal error: breaking without `}`");
         goto onerror;