diff options
Diffstat (limited to 'lexlua/ledger.lua')
| -rw-r--r-- | lexlua/ledger.lua | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/lexlua/ledger.lua b/lexlua/ledger.lua index 01e270d1d..2daaab46a 100644 --- a/lexlua/ledger.lua +++ b/lexlua/ledger.lua @@ -10,32 +10,31 @@ local lex = lexer.new('ledger', {lex_by_line = true}) local delim = P('\t') + P(' ') -- Account. -lex:add_rule('account', token(lexer.VARIABLE, - lexer.starts_line(S(' \t')^1 * - (lexer.print - delim)^1))) +lex:add_rule('account', token(lexer.VARIABLE, lexer.starts_line(S(' \t')^1 * + (lexer.print - delim)^1))) -- Amount. lex:add_rule('amount', token(lexer.NUMBER, delim * (1 - S(';\r\n'))^1)) -- Comments. -lex:add_rule('comment', token(lexer.COMMENT, S(';#') * lexer.nonnewline^0)) +lex:add_rule('comment', token(lexer.COMMENT, lexer.to_eol(S(';#')))) -- Whitespace. lex:add_rule('whitespace', token(lexer.WHITESPACE, lexer.space^1)) -- Strings. -local sq_str = lexer.delimited_range("'") -local dq_str = lexer.delimited_range('"') -local label = lexer.delimited_range('[]', true, true) +local sq_str = lexer.range("'") +local dq_str = lexer.range('"') +local label = lexer.range('[', ']', true) lex:add_rule('string', token(lexer.STRING, sq_str + dq_str + label)) -- Date. lex:add_rule('date', token(lexer.CONSTANT, - lexer.starts_line((lexer.digit + S('/-'))^1))) + lexer.starts_line((lexer.digit + S('/-'))^1))) -- Automated transactions. lex:add_rule('auto_tx', token(lexer.PREPROCESSOR, - lexer.starts_line(S('=~') * lexer.nonnewline^0))) + lexer.to_eol(lexer.starts_line(S('=~'))))) -- Directives. local directive_word = word_match[[ @@ -43,6 +42,6 @@ local directive_word = word_match[[ endfixed include payee apply tag test year ]] + S('AYNDCIiOobh') lex:add_rule('directive', token(lexer.KEYWORD, - lexer.starts_line(S('!@')^-1 * directive_word))) + lexer.starts_line(S('!@')^-1 * directive_word))) return lex |