p
/
ell
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add "break" for breaking out of loops

This commit is contained in:
Přemysl Eric Janouch 2017-05-21 09:38:18 +02:00
parent 1caec277bf
commit 0f4ece8867
Signed by: p
GPG Key ID: B715679E3A361BE6
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ell.c
View File

@ -858,9 +858,10 @@ execute_statement
item_free_list (*result); item_free_list (*result);
*result = NULL; *result = NULL;
// In that case, `error' is NULL and there's nothing else to do anyway // In that case, `error' is NULL and there's nothing else to do anyway.
if (!ctx->memory_failure) { // Errors starting with an underscore are exceptions and would not work
// This creates some form of a stack trace // with stack traces generated this way.
if (!ctx->memory_failure && ctx->error[0] != '_') {
char *tmp = ctx->error; char *tmp = ctx->error;
set_error (ctx, "%s -> %s", name, tmp); set_error (ctx, "%s -> %s", name, tmp);
free (tmp); free (tmp);
@ -885,12 +886,26 @@ execute (struct context *ctx, struct item *body, struct item **result) {
#define defn(name) static bool name \ #define defn(name) static bool name \
(struct context *ctx, struct item *args, struct item **result) (struct context *ctx, struct item *args, struct item **result)
#define E_BREAK "_break"
static bool
eat_error (struct context *ctx, const char *name) {
if (!ctx->error || strcmp (ctx->error, name))
return false;
free (ctx->error);
ctx->error = NULL;
return true;
}
static bool static bool
truthy (struct item *item) { truthy (struct item *item) {
return item return item
&& ((item->type == ITEM_STRING && item->len != 0) || item->head); && ((item->type == ITEM_STRING && item->len != 0) || item->head);
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
defn (fn_set) { defn (fn_set) {
struct item *name = args; struct item *name = args;
if (!name || name->type != ITEM_STRING) if (!name || name->type != ITEM_STRING)
@ -946,7 +961,6 @@ defn (fn_if) {
return true; return true;
} }
// TODO: how to break out of the loop? Catchable error? Special value?
defn (fn_for) { defn (fn_for) {
struct item *list = args, *body; struct item *list = args, *body;
if (!list || list->type != ITEM_LIST) if (!list || list->type != ITEM_LIST)
@ -960,12 +974,18 @@ defn (fn_for) {
bool ok = set_arg (ctx, 0, v) bool ok = set_arg (ctx, 0, v)
&& execute (ctx, body->head, &res); && execute (ctx, body->head, &res);
item_free_list (res); item_free_list (res);
if (eat_error (ctx, E_BREAK))
break;
if (!ok) if (!ok)
return false; return false;
} }
return true; return true;
} }
defn (fn_break) {
(void) args; (void) result; return set_error (ctx, E_BREAK);
}
defn (fn_map) { defn (fn_map) {
struct item *body = args, *values; struct item *body = args, *values;
if (!body || body->type != ITEM_LIST) if (!body || body->type != ITEM_LIST)
@ -1054,6 +1074,7 @@ init_native_library (void)
&& native_register ("list", fn_list) && native_register ("list", fn_list)
&& native_register ("if", fn_if) && native_register ("if", fn_if)
&& native_register ("for", fn_for) && native_register ("for", fn_for)
&& native_register ("break", fn_break)
&& native_register ("map", fn_map) && native_register ("map", fn_map)
&& native_register ("filter", fn_filter) && native_register ("filter", fn_filter)
&& native_register ("print", fn_print) && native_register ("print", fn_print)