diff options
| author | Neil <nyamatongwe@gmail.com> | 2015-01-22 12:31:05 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2015-01-22 12:31:05 +1100 |
| commit | 423b71c92cce374b886ed226e2f57c37a2560d72 (patch) | |
| tree | 884e79dfef7739595573fa2e188567b4115cf085 | |
| parent | 0da64693cf9132a2feb628e47c61b2df1c00d9a9 (diff) | |
| download | scintilla-mirror-423b71c92cce374b886ed226e2f57c37a2560d72.tar.gz | |
Feature [feature-requests:#1098]. Accept `is`/`us` integer suffixes instead of
`i`/`u`.
From Mika Attila.
| -rw-r--r-- | doc/ScintillaHistory.html | 14 | ||||
| -rw-r--r-- | lexers/LexRust.cxx | 4 |
2 files changed, 17 insertions, 1 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 5fb8eb4b1..9fe18dcf6 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -465,6 +465,8 @@ <td>Yusuf Ramazan Karagöz</td> <td>Markus Heidelberg</td> <td>Joe Mueller</td> + </tr><tr> + <td>Mika Attila</td> </tr> </table> <p> @@ -484,6 +486,18 @@ Released 20 January 2015. </li> <li> + Rust lexer accepts new 'is'/'us' integer suffixes instead of 'i'/'u'. + <a href="http://sourceforge.net/p/scintilla/bugs/1098/">Bug #1098</a>. + </li> + </ul> + <h3> + <a href="http://prdownloads.sourceforge.net/scintilla/scite353.zip?download">Release 3.5.3</a> + </h3> + <ul> + <li> + Released 20 January 2015. + </li> + <li> Support removed for Windows 95, 98, and ME. </li> <li> diff --git a/lexers/LexRust.cxx b/lexers/LexRust.cxx index 3b1201c7f..80ec014ca 100644 --- a/lexers/LexRust.cxx +++ b/lexers/LexRust.cxx @@ -271,7 +271,7 @@ static void ScanNumber(Accessor& styler, int& pos) { pos++; c = styler.SafeGetCharAt(pos, '\0'); n = styler.SafeGetCharAt(pos + 1, '\0'); - if (c == '8') { + if (c == '8' || c == 's') { pos++; } else if (c == '1' && n == '6') { pos += 2; @@ -279,6 +279,8 @@ static void ScanNumber(Accessor& styler, int& pos) { pos += 2; } else if (c == '6' && n == '4') { pos += 2; + } else { + error = true; } /* See if it's a floating point literal. These literals have to be base 10. */ |