X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=runtime%2Fsyntax%2Fswift.yaml;h=ad1aee79cf0d7d72d013f133659ed137d628c3fc;hb=54c23cae72d7237bc898a59f79aad0acffdf0ffe;hp=2a13a07baaab4ad3c7b462d5daec6bd26cba8bc9;hpb=54bb99d7580cc1bc76507ce64ff78ef2038c8066;p=micro.git

diff --git a/runtime/syntax/swift.yaml b/runtime/syntax/swift.yaml
index 2a13a07b..ad1aee79 100644
--- a/runtime/syntax/swift.yaml
+++ b/runtime/syntax/swift.yaml
@@ -4,46 +4,99 @@ detect:
     filename: "\\.swift$"
 
 rules:
+ 
+    # Patterns
+    - type: \b(_)\b
+    
     # Operators
-    - statement: "([.:;,+*|=!?\\%]|<|>|/|-|&)"
+    - symbol.operator: ([.:;,+*|=!?\\%]|<|>|/|-|&)
+    
+    # Declaration Keywords
+    - statement.declaration: \b(associatedtype|class|deinit|enum|extension|fileprivate|func|import|init)\b
+    - statement.declaration: \b(inout|internal|let|open|operator|private|protocol|public|static|struct|subscript|typealias|var)\b
+    
+    # Statements Keywords
+    - statement: \b(break|case|continue|default|defer|do|else|fallthrough|for|guard)\b
+    - statement: \b(if|inif|repeat|return|switch|where|while)\b
+    
+    # keyword.reserved
+    - statement.reserved: \b(associativity|convenience|dynamic|didSet|final|get|infix|indirect|lazy|left|mutating)\b
+    - statement.reserved: \b(none|nonmutating|override|postfix|precedence|prefix|Protocol|required)\b
+    - statement.reserved: \b(right|set|Type|unowned|weak|willSet)\b
+    
+    # Expression and types
+    - type: \b(as|Any|catch|is|rethrows|super|self|throw|throws|try)\b
+    
+    - statement.built_in: \b(abs|advance|alignof|alignofValue|anyGenerator|assert|assertionFailure|bridgeFromObjectiveC)\b
+    - statement.built_in: \b(bridgeFromObjectiveCUnconditional|bridgeToObjectiveC|bridgeToObjectiveCUnconditional|contains)\b
+    - statement.built_in: \b(count|countElements|countLeadingZeros|debugPrint|debugPrintln|distance|dropFirst|dropLast|dump|encodeBitsAsWords)\b
+    - statement.built_in: \b(enumerate|equal|fatalError|filter|find|getBridgedObjectiveCType|getVaList|indices|insertionSort)\b
+    - statement.built_in: \b(isBridgedToObjectiveC|isBridgedVerbatimToObjectiveC|isUniquelyReferenced|isUniquelyReferencedNonObjC)\b
+    - statement.built_in: \b(join|lexicographicalCompare|map|max|maxElement|min|minElement|numericCast|overlaps|partition|posix)\b
+    - statement.built_in: \b(precondition|preconditionFailure|print|println|quickSort|readLine|reduce|reflect)\b
+    - statement.built_in: \b(reinterpretCast!reverse|roundUpToAlignment|sizeof|sizeofValue|sort|split|startsWith|stride)\b
+    - statement.built_in: \b(strideof|strideofValue|swap|toString|transcode|underestimateCount|unsafeAddressOf|unsafeBitCast)\b
+    - statement.built_in: \b(unsafeDowncast|unsafeUnwrap|unsafeReflect|withExtendedLifetime|withObjectAtPlusZero|withUnsafePointer)\b
+    - statement.built_in: \b(withUnsafePointerToObject|withUnsafeMutablePointer|withUnsafeMutablePointers|withUnsafePointer)\b
+    - statement.built_in: \b(withUnsafePointers|withVaList|zip)\b
 
-      # Statements
-    - statement:  "(class|import|let|var|struct|enum|func|if|else|switch|case|default|for|in|internal|external|unowned|private|public|throws)\\ "
-    - statement:  "(prefix|postfix|operator|extension|lazy|get|set|self|willSet|didSet|override|super|convenience|weak|strong|mutating|return|guard)\\ "
+    # Meta
+    - statement.meta: \@\b(autoclosure|available|convention|exported|IBAction|IBDesignable|IBOutlet|IBInspectable|infix)\b
+    - statement.meta: \@\b(lazy|noreturn|noescape|nonobjc|NSApplicationMain|NSCopying|NSManaged|objc|prefix|postfix)\b
+    - statement.meta: \@\b(required|testable|warn_unused_result|UIApplicationMain)\b
+  
+    #preprocessor
+    - preproc: ^[[:space:]]*#[[:space:]]*(define|else|elseif|endif|if|selector)\b
+    - preproc.DebugIdentifier: \b(__COLUMN__|__FILE__|__FUNCTION__|__LINE__)\b
+    - preproc.DebugIdentifier: ^[[:space:]]*#[[:space:]]*(column|file|function|line)\b
 
-      # Keywords
-    - statement: "(print)"
-    - statement: "(init)"
+    # Constant
+    - constant: \b(true|false|nil)
+    - constant.number: ([0-9]+)
+    
+    # Storage Types
+    - type.storage: \b((U)?Int(8|16|32|64))\b
+    - type.storage: \b(Int|UInt|String|Bit|Bool|Character|Double|Optional|Float|Range)\b
+    - type.storage: \b(AnyObject)\b
+    
+    # Collections
+    - type.collections: \b(Array|Dictionary|Set)\b
 
-      # Numbers
-    - constant.number: "([0-9]+)"
-
-      # Standard Types
-    - type: "\\ ((U)?Int(8|16|32|64))"
-    - constant: "(true|false|nil)"
-    - type: "\\ (Double|String|Float|Boolean|Dictionary|Array|Int)"
-    - type: "\\ (AnyObject)"
+    # Ctypes
+    - type.ctypes: \b(CBool|CChar|CUnsignedChar|CShort|CUnsignedShort|CInt|CUnsignedInt|CLong|CUnsignedLong|CLongLong|CUnsignedLongLong|CWideChar|CChar16|CChar32|CFloat|CDouble)\b
 
+    # String
     - constant.string:
-        start: "\""
-        end: "\""
+        start: \"
+        end: \"
+        skip: \\.
         rules:
-            - constant.specialChar: "\\\\."
+            - constant.specialChar: (\\0|\\\\|\\t|\\n|\\r|\\"|\\')
+            - constant.interpolation: \\\([[:graph:]]*\)
+            - constant.unicode: \\u\{[[:xdigit:]]+}
 
-    - comment:
-        start: "//"
-        end: "$"
-        rules:
-            - todo: "(TODO|XXX|FIXME):?"
+    # Shebang Line
+    - comment.shebang: ^(#!).*
 
-    - comment:
-        start: "///"
-        end: "$"
+    # Doc Comment
+    - comment.doc: (///).*
+    
+    # Line Comment
+    - comment.line: "//.*"
+    
+    # Block Comment
+    - comment.block:
+        start: "/\\*"
+        end: "\\*/"
         rules:
             - todo: "(TODO|XXX|FIXME):?"
-
-    - comment:
+      
+    # Doc Block Comment
+    - comment.block:
         start: "/\\*\\*"
         end: "\\*/"
         rules:
             - todo: "(TODO|XXX|FIXME):?"
+
+    # Todo
+    - todo: "(TODO|XXX|FIXME):?"