conservatory/picrin
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into analyzer

Browse Source 
Conflicts:
	include/picrin/pair.h
	src/pair.c
This commit is contained in:
Yuichi Nishiwaki
2014-01-23 16:21:10 +09:00
parent c7811f0c39 95c5361197
commit 2e28f604a6
7 changed files with 503 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/picrin/gc.h
+4 -6
View File
@@ -9,18 +9,16 @@
extern "C" {
#endif
enum pic_gc_mark {
PIC_GC_UNMARK = 0,
PIC_GC_MARK
};
#define PIC_GC_UNMARK 0
#define PIC_GC_MARK 1
union header {
struct {
union header *ptr;
size_t size;
enum pic_gc_mark mark : 1;
unsigned int mark : 1;
} s;
long alignment[2];
long alignment[4];
};
struct heap_page {
include/picrin/pair.h
+5
View File
@@ -16,9 +16,11 @@ pic_value pic_cdr(pic_state *, pic_value);
bool pic_list_p(pic_state *, pic_value);
pic_value pic_list(pic_state *, size_t, ...);
pic_value pic_list_from_array(pic_state *, size_t, pic_value *);
pic_value pic_make_list(pic_state *, int, pic_value);
int pic_length(pic_state *, pic_value);
pic_value pic_reverse(pic_state *, pic_value);
pic_value pic_append(pic_state *, pic_value, pic_value);
pic_value pic_assq(pic_state *, pic_value key, pic_value assoc);
pic_value pic_assoc(pic_state *, pic_value key, pic_value assoc);
@@ -29,7 +31,10 @@ pic_value pic_cadr(pic_state *, pic_value);
pic_value pic_cdar(pic_state *, pic_value);
pic_value pic_cddr(pic_state *, pic_value);
pic_value pic_list_tail(pic_state *, pic_value ,int);
pic_value pic_list_ref(pic_state *, pic_value, int);
void pic_list_set(pic_state *, pic_value, int, pic_value);
pic_value pic_list_copy(pic_state *, pic_value);
#if defined(__cplusplus)
}