From 9632a36457192763114875d6279ca5bb0819d7c3 Mon Sep 17 00:00:00 2001 From: Masatake YAMATO Date: Wed, 23 Dec 2020 07:08:13 +0900 Subject: [PATCH] Kotlin: use [[:space:]] instead of \s --- optlib/kotlin.c | 22 +++++++++++----------- optlib/kotlin.ctags | 22 +++++++++++----------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/optlib/kotlin.c b/optlib/kotlin.c index 45ed97208b..1170378379 100644 --- a/optlib/kotlin.c +++ b/optlib/kotlin.c @@ -34,31 +34,31 @@ static void initializeKotlinParser (const langType language) "^'.{1,2}'", "", "", "", NULL); addLanguageTagMultiTableRegex (language, "toplevel", - "^val\\s+\\(\\s*", + "^val[[:space:]]+\\([[:space:]]*", "", "", "{tenter=vals}", NULL); addLanguageTagMultiTableRegex (language, "toplevel", - "^var\\s+\\(\\s*", + "^var[[:space:]]+\\([[:space:]]*", "", "", "{tenter=vars}", NULL); addLanguageTagMultiTableRegex (language, "toplevel", - "^class\\s+([[:alnum:]_]+)", + "^class[[:space:]]+([[:alnum:]_]+)", "\\1", "c", "", NULL); addLanguageTagMultiTableRegex (language, "toplevel", - "^interface\\s+([[:alnum:]_]+)", + "^interface[[:space:]]+([[:alnum:]_]+)", "\\1", "i", "", NULL); addLanguageTagMultiTableRegex (language, "toplevel", - "^object\\s+([[:alnum:]_]+)", + "^object[[:space:]]+([[:alnum:]_]+)", "\\1", "o", "", NULL); addLanguageTagMultiTableRegex (language, "toplevel", - "^typealias\\s+([[:alnum:]_]+)", + "^typealias[[:space:]]+([[:alnum:]_]+)", "\\1", "T", "", NULL); addLanguageTagMultiTableRegex (language, "toplevel", - "^fun(<.*>)*\\s+([[:alnum:]_]+\\.)*([[:alnum:]_]+)", + "^fun(<.*>)*[[:space:]]+([[:alnum:]_]+\\.)*([[:alnum:]_]+)", "\\3", "m", "", NULL); addLanguageTagMultiTableRegex (language, "toplevel", - "^val\\s+([[:alnum:]_]+\\.)*([[:alnum:]_]+)", + "^val[[:space:]]+([[:alnum:]_]+\\.)*([[:alnum:]_]+)", "\\2", "C", "", NULL); addLanguageTagMultiTableRegex (language, "toplevel", - "^var\\s+([[:alnum:]_]+\\.)*([[:alnum:]_]+)", + "^var[[:space:]]+([[:alnum:]_]+\\.)*([[:alnum:]_]+)", "\\2", "v", "", NULL); addLanguageTagMultiTableRegex (language, "toplevel", "^[[:alnum:]]+", @@ -97,13 +97,13 @@ static void initializeKotlinParser (const langType language) "^.", "", "", "", NULL); addLanguageTagMultiTableRegex (language, "vals", - "^([[:alnum:]_]+)\\s*(:\\s*[[:alnum:]_]+)*\\s*,*\\s*", + "^([[:alnum:]_]+)[[:space:]]*(:[[:space:]]*[[:alnum:]_]+)*[[:space:]]*,*[[:space:]]*", "\\1", "C", "", NULL); addLanguageTagMultiTableRegex (language, "vals", "^\\)", "", "", "{tleave}", NULL); addLanguageTagMultiTableRegex (language, "vars", - "^([[:alnum:]_]+)\\s*(:\\s*[[:alnum:]_]+)*\\s*,*\\s*", + "^([[:alnum:]_]+)[[:space:]]*(:[[:space:]]*[[:alnum:]_]+)*[[:space:]]*,*[[:space:]]*", "\\1", "v", "", NULL); addLanguageTagMultiTableRegex (language, "vars", "^\\)", diff --git a/optlib/kotlin.ctags b/optlib/kotlin.ctags index 1b31b9f251..04d9b9205e 100644 --- a/optlib/kotlin.ctags +++ b/optlib/kotlin.ctags @@ -59,10 +59,10 @@ --_mtable-regex-Kotlin=string/"//{tleave} --_mtable-regex-Kotlin=string/.// ---_mtable-regex-Kotlin=vals/([[:alnum:]_]+)\s*(:\s*[[:alnum:]_]+)*\s*,*\s*/\1/C/ +--_mtable-regex-Kotlin=vals/([[:alnum:]_]+)[[:space:]]*(:[[:space:]]*[[:alnum:]_]+)*[[:space:]]*,*[[:space:]]*/\1/C/ --_mtable-regex-Kotlin=vals/\)//{tleave} ---_mtable-regex-Kotlin=vars/([[:alnum:]_]+)\s*(:\s*[[:alnum:]_]+)*\s*,*\s*/\1/v/ +--_mtable-regex-Kotlin=vars/([[:alnum:]_]+)[[:space:]]*(:[[:space:]]*[[:alnum:]_]+)*[[:space:]]*,*[[:space:]]*/\1/v/ --_mtable-regex-Kotlin=vars/\)//{tleave} --_mtable-regex-Kotlin=toplevel/\/\*//{tenter=comment} @@ -70,14 +70,14 @@ --_mtable-regex-Kotlin=toplevel/"""//{tenter=mlstring} --_mtable-regex-Kotlin=toplevel/"//{tenter=string} --_mtable-regex-Kotlin=toplevel/'.{1,2}'// ---_mtable-regex-Kotlin=toplevel/val\s+\(\s*//{tenter=vals} ---_mtable-regex-Kotlin=toplevel/var\s+\(\s*//{tenter=vars} ---_mtable-regex-Kotlin=toplevel/class\s+([[:alnum:]_]+)/\1/c/ ---_mtable-regex-Kotlin=toplevel/interface\s+([[:alnum:]_]+)/\1/i/ ---_mtable-regex-Kotlin=toplevel/object\s+([[:alnum:]_]+)/\1/o/ ---_mtable-regex-Kotlin=toplevel/typealias\s+([[:alnum:]_]+)/\1/T/ ---_mtable-regex-Kotlin=toplevel/fun(<.*>)*\s+([[:alnum:]_]+\.)*([[:alnum:]_]+)/\3/m/ ---_mtable-regex-Kotlin=toplevel/val\s+([[:alnum:]_]+\.)*([[:alnum:]_]+)/\2/C/ ---_mtable-regex-Kotlin=toplevel/var\s+([[:alnum:]_]+\.)*([[:alnum:]_]+)/\2/v/ +--_mtable-regex-Kotlin=toplevel/val[[:space:]]+\([[:space:]]*//{tenter=vals} +--_mtable-regex-Kotlin=toplevel/var[[:space:]]+\([[:space:]]*//{tenter=vars} +--_mtable-regex-Kotlin=toplevel/class[[:space:]]+([[:alnum:]_]+)/\1/c/ +--_mtable-regex-Kotlin=toplevel/interface[[:space:]]+([[:alnum:]_]+)/\1/i/ +--_mtable-regex-Kotlin=toplevel/object[[:space:]]+([[:alnum:]_]+)/\1/o/ +--_mtable-regex-Kotlin=toplevel/typealias[[:space:]]+([[:alnum:]_]+)/\1/T/ +--_mtable-regex-Kotlin=toplevel/fun(<.*>)*[[:space:]]+([[:alnum:]_]+\.)*([[:alnum:]_]+)/\3/m/ +--_mtable-regex-Kotlin=toplevel/val[[:space:]]+([[:alnum:]_]+\.)*([[:alnum:]_]+)/\2/C/ +--_mtable-regex-Kotlin=toplevel/var[[:space:]]+([[:alnum:]_]+\.)*([[:alnum:]_]+)/\2/v/ --_mtable-regex-Kotlin=toplevel/[[:alnum:]]+// --_mtable-regex-Kotlin=toplevel/.//