diff options
author | nyamatongwe <unknown> | 2003-12-22 22:06:04 +0000 |
---|---|---|
committer | nyamatongwe <unknown> | 2003-12-22 22:06:04 +0000 |
commit | 3ab98cb503b3b0b10793bc0340efeabf30fa8884 (patch) | |
tree | 57a29261e8cd7c27310083960c2ca2aa2b9f7920 | |
parent | 6393848cdf39a1d69366ed14102f6b05741a2459 (diff) | |
download | scintilla-mirror-3ab98cb503b3b0b10793bc0340efeabf30fa8884.tar.gz |
Support for Intel ifort and absoft Fortran compiler error messages.
-rw-r--r-- | doc/ScintillaHistory.html | 1 | ||||
-rw-r--r-- | include/SciLexer.h | 2 | ||||
-rw-r--r-- | include/Scintilla.iface | 2 | ||||
-rw-r--r-- | src/LexOthers.cxx | 6 |
4 files changed, 11 insertions, 0 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index ac2af30d8..9974be585 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -154,6 +154,7 @@ <li>Robert Boucher</li> <li>Christoph Dalitz</li> <li>April White</li> + <li>S. Umar</li> </ul> <p> Images used in GTK+ version diff --git a/include/SciLexer.h b/include/SciLexer.h index 57f10bd5b..44d5dcdcd 100644 --- a/include/SciLexer.h +++ b/include/SciLexer.h @@ -304,6 +304,8 @@ #define SCE_ERR_PHP 14 #define SCE_ERR_ELF 15 #define SCE_ERR_IFC 16 +#define SCE_ERR_IFORT 17 +#define SCE_ERR_ABSF 18 #define SCE_BAT_DEFAULT 0 #define SCE_BAT_COMMENT 1 #define SCE_BAT_WORD 2 diff --git a/include/Scintilla.iface b/include/Scintilla.iface index 831e0393d..6c5a48f44 100644 --- a/include/Scintilla.iface +++ b/include/Scintilla.iface @@ -1968,6 +1968,8 @@ val SCE_ERR_DIFF_MESSAGE=13 val SCE_ERR_PHP=14 val SCE_ERR_ELF=15 val SCE_ERR_IFC=16 +val SCE_ERR_IFORT=17 +val SCE_ERR_ABSF=18 # Lexical states for SCLEX_BATCH lex Batch=SCLEX_BATCH SCE_BAT_ val SCE_BAT_DEFAULT=0 diff --git a/src/LexOthers.cxx b/src/LexOthers.cxx index 31ac415ad..819dd3129 100644 --- a/src/LexOthers.cxx +++ b/src/LexOthers.cxx @@ -427,6 +427,12 @@ static void ColouriseErrorListLine( styler.ColourTo(endPos, SCE_ERR_DIFF_ADDITION); } else if (lineBuffer[0] == '-' && lineBuffer[1] == '-' && lineBuffer[2] == '-') { styler.ColourTo(endPos, SCE_ERR_DIFF_MESSAGE); + } else if (strstart(lineBuffer, "cf90-")) { + // Absoft Pro Fortran 90/95 v8.2 error and/or warning message + styler.ColourTo(endPos, SCE_ERR_ABSF); + } else if (strstart(lineBuffer, "fortcom:")) { + // Intel Fortran Compiler v8.0 error/warning message + styler.ColourTo(endPos, SCE_ERR_IFORT); } else if (lineBuffer[0] == '-') { styler.ColourTo(endPos, SCE_ERR_DIFF_DELETION); } else if (strstr(lineBuffer, "File \"") && strstr(lineBuffer, ", line ")) { |