From fad15f79b1230b3076be515d6894c8919562809b Mon Sep 17 00:00:00 2001 From: mitchell Date: Sat, 25 Apr 2020 16:26:31 -0400 Subject: Reformatted Lua LPeg lexers and added new convenience functions and pattern. `lexer.range()` replaces `lexer.delimited_range()` and `lexer.nested_pair()`. `lexer.to_eol()` replaces `patt * lexer.nonnewline^0` constructs. `lexer.number` replaces `lexer.float + lexer.integer`. Also added unit tests for lexer functions. --- lexlua/taskpaper.lua | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'lexlua/taskpaper.lua') diff --git a/lexlua/taskpaper.lua b/lexlua/taskpaper.lua index de9270286..a7a390c68 100644 --- a/lexlua/taskpaper.lua +++ b/lexlua/taskpaper.lua @@ -19,14 +19,12 @@ local overdue_tag = token('overdue_tag', P('@overdue')) local plain_tag = token('plain_tag', P('@') * lexer.word) -local extended_tag = token('extended_tag', - P('@') * lexer.word * P('(') * - (lexer.word + R('09') + P('-'))^1 * P(')')) +local extended_tag = token('extended_tag', P('@') * lexer.word * P('(') * + (lexer.word + R('09') + P('-'))^1 * P(')')) -- Projects -local project = token('project', - lexer.nested_pair(lexer.starts_line(lexer.alnum), ':') * - lexer.newline) +local project = token('project', lexer.range(lexer.starts_line(lexer.alnum), + ':', false, false, true) * lexer.newline) -- Notes local note = token('note', delimiter^1 * lexer.alnum * lexer.nonnewline^0) -- cgit v1.2.3