Skip to content

Commit

Permalink
Update Swift keyword to Swift 6.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
zufuliu committed Dec 18, 2024
1 parent 8e43a82 commit bd29e3c
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 9 deletions.
2 changes: 1 addition & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ Latest development builds (artifacts in Release configuration for each compiler
* [PostgreSQL](tools/lang/PostgreSQL.sql), PostgreSQL 14.
* [Transact-SQL](tools/lang/Transact-SQL.sql), SQL Server 2019.
* [Oracle](tools/lang/Oracle.sql), Oracle 20, incomplete.
* [Swift](tools/lang/Swift.swift), up to Swift 5.10.
* [Swift](tools/lang/Swift.swift), up to Swift 6.0.
* TCL, [Screenshots](https://github.com/zufuliu/notepad4/wiki/Screenshots#tcl)
* [Texinfo](tools/lang/Texinfo.texi), up to Texinfo 7.1.
* [TOML File](https://toml.io/)
Expand Down
14 changes: 7 additions & 7 deletions src/EditLexers/stlSwift.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@

static KEYWORDLIST Keywords_Swift = {{
//++Autogenerated -- start of section automatically generated
"Any Protocol Self Type actor as associatedtype associativity async await break case catch class continue convenience "
"default defer deinit didSet do dynamic else enum extension fallthrough false fileprivate final for func get guard "
"if import in indirect infix init inout internal is lazy left let macro mutating nil none nonisolated nonmutating "
"open operator optional override package postfix precedence precedencegroup prefix private protocol public "
"repeat required rethrows return right self set some static struct subscript super switch "
"throw throws true try typealias unowned var weak where while willSet "
"Any Protocol Self Type actor as associatedtype associativity async await borrowing break "
"case catch class consuming continue convenience default defer deinit didSet do dynamic else enum extension "
"fallthrough false fileprivate final for func get guard if import in indirect infix init inout internal is lazy left let "
"macro mutating nil none nonisolated nonmutating open operator optional override "
"package postfix precedence precedencegroup prefix private protocol public repeat required rethrows return right "
"self set some static struct subscript super switch throw throws true try typealias unowned var weak where while willSet "

, // 1 directive
"available( colorLiteral( column dsohandle else elseif endif error( externalMacro( "
Expand All @@ -18,7 +18,7 @@ static KEYWORDLIST Keywords_Swift = {{
, // 2 attribute
"GKInspectable NSCopying NSManaged Sendable attached( autoclosure available( backDeployed( convention "
"discardableResult dynamicCallable dynamicMemberLookup escaping freestanding( frozen inlinable main nonobjc "
"objc objcMembers propertyWrapper requires_stored_property_inits resultBuilder testable "
"objc objcMembers preconcurrency propertyWrapper requires_stored_property_inits resultBuilder testable "
"unchecked unknown usableFromInline warn_unqualified_access "

, // 3 class
Expand Down
5 changes: 4 additions & 1 deletion tools/lang/Swift.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 5.10 https://www.swift.org/
// 6.0 https://www.swift.org/
// https://swift.org/documentation/
// https://github.com/apple/swift-evolution

Expand All @@ -7,6 +7,8 @@
// https://docs.swift.org/swift-book/documentation/the-swift-programming-language/lexicalstructure
// Keywords used in declarations
associatedtype
borrowing
class consuming
class
deinit
enum extension
Expand Down Expand Up @@ -125,6 +127,7 @@ actor nonisolated
@NSManaged
@objc
@objcMembers
@preconcurrency
@propertyWrapper
@resultBuilder
@requires_stored_property_inits
Expand Down

0 comments on commit bd29e3c

Please sign in to comment.