diff options
| -rw-r--r-- | doc/ScintillaHistory.html | 3 | ||||
| -rw-r--r-- | include/SciLexer.h | 31 | ||||
| -rw-r--r-- | src/Catalogue.cxx | 1 |
3 files changed, 21 insertions, 14 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 0e9a50b31..481bedf03 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -484,8 +484,9 @@ Released 2 December 2014. </li> <li> - Lexer added for Motorola S-Record files. + Lexers added for Motorola S-Record files and Intel hex files. <a href="http://sourceforge.net/p/scintilla/feature-requests/1091/">Feature #1091.</a> + <a href="http://sourceforge.net/p/scintilla/feature-requests/1093/">Feature #1093.</a> </li> <li> C++ folder allows folding on square brackets '['. diff --git a/include/SciLexer.h b/include/SciLexer.h index b986d7391..8547bf5c2 100644 --- a/include/SciLexer.h +++ b/include/SciLexer.h @@ -130,6 +130,7 @@ #define SCLEX_REGISTRY 115 #define SCLEX_BIBTEX 116 #define SCLEX_SREC 117 +#define SCLEX_IHEX 118 #define SCLEX_AUTOMATIC 1000 #define SCE_P_DEFAULT 0 #define SCE_P_COMMENTLINE 1 @@ -1747,19 +1748,23 @@ #define SCE_BIBTEX_PARAMETER 4 #define SCE_BIBTEX_VALUE 5 #define SCE_BIBTEX_COMMENT 6 -#define SCE_SREC_DEFAULT 0 -#define SCE_SREC_RECSTART 1 -#define SCE_SREC_RECTYPE 2 -#define SCE_SREC_BYTECOUNT 3 -#define SCE_SREC_BYTECOUNT_WRONG 4 -#define SCE_SREC_NOADDRESS 5 -#define SCE_SREC_DATAADDRESS 6 -#define SCE_SREC_RECCOUNT 7 -#define SCE_SREC_STARTADDRESS 8 -#define SCE_SREC_DATA_ODD 9 -#define SCE_SREC_DATA_EVEN 10 -#define SCE_SREC_CHECKSUM 11 -#define SCE_SREC_CHECKSUM_WRONG 12 +#define SCE_HEX_DEFAULT 0 +#define SCE_HEX_RECSTART 1 +#define SCE_HEX_RECTYPE 2 +#define SCE_HEX_BYTECOUNT 3 +#define SCE_HEX_BYTECOUNT_WRONG 4 +#define SCE_HEX_NOADDRESS 5 +#define SCE_HEX_DATAADDRESS 6 +#define SCE_HEX_RECCOUNT 7 +#define SCE_HEX_STARTADDRESS 8 +#define SCE_HEX_ADDRESSFIELD_UNKNOWN 9 +#define SCE_HEX_EXTENDEDADDRESS 10 +#define SCE_HEX_DATA_ODD 11 +#define SCE_HEX_DATA_EVEN 12 +#define SCE_HEX_DATA_UNKNOWN 13 +#define SCE_HEX_DATA_EMPTY 14 +#define SCE_HEX_CHECKSUM 15 +#define SCE_HEX_CHECKSUM_WRONG 16 /* --Autogenerated -- end of section automatically generated from Scintilla.iface */ #endif diff --git a/src/Catalogue.cxx b/src/Catalogue.cxx index e2377e14c..5e0bfd790 100644 --- a/src/Catalogue.cxx +++ b/src/Catalogue.cxx @@ -123,6 +123,7 @@ int Scintilla_LinkLexers() { LINK_LEXER(lmGui4Cli); LINK_LEXER(lmHaskell); LINK_LEXER(lmHTML); + LINK_LEXER(lmIHex); LINK_LEXER(lmInno); LINK_LEXER(lmKix); LINK_LEXER(lmKVIrc); |