TODO(#330)

[nothing.git] / src / script / expr.h

diff --git a/src/script/expr.h b/src/script/expr.h
index cc317f05d76799871c2e490f7bde04fd91e43c6c..d3607579e382b6995a9a07c87aeb63b47eb945fd 100644 (file)
--- a/src/script/expr.h
+++ b/src/script/expr.h
@@ -1,13 +1,26 @@
 #ifndef ATOM_H_
 #define ATOM_H_
 
+#include <stdlib.h>
+#include <stdbool.h>
+
+typedef struct Gc Gc;
+
 struct Cons;
 struct Atom;
 
+// TODO(#321): get rid of gc argument from expr macros (just assume that it's `gc` in the current scope)
+#define NUMBER(G, X) atom_as_expr(create_number_atom(G, X))
+#define STRING(G, S) atom_as_expr(create_string_atom(G, S, NULL))
+#define SYMBOL(G, S) atom_as_expr(create_symbol_atom(G, S, NULL))
+#define CONS(G, CAR, CDR) cons_as_expr(create_cons(G, CAR, CDR))
+#define NIL(G) SYMBOL(G, "nil")
+
 enum ExprType
 {
     EXPR_ATOM = 0,
-    EXPR_CONS
+    EXPR_CONS,
+    EXPR_VOID
 };
 
 // TODO(#285): there is no way to execute struct Expr
@@ -22,7 +35,8 @@ struct Expr
 
 struct Expr atom_as_expr(struct Atom *atom);
 struct Expr cons_as_expr(struct Cons *cons);
-struct Expr create_expr_from_str(const char *str);
+struct Expr void_expr(void);
+
 void destroy_expr(struct Expr expr);
 void print_expr_as_sexpr(struct Expr expr);
 
@@ -38,14 +52,18 @@ struct Atom
     enum AtomType type;
     union
     {
-        int number;             // ATOM_NUMBER
-        char *name;             // ATOM_SYMBOL
-        char *text;             // ATOM_STRING
+        // TODO(#330): Atom doesn't support floats
+        long int num;               // ATOM_NUMBER
+        char *sym;             // ATOM_SYMBOL
+        char *str;             // ATOM_STRING
     };
 };
 
-struct Atom *create_atom(enum AtomType type, ...);
+struct Atom *create_number_atom(Gc *gc, long int num);
+struct Atom *create_string_atom(Gc *gc, const char *str, const char *str_end);
+struct Atom *create_symbol_atom(Gc *gc, const char *sym, const char *sym_end);
 void destroy_atom(struct Atom *atom);
+void print_atom_as_sexpr(struct Atom *atom);
 
 struct Cons
 {
@@ -53,7 +71,8 @@ struct Cons
     struct Expr cdr;
 };
 
-struct Cons *create_cons(struct Expr car, struct Expr cdr);
+struct Cons *create_cons(Gc *gc, struct Expr car, struct Expr cdr);
 void destroy_cons(struct Cons *cons);
+void print_cons_as_sexpr(struct Cons *cons);
 
 #endif  // ATOM_H_