s/NULL/nullptr/

[xonotic/gmqcc.git] / parser.h

diff --git a/parser.h b/parser.h
index 49c76c9b8061ce02435897957241f5b17ea34ddc..2393fcea7ef1081f0d6d5cb6b9ee32abc9ee8665 100644 (file)
--- a/parser.h
+++ b/parser.h
@@ -9,9 +9,9 @@ struct intrin_t;
 
 struct fold_t {
     parser_t *parser;
-    ast_value **imm_float;              /* vector<ast_value*> */
-    ast_value **imm_vector;             /* vector<ast_value*> */
-    ast_value **imm_string;             /* vector<ast_value*> */
+    std::vector<ast_value*> imm_float;
+    std::vector<ast_value*> imm_vector;
+    std::vector<ast_value*> imm_string;
     hash_table_t *imm_string_untranslate; /* map<string, ast_value*> */
     hash_table_t *imm_string_dotranslate; /* map<string, ast_value*> */
 };
@@ -24,10 +24,10 @@ struct intrin_func_t {
 };
 
 struct intrin_t {
-    intrin_func_t  *intrinsics;              /* vector<intrin_func_t>   */
-    ast_expression **generated;              /* vector<ast_expression*> */
-    parser_t       *parser;
-    fold_t         *fold;
+    std::vector<intrin_func_t> intrinsics;
+    std::vector<ast_expression*> generated;
+    parser_t *parser;
+    fold_t *fold;
 };
 
 #define parser_ctx(p) ((p)->lex->tok.ctx)