From fec93b9b0cc83dc1102c78c8bf1eacaf8763d9b8 Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Mon, 23 Mar 2015 20:30:46 +0100 Subject: reformatted existing lexer definitions * they are updated with the results of scite2co.lua This makes it easier in the future to update lexer settings based on the property files of new SciTE releases. --- lib/Makefile.am | 4 +-- lib/lexers/bash.tes | 42 ++++++++++++++++++++++++ lib/lexers/batch.tes | 14 ++++---- lib/lexers/cmake.tes | 91 +++++++++++++++++++--------------------------------- lib/lexers/cpp.tes | 42 ++++++++++++------------ lib/lexers/diff.tes | 16 +++++++++ lib/lexers/patch.tes | 16 --------- lib/lexers/sh.tes | 50 ----------------------------- lib/lexers/xml.tes | 9 +++--- 9 files changed, 125 insertions(+), 159 deletions(-) create mode 100644 lib/lexers/bash.tes create mode 100644 lib/lexers/diff.tes delete mode 100644 lib/lexers/patch.tes delete mode 100644 lib/lexers/sh.tes (limited to 'lib') diff --git a/lib/Makefile.am b/lib/Makefile.am index 21a8774..027a2f7 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -13,8 +13,8 @@ dist_colorscheme_DATA = colors/terminal.tes # This list must be extended when adding # a new lexer configuration: lexerdir = $(scitecolibdir)/lexers -dist_lexer_DATA = lexers/patch.tes \ - lexers/sh.tes \ +dist_lexer_DATA = lexers/diff.tes \ + lexers/bash.tes \ lexers/cpp.tes \ lexers/cmake.tes \ lexers/batch.tes \ diff --git a/lib/lexers/bash.tes b/lib/lexers/bash.tes new file mode 100644 index 0000000..80a3bbb --- /dev/null +++ b/lib/lexers/bash.tes @@ -0,0 +1,42 @@ +! Unix Shell + It's called bash.tes only because SciTE calls it this way + internally ! + +@[lexer.test.bash]{ [_ + _#!M[sh,bash,ksh]M[lexer.checkheader]"S + -1 + | + _[.sh,.bsh,configure,.ksh]M[lexer.checkname] + ' +]_ } + +@[lexer.set.bash]{ + ESSETLEXER,SCLEX_BASH + 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 + crypt csplit ctags cut date dc dd declare deroff dev df diff diff3 dircmp dirname + do done du echo ed egrep elif else env esac eval ex exec exit expand export + expr false fc fgrep fi file find fmt fold for function functions getconf getopt + getopts grep gres hash head help history iconv id if in integer jobs join kill local + lc let line ln logname look ls m4 mail mailx make man mkdir more mt mv newgrp + nl nm nohup ntps od pack paste patch pathchk pax pcat perl pg pr print printf + ps pwd read readonly red return rev rm rmdir sed select set sh shift size sleep + sort spell split start stop strings strip stty sum suspend sync tail tar tee test + then time times touch tr trap true tsort tty type typeset ulimit umask unalias + uname uncompress unexpand uniq unpack unset until uudecode uuencode vi vim vpax + wait wc whence which while who wpaste wstart xargs zcat chgrp chown chroot dir + dircolors factor groups hostid install link md5sum mkfifo mknod nice pinky printenv + ptx readlink seq sha1sum shred stat su tac unlink users vdir whoami yes + :M[color.error],1M[color.set] + :M[color.comment],2M[color.set] + :M[color.number],3M[color.set] + :M[color.keyword],4M[color.set] + :M[color.string],5M[color.set] + :M[color.string],6M[color.set] + :M[color.operator],7M[color.set] + :M[color.target],8M[color.set] ! Identifiers, e.g. FOO=... ! + :M[color.variable],9M[color.set] + :M[color.variable],10M[color.set] + :M[color.string2],11M[color.set] ! Backticks ! +} diff --git a/lib/lexers/batch.tes b/lib/lexers/batch.tes index 000910d..09c8649 100644 --- a/lib/lexers/batch.tes +++ b/lib/lexers/batch.tes @@ -1,17 +1,15 @@ ! DOS, Windows, OS/2 Batch Files ! -@[lexer.test.batch]{ - [_ _.[bat,cmd,nt]M[lexer.checkname] ]_ -} +@[lexer.test.batch]{ [_ + _.[bat,cmd,nt]M[lexer.checkname] +]_ } @[lexer.set.batch]{ ESSETLEXER,SCLEX_BATCH 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 pause prompt rename ren - rmdir rd shift time type ver verify vol - com con lpt nul + 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 + pause prompt rename ren rmdir rd shift time type ver verify vol com con lpt nul color copy defined else not start :M[color.comment],1M[color.set] :M[color.keyword],2M[color.set] diff --git a/lib/lexers/cmake.tes b/lib/lexers/cmake.tes index 02728e5..b6028bc 100644 --- a/lib/lexers/cmake.tes +++ b/lib/lexers/cmake.tes @@ -1,70 +1,45 @@ ! CMake Lexing ! -@[lexer.test.cmake]{ - [_ _[CMakeLists.txt,.cmake,.ctest]M[lexer.checkname] ]_ -} +@[lexer.test.cmake]{ [_ + _[CMakeLists.txt,.cmake,.cmake.in,.ctest,.ctest.in]M[lexer.checkname] +]_ } @[lexer.set.cmake]{ ESSETLEXER,SCLEX_CMAKE ! Commands ! 0ESSETKEYWORDS - add_custom_command add_custom_target add_definitions - add_dependencies add_executable add_library - add_subdirectory add_test aux_source_directory - build_command build_name cmake_minimum_required cmake_policy - configure_file create_test_sourcelist else - elseif enable_language enable_testing - endforeach endif endmacro - endwhile exec_program execute_process - export_library_dependencies file find_file - find_library find_package find_path - find_program fltk_wrap_ui foreach - get_cmake_property get_directory_property get_filename_component - get_source_file_property get_target_property get_test_property - if include include_directories - include_external_msproject include_regular_expression install - install_files install_programs install_targets - link_directories link_libraries list - load_cache load_command macro - make_directory mark_as_advanced math - message option output_required_files - project qt_wrap_cpp qt_wrap_ui - remove remove_definitions separate_arguments - set set_directory_properties set_source_files_properties - set_target_properties set_tests_properties site_name - source_group string subdir_depends - subdirs target_link_libraries try_compile - try_run use_mangled_mesa utility_source - variable_requires vtk_make_instantiator vtk_wrap_java - vtk_wrap_python vtk_wrap_tcl while - write_file + add_custom_command add_custom_target add_definitions add_dependencies + add_executable add_library add_subdirectory add_test aux_source_directory build_command + build_name cmake_minimum_required configure_file create_test_sourcelist else elseif + enable_language enable_testing endforeach endif endmacro endwhile exec_program + execute_process export_library_dependencies file find_file find_library find_package + find_path find_program fltk_wrap_ui foreach get_cmake_property get_directory_property + get_filename_component get_source_file_property get_target_property get_test_property if include + include_directories include_external_msproject include_regular_expression install install_files + install_programs install_targets link_directories link_libraries list load_cache load_command + macro make_directory mark_as_advanced math message option output_required_files + project qt_wrap_cpp qt_wrap_ui remove remove_definitions separate_arguments set + set_directory_properties set_source_files_properties set_target_properties set_tests_properties + site_name source_group string subdir_depends subdirs target_link_libraries try_compile + try_run use_mangled_mesa utility_source variable_requires vtk_make_instantiator + vtk_wrap_java vtk_wrap_python vtk_wrap_tcl while write_file ! Special command arguments ! 1ESSETKEYWORDS - ABSOLUTE ABSTRACT ADDITIONAL_MAKE_CLEAN_FILES ALL AND - APPEND ARGS ASCII BEFORE CACHE - CACHE_VARIABLES CLEAR COMMAND COMMANDS COMMAND_NAME - COMMENT COMPARE COMPILE_FLAGS COPYONLY DEFINED - DEFINE_SYMBOL DEPENDS DOC EQUAL ESCAPE_QUOTES - EXCLUDE EXCLUDE_FROM_ALL EXISTS EXPORT_MACRO EXT - EXTRA_INCLUDE FATAL_ERROR FILE FILES FORCE - FUNCTION GENERATED GLOB GLOB_RECURSE GREATER - GROUP_SIZE HEADER_FILE_ONLY HEADER_LOCATION HINTS IMMEDIATE INCLUDES - INCLUDE_DIRECTORIES INCLUDE_INTERNALS INCLUDE_REGULAR_EXPRESSION LESS LINK_DIRECTORIES - LINK_FLAGS LOCATION MACOSX_BUNDLE MACROS MAIN_DEPENDENCY - MAKE_DIRECTORY MATCH MATCHALL MATCHES MODULE - NAME NAME_WE NOT NOTEQUAL NO_SYSTEM_PATH - OBJECT_DEPENDS OPTIONAL OR OUTPUT OUTPUT_VARIABLE - PATH PATHS POST_BUILD POST_INSTALL_SCRIPT PREFIX - PREORDER PRE_BUILD PRE_INSTALL_SCRIPT PRE_LINK PROGRAM - PROGRAM_ARGS PROPERTIES QUIET RANGE READ - REGEX REGULAR_EXPRESSION REPLACE REQUIRED RETURN_VALUE - RUNTIME_DIRECTORY SEND_ERROR SHARED SOURCES STATIC - STATUS STREQUAL STRGREATER STRLESS SUFFIX - TARGET TOLOWER TOUPPER VAR VARIABLES - VERSION WIN32 WRAP_EXCLUDE WRITE APPLE - MINGW MSYS CYGWIN BORLAND WATCOM MSVC MSVC_IDE MSVC60 - MSVC70 MSVC71 MSVC80 CMAKE_COMPILER_2005 OFF - ON + ABSOLUTE ABSTRACT ADDITIONAL_MAKE_CLEAN_FILES ALL AND APPEND ARGS ASCII + BEFORE CACHE CACHE_VARIABLES CLEAR COMMAND COMMANDS COMMAND_NAME COMMENT COMPARE + COMPILE_FLAGS COPYONLY DEFINED DEFINE_SYMBOL DEPENDS DOC EQUAL ESCAPE_QUOTES EXCLUDE + EXCLUDE_FROM_ALL EXISTS EXPORT_MACRO EXT EXTRA_INCLUDE FATAL_ERROR FILE FILES FORCE FUNCTION + GENERATED GLOB GLOB_RECURSE GREATER GROUP_SIZE HEADER_FILE_ONLY HEADER_LOCATION + IMMEDIATE INCLUDES INCLUDE_DIRECTORIES INCLUDE_INTERNALS INCLUDE_REGULAR_EXPRESSION + LESS LINK_DIRECTORIES LINK_FLAGS LOCATION MACOSX_BUNDLE MACROS MAIN_DEPENDENCY + MAKE_DIRECTORY MATCH MATCHALL MATCHES MODULE NAME NAME_WE NOT NOTEQUAL NO_SYSTEM_PATH + OBJECT_DEPENDS OPTIONAL OR OUTPUT OUTPUT_VARIABLE PATH PATHS POST_BUILD POST_INSTALL_SCRIPT + PREFIX PREORDER PRE_BUILD PRE_INSTALL_SCRIPT PRE_LINK PROGRAM PROGRAM_ARGS + PROPERTIES QUIET RANGE READ REGEX REGULAR_EXPRESSION REPLACE REQUIRED RETURN_VALUE + RUNTIME_DIRECTORY SEND_ERROR SHARED SOURCES STATIC STATUS STREQUAL STRGREATER STRLESS SUFFIX + TARGET TOLOWER TOUPPER VAR VARIABLES VERSION WIN32 WRAP_EXCLUDE WRITE APPLE MINGW + MSYS CYGWIN BORLAND WATCOM MSVC MSVC_IDE MSVC60 MSVC70 MSVC71 MSVC80 + CMAKE_COMPILER_2005 OFF ON :M[color.comment],1M[color.set] :M[color.string],2M[color.set] :M[color.string],3M[color.set] diff --git a/lib/lexers/cpp.tes b/lib/lexers/cpp.tes index 8d7cee8..a080c7c 100644 --- a/lib/lexers/cpp.tes +++ b/lib/lexers/cpp.tes @@ -1,32 +1,32 @@ ! C/C++ Lexing ! -@[lexer.test.cpp]{ - [_ _.[c,cc,cpp,cxx,h,hh,hpp,hxx,ipp,m,mm,sma]M[lexer.checkname] ]_ -} +@[lexer.test.cpp]{ [_ + _.[c,cc,cpp,cxx,h,hh,hpp,hxx,ipp,m,mm,sma]M[lexer.checkname] +]_ } @[lexer.set.cpp]{ ESSETLEXER,SCLEX_CPP 0ESSETKEYWORDS - and and_eq asm auto bitand bitor bool break - case catch char class compl const const_cast continue - default delete do double dynamic_cast else enum explicit export extern false float for - friend goto if inline int long mutable namespace new not not_eq - operator or or_eq private protected public - register reinterpret_cast return short signed sizeof static static_cast struct switch - template this throw true try typedef typeid typename union unsigned using - virtual void volatile wchar_t while xor xor_eq + 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 + enum explicit export extern false float for friend goto if inline int long + mutable namespace new not not_eq operator or or_eq private protected public register + reinterpret_cast return short signed sizeof static static_cast struct switch template this + throw true try typedef typeid typename union unsigned using virtual void volatile + wchar_t while xor xor_eq @class @defs @protocol @required @optional @end @interface + @public @package @protected @private @property @implementation @synthesize @dynamic + @throw @try @catch @finally @synchronized @autoreleasepool @selector @encode + @compatibility_alias ! Doxygen keywords ! 2ESSETKEYWORDS - a addindex addtogroup anchor arg attention - author b brief bug c class code date def defgroup deprecated dontinclude - e em endcode endhtmlonly endif endlatexonly endlink endverbatim enum example exception - f$ f[ f] file fn hideinitializer htmlinclude htmlonly - if image include ingroup internal invariant interface latexonly li line link - mainpage name namespace nosubgrouping note overload - p page par param post pre ref relates remarks return retval - sa section see showinitializer since skip skipline struct subsection - test throw todo typedef union until - var verbatim verbinclude version warning weakgroup $ @ \ & < > # { } + a addindex addtogroup anchor arg attention author b brief bug c class code + date def defgroup deprecated dontinclude e em endcode endhtmlonly endif + endlatexonly endlink endverbatim enum example exception f$ f[ f] file fn hideinitializer + htmlinclude htmlonly if image include ingroup internal invariant interface latexonly li + line link mainpage name namespace nosubgrouping note overload p page par param + param[in] param[out] post pre ref relates remarks return retval sa section see + showinitializer since skip skipline struct subsection test throw throws todo typedef union + until var verbatim verbinclude version warning weakgroup $ @ \ & < > # { } :M[color.comment],1M[color.set] :M[color.comment],2M[color.set] :M[color.comment],3M[color.set] diff --git a/lib/lexers/diff.tes b/lib/lexers/diff.tes new file mode 100644 index 0000000..fb1af2b --- /dev/null +++ b/lib/lexers/diff.tes @@ -0,0 +1,16 @@ +! Patch/Diff Files ! + +@[lexer.test.diff]{ [_ + _.[diff,patch]M[lexer.checkname] +]_ } + +@[lexer.set.diff]{ + ESSETLEXER,SCLEX_DIFF + :M[color.comment],1M[color.set] + :M[color.keyword],2M[color.set] ! Command ! + :M[color.preproc],3M[color.set] ! Source/Dest ! + :M[color.operator],4M[color.set] ! Position @@ ! + :M[color.deletion],5M[color.set] + :M[color.addition],6M[color.set] + :M[color.change],7M[color.set] +} diff --git a/lib/lexers/patch.tes b/lib/lexers/patch.tes deleted file mode 100644 index 20670c1..0000000 --- a/lib/lexers/patch.tes +++ /dev/null @@ -1,16 +0,0 @@ -! Patch/Diff Files ! - -@[lexer.test.patch]{ - [_ _.[diff,patch]M[lexer.checkname] ]_ -} - -@[lexer.set.patch]{ - ESSETLEXER,SCLEX_DIFF - :M[color.comment],1M[color.set] - :M[color.keyword],2M[color.set] ! Command ! - :M[color.preproc],3M[color.set] ! Source/Dest ! - :M[color.operator],4M[color.set] ! Position @@ ! - :M[color.deletion],5M[color.set] - :M[color.addition],6M[color.set] - :M[color.change],7M[color.set] -} diff --git a/lib/lexers/sh.tes b/lib/lexers/sh.tes deleted file mode 100644 index 5e853d0..0000000 --- a/lib/lexers/sh.tes +++ /dev/null @@ -1,50 +0,0 @@ -! Unix Shell ! - -@[lexer.test.sh]{ [_ - _#!M[sh,bash,ksh]M[lexer.checkheader]"S - -1 - | - _[.sh,.bsh,configure,.ksh]M[lexer.checkname] - ' -]_ } - -@[lexer.set.sh]{ - ESSETLEXER,SCLEX_BASH - 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 crypt - csplit ctags cut date dc dd declare deroff dev df diff diff3 - dircmp dirname do done du echo ed egrep elif else env - esac eval ex exec exit expand export expr false fc - fgrep fi file find fmt fold for function functions - getconf getopt getopts grep gres hash head help - history iconv id if in integer jobs join kill local lc - let line ln logname look ls m4 mail mailx make - man mkdir more mt mv newgrp nl nm nohup ntps od - pack paste patch pathchk pax pcat perl pg pr print - printf ps pwd read readonly red return rev rm rmdir - sed select set sh shift size sleep sort spell - split start stop strings strip stty sum suspend - sync tail tar tee test then time times touch tr - trap true tsort tty type typeset ulimit umask unalias - uname uncompress unexpand uniq unpack unset until - uudecode uuencode vi vim vpax wait wc whence which - while who wpaste wstart xargs zcat - - chgrp chown chroot dir dircolors - factor groups hostid install link md5sum mkfifo - mknod nice pinky printenv ptx readlink seq - sha1sum shred stat su tac unlink users vdir whoami yes - :M[color.error],1M[color.set] - :M[color.comment],2M[color.set] - :M[color.number],3M[color.set] - :M[color.keyword],4M[color.set] - :M[color.string],5M[color.set] - :M[color.string],6M[color.set] - :M[color.operator],7M[color.set] - :M[color.target],8M[color.set] ! Identifiers, e.g. FOO=... ! - :M[color.variable],9M[color.set] - :M[color.variable],10M[color.set] - :M[color.string2],11M[color.set] ! Backticks ! -} diff --git a/lib/lexers/xml.tes b/lib/lexers/xml.tes index 30094ea..ddb97df 100644 --- a/lib/lexers/xml.tes +++ b/lib/lexers/xml.tes @@ -1,14 +1,15 @@ ! Lexing for XML and its applications ! -@[lexer.test.xml]{ - [_ _.[xml,xsl,svg,xul,xsd,dtd,xslt,axl,xrc,rdf]M[lexer.checkname] ]_ -} +@[lexer.test.xml]{ [_ + _.[xml,xsl,svg,xul,xsd,dtd,xslt,axl,xrc,rdf]M[lexer.checkname] +]_ } @[lexer.set.xml]{ ESSETLEXER,SCLEX_XML 0ESSETKEYWORDS  ! DTD keywords ! - 5ESSETKEYWORDSELEMENT DOCTYPE ATTLIST ENTITY NOTATION + 5ESSETKEYWORDS + ELEMENT DOCTYPE ATTLIST ENTITY NOTATION :M[color.keyword],1M[color.set] ! Tags ! :M[color.keyword],2M[color.set] ! Tags ! :M[color.variable],3M[color.set] ! Attributes ! -- cgit v1.2.3