Skip to content

Commit 48f706c

Browse files
committed
Изменены шаблоны support_function_sdbl с медленных match на keyword
1 parent d9402a8 commit 48f706c

File tree

1 file changed

+29
-28
lines changed

1 file changed

+29
-28
lines changed

syntax/sdbl.vim

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim syntax file
22
" Language: 1C (SDBL)
33
" Maintainer: Alexander Andreev <andreevlex.as@gmail.com>
4-
" Last Change: 22/10/2016
4+
" Last Change: 30/10/2016
55
"
66
" For version 5.x: Clear all syntax items
77
" For version 6.x: Quit when a syntax file was already loaded
@@ -35,44 +35,45 @@ syn match keyword_control_sdbl "\([^.]\@<=\|^\)\<\(По\(\s\+Общие\)\?\|By\
3535
syn match keyword_control_sdbl "\([^.]\@<=\|^\)\<\(Периодами\|Periods\|Индексировать\|Index\|Выразить\|Cast\|Возр\|Asc\|Убыв\|Desc\|Для\s\+Изменения\|For\s\+Update\(\s\+Of\)\?\|Спецсимвол\|Escape\)\>\([^.]\@=\|$\)"
3636

3737
"Функции языка запросов
38-
syn match support_function_sdbl "\([^.]\@<=\|^\)\<\(Значение\|Value\)\>\s*\((\@=\)"
39-
syn match support_function_sdbl "\([^.]\@<=\|^\)\<\(ДатаВремя\|DateTime\)\>\s*\((\@=\)"
40-
syn match support_function_sdbl "\([^.]\@<=\|^\)\<\(Тип\|Type\)\>\s*\((\@=\)"
38+
syn keyword support_function_sdbl contained Значение Value
39+
syn keyword support_function_sdbl contained ДатаВремя DateTime
40+
syn keyword support_function_sdbl contained Тип Type
4141

4242
"Функции работы со строками
43-
syn match support_function_sdbl "\([^.]\@<=\|^\)\<\(Подстрока\|Substring\)\>\s*\((\@=\)"
43+
syn keyword support_function_sdbl contained Подстрока Substring
4444

4545
"Функции работы с датами
46-
syn match support_function_sdbl "\([^.]\@<=\|^\)\<\(Год\|Year\)\>\s*\((\@=\)"
47-
syn match support_function_sdbl "\([^.]\@<=\|^\)\<\(Квартал\|Quarter\)\>\s*\((\@=\)"
48-
syn match support_function_sdbl "\([^.]\@<=\|^\)\<\(Месяц\|Month\)\>\s*\((\@=\)"
49-
syn match support_function_sdbl "\([^.]\@<=\|^\)\<\(ДеньГода\|DayOfYear\)\>\s*\((\@=\)"
50-
syn match support_function_sdbl "\([^.]\@<=\|^\)\<\(День\|Day\)\>\s*\((\@=\)"
51-
syn match support_function_sdbl "\([^.]\@<=\|^\)\<\(Неделя\|Week\)\>\s*\((\@=\)"
52-
syn match support_function_sdbl "\([^.]\@<=\|^\)\<\(ДеньНедели\|Weekday\)\>\s*\((\@=\)"
53-
syn match support_function_sdbl "\([^.]\@<=\|^\)\<\(Час\|Hour\)\>\s*\((\@=\)"
54-
syn match support_function_sdbl "\([^.]\@<=\|^\)\<\(Минута\|Minute\)\>\s*\((\@=\)"
55-
syn match support_function_sdbl "\([^.]\@<=\|^\)\<\(Секунда\|Second\)\>\s*\((\@=\)"
56-
syn match support_function_sdbl "\([^.]\@<=\|^\)\<\(НачалоПериода\|BeginOfPeriod\)\>\s*\((\@=\)"
57-
syn match support_function_sdbl "\([^.]\@<=\|^\)\<\(КонецПериода\|EndOfPeriod\)\>\s*\((\@=\)"
58-
syn match support_function_sdbl "\([^.]\@<=\|^\)\<\(ДобавитьКДате\|DateAdd\)\>\s*\((\@=\)"
59-
syn match support_function_sdbl "\([^.]\@<=\|^\)\<\(РазностьДат\|DateDiff\)\>\s*\((\@=\)"
46+
syn keyword support_function_sdbl contained Год Year
47+
syn keyword support_function_sdbl contained Квартал Quarter
48+
syn keyword support_function_sdbl contained Месяц Month
49+
syn keyword support_function_sdbl contained ДеньГода DayOfYear
50+
syn keyword support_function_sdbl contained День Day
51+
syn keyword support_function_sdbl contained Неделя Week
52+
syn keyword support_function_sdbl contained ДеньНедели Weekday
53+
syn keyword support_function_sdbl contained Час Hour
54+
syn keyword support_function_sdbl contained Минута Minute
55+
syn keyword support_function_sdbl contained Секунда Second
56+
syn keyword support_function_sdbl contained НачалоПериода BeginOfPeriod
57+
syn keyword support_function_sdbl contained КонецПериода EndOfPeriod
58+
syn keyword support_function_sdbl contained ДобавитьКДате DateAdd
59+
syn keyword support_function_sdbl contained РазностьДат DateDiff
6060

6161
"Агрегатные функции
62-
syn match support_function_sdbl "\([^.]\@<=\|^\)\<\(Сумма\|Sum\)\>\s*\((\@=\)"
63-
syn match support_function_sdbl "\([^.]\@<=\|^\)\<\(Среднее\|Avg\)\>\s*\((\@=\)"
64-
syn match support_function_sdbl "\([^.]\@<=\|^\)\<\(Минимум\|Min\)\>\s*\((\@=\)"
65-
syn match support_function_sdbl "\([^.]\@<=\|^\)\<\(Максимум\|Max\)\>\s*\((\@=\)"
66-
syn match support_function_sdbl "\([^.]\@<=\|^\)\<\(Количество\|Count\)\>\s*\((\@=\)"
62+
syn keyword support_function_sdbl contained Сумма Sum
63+
syn keyword support_function_sdbl contained Среднее Avg
64+
syn keyword support_function_sdbl contained Минимум Min
65+
syn keyword support_function_sdbl contained Максимум Max
66+
syn keyword support_function_sdbl contained Количество Count
6767

6868
"Прочие функции
69-
syn match support_function_sdbl "\([^.]\@<=\|^\)\<\(ЕстьNULL\|IsNULL\)\>\s*\((\@=\)"
70-
syn match support_function_sdbl "\([^.]\@<=\|^\)\<\(Представление\|Presentation\)\>\s*\((\@=\)"
71-
syn match support_function_sdbl "\([^.]\@<=\|^\)\<\(ПредставлениеСсылки\|RefPresentation\)\>\s*\((\@=\)"
72-
syn match support_function_sdbl "\([^.]\@<=\|^\)\<\(ТипЗначения\|ValueType\)\>\s*\((\@=\)"
69+
syn keyword support_function_sdbl contained ЕстьNULL IsNULL
70+
syn keyword support_function_sdbl contained Представление Presentation
71+
syn keyword support_function_sdbl contained ПредставлениеСсылки RefPresentation
72+
syn keyword support_function_sdbl contained ТипЗначения ValueType
7373

7474
syn match support_type_sdbl "\([^.]\@<=\|^\)\<\(Число\|Number\|Строка\|String\|Дата\|Date\)\>\([^.]\@=\|$\)"
7575

76+
syn match sdblSupportFunction "\%([^.]\@1<=\|^\)\%(\<\%([a-z0-9_а-яё]\+\)*\>\)\ze\s*(" contains=support_function_sdbl
7677

7778
" Define the default highlighting.
7879
" For version 5.7 and earlier: only when not done already

0 commit comments

Comments
 (0)