Merge pull request #187 from divVerent/patch-1

[xonotic/gmqcc.git] / parser.h

diff --git a/parser.h b/parser.h
index 49c76c9b8061ce02435897957241f5b17ea34ddc..e5361a8aae020ba1c8ac8d2e2d74bcc78a55ecc9 100644 (file)
--- a/parser.h
+++ b/parser.h
@@ -4,35 +4,19 @@
 #include "lexer.h"
 #include "ast.h"
 
-struct parser_t;
-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*> */
-    hash_table_t *imm_string_untranslate; /* map<string, ast_value*> */
-    hash_table_t *imm_string_dotranslate; /* map<string, ast_value*> */
-};
+#include "intrin.h"
+#include "fold.h"
 
-struct intrin_func_t {
-    ast_expression *(*intrin)(intrin_t *);
-    const char *name;
-    const char *alias;
-    size_t args;
-};
-
-struct intrin_t {
-    intrin_func_t  *intrinsics;              /* vector<intrin_func_t>   */
-    ast_expression **generated;              /* vector<ast_expression*> */
-    parser_t       *parser;
-    fold_t         *fold;
-};
+struct parser_t;
 
 #define parser_ctx(p) ((p)->lex->tok.ctx)
 
 struct parser_t {
+    parser_t();
+    ~parser_t();
+
+    void remove_ast();
+
     lex_file *lex;
     int tok;
 
@@ -64,17 +48,17 @@ struct parser_t {
     std::vector<const char *> continues;
 
     /* A list of hashtables for each scope */
-    ht *variables;
+    std::vector<ht> variables;
     ht htfields;
     ht htglobals;
-    ht *typedefs;
+    std::vector<ht> typedefs;
 
     /* not to be used directly, we use the hash table */
-    ast_expression **_locals;
-    size_t *_blocklocals;
-    ast_value **_typedefs;
-    size_t *_blocktypedefs;
-    lex_ctx_t *_block_ctx;
+    std::vector<ast_expression*> _locals;
+    std::vector<size_t> _blocklocals;
+    std::vector<std::unique_ptr<ast_value>> _typedefs;
+    std::vector<size_t> _blocktypedefs;
+    std::vector<lex_ctx_t> _block_ctx;
 
     /* we store the '=' operator info */
     const oper_info *assign_op;
@@ -88,8 +72,8 @@ struct parser_t {
     /* collected information */
     size_t max_param_count;
 
-    fold_t *fold;
-    intrin_t *intrin;
+    fold m_fold;
+    intrin m_intrin;
 };
 
 
@@ -97,25 +81,4 @@ struct parser_t {
 char           *parser_strdup     (const char *str);
 ast_expression *parser_find_global(parser_t *parser, const char *name);
 
-/* fold.c */
-fold_t         *fold_init           (parser_t *);
-void            fold_cleanup        (fold_t *);
-ast_expression *fold_constgen_float (fold_t *, qcfloat_t, bool);
-ast_expression *fold_constgen_vector(fold_t *, vec3_t);
-ast_expression *fold_constgen_string(fold_t *, const char *, bool);
-bool            fold_generate       (fold_t *, ir_builder *);
-ast_expression *fold_op             (fold_t *, const oper_info *, ast_expression **);
-ast_expression *fold_intrin         (fold_t *, const char      *, ast_expression **);
-
-ast_expression *fold_binary         (lex_ctx_t ctx, int, ast_expression *, ast_expression *);
-int             fold_cond_ifthen    (ir_value *, ast_function *, ast_ifthen  *);
-int             fold_cond_ternary   (ir_value *, ast_function *, ast_ternary *);
-
-/* intrin.c */
-intrin_t       *intrin_init            (parser_t *parser);
-void            intrin_cleanup         (intrin_t *intrin);
-ast_expression *intrin_fold            (intrin_t *intrin, ast_value *, ast_expression **);
-ast_expression *intrin_func            (intrin_t *intrin, const char *name);
-ast_expression *intrin_debug_typestring(intrin_t *intrin);
-
 #endif