X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=parser.h;h=a09238df68d768dbd1d0f2fbee2bc5165c0d5686;hp=08692107b93dcf061cccff5032c095e77ee14cf9;hb=163c4b99a4bef8746fc9d3caa8dc6c54c11d4955;hpb=920dbaf1e09f6dce8cc8dd703ed2bfdec62fae38

diff --git a/parser.h b/parser.h
index 0869210..a09238d 100644
--- a/parser.h
+++ b/parser.h
@@ -1,55 +1,31 @@
-/*
- * Copyright (C) 2012, 2013
- *     Wolfgang Bumiller
- *     Dale Weiler
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 #ifndef GMQCC_PARSER_HDR
 #define GMQCC_PARSER_HDR
 #include "gmqcc.h"
 #include "lexer.h"
-#include "ast.h"
-
-typedef struct {
-    struct parser_s *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*> */
-} fold_t;
-
-#define parser_ctx(p)    ((p)->lex->tok.ctx)
-typedef struct parser_s {
+//#include "ast.h"
+
+#include "intrin.h"
+#include "fold.h"
+
+struct parser_t;
+
+#define parser_ctx(p) ((p)->lex->tok.ctx)
+
+struct parser_t {
+    parser_t() { }
+
     lex_file *lex;
-    int      tok;
+    int tok;
 
-    bool     ast_cleaned;
+    bool ast_cleaned;
 
-    ast_expression **globals;
-    ast_expression **fields;
-    ast_function **functions;
-    size_t         translated;
+    std::vector<ast_expression *> globals;
+    std::vector<ast_expression *> fields;
+    std::vector<ast_function *> functions;
+    size_t translated;
 
     /* must be deleted first, they reference immediates and values */
-    ast_value    **accessors;
+    std::vector<ast_value *> accessors;
 
     ast_value *nil;
     ast_value *reserved_version;
@@ -58,15 +34,15 @@ typedef struct parser_s {
     size_t crc_fields;
 
     ast_function *function;
-    ht            aliases;
+    ht aliases;
 
     /* All the labels the function defined...
      * Should they be in ast_function instead?
      */
-    ast_label  **labels;
-    ast_goto   **gotos;
-    const char **breaks;
-    const char **continues;
+    std::vector<ast_label*> labels;
+    std::vector<ast_goto*> gotos;
+    std::vector<const char *> breaks;
+    std::vector<const char *> continues;
 
     /* A list of hashtables for each scope */
     ht *variables;
@@ -74,16 +50,12 @@ typedef struct parser_s {
     ht htglobals;
     ht *typedefs;
 
-    /* same as above but for the spelling corrector */
-    correct_trie_t  **correct_variables;
-    size_t         ***correct_variables_score;  /* vector of vector of size_t* */
-
     /* 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;
+    size_t *_blocklocals;
+    ast_value **_typedefs;
+    size_t *_blocktypedefs;
+    lex_ctx_t *_block_ctx;
 
     /* we store the '=' operator info */
     const oper_info *assign_op;
@@ -95,20 +67,15 @@ typedef struct parser_s {
     bool noref;
 
     /* collected information */
-    size_t     max_param_count;
+    size_t max_param_count;
 
-    fold_t *fold;
-} parser_t;
+    fold m_fold;
+    intrin m_intrin;
+};
 
 
-char *parser_strdup(const char *str);
+/* parser.c */
+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);
-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**);
 #endif