X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=ast.h;h=411a75851c42e89a7eaee4745b705aa9b0f7e095;hp=4cbd453411e709d007f59c04cd18e2113c7f407f;hb=a5e1f40b85faff802b8471c25ba9eb6f51e98ed5;hpb=c692794eb59e9ea97ecf47903ce7b7c90eab5268

diff --git a/ast.h b/ast.h
index 4cbd453..411a758 100644
--- a/ast.h
+++ b/ast.h
@@ -20,10 +20,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef GMQCC_AST_H__
-#define GMQCC_AST_H__
-
-#include "astir.h"
+#ifndef GMQCC_AST_HDR
+#define GMQCC_AST_HDR
 #include "ir.h"
 
 /* Note: I will not be using a _t suffix for the
@@ -37,18 +35,29 @@ typedef struct ast_value_s      ast_value;
 typedef struct ast_function_s   ast_function;
 typedef struct ast_block_s      ast_block;
 typedef struct ast_binary_s     ast_binary;
+typedef struct ast_store_s      ast_store;
 
 /* Node interface with common components
  */
 typedef void ast_node_delete(ast_node*);
 typedef struct
 {
-    lex_ctx_t        context;
+    lex_ctx          context;
     /* I don't feel comfortable using keywords like 'delete' as names... */
     ast_node_delete *destroy;
+    /* keep: if a node contains this node, 'keep'
+     * prevents its dtor from destroying this node as well.
+     */
+    bool             keep;
 } ast_node_common;
 
 #define ast_delete(x) ( ( (ast_node*)(x) ) -> node.destroy )((ast_node*)(x))
+#define ast_unref(x) do                     \
+{                                           \
+    if (! (((ast_node*)(x))->node.keep) ) { \
+        ast_delete(x);                      \
+    }                                       \
+} while(0)
 
 /* Expression interface
  *
@@ -84,7 +93,7 @@ struct ast_value_s
     union {
         double        vfloat;
         int           vint;
-        vector_t      vvec;
+        vector        vvec;
         const char   *vstring;
         int           ventity;
         ast_function *vfunc;
@@ -97,10 +106,11 @@ struct ast_value_s
      */
     MEM_VECTOR_MAKE(ast_value*, params);
 };
-ast_value* ast_value_new(lex_ctx_t ctx, const char *name, int qctype);
+ast_value* ast_value_new(lex_ctx ctx, const char *name, int qctype);
+/* This will NOT delete an underlying ast_function */
 void ast_value_delete(ast_value*);
 
-void ast_value_set_name(ast_value*, const char *name);
+bool ast_value_set_name(ast_value*, const char *name);
 
 bool ast_value_codegen(ast_value*, ast_function*, ir_value**);
 
@@ -112,25 +122,38 @@ struct ast_binary_s
 {
     ast_expression_common expression;
 
-    int       op;
-    ast_value *left;
-    ast_value *right;
+    int             op;
+    ast_expression *left;
+    ast_expression *right;
 };
-ast_binary* ast_binary_new(lex_ctx_t  ctx,
+ast_binary* ast_binary_new(lex_ctx    ctx,
                            int        op,
-                           ast_value *left,
-                           ast_value *right);
+                           ast_expression *left,
+                           ast_expression *right);
 void ast_binary_delete(ast_binary*);
 
-/* hmm, seperate functions? */
-bool ast_bin_add_codegen(ast_binary*, ir_function*, ir_value**);
-/* ... */
+/* hmm, seperate functions?
+bool ast_block_codegen(ast_block*, ast_function*, ir_value**);
+ */
+bool ast_binary_codegen(ast_binary*, ast_function*, ir_value**);
 
-/* maybe for this one */
-bool ast_bin_store_codegen(ast_binary*, ir_function*, ir_value**);
+/* Store
+ *
+ * Stores left<-right and returns left.
+ * Specialized binary expression node
+ */
+struct ast_store_s
+{
+    ast_expression_common expression;
+    int             op;
+    ast_value      *dest; /* When we add pointers this might have to change to expression */
+    ast_expression *source;
+};
+ast_store* ast_store_new(lex_ctx ctx, int op,
+                         ast_value *d, ast_expression *s);
+void ast_store_delete(ast_store*);
 
-/* could decide what to use */
-bool ast_binary_codegen(ast_binary*, ir_function*, ir_value**);
+bool ast_store_codegen(ast_store*, ast_function*, ir_value**);
 
 /* Blocks
  *
@@ -142,7 +165,7 @@ struct ast_block_s
     MEM_VECTOR_MAKE(ast_value*,      locals);
     MEM_VECTOR_MAKE(ast_expression*, exprs);
 };
-ast_block* ast_block_new(lex_ctx_t ctx);
+ast_block* ast_block_new(lex_ctx ctx);
 void ast_block_delete(ast_block*);
 
 MEM_VECTOR_PROTO(ast_block, ast_value*, locals);
@@ -167,9 +190,12 @@ struct ast_function_s
     ast_value  *vtype;
     const char *name;
 
+    ir_function *ir_func;
+
     MEM_VECTOR_MAKE(ast_block*, blocks);
 };
-ast_function* ast_function_new(lex_ctx_t ctx, const char *name, ast_value *vtype);
+ast_function* ast_function_new(lex_ctx ctx, const char *name, ast_value *vtype);
+/* This will NOT delete the underlying ast_value */
 void ast_function_delete(ast_function*);
 
 MEM_VECTOR_PROTO(ast_function, ast_block*, blocks);