From f82c067544e8ad2dc8ee0c78f65faeb03205b806 Mon Sep 17 00:00:00 2001 From: Jon Reid Date: Tue, 7 Dec 2021 21:21:09 -0800 Subject: [PATCH 1/3] Swift: Apply AppCode inspection "unnecessary parentheses" --- swift/Sources/GildedRose/GildedRose.swift | 32 +++++++++++------------ swift/Sources/GildedRoseApp/main.swift | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/swift/Sources/GildedRose/GildedRose.swift b/swift/Sources/GildedRose/GildedRose.swift index 024d9870..2e1cf4d2 100644 --- a/swift/Sources/GildedRose/GildedRose.swift +++ b/swift/Sources/GildedRose/GildedRose.swift @@ -7,25 +7,25 @@ public class GildedRose { public func updateQuality() { for i in 0 ..< items.count { - if (items[i].name != "Aged Brie" && items[i].name != "Backstage passes to a TAFKAL80ETC concert") { - if (items[i].quality > 0) { - if (items[i].name != "Sulfuras, Hand of Ragnaros") { + if items[i].name != "Aged Brie" && items[i].name != "Backstage passes to a TAFKAL80ETC concert" { + if items[i].quality > 0 { + if items[i].name != "Sulfuras, Hand of Ragnaros" { items[i].quality = items[i].quality - 1 } } } else { - if (items[i].quality < 50) { + if items[i].quality < 50 { items[i].quality = items[i].quality + 1 - if (items[i].name == "Backstage passes to a TAFKAL80ETC concert") { - if (items[i].sellIn < 11) { - if (items[i].quality < 50) { + if items[i].name == "Backstage passes to a TAFKAL80ETC concert" { + if items[i].sellIn < 11 { + if items[i].quality < 50 { items[i].quality = items[i].quality + 1 } } - if (items[i].sellIn < 6) { - if (items[i].quality < 50) { + if items[i].sellIn < 6 { + if items[i].quality < 50 { items[i].quality = items[i].quality + 1 } } @@ -33,15 +33,15 @@ public class GildedRose { } } - if (items[i].name != "Sulfuras, Hand of Ragnaros") { + if items[i].name != "Sulfuras, Hand of Ragnaros" { items[i].sellIn = items[i].sellIn - 1 } - if (items[i].sellIn < 0) { - if (items[i].name != "Aged Brie") { - if (items[i].name != "Backstage passes to a TAFKAL80ETC concert") { - if (items[i].quality > 0) { - if (items[i].name != "Sulfuras, Hand of Ragnaros") { + if items[i].sellIn < 0 { + if items[i].name != "Aged Brie" { + if items[i].name != "Backstage passes to a TAFKAL80ETC concert" { + if items[i].quality > 0 { + if items[i].name != "Sulfuras, Hand of Ragnaros" { items[i].quality = items[i].quality - 1 } } @@ -49,7 +49,7 @@ public class GildedRose { items[i].quality = items[i].quality - items[i].quality } } else { - if (items[i].quality < 50) { + if items[i].quality < 50 { items[i].quality = items[i].quality + 1 } } diff --git a/swift/Sources/GildedRoseApp/main.swift b/swift/Sources/GildedRoseApp/main.swift index 8b39590f..78618ee4 100644 --- a/swift/Sources/GildedRoseApp/main.swift +++ b/swift/Sources/GildedRoseApp/main.swift @@ -15,7 +15,7 @@ let items = [ let app = GildedRose(items: items); var days = 2; -if (CommandLine.argc > 1) { +if CommandLine.argc > 1 { days = Int(CommandLine.arguments[1])! + 1 } From 7c615c077fd1ca6b0d27ec252cedc07703f51d22 Mon Sep 17 00:00:00 2001 From: Jon Reid Date: Tue, 7 Dec 2021 21:23:35 -0800 Subject: [PATCH 2/3] Swift: Apply AppCode inspection "unnecessary self" --- swift/Sources/GildedRose/Item.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swift/Sources/GildedRose/Item.swift b/swift/Sources/GildedRose/Item.swift index dbd81b12..f4121c2c 100644 --- a/swift/Sources/GildedRose/Item.swift +++ b/swift/Sources/GildedRose/Item.swift @@ -12,6 +12,6 @@ public class Item { extension Item: CustomStringConvertible { public var description: String { - return self.name + ", " + String(self.sellIn) + ", " + String(self.quality); + return name + ", " + String(sellIn) + ", " + String(quality); } } From dc09a06cda9405bc4696b723f47ce9597bd5fc61 Mon Sep 17 00:00:00 2001 From: Jon Reid Date: Tue, 7 Dec 2021 21:24:21 -0800 Subject: [PATCH 3/3] Swift: Apply AppCode inspection "redundant return" --- swift/Sources/GildedRose/Item.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swift/Sources/GildedRose/Item.swift b/swift/Sources/GildedRose/Item.swift index f4121c2c..d579d010 100644 --- a/swift/Sources/GildedRose/Item.swift +++ b/swift/Sources/GildedRose/Item.swift @@ -12,6 +12,6 @@ public class Item { extension Item: CustomStringConvertible { public var description: String { - return name + ", " + String(sellIn) + ", " + String(quality); + name + ", " + String(sellIn) + ", " + String(quality); } }