Update Lexilla to v5.4

dail8859 · Sep 2, 2024 · dadc014 · dadc014
1 parent ca463a0
commit dadc014
Show file tree

Hide file tree

Showing 189 changed files with 2,899 additions and 738 deletions.
diff --git a/src/lexilla/.gitattributes b/src/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/src/lexilla/cppcheck.suppress b/src/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/src/lexilla/doc/Lexilla.html b/src/lexilla/doc/Lexilla.html
@@ -9,7 +9,7 @@
     <meta name="keywords" content="Scintilla, SciTE, Editing Component, Text Editor" />
     <meta name="Description"
     content="www.scintilla.org is the home of the Scintilla editing component and SciTE text editor application." />
-    <meta name="Date.Modified" content="20240423" />
+    <meta name="Date.Modified" content="20240821" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <style type="text/css">
         .logo {
@@ -61,8 +61,8 @@
           <font color="#FFCC99" size="4"> A library of language lexers for use with Scintilla</font>
         </td>
         <td width="40%" align="right">
-          <font color="#FFCC99" size="3">Release version 5.3.2<br />
-           Site last modified April 23 2024</font>
+          <font color="#FFCC99" size="3">Release version 5.4.0<br />
+           Site last modified August 21 2024</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -77,11 +77,11 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 5.4.0 adds a TOML lexer.</li>
+      <li>Version 5.3.3 improves HTML, JavaScript, Lua, PHP, and XML.</li>
       <li>Version 5.3.2 improves COBOL, HTML, Lua, Ruby, and Rust.</li>
       <li>Version 5.3.1 improves Assembler, Bash, Batch, JavaScript, Python, and Ruby.</li>
       <li>Version 5.3.0 improves Bash, HTML, and Lua.</li>
-      <li>Version 5.2.9 fixes potential problems on macOS 12 and older when built with Xcode 15.0.</li>
-      <li>Version 5.2.8 improves Python and R.</li>
     </ul>
     <ul id="menu">
       <li id="remote1"><a href="https://www.scintilla.org/SciTEImage.html">Screenshot</a></li>

diff --git a/src/lexilla/doc/LexillaDownload.html b/src/lexilla/doc/LexillaDownload.html
@@ -26,9 +26,9 @@
     <table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
       <tr>
         <td>
-          <font size="4"> <a href="https://www.scintilla.org/lexilla532.zip">
+          <font size="4"> <a href="https://www.scintilla.org/lexilla540.zip">
 	Windows</a>&nbsp;&nbsp;
-	<a href="https://www.scintilla.org/lexilla532.tgz">
+	<a href="https://www.scintilla.org/lexilla540.tgz">
           GTK/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -42,16 +42,16 @@ <h2>
       containing very few restrictions.
     </p>
     <h3>
-       Release 5.3.2
+       Release 5.4.0
     </h3>
     <h4>
        Source Code
     </h4>
        The source code package contains all of the source code for Lexilla but no binary
 	executable code and is available in
        <ul>
-       <li><a href="https://www.scintilla.org/lexilla532.zip">zip format</a> (1.3M) commonly used on Windows</li>
-       <li><a href="https://www.scintilla.org/lexilla532.tgz">tgz format</a> (0.9M) commonly used on Linux and compatible operating systems</li>
+       <li><a href="https://www.scintilla.org/lexilla540.zip">zip format</a> (1.3M) commonly used on Windows</li>
+       <li><a href="https://www.scintilla.org/lexilla540.tgz">tgz format</a> (0.9M) commonly used on Linux and compatible operating systems</li>
        </ul>
        Instructions for building on both Windows and Linux are included in the readme file.
     <h4>

diff --git a/src/lexilla/doc/LexillaHistory.html b/src/lexilla/doc/LexillaHistory.html
@@ -588,6 +588,71 @@ <h2>Contributors</h2>
     </tr>
     </table>
     <h2>Releases</h2>
+    <h3>
+       <a href="https://www.scintilla.org/lexilla540.zip">Release 5.4.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 21 August 2024.
+	</li>
+	<li>
+	Inside Lexilla, LexerModule instances are now const.
+	This will require changes to applications that modify Lexilla.cxx, which
+	may be done to add custom lexers.
+	</li>
+	<li>
+	Lexer added for TOML "toml".
+	</li>
+	<li>
+	Bash: Handle backslash in heredoc delimiter.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/257">Issue #257</a>.
+	</li>
+	<li>
+	Progress: Fix lexing of nested comments.
+	<a href="https://github.com/ScintillaOrg/lexilla/pull/258">Pull request #258</a>.
+	</li>
+	<li>
+	Force lower-casing of case-insensitive keyword lists so keywords match in some lexers.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/259">Issue #259</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/lexilla533.zip">Release 5.3.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 22 July 2024.
+	</li>
+	<li>
+	ASP: Control whether ASP is enabled for XML and HTML with
+	lexer.xml.allow.asp and lexer.html.allow.asp.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/252">Issue #252</a>.
+	</li>
+	<li>
+	JavaScript: Recognize regular expressions at start or after '&gt;' in JavaScript when lexer is cpp,
+	hypertext, or xml.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/250">Issue #250</a>,
+	<a href="https://sourceforge.net/p/scintilla/bugs/918/">Bug #918</a>.
+	</li>
+	<li>
+	JavaScript: Recognize initial #! 'shebang' line as a comment in standalone files.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/253">Issue #253</a>.
+	</li>
+	<li>
+	Lua: Fix non-ASCII identifiers joined with '.' or ':'.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/242">Issue #242</a>.
+	</li>
+	<li>
+	Lua: Fix folding for multi-line SCE_LUA_LITERALSTRING and SCE_LUA_COMMENT
+	when performed incrementally.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/247">Issue #247</a>.
+	</li>
+	<li>
+	PHP: Control whether PHP is enabled for XML and HTML with
+	lexer.xml.allow.php and lexer.html.allow.php.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/252">Issue #252</a>.
+	</li>
+    </ul>
     <h3>
        <a href="https://www.scintilla.org/lexilla532.zip">Release 5.3.2</a>
     </h3>

diff --git a/src/lexilla/include/LexicalStyles.iface b/src/lexilla/include/LexicalStyles.iface
@@ -144,6 +144,7 @@ val SCLEX_FSHARP=132
 val SCLEX_JULIA=133
 val SCLEX_ASCIIDOC=134
 val SCLEX_GDSCRIPT=135
+val SCLEX_TOML=136
 
 # When a lexer specifies its language as SCLEX_AUTOMATIC it receives a
 # value assigned in sequence from SCLEX_AUTOMATIC+1.
@@ -2310,3 +2311,20 @@ val SCE_GD_STRINGEOL=13
 val SCE_GD_WORD2=14
 val SCE_GD_ANNOTATION=15
 val SCE_GD_NODEPATH=16
+# Lexical states for SCLEX_TOML
+lex TOML=SCLEX_TOML SCE_TOML_
+val SCE_TOML_DEFAULT=0
+val SCE_TOML_COMMENT=1
+val SCE_TOML_IDENTIFIER=2
+val SCE_TOML_KEYWORD=3
+val SCE_TOML_NUMBER=4
+val SCE_TOML_TABLE=5
+val SCE_TOML_KEY=6
+val SCE_TOML_ERROR=7
+val SCE_TOML_OPERATOR=8
+val SCE_TOML_STRING_SQ=9
+val SCE_TOML_STRING_DQ=10
+val SCE_TOML_TRIPLE_STRING_SQ=11
+val SCE_TOML_TRIPLE_STRING_DQ=12
+val SCE_TOML_ESCAPECHAR=13
+val SCE_TOML_DATETIME=14
diff --git a/src/lexilla/include/Lexilla.h b/src/lexilla/include/Lexilla.h
@@ -102,7 +102,7 @@ namespace Lexilla {
 	class LexerModule;
 }
 // Add a static lexer (in the same binary) to Lexilla's list
-void AddStaticLexerModule(Lexilla::LexerModule *plm);
+void AddStaticLexerModule(const Lexilla::LexerModule *plm);
 #endif
 
 #endif
diff --git a/src/lexilla/include/SciLexer.h b/src/lexilla/include/SciLexer.h
@@ -148,6 +148,7 @@
 #define SCLEX_JULIA 133
 #define SCLEX_ASCIIDOC 134
 #define SCLEX_GDSCRIPT 135
+#define SCLEX_TOML 136
 #define SCLEX_AUTOMATIC 1000
 #define SCE_P_DEFAULT 0
 #define SCE_P_COMMENTLINE 1
@@ -2058,6 +2059,21 @@
 #define SCE_GD_WORD2 14
 #define SCE_GD_ANNOTATION 15
 #define SCE_GD_NODEPATH 16
+#define SCE_TOML_DEFAULT 0
+#define SCE_TOML_COMMENT 1
+#define SCE_TOML_IDENTIFIER 2
+#define SCE_TOML_KEYWORD 3
+#define SCE_TOML_NUMBER 4
+#define SCE_TOML_TABLE 5
+#define SCE_TOML_KEY 6
+#define SCE_TOML_ERROR 7
+#define SCE_TOML_OPERATOR 8
+#define SCE_TOML_STRING_SQ 9
+#define SCE_TOML_STRING_DQ 10
+#define SCE_TOML_TRIPLE_STRING_SQ 11
+#define SCE_TOML_TRIPLE_STRING_DQ 12
+#define SCE_TOML_ESCAPECHAR 13
+#define SCE_TOML_DATETIME 14
 /* --Autogenerated -- end of section automatically generated from Scintilla.iface */
 
 #endif
diff --git a/src/lexilla/lexers/LexA68k.cxx b/src/lexilla/lexers/LexA68k.cxx
@@ -345,4 +345,4 @@ static const char * const a68kWordListDesc[] =
     0
 };
 
-LexerModule lmA68k(SCLEX_A68K, ColouriseA68kDoc, "a68k", 0, a68kWordListDesc);
+extern const LexerModule lmA68k(SCLEX_A68K, ColouriseA68kDoc, "a68k", 0, a68kWordListDesc);
diff --git a/src/lexilla/lexers/LexAPDL.cxx b/src/lexilla/lexers/LexAPDL.cxx
@@ -257,4 +257,4 @@ static const char * const apdlWordListDesc[] = {
     0
 };
 
-LexerModule lmAPDL(SCLEX_APDL, ColouriseAPDLDoc, "apdl", FoldAPDLDoc, apdlWordListDesc);
+extern const LexerModule lmAPDL(SCLEX_APDL, ColouriseAPDLDoc, "apdl", FoldAPDLDoc, apdlWordListDesc);
diff --git a/src/lexilla/lexers/LexASY.cxx b/src/lexilla/lexers/LexASY.cxx
@@ -272,4 +272,4 @@ static const char * const asyWordLists[] = {
             0,
         };
 
-LexerModule lmASY(SCLEX_ASYMPTOTE, ColouriseAsyDoc, "asy", FoldAsyDoc, asyWordLists);
+extern const LexerModule lmASY(SCLEX_ASYMPTOTE, ColouriseAsyDoc, "asy", FoldAsyDoc, asyWordLists);
diff --git a/src/lexilla/lexers/LexAU3.cxx b/src/lexilla/lexers/LexAU3.cxx
@@ -908,4 +908,4 @@ static const char * const AU3WordLists[] = {
     "#autoit UDF",
     0
 };
-LexerModule lmAU3(SCLEX_AU3, ColouriseAU3Doc, "au3", FoldAU3Doc , AU3WordLists);
+extern const LexerModule lmAU3(SCLEX_AU3, ColouriseAU3Doc, "au3", FoldAU3Doc , AU3WordLists);
diff --git a/src/lexilla/lexers/LexAVE.cxx b/src/lexilla/lexers/LexAVE.cxx
@@ -228,5 +228,5 @@ static void FoldAveDoc(Sci_PositionU startPos, Sci_Position length, int /* initS
 	styler.SetLevel(lineCurrent, levelPrev | flagsNext);
 }
 
-LexerModule lmAVE(SCLEX_AVE, ColouriseAveDoc, "ave", FoldAveDoc);
+extern const LexerModule lmAVE(SCLEX_AVE, ColouriseAveDoc, "ave", FoldAveDoc);
 
diff --git a/src/lexilla/lexers/LexAVS.cxx b/src/lexilla/lexers/LexAVS.cxx
@@ -291,4 +291,4 @@ static const char * const avsWordLists[] = {
 	0,
 };
 
-LexerModule lmAVS(SCLEX_AVS, ColouriseAvsDoc, "avs", FoldAvsDoc, avsWordLists);
+extern const LexerModule lmAVS(SCLEX_AVS, ColouriseAvsDoc, "avs", FoldAvsDoc, avsWordLists);
diff --git a/src/lexilla/lexers/LexAbaqus.cxx b/src/lexilla/lexers/LexAbaqus.cxx
@@ -603,4 +603,4 @@ static const char * const abaqusWordListDesc[] = {
     0
 };
 
-LexerModule lmAbaqus(SCLEX_ABAQUS, ColouriseABAQUSDoc, "abaqus", FoldABAQUSDoc, abaqusWordListDesc);
+extern const LexerModule lmAbaqus(SCLEX_ABAQUS, ColouriseABAQUSDoc, "abaqus", FoldABAQUSDoc, abaqusWordListDesc);
diff --git a/src/lexilla/lexers/LexAda.cxx b/src/lexilla/lexers/LexAda.cxx
@@ -44,7 +44,7 @@ static const char * const adaWordListDesc[] = {
 	0
 };
 
-LexerModule lmAda(SCLEX_ADA, ColouriseDocument, "ada", NULL, adaWordListDesc);
+extern const LexerModule lmAda(SCLEX_ADA, ColouriseDocument, "ada", NULL, adaWordListDesc);
 
 /*
  * Implementation

diff --git a/src/lexilla/lexers/LexAsciidoc.cxx b/src/lexilla/lexers/LexAsciidoc.cxx
@@ -390,4 +390,4 @@ static void ColorizeAsciidocDoc(Sci_PositionU startPos, Sci_Position length, int
     sc.Complete();
 }
 
-LexerModule lmAsciidoc(SCLEX_ASCIIDOC, ColorizeAsciidocDoc, "asciidoc");
+extern const LexerModule lmAsciidoc(SCLEX_ASCIIDOC, ColorizeAsciidocDoc, "asciidoc");