refactoring

Author: thradams

src/parser.c

@@ -3563,28 +3563,28 @@ struct static_assert_declaration* static_assert_declaration(struct parser_ctx* c
         parser_match_tk(ctx, TK_KEYWORD__STATIC_ASSERT, error);
         parser_match_tk(ctx, '(', error);
         struct expression_ctx ectx = { .bConstantExpressionRequired = true };
-        p_static_assert_declaration->p_conditional_expression = constant_expression(ctx, error, &ectx);
+        p_static_assert_declaration->constant_expression = constant_expression(ctx, error, &ectx);
 
         if (error->code != 0)
             throw;
 
         if (ctx->current->type == ',')
         {
             parser_match(ctx);
-            p_static_assert_declaration->text_opt = ctx->current;
+            p_static_assert_declaration->string_literal_opt = ctx->current;
             parser_match_tk(ctx, TK_STRING_LITERAL, error);
         }
 
         parser_match_tk(ctx, ')', error);
         p_static_assert_declaration->last_token = ctx->current;
         parser_match_tk(ctx, ';', error);
 
-        if (p_static_assert_declaration->p_conditional_expression->constant_value == 0)
+        if (p_static_assert_declaration->constant_expression->constant_value == 0)
         {
-            if (p_static_assert_declaration->text_opt)
+            if (p_static_assert_declaration->string_literal_opt)
             {
                 parser_seterror_with_token(ctx, position, "_Static_assert failed %s\n",
-                    p_static_assert_declaration->text_opt->lexeme);
+                    p_static_assert_declaration->string_literal_opt->lexeme);
             }
             else
             {

src/parser.h

@@ -152,10 +152,16 @@ struct declaration_specifiers* declaration_specifiers(struct parser_ctx* ctx, st
 
 struct static_assert_declaration
 {
+    /*
+     static_assert-declaration:
+       "static_assert" ( constant-expression , string-literal ) ;
+       "static_assert" ( constant-expression ) ;
+    */
+
     struct token* first_token;
     struct token* last_token;
-    struct expression* p_conditional_expression;
-    struct token* text_opt;
+    struct expression* constant_expression;
+    struct token* string_literal_opt;
 };
 struct static_assert_declaration* static_assert_declaration(struct parser_ctx* ctx, struct error* error);
 

src/visit.c

@@ -1042,7 +1042,7 @@ static void visit_block_item_list(struct visit_ctx* ctx, struct block_item_list*
 
 static void visit_static_assert_declaration(struct visit_ctx* ctx, struct static_assert_declaration* p_static_assert_declaration, struct error* error)
 {
-    visit_expression(ctx, p_static_assert_declaration->p_conditional_expression, error);
+    visit_expression(ctx, p_static_assert_declaration->constant_expression, error);
 
     if (ctx->target < LANGUAGE_C11)
     {
@@ -1062,7 +1062,7 @@ static void visit_static_assert_declaration(struct visit_ctx* ctx, struct static
     }
     else if (ctx->target == LANGUAGE_C11)
     {
-        if (p_static_assert_declaration->text_opt == NULL)
+        if (p_static_assert_declaration->string_literal_opt == NULL)
         {
             struct token* rp = previous_parser_token(p_static_assert_declaration->last_token);
             rp = previous_parser_token(rp);