diff --git a/lua/lexers/strace.lua b/lua/lexers/strace.lua index c4db4101b..3547dd230 100644 --- a/lua/lexers/strace.lua +++ b/lua/lexers/strace.lua @@ -1,9 +1,9 @@ --- Copyright 2017 Marc André Tanner. See LICENSE. +-- Copyright 2017-2021 Marc André Tanner. See LICENSE. -- strace(1) output lexer local l = require('lexer') local token, word_match = l.token, l.word_match -local S = lpeg.S +local S, B = lpeg.S, lpeg.B local M = {_NAME = 'strace'} @@ -13,16 +13,18 @@ local number = token(l.NUMBER, l.float + l.integer) local constant = token(l.CONSTANT, (l.upper + '_') * (l.upper + l.digit + '_')^0) local syscall = token(l.KEYWORD, l.starts_line(l.word)) local operator = token(l.OPERATOR, S('+-/*%<>~!=^&|?~:;,.()[]{}')) -local comment = token(l.COMMENT, l.nested_pair('/*', '*/') + ('(' * (l.alpha + ' ')^1 * ')\n')) -local result = token(l.TYPE, '= ' * l.integer) +local comment = token(l.COMMENT, l.nested_pair('/*', '*/') + (l.delimited_range('()') * l.newline)) +local result = token(l.TYPE, B(' = ') * l.integer) +local identifier = token(l.IDENTIFIER, l.word) M._rules = { {'whitespace', ws}, - {'keyword', syscall}, + {'syscall', syscall}, {'constant', constant}, {'string', string}, {'comment', comment}, - {'type', result}, + {'result', result}, + {'identifier', identifier}, {'number', number}, {'operator', operator}, }