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

Make ; a synonym for a newline

This commit is contained in:
Přemysl Eric Janouch 2017-05-20 23:00:43 +02:00
parent 5307d24315
commit 7e8bfbf9b9
Signed by: p
GPG Key ID: B715679E3A361BE6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ell.c
View File

@ -247,7 +247,7 @@ lexer_free (struct lexer *self) {
static bool lexer_is_ignored (int c) { return strchr (" \t", c); } static bool lexer_is_ignored (int c) { return strchr (" \t", c); }
static bool lexer_is_word_char (int 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 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_LBRACE;
case '}': lexer_advance (self); return T_RBRACE; case '}': lexer_advance (self); return T_RBRACE;
case '\n': lexer_advance (self); return T_NEWLINE; case '\n': lexer_advance (self); return T_NEWLINE;
case ';': lexer_advance (self); return T_NEWLINE;
case '@': lexer_advance (self); return T_AT; case '@': lexer_advance (self); return T_AT;
case '#': case '#':
@ -1065,9 +1066,8 @@ init_runtime_library (struct context *ctx) {
const char *definition; ///< The defining script const char *definition; ///< The defining script
} functions[] = { } functions[] = {
// TODO: try to think of something useful // 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 // 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++) { for (size_t i = 0; i < N_ELEMENTS (functions); i++) {