Remove trailing whitespace from everything

[xonotic/gmqcc.git] / ast.h

diff --git a/ast.h b/ast.h
index a2b5d2cb2b64220999d9e90ec11b861d9f6f4941..bcc04f1e31fb680107abd7079950010a2e1fd3c1 100644 (file)
--- a/ast.h
+++ b/ast.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 
+ * Copyright (C) 2012
  *     Wolfgang Bumiller
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -22,8 +22,6 @@
  */
 #ifndef GMQCC_AST_HDR
 #define GMQCC_AST_HDR
-
-#include "astir.h"
 #include "ir.h"
 
 /* Note: I will not be using a _t suffix for the
@@ -44,7 +42,7 @@ typedef struct ast_store_s      ast_store;
 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'
@@ -95,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;
@@ -108,7 +106,8 @@ struct ast_value_s
      */
     MEM_VECTOR_MAKE(ast_value*, params);
 };
-ast_value* ast_value_new(lex_ctx_t ctx, const char *name, int qctype, bool keep);
+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*);
 
 bool ast_value_set_name(ast_value*, const char *name);
@@ -123,14 +122,14 @@ 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?
@@ -146,12 +145,12 @@ bool ast_binary_codegen(ast_binary*, ast_function*, ir_value**);
 struct ast_store_s
 {
     ast_expression_common expression;
-    int       op;
-    ast_value *dest;
-    ast_value *source;
+    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_t ctx, int op,
-                         ast_value *d, ast_value *s);
+ast_store* ast_store_new(lex_ctx ctx, int op,
+                         ast_value *d, ast_expression *s);
 void ast_store_delete(ast_store*);
 
 bool ast_store_codegen(ast_store*, ast_function*, ir_value**);
@@ -166,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);
@@ -191,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);