Merge branch 'master' of https://gitlab.lrz.de/FelixBrendel/slime
This commit is contained in:
+11
-3
@@ -533,13 +533,21 @@ namespace Slime {
|
|||||||
|
|
||||||
Lisp_Object* parsed, * evaluated;
|
Lisp_Object* parsed, * evaluated;
|
||||||
while (true) {
|
while (true) {
|
||||||
|
if (Globals::error) {
|
||||||
|
log_error();
|
||||||
delete_error();
|
delete_error();
|
||||||
|
}
|
||||||
fputs("> ", stdout);
|
fputs("> ", stdout);
|
||||||
line = read_expression();
|
line = read_expression();
|
||||||
try_void parsed = Parser::parse_single_expression(line);
|
parsed = Parser::parse_single_expression(line);
|
||||||
|
if (Globals::error) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
free(line);
|
free(line);
|
||||||
try_void evaluated = eval_expr(parsed);
|
evaluated = eval_expr(parsed);
|
||||||
// try_void evaluated = eval_expr(parsed);
|
if (Globals::error) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
if (evaluated && evaluated != Memory::nil) {
|
if (evaluated && evaluated != Memory::nil) {
|
||||||
print(evaluated);
|
print(evaluated);
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-2
@@ -210,8 +210,7 @@ namespace Slime::Memory {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
char* exe_path = get_exe_dir();
|
char* exe_path = get_exe_dir();
|
||||||
// don't free exe path because it will be used until end of time
|
|
||||||
Globals::load_path.alloc();
|
|
||||||
|
|
||||||
global_symbol_table.alloc();
|
global_symbol_table.alloc();
|
||||||
global_keyword_table.alloc();
|
global_keyword_table.alloc();
|
||||||
|
|||||||
Reference in New Issue
Block a user