Rewrite constant folder in C++

[xonotic/gmqcc.git] / intrin.h

diff --git a/intrin.h b/intrin.h
index d3d2df336f4711e9eeebd276c4a1fc532e399a44..e0151d8bdabb33c1ba87b39f9240cfe5a3a26a39 100644 (file)
--- a/intrin.h
+++ b/intrin.h
@@ -2,7 +2,7 @@
 #define GMQCC_INTRIN_HDR
 #include "gmqcc.h"
 
 #define GMQCC_INTRIN_HDR
 #include "gmqcc.h"
 

-struct fold_t;
+struct fold;

 struct parser_t;
 
 struct ast_function;
 struct parser_t;
 
 struct ast_function;


@@ -23,7 +23,7 @@ struct intrin {
     intrin(parser_t *parser);
 
     ast_expression *debug_typestring();
     intrin(parser_t *parser);
 
     ast_expression *debug_typestring();

-    ast_expression *fold(ast_value *val, ast_expression **exprs);
+    ast_expression *do_fold(ast_value *val, ast_expression **exprs);

     ast_expression *func_try(size_t offset, const char *compare);
     ast_expression *func_self(const char *name, const char *from);
     ast_expression *func(const char *name);
     ast_expression *func_try(size_t offset, const char *compare);
     ast_expression *func_self(const char *name, const char *from);
     ast_expression *func(const char *name);


@@ -65,10 +65,9 @@ protected:
 
 private:
     parser_t *m_parser;
 
 private:
     parser_t *m_parser;

-    fold_t *m_fold;
+    fold *m_fold;

     std::vector<intrin_func_t> m_intrinsics;
     std::vector<ast_expression*> m_generated;
     std::vector<intrin_func_t> m_intrinsics;
     std::vector<ast_expression*> m_generated;

-

 };
 
 
 };