diff options
70 files changed, 74 insertions, 70 deletions
diff --git a/lib/lexers/abaqus.tes b/lib/lexers/abaqus.tes index d3facee..ffcfdec 100644 --- a/lib/lexers/abaqus.tes +++ b/lib/lexers/abaqus.tes @@ -7,7 +7,7 @@ Q.r} @[lexer.set.abaqus]{ - ESSETLEXER,SCLEX_ABAQUS + ESSETLEXERLANGUAGEabaqus 1ESSETKEYWORDS *amplitude *assembly *beam *boundary *buckle *bulk *cload *conditions *conductivity *contact *damping *density *dload *dsflux *dsload *dynamic *el *elastic diff --git a/lib/lexers/ada.tes b/lib/lexers/ada.tes index 52f2673..609ec3e 100644 --- a/lib/lexers/ada.tes +++ b/lib/lexers/ada.tes @@ -6,7 +6,7 @@ Q.r} @[lexer.set.ada]{ - ESSETLEXER,SCLEX_ADA + ESSETLEXERLANGUAGEada 0ESSETKEYWORDS abort abstract accept access aliased all array at begin body case constant declare delay delta digits do else elsif end entry exception exit for function diff --git a/lib/lexers/asl.tes b/lib/lexers/asl.tes index e47b0cf..dc70f5a 100644 --- a/lib/lexers/asl.tes +++ b/lib/lexers/asl.tes @@ -6,7 +6,7 @@ Q.r} @[lexer.set.asl]{ - ESSETLEXER,SCLEX_CPP + ESSETLEXERLANGUAGEcpp 0ESSETKEYWORDS AccessAs Acquire Add Alias And Arg0 Arg1 Arg2 Arg3 Arg4 Arg5 Arg6 BankField Break BreakPoint Buffer Case Concatenate ConcatenateResTemplate CondRefOf diff --git a/lib/lexers/asm.tes b/lib/lexers/asm.tes index 6bd5346..e7165ec 100644 --- a/lib/lexers/asm.tes +++ b/lib/lexers/asm.tes @@ -5,7 +5,7 @@ } @[lexer.set.asm]{ - ESSETLEXER,SCLEX_ASM + ESSETLEXERLANGUAGEasm 0ESSETKEYWORDS aaa aad aam aas daa das ja jae jb jbe jc jcxz je jg jge jl jle jmp jna jnae jnb jnbe jnc jne jng jnge jnl jnle jno jnp jns jnz jo jp jpe jpo js jz jcxz diff --git a/lib/lexers/ave.tes b/lib/lexers/ave.tes index 3b80236..52a7899 100644 --- a/lib/lexers/ave.tes +++ b/lib/lexers/ave.tes @@ -5,7 +5,7 @@ } @[lexer.set.ave]{ - ESSETLEXER,SCLEX_AVE + ESSETLEXERLANGUAGEave 0ESSETKEYWORDS nil true false else for if while then elseif end av self in exit :M[color.comment],1M[color.set] diff --git a/lib/lexers/avs.tes b/lib/lexers/avs.tes index de4ec70..0cb9eda 100644 --- a/lib/lexers/avs.tes +++ b/lib/lexers/avs.tes @@ -6,7 +6,7 @@ Q.r} @[lexer.set.avs]{ - ESSETLEXER,SCLEX_AVS + ESSETLEXERLANGUAGEavs 0ESSETKEYWORDS true false return global 1ESSETKEYWORDS diff --git a/lib/lexers/awk.tes b/lib/lexers/awk.tes index e069508..acc4b83 100644 --- a/lib/lexers/awk.tes +++ b/lib/lexers/awk.tes @@ -5,7 +5,7 @@ } @[lexer.set.awk]{ - ESSETLEXER,SCLEX_PERL + ESSETLEXERLANGUAGEperl 0ESSETKEYWORDS BEGIN END if else while do for in break continue delete exit function return print printf sprintf system close getline next nextfile fflush atan2 cos exp int diff --git a/lib/lexers/baan.tes b/lib/lexers/baan.tes index a005bfc..a102131 100644 --- a/lib/lexers/baan.tes +++ b/lib/lexers/baan.tes @@ -6,7 +6,7 @@ Q.r} @[lexer.set.baan]{ - ESSETLEXER,SCLEX_BAAN + ESSETLEXERLANGUAGEbaan :M[color.comment],1M[color.set] :M[color.comment],2M[color.set] :M[color.number],3M[color.set] diff --git a/lib/lexers/bash.tes b/lib/lexers/bash.tes index 33cab3a..2a4a6b7 100644 --- a/lib/lexers/bash.tes +++ b/lib/lexers/bash.tes @@ -11,7 +11,7 @@ Q.r} @[lexer.set.bash]{ - ESSETLEXER,SCLEX_BASH + ESSETLEXERLANGUAGEbash 0ESSETKEYWORDS alias ar asa awk banner basename bash bc bdiff break bunzip2 bzip2 cal calendar case cat cc cd chmod cksum clear cmp col comm compress continue cp cpio diff --git a/lib/lexers/batch.tes b/lib/lexers/batch.tes index c8b8100..879482f 100644 --- a/lib/lexers/batch.tes +++ b/lib/lexers/batch.tes @@ -7,7 +7,7 @@ Q.r} @[lexer.set.batch]{ - ESSETLEXER,SCLEX_BATCH + ESSETLEXERLANGUAGEbatch 0ESSETKEYWORDS rem set if exist errorlevel for in do break call chcp cd chdir choice cls country ctty date del erase dir echo exit goto loadfix loadhigh mkdir md move path diff --git a/lib/lexers/blitzbasic.tes b/lib/lexers/blitzbasic.tes index e815473..167777e 100644 --- a/lib/lexers/blitzbasic.tes +++ b/lib/lexers/blitzbasic.tes @@ -5,7 +5,7 @@ } @[lexer.set.blitzbasic]{ - ESSETLEXER,SCLEX_BLITZBASIC + ESSETLEXERLANGUAGEblitzbasic 0ESSETKEYWORDS abs accepttcpstream acos after and apptitle asc asin atan atan2 automidhandle autosuspend availvidmem backbuffer banksize before bin calldll case ceil diff --git a/lib/lexers/caml.tes b/lib/lexers/caml.tes index 13026cb..9562b82 100644 --- a/lib/lexers/caml.tes +++ b/lib/lexers/caml.tes @@ -6,7 +6,7 @@ Q.r} @[lexer.set.caml]{ - ESSETLEXER,SCLEX_CAML + ESSETLEXERLANGUAGEcaml 0ESSETKEYWORDS and as assert asr begin class constraint do done downto else end exception external false for fun function functor if in include inherit initializer land lazy diff --git a/lib/lexers/ch.tes b/lib/lexers/ch.tes index 560c947..3ba523a 100644 --- a/lib/lexers/ch.tes +++ b/lib/lexers/ch.tes @@ -7,7 +7,7 @@ Q.r} @[lexer.set.ch]{ - ESSETLEXER,SCLEX_CPP + ESSETLEXERLANGUAGEcpp 0ESSETKEYWORDS auto array bool break case char class complex ComplexInf ComplexNaN const continue default delete do double else enum export extern float for foreach goto if diff --git a/lib/lexers/cmake.tes b/lib/lexers/cmake.tes index feb32e8..0cae216 100644 --- a/lib/lexers/cmake.tes +++ b/lib/lexers/cmake.tes @@ -7,7 +7,7 @@ Q.r} @[lexer.set.cmake]{ - ESSETLEXER,SCLEX_CMAKE + ESSETLEXERLANGUAGEcmake ! Commands ! 0ESSETKEYWORDS add_custom_command add_custom_target add_definitions add_dependencies diff --git a/lib/lexers/cobol.tes b/lib/lexers/cobol.tes index 4be4a0a..d9cf4de 100644 --- a/lib/lexers/cobol.tes +++ b/lib/lexers/cobol.tes @@ -5,7 +5,7 @@ } @[lexer.set.cobol]{ - ESSETLEXER,SCLEX_COBOL + ESSETLEXERLANGUAGECOBOL 0ESSETKEYWORDS configuration data declaratives division environment environment-division file file-control function i-o i-o-control identification input input-output diff --git a/lib/lexers/cpp.tes b/lib/lexers/cpp.tes index 6a77c95..35fb5d7 100644 --- a/lib/lexers/cpp.tes +++ b/lib/lexers/cpp.tes @@ -16,7 +16,7 @@ Q.r} @[lexer.set.cpp]{ - ESSETLEXER,SCLEX_CPP + ESSETLEXERLANGUAGEcpp 0ESSETKEYWORDS and and_eq asm auto bitand bitor bool break case catch char class compl const const_cast constexpr continue default delete do double dynamic_cast else diff --git a/lib/lexers/cs.tes b/lib/lexers/cs.tes index 6b3ae4a..037a07c 100644 --- a/lib/lexers/cs.tes +++ b/lib/lexers/cs.tes @@ -5,7 +5,7 @@ } @[lexer.set.cs]{ - ESSETLEXER,SCLEX_CPP + ESSETLEXERLANGUAGEcpp 0ESSETKEYWORDS abstract as ascending base bool break by byte case catch char checked class const continue decimal default delegate descending do double else enum equals diff --git a/lib/lexers/d.tes b/lib/lexers/d.tes index 1f102f0..f360d0b 100644 --- a/lib/lexers/d.tes +++ b/lib/lexers/d.tes @@ -5,7 +5,7 @@ } @[lexer.set.d]{ - ESSETLEXER,SCLEX_D + ESSETLEXERLANGUAGEd 0ESSETKEYWORDS abstract alias align asm assert auto body bool break byte case cast catch cdouble cent cfloat char class const continue creal dchar debug default delegate diff --git a/lib/lexers/diff.tes b/lib/lexers/diff.tes index cd01708..fa5ee42 100644 --- a/lib/lexers/diff.tes +++ b/lib/lexers/diff.tes @@ -6,7 +6,7 @@ Q.r} @[lexer.set.diff]{ - ESSETLEXER,SCLEX_DIFF + ESSETLEXERLANGUAGEdiff :M[color.comment],1M[color.set] :M[color.keyword],2M[color.set] ! Command ! :M[color.preproc],3M[color.set] ! Source/Dest ! diff --git a/lib/lexers/docbook.tes b/lib/lexers/docbook.tes index 6417f76..1c9f53f 100644 --- a/lib/lexers/docbook.tes +++ b/lib/lexers/docbook.tes @@ -5,7 +5,7 @@ } @[lexer.set.docbook]{ - ESSETLEXER,SCLEX_HYPERTEXT + ESSETLEXERLANGUAGEhypertext 0ESSETKEYWORDS abbrev abstract accel ackno acronym action address affiliation alt anchor answer appendix appendixinfo application area areaset areaspec arg article diff --git a/lib/lexers/eiffel.tes b/lib/lexers/eiffel.tes index 8277a10..8d97f05 100644 --- a/lib/lexers/eiffel.tes +++ b/lib/lexers/eiffel.tes @@ -5,7 +5,7 @@ } @[lexer.set.eiffel]{ - ESSETLEXER,SCLEX_CPP + ESSETLEXERLANGUAGEcpp 0ESSETKEYWORDS struct unit integer real bool int long uint nibble byte bits bytes bit time string var instance event verilog vhdl on compute start expect check that routine diff --git a/lib/lexers/f77.tes b/lib/lexers/f77.tes index c0d2fca..cd7409a 100644 --- a/lib/lexers/f77.tes +++ b/lib/lexers/f77.tes @@ -6,7 +6,7 @@ Q.r} @[lexer.set.f77]{ - ESSETLEXER,SCLEX_F77 + ESSETLEXERLANGUAGEf77 0ESSETKEYWORDS access action advance allocatable allocate apostrophe assign assignment associate asynchronous backspace bind blank blockdata call case character class close diff --git a/lib/lexers/f95.tes b/lib/lexers/f95.tes index dbd60f9..4166e87 100644 --- a/lib/lexers/f95.tes +++ b/lib/lexers/f95.tes @@ -7,7 +7,7 @@ Q.r} @[lexer.set.f95]{ - ESSETLEXER,SCLEX_FORTRAN + ESSETLEXERLANGUAGEfortran 0ESSETKEYWORDS access action advance allocatable allocate apostrophe assign assignment associate asynchronous backspace bind blank blockdata call case character class close diff --git a/lib/lexers/flagship.tes b/lib/lexers/flagship.tes index a3de658..556356d 100644 --- a/lib/lexers/flagship.tes +++ b/lib/lexers/flagship.tes @@ -5,7 +5,7 @@ } @[lexer.set.flagship]{ - ESSETLEXER,SCLEX_FLAGSHIP + ESSETLEXERLANGUAGEflagship 0ESSETKEYWORDS ? @ accept access all alternate announce ansi any append as assign autolock average begin bell bitmap blank box call cancel case century charset checkbox clear diff --git a/lib/lexers/flash.tes b/lib/lexers/flash.tes index 7924394..6928160 100644 --- a/lib/lexers/flash.tes +++ b/lib/lexers/flash.tes @@ -7,7 +7,7 @@ Q.r} @[lexer.set.flash]{ - ESSETLEXER,SCLEX_CPP + ESSETLEXERLANGUAGEcpp 0ESSETKEYWORDS add and break case catch class continue default delete do dynamic else eq extends false finally for function ge get gt if implements import in instanceof diff --git a/lib/lexers/freebasic.tes b/lib/lexers/freebasic.tes index 471309a..698143d 100644 --- a/lib/lexers/freebasic.tes +++ b/lib/lexers/freebasic.tes @@ -6,7 +6,7 @@ Q.r} @[lexer.set.freebasic]{ - ESSETLEXER,SCLEX_FREEBASIC + ESSETLEXERLANGUAGEfreebasic 0ESSETKEYWORDS append as asc asin asm atan2 atn beep bin binary bit bitreset bitset bload bsave byref byte byval call callocate case cbyte cdbl cdecl chain chdir chr cint diff --git a/lib/lexers/gap.tes b/lib/lexers/gap.tes index 9e85e36..657a3ac 100644 --- a/lib/lexers/gap.tes +++ b/lib/lexers/gap.tes @@ -7,7 +7,7 @@ Q.r} @[lexer.set.gap]{ - ESSETLEXER,SCLEX_GAP + ESSETLEXERLANGUAGEgap 0ESSETKEYWORDS and break continue do elif else end fi for function if in local mod not od or quit rec repeat return then until while QUIT diff --git a/lib/lexers/go.tes b/lib/lexers/go.tes index 2b2eaef..ef66a3e 100644 --- a/lib/lexers/go.tes +++ b/lib/lexers/go.tes @@ -5,7 +5,7 @@ } @[lexer.set.go]{ - ESSETLEXER,SCLEX_CPP + ESSETLEXERLANGUAGEcpp 0ESSETKEYWORDS bool byte break case chan complex64 complex128 const continue defer default else for func go goto fallthrough false float32 float64 if import int interface diff --git a/lib/lexers/html.tes b/lib/lexers/html.tes index ddc6764..924396d 100644 --- a/lib/lexers/html.tes +++ b/lib/lexers/html.tes @@ -19,7 +19,7 @@ Q.r} @[lexer.set.html]{ - ESSETLEXER,SCLEX_HYPERTEXT + ESSETLEXERLANGUAGEhypertext 0ESSETKEYWORDS a abbr acronym address applet area b base basefont bdo big blockquote body br button caption center cite code col colgroup dd del dfn dir div dl dt em diff --git a/lib/lexers/idl.tes b/lib/lexers/idl.tes index 3b7d25a..a457afa 100644 --- a/lib/lexers/idl.tes +++ b/lib/lexers/idl.tes @@ -6,7 +6,7 @@ Q.r} @[lexer.set.idl]{ - ESSETLEXER,SCLEX_CPP + ESSETLEXERLANGUAGEcpp 0ESSETKEYWORDS aggregatable allocate appobject arrays async async_uuid auto_handle bindable boolean broadcast byte byte_count call_as callback char coclass code comm_status diff --git a/lib/lexers/inno.tes b/lib/lexers/inno.tes index 1ac95fb..15b5042 100644 --- a/lib/lexers/inno.tes +++ b/lib/lexers/inno.tes @@ -6,7 +6,7 @@ Q.r} @[lexer.set.inno]{ - ESSETLEXER,SCLEX_INNO + ESSETLEXERLANGUAGEinno 0ESSETKEYWORDS code components custommessages dirs files icons ini installdelete langoptions languages messages registry run setup types tasks uninstalldelete diff --git a/lib/lexers/java.tes b/lib/lexers/java.tes index 968631a..73bb800 100644 --- a/lib/lexers/java.tes +++ b/lib/lexers/java.tes @@ -7,7 +7,7 @@ Q.r} @[lexer.set.java]{ - ESSETLEXER,SCLEX_CPP + ESSETLEXERLANGUAGEcpp 0ESSETKEYWORDS abstract assert boolean break byte case catch char class const continue default do double else enum extends final finally float for goto if implements diff --git a/lib/lexers/js.tes b/lib/lexers/js.tes index 650935c..70c17c7 100644 --- a/lib/lexers/js.tes +++ b/lib/lexers/js.tes @@ -7,7 +7,7 @@ Q.r} @[lexer.set.js]{ - ESSETLEXER,SCLEX_CPP + ESSETLEXERLANGUAGEcpp 0ESSETKEYWORDS abstract boolean break byte case catch char class const continue debugger default delete do double else enum export extends final finally float for function diff --git a/lib/lexers/kix.tes b/lib/lexers/kix.tes index a605219..533084a 100644 --- a/lib/lexers/kix.tes +++ b/lib/lexers/kix.tes @@ -5,7 +5,7 @@ } @[lexer.set.kix]{ - ESSETLEXER,SCLEX_KIX + ESSETLEXERLANGUAGEkix 0ESSETKEYWORDS ? and beep big break call cd cls color cookie1 copy debug del dim display do until exit flushkb for each next function endfunction get gets global go gosub diff --git a/lib/lexers/lisp.tes b/lib/lexers/lisp.tes index 1b4f1dd..236cdf2 100644 --- a/lib/lexers/lisp.tes +++ b/lib/lexers/lisp.tes @@ -6,7 +6,7 @@ Q.r} @[lexer.set.lisp]{ - ESSETLEXER,SCLEX_LISP + ESSETLEXERLANGUAGElisp 0ESSETKEYWORDS not defun + - * / = < > <= >= princ eval apply funcall quote identity function complement backquote lambda set setq setf defun defmacro gensym make symbol diff --git a/lib/lexers/lout.tes b/lib/lexers/lout.tes index 1121a10..5df0674 100644 --- a/lib/lexers/lout.tes +++ b/lib/lexers/lout.tes @@ -5,7 +5,7 @@ } @[lexer.set.lout]{ - ESSETLEXER,SCLEX_LOUT + ESSETLEXERLANGUAGElout 0ESSETKEYWORDS @OptGall @FontDef @Family @Face @Name @Metrics @ExtraMetrics @Mapping @Recode @Filter @FilterIn @FilterOut @FilterErr @Common @Rump @Meld @Insert @OneOf diff --git a/lib/lexers/lua.tes b/lib/lexers/lua.tes index 9278557..1efbfb5 100644 --- a/lib/lexers/lua.tes +++ b/lib/lexers/lua.tes @@ -6,7 +6,7 @@ Q.r} @[lexer.set.lua]{ - ESSETLEXER,SCLEX_LUA + ESSETLEXERLANGUAGElua 0ESSETKEYWORDS and break do else elseif end for function if in local nil not or repeat return then until while false true goto diff --git a/lib/lexers/make.tes b/lib/lexers/make.tes index aa5bbe6..2c428da 100644 --- a/lib/lexers/make.tes +++ b/lib/lexers/make.tes @@ -7,7 +7,7 @@ Q.r} @[lexer.set.make]{ - ESSETLEXER,SCLEX_MAKEFILE + ESSETLEXERLANGUAGEmakefile :M[color.comment],1M[color.set] :M[color.preproc],2M[color.set] :M[color.variable],3M[color.set] diff --git a/lib/lexers/mako.tes b/lib/lexers/mako.tes index 9ae9d25..5487d03 100644 --- a/lib/lexers/mako.tes +++ b/lib/lexers/mako.tes @@ -6,7 +6,7 @@ Q.r} @[lexer.set.mako]{ - ESSETLEXER,SCLEX_HYPERTEXT + ESSETLEXERLANGUAGEhypertext 0ESSETKEYWORDS a abbr acronym address applet area b base basefont bdo big blockquote body br button caption center cite code col colgroup dd del dfn dir div dl dt em diff --git a/lib/lexers/matlab.tes b/lib/lexers/matlab.tes index d2d8bcc..58329a4 100644 --- a/lib/lexers/matlab.tes +++ b/lib/lexers/matlab.tes @@ -5,7 +5,7 @@ } @[lexer.set.matlab]{ - ESSETLEXER,SCLEX_MATLAB + ESSETLEXERLANGUAGEmatlab 0ESSETKEYWORDS break case catch continue else elseif end for function global if otherwise persistent return switch try while diff --git a/lib/lexers/mmixal.tes b/lib/lexers/mmixal.tes index c801670..3193e18 100644 --- a/lib/lexers/mmixal.tes +++ b/lib/lexers/mmixal.tes @@ -5,7 +5,7 @@ } @[lexer.set.mmixal]{ - ESSETLEXER,SCLEX_MMIXAL + ESSETLEXERLANGUAGEmmixal 0ESSETKEYWORDS 2ADDU 4ADDU 8ADDU 16ADDU ADD ADDU AND ANDNH ANDNL ANDNMH ANDNML BDIF BEV BN BNN BNP BNZ BOD BP BSPEC BYTE BZ CMP CMPU CSEV CSN CSNN CSNP CSNZ CSOD CSP CSWAP diff --git a/lib/lexers/octave.tes b/lib/lexers/octave.tes index 0fa3569..1567d6c 100644 --- a/lib/lexers/octave.tes +++ b/lib/lexers/octave.tes @@ -5,7 +5,7 @@ } @[lexer.set.octave]{ - ESSETLEXER,SCLEX_OCTAVE + ESSETLEXERLANGUAGEoctave 0ESSETKEYWORDS __FILE__ __LINE__ break case catch classdef continue do else elseif end end_try_catch end_unwind_protect endclassdef endenumeration endevents endfor endif diff --git a/lib/lexers/oscript.tes b/lib/lexers/oscript.tes index 3bbf8b7..25d7153 100644 --- a/lib/lexers/oscript.tes +++ b/lib/lexers/oscript.tes @@ -5,7 +5,7 @@ } @[lexer.set.oscript]{ - ESSETLEXER,SCLEX_OSCRIPT + ESSETLEXERLANGUAGEoscript 0ESSETKEYWORDS break breakif by case continue continueif default downto else elseif end for goto if in repeat switch to until while function return void dll inbyref inout diff --git a/lib/lexers/pascal.tes b/lib/lexers/pascal.tes index e1323fa..ebf06ed 100644 --- a/lib/lexers/pascal.tes +++ b/lib/lexers/pascal.tes @@ -9,7 +9,7 @@ Q.r} @[lexer.set.pascal]{ - ESSETLEXER,SCLEX_PASCAL + ESSETLEXERLANGUAGEpascal 0ESSETKEYWORDS absolute abstract and array as asm assembler automated begin case cdecl class const constructor delayed deprecated destructor dispid dispinterface div do diff --git a/lib/lexers/perl.tes b/lib/lexers/perl.tes index a7d04ee..4f9b6e8 100644 --- a/lib/lexers/perl.tes +++ b/lib/lexers/perl.tes @@ -8,7 +8,7 @@ Q.r} @[lexer.set.perl]{ - ESSETLEXER,SCLEX_PERL + ESSETLEXERLANGUAGEperl 0ESSETKEYWORDS NULL __FILE__ __LINE__ __PACKAGE__ __DATA__ __END__ AUTOLOAD BEGIN CORE DESTROY END EQ GE GT INIT LE LT NE CHECK abs accept alarm and atan2 bind binmode diff --git a/lib/lexers/php.tes b/lib/lexers/php.tes index f20efb7..b447ecb 100644 --- a/lib/lexers/php.tes +++ b/lib/lexers/php.tes @@ -7,7 +7,7 @@ Q.r} @[lexer.set.php]{ - ESSETLEXER,SCLEX_HYPERTEXT + ESSETLEXERLANGUAGEhypertext 0ESSETKEYWORDS a abbr acronym address applet area b base basefont bdo big blockquote body br button caption center cite code col colgroup dd del dfn dir div dl dt em diff --git a/lib/lexers/pike.tes b/lib/lexers/pike.tes index eee474f..7bc203c 100644 --- a/lib/lexers/pike.tes +++ b/lib/lexers/pike.tes @@ -5,7 +5,7 @@ } @[lexer.set.pike]{ - ESSETLEXER,SCLEX_CPP + ESSETLEXERLANGUAGEcpp 0ESSETKEYWORDS constant enum if do for while else foreach case switch break continue return typeof catch class lambda import inherit static void int string float mixed object diff --git a/lib/lexers/pov.tes b/lib/lexers/pov.tes index 93d8bec..1cfb2a1 100644 --- a/lib/lexers/pov.tes +++ b/lib/lexers/pov.tes @@ -6,7 +6,7 @@ Q.r} @[lexer.set.pov]{ - ESSETLEXER,SCLEX_POV + ESSETLEXERLANGUAGEpov 0ESSETKEYWORDS declare local include undef fopen fclose read write default version case range break debug error warning if ifdef ifndef switch while macro else end diff --git a/lib/lexers/powerpro.tes b/lib/lexers/powerpro.tes index b4fa29f..a764a2f 100644 --- a/lib/lexers/powerpro.tes +++ b/lib/lexers/powerpro.tes @@ -5,7 +5,7 @@ } @[lexer.set.powerpro]{ - ESSETLEXER,SCLEX_POWERPRO + ESSETLEXERLANGUAGEpowerpro 0ESSETKEYWORDS break do else elseif endfor endif for function global gt if ifelse ifx jump local lt quit static diff --git a/lib/lexers/purebasic.tes b/lib/lexers/purebasic.tes index 6c220b9..5715205 100644 --- a/lib/lexers/purebasic.tes +++ b/lib/lexers/purebasic.tes @@ -5,7 +5,7 @@ } @[lexer.set.purebasic]{ - ESSETLEXER,SCLEX_PUREBASIC + ESSETLEXERLANGUAGEpurebasic 0ESSETKEYWORDS and break case continue data datasection declare declarecdll declaredll default deftype dim else elseif end enddatasection endenumeration endif endinterface diff --git a/lib/lexers/r.tes b/lib/lexers/r.tes index 0889d27..7d583d1 100644 --- a/lib/lexers/r.tes +++ b/lib/lexers/r.tes @@ -7,7 +7,7 @@ Q.r} @[lexer.set.r]{ - ESSETLEXER,SCLEX_R + ESSETLEXERLANGUAGEr 0ESSETKEYWORDS if else repeat while function for in next break TRUE FALSE NULL NA Inf NaN 1ESSETKEYWORDS diff --git a/lib/lexers/rc.tes b/lib/lexers/rc.tes index 077e3df..1591f4b 100644 --- a/lib/lexers/rc.tes +++ b/lib/lexers/rc.tes @@ -7,7 +7,7 @@ Q.r} @[lexer.set.rc]{ - ESSETLEXER,SCLEX_CPP + ESSETLEXERLANGUAGEcpp 0ESSETKEYWORDS ACCELERATORS ALT AUTO3STATE AUTOCHECKBOX AUTORADIOBUTTON BEGIN BITMAP BLOCK BUTTON CAPTION CHARACTERISTICS CHECKBOX CLASS COMBOBOX CONTROL CTEXT CURSOR diff --git a/lib/lexers/rebol.tes b/lib/lexers/rebol.tes index ac75d03..62346a6 100644 --- a/lib/lexers/rebol.tes +++ b/lib/lexers/rebol.tes @@ -6,7 +6,7 @@ Q.r} @[lexer.set.rebol]{ - ESSETLEXER,SCLEX_REBOL + ESSETLEXERLANGUAGErebol 0ESSETKEYWORDS about abs absolute add alert alias all alter and any any-block? any-function? any-string? any-type? any-word? append arccosine arcsine arctangent array diff --git a/lib/lexers/rust.tes b/lib/lexers/rust.tes index ada1907..f622965 100644 --- a/lib/lexers/rust.tes +++ b/lib/lexers/rust.tes @@ -5,7 +5,7 @@ } @[lexer.set.rust]{ - ESSETLEXER,SCLEX_RUST + ESSETLEXERLANGUAGErust 0ESSETKEYWORDS if else repeat while function for in next break TRUE FALSE NULL NA Inf NaN 1ESSETKEYWORDS diff --git a/lib/lexers/scheme.tes b/lib/lexers/scheme.tes index d1c2b3e..9b13f33 100644 --- a/lib/lexers/scheme.tes +++ b/lib/lexers/scheme.tes @@ -7,7 +7,7 @@ Q.r} @[lexer.set.scheme]{ - ESSETLEXER,SCLEX_LISP + ESSETLEXERLANGUAGElisp 0ESSETKEYWORDS + - * / = < > <= >= => abs acos and angle append apply asin assoc assoc assq assv atan begin boolean? caar cadr call-with-current-continuation call/cc diff --git a/lib/lexers/specman.tes b/lib/lexers/specman.tes index c33acf0..753bc21 100644 --- a/lib/lexers/specman.tes +++ b/lib/lexers/specman.tes @@ -5,7 +5,7 @@ } @[lexer.set.specman]{ - ESSETLEXER,SCLEX_EIFFEL + ESSETLEXERLANGUAGEeiffel 0ESSETKEYWORDS abs acos ascii asin asstring atan atan2 ave case choose choosen choosesets clustersize cos cosh count cron dataset dedup denormalize distribute distributed diff --git a/lib/lexers/spice.tes b/lib/lexers/spice.tes index ae909bf..f399e4e 100644 --- a/lib/lexers/spice.tes +++ b/lib/lexers/spice.tes @@ -6,7 +6,7 @@ Q.r} @[lexer.set.spice]{ - ESSETLEXER,SCLEX_SPICE + ESSETLEXERLANGUAGEspice 0ESSETKEYWORDS ac alias alter alterparam append askvalues assertvalid autoscale break compose copy copytodoc dc delete destroy destroyvec diff display disto dowhile echo diff --git a/lib/lexers/swift.tes b/lib/lexers/swift.tes index 5abc8ca..b4d6c31 100644 --- a/lib/lexers/swift.tes +++ b/lib/lexers/swift.tes @@ -5,7 +5,7 @@ } @[lexer.set.swift]{ - ESSETLEXER,SCLEX_CPP + ESSETLEXERLANGUAGEcpp 0ESSETKEYWORDS class deinit enum extension func import init internal let operator private protocol public static struct subscript typealias var break case continue default do diff --git a/lib/lexers/systemverilog.tes b/lib/lexers/systemverilog.tes index 9e5c696..55a780d 100644 --- a/lib/lexers/systemverilog.tes +++ b/lib/lexers/systemverilog.tes @@ -6,7 +6,7 @@ Q.r} @[lexer.set.systemverilog]{ - ESSETLEXER,SCLEX_VERILOG + ESSETLEXERLANGUAGEverilog 0ESSETKEYWORDS alias always always_comb always_ff always_latch and assert assign assume automatic before begin bind bins binsof bit break buf bufif0 bufif1 byte case casex diff --git a/lib/lexers/tacl.tes b/lib/lexers/tacl.tes index 13c975a..0876329 100644 --- a/lib/lexers/tacl.tes +++ b/lib/lexers/tacl.tes @@ -5,7 +5,7 @@ } @[lexer.set.tacl]{ - ESSETLEXER,SCLEX_TACL + ESSETLEXERLANGUAGETACL 0ESSETKEYWORDS activate add adddsttransition adduser alter altpri assign attachseg backupcpu break builtins buscmd clear columnize comment compute copy dump copyvar diff --git a/lib/lexers/tal.tes b/lib/lexers/tal.tes index 93ad688..5acd5a4 100644 --- a/lib/lexers/tal.tes +++ b/lib/lexers/tal.tes @@ -5,7 +5,7 @@ } @[lexer.set.tal]{ - ESSETLEXER,SCLEX_TAL + ESSETLEXERLANGUAGETAL 0ESSETKEYWORDS and assert baddr begin by call callable case cbaddr code cwaddr define do downto drop else end entry external fixed for forward goto if int interrupt label diff --git a/lib/lexers/tcl.tes b/lib/lexers/tcl.tes index dddae89..5fd47de 100644 --- a/lib/lexers/tcl.tes +++ b/lib/lexers/tcl.tes @@ -6,7 +6,7 @@ Q.r} @[lexer.set.tcl]{ - ESSETLEXER,SCLEX_TCL + ESSETLEXERLANGUAGEtcl 0ESSETKEYWORDS after append array auto_execok auto_import auto_load auto_load_index auto_qualify beep bgerror binary break case catch cd clock close concat continue dde diff --git a/lib/lexers/test.tes b/lib/lexers/test.tes index 48eb396..cff5ff3 100644 --- a/lib/lexers/test.tes +++ b/lib/lexers/test.tes @@ -7,7 +7,7 @@ Q.r} @[lexer.set.test]{ - ESSETLEXER,SCLEX_CPP + ESSETLEXERLANGUAGEcpp :M[color.comment],1M[color.set] :M[color.comment],2M[color.set] :M[color.comment],3M[color.set] diff --git a/lib/lexers/vala.tes b/lib/lexers/vala.tes index c78d079..b76dccd 100644 --- a/lib/lexers/vala.tes +++ b/lib/lexers/vala.tes @@ -5,7 +5,7 @@ } @[lexer.set.vala]{ - ESSETLEXER,SCLEX_CPP + ESSETLEXERLANGUAGEcpp 0ESSETKEYWORDS if else switch case default break continue return yield for foreach in do while try catch finally throw diff --git a/lib/lexers/vb.tes b/lib/lexers/vb.tes index 18ffbe2..aa9e42a 100644 --- a/lib/lexers/vb.tes +++ b/lib/lexers/vb.tes @@ -12,7 +12,7 @@ Q.r} @[lexer.set.vb]{ - ESSETLEXER,SCLEX_VB + ESSETLEXERLANGUAGEvb 0ESSETKEYWORDS addressof alias and as attribute base begin binary boolean byref byte byval call case cdbl cint clng compare const csng cstr currency date decimal declare diff --git a/lib/lexers/verilog.tes b/lib/lexers/verilog.tes index 4c5d99a..4c83157 100644 --- a/lib/lexers/verilog.tes +++ b/lib/lexers/verilog.tes @@ -6,7 +6,7 @@ Q.r} @[lexer.set.verilog]{ - ESSETLEXER,SCLEX_VERILOG + ESSETLEXERLANGUAGEverilog 0ESSETKEYWORDS always and assign automatic begin buf bufif0 bufif1 case casex casez cell cmos config deassign default defparam design disable edge else end endcase diff --git a/lib/lexers/vhdl.tes b/lib/lexers/vhdl.tes index f382640..db6c7e2 100644 --- a/lib/lexers/vhdl.tes +++ b/lib/lexers/vhdl.tes @@ -6,7 +6,7 @@ Q.r} @[lexer.set.vhdl]{ - ESSETLEXER,SCLEX_VHDL + ESSETLEXERLANGUAGEvhdl 0ESSETKEYWORDS access after alias all architecture array assert attribute begin block body buffer bus case component configuration constant disconnect downto else elsif end diff --git a/lib/lexers/vxml.tes b/lib/lexers/vxml.tes index 74197ba..1844616 100644 --- a/lib/lexers/vxml.tes +++ b/lib/lexers/vxml.tes @@ -5,7 +5,7 @@ } @[lexer.set.vxml]{ - ESSETLEXER,SCLEX_HYPERTEXT + ESSETLEXERLANGUAGEhypertext 0ESSETKEYWORDS assign audio block break catch choice clear disconnect else elseif emphasis enumerate error exit field filled form goto grammar help if initial link log menu meta diff --git a/lib/lexers/xml.tes b/lib/lexers/xml.tes index 92c02da..9d58de7 100644 --- a/lib/lexers/xml.tes +++ b/lib/lexers/xml.tes @@ -14,7 +14,7 @@ Q.r} @[lexer.set.xml]{ - ESSETLEXER,SCLEX_XML + ESSETLEXERLANGUAGExml 0ESSETKEYWORDS ! DTD keywords ! 5ESSETKEYWORDS diff --git a/lib/scite2co.lua b/lib/scite2co.lua index c0e223a..b39c184 100755 --- a/lib/scite2co.lua +++ b/lib/scite2co.lua @@ -109,10 +109,14 @@ io.write([=[Q.r} ]=]) -- print [lexer.set...] macro +-- NOTE: The lexer encoded in the property file is not +-- a SCLEX_* name but rather the lexer's module name +-- as set by the LexerModule constructor. +-- Therefore we must emit SCI_SETLEXERLANGUAGE calls here. local lexer = expand(get_property_by_pattern("lexer.", file_patterns)) io.write([=[ @[lexer.set.]=]..language:lower()..[=[]{ - ESSETLEXER,SCLEX_]=]..lexer:upper()..[=[ + ESSETLEXERLANGUAGE]=]..lexer..[=[ ]=]) -- print keyword definitions with word wrapping for i = 1, 9 do |