Fcalva/cyclone
1
0
Fork 0
mirror of https://github.com/justinethier/cyclone.git synced 2025-07-12 07:17:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactoring

Browse source
This commit is contained in:
Justin Ethier 2016-04-20 23:45:35 -04:00
parent 6a5713da36
commit aa85e34002
4 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/cyclone/runtime.h
View file

@ -78,8 +78,8 @@ object Cyc_global_set(void *thd, object *glo, object value);
var[i].hdr.mark = gc_color_red; \ var[i].hdr.mark = gc_color_red; \
var[i].hdr.grayed = 0; \ var[i].hdr.grayed = 0; \
var[i].tag = pair_tag; \ var[i].tag = pair_tag; \
var[i].cons_car = tmp; \ var[i].pair_car = tmp; \
var[i].cons_cdr = (i == (count-1)) ? NULL : &var[i + 1]; \ var[i].pair_cdr = (i == (count-1)) ? NULL : &var[i + 1]; \
} \ } \
va_end(va); \ va_end(va); \
} \ } \

14
include/cyclone/types.h
View file

@ -195,7 +195,7 @@ typedef enum { STAGE_CLEAR_OR_MARKING, STAGE_TRACING
#endif #endif
#define type_of(obj) (((pair_type *) obj)->tag) #define type_of(obj) (((pair_type *) obj)->tag)
#define forward(obj) (((pair_type *) obj)->cons_car) #define forward(obj) (((pair_type *) obj)->pair_car)
/** Define value types. /** Define value types.
* Depending on the underlying architecture, compiler, etc these types * Depending on the underlying architecture, compiler, etc these types
@ -417,8 +417,8 @@ typedef bytevector_type *bytevector;
typedef struct { typedef struct {
gc_header_type hdr; gc_header_type hdr;
tag_type tag; tag_type tag;
object cons_car; object pair_car;
object cons_cdr; object pair_cdr;
} pair_type; } pair_type;
typedef pair_type *list; typedef pair_type *list;
typedef pair_type *pair; typedef pair_type *pair;
@ -428,13 +428,13 @@ typedef pair_type *pair;
n.hdr.mark = gc_color_red; \ n.hdr.mark = gc_color_red; \
n.hdr.grayed = 0; \ n.hdr.grayed = 0; \
n.tag = pair_tag; \ n.tag = pair_tag; \
n.cons_car = a; \ n.pair_car = a; \
n.cons_cdr = d; n.pair_cdr = d;
#define make_cell(n,a) make_pair(n,a,NULL); #define make_cell(n,a) make_pair(n,a,NULL);
#define car(x) (((pair_type *) x)->cons_car) #define car(x) (((pair_type *) x)->pair_car)
#define cdr(x) (((pair_type *) x)->cons_cdr) #define cdr(x) (((pair_type *) x)->pair_cdr)
#define caar(x) (car(car(x))) #define caar(x) (car(car(x)))
#define cadr(x) (car(cdr(x))) #define cadr(x) (car(cdr(x)))
#define cdar(x) (cdr(car(x))) #define cdar(x) (cdr(car(x)))

16
runtime.c
View file

@ -1422,8 +1422,8 @@ object Cyc_command_line_arguments(void *data, object cont) {
((list)pl)->hdr.mark = gc_color_red; ((list)pl)->hdr.mark = gc_color_red;
((list)pl)->hdr.grayed = 0; ((list)pl)->hdr.grayed = 0;
((list)pl)->tag = pair_tag; ((list)pl)->tag = pair_tag;
((list)pl)->cons_car = ps; ((list)pl)->pair_car = ps;
((list)pl)->cons_cdr = lis; ((list)pl)->pair_cdr = lis;
lis = pl; lis = pl;
} }
return_closcall1(data, cont, lis); return_closcall1(data, cont, lis);
@ -2081,8 +2081,8 @@ list mcons(object a, object d)
c->hdr.mark = gc_color_red; c->hdr.mark = gc_color_red;
c->hdr.grayed = 0; c->hdr.grayed = 0;
c->tag = pair_tag; c->tag = pair_tag;
c->cons_car = a; c->pair_car = a;
c->cons_cdr = d; c->pair_cdr = d;
return c; return c;
} }
@ -2652,8 +2652,8 @@ void Cyc_apply(void *data, int argc, closure cont, object prim, ...){
args[i].hdr.mark = gc_color_red; args[i].hdr.mark = gc_color_red;
args[i].hdr.grayed = 0; args[i].hdr.grayed = 0;
args[i].tag = pair_tag; args[i].tag = pair_tag;
args[i].cons_car = tmp; args[i].pair_car = tmp;
args[i].cons_cdr = (i == (argc-1)) ? NULL : &args[i + 1]; args[i].pair_cdr = (i == (argc-1)) ? NULL : &args[i + 1];
} }
//printf("DEBUG applying primitive to "); //printf("DEBUG applying primitive to ");
//Cyc_display((object)&args[0]); //Cyc_display((object)&args[0]);
@ -2685,8 +2685,8 @@ void Cyc_apply_from_buf(void *data, int argc, object prim, object *buf) {
args[i - 1].hdr.mark = gc_color_red; args[i - 1].hdr.mark = gc_color_red;
args[i - 1].hdr.grayed = 0; args[i - 1].hdr.grayed = 0;
args[i - 1].tag = pair_tag; args[i - 1].tag = pair_tag;
args[i - 1].cons_car = buf[i]; args[i - 1].pair_car = buf[i];
args[i - 1].cons_cdr = (i == (argc-1)) ? NULL : &args[i]; args[i - 1].pair_cdr = (i == (argc-1)) ? NULL : &args[i];
} }
apply(data, cont, prim, (object)&args[0]); apply(data, cont, prim, (object)&args[0]);

4
scheme/process-context.sld
View file

@ -29,8 +29,8 @@
((list)pl)->hdr.mark = gc_color_red; ((list)pl)->hdr.mark = gc_color_red;
((list)pl)->hdr.grayed = 0; ((list)pl)->hdr.grayed = 0;
((list)pl)->tag = pair_tag; ((list)pl)->tag = pair_tag;
((list)pl)->cons_car = ps; ((list)pl)->pair_car = ps;
((list)pl)->cons_cdr = lis; ((list)pl)->pair_cdr = lis;
lis = pl; lis = pl;
} }
return_closcall1(data, k, lis); ") return_closcall1(data, k, lis); ")