Happy new year redux!

[xonotic/gmqcc.git] / parser.h

diff --git a/parser.h b/parser.h
index d4c8dddd5e65c80c2fa70de221ddd6d9123c1c39..51140be9781325ed369c37acfadad595575d7498 100644 (file)
--- a/parser.h
+++ b/parser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2013
+ * Copyright (C) 2012, 2013, 2014
  *     Wolfgang Bumiller
  *     Dale Weiler
  *
@@ -43,10 +43,12 @@ 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<intrin_func_t> */
+    intrin_func_t  *intrinsics;              /* vector<intrin_func_t>   */
+    ast_expression **generated;              /* vector<ast_expression*> */
     parser_t       *parser;
     fold_t         *fold;
 };
@@ -132,7 +134,9 @@ 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 **);
 
-int             fold_cond           (ir_value *, ast_function *, ast_ifthen *);
+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);