swift shorthand notation

paiv · paiv · commit 3f8cef296c46 · 2024-12-27T12:36:04.000+02:00
diff --git a/docs/_posts/2024-11-13-uklatn-swift.md b/docs/_posts/2024-11-13-uklatn-swift.md
@@ -28,8 +28,8 @@ decode("Paljanycja")
 
 Set the transliteration scheme:
 ```swift
-encode("Борщ", table: UKLatnTable.DSTU_9112_B)
-encode("Шевченко", table: UKLatnTable.KMU_55)
+encode("Борщ", table: .DSTU_9112_B)
+encode("Шевченко", table: .KMU_55)
 ```
 
 
diff --git a/swift/Tests/UkrainianLatinTests/UKLatnTests.swift b/swift/Tests/UkrainianLatinTests/UKLatnTests.swift
@@ -79,9 +79,9 @@ class Dstu9112ATests: XCTestCase {
         ]
 
         for (cyr, lat) in data {
-            let enc = encode(cyr, table: UKLatnTable.DSTU_9112_A)
+            let enc = encode(cyr, table: .DSTU_9112_A)
             XCTAssertEqual(lat, enc)
-            let dec = decode(lat, table: UKLatnTable.DSTU_9112_A)
+            let dec = decode(lat, table: .DSTU_9112_A)
             XCTAssertEqual(cyr, dec)
         }
 
@@ -106,7 +106,7 @@ class Dstu9112ATests: XCTestCase {
         ]
 
         for (cyr, lat) in data {
-            let enc = encode(cyr, table: UKLatnTable.DSTU_9112_A)
+            let enc = encode(cyr, table: .DSTU_9112_A)
             XCTAssertEqual(lat, enc)
         }
 
@@ -141,7 +141,7 @@ class Dstu9112ATests: XCTestCase {
         ]
 
         for (cyr, lat) in data {
-            let dec = decode(lat, table: UKLatnTable.DSTU_9112_A)
+            let dec = decode(lat, table: .DSTU_9112_A)
             XCTAssertEqual(cyr, dec)
         }
 
@@ -228,9 +228,9 @@ class Dstu9112BTests: XCTestCase {
         ]
 
         for (cyr, lat) in data {
-            let enc = encode(cyr, table: UKLatnTable.DSTU_9112_B)
+            let enc = encode(cyr, table: .DSTU_9112_B)
             XCTAssertEqual(lat, enc)
-            let dec = decode(lat, table: UKLatnTable.DSTU_9112_B)
+            let dec = decode(lat, table: .DSTU_9112_B)
             XCTAssertEqual(cyr, dec)
         }
     }
@@ -248,7 +248,7 @@ class Dstu9112BTests: XCTestCase {
         ]
 
         for (cyr, lat) in data {
-            let enc = encode(cyr, table: UKLatnTable.DSTU_9112_B)
+            let enc = encode(cyr, table: .DSTU_9112_B)
             XCTAssertEqual(lat, enc)
         }
     }
@@ -270,7 +270,7 @@ class Dstu9112BTests: XCTestCase {
         ]
 
         for (cyr, lat) in data {
-            let dec = decode(lat, table: UKLatnTable.DSTU_9112_B)
+            let dec = decode(lat, table: .DSTU_9112_B)
             XCTAssertEqual(cyr, dec)
         }
     }
@@ -352,7 +352,7 @@ class Kmu55Tests: XCTestCase {
         ]
 
         for (cyr, lat) in data {
-            let enc = encode(cyr, table: UKLatnTable.KMU_55)
+            let enc = encode(cyr, table: .KMU_55)
             XCTAssertEqual(lat, enc)
         }
     }
diff --git a/swift/readme.md b/swift/readme.md
@@ -16,8 +16,8 @@ decode("Paljanycja")
 
 Set the transliteration scheme:
 ```swift
-encode("Борщ", table: UKLatnTable.DSTU_9112_B)
-encode("Шевченко", table: UKLatnTable.KMU_55)
+encode("Борщ", table: .DSTU_9112_B)
+encode("Шевченко", table: .KMU_55)
 ```
 
 
diff --git a/tools/gen/gen_swift.py b/tools/gen/gen_swift.py
@@ -33,17 +33,17 @@ def all_c2l(data):
 
     def _emit_tests(kind, table):
         if kind[0] == 'c':
-            yield f'let enc = encode(cyr, table: UKLatnTable.{table})\n'
+            yield f'let enc = encode(cyr, table: .{table})\n'
             yield 'XCTAssertEqual(lat, enc)\n'
         else:
-            yield f'let dec = decode(lat, table: UKLatnTable.{table})\n'
+            yield f'let dec = decode(lat, table: .{table})\n'
             yield 'XCTAssertEqual(cyr, dec)\n'
         if kind[-1] == 'r':
             if kind[0] == 'c':
-                yield f'let dec = decode(lat, table: UKLatnTable.{table})\n'
+                yield f'let dec = decode(lat, table: .{table})\n'
                 yield 'XCTAssertEqual(cyr, dec)\n'
             else:
-                yield f'let enc = encode(cyr, table: UKLatnTable.{table})\n'
+                yield f'let enc = encode(cyr, table: .{table})\n'
                 yield 'XCTAssertEqual(lat, enc)\n'
 
     def _emit_tests_default(kind):

Original file line number	Diff line number	Diff line change
`@@ -79,9 +79,9 @@ class Dstu9112ATests: XCTestCase {`
`79`	`79`	`]`
`80`	`80`
`81`	`81`	`for (cyr, lat) in data {`
`82`		`- let enc = encode(cyr, table: UKLatnTable.DSTU_9112_A)`
	`82`	`+ let enc = encode(cyr, table: .DSTU_9112_A)`
`83`	`83`	`XCTAssertEqual(lat, enc)`
`84`		`- let dec = decode(lat, table: UKLatnTable.DSTU_9112_A)`
	`84`	`+ let dec = decode(lat, table: .DSTU_9112_A)`
`85`	`85`	`XCTAssertEqual(cyr, dec)`
`86`	`86`	`}`
`87`	`87`
`@@ -106,7 +106,7 @@ class Dstu9112ATests: XCTestCase {`
`106`	`106`	`]`
`107`	`107`
`108`	`108`	`for (cyr, lat) in data {`
`109`		`- let enc = encode(cyr, table: UKLatnTable.DSTU_9112_A)`
	`109`	`+ let enc = encode(cyr, table: .DSTU_9112_A)`
`110`	`110`	`XCTAssertEqual(lat, enc)`
`111`	`111`	`}`
`112`	`112`
`@@ -141,7 +141,7 @@ class Dstu9112ATests: XCTestCase {`
`141`	`141`	`]`
`142`	`142`
`143`	`143`	`for (cyr, lat) in data {`
`144`		`- let dec = decode(lat, table: UKLatnTable.DSTU_9112_A)`
	`144`	`+ let dec = decode(lat, table: .DSTU_9112_A)`
`145`	`145`	`XCTAssertEqual(cyr, dec)`
`146`	`146`	`}`
`147`	`147`
`@@ -228,9 +228,9 @@ class Dstu9112BTests: XCTestCase {`
`228`	`228`	`]`
`229`	`229`
`230`	`230`	`for (cyr, lat) in data {`
`231`		`- let enc = encode(cyr, table: UKLatnTable.DSTU_9112_B)`
	`231`	`+ let enc = encode(cyr, table: .DSTU_9112_B)`
`232`	`232`	`XCTAssertEqual(lat, enc)`
`233`		`- let dec = decode(lat, table: UKLatnTable.DSTU_9112_B)`
	`233`	`+ let dec = decode(lat, table: .DSTU_9112_B)`
`234`	`234`	`XCTAssertEqual(cyr, dec)`
`235`	`235`	`}`
`236`	`236`	`}`
`@@ -248,7 +248,7 @@ class Dstu9112BTests: XCTestCase {`
`248`	`248`	`]`
`249`	`249`
`250`	`250`	`for (cyr, lat) in data {`
`251`		`- let enc = encode(cyr, table: UKLatnTable.DSTU_9112_B)`
	`251`	`+ let enc = encode(cyr, table: .DSTU_9112_B)`
`252`	`252`	`XCTAssertEqual(lat, enc)`
`253`	`253`	`}`
`254`	`254`	`}`
`@@ -270,7 +270,7 @@ class Dstu9112BTests: XCTestCase {`
`270`	`270`	`]`
`271`	`271`
`272`	`272`	`for (cyr, lat) in data {`
`273`		`- let dec = decode(lat, table: UKLatnTable.DSTU_9112_B)`
	`273`	`+ let dec = decode(lat, table: .DSTU_9112_B)`
`274`	`274`	`XCTAssertEqual(cyr, dec)`
`275`	`275`	`}`
`276`	`276`	`}`
`@@ -352,7 +352,7 @@ class Kmu55Tests: XCTestCase {`
`352`	`352`	`]`
`353`	`353`
`354`	`354`	`for (cyr, lat) in data {`
`355`		`- let enc = encode(cyr, table: UKLatnTable.KMU_55)`
	`355`	`+ let enc = encode(cyr, table: .KMU_55)`
`356`	`356`	`XCTAssertEqual(lat, enc)`
`357`	`357`	`}`
`358`	`358`	`}`