@@ -321,33 +321,40 @@ open class Unit : NSObject, NSCopying, NSSecureCoding {
321
321
case knot
322
322
case meterPerSecond
323
323
case milePerHour
324
+
324
325
case celsius
325
326
case fahrenheit
326
327
case generic
327
328
case kelvin
329
+
328
330
case acreFoot
329
331
case bushel
330
332
case centiliter
331
333
case cubicCentimeter
332
334
case cubicFoot
333
335
case cubicInch
334
336
case cubicKilometer
337
+ case cubicDecimeter
335
338
case cubicMeter
336
339
case cubicMile
337
340
case cubicYard
338
341
case cup
339
342
case cupMetric
340
343
case deciliter
341
344
case fluidOunce
345
+ case fluidOunceImperial
342
346
case gallon
343
347
case gallonImperial
344
348
case hectoliter
345
349
case liter
346
350
case megaliter
351
+ case kiloliter
347
352
case milliliter
348
353
case pint
354
+ case pintImperial
349
355
case pintMetric
350
356
case quart
357
+ case quartImperial
351
358
case tablespoon
352
359
case teaspoon
353
360
@@ -2223,187 +2230,191 @@ public final class UnitVolume : Dimension {
2223
2230
2224
2231
public class var megaliters : UnitVolume {
2225
2232
get {
2226
- return UnitVolume ( symbol: Symbol . megaliters, coefficient: Coefficient . megaliters)
2233
+ return Unit . stored ( at : . megaliter , newUnit : UnitVolume ( symbol: Symbol . megaliters, coefficient: Coefficient . megaliters, storeIndex : . megaliter ) )
2227
2234
}
2228
2235
}
2229
2236
2230
2237
public class var kiloliters : UnitVolume {
2231
2238
get {
2232
- return UnitVolume ( symbol: Symbol . kiloliters , coefficient: Coefficient . kiloliters)
2239
+ return Unit . stored ( at : . kiloliter , newUnit : UnitVolume ( symbol: Symbol . megaliters , coefficient: Coefficient . kiloliters, storeIndex : . kiloliter ) )
2233
2240
}
2234
2241
}
2235
2242
2236
2243
public class var liters : UnitVolume {
2237
2244
get {
2238
- return UnitVolume ( symbol: Symbol . liters, coefficient: Coefficient . liters)
2245
+ return Unit . stored ( at : . liter , newUnit : UnitVolume ( symbol: Symbol . liters, coefficient: Coefficient . liters, storeIndex : . liter ) )
2239
2246
}
2240
2247
}
2241
2248
2242
2249
public class var deciliters : UnitVolume {
2243
2250
get {
2244
- return UnitVolume ( symbol: Symbol . deciliters, coefficient: Coefficient . deciliters)
2251
+ return Unit . stored ( at : . deciliter , newUnit : UnitVolume ( symbol: Symbol . deciliters, coefficient: Coefficient . deciliters, storeIndex : . deciliter ) )
2245
2252
}
2246
2253
}
2247
2254
2248
2255
public class var centiliters : UnitVolume {
2249
2256
get {
2250
- return UnitVolume ( symbol: Symbol . centiliters, coefficient: Coefficient . centiliters)
2257
+ return Unit . stored ( at : . centiliter , newUnit : UnitVolume ( symbol: Symbol . centiliters, coefficient: Coefficient . centiliters, storeIndex : . centiliter ) )
2251
2258
}
2252
2259
}
2253
2260
2254
2261
public class var milliliters : UnitVolume {
2255
2262
get {
2256
- return UnitVolume ( symbol: Symbol . milliliters, coefficient: Coefficient . milliliters)
2263
+ return Unit . stored ( at : . milliliter , newUnit : UnitVolume ( symbol: Symbol . milliliters, coefficient: Coefficient . milliliters, storeIndex : . milliliter ) )
2257
2264
}
2258
2265
}
2259
2266
2260
2267
public class var cubicKilometers : UnitVolume {
2261
2268
get {
2262
- return UnitVolume ( symbol: Symbol . cubicKilometers, coefficient: Coefficient . cubicKilometers)
2269
+ return Unit . stored ( at : . cubicKilometer , newUnit : UnitVolume ( symbol: Symbol . cubicKilometers, coefficient: Coefficient . cubicKilometers, storeIndex : . cubicKilometer ) )
2263
2270
}
2264
2271
}
2265
2272
2266
2273
public class var cubicMeters : UnitVolume {
2267
2274
get {
2268
- return UnitVolume ( symbol: Symbol . cubicMeters, coefficient: Coefficient . cubicMeters)
2275
+ return Unit . stored ( at : . cubicMeter , newUnit : UnitVolume ( symbol: Symbol . cubicMeters, coefficient: Coefficient . cubicMeters, storeIndex : . cubicMeter ) )
2269
2276
}
2270
2277
}
2271
2278
2272
2279
public class var cubicDecimeters : UnitVolume {
2273
2280
get {
2274
- return UnitVolume ( symbol: Symbol . cubicDecimeters, coefficient: Coefficient . cubicDecimeters)
2281
+ return Unit . stored ( at : . cubicDecimeter , newUnit : UnitVolume ( symbol: Symbol . cubicDecimeters, coefficient: Coefficient . cubicDecimeters, storeIndex : . cubicDecimeter ) )
2275
2282
}
2276
2283
}
2277
2284
2278
2285
public class var cubicCentimeters : UnitVolume {
2279
2286
get {
2280
- return UnitVolume ( symbol: Symbol . cubicCentimeters, coefficient: Coefficient . cubicCentimeters)
2287
+ return Unit . stored ( at : . cubicCentimeter , newUnit : UnitVolume ( symbol: Symbol . cubicCentimeters, coefficient: Coefficient . cubicCentimeters, storeIndex : . cubicCentimeter ) )
2281
2288
}
2282
2289
}
2283
2290
2284
2291
public class var cubicMillimeters : UnitVolume {
2285
2292
get {
2293
+ return Unit . stored ( at: . cubicMeter, newUnit: UnitVolume ( symbol: Symbol . cubicMeters, coefficient: Coefficient . cubicMeters, storeIndex: . cubicMeter) )
2286
2294
return UnitVolume ( symbol: Symbol . cubicMillimeters, coefficient: Coefficient . cubicMillimeters)
2287
2295
}
2288
2296
}
2289
2297
2290
2298
public class var cubicInches : UnitVolume {
2291
2299
get {
2300
+ return Unit . stored ( at: . cubicMeter, newUnit: UnitVolume ( symbol: Symbol . cubicMeters, coefficient: Coefficient . cubicMeters, storeIndex: . cubicMeter) )
2292
2301
return UnitVolume ( symbol: Symbol . cubicInches, coefficient: Coefficient . cubicInches)
2293
2302
}
2294
2303
}
2295
2304
2296
2305
public class var cubicFeet : UnitVolume {
2297
2306
get {
2298
- return UnitVolume ( symbol: Symbol . cubicFeet, coefficient: Coefficient . cubicFeet)
2307
+ return Unit . stored ( at : . cubicFoot , newUnit : UnitVolume ( symbol: Symbol . cubicFeet, coefficient: Coefficient . cubicFeet, storeIndex : . cubicFoot ) )
2299
2308
}
2300
2309
}
2301
2310
2302
2311
public class var cubicYards : UnitVolume {
2303
2312
get {
2304
- return UnitVolume ( symbol: Symbol . cubicYards, coefficient: Coefficient . cubicYards)
2313
+ return Unit . stored ( at : . cubicYard , newUnit : UnitVolume ( symbol: Symbol . cubicYards, coefficient: Coefficient . cubicYards, storeIndex : . cubicYard ) )
2305
2314
}
2306
2315
}
2307
2316
2308
2317
public class var cubicMiles : UnitVolume {
2309
2318
get {
2310
- return UnitVolume ( symbol: Symbol . cubicMiles, coefficient: Coefficient . cubicMiles)
2319
+ return Unit . stored ( at : . cubicMile , newUnit : UnitVolume ( symbol: Symbol . cubicMiles, coefficient: Coefficient . cubicMiles, storeIndex : . cubicMile ) )
2311
2320
}
2312
2321
}
2313
2322
2314
2323
public class var acreFeet : UnitVolume {
2315
2324
get {
2316
- return UnitVolume ( symbol: Symbol . acreFeet, coefficient: Coefficient . acreFeet)
2325
+ return Unit . stored ( at : . acreFoot , newUnit : UnitVolume ( symbol: Symbol . acreFeet, coefficient: Coefficient . acreFeet, storeIndex : . acreFoot ) )
2317
2326
}
2318
2327
}
2319
2328
2320
2329
public class var bushels : UnitVolume {
2321
2330
get {
2322
- return UnitVolume ( symbol: Symbol . bushels, coefficient: Coefficient . bushels)
2331
+ return Unit . stored ( at : . bushel , newUnit : UnitVolume ( symbol: Symbol . bushels, coefficient: Coefficient . bushels, storeIndex : . bushel ) )
2323
2332
}
2324
2333
}
2325
2334
2326
2335
public class var teaspoons : UnitVolume {
2327
2336
get {
2328
- return UnitVolume ( symbol: Symbol . teaspoons, coefficient: Coefficient . teaspoons)
2337
+ return Unit . stored ( at : . teaspoon , newUnit : UnitVolume ( symbol: Symbol . teaspoons, coefficient: Coefficient . teaspoons, storeIndex : . teaspoon ) )
2329
2338
}
2330
2339
}
2331
2340
2332
2341
public class var tablespoons : UnitVolume {
2333
2342
get {
2334
- return UnitVolume ( symbol: Symbol . tablespoons, coefficient: Coefficient . tablespoons)
2343
+ return Unit . stored ( at : . tablespoon , newUnit : UnitVolume ( symbol: Symbol . tablespoons, coefficient: Coefficient . tablespoons, storeIndex : . tablespoon ) )
2335
2344
}
2336
2345
}
2337
2346
2338
2347
public class var fluidOunces : UnitVolume {
2339
2348
get {
2340
- return UnitVolume ( symbol: Symbol . fluidOunces, coefficient: Coefficient . fluidOunces)
2349
+ return Unit . stored ( at : . fluidOunce , newUnit : UnitVolume ( symbol: Symbol . fluidOunces, coefficient: Coefficient . fluidOunces, storeIndex : . fluidOunce ) )
2341
2350
}
2342
2351
}
2343
2352
2344
2353
public class var cups : UnitVolume {
2345
2354
get {
2346
- return UnitVolume ( symbol: Symbol . cups, coefficient: Coefficient . cups)
2355
+ return Unit . stored ( at : . cup , newUnit : UnitVolume ( symbol: Symbol . cups, coefficient: Coefficient . cups, storeIndex : . cup ) )
2347
2356
}
2348
2357
}
2349
2358
2350
2359
public class var pints : UnitVolume {
2351
2360
get {
2352
- return UnitVolume ( symbol: Symbol . pints, coefficient: Coefficient . pints)
2361
+ return Unit . stored ( at : . pint , newUnit : UnitVolume ( symbol: Symbol . pints, coefficient: Coefficient . pints, storeIndex : . pint ) )
2353
2362
}
2354
2363
}
2355
2364
2356
2365
public class var quarts : UnitVolume {
2357
2366
get {
2358
- return UnitVolume ( symbol: Symbol . quarts, coefficient: Coefficient . quarts)
2367
+ return Unit . stored ( at : . quart , newUnit : UnitVolume ( symbol: Symbol . quarts, coefficient: Coefficient . quarts, storeIndex : . quart ) )
2359
2368
}
2360
2369
}
2361
2370
2362
2371
public class var gallons : UnitVolume {
2363
2372
get {
2364
- return UnitVolume ( symbol: Symbol . gallons, coefficient: Coefficient . gallons)
2373
+ return Unit . stored ( at : . gallon , newUnit : UnitVolume ( symbol: Symbol . gallons, coefficient: Coefficient . gallons, storeIndex : . gallon ) )
2365
2374
}
2366
2375
}
2367
2376
2368
2377
public class var imperialTeaspoons : UnitVolume {
2369
2378
get {
2379
+ return Unit . stored ( at: . gallonImperial, newUnit: UnitVolume ( symbol: Symbol . cubicMeters, coefficient: Coefficient . cubicMeters, storeIndex: . cubicMeter) )
2370
2380
return UnitVolume ( symbol: Symbol . imperialTeaspoons, coefficient: Coefficient . imperialTeaspoons)
2371
2381
}
2372
2382
}
2373
2383
2374
2384
public class var imperialTablespoons : UnitVolume {
2375
2385
get {
2386
+ return Unit . stored ( at: . cubicMeter, newUnit: UnitVolume ( symbol: Symbol . cubicMeters, coefficient: Coefficient . cubicMeters, storeIndex: . cubicMeter) )
2376
2387
return UnitVolume ( symbol: Symbol . imperialTablespoons, coefficient: Coefficient . imperialTablespoons)
2377
2388
}
2378
2389
}
2379
2390
2380
2391
public class var imperialFluidOunces : UnitVolume {
2381
2392
get {
2382
- return UnitVolume ( symbol: Symbol . imperialFluidOunces, coefficient: Coefficient . imperialFluidOunces)
2393
+ return Unit . stored ( at : . fluidOunceImperial , newUnit : UnitVolume ( symbol: Symbol . imperialFluidOunces, coefficient: Coefficient . imperialFluidOunces, storeIndex : . fluidOunceImperial ) )
2383
2394
}
2384
2395
}
2385
2396
2386
2397
public class var imperialPints : UnitVolume {
2387
2398
get {
2388
- return UnitVolume ( symbol: Symbol . imperialPints, coefficient: Coefficient . imperialPints)
2399
+ return Unit . stored ( at : . pintImperial , newUnit : UnitVolume ( symbol: Symbol . imperialPints, coefficient: Coefficient . imperialPints, storeIndex : . pintImperial ) )
2389
2400
}
2390
2401
}
2391
2402
2392
2403
public class var imperialQuarts : UnitVolume {
2393
2404
get {
2394
- return UnitVolume ( symbol: Symbol . imperialQuarts, coefficient: Coefficient . imperialQuarts)
2405
+ return Unit . stored ( at : . quartImperial , newUnit : UnitVolume ( symbol: Symbol . imperialQuarts, coefficient: Coefficient . imperialQuarts, storeIndex : . quartImperial ) )
2395
2406
}
2396
2407
}
2397
2408
2398
2409
public class var imperialGallons : UnitVolume {
2399
2410
get {
2400
- return UnitVolume ( symbol: Symbol . imperialGallons, coefficient: Coefficient . imperialGallons)
2411
+ return Unit . stored ( at : . gallonImperial , newUnit : UnitVolume ( symbol: Symbol . imperialGallons, coefficient: Coefficient . imperialGallons, storeIndex : . gallonImperial ) )
2401
2412
}
2402
2413
}
2403
2414
2404
2415
public class var metricCups : UnitVolume {
2405
2416
get {
2406
- return UnitVolume ( symbol: Symbol . metricCups, coefficient: Coefficient . metricCups)
2417
+ return Unit . stored ( at : . cupMetric , newUnit : UnitVolume ( symbol: Symbol . metricCups, coefficient: Coefficient . metricCups, storeIndex : . cupMetric ) )
2407
2418
}
2408
2419
}
2409
2420
0 commit comments