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

General cleanup 

With the exception of memory handling, ell looks pretty fine now.
This commit is contained in:
Přemysl Eric Janouch 2017-05-19 21:56:10 +02:00
parent 158b8fffeb
commit 3c86249f11
Signed by: p
GPG Key ID: B715679E3A361BE6
1 changed files with 22 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
ell.c
View File

@ -172,14 +172,13 @@ new_clone (const struct item *item) {
static struct item * static struct item *
new_clone_list (const struct item *item) { new_clone_list (const struct item *item) {
struct item *head = NULL, *clone; struct item *head = NULL;
for (struct item **out = &head; item; item = item->next) { for (struct item **out = &head; item; item = item->next) {
if (!(clone = *out = new_clone (item))) { if (!(*out = new_clone (item))) {
item_free_list (head); item_free_list (head);
return NULL; return NULL;
} }
clone->next = NULL; out = &(*out)->next;
out = &clone->next;
} }
return head; return head;
} }
@ -218,26 +217,18 @@ new_list (struct item *head) {
enum token { T_ABORT, T_LPAREN, T_RPAREN, T_LBRACKET, T_RBRACKET, enum token { T_ABORT, T_LPAREN, T_RPAREN, T_LBRACKET, T_RBRACKET,
T_LBRACE, T_RBRACE, T_STRING, T_NEWLINE, T_AT }; T_LBRACE, T_RBRACE, T_STRING, T_NEWLINE, T_AT };
static const char * static const char *token_names[] = {
token_name (enum token token) { [T_ABORT] = "end of input",
switch (token) { [T_LPAREN] = "left parenthesis",
case T_ABORT: return "end of input"; [T_RPAREN] = "right parenthesis",
[T_LBRACKET] = "left bracket",
case T_LPAREN: return "left parenthesis"; [T_RBRACKET] = "right bracket",
case T_RPAREN: return "right parenthesis"; [T_LBRACE] = "left brace",
case T_LBRACKET: return "left bracket"; [T_RBRACE] = "right brace",
case T_RBRACKET: return "right bracket"; [T_STRING] = "string",
case T_LBRACE: return "left brace"; [T_NEWLINE] = "newline",
case T_RBRACE: return "right brace"; [T_AT] = "at symbol",
case T_STRING: return "string"; };
case T_NEWLINE: return "newline";
case T_AT: return "at symbol";
default:
abort ();
return NULL;
}
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -449,8 +440,7 @@ print_tree (struct item *tree, int level) {
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
struct parser struct parser {
{
struct lexer lexer; ///< Tokenizer struct lexer lexer; ///< Tokenizer
char *error; ///< Tokenizer error char *error; ///< Tokenizer error
enum token token; ///< Current token in the lexer enum token token; ///< Current token in the lexer
@ -505,7 +495,7 @@ parser_expect (struct parser *self, enum token token, jmp_buf out) {
self->memory_failure = !(self->error = lexer_errorf (&self->lexer, self->memory_failure = !(self->error = lexer_errorf (&self->lexer,
"unexpected `%s', expected `%s'", "unexpected `%s', expected `%s'",
token_name (self->token), token_name (token))); token_names[self->token], token_names[token]));
longjmp (out, 1); longjmp (out, 1);
} }
@ -586,7 +576,7 @@ parse_item (struct parser *self, jmp_buf out) {
} }
self->memory_failure = !(self->error = lexer_errorf (&self->lexer, self->memory_failure = !(self->error = lexer_errorf (&self->lexer,
"unexpected `%s', expected a value", token_name (self->token))); "unexpected `%s', expected a value", token_names[self->token]));
longjmp (out, 1); longjmp (out, 1);
} }
@ -820,7 +810,8 @@ execute_args (struct context *ctx, struct item *next) {
size_t i = 0; size_t i = 0;
for (struct item *arg = args; arg; arg = arg->next) { for (struct item *arg = args; arg; arg = arg->next) {
(void) snprintf (buf, sizeof buf, "%zu", i++); (void) snprintf (buf, sizeof buf, "%zu", i++);
set (ctx, buf, arg); if (!set (ctx, buf, arg))
return false;
} }
item_free_list (args); item_free_list (args);
return true; return true;
@ -848,7 +839,7 @@ execute_statement
name = body->value; name = body->value;
// TODO: these could be just regular handlers, only top priority // TODO: these could be just regular handlers, only top priority
if (!strcmp (name, "quote")) { if (!strcmp (name, "quote")) {
if ((*result = new_clone_list (following))) if (!following || (*result = new_clone_list (following)))
return true; return true;
ctx->memory_failure = true; ctx->memory_failure = true;
return false; return false;
@ -881,7 +872,6 @@ execute_statement
// This creates some form of a stack trace // This creates some form of a stack trace
char *tmp = ctx->error; char *tmp = ctx->error;
ctx->error = NULL;
set_error (ctx, "%s -> %s", name, tmp); set_error (ctx, "%s -> %s", name, tmp);
free (tmp); free (tmp);
return false; return false;
@ -1042,11 +1032,9 @@ main (int argc, char *argv[]) {
item_free_list (result); item_free_list (result);
item_free_list (program); item_free_list (program);
const char *failure = NULL; const char *failure = ctx.error;
if (ctx.memory_failure) if (ctx.memory_failure)
failure = "memory allocation failure"; failure = "memory allocation failure";
else if (ctx.error)
failure = ctx.error;
if (failure) if (failure)
printf ("%s: %s\n", "runtime error", failure); printf ("%s: %s\n", "runtime error", failure);
context_free (&ctx); context_free (&ctx);