Skip to content

Commit

Permalink
Update F# lexer to F# 7.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
zufuliu committed Jul 8, 2023
1 parent e2ff4fe commit a12666d
Show file tree
Hide file tree
Showing 13 changed files with 668 additions and 241 deletions.
1 change: 0 additions & 1 deletion doc/Notepad2 DarkTheme.ini
Expand Up @@ -186,7 +186,6 @@ Line Addition=back:#085820; eolfilled
Line Removal=back:#A52A2A; eolfilled
Line Change=back:#0F405D; eolfilled
[F# Source]
Keyword=fore:#00B050
Code Quotation=fore:#006633; back:#0F405D; eolfilled
Number=fore:#F84C4C
Operator=fore:#A349A4
Expand Down
2 changes: 1 addition & 1 deletion readme.md
Expand Up @@ -63,7 +63,7 @@ Latest development builds (artifacts in Release configuration for each compiler
* [D](tools/lang/D.d), up to D language 2.0.
* [Dart](tools/lang/Dart.dart), up to Dart 3.0.
* Diff/Patch File
* F#
* [F#](tools/lang/FSharp.fs), up to F# 7.0.
* [Fortran](tools/lang/Fortran.f), up to Fortran 2018.
* [GN Build](tools/lang/GN.gn), up to GN 2019-03-13.
* [Go](tools/lang/Go.go), up to Go 1.14.
Expand Down
33 changes: 21 additions & 12 deletions scintilla/include/SciLexer.h
Expand Up @@ -561,18 +561,27 @@
#define SCE_FSHARP_DEFAULT 0
#define SCE_FSHARP_COMMENT 1
#define SCE_FSHARP_COMMENTLINE 2
#define SCE_FSHARP_IDENTIFIER 3
#define SCE_FSHARP_KEYWORD 4
#define SCE_FSHARP_TYPEKEYWORD 5
#define SCE_FSHARP_PREPROCESSOR 6
#define SCE_FSHARP_ATTRIBUTE 7
#define SCE_FSHARP_CHARACTER 8
#define SCE_FSHARP_STRING 9
#define SCE_FSHARP_STRINGEOL 10
#define SCE_FSHARP_VERBATIM 11
#define SCE_FSHARP_QUOTATION 12
#define SCE_FSHARP_NUMBER 13
#define SCE_FSHARP_OPERATOR 14
#define SCE_FSHARP_COMMENTLINEDOC 3
#define SCE_FSHARP_COMMENTTAG_XML 4
#define SCE_FSHARP_TASKMARKER 5
#define SCE_FSHARP_NUMBER 6
#define SCE_FSHARP_OPERATOR 7
#define SCE_FSHARP_IDENTIFIER 8
#define SCE_FSHARP_PREPROCESSOR 9
#define SCE_FSHARP_CHARACTER 10
#define SCE_FSHARP_STRING 11
#define SCE_FSHARP_INTERPOLATED_STRING 12
#define SCE_FSHARP_VERBATIM_STRING 13
#define SCE_FSHARP_INTERPOLATED_VERBATIM_STRING 14
#define SCE_FSHARP_TRIPLE_STRING 15
#define SCE_FSHARP_INTERPOLATED_TRIPLE_STRING 16
#define SCE_FSHARP_ESCAPECHAR 17
#define SCE_FSHARP_FORMAT_SPECIFIER 18
#define SCE_FSHARP_BACKTICK 19
#define SCE_FSHARP_QUOTATION 20
#define SCE_FSHARP_KEYWORD 21
#define SCE_FSHARP_TYPE 22
#define SCE_FSHARP_ATTRIBUTE 23
#define SCE_ASM_DEFAULT 0
#define SCE_ASM_COMMENT 1
#define SCE_ASM_COMMENTBLOCK 2
Expand Down
39 changes: 24 additions & 15 deletions scintilla/include/SciLexer.iface
Expand Up @@ -886,21 +886,30 @@ val SCE_MAT_CALLBACK=
val SCE_MAT_FUNCTION=
# Lexical states for SCLEX_FSHARP
lex FSharp=SCLEX_FSHARP SCE_FSHARP_
val SCE_FSHARP_DEFAULT=0
val SCE_FSHARP_COMMENT=1
val SCE_FSHARP_COMMENTLINE=2
val SCE_FSHARP_IDENTIFIER=3
val SCE_FSHARP_KEYWORD=4
val SCE_FSHARP_TYPEKEYWORD=5
val SCE_FSHARP_PREPROCESSOR=6
val SCE_FSHARP_ATTRIBUTE=7
val SCE_FSHARP_CHARACTER=8
val SCE_FSHARP_STRING=9
val SCE_FSHARP_STRINGEOL=10
val SCE_FSHARP_VERBATIM=11
val SCE_FSHARP_QUOTATION=12
val SCE_FSHARP_NUMBER=13
val SCE_FSHARP_OPERATOR=14
val SCE_FSHARP_DEFAULT=
val SCE_FSHARP_COMMENT=
val SCE_FSHARP_COMMENTLINE=
val SCE_FSHARP_COMMENTLINEDOC=
val SCE_FSHARP_COMMENTTAG_XML=
val SCE_FSHARP_TASKMARKER=
val SCE_FSHARP_NUMBER=
val SCE_FSHARP_OPERATOR=
val SCE_FSHARP_IDENTIFIER=
val SCE_FSHARP_PREPROCESSOR=
val SCE_FSHARP_CHARACTER=
val SCE_FSHARP_STRING=
val SCE_FSHARP_INTERPOLATED_STRING=
val SCE_FSHARP_VERBATIM_STRING=
val SCE_FSHARP_INTERPOLATED_VERBATIM_STRING=
val SCE_FSHARP_TRIPLE_STRING=
val SCE_FSHARP_INTERPOLATED_TRIPLE_STRING=
val SCE_FSHARP_ESCAPECHAR=
val SCE_FSHARP_FORMAT_SPECIFIER=
val SCE_FSHARP_BACKTICK=
val SCE_FSHARP_QUOTATION=
val SCE_FSHARP_KEYWORD=
val SCE_FSHARP_TYPE=
val SCE_FSHARP_ATTRIBUTE=
# Lexical states for SCLEX_MAXIMA
#lex Maxima=SCLEX_MAXIMA SCE_MAXIMA_
#val SCE_MAXIMA_OPERATOR=0
Expand Down

0 comments on commit a12666d

Please sign in to comment.