parse_expression_leave: also end at a closing } - enum: check for } and , after an...

diff --git a/parser.c b/parser.c
index 8090be4206c9b6e17a9bb2de23072626060b6f73..f99fd790cc0ac1e4a643c9315c762aa615801b63 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -1957,7 +1957,7 @@ static ast_expression* parse_expression_leave(parser_t *parser, bool stopatcomma
             goto onerr;
         }
         if (parser->tok == ';' ||
             goto onerr;
         }
         if (parser->tok == ';' ||

-            (!parens && (parser->tok == ']' || parser->tok == ')')))
+            (!parens && (parser->tok == ']' || parser->tok == ')' || parser->tok == '}')))

         {
             break;
         }
         {
             break;
         }


@@ -3508,6 +3508,13 @@ static bool parse_enum(parser_t *parser)
             goto onerror;
         }
         num = (var->constval.vfloat = asvalue->constval.vfloat) + 1;
             goto onerror;
         }
         num = (var->constval.vfloat = asvalue->constval.vfloat) + 1;

+
+        if (parser->tok == '}')
+            break;
+        if (parser->tok != ',') {
+            parseerror(parser, "expected `}` or comma after expression");
+            goto onerror;
+        }

     }
 
     if (parser->tok != '}') {
     }
 
     if (parser->tok != '}') {