Reverted experimental Lexilla and SCI_SETILEXER support.

When testing, it works when compiled with debug symbols enabled, but crashes
without them. It doesn't seem worth maintaining.

3 files changed, 2 insertions, 82 deletions

diff --git a/include/ILexer.h b/include/ILexer.h
index 991c981e8..f7f188972 100644
--- a/include/ILexer.h
+++ b/include/ILexer.h
@@ -12,7 +12,7 @@
 
 namespace Scintilla {
 
-enum { dvOriginal=0, dvLineEnd=1, dvRelease4=2 };
+enum { dvOriginal=0, dvLineEnd=1 };
 
 class IDocument {
 public:
@@ -92,82 +92,6 @@ public:
 	virtual const char * SCI_METHOD PropertyGet(const char *key) = 0;
 };
 
-// For upstream lexer/lexilla support.
-
-enum { lvRelease4=2, lvRelease5=3 };
-
-class ILexer4 {
-public:
-	virtual int SCI_METHOD Version() const = 0;
-	virtual void SCI_METHOD Release() = 0;
-	virtual const char * SCI_METHOD PropertyNames() = 0;
-	virtual int SCI_METHOD PropertyType(const char *name) = 0;
-	virtual const char * SCI_METHOD DescribeProperty(const char *name) = 0;
-	virtual Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) = 0;
-	virtual const char * SCI_METHOD DescribeWordListSets() = 0;
-	virtual Sci_Position SCI_METHOD WordListSet(int n, const char *wl) = 0;
-	virtual void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, IDocument *pAccess) = 0;
-	virtual void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, IDocument *pAccess) = 0;
-	virtual void * SCI_METHOD PrivateCall(int operation, void *pointer) = 0;
-	virtual int SCI_METHOD LineEndTypesSupported() = 0;
-	virtual int SCI_METHOD AllocateSubStyles(int styleBase, int numberStyles) = 0;
-	virtual int SCI_METHOD SubStylesStart(int styleBase) = 0;
-	virtual int SCI_METHOD SubStylesLength(int styleBase) = 0;
-	virtual int SCI_METHOD StyleFromSubStyle(int subStyle) = 0;
-	virtual int SCI_METHOD PrimaryStyleFromStyle(int style) = 0;
-	virtual void SCI_METHOD FreeSubStyles() = 0;
-	virtual void SCI_METHOD SetIdentifiers(int style, const char *identifiers) = 0;
-	virtual int SCI_METHOD DistanceToSecondaryStyles() = 0;
-	virtual const char * SCI_METHOD GetSubStyleBases() = 0;
-	virtual int SCI_METHOD NamedStyles() = 0;
-	virtual const char * SCI_METHOD NameOfStyle(int style) = 0;
-	virtual const char * SCI_METHOD TagsOfStyle(int style) = 0;
-	virtual const char * SCI_METHOD DescriptionOfStyle(int style) = 0;
-};
-
-class ILexer5 : public ILexer4 {
-public:
-	virtual const char * SCI_METHOD GetName() = 0;
-	virtual int SCI_METHOD  GetIdentifier() = 0;
-	virtual const char * SCI_METHOD PropertyGet(const char *key) = 0;
-};
-
-class LexillaLexer : public ILexerWithIdentity {
-ILexer5 *lex;
-public:
-	LexillaLexer(ILexer5 *lex_) : lex(lex_) {}
-	virtual ~LexillaLexer() {}
-	void SCI_METHOD Release() override { lex->Release(); delete this; };
-	int SCI_METHOD Version() const override { return lex->Version(); }
-	const char * SCI_METHOD PropertyNames() override { return lex->PropertyNames(); }
-	int SCI_METHOD PropertyType(const char *name) override { return lex->PropertyType(name); }
-	const char * SCI_METHOD DescribeProperty(const char *name) override { return lex->DescribeProperty(name); }
-	Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override { return lex->PropertySet(key, val); }
-	const char * SCI_METHOD DescribeWordListSets() override { return lex->DescribeWordListSets(); }
-	Sci_Position SCI_METHOD WordListSet(int n, const char *wl) override { return lex->WordListSet(n, wl); }
-	void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, IDocument *pAccess) override { lex->Lex(startPos, lengthDoc, initStyle, pAccess); }
-	void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, IDocument *pAccess) override { lex->Fold(startPos, lengthDoc, initStyle, pAccess); }
-	void * SCI_METHOD PrivateCall(int operation, void *pointer) override { return lex->PrivateCall(operation, pointer); }
-	int SCI_METHOD LineEndTypesSupported() override { return lex->LineEndTypesSupported(); }
-	int SCI_METHOD AllocateSubStyles(int styleBase, int numberStyles) override { return lex->AllocateSubStyles(styleBase, numberStyles); }
-	int SCI_METHOD SubStylesStart(int styleBase) override { return lex->SubStylesStart(styleBase); }
-	int SCI_METHOD SubStylesLength(int styleBase) override { return lex->SubStylesLength(styleBase); }
-	int SCI_METHOD StyleFromSubStyle(int subStyle) override { return lex->StyleFromSubStyle(subStyle); }
-	int SCI_METHOD PrimaryStyleFromStyle(int style) override { return lex->PrimaryStyleFromStyle(style); }
-	void SCI_METHOD FreeSubStyles() override { lex->FreeSubStyles(); }
-	void SCI_METHOD SetIdentifiers(int style, const char *identifiers) override { lex->SetIdentifiers(style, identifiers); }
-	int SCI_METHOD DistanceToSecondaryStyles() override { return lex->DistanceToSecondaryStyles(); }
-	const char * SCI_METHOD GetSubStyleBases() override { return lex->GetSubStyleBases(); }
-	int SCI_METHOD NamedStyles() override { return lex->NamedStyles(); }
-	const char * SCI_METHOD NameOfStyle(int style) override { return lex->NameOfStyle(style); }
-	const char * SCI_METHOD TagsOfStyle(int style) override { return lex->TagsOfStyle(style); }
-	const char * SCI_METHOD DescriptionOfStyle(int style) override { return lex->DescriptionOfStyle(style); }
-	// ILexerWithIdentity methods
-	const char * SCI_METHOD GetName() override { return lex->GetName(); }
-	int SCI_METHOD GetIdentifier() override { return lex->GetIdentifier(); }
-	const char * SCI_METHOD PropertyGet(const char *key) override { return lex->PropertyGet(key); }
-};
-
 }
 
 #endif
diff --git a/include/Scintilla.h b/include/Scintilla.h
index 7cc0211d3..7eaef9be8 100644
--- a/include/Scintilla.h
+++ b/include/Scintilla.h
@@ -1055,7 +1055,6 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SCI_NAMEOFSTYLE 4030
 #define SCI_TAGSOFSTYLE 4031
 #define SCI_DESCRIPTIONOFSTYLE 4032
-#define SCI_SETILEXER 4033
 #define SC_MOD_NONE 0x0
 #define SC_MOD_INSERTTEXT 0x1
 #define SC_MOD_DELETETEXT 0x2
diff --git a/include/Scintilla.iface b/include/Scintilla.iface
index 483208acf..29b5a2ac6 100644
--- a/include/Scintilla.iface
+++ b/include/Scintilla.iface
@@ -2904,7 +2904,7 @@ set void SetKeyWords=4005(int keyWordSet, string keyWords)
 set void SetLexerLanguage=4006(, string language)
 
 # Load a lexer library (dll / so).
-fun void LoadLexerLibrary=4007(bool iLexer5, string path)
+fun void LoadLexerLibrary=4007(, string path)
 
 # Retrieve a "property" value previously set with SetProperty.
 # Result is NUL-terminated.
@@ -2995,9 +2995,6 @@ fun int TagsOfStyle=4031(int style, stringresult tags)
 # Result is NUL-terminated.
 fun int DescriptionOfStyle=4032(int style, stringresult description)
 
-# Set the lexer from an ILexer*.
-set void SetILexer=4033(, pointer ilexer)
-
 # Notifications
 # Type of modification and the action which caused the modification.
 # These are defined as a bit mask to make it easy to specify which notifications are wanted.