carp-lang/Carp
1
1
Fork 0
mirror of https://github.com/carp-lang/Carp.git synced 2024-10-12 04:58:18 +03:00
Code Issues Projects Releases Wiki Activity

changed name of the error globla variable to eval_error

Browse Source
This commit is contained in:
Erik Svedäng 2016-02-11 11:06:06 +01:00
parent 241b1d20f6
commit 1b61dfd278
8 changed files with 100 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lisp/core.carp
View File

@ -213,6 +213,7 @@
(register-builtin "printf" '((:ref :string)) :void)
(register-builtin "print" '((:ref :string)) :void)
(register-builtin "println" '((:ref :string)) :void)
;;(register-builtin "error" '((:ref :string)) :void)
(register-builtin "sleep" '(:int) :void)
(register-builtin "nullQMARK" '(:any) :bool)
(register-builtin "not" '(:bool) :bool)

2
lisp/examples.carp
View File

@ -59,3 +59,5 @@
(defn soon ()
(crash-soon))

2
shared/shared.h
View File

@ -41,6 +41,8 @@ void panic(string msg) {
exit(1);
}
void print(string msg) {
printf("%s", msg);
}

4
src/assertions.h
View File

@ -4,12 +4,12 @@
#define assert_or_return_nil(assertion, ...) if(!(assertion)) { printf(_VA_ARGS_); printf("\n"); return; }
#define set_error(message, obj) \
error = concat_c_strings((message), obj_to_string((obj) ? (obj) : nil)->s); \
eval_error = concat_c_strings((message), obj_to_string((obj) ? (obj) : nil)->s); \
stack_push(nil); \
return;
#define set_error_and_return(message, obj) \
error = concat_c_strings((message), obj_to_string((obj) ? (obj) : nil)->s); \
eval_error = concat_c_strings((message), obj_to_string((obj) ? (obj) : nil)->s); \
return nil;
#define assert_or_set_error(assertion, message, obj) \

74
src/eval.c
View File

@ -38,7 +38,7 @@ void stack_push(Obj *o) {
}
Obj *stack_pop() {
if(error) {
if(eval_error) {
return nil;
}
if(stack_pos <= 0) {
@ -211,7 +211,7 @@ void apply(Obj *function, Obj **args, int arg_count) {
assert(function);
if(!function->funptr) {
error = obj_new_string("Can't call foregin function, it's funptr is NULL. May be a stub function with just a signature?");
eval_error = obj_new_string("Can't call foregin function, it's funptr is NULL. May be a stub function with just a signature?");
return;
}
@ -345,23 +345,23 @@ void apply(Obj *function, Obj **args, int arg_count) {
}
else if(function->tag == 'K') {
if(arg_count != 1) {
error = obj_new_string("Args to keyword lookup must be a single arg.");
eval_error = obj_new_string("Args to keyword lookup must be a single arg.");
}
else if(args[0]->tag != 'E') {
error = obj_new_string("Arg 0 to keyword lookup must be a dictionary: ");
obj_string_mut_append(error, obj_to_string(args[0])->s);
eval_error = obj_new_string("Arg 0 to keyword lookup must be a dictionary: ");
obj_string_mut_append(eval_error, obj_to_string(args[0])->s);
}
else {
Obj *value = env_lookup(args[0], function);
if(value) {
stack_push(value);
} else {
error = obj_new_string("Failed to lookup keyword '");
obj_string_mut_append(error, obj_to_string(function)->s);
obj_string_mut_append(error, "'");
obj_string_mut_append(error, " in \n");
obj_string_mut_append(error, obj_to_string(args[0])->s);
obj_string_mut_append(error, "\n");
eval_error = obj_new_string("Failed to lookup keyword '");
obj_string_mut_append(eval_error, obj_to_string(function)->s);
obj_string_mut_append(eval_error, "'");
obj_string_mut_append(eval_error, " in \n");
obj_string_mut_append(eval_error, obj_to_string(args[0])->s);
obj_string_mut_append(eval_error, "\n");
}
}
}
@ -382,7 +382,7 @@ void eval_list(Obj *env, Obj *o) {
Obj *p = o->cdr;
while(p && p->car) {
eval_internal(env, p->car);
if(error) { return; }
if(eval_error) { return; }
p = p->cdr;
if(p && p->car) {
stack_pop(); // remove result from form that is not last
@ -400,7 +400,7 @@ void eval_list(Obj *env, Obj *o) {
}
assert_or_set_error(p->car->tag == 'Y', "Must bind to symbol in let form: ", p->car);
eval_internal(let_env, p->cdr->car);
if(error) { return; }
if(eval_error) { return; }
env_extend(let_env, p->car, stack_pop());
p = p->cdr->cdr;
}
@ -414,7 +414,7 @@ void eval_list(Obj *env, Obj *o) {
while(p) {
if(p->car) {
eval_internal(env, p->car);
if(error) { return; }
if(eval_error) { return; }
if(is_true(stack_pop())) {
stack_push(lisp_false);
return;
@ -429,7 +429,7 @@ void eval_list(Obj *env, Obj *o) {
while(p) {
if(p->car) {
eval_internal(env, p->car);
if(error) { return; }
if(eval_error) { return; }
if(is_true(stack_pop())) {
stack_push(lisp_true);
return;
@ -444,7 +444,7 @@ void eval_list(Obj *env, Obj *o) {
while(p) {
if(p->car) {
eval_internal(env, p->car);
if(error) { return; }
if(eval_error) { return; }
if(!is_true(stack_pop())) {
stack_push(lisp_false);
return;
@ -465,14 +465,14 @@ void eval_list(Obj *env, Obj *o) {
assert_or_set_error(o->cdr->car, "Too few body forms in 'while' form: ", o);
assert_or_set_error(o->cdr->cdr->cdr->car == NULL, "Too many body forms in 'while' form (use explicit 'do').", o);
eval_internal(env, o->cdr->car);
if(error) {
if(eval_error) {
return;
}
while(is_true(stack_pop())) {
eval_internal(env, o->cdr->cdr->car);
stack_pop();
eval_internal(env, o->cdr->car);
if(error) {
if(eval_error) {
return;
}
}
@ -484,7 +484,7 @@ void eval_list(Obj *env, Obj *o) {
assert_or_set_error(o->cdr->cdr->cdr->car, "Too few body forms in 'if' form: ", o);
assert_or_set_error(o->cdr->cdr->cdr->cdr->car == NULL, "Too many body forms in 'if' form (use explicit 'do').", o);
eval_internal(env, o->cdr->car);
if(error) {
if(eval_error) {
return;
}
else if(is_true(stack_pop())) {
@ -496,7 +496,7 @@ void eval_list(Obj *env, Obj *o) {
}
else if(HEAD_EQ("match")) {
eval_internal(env, o->cdr->car);
if(error) { return; }
if(eval_error) { return; }
Obj *value = stack_pop();
Obj *p = o->cdr->cdr;
match(env, value, p);
@ -510,7 +510,7 @@ void eval_list(Obj *env, Obj *o) {
return;
}
eval_internal(env, o->cdr->cdr->car);
if(error) { return; }
if(eval_error) { return; }
pair->cdr = stack_pop();
stack_push(pair->cdr);
}
@ -541,7 +541,7 @@ void eval_list(Obj *env, Obj *o) {
assert_or_set_error(o->cdr->car->tag == 'Y', "Can't assign to non-symbol: ", o);
Obj *key = o->cdr->car;
eval_internal(env, o->cdr->cdr->car); // eval the second arg to 'def', the value to assign
if(error) { return; } // don't define it if there was an error
if(eval_error) { return; } // don't define it if there was an error
Obj *val = stack_pop();
global_env_extend(key, val);
//printf("def %s to %s\n", obj_to_string(key)->s, obj_to_string(val)->s);
@ -568,9 +568,9 @@ void eval_list(Obj *env, Obj *o) {
shadow_stack_pos = shadow_stack_size_save;
stack_pos = stack_size_save + 1;
if(error) {
stack_push(error);
error = NULL;
if(eval_error) {
stack_push(eval_error);
eval_error = NULL;
return;
}
else {
@ -584,7 +584,7 @@ void eval_list(Obj *env, Obj *o) {
// Lambda, primop or macro
eval_internal(env, o->car);
if(error) { return; }
if(eval_error) { return; }
Obj *function = stack_pop();
assert_or_set_error(function, "Can't call NULL.", o);
@ -595,7 +595,7 @@ void eval_list(Obj *env, Obj *o) {
int count = 0;
while(p && p->car) {
if(error) {
if(eval_error) {
shadow_stack_pop();
return;
}
@ -610,7 +610,7 @@ void eval_list(Obj *env, Obj *o) {
p = p->cdr;
}
if(error) {
if(eval_error) {
shadow_stack_pop();
return;
}
@ -628,7 +628,7 @@ void eval_list(Obj *env, Obj *o) {
env_extend_with_args(calling_env, function, count, args);
shadow_stack_push(calling_env);
eval_internal(calling_env, function->body);
if(error) { return; }
if(eval_error) { return; }
Obj *expanded = stack_pop();
if(SHOW_MACRO_EXPANSION) {
printf("Expanded macro: %s\n", obj_to_string(expanded)->s);
@ -676,12 +676,12 @@ void eval_list(Obj *env, Obj *o) {
apply(function, args, count);
//printf("apply end\n");
if(!error) {
if(!eval_error) {
function_trace_pos--;
}
}
if(!error) {
if(!eval_error) {
//printf("time to pop!\n");
for(int i = 0; i < count; i++) {
shadow_stack_pop();
@ -700,7 +700,7 @@ void eval_list(Obj *env, Obj *o) {
}
void eval_internal(Obj *env, Obj *o) {
if(error) { return; }
if(eval_error) { return; }
//shadow_stack_print();
if(LOG_EVAL) {
@ -744,7 +744,7 @@ void eval_internal(Obj *env, Obj *o) {
if(!result) {
char buffer[256];
snprintf(buffer, 256, "Can't find '%s' in environment.", obj_to_string(o)->s);
error = obj_new_string(buffer);
eval_error = obj_new_string(buffer);
stack_push(nil);
} else {
stack_push(result);
@ -756,7 +756,7 @@ void eval_internal(Obj *env, Obj *o) {
}
Obj *eval(Obj *env, Obj *form) {
error = NULL;
eval_error = NULL;
function_trace_pos = 0;
eval_internal(env, form);
Obj *result = stack_pop();
@ -769,10 +769,10 @@ void eval_text(Obj *env, char *text, bool print, Obj *filename) {
stack_push(forms);
while(form && form->car) {
Obj *result = eval(env, form->car);
if(error) {
printf("\e[31mERROR: %s\e[0m\n", obj_to_string_not_prn(error)->s);
if(eval_error) {
printf("\e[31mERROR: %s\e[0m\n", obj_to_string_not_prn(eval_error)->s);
function_trace_print();
error = NULL;
eval_error = NULL;
if(LOG_GC_POINTS) {
printf("Running GC after error occured:\n");
}

2
src/obj.c
View File

@ -315,7 +315,7 @@ bool obj_eq(Obj *a, Obj *b) {
else {
char buffer[512];
snprintf(buffer, 512, "Can't compare %s with %s.\n", obj_to_string(a)->s, obj_to_string(b)->s);
error = obj_new_string(strdup(buffer));
eval_error = obj_new_string(strdup(buffer));
return false;
}
}

2
src/obj.h
View File

@ -115,7 +115,7 @@ Obj *nil;
Obj *lisp_false;
Obj *lisp_true;
Obj *lisp_quote;
Obj *error;
Obj *eval_error;
Obj *ampersand;
Obj *lisp_NULL;

108
src/primops.c
View File

@ -92,7 +92,7 @@ Obj *p_add(Obj** args, int arg_count) {
return obj_new_float(sum);
}
else {
error = obj_new_string("Can't add non-numbers together.");
eval_error = obj_new_string("Can't add non-numbers together.");
return nil;
}
}
@ -117,7 +117,7 @@ Obj *p_sub(Obj** args, int arg_count) {
return obj_new_float(sum);
}
else {
error = obj_new_string("Can't subtract non-numbers.");
eval_error = obj_new_string("Can't subtract non-numbers.");
return nil;
}
}
@ -142,7 +142,7 @@ Obj *p_mul(Obj** args, int arg_count) {
return obj_new_float(prod);
}
else {
error = obj_new_string("Can't multiply non-numbers.");
eval_error = obj_new_string("Can't multiply non-numbers.");
return nil;
}
}
@ -167,7 +167,7 @@ Obj *p_div(Obj** args, int arg_count) {
return obj_new_float(prod);
}
else {
error = obj_new_string("Can't divide non-numbers.");
eval_error = obj_new_string("Can't divide non-numbers.");
return nil;
}
}
@ -222,15 +222,15 @@ Obj *p_str(Obj** args, int arg_count) {
Obj *p_str_append_bang(Obj** args, int arg_count) {
if(arg_count != 2) {
error = obj_new_string("'str-append!' takes exactly two arguments");
eval_error = obj_new_string("'str-append!' takes exactly two arguments");
return nil;
}
if(args[0]->tag != 'S') {
error = obj_new_string("'str-append!' arg0 invalid");
eval_error = obj_new_string("'str-append!' arg0 invalid");
return nil;
}
if(args[1]->tag != 'S') {
error = obj_new_string("'str-append!' arg1 invalid");
eval_error = obj_new_string("'str-append!' arg1 invalid");
return nil;
}
Obj *s = args[0];
@ -319,20 +319,20 @@ end_repl_str:
Obj *p_str_replace(Obj** args, int arg_count) {
if(arg_count != 3) {
error = obj_new_string("'str-replace' takes exactly three arguments");
eval_error = obj_new_string("'str-replace' takes exactly three arguments");
return nil;
}
if(args[0]->tag != 'S') {
error = obj_new_string("'str-replace' arg0 invalid: ");
obj_string_mut_append(error, obj_to_string(args[0])->s);
eval_error = obj_new_string("'str-replace' arg0 invalid: ");
obj_string_mut_append(eval_error, obj_to_string(args[0])->s);
return nil;
}
if(args[1]->tag != 'S') {
error = obj_new_string("'str-replace' arg1 invalid");
eval_error = obj_new_string("'str-replace' arg1 invalid");
return nil;
}
if(args[2]->tag != 'S') {
error = obj_new_string("'str-replace' arg2 invalid");
eval_error = obj_new_string("'str-replace' arg2 invalid");
return nil;
}
@ -345,7 +345,7 @@ Obj *p_str_replace(Obj** args, int arg_count) {
Obj *p_copy(Obj** args, int arg_count) {
if(arg_count != 1) {
error = obj_new_string("'copy' takes exactly one argument");
eval_error = obj_new_string("'copy' takes exactly one argument");
return nil;
}
Obj *a = args[0];
@ -400,13 +400,13 @@ Obj *p_get(Obj** args, int arg_count) {
obj_string_mut_append(s, "' in dict:\n");
obj_string_mut_append(s, obj_to_string(args[0])->s);
obj_string_mut_append(s, "");
error = s;
eval_error = s;
return nil;
}
}
else if(args[0]->tag == 'C') {
if(args[1]->tag != 'I') {
error = obj_new_string("get requires arg 1 to be an integer\n");
eval_error = obj_new_string("get requires arg 1 to be an integer\n");
return nil;
}
int i = 0;
@ -419,15 +419,15 @@ Obj *p_get(Obj** args, int arg_count) {
p = p->cdr;
i++;
}
error = obj_new_string("Index ");
obj_string_mut_append(error, obj_to_string(obj_new_int(i))->s);
obj_string_mut_append(error, " out of bounds in");
obj_string_mut_append(error, obj_to_string(args[0])->s);
eval_error = obj_new_string("Index ");
obj_string_mut_append(eval_error, obj_to_string(obj_new_int(i))->s);
obj_string_mut_append(eval_error, " out of bounds in");
obj_string_mut_append(eval_error, obj_to_string(args[0])->s);
return nil;
}
else {
error = obj_new_string("'get' requires arg 0 to be a dictionary or list: ");
obj_string_mut_append(error, obj_to_string(args[0])->s);
eval_error = obj_new_string("'get' requires arg 0 to be a dictionary or list: ");
obj_string_mut_append(eval_error, obj_to_string(args[0])->s);
return nil;
}
}
@ -469,7 +469,7 @@ Obj *p_dict_set_bang(Obj** args, int arg_count) {
}
else if(args[0]->tag == 'C') {
if(args[1]->tag != 'I') {
error = obj_new_string("dict-set! requires arg 1 to be an integer\n");
eval_error = obj_new_string("dict-set! requires arg 1 to be an integer\n");
return nil;
}
int i = 0;
@ -483,10 +483,10 @@ Obj *p_dict_set_bang(Obj** args, int arg_count) {
p = p->cdr;
i++;
}
error = obj_new_string("Index ");
obj_string_mut_append(error, obj_to_string(obj_new_int(i))->s);
obj_string_mut_append(error, " out of bounds in");
obj_string_mut_append(error, obj_to_string(args[0])->s);
eval_error = obj_new_string("Index ");
obj_string_mut_append(eval_error, obj_to_string(obj_new_int(i))->s);
obj_string_mut_append(eval_error, " out of bounds in");
obj_string_mut_append(eval_error, obj_to_string(args[0])->s);
return nil;
}
else {
@ -539,7 +539,7 @@ Obj *p_rest(Obj** args, int arg_count) {
if(args[0]->tag != 'C') {
char buffer[512];
snprintf(buffer, 512, "'rest' requires arg 0 to be a list: %s\n", obj_to_string(args[0])->s);
error = obj_new_string(strdup(buffer));
eval_error = obj_new_string(strdup(buffer));
return nil;
}
if(args[0]->cdr == NULL) {
@ -554,7 +554,7 @@ Obj *p_cons(Obj** args, int arg_count) {
if(args[1]->tag != 'C') {
char buffer[512];
snprintf(buffer, 512, "'cons' requires arg 1 to be a list: %s\n", obj_to_string(args[0])->s);
error = obj_new_string(strdup(buffer));
eval_error = obj_new_string(strdup(buffer));
return nil;
}
Obj *new_cons = obj_new_cons(args[0], args[1]);
@ -580,7 +580,7 @@ Obj *p_concat(Obj** args, int arg_count) {
}
for(int i = 0; i < arg_count; i++) {
if(args[0]->tag != 'C') { error = obj_new_string("'concat' requires all args to be lists\n"); return nil; }
if(args[0]->tag != 'C') { eval_error = obj_new_string("'concat' requires all args to be lists\n"); return nil; }
}
int i = 0;
@ -649,7 +649,7 @@ bool is_callable(Obj *obj) {
Obj *p_map(Obj** args, int arg_count) {
//printf("map start\n");
if(arg_count != 2) {
error = obj_new_string("Wrong argument count to 'map'.");
eval_error = obj_new_string("Wrong argument count to 'map'.");
return nil;
}
if(!is_callable(args[0])) { printf("'map' requires arg 0 to be a function or lambda: %s\n", obj_to_string(args[0])->s); return nil; }
@ -684,8 +684,8 @@ Obj *p_map2(Obj** args, int arg_count) {
if(!is_callable(args[0])) { printf("'map2' requires arg 0 to be a function or lambda: %s\n", obj_to_string(args[0])->s); return nil; }
if(args[1]->tag != 'C') { printf("'map2' requires arg 1 to be a list\n"); return nil; }
if(args[2]->tag != 'C') {
error = obj_new_string("'map2' requires arg 2 to be a list: ");
obj_string_mut_append(error, obj_to_string(args[2])->s);
eval_error = obj_new_string("'map2' requires arg 2 to be a list: ");
obj_string_mut_append(eval_error, obj_to_string(args[2])->s);
return nil;
}
Obj *f = args[0];
@ -747,8 +747,8 @@ Obj *p_values(Obj** args, int arg_count) {
}
Obj *p_signature(Obj** args, int arg_count) {
if(arg_count != 1) { error = obj_new_string("Wrong argument count to 'signature'"); return nil; }
if(args[0]->tag != 'F') { error = obj_new_string("'signature' requires arg 0 to be a foreign function."); return nil; }
if(arg_count != 1) { eval_error = obj_new_string("Wrong argument count to 'signature'"); return nil; }
if(args[0]->tag != 'F') { eval_error = obj_new_string("'signature' requires arg 0 to be a foreign function."); return nil; }
Obj *a = obj_copy(args[0]->arg_types);
Obj *b = args[0]->return_type;
Obj *sig = obj_list(obj_new_keyword("fn"), a, b);
@ -756,8 +756,8 @@ Obj *p_signature(Obj** args, int arg_count) {
}
Obj *p_null_predicate(Obj** args, int arg_count) {
if(arg_count != 1) { error = obj_new_string("Wrong argument count to 'null?'"); return nil; }
if(args[0]->tag != 'Q') { error = obj_new_string("Argument to 'null?' must be void pointer."); return nil; }
if(arg_count != 1) { eval_error = obj_new_string("Wrong argument count to 'null?'"); return nil; }
if(args[0]->tag != 'Q') { eval_error = obj_new_string("Argument to 'null?' must be void pointer."); return nil; }
if(args[0]->void_ptr == NULL) {
return lisp_true;
} else {
@ -816,12 +816,12 @@ Obj *p_apply(Obj** args, int arg_count) {
if(arg_count != 2) { printf("'apply' takes two arguments.\n"); return nil; }
if(args[0]->tag != 'P' && args[0]->tag != 'L') {
printf("'apply' requires arg 0 to be a function or lambda: %s (%c)\n", obj_to_string(args[0])->s, args[0]->tag);
error = obj_new_string("");
eval_error = obj_new_string("");
return nil;
}
if(args[1]->tag != 'C') {
printf("'apply' requires arg 1 to be a list: %s (%c)\n", obj_to_string(args[0])->s, args[0]->tag);
error = obj_new_string("");
eval_error = obj_new_string("");
return nil;
}
Obj *p = args[1];
@ -880,7 +880,7 @@ Obj *p_type(Obj** args, int arg_count) {
}
else {
printf("Unknown type tag: %c\n", args[0]->tag);
//error = obj_new_string("Unknown type.");
//eval_error = obj_new_string("Unknown type.");
return nil;
}
}
@ -904,7 +904,7 @@ Obj *p_lt(Obj** args, int arg_count) {
return lisp_true;
}
else {
error = obj_new_string("Can't call < on non-numbers.");
eval_error = obj_new_string("Can't call < on non-numbers.");
return lisp_false;
}
}
@ -923,13 +923,13 @@ Obj *p_now(Obj** args, int arg_count) {
Obj *p_name(Obj** args, int arg_count) {
if(arg_count != 1) {
error = obj_new_string("Wrong arg count to 'name'.");
eval_error = obj_new_string("Wrong arg count to 'name'.");
return nil;
}
if(args[0]->tag != 'S' && args[0]->tag != 'Y' && args[0]->tag != 'K') {
Obj *s = obj_new_string("Argument to 'name' must be string, keyword or symbol: ");
obj_string_mut_append(s, obj_to_string(args[0])->s);
error = s;
eval_error = s;
return nil;
}
return obj_new_string(args[0]->s);
@ -937,21 +937,21 @@ Obj *p_name(Obj** args, int arg_count) {
Obj *p_symbol(Obj** args, int arg_count) {
if(arg_count != 1) {
error = obj_new_string("Wrong arg count to 'symbol'.");
eval_error = obj_new_string("Wrong arg count to 'symbol'.");
return nil;
}
if(args[0]->tag != 'S') {
Obj *s = obj_new_string("Argument to 'symbol' must be string: ");
obj_string_mut_append(s, obj_to_string(args[0])->s);
error = s;
eval_error = s;
return nil;
}
return obj_new_symbol(args[0]->s);
}
Obj *p_error(Obj** args, int arg_count) {
if(arg_count != 1) { error = obj_new_string("Wrong argument count to 'error'\n"); return nil; }
error = args[0];
if(arg_count != 1) { eval_error = obj_new_string("Wrong argument count to 'error'\n"); return nil; }
eval_error = args[0];
return nil;
}
@ -968,7 +968,7 @@ Obj *p_load_lisp(Obj** args, int arg_count) {
Obj *form = forms;
while(form && form->car) {
eval_internal(global_env, form->car);
if(error) { return nil; }
if(eval_error) { return nil; }
Obj *result = stack_pop();
form = form->cdr;
}
@ -1007,7 +1007,7 @@ Obj *p_unload_dylib(Obj** args, int arg_count) {
//printf("dlclose %p\n", handle);
int result = dlclose(handle);
if(result) {
error = obj_new_string(dlerror());
eval_error = obj_new_string(dlerror());
return nil;
}
else {
@ -1028,7 +1028,7 @@ Obj *p_read_many(Obj** args, int arg_count) {
}
Obj *p_eval(Obj** args, int arg_count) {
if(arg_count != 1) { error = obj_new_string("Wrong argument count to 'eval'"); return nil; }
if(arg_count != 1) { eval_error = obj_new_string("Wrong argument count to 'eval'"); return nil; }
eval_internal(global_env, args[0]);
Obj *result = stack_pop();
return result;
@ -1111,7 +1111,7 @@ Obj *register_ffi_internal(char *name, VoidFn funptr, Obj *args, Obj *return_typ
if(!arg_type) {
char buffer[512];
snprintf(buffer, 512, "Arg %d for function %s has invalid type: %s\n", i, name, obj_to_string(p->car)->s);
error = obj_new_string(strdup(buffer));
eval_error = obj_new_string(strdup(buffer));
return nil;
}
arg_types_c_array[i] = arg_type;
@ -1163,7 +1163,7 @@ Obj *register_ffi_variable_internal(char *name, void *varptr, Obj *var_type_obj)
new_variable_value = obj_new_int(*i);
}
else {
error = obj_new_string("Invalid variable type.");
eval_error = obj_new_string("Invalid variable type.");
return nil;
}
@ -1239,7 +1239,7 @@ Obj *p_builtin_p(Obj** args, int arg_count) {
printf("Arg to builtin? must be foreign function:\n");
obj_print_cout(args[0]);
printf("Arg count: %d\n", arg_count);
error = obj_new_string("Invalid argument to builtin?");
eval_error = obj_new_string("Invalid argument to builtin?");
return nil;
}
if(args[0]->builtin) {
@ -1252,7 +1252,7 @@ Obj *p_builtin_p(Obj** args, int arg_count) {
Obj *p_meta_set_BANG(Obj** args, int arg_count) {
if(arg_count != 3) {
error = obj_new_string("Invalid argument to meta-set!");
eval_error = obj_new_string("Invalid argument to meta-set!");
return nil;
}
Obj *o = args[0];
@ -1265,7 +1265,7 @@ Obj *p_meta_set_BANG(Obj** args, int arg_count) {
Obj *p_meta_get(Obj** args, int arg_count) {
if(arg_count != 2) {
error = obj_new_string("Invalid argument to meta-get");
eval_error = obj_new_string("Invalid argument to meta-get");
return nil;
}
Obj *o = args[0];