X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=parser.h;h=f9f0ab56e74c63f9ef8c994450c523c1ab8827b0;hp=b1c7a2085d298753f848deefc642aabca16df1e4;hb=e2ba77a5461096cb4f4a337ef3d8c2ef46552f97;hpb=cc693705755f277d33bb2fb3c1a801491294dcd9 diff --git a/parser.h b/parser.h index b1c7a20..f9f0ab5 100644 --- a/parser.h +++ b/parser.h @@ -1,72 +1,38 @@ -/* - * 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" +#include "intrin.h" -typedef struct intrin_s intrin_t; -typedef struct parser_s parser_t; - -typedef struct { - struct parser_s *parser; - ast_value **imm_float; /* vector */ - ast_value **imm_vector; /* vector */ - ast_value **imm_string; /* vector */ - hash_table_t *imm_string_untranslate; /* map */ - hash_table_t *imm_string_dotranslate; /* map */ -} fold_t; - -typedef struct { - ast_expression *(*intrin)(intrin_t *); - const char *name; - const char *alias; - size_t args; -} intrin_func_t; - -struct intrin_s { - intrin_func_t *intrinsics; /* vector */ - parser_t *parser; - fold_t *fold; +struct parser_t; + +struct fold_t { + parser_t *parser; + std::vector imm_float; + std::vector imm_vector; + std::vector imm_string; + hash_table_t *imm_string_untranslate; /* map */ + hash_table_t *imm_string_dotranslate; /* map */ }; #define parser_ctx(p) ((p)->lex->tok.ctx) -struct parser_s { +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 globals; + std::vector fields; + std::vector functions; + size_t translated; /* must be deleted first, they reference immediates and values */ - ast_value **accessors; + std::vector accessors; ast_value *nil; ast_value *reserved_version; @@ -75,15 +41,15 @@ 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 labels; + std::vector gotos; + std::vector breaks; + std::vector continues; /* A list of hashtables for each scope */ ht *variables; @@ -91,16 +57,12 @@ 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; @@ -112,10 +74,10 @@ struct parser_s { bool noref; /* collected information */ - size_t max_param_count; + size_t max_param_count; - fold_t *fold; - intrin_t *intrin; + fold_t *fold; + intrin m_intrin; }; @@ -126,22 +88,15 @@ 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_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_superfluous (ast_expression *, ast_expression *, int); +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