From 7e8bfbf9b952915f9c1c4bb58081b45620714e3f Mon Sep 17 00:00:00 2001 From: Přemysl Janouch Date: Sat, 20 May 2017 23:00:43 +0200 Subject: Make ; a synonym for a newline --- ell.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ell.c b/ell.c index e245958..0e6b550 100755 --- a/ell.c +++ b/ell.c @@ -247,7 +247,7 @@ lexer_free (struct lexer *self) { static bool lexer_is_ignored (int c) { return strchr (" \t", c); } static bool lexer_is_word_char (int c) { - return !lexer_is_ignored (c) && !strchr ("()[]{}\n@#'", c); + return !lexer_is_ignored (c) && !strchr ("()[]{}\n;@#'", c); } static int @@ -354,6 +354,7 @@ lexer_next (struct lexer *self, const char **e) { case '{': lexer_advance (self); return T_LBRACE; case '}': lexer_advance (self); return T_RBRACE; case '\n': lexer_advance (self); return T_NEWLINE; + case ';': lexer_advance (self); return T_NEWLINE; case '@': lexer_advance (self); return T_AT; case '#': @@ -1065,9 +1066,8 @@ init_runtime_library (struct context *ctx) { const char *definition; ///< The defining script } functions[] = { // TODO: try to think of something useful - // XXX: should we add a ';' token to substitute newlines? // FIXME: this "unless" is probably not going to work - { "unless", "arg cond body\nif (not (eval @cond)) @body" }, + { "unless", "arg cond body; if (not (eval @cond)) @body" }, }; for (size_t i = 0; i < N_ELEMENTS (functions); i++) { -- cgit v1.2.3-70-g09d2