Define ILexer5 with methods for retrieving name, ID, and property values.

Implement ILexer5 on object lexers.
Implement ILexer5 on LexerSimple wrapper for function lexers.

1 files changed, 9 insertions, 6 deletions

diff --git a/lexers/LexAsm.cxx b/lexers/LexAsm.cxx
index f34c8b50c..8c30087cd 100644
--- a/lexers/LexAsm.cxx
+++ b/lexers/LexAsm.cxx
@@ -151,7 +151,7 @@ class LexerAsm : public DefaultLexer {
 	OptionSetAsm osAsm;
 	int commentChar;
 public:
-	LexerAsm(int commentChar_) {
+	LexerAsm(const char *languageName_, int language_, int commentChar_) : DefaultLexer(languageName_, language_) {
 		commentChar = commentChar_;
 	}
 	virtual ~LexerAsm() {
@@ -160,7 +160,7 @@ public:
 		delete this;
 	}
 	int SCI_METHOD Version() const override {
-		return lvRelease4;
+		return lvRelease5;
 	}
 	const char * SCI_METHOD PropertyNames() override {
 		return osAsm.PropertyNames();
@@ -172,6 +172,9 @@ public:
 		return osAsm.DescribeProperty(name);
 	}
 	Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override;
+	const char * SCI_METHOD PropertyGet(const char *key) override {
+		return osAsm.PropertyGet(key);
+	}
 	const char * SCI_METHOD DescribeWordListSets() override {
 		return osAsm.DescribeWordListSets();
 	}
@@ -183,12 +186,12 @@ public:
 		return 0;
 	}
 
-	static ILexer4 *LexerFactoryAsm() {
-		return new LexerAsm(';');
+	static ILexer5 *LexerFactoryAsm() {
+		return new LexerAsm("asm", SCLEX_ASM, ';');
 	}
 
-	static ILexer4 *LexerFactoryAs() {
-		return new LexerAsm('#');
+	static ILexer5 *LexerFactoryAs() {
+		return new LexerAsm("as", SCLEX_AS, '#');
 	}
 };