diff --git a/lexilla/Lexilla.vcxproj b/lexilla/Lexilla.vcxproj index bc8678f5e..403be6210 100644 --- a/lexilla/Lexilla.vcxproj +++ b/lexilla/Lexilla.vcxproj @@ -100,6 +100,7 @@ + diff --git a/lexilla/Lexilla.vcxproj.filters b/lexilla/Lexilla.vcxproj.filters index bf401aa72..50fa1b244 100644 --- a/lexilla/Lexilla.vcxproj.filters +++ b/lexilla/Lexilla.vcxproj.filters @@ -266,6 +266,9 @@ lexers_x + + lexlib + diff --git a/lexilla/cppcheck.suppress b/lexilla/cppcheck.suppress index bc9b8aa7b..ed034fa8e 100644 --- a/lexilla/cppcheck.suppress +++ b/lexilla/cppcheck.suppress @@ -13,9 +13,6 @@ useStlAlgorithm // Some non-explicit constructors are used for conversions or are private to lexers noExplicitConstructor -// The styler parameter is not const as LexAccessor::operator[] is not const -constParameter:lexilla/lexlib/StyleContext.cxx - // The performance cost of by-value passing is often small and using a reference decreases // code legibility. passedByValue diff --git a/lexilla/lexers_x/LexerUtils.cxx b/lexilla/lexers_x/LexerUtils.cxx index 645209b6e..76934e054 100644 --- a/lexilla/lexers_x/LexerUtils.cxx +++ b/lexilla/lexers_x/LexerUtils.cxx @@ -1,7 +1,7 @@ // encoding: UTF-8 #include -#include +#include #include "Scintilla.h" diff --git a/lexilla/lexlib/LexAccessor.cxx b/lexilla/lexlib/LexAccessor.cxx new file mode 100644 index 000000000..7a15fb614 --- /dev/null +++ b/lexilla/lexlib/LexAccessor.cxx @@ -0,0 +1,70 @@ +// Scintilla source code edit control +/** @file LexAccessor.cxx + ** Interfaces between Scintilla and lexers. + **/ +// 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 "LexAccessor.h" +#include "CharacterSet.h" + +using namespace Lexilla; + +namespace Lexilla { + +bool LexAccessor::MatchIgnoreCase(Sci_Position pos, const char *s) { + for (; *s; s++, pos++) { + if (*s != MakeLowerCase(SafeGetCharAt(pos))) { + return false; + } + } + return true; +} + +void LexAccessor::GetRange(Sci_PositionU startPos_, Sci_PositionU endPos_, char *s, Sci_PositionU len) { + assert(startPos_ <= endPos_ && len != 0 && s != nullptr); + endPos_ = std::min(endPos_, startPos_ + len - 1); + len = endPos_ - startPos_; + if (startPos_ >= static_cast(startPos) && endPos_ <= static_cast(endPos)) { + const char * const p = buf + (startPos_ - startPos); + memcpy(s, p, len); + } else { + pAccess->GetCharRange(s, startPos_, len); + } + s[len] = '\0'; +} + +void LexAccessor::GetRangeLowered(Sci_PositionU startPos_, Sci_PositionU endPos_, char *s, Sci_PositionU len) { + GetRange(startPos_, endPos_, s, len); + while (*s) { + if (*s >= 'A' && *s <= 'Z') { + *s += 'a' - 'A'; + } + ++s; + } +} + +std::string LexAccessor::GetRange(Sci_PositionU startPos_, Sci_PositionU endPos_) { + assert(startPos_ < endPos_); + const Sci_PositionU len = endPos_ - startPos_; + std::string s(len, '\0'); + GetRange(startPos_, endPos_, s.data(), len); + return s; +} + +std::string LexAccessor::GetRangeLowered(Sci_PositionU startPos_, Sci_PositionU endPos_) { + assert(startPos_ < endPos_); + const Sci_PositionU len = endPos_ - startPos_; + std::string s(len, '\0'); + GetRangeLowered(startPos_, endPos_, s.data(), len); + return s; +} + +} diff --git a/lexilla/lexlib/LexAccessor.h b/lexilla/lexlib/LexAccessor.h index 53553a149..8f76ed2a4 100644 --- a/lexilla/lexlib/LexAccessor.h +++ b/lexilla/lexlib/LexAccessor.h @@ -108,6 +108,15 @@ public: } return true; } + bool MatchIgnoreCase(Sci_Position pos, const char *s); + + // Get first len - 1 characters in range [startPos_, endPos_). + void GetRange(Sci_PositionU startPos_, Sci_PositionU endPos_, char *s, Sci_PositionU len); + void GetRangeLowered(Sci_PositionU startPos_, Sci_PositionU endPos_, char *s, Sci_PositionU len); + // Get all characters in range [startPos_, endPos_). + std::string GetRange(Sci_PositionU startPos_, Sci_PositionU endPos_); + std::string GetRangeLowered(Sci_PositionU startPos_, Sci_PositionU endPos_); + char StyleAt(Sci_Position position) const { return pAccess->StyleAt(position); } diff --git a/lexilla/lexlib/StyleContext.cxx b/lexilla/lexlib/StyleContext.cxx index 7d94ed9e0..e7b571931 100644 --- a/lexilla/lexlib/StyleContext.cxx +++ b/lexilla/lexlib/StyleContext.cxx @@ -36,36 +36,10 @@ bool StyleContext::MatchIgnoreCase(const char *s) { return true; } -static void getRange(Sci_PositionU start, - Sci_PositionU end, - LexAccessor &styler, - char *s, - Sci_PositionU len) { - Sci_PositionU i = 0; - while ((i < end - start + 1) && (i < len-1)) { - s[i] = styler[start + i]; - i++; - } - s[i] = '\0'; -} - void StyleContext::GetCurrent(char *s, Sci_PositionU len) { - getRange(styler.GetStartSegment(), currentPos - 1, styler, s, len); -} - -static void getRangeLowered(Sci_PositionU start, - Sci_PositionU end, - LexAccessor &styler, - char *s, - Sci_PositionU len) { - Sci_PositionU i = 0; - while ((i < end - start + 1) && (i < len-1)) { - s[i] = MakeLowerCase(styler[start + i]); - i++; - } - s[i] = '\0'; + styler.GetRange(styler.GetStartSegment(), currentPos, s, len); } void StyleContext::GetCurrentLowered(char *s, Sci_PositionU len) { - getRangeLowered(styler.GetStartSegment(), currentPos - 1, styler, s, len); + styler.GetRangeLowered(styler.GetStartSegment(), currentPos, s, len); } diff --git a/lexilla/scripts/LexillaGen.py b/lexilla/scripts/LexillaGen.py index 279344fef..be72ba1ae 100644 --- a/lexilla/scripts/LexillaGen.py +++ b/lexilla/scripts/LexillaGen.py @@ -142,7 +142,8 @@ def RegenerateAll(rootDirectory): "CFBundleShortVersionString", versionDotted) ReplaceREInFile(lexillaXcodeProject, "CURRENT_PROJECT_VERSION = [0-9.]+;", - f'CURRENT_PROJECT_VERSION = {versionDotted};') + f'CURRENT_PROJECT_VERSION = {versionDotted};', + 0) RegenerateXcodeProject(lexillaXcodeProject, lex.lexFiles, lexerReferences) diff --git a/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj b/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj index ca284793d..02e1c4e62 100644 --- a/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj +++ b/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 283639BC268FD4EA009D58A1 /* LexAccessor.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 283639BB268FD4EA009D58A1 /* LexAccessor.cxx */; }; 28BA72AB24E34D5B00272C2D /* LexerBase.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA728F24E34D5A00272C2D /* LexerBase.cxx */; }; 28BA72AC24E34D5B00272C2D /* LexAccessor.h in Headers */ = {isa = PBXBuildFile; fileRef = 28BA729024E34D5A00272C2D /* LexAccessor.h */; }; 28BA72AD24E34D5B00272C2D /* DefaultLexer.h in Headers */ = {isa = PBXBuildFile; fileRef = 28BA729124E34D5A00272C2D /* DefaultLexer.h */; }; @@ -151,18 +152,19 @@ 28BA73AA24E34D9700272C2D /* LexRust.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA733824E34D9700272C2D /* LexRust.cxx */; }; 28BA73AD24E34DBC00272C2D /* Lexilla.h in Headers */ = {isa = PBXBuildFile; fileRef = 28BA73AB24E34DBC00272C2D /* Lexilla.h */; }; 28BA73AE24E34DBC00272C2D /* Lexilla.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA73AC24E34DBC00272C2D /* Lexilla.cxx */; }; + 70BF497C8D265026B77C97DA /* LexJulia.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 315E4E969868C52C125686B2 /* LexJulia.cxx */; }; B32D4A2A9CEC222A5140E99F /* LexFSharp.cxx in Sources */ = {isa = PBXBuildFile; fileRef = F8E54626B22BD9493090F40B /* LexFSharp.cxx */; }; - 4513481EA58392BAD920002D /* LexAHKL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9F5549A082793DBDA0BDC285 /* LexAHKL.cxx */; }; - DAB44B82B8CD0FC761847568 /* LexCSV.cxx in Sources */ = {isa = PBXBuildFile; fileRef = E1C14775AE364C6EEE7703D4 /* LexCSV.cxx */; }; - 81FB4669BDD0C8EDE2C865F1 /* LexDart.cxx in Sources */ = {isa = PBXBuildFile; fileRef = F09B40F49D38F7DF03F80F00 /* LexDart.cxx */; }; - F6224FEE88B39060046EEBB0 /* LexerUtils.cxx in Sources */ = {isa = PBXBuildFile; fileRef = B70142AEAD02FCCC38C95437 /* LexerUtils.cxx */; }; - 20734B2BAC0066B302C5F572 /* LexKotlin.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 4B244DD685C45BD626DFCBFA /* LexKotlin.cxx */; }; - 173A4B628003CD6778153F13 /* LexTOML.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 8FE446A1AD4BC789488C9865 /* LexTOML.cxx */; }; - 98684028BA6245805B2034D1 /* LexJulia.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9AA44B1D90573293F9570B5E /* LexJulia.cxx */; }; + EC6A40EDB53BDA02ECD58989 /* LexAHKL.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 1BCB4EB388CAB8BC57C8E524 /* LexAHKL.cxx */; }; + 1E0248FAAA68299AD73D6C2F /* LexCSV.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 8FD24A478625FFC69BCF5611 /* LexCSV.cxx */; }; + 06F24059BEC5C74CD7536999 /* LexDart.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 9B224055AF695FACF70C06EA /* LexDart.cxx */; }; + 08084D78A14ADD9A4E3BBF45 /* LexerUtils.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 214542D293B8229DF76865BF /* LexerUtils.cxx */; }; + 5CC5494D93A9A27918106106 /* LexKotlin.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 47A1492780FE119CF797F463 /* LexKotlin.cxx */; }; + 63104C2F805ED6F2623BA2DC /* LexTOML.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 55A340DFB663EDFC048C3842 /* LexTOML.cxx */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ 280262A5246DF655000DF3B8 /* liblexilla.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = liblexilla.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; + 283639BB268FD4EA009D58A1 /* LexAccessor.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexAccessor.cxx; path = ../../lexlib/LexAccessor.cxx; sourceTree = ""; }; 28BA728F24E34D5A00272C2D /* LexerBase.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexerBase.cxx; path = ../../lexlib/LexerBase.cxx; sourceTree = ""; }; 28BA729024E34D5A00272C2D /* LexAccessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LexAccessor.h; path = ../../lexlib/LexAccessor.h; sourceTree = ""; }; 28BA729124E34D5A00272C2D /* DefaultLexer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DefaultLexer.h; path = ../../lexlib/DefaultLexer.h; sourceTree = ""; }; @@ -308,14 +310,14 @@ 28BA73AB24E34DBC00272C2D /* Lexilla.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Lexilla.h; path = ../Lexilla.h; sourceTree = ""; }; 28BA73AC24E34DBC00272C2D /* Lexilla.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Lexilla.cxx; path = ../Lexilla.cxx; sourceTree = ""; }; 28BA73B024E3510900272C2D /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 315E4E969868C52C125686B2 /* LexJulia.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexJulia.cxx; path = ../../lexers/LexJulia.cxx; sourceTree = SOURCE_ROOT; }; F8E54626B22BD9493090F40B /* LexFSharp.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexFSharp.cxx; path = ../../lexers/LexFSharp.cxx; sourceTree = SOURCE_ROOT; }; - 9F5549A082793DBDA0BDC285 /* LexAHKL.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexAHKL.cxx; path = ../../lexers/LexAHKL.cxx; sourceTree = SOURCE_ROOT; }; - E1C14775AE364C6EEE7703D4 /* LexCSV.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexCSV.cxx; path = ../../lexers/LexCSV.cxx; sourceTree = SOURCE_ROOT; }; - F09B40F49D38F7DF03F80F00 /* LexDart.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexDart.cxx; path = ../../lexers/LexDart.cxx; sourceTree = SOURCE_ROOT; }; - B70142AEAD02FCCC38C95437 /* LexerUtils.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexerUtils.cxx; path = ../../lexers/LexerUtils.cxx; sourceTree = SOURCE_ROOT; }; - 4B244DD685C45BD626DFCBFA /* LexKotlin.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexKotlin.cxx; path = ../../lexers/LexKotlin.cxx; sourceTree = SOURCE_ROOT; }; - 8FE446A1AD4BC789488C9865 /* LexTOML.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexTOML.cxx; path = ../../lexers/LexTOML.cxx; sourceTree = SOURCE_ROOT; }; - 9AA44B1D90573293F9570B5E /* LexJulia.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexJulia.cxx; path = ../../lexers/LexJulia.cxx; sourceTree = SOURCE_ROOT; }; + 1BCB4EB388CAB8BC57C8E524 /* LexAHKL.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexAHKL.cxx; path = ../../lexers/LexAHKL.cxx; sourceTree = SOURCE_ROOT; }; + 8FD24A478625FFC69BCF5611 /* LexCSV.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexCSV.cxx; path = ../../lexers/LexCSV.cxx; sourceTree = SOURCE_ROOT; }; + 9B224055AF695FACF70C06EA /* LexDart.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexDart.cxx; path = ../../lexers/LexDart.cxx; sourceTree = SOURCE_ROOT; }; + 214542D293B8229DF76865BF /* LexerUtils.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexerUtils.cxx; path = ../../lexers/LexerUtils.cxx; sourceTree = SOURCE_ROOT; }; + 47A1492780FE119CF797F463 /* LexKotlin.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexKotlin.cxx; path = ../../lexers/LexKotlin.cxx; sourceTree = SOURCE_ROOT; }; + 55A340DFB663EDFC048C3842 /* LexTOML.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexTOML.cxx; path = ../../lexers/LexTOML.cxx; sourceTree = SOURCE_ROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -363,7 +365,7 @@ 28BA730624E34D9400272C2D /* LexA68k.cxx */, 28BA72EE24E34D9300272C2D /* LexAbaqus.cxx */, 28BA730024E34D9400272C2D /* LexAda.cxx */, - 9F5549A082793DBDA0BDC285 /* LexAHKL.cxx */, + 1BCB4EB388CAB8BC57C8E524 /* LexAHKL.cxx */, 28BA72DF24E34D9200272C2D /* LexAPDL.cxx */, 28BA72FF24E34D9400272C2D /* LexAsm.cxx */, 28BA72DB24E34D9200272C2D /* LexAsn1.cxx */, @@ -388,9 +390,9 @@ 28BA730124E34D9400272C2D /* LexCrontab.cxx */, 28BA731524E34D9500272C2D /* LexCsound.cxx */, 28BA732924E34D9600272C2D /* LexCSS.cxx */, - E1C14775AE364C6EEE7703D4 /* LexCSV.cxx */, + 8FD24A478625FFC69BCF5611 /* LexCSV.cxx */, 28BA72E024E34D9200272C2D /* LexD.cxx */, - F09B40F49D38F7DF03F80F00 /* LexDart.cxx */, + 9B224055AF695FACF70C06EA /* LexDart.cxx */, 28BA732C24E34D9600272C2D /* LexDataflex.cxx */, 28BA72DD24E34D9200272C2D /* LexDiff.cxx */, 28BA732024E34D9600272C2D /* LexDMAP.cxx */, @@ -400,7 +402,7 @@ 28BA72D924E34D9200272C2D /* LexEiffel.cxx */, 28BA72E824E34D9200272C2D /* LexErlang.cxx */, 28BA72EB24E34D9300272C2D /* LexErrorList.cxx */, - B70142AEAD02FCCC38C95437 /* LexerUtils.cxx */, + 214542D293B8229DF76865BF /* LexerUtils.cxx */, 28BA72F624E34D9300272C2D /* LexEScript.cxx */, 28BA72EC24E34D9300272C2D /* LexFlagship.cxx */, 28BA72CB24E34D9100272C2D /* LexForth.cxx */, @@ -415,9 +417,9 @@ 28BA72EA24E34D9300272C2D /* LexIndent.cxx */, 28BA730524E34D9400272C2D /* LexInno.cxx */, 28BA733024E34D9600272C2D /* LexJSON.cxx */, - 9AA44B1D90573293F9570B5E /* LexJulia.cxx */, + 315E4E969868C52C125686B2 /* LexJulia.cxx */, 28BA731124E34D9500272C2D /* LexKix.cxx */, - 4B244DD685C45BD626DFCBFA /* LexKotlin.cxx */, + 47A1492780FE119CF797F463 /* LexKotlin.cxx */, 28BA72F824E34D9300272C2D /* LexKVIrc.cxx */, 28BA72ED24E34D9300272C2D /* LexLaTeX.cxx */, 28BA72E424E34D9200272C2D /* LexLisp.cxx */, @@ -474,7 +476,7 @@ 28BA72C924E34D9100272C2D /* LexTCL.cxx */, 28BA730324E34D9400272C2D /* LexTCMD.cxx */, 28BA730824E34D9400272C2D /* LexTeX.cxx */, - 8FE446A1AD4BC789488C9865 /* LexTOML.cxx */, + 55A340DFB663EDFC048C3842 /* LexTOML.cxx */, 28BA730F24E34D9500272C2D /* LexTxt2tags.cxx */, 28BA731F24E34D9600272C2D /* LexVB.cxx */, 28BA731A24E34D9500272C2D /* LexVerilog.cxx */, @@ -498,6 +500,7 @@ 28BA72A124E34D5B00272C2D /* CharacterSet.h */, 28BA729C24E34D5A00272C2D /* DefaultLexer.cxx */, 28BA729124E34D5A00272C2D /* DefaultLexer.h */, + 283639BB268FD4EA009D58A1 /* LexAccessor.cxx */, 28BA729024E34D5A00272C2D /* LexAccessor.h */, 28BA728F24E34D5A00272C2D /* LexerBase.cxx */, 28BA72A624E34D5B00272C2D /* LexerBase.h */, @@ -612,6 +615,7 @@ 28BA73A924E34D9700272C2D /* LexPerl.cxx in Sources */, 28BA733D24E34D9700272C2D /* LexForth.cxx in Sources */, 28BA736824E34D9700272C2D /* LexEScript.cxx in Sources */, + 283639BC268FD4EA009D58A1 /* LexAccessor.cxx in Sources */, 28BA737124E34D9700272C2D /* LexAsm.cxx in Sources */, 28BA737B24E34D9700272C2D /* LexSpice.cxx in Sources */, 28BA737024E34D9700272C2D /* LexCmake.cxx in Sources */, @@ -733,13 +737,13 @@ 28BA72B424E34D5B00272C2D /* PropSetSimple.cxx in Sources */, 28BA737C24E34D9700272C2D /* LexX12.cxx in Sources */, B32D4A2A9CEC222A5140E99F /* LexFSharp.cxx in Sources */, - 4513481EA58392BAD920002D /* LexAHKL.cxx in Sources */, - DAB44B82B8CD0FC761847568 /* LexCSV.cxx in Sources */, - 81FB4669BDD0C8EDE2C865F1 /* LexDart.cxx in Sources */, - F6224FEE88B39060046EEBB0 /* LexerUtils.cxx in Sources */, - 20734B2BAC0066B302C5F572 /* LexKotlin.cxx in Sources */, - 173A4B628003CD6778153F13 /* LexTOML.cxx in Sources */, - 98684028BA6245805B2034D1 /* LexJulia.cxx in Sources */, + 70BF497C8D265026B77C97DA /* LexJulia.cxx in Sources */, + EC6A40EDB53BDA02ECD58989 /* LexAHKL.cxx in Sources */, + 1E0248FAAA68299AD73D6C2F /* LexCSV.cxx in Sources */, + 06F24059BEC5C74CD7536999 /* LexDart.cxx in Sources */, + 08084D78A14ADD9A4E3BBF45 /* LexerUtils.cxx in Sources */, + 5CC5494D93A9A27918106106 /* LexKotlin.cxx in Sources */, + 63104C2F805ED6F2623BA2DC /* LexTOML.cxx in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -889,7 +893,7 @@ buildSettings = { CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 5.0.0; + CURRENT_PROJECT_VERSION = 5.1.0; DEVELOPMENT_TEAM = 4F446KW87E; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; diff --git a/lexilla/src/deps.mak b/lexilla/src/deps.mak index 295bab04f..b32159ac0 100644 --- a/lexilla/src/deps.mak +++ b/lexilla/src/deps.mak @@ -33,6 +33,12 @@ DefaultLexer.o: \ ../lexlib/Accessor.h \ ../lexlib/LexerModule.h \ ../lexlib/DefaultLexer.h +LexAccessor.o: \ + ../lexlib/LexAccessor.cxx \ + ../../scintilla/include/ILexer.h \ + ../../scintilla/include/Sci_Position.h \ + ../lexlib/LexAccessor.h \ + ../lexlib/CharacterSet.h LexerBase.o: \ ../lexlib/LexerBase.cxx \ ../../scintilla/include/ILexer.h \ @@ -612,8 +618,8 @@ LexerUtils.o: \ ../../scintilla/include/ILexer.h \ ../lexlib/LexAccessor.h \ ../lexers_x/CharSetX.h \ - ../lexlib/CharacterSet.h \ ../lexlib/StyleContext.h \ + ../lexlib/CharacterSet.h \ ../lexers_x/StringUtils.h \ ../lexers_x/LexerUtils.h LexJSON.o: \ diff --git a/lexilla/src/lexilla.mak b/lexilla/src/lexilla.mak index 372da4f11..0eef1403e 100644 --- a/lexilla/src/lexilla.mak +++ b/lexilla/src/lexilla.mak @@ -127,6 +127,7 @@ LEXLIB_OBJS=\ $(DIR_O)\CharacterCategory.obj \ $(DIR_O)\CharacterSet.obj \ $(DIR_O)\DefaultLexer.obj \ + $(DIR_O)\LexAccessor.obj \ $(DIR_O)\LexerBase.obj \ $(DIR_O)\LexerModule.obj \ $(DIR_O)\LexerSimple.obj \ diff --git a/lexilla/src/nmdeps.mak b/lexilla/src/nmdeps.mak index 2efad8fdb..a3d291774 100644 --- a/lexilla/src/nmdeps.mak +++ b/lexilla/src/nmdeps.mak @@ -33,6 +33,12 @@ $(DIR_O)/DefaultLexer.obj: \ ../lexlib/Accessor.h \ ../lexlib/LexerModule.h \ ../lexlib/DefaultLexer.h +$(DIR_O)/LexAccessor.obj: \ + ../lexlib/LexAccessor.cxx \ + ../../scintilla/include/ILexer.h \ + ../../scintilla/include/Sci_Position.h \ + ../lexlib/LexAccessor.h \ + ../lexlib/CharacterSet.h $(DIR_O)/LexerBase.obj: \ ../lexlib/LexerBase.cxx \ ../../scintilla/include/ILexer.h \ @@ -612,8 +618,8 @@ $(DIR_O)/LexerUtils.obj: \ ../../scintilla/include/ILexer.h \ ../lexlib/LexAccessor.h \ ../lexers_x/CharSetX.h \ - ../lexlib/CharacterSet.h \ ../lexlib/StyleContext.h \ + ../lexlib/CharacterSet.h \ ../lexers_x/StringUtils.h \ ../lexers_x/LexerUtils.h $(DIR_O)/LexJSON.obj: \