diff --git a/3rdparty/lexilla532/lexilla/lexlib/LexerNoExceptions.cxx b/3rdparty/lexilla532/lexilla/lexlib/LexerNoExceptions.cxx deleted file mode 100644 index d4c2857..0000000 --- a/3rdparty/lexilla532/lexilla/lexlib/LexerNoExceptions.cxx +++ /dev/null @@ -1,65 +0,0 @@ -// Scintilla source code edit control -/** @file LexerNoExceptions.cxx - ** A simple lexer with no state which does not throw exceptions so can be used in an external lexer. - **/ -// Copyright 1998-2010 by Neil Hodgson -// The License.txt file describes the conditions under which this software may be distributed. - -#include -#include - -#include -#include - -#include "ILexer.h" -#include "Scintilla.h" -#include "SciLexer.h" - -#include "PropSetSimple.h" -#include "WordList.h" -#include "LexAccessor.h" -#include "Accessor.h" -#include "LexerModule.h" -#include "LexerBase.h" -#include "LexerNoExceptions.h" - -using namespace Lexilla; - -Sci_Position SCI_METHOD LexerNoExceptions::PropertySet(const char *key, const char *val) { - try { - return LexerBase::PropertySet(key, val); - } catch (...) { - // Should not throw into caller as may be compiled with different compiler or options - } - return -1; -} - -Sci_Position SCI_METHOD LexerNoExceptions::WordListSet(int n, const char *wl) { - try { - return LexerBase::WordListSet(n, wl); - } catch (...) { - // Should not throw into caller as may be compiled with different compiler or options - } - return -1; -} - -void SCI_METHOD LexerNoExceptions::Lex(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, Scintilla::IDocument *pAccess) { - try { - Accessor astyler(pAccess, &props); - Lexer(startPos, lengthDoc, initStyle, pAccess, astyler); - astyler.Flush(); - } catch (...) { - // Should not throw into caller as may be compiled with different compiler or options - pAccess->SetErrorStatus(SC_STATUS_FAILURE); - } -} -void SCI_METHOD LexerNoExceptions::Fold(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, Scintilla::IDocument *pAccess) { - try { - Accessor astyler(pAccess, &props); - Folder(startPos, lengthDoc, initStyle, pAccess, astyler); - astyler.Flush(); - } catch (...) { - // Should not throw into caller as may be compiled with different compiler or options - pAccess->SetErrorStatus(SC_STATUS_FAILURE); - } -} diff --git a/3rdparty/lexilla532/lexilla/lexlib/LexerNoExceptions.h b/3rdparty/lexilla532/lexilla/lexlib/LexerNoExceptions.h deleted file mode 100644 index 6b3a85a..0000000 --- a/3rdparty/lexilla532/lexilla/lexlib/LexerNoExceptions.h +++ /dev/null @@ -1,28 +0,0 @@ -// Scintilla source code edit control -/** @file LexerNoExceptions.h - ** A simple lexer with no state. - **/ -// Copyright 1998-2010 by Neil Hodgson -// The License.txt file describes the conditions under which this software may be distributed. - -#ifndef LEXERNOEXCEPTIONS_H -#define LEXERNOEXCEPTIONS_H - -namespace Lexilla { - -// A simple lexer with no state -class LexerNoExceptions : public LexerBase { -public: - // TODO Also need to prevent exceptions in constructor and destructor - Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override; - Sci_Position SCI_METHOD WordListSet(int n, const char *wl) override; - void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, Scintilla::IDocument *pAccess) override; - void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, Scintilla::IDocument *) override; - - virtual void Lexer(Sci_PositionU startPos, Sci_Position length, int initStyle, Scintilla::IDocument *pAccess, Accessor &styler) = 0; - virtual void Folder(Sci_PositionU startPos, Sci_Position length, int initStyle, Scintilla::IDocument *pAccess, Accessor &styler) = 0; -}; - -} - -#endif diff --git a/3rdparty/lexilla532/lexilla/src/Lexilla.cxx b/3rdparty/lexilla532/lexilla/src/Lexilla.cxx deleted file mode 100644 index 4a0ce4e..0000000 --- a/3rdparty/lexilla532/lexilla/src/Lexilla.cxx +++ /dev/null @@ -1,379 +0,0 @@ -// Lexilla lexer library -/** @file Lexilla.cxx - ** Lexer infrastructure. - ** Provides entry points to shared library. - **/ -// Copyright 2019 by Neil Hodgson -// The License.txt file describes the conditions under which this software may be distributed. - -#include - -#include -#include - -#if defined(_WIN32) -#define EXPORT_FUNCTION __declspec(dllexport) -#define CALLING_CONVENTION __stdcall -#else -#define EXPORT_FUNCTION __attribute__((visibility("default"))) -#define CALLING_CONVENTION -#endif - -#include "ILexer.h" - -#include "LexerModule.h" -#include "CatalogueModules.h" - -using namespace Lexilla; - -//++Autogenerated -- run lexilla/scripts/LexillaGen.py to regenerate -//**\(extern LexerModule \*;\n\) -extern LexerModule lmA68k; -extern LexerModule lmAbaqus; -extern LexerModule lmAda; -extern LexerModule lmAPDL; -extern LexerModule lmAs; -extern LexerModule lmAsciidoc; -extern LexerModule lmAsm; -extern LexerModule lmAsn1; -extern LexerModule lmASY; -extern LexerModule lmAU3; -extern LexerModule lmAVE; -extern LexerModule lmAVS; -extern LexerModule lmBaan; -extern LexerModule lmBash; -extern LexerModule lmBatch; -extern LexerModule lmBibTeX; -extern LexerModule lmBlitzBasic; -extern LexerModule lmBullant; -extern LexerModule lmCaml; -extern LexerModule lmCIL; -extern LexerModule lmClw; -extern LexerModule lmClwNoCase; -extern LexerModule lmCmake; -extern LexerModule lmCOBOL; -extern LexerModule lmCoffeeScript; -extern LexerModule lmConf; -extern LexerModule lmCPP; -extern LexerModule lmCPPNoCase; -extern LexerModule lmCsound; -extern LexerModule lmCss; -extern LexerModule lmD; -extern LexerModule lmDataflex; -extern LexerModule lmDiff; -extern LexerModule lmDMAP; -extern LexerModule lmDMIS; -extern LexerModule lmECL; -extern LexerModule lmEDIFACT; -extern LexerModule lmEiffel; -extern LexerModule lmEiffelkw; -extern LexerModule lmErlang; -extern LexerModule lmErrorList; -extern LexerModule lmESCRIPT; -extern LexerModule lmF77; -extern LexerModule lmFlagShip; -extern LexerModule lmForth; -extern LexerModule lmFortran; -extern LexerModule lmFreeBasic; -extern LexerModule lmFSharp; -extern LexerModule lmGAP; -extern LexerModule lmGDScript; -extern LexerModule lmGui4Cli; -extern LexerModule lmHaskell; -extern LexerModule lmHollywood; -extern LexerModule lmHTML; -extern LexerModule lmIHex; -extern LexerModule lmIndent; -extern LexerModule lmInno; -extern LexerModule lmJSON; -extern LexerModule lmJulia; -extern LexerModule lmKix; -extern LexerModule lmKVIrc; -extern LexerModule lmLatex; -extern LexerModule lmLISP; -extern LexerModule lmLiterateHaskell; -extern LexerModule lmLot; -extern LexerModule lmLout; -extern LexerModule lmLua; -extern LexerModule lmMagikSF; -extern LexerModule lmMake; -extern LexerModule lmMarkdown; -extern LexerModule lmMatlab; -extern LexerModule lmMaxima; -extern LexerModule lmMETAPOST; -extern LexerModule lmMMIXAL; -extern LexerModule lmModula; -extern LexerModule lmMSSQL; -extern LexerModule lmMySQL; -extern LexerModule lmNim; -extern LexerModule lmNimrod; -extern LexerModule lmNncrontab; -extern LexerModule lmNsis; -extern LexerModule lmNull; -extern LexerModule lmOctave; -extern LexerModule lmOpal; -extern LexerModule lmOScript; -extern LexerModule lmPascal; -extern LexerModule lmPB; -extern LexerModule lmPerl; -extern LexerModule lmPHPSCRIPT; -extern LexerModule lmPLM; -extern LexerModule lmPO; -extern LexerModule lmPOV; -extern LexerModule lmPowerPro; -extern LexerModule lmPowerShell; -extern LexerModule lmProgress; -extern LexerModule lmProps; -extern LexerModule lmPS; -extern LexerModule lmPureBasic; -extern LexerModule lmPython; -extern LexerModule lmR; -extern LexerModule lmRaku; -extern LexerModule lmREBOL; -extern LexerModule lmRegistry; -extern LexerModule lmRuby; -extern LexerModule lmRust; -extern LexerModule lmSAS; -extern LexerModule lmScriptol; -extern LexerModule lmSmalltalk; -extern LexerModule lmSML; -extern LexerModule lmSorc; -extern LexerModule lmSpecman; -extern LexerModule lmSpice; -extern LexerModule lmSQL; -extern LexerModule lmSrec; -extern LexerModule lmStata; -extern LexerModule lmSTTXT; -extern LexerModule lmTACL; -extern LexerModule lmTADS3; -extern LexerModule lmTAL; -extern LexerModule lmTCL; -extern LexerModule lmTCMD; -extern LexerModule lmTEHex; -extern LexerModule lmTeX; -extern LexerModule lmTxt2tags; -extern LexerModule lmVB; -extern LexerModule lmVBScript; -extern LexerModule lmVerilog; -extern LexerModule lmVHDL; -extern LexerModule lmVisualProlog; -extern LexerModule lmX12; -extern LexerModule lmXML; -extern LexerModule lmYAML; - -//--Autogenerated -- end of automatically generated section - -namespace { - -CatalogueModules catalogueLexilla; - -void AddEachLexer() { - - if (catalogueLexilla.Count() > 0) { - return; - } - - catalogueLexilla.AddLexerModules({ -//++Autogenerated -- run scripts/LexillaGen.py to regenerate -//**\(\t\t&\*,\n\) - &lmA68k, - &lmAbaqus, - &lmAda, - &lmAPDL, - &lmAs, - &lmAsciidoc, - &lmAsm, - &lmAsn1, - &lmASY, - &lmAU3, - &lmAVE, - &lmAVS, - &lmBaan, - &lmBash, - &lmBatch, - &lmBibTeX, - &lmBlitzBasic, - &lmBullant, - &lmCaml, - &lmCIL, - &lmClw, - &lmClwNoCase, - &lmCmake, - &lmCOBOL, - &lmCoffeeScript, - &lmConf, - &lmCPP, - &lmCPPNoCase, - &lmCsound, - &lmCss, - &lmD, - &lmDataflex, - &lmDiff, - &lmDMAP, - &lmDMIS, - &lmECL, - &lmEDIFACT, - &lmEiffel, - &lmEiffelkw, - &lmErlang, - &lmErrorList, - &lmESCRIPT, - &lmF77, - &lmFlagShip, - &lmForth, - &lmFortran, - &lmFreeBasic, - &lmFSharp, - &lmGAP, - &lmGDScript, - &lmGui4Cli, - &lmHaskell, - &lmHollywood, - &lmHTML, - &lmIHex, - &lmIndent, - &lmInno, - &lmJSON, - &lmJulia, - &lmKix, - &lmKVIrc, - &lmLatex, - &lmLISP, - &lmLiterateHaskell, - &lmLot, - &lmLout, - &lmLua, - &lmMagikSF, - &lmMake, - &lmMarkdown, - &lmMatlab, - &lmMaxima, - &lmMETAPOST, - &lmMMIXAL, - &lmModula, - &lmMSSQL, - &lmMySQL, - &lmNim, - &lmNimrod, - &lmNncrontab, - &lmNsis, - &lmNull, - &lmOctave, - &lmOpal, - &lmOScript, - &lmPascal, - &lmPB, - &lmPerl, - &lmPHPSCRIPT, - &lmPLM, - &lmPO, - &lmPOV, - &lmPowerPro, - &lmPowerShell, - &lmProgress, - &lmProps, - &lmPS, - &lmPureBasic, - &lmPython, - &lmR, - &lmRaku, - &lmREBOL, - &lmRegistry, - &lmRuby, - &lmRust, - &lmSAS, - &lmScriptol, - &lmSmalltalk, - &lmSML, - &lmSorc, - &lmSpecman, - &lmSpice, - &lmSQL, - &lmSrec, - &lmStata, - &lmSTTXT, - &lmTACL, - &lmTADS3, - &lmTAL, - &lmTCL, - &lmTCMD, - &lmTEHex, - &lmTeX, - &lmTxt2tags, - &lmVB, - &lmVBScript, - &lmVerilog, - &lmVHDL, - &lmVisualProlog, - &lmX12, - &lmXML, - &lmYAML, - -//--Autogenerated -- end of automatically generated section - }); - -} - -} - -extern "C" { - -EXPORT_FUNCTION int CALLING_CONVENTION GetLexerCount() { - AddEachLexer(); - return static_cast(catalogueLexilla.Count()); -} - -EXPORT_FUNCTION void CALLING_CONVENTION GetLexerName(unsigned int index, char *name, int buflength) { - AddEachLexer(); - *name = 0; - const char *lexerName = catalogueLexilla.Name(index); - if (static_cast(buflength) > strlen(lexerName)) { - strcpy(name, lexerName); - } -} - -EXPORT_FUNCTION LexerFactoryFunction CALLING_CONVENTION GetLexerFactory(unsigned int index) { - AddEachLexer(); - return catalogueLexilla.Factory(index); -} - -EXPORT_FUNCTION Scintilla::ILexer5 * CALLING_CONVENTION CreateLexer(const char *name) { - AddEachLexer(); - for (size_t i = 0; i < catalogueLexilla.Count(); i++) { - const char *lexerName = catalogueLexilla.Name(i); - if (0 == strcmp(lexerName, name)) { - return catalogueLexilla.Create(i); - } - } - return nullptr; -} - -EXPORT_FUNCTION const char * CALLING_CONVENTION LexerNameFromID(int identifier) { - AddEachLexer(); - const LexerModule *pModule = catalogueLexilla.Find(identifier); - if (pModule) { - return pModule->languageName; - } - return nullptr; -} - -EXPORT_FUNCTION const char * CALLING_CONVENTION GetLibraryPropertyNames() { - return ""; -} - -EXPORT_FUNCTION void CALLING_CONVENTION SetLibraryProperty(const char *, const char *) { - // Null implementation -} - -EXPORT_FUNCTION const char * CALLING_CONVENTION GetNameSpace() { - return "lexilla"; -} - -} - -// Not exported from binary as LexerModule must be built exactly the same as -// modules listed above -void AddStaticLexerModule(LexerModule *plm) { - AddEachLexer(); - catalogueLexilla.AddLexerModule(plm); -} diff --git a/3rdparty/lexilla532/lexilla/test/examples/vb/SciTE.properties b/3rdparty/lexilla532/lexilla/test/examples/vb/SciTE.properties deleted file mode 100644 index 859e547..0000000 --- a/3rdparty/lexilla532/lexilla/test/examples/vb/SciTE.properties +++ /dev/null @@ -1,3 +0,0 @@ -lexer.*.vb=vb -lexer.vb.strings.multiline=1 -keywords.*.vb=as dim or string diff --git a/3rdparty/lexilla532/lexilla/version.txt b/3rdparty/lexilla532/lexilla/version.txt deleted file mode 100644 index 2b9f7e8..0000000 --- a/3rdparty/lexilla532/lexilla/version.txt +++ /dev/null @@ -1 +0,0 @@ -532 \ No newline at end of file diff --git a/3rdparty/lexilla532/CMakeLists.txt b/3rdparty/lexilla540/CMakeLists.txt similarity index 92% rename from 3rdparty/lexilla532/CMakeLists.txt rename to 3rdparty/lexilla540/CMakeLists.txt index 8294ce5..1008a0e 100644 --- a/3rdparty/lexilla532/CMakeLists.txt +++ b/3rdparty/lexilla540/CMakeLists.txt @@ -27,5 +27,5 @@ target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/lexilla/include ${CMAKE_CURRENT_SOURCE_DIR}/lexilla/lexlib - ${CMAKE_CURRENT_SOURCE_DIR}/../scintilla550/scintilla/include + ${CMAKE_CURRENT_SOURCE_DIR}/../scintilla552/scintilla/include ) diff --git a/3rdparty/lexilla532/README.md b/3rdparty/lexilla540/README.md similarity index 92% rename from 3rdparty/lexilla532/README.md rename to 3rdparty/lexilla540/README.md index 20490e8..f88e1e3 100644 --- a/3rdparty/lexilla532/README.md +++ b/3rdparty/lexilla540/README.md @@ -2,7 +2,7 @@ ## Source -The vendored Lexilla source code is fetched from their official website [^1]. Version is 5.3.2. All vendored code are inside the `scintilla` folder. +The vendored Lexilla source code is fetched from their official website [^1]. Version is 5.4.0. All vendored code are inside the `scintilla` folder. [^1]: https://www.scintilla.org/LexillaDownload.html diff --git a/3rdparty/lexilla532/lexilla/.gitattributes b/3rdparty/lexilla540/lexilla/.gitattributes similarity index 88% rename from 3rdparty/lexilla532/lexilla/.gitattributes rename to 3rdparty/lexilla540/lexilla/.gitattributes index c20856a..4864626 100644 --- a/3rdparty/lexilla532/lexilla/.gitattributes +++ b/3rdparty/lexilla540/lexilla/.gitattributes @@ -9,6 +9,7 @@ **.iface text **.template text **.mk text +**.mk text **.py text **.rc text **.css text @@ -29,6 +30,7 @@ **.aspx text **.php text **.vb text +**.vbs text **.asm text **.cob text **.cmake text @@ -47,6 +49,7 @@ **.ml text **.nim text **.octave text +**.p text **.pl text **.p6 text **.ps1 text @@ -55,6 +58,7 @@ **.rs text **.sql text **.tcl text +**.toml text **.tsql text **.err text **.mms text diff --git a/3rdparty/lexilla532/lexilla/.github/workflows/build-check-macos.yml b/3rdparty/lexilla540/lexilla/.github/workflows/build-check-macos.yml similarity index 74% rename from 3rdparty/lexilla532/lexilla/.github/workflows/build-check-macos.yml rename to 3rdparty/lexilla540/lexilla/.github/workflows/build-check-macos.yml index 7534f66..440d17b 100644 --- a/3rdparty/lexilla532/lexilla/.github/workflows/build-check-macos.yml +++ b/3rdparty/lexilla540/lexilla/.github/workflows/build-check-macos.yml @@ -5,7 +5,7 @@ on: [push] jobs: build: - runs-on: macos-11 + runs-on: macos-latest strategy: matrix: @@ -18,16 +18,16 @@ jobs: (cd .. && wget --no-verbose https://www.scintilla.org/scintilla500.zip) (cd .. && unzip scintilla500.zip) - name: Unit Test - run: (cd test/unit && make DEBUG=1 CXX=${{matrix.cpp_compiler}} test) + run: (cd test/unit && make DEBUG=1 CXX=${{matrix.cpp_compiler}} --jobs=$(getconf _NPROCESSORS_ONLN) test) - name: Build Lexilla - run: (cd src && make DEBUG=1 CXX=${{matrix.cpp_compiler}}) + run: (cd src && make DEBUG=1 CXX=${{matrix.cpp_compiler}} --jobs=$(getconf _NPROCESSORS_ONLN)) - uses: actions/upload-artifact@v4 with: name: liblexilla.dylib path: bin/liblexilla.dylib - name: Test lexing and folding - run: (cd test && make DEBUG=1 CXX=${{matrix.cpp_compiler}} test) + run: (cd test && make DEBUG=1 CXX=${{matrix.cpp_compiler}} --jobs=$(getconf _NPROCESSORS_ONLN) test) - name: CheckLexilla C Example - run: (cd examples/CheckLexilla && make DEBUG=1 check) + run: (cd examples/CheckLexilla && make DEBUG=1 --jobs=$(getconf _NPROCESSORS_ONLN) check) - name: SimpleLexer Example - run: (cd examples/SimpleLexer && make DEBUG=1 CXX=${{matrix.cpp_compiler}} check) + run: (cd examples/SimpleLexer && make DEBUG=1 CXX=${{matrix.cpp_compiler}} --jobs=$(getconf _NPROCESSORS_ONLN) check) diff --git a/3rdparty/lexilla532/lexilla/.github/workflows/build-check-win32.yml b/3rdparty/lexilla540/lexilla/.github/workflows/build-check-win32.yml similarity index 86% rename from 3rdparty/lexilla532/lexilla/.github/workflows/build-check-win32.yml rename to 3rdparty/lexilla540/lexilla/.github/workflows/build-check-win32.yml index f9534e7..a80e37a 100644 --- a/3rdparty/lexilla532/lexilla/.github/workflows/build-check-win32.yml +++ b/3rdparty/lexilla540/lexilla/.github/workflows/build-check-win32.yml @@ -43,11 +43,11 @@ jobs: - name: CheckLexilla C Example run: | cd examples/CheckLexilla - cl CheckLexilla.c -I ../../include -Fe: CheckLexilla + cl -MP CheckLexilla.c -I ../../include -Fe: CheckLexilla .\CheckLexilla.exe cd ../.. - name: SimpleLexer Example run: | cd examples/SimpleLexer - cl -std:c++17 -EHsc -LD -I ../../../scintilla/include -I ../../include -I ../../lexlib SimpleLexer.cxx ../../lexlib/*.cxx + cl -MP -std:c++17 -EHsc -LD -I ../../../scintilla/include -I ../../include -I ../../lexlib SimpleLexer.cxx ../../lexlib/*.cxx cd ../.. diff --git a/3rdparty/lexilla532/lexilla/.github/workflows/build-check.yml b/3rdparty/lexilla540/lexilla/.github/workflows/build-check.yml similarity index 77% rename from 3rdparty/lexilla532/lexilla/.github/workflows/build-check.yml rename to 3rdparty/lexilla540/lexilla/.github/workflows/build-check.yml index 98a6130..296cfb5 100644 --- a/3rdparty/lexilla532/lexilla/.github/workflows/build-check.yml +++ b/3rdparty/lexilla540/lexilla/.github/workflows/build-check.yml @@ -18,17 +18,17 @@ jobs: (cd .. && wget --no-verbose https://www.scintilla.org/scintilla500.zip) (cd .. && unzip scintilla500.zip) - name: Unit Test - run: (cd test/unit && make DEBUG=1 CXX=${{matrix.cpp_compiler}} test) + run: (cd test/unit && make DEBUG=1 CXX=${{matrix.cpp_compiler}} --jobs=$(getconf _NPROCESSORS_ONLN) test) - name: Build Lexilla - run: (cd src && make DEBUG=1 CXX=${{matrix.cpp_compiler}}) + run: (cd src && make DEBUG=1 CXX=${{matrix.cpp_compiler}} --jobs=$(getconf _NPROCESSORS_ONLN)) - uses: actions/upload-artifact@v4 with: name: liblexilla-${{matrix.cpp_compiler}}.so path: bin/liblexilla.so overwrite: true - name: Test lexing and folding - run: (cd test && make DEBUG=1 CXX=${{matrix.cpp_compiler}} test) + run: (cd test && make DEBUG=1 CXX=${{matrix.cpp_compiler}} --jobs=$(getconf _NPROCESSORS_ONLN) test) - name: CheckLexilla C Example - run: (cd examples/CheckLexilla && make DEBUG=1 check) + run: (cd examples/CheckLexilla && make DEBUG=1 --jobs=$(getconf _NPROCESSORS_ONLN) check) - name: SimpleLexer Example - run: (cd examples/SimpleLexer && make DEBUG=1 CXX=${{matrix.cpp_compiler}} check) + run: (cd examples/SimpleLexer && make DEBUG=1 CXX=${{matrix.cpp_compiler}} --jobs=$(getconf _NPROCESSORS_ONLN) check) diff --git a/3rdparty/lexilla532/lexilla/.gitignore b/3rdparty/lexilla540/lexilla/.gitignore similarity index 100% rename from 3rdparty/lexilla532/lexilla/.gitignore rename to 3rdparty/lexilla540/lexilla/.gitignore diff --git a/3rdparty/lexilla532/lexilla/.travis.yml b/3rdparty/lexilla540/lexilla/.travis.yml similarity index 100% rename from 3rdparty/lexilla532/lexilla/.travis.yml rename to 3rdparty/lexilla540/lexilla/.travis.yml diff --git a/3rdparty/lexilla532/lexilla/CONTRIBUTING b/3rdparty/lexilla540/lexilla/CONTRIBUTING similarity index 100% rename from 3rdparty/lexilla532/lexilla/CONTRIBUTING rename to 3rdparty/lexilla540/lexilla/CONTRIBUTING diff --git a/3rdparty/lexilla532/lexilla/License.txt b/3rdparty/lexilla540/lexilla/License.txt similarity index 100% rename from 3rdparty/lexilla532/lexilla/License.txt rename to 3rdparty/lexilla540/lexilla/License.txt diff --git a/3rdparty/lexilla532/lexilla/README b/3rdparty/lexilla540/lexilla/README similarity index 100% rename from 3rdparty/lexilla532/lexilla/README rename to 3rdparty/lexilla540/lexilla/README diff --git a/3rdparty/lexilla532/lexilla/access/LexillaAccess.cxx b/3rdparty/lexilla540/lexilla/access/LexillaAccess.cxx similarity index 100% rename from 3rdparty/lexilla532/lexilla/access/LexillaAccess.cxx rename to 3rdparty/lexilla540/lexilla/access/LexillaAccess.cxx diff --git a/3rdparty/lexilla532/lexilla/access/LexillaAccess.h b/3rdparty/lexilla540/lexilla/access/LexillaAccess.h similarity index 100% rename from 3rdparty/lexilla532/lexilla/access/LexillaAccess.h rename to 3rdparty/lexilla540/lexilla/access/LexillaAccess.h diff --git a/3rdparty/lexilla532/lexilla/access/README b/3rdparty/lexilla540/lexilla/access/README similarity index 100% rename from 3rdparty/lexilla532/lexilla/access/README rename to 3rdparty/lexilla540/lexilla/access/README diff --git a/3rdparty/lexilla532/lexilla/bin/empty.txt b/3rdparty/lexilla540/lexilla/bin/empty.txt similarity index 100% rename from 3rdparty/lexilla532/lexilla/bin/empty.txt rename to 3rdparty/lexilla540/lexilla/bin/empty.txt diff --git a/3rdparty/lexilla532/lexilla/cppcheck.suppress b/3rdparty/lexilla540/lexilla/cppcheck.suppress similarity index 95% rename from 3rdparty/lexilla532/lexilla/cppcheck.suppress rename to 3rdparty/lexilla540/lexilla/cppcheck.suppress index 1e96cda..5fbab62 100644 --- a/3rdparty/lexilla532/lexilla/cppcheck.suppress +++ b/3rdparty/lexilla540/lexilla/cppcheck.suppress @@ -11,6 +11,9 @@ useInitializationList // produces same result on empty collections useStlAlgorithm +// Common for lexer object destructors +missingOverride + // Some non-explicit constructors are used for conversions or are private to lexers noExplicitConstructor @@ -153,7 +156,6 @@ constVariableReference:lexilla/lexers/LexTCL.cxx invalidscanf:lexilla/lexers/LexTCMD.cxx constParameterReference:lexilla/lexers/LexTeX.cxx variableScope:lexilla/lexers/LexTeX.cxx -knownConditionTrueFalse:lexilla/lexers/LexTxt2tags.cxx knownConditionTrueFalse:lexilla/lexers/LexVB.cxx constParameterReference:lexilla/lexers/LexVerilog.cxx variableScope:lexilla/lexers/LexVerilog.cxx @@ -205,3 +207,9 @@ knownConditionTrueFalse:lexilla/test/unit/testCharacterSet.cxx // cppcheck fails REQUIRE from Catch comparisonOfFuncReturningBoolError:lexilla/test/unit/*.cxx + +// cppcheck fails SECTION from Catch +syntaxError:lexilla/test/unit/*.cxx + +// argv has a standardised type +constParameter:lexilla/examples/CheckLexilla/CheckLexilla.c diff --git a/3rdparty/lexilla532/lexilla/delbin.bat b/3rdparty/lexilla540/lexilla/delbin.bat similarity index 100% rename from 3rdparty/lexilla532/lexilla/delbin.bat rename to 3rdparty/lexilla540/lexilla/delbin.bat diff --git a/3rdparty/lexilla532/lexilla/doc/Lexilla.html b/3rdparty/lexilla540/lexilla/doc/Lexilla.html similarity index 95% rename from 3rdparty/lexilla532/lexilla/doc/Lexilla.html rename to 3rdparty/lexilla540/lexilla/doc/Lexilla.html index cb549e7..d2d2a0f 100644 --- a/3rdparty/lexilla532/lexilla/doc/Lexilla.html +++ b/3rdparty/lexilla540/lexilla/doc/Lexilla.html @@ -9,7 +9,7 @@ - +