s/PIC_OBJECT_HEADER/OBJECT_HEADER/g
This commit is contained in:
parent
17ccaea236
commit
17d75f915f
|
@ -17,18 +17,18 @@ KHASH_DECLARE(env, struct identifier *, symbol *)
|
||||||
KHASH_DECLARE(dict, symbol *, pic_value)
|
KHASH_DECLARE(dict, symbol *, pic_value)
|
||||||
KHASH_DECLARE(weak, struct object *, pic_value)
|
KHASH_DECLARE(weak, struct object *, pic_value)
|
||||||
|
|
||||||
#define PIC_OBJECT_HEADER \
|
#define OBJECT_HEADER \
|
||||||
unsigned char tt; \
|
unsigned char tt; \
|
||||||
char gc_mark;
|
char gc_mark;
|
||||||
|
|
||||||
struct object; /* defined in gc.c */
|
struct object; /* defined in gc.c */
|
||||||
|
|
||||||
struct basic {
|
struct basic {
|
||||||
PIC_OBJECT_HEADER
|
OBJECT_HEADER
|
||||||
};
|
};
|
||||||
|
|
||||||
struct identifier {
|
struct identifier {
|
||||||
PIC_OBJECT_HEADER
|
OBJECT_HEADER
|
||||||
union {
|
union {
|
||||||
struct string *str;
|
struct string *str;
|
||||||
struct identifier *id;
|
struct identifier *id;
|
||||||
|
@ -37,54 +37,54 @@ struct identifier {
|
||||||
};
|
};
|
||||||
|
|
||||||
struct env {
|
struct env {
|
||||||
PIC_OBJECT_HEADER
|
OBJECT_HEADER
|
||||||
khash_t(env) map;
|
khash_t(env) map;
|
||||||
struct env *up;
|
struct env *up;
|
||||||
struct string *lib;
|
struct string *lib;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct pair {
|
struct pair {
|
||||||
PIC_OBJECT_HEADER
|
OBJECT_HEADER
|
||||||
pic_value car;
|
pic_value car;
|
||||||
pic_value cdr;
|
pic_value cdr;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct blob {
|
struct blob {
|
||||||
PIC_OBJECT_HEADER
|
OBJECT_HEADER
|
||||||
unsigned char *data;
|
unsigned char *data;
|
||||||
int len;
|
int len;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct string {
|
struct string {
|
||||||
PIC_OBJECT_HEADER
|
OBJECT_HEADER
|
||||||
struct rope *rope;
|
struct rope *rope;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct dict {
|
struct dict {
|
||||||
PIC_OBJECT_HEADER
|
OBJECT_HEADER
|
||||||
khash_t(dict) hash;
|
khash_t(dict) hash;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct weak {
|
struct weak {
|
||||||
PIC_OBJECT_HEADER
|
OBJECT_HEADER
|
||||||
khash_t(weak) hash;
|
khash_t(weak) hash;
|
||||||
struct weak *prev; /* for GC */
|
struct weak *prev; /* for GC */
|
||||||
};
|
};
|
||||||
|
|
||||||
struct vector {
|
struct vector {
|
||||||
PIC_OBJECT_HEADER
|
OBJECT_HEADER
|
||||||
pic_value *data;
|
pic_value *data;
|
||||||
int len;
|
int len;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct data {
|
struct data {
|
||||||
PIC_OBJECT_HEADER
|
OBJECT_HEADER
|
||||||
const pic_data_type *type;
|
const pic_data_type *type;
|
||||||
void *data;
|
void *data;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct context {
|
struct context {
|
||||||
PIC_OBJECT_HEADER
|
OBJECT_HEADER
|
||||||
pic_value *regs;
|
pic_value *regs;
|
||||||
int regc;
|
int regc;
|
||||||
struct context *up;
|
struct context *up;
|
||||||
|
@ -92,7 +92,7 @@ struct context {
|
||||||
};
|
};
|
||||||
|
|
||||||
struct proc {
|
struct proc {
|
||||||
PIC_OBJECT_HEADER
|
OBJECT_HEADER
|
||||||
union {
|
union {
|
||||||
struct {
|
struct {
|
||||||
pic_func_t func;
|
pic_func_t func;
|
||||||
|
@ -107,13 +107,13 @@ struct proc {
|
||||||
};
|
};
|
||||||
|
|
||||||
struct record {
|
struct record {
|
||||||
PIC_OBJECT_HEADER
|
OBJECT_HEADER
|
||||||
pic_value type;
|
pic_value type;
|
||||||
pic_value datum;
|
pic_value datum;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct error {
|
struct error {
|
||||||
PIC_OBJECT_HEADER
|
OBJECT_HEADER
|
||||||
symbol *type;
|
symbol *type;
|
||||||
struct string *msg;
|
struct string *msg;
|
||||||
pic_value irrs;
|
pic_value irrs;
|
||||||
|
@ -121,12 +121,12 @@ struct error {
|
||||||
};
|
};
|
||||||
|
|
||||||
struct port {
|
struct port {
|
||||||
PIC_OBJECT_HEADER
|
OBJECT_HEADER
|
||||||
xFILE *file;
|
xFILE *file;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct checkpoint {
|
struct checkpoint {
|
||||||
PIC_OBJECT_HEADER
|
OBJECT_HEADER
|
||||||
struct proc *in;
|
struct proc *in;
|
||||||
struct proc *out;
|
struct proc *out;
|
||||||
int depth;
|
int depth;
|
||||||
|
|
Loading…
Reference in New Issue