(#395) Make region print eval errors on stdout

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

diff --git a/src/script/expr.h b/src/script/expr.h
index d5a1904a57a3146095eb4c39da4fe599928adc50..25e03a5fc1d6f14b74d83ab1125b9969e2045072 100644 (file)
--- a/src/script/expr.h
+++ b/src/script/expr.h
@@ -1,8 +1,9 @@
 #ifndef EXPR_H_
 #define EXPR_H_
 
-#include <stdlib.h>
 #include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 typedef struct Gc Gc;
 typedef struct Scope Scope;
@@ -13,10 +14,13 @@ struct Atom;
 #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 NATIVE(G, F) atom_as_expr(create_native_atom(G, F))
+#define NATIVE(G, F, P) atom_as_expr(create_native_atom(G, F, P))
 #define CONS(G, CAR, CDR) cons_as_expr(create_cons(G, CAR, CDR))
 #define NIL(G) SYMBOL(G, "nil")
 
+#define CAR(O) ((O).cons->car)
+#define CDR(O) ((O).cons->cdr)
+
 enum ExprType
 {
     EXPR_ATOM = 0,
@@ -38,7 +42,8 @@ struct Expr cons_as_expr(struct Cons *cons);
 struct Expr void_expr(void);
 
 void destroy_expr(struct Expr expr);
-void print_expr_as_sexpr(struct Expr expr);
+void print_expr_as_sexpr(FILE *stream, struct Expr expr);
+int expr_as_sexpr(struct Expr expr, char *output, size_t n);
 
 // TODO(#337): EvalResult does not belong to expr unit
 struct EvalResult
@@ -47,7 +52,14 @@ struct EvalResult
     struct Expr expr;
 };
 
-typedef struct EvalResult (*NativeFunction)(Gc *gc, struct Scope *scope, struct Expr args);
+
+typedef struct EvalResult (*NativeFunction)(void *param, Gc *gc, struct Scope *scope, struct Expr args);
+
+struct Native
+{
+    NativeFunction fun;
+    void *param;
+};
 
 enum AtomType
 {
@@ -66,16 +78,16 @@ struct Atom
         long int num;           // ATOM_NUMBER
         char *sym;              // ATOM_SYMBOL
         char *str;              // ATOM_STRING
-        NativeFunction fun;     // ATOM_NATIVE
+        struct Native native;   // ATOM_NATIVE
     };
 };
 
 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);
-struct Atom *create_native_atom(Gc *gc, NativeFunction fun);
+struct Atom *create_native_atom(Gc *gc, NativeFunction fun, void *param);
 void destroy_atom(struct Atom *atom);
-void print_atom_as_sexpr(struct Atom *atom);
+void print_atom_as_sexpr(FILE *stream, struct Atom *atom);
 
 struct Cons
 {
@@ -85,6 +97,6 @@ struct Cons
 
 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);
+void print_cons_as_sexpr(FILE *stream, struct Cons *cons);
 
 #endif  // EXPR_H_