Fcalva/cyclone
1
0
Fork 0
mirror of https://github.com/justinethier/cyclone.git synced 2025-05-24 20:45:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactoring

Browse source
This commit is contained in:
Justin Ethier 2016-04-20 21:54:03 -04:00
parent b14d25afc9
commit dfe9b477c2
1 changed files with 56 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
include/cyclone/types.h
View file

@ -233,7 +233,12 @@ typedef struct {
object *pvar; object *pvar;
} cvar_type; } cvar_type;
typedef cvar_type *cvar; typedef cvar_type *cvar;
#define make_cvar(n,v) cvar_type n; n.hdr.mark = gc_color_red; n.hdr.grayed = 0; n.tag = cvar_tag; n.pvar = v; #define make_cvar(n,v) \
cvar_type n; \
n.hdr.mark = gc_color_red; \
n.hdr.grayed = 0; \
n.tag = cvar_tag; \
n.pvar = v;
/* C Opaque type - a wrapper around a pointer of any type. /* C Opaque type - a wrapper around a pointer of any type.
Note this requires application code to free any memory Note this requires application code to free any memory
@ -244,7 +249,12 @@ typedef struct {
void *ptr; void *ptr;
} c_opaque_type; } c_opaque_type;
typedef c_opaque_type *c_opaque; typedef c_opaque_type *c_opaque;
#define make_c_opaque(var, p) c_opaque_type var; var.hdr.mark = gc_color_red; var.hdr.grayed = 0; var.tag = c_opaque_tag; var.ptr = p; #define make_c_opaque(var, p) \
c_opaque_type var; \
var.hdr.mark = gc_color_red; \
var.hdr.grayed = 0; \
var.tag = c_opaque_tag; \
var.ptr = p;
#define opaque_ptr(x) (((c_opaque)x)->ptr) #define opaque_ptr(x) (((c_opaque)x)->ptr)
@ -300,13 +310,24 @@ typedef struct {
int value; int value;
int padding; // Prevent mem corruption if sizeof(int) < sizeof(ptr) int padding; // Prevent mem corruption if sizeof(int) < sizeof(ptr)
} integer_type; } integer_type;
#define make_int(n,v) integer_type n; n.hdr.mark = gc_color_red; n.hdr.grayed = 0; n.tag = integer_tag; n.value = v; #define make_int(n,v) \
integer_type n; \
n.hdr.mark = gc_color_red; \
n.hdr.grayed = 0; \
n.tag = integer_tag; \
n.value = v;
typedef struct { typedef struct {
gc_header_type hdr; gc_header_type hdr;
tag_type tag; tag_type tag;
double value; double value;
} double_type; } double_type;
#define make_double(n,v) double_type n; n.hdr.mark = gc_color_red; n.hdr.grayed = 0; n.tag = double_tag; n.value = v; #define make_double(n,v) \
double_type n; \
n.hdr.mark = gc_color_red; \
n.hdr.grayed = 0; \
n.tag = double_tag; \
n.value = v;
#define integer_value(x) (((integer_type *) x)->value) #define integer_value(x) (((integer_type *) x)->value)
#define double_value(x) (((double_type *) x)->value) #define double_value(x) (((double_type *) x)->value)
@ -347,7 +368,13 @@ typedef struct {
FILE *fp; FILE *fp;
int mode; int mode;
} port_type; } port_type;
#define make_port(p,f,m) port_type p; p.hdr.mark = gc_color_red; p.hdr.grayed = 0; p.tag = port_tag; p.fp = f; p.mode = m; #define make_port(p,f,m) \
port_type p; \
p.hdr.mark = gc_color_red; \
p.hdr.grayed = 0; \
p.tag = port_tag; \
p.fp = f; \
p.mode = m;
/* Vector type */ /* Vector type */
@ -359,7 +386,13 @@ typedef struct {
} vector_type; } vector_type;
typedef vector_type *vector; typedef vector_type *vector;
#define make_empty_vector(v) vector_type v; v.hdr.mark = gc_color_red; v.hdr.grayed = 0; v.tag = vector_tag; v.num_elt = 0; v.elts = NULL; #define make_empty_vector(v) \
vector_type v; \
v.hdr.mark = gc_color_red; \
v.hdr.grayed = 0; \
v.tag = vector_tag; \
v.num_elt = 0; \
v.elts = NULL;
/* Bytevector type */ /* Bytevector type */
@ -371,7 +404,13 @@ typedef struct {
} bytevector_type; } bytevector_type;
typedef bytevector_type *bytevector; typedef bytevector_type *bytevector;
#define make_empty_bytevector(v) bytevector_type v; v.hdr.mark = gc_color_red; v.hdr.grayed = 0; v.tag = bytevector_tag; v.len = 0; v.data = NULL; #define make_empty_bytevector(v) \
bytevector_type v; \
v.hdr.mark = gc_color_red; \
v.hdr.grayed = 0; \
v.tag = bytevector_tag; \
v.len = 0; \
v.data = NULL;
/* Pair (cons) type */ /* Pair (cons) type */
@ -385,6 +424,16 @@ typedef cons_type *list;
typedef cons_type pair_type; typedef cons_type pair_type;
typedef pair_type *pair; typedef pair_type *pair;
#define make_cons(n,a,d) \
cons_type n; \
n.hdr.mark = gc_color_red; \
n.hdr.grayed = 0; \
n.tag = cons_tag; \
n.cons_car = a; \
n.cons_cdr = d;
#define make_cell(n,a) make_cons(n,a,NULL);
#define car(x) (((pair_type *) x)->cons_car) #define car(x) (((pair_type *) x)->cons_car)
#define cdr(x) (((pair_type *) x)->cons_cdr) #define cdr(x) (((pair_type *) x)->cons_cdr)
#define caar(x) (car(car(x))) #define caar(x) (car(car(x)))
@ -416,9 +465,6 @@ typedef pair_type *pair;
#define cdddar(x) (cdr(cdr(cdr(car(x))))) #define cdddar(x) (cdr(cdr(cdr(car(x)))))
#define cddddr(x) (cdr(cdr(cdr(cdr(x))))) #define cddddr(x) (cdr(cdr(cdr(cdr(x)))))
#define make_cons(n,a,d) \
cons_type n; n.hdr.mark = gc_color_red; n.hdr.grayed = 0; n.tag = cons_tag; n.cons_car = a; n.cons_cdr = d;
/* Closure types */ /* Closure types */
typedef struct { typedef struct {
@ -460,8 +506,6 @@ typedef closure0_type *macro;
#define mclosure1(c,f,a) closure1_type c; c.hdr.mark = gc_color_red; c.hdr.grayed = 0; c.tag = closure1_tag; \ #define mclosure1(c,f,a) closure1_type c; c.hdr.mark = gc_color_red; c.hdr.grayed = 0; c.tag = closure1_tag; \
c.fn = f; c.num_args = -1; c.elt1 = a; c.fn = f; c.num_args = -1; c.elt1 = a;
#define make_cell(n,a) make_cons(n,a,NULL);
/* Primitive types */ /* Primitive types */
typedef struct { typedef struct {
gc_header_type hdr; gc_header_type hdr;