846 fix lexillapath (#847)

* fix lexilla.patch * fixing link error
antonvw · Feb 14, 2025 · 35473a9 · 35473a9
1 parent e8c691c
commit 35473a9
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 24 deletions.
diff --git a/external/lexilla.patch b/external/lexilla.patch
@@ -1,5 +1,5 @@
 diff --git a/lexers/LexBash.cxx b/lexers/LexBash.cxx
-index 4517df0c..80a74a53 100644
+index d077e8f3..02af83b8 100644
 --- a/lexers/LexBash.cxx
 +++ b/lexers/LexBash.cxx
 @@ -37,6 +37,9 @@
@@ -8,15 +8,15 @@ index 4517df0c..80a74a53 100644
 
 +#include "../../../../../../src/syntax/wex/lex-rfw.cpp"
 +#include "../../../../../../src/syntax/wex/lex-lilypond.cpp"
-+  
++
  namespace {
 
  #define HERE_DELIM_MAX			256
 diff --git a/lexlib/StyleContext.h b/lexlib/StyleContext.h
-index 75e5c77f..b3b6933b 100644
+index d148140e..e4c40429 100644
 --- a/lexlib/StyleContext.h
 +++ b/lexlib/StyleContext.h
-@@ -149,7 +149,7 @@ public:
+@@ -152,7 +152,7 @@ public:
  	}
  	bool MatchLineEnd() const noexcept {
  		const Sci_Position currentPosSigned = currentPos;
@@ -26,24 +26,24 @@ index 75e5c77f..b3b6933b 100644
  	bool Match(char ch0) const noexcept {
  		const unsigned char uch0 = ch0;
 diff --git a/src/Lexilla.cxx b/src/Lexilla.cxx
-index 4a0ce4e5..ddd6ad3b 100644
+index dc98575d..67328fc0 100644
 --- a/src/Lexilla.cxx
 +++ b/src/Lexilla.cxx
-@@ -131,6 +131,8 @@ extern LexerModule lmR;
- extern LexerModule lmRaku;
- extern LexerModule lmREBOL;
- extern LexerModule lmRegistry;
-+extern LexerModule lmLilyPond;
-+extern LexerModule lmRFW;
- extern LexerModule lmRuby;
- extern LexerModule lmRust;
- extern LexerModule lmSAS;
-@@ -279,6 +281,8 @@ void AddEachLexer() {
- 		&lmRaku,
- 		&lmREBOL,
- 		&lmRegistry,
+@@ -28,6 +28,8 @@ using namespace Lexilla;
+
+ //++Autogenerated -- run lexilla/scripts/LexillaGen.py to regenerate
+ //**\(extern const LexerModule \*;\n\)
++extern const LexerModule lmLilyPond;
++extern const LexerModule lmRFW;
+ extern const LexerModule lmA68k;
+ extern const LexerModule lmAbaqus;
+ extern const LexerModule lmAda;
+@@ -181,6 +183,8 @@ void AddEachLexer() {
+ 	catalogueLexilla.AddLexerModules({
+ //++Autogenerated -- run scripts/LexillaGen.py to regenerate
+ //**\(\t\t&\*,\n\)
 +		&lmLilyPond,
 +		&lmRFW,
- 		&lmRuby,
- 		&lmRust,
- 		&lmSAS,
+ 		&lmA68k,
+ 		&lmAbaqus,
+ 		&lmAda,
diff --git a/src/syntax/wex/lex-lilypond.cpp b/src/syntax/wex/lex-lilypond.cpp
@@ -2,7 +2,7 @@
 // Name:      lex-lilypond.cpp
 // Purpose:   Implementation of Scintilla::lex_lillypond
 // Author:    Anton van Wezenbeek
-// Copyright: (c) 2023-2024 Anton van Wezenbeek
+// Copyright: (c) 2023-2025 Anton van Wezenbeek
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "lex-lilypond.h"
@@ -523,7 +523,7 @@ void SCI_METHOD lex_lilypond::Lex(
 
 static const char* const emptyWordListDesc[] = {0};
 
-LexerModule lmLilyPond(
+extern const LexerModule lmLilyPond(
   lex_lilypond::language(),
   lex_lilypond::get,
   lex_lilypond::name(),

diff --git a/src/syntax/wex/lex-rfw.cpp b/src/syntax/wex/lex-rfw.cpp
@@ -1022,7 +1022,7 @@ Sci_Position SCI_METHOD Scintilla::lex_rfw::WordListSet(int n, const char* wl)
   return firstModification;
 }
 
-LexerModule lmRFW(
+extern const LexerModule lmRFW(
   lex_rfw::language(),
   lex_rfw::get,
   lex_rfw::name(),