Added Doxyfile, updated Makefile, reformatted.
This commit is contained in:
parent
3112f190db
commit
88fd7d95d9
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -16,3 +16,5 @@ src/\.#*
|
|||
\.idea/
|
||||
|
||||
post-scarcity\.iml
|
||||
|
||||
doc/
|
||||
|
|
12
Makefile
12
Makefile
|
@ -3,9 +3,12 @@ TARGET ?= target/psse
|
|||
SRC_DIRS ?= ./src
|
||||
|
||||
SRCS := $(shell find $(SRC_DIRS) -name *.cpp -or -name *.c -or -name *.s)
|
||||
HDRS := $(shell find $(SRC_DIRS) -name *.h)
|
||||
OBJS := $(addsuffix .o,$(basename $(SRCS)))
|
||||
DEPS := $(OBJS:.o=.d)
|
||||
|
||||
TESTS := $(shell find unit-tests -name *.sh)
|
||||
|
||||
INC_DIRS := $(shell find $(SRC_DIRS) -type d)
|
||||
INC_FLAGS := $(addprefix -I,$(INC_DIRS))
|
||||
INDENT_FLAGS := -kr -br -brf -brs -ce -cdw -npsl -nut -prs -l79 -ts2
|
||||
|
@ -18,10 +21,13 @@ LDFLAGS := -lm
|
|||
$(TARGET): $(OBJS) Makefile
|
||||
$(CC) $(LDFLAGS) $(OBJS) -DVERSION=$(VERSION) -o $@ $(LDFLAGS) $(LOADLIBES) $(LDLIBS)
|
||||
|
||||
format:
|
||||
indent $(INDENT_FLAGS) $(SRCS) src/*.h
|
||||
doc: $(SRCS) Makefile
|
||||
doxygen
|
||||
|
||||
test:
|
||||
format: $(SRCS) $(HDRS) Makefile
|
||||
indent $(INDENT_FLAGS) $(SRCS) $(HDRS)
|
||||
|
||||
test: $(OBJS) $(TESTS) Makefile
|
||||
bash ./unit-tests.sh
|
||||
|
||||
.PHONY: clean
|
||||
|
|
|
@ -81,7 +81,9 @@ struct cons_pointer c_cdr( struct cons_pointer arg ) {
|
|||
* @param env the evaluation environment.
|
||||
* @return the result of evaluating the form.
|
||||
*/
|
||||
struct cons_pointer eval_form( struct stack_frame *parent, struct cons_pointer form, struct cons_pointer env) {
|
||||
struct cons_pointer eval_form( struct stack_frame *parent,
|
||||
struct cons_pointer form,
|
||||
struct cons_pointer env ) {
|
||||
fputws( L"eval_form: ", stderr );
|
||||
print( stderr, form );
|
||||
fputws( L"\n", stderr );
|
||||
|
@ -161,8 +163,7 @@ c_apply( struct stack_frame *frame, struct cons_pointer env ) {
|
|||
* @param pointer a pointer to the object whose type is requested.
|
||||
* @return As a Lisp string, the tag of the object which is at that pointer.
|
||||
*/
|
||||
struct cons_pointer
|
||||
c_type( struct cons_pointer pointer) {
|
||||
struct cons_pointer c_type( struct cons_pointer pointer ) {
|
||||
char *buffer = malloc( TAGLENGTH + 1 );
|
||||
memset( buffer, 0, TAGLENGTH + 1 );
|
||||
struct cons_space_object cell = pointer2cell( pointer );
|
||||
|
@ -489,9 +490,8 @@ lisp_cond( struct stack_frame *frame, struct cons_pointer env ) {
|
|||
} else if ( nilp( clause_pointer ) ) {
|
||||
done = true;
|
||||
} else {
|
||||
lisp_throw(
|
||||
c_string_to_lisp_string( "Arguments to `cond` must be lists"),
|
||||
frame);
|
||||
lisp_throw( c_string_to_lisp_string
|
||||
( "Arguments to `cond` must be lists" ), frame );
|
||||
}
|
||||
}
|
||||
/* TODO: if there are more than 8 clauses we need to continue into the
|
||||
|
|
|
@ -28,8 +28,7 @@
|
|||
* @param pointer a pointer to the object whose type is requested.
|
||||
* @return As a Lisp string, the tag of the object which is at that pointer.
|
||||
*/
|
||||
struct cons_pointer
|
||||
c_type( struct cons_pointer pointer);
|
||||
struct cons_pointer c_type( struct cons_pointer pointer );
|
||||
|
||||
/*
|
||||
* special forms
|
||||
|
|
|
@ -157,9 +157,7 @@ void dump_frame( FILE * output, struct stack_frame *frame ) {
|
|||
|
||||
fwprintf( output, L"Arg %d:\t%c%c%c%c\t", arg,
|
||||
cell.tag.bytes[0],
|
||||
cell.tag.bytes[1],
|
||||
cell.tag.bytes[2],
|
||||
cell.tag.bytes[3]);
|
||||
cell.tag.bytes[1], cell.tag.bytes[2], cell.tag.bytes[3] );
|
||||
|
||||
print( output, frame->arg[arg] );
|
||||
fputws( L"\n", output );
|
||||
|
|
Loading…
Reference in a new issue