From 6da9c52a011302dd4bf9c4ad7714ad0db738a98e Mon Sep 17 00:00:00 2001
From: Gordon Brander <gordonbrander@users.noreply.github.com>
Date: Mon, 1 Nov 2021 11:47:00 -0700
Subject: [PATCH] Subtext recursive descent parser (#3)

Re-implementing Subtext via recursive descent.

- Two passes instead of 4x passes with Regexp
- Gives us a DOM to work with so we can extract titles, etc, later on
---
 .../Shared/Components/AppView.swift           |   6 +-
 .../Subconscious/Shared/Library/Subtext.swift | 211 ++++++++++++++++++
 .../Shared/Library/Subtext4.swift             | 130 -----------
 xcode/Subconscious/Shared/Library/Tape.swift  | 134 +++++++++++
 .../Subconscious.xcodeproj/project.pbxproj    |  24 +-
 5 files changed, 363 insertions(+), 142 deletions(-)
 create mode 100644 xcode/Subconscious/Shared/Library/Subtext.swift
 delete mode 100644 xcode/Subconscious/Shared/Library/Subtext4.swift
 create mode 100644 xcode/Subconscious/Shared/Library/Tape.swift

diff --git a/xcode/Subconscious/Shared/Components/AppView.swift b/xcode/Subconscious/Shared/Components/AppView.swift
index e85c7540..c812ab6c 100644
--- a/xcode/Subconscious/Shared/Components/AppView.swift
+++ b/xcode/Subconscious/Shared/Components/AppView.swift
@@ -111,10 +111,8 @@ struct AppModel: Updatable {
         markup: String,
         selection: NSRange
     ) -> NSAttributedString {
-        Subtext4(
-            markup: markup,
-            range: selection
-        ).renderMarkup(url: Slashlink.slashlinkToURLString)
+        Subtext(markup: markup)
+            .renderMarkup(url: Slashlink.slashlinkToURLString)
     }
 
     //  MARK: Update
diff --git a/xcode/Subconscious/Shared/Library/Subtext.swift b/xcode/Subconscious/Shared/Library/Subtext.swift
new file mode 100644
index 00000000..c4a2e0a8
--- /dev/null
+++ b/xcode/Subconscious/Shared/Library/Subtext.swift
@@ -0,0 +1,211 @@
+//
+//  Subtext5.swift
+//  Subconscious
+//
+//  Created by Gordon Brander on 10/25/21.
+//
+
+import Foundation
+import SwiftUI
+
+struct Subtext {
+    enum Block {
+        case text(span: Substring, inline: [Inline])
+        case list(span: Substring, inline: [Inline])
+        case quote(span: Substring, inline: [Inline])
+        case heading(span: Substring)
+
+        /// Returns the body of a block, without the leading sigil
+        func body() -> Substring {
+            switch self {
+            case .text(let span, _):
+                return span
+            case .quote(let span, _), .list(let span, _), .heading(let span):
+                return span.dropFirst()
+            }
+        }
+    }
+
+    struct Link {
+        var span: Substring
+    }
+
+    struct Bracketlink {
+        var span: Substring
+
+        func body() -> Substring {
+            span.dropFirst().dropLast()
+        }
+    }
+
+    struct Slashlink {
+        var span: Substring
+    }
+
+    enum Inline {
+        case link(Link)
+        case bracketlink(Bracketlink)
+        case slashlink(Slashlink)
+    }
+
+    /// Consume a well-formed bracket link, or else backtrack
+    private static func consumeBracketLink(tape: inout Tape<Substring>) -> Substring? {
+        tape.save()
+        while !tape.isExhausted() {
+            if tape.consumeMatch(" ") {
+                tape.backtrack()
+                return nil
+            } else if tape.consumeMatch(">") {
+                return tape.cut()
+            } else {
+                tape.consume()
+            }
+        }
+        tape.backtrack()
+        return nil
+    }
+
+    private static func consumeInlineWordBoundaryForm(
+        tape: inout Tape<Substring>
+    ) -> Inline? {
+        if tape.consumeMatch("<") {
+            if let link = consumeBracketLink(tape: &tape) {
+                return .bracketlink(Bracketlink(span: link))
+            } else {
+                return nil
+            }
+        } else if tape.consumeMatch("https://") {
+            tape.consumeUntil(" ")
+            return .link(Link(span: tape.cut()))
+        } else if tape.consumeMatch("http://") {
+            tape.consumeUntil(" ")
+            return .link(Link(span: tape.cut()))
+        } else if tape.consumeMatch("/") {
+            tape.consumeUntil(" ")
+            return .slashlink(Slashlink(span: tape.cut()))
+        } else {
+            return nil
+        }
+    }
+
+    private static func parseInline(tape: inout Tape<Substring>) -> [Inline] {
+        var inlines: [Inline] = []
+
+        /// Capture word-boundary-delimited forms at beginning of line.
+        tape.start()
+        if let inline = consumeInlineWordBoundaryForm(tape: &tape) {
+            inlines.append(inline)
+        }
+
+        while !tape.isExhausted() {
+            tape.start()
+            let curr = tape.consume()
+            /// Capture word-boundary-delimited forms after space
+            if curr == " " {
+                tape.start()
+                if let inline = consumeInlineWordBoundaryForm(tape: &tape) {
+                    inlines.append(inline)
+                }
+            }
+        }
+
+        return inlines
+    }
+
+    private static func parseLine(_ line: Substring) -> Block {
+        if line.hasPrefix("#") {
+            return Block.heading(span: line)
+        } else if line.hasPrefix(">") {
+            var tape = Tape(line)
+            // Discard prefix
+            tape.consume()
+            let inline = parseInline(tape: &tape)
+            return Block.quote(span: line, inline: inline)
+        } else if line.hasPrefix("-") {
+            var tape = Tape(line)
+            // Discard prefix
+            tape.consume()
+            let inline = parseInline(tape: &tape)
+            return Block.list(span: line, inline: inline)
+        } else {
+            var tape = Tape(line)
+            let inline = parseInline(tape: &tape)
+            return Block.list(span: line, inline: inline)
+        }
+    }
+
+    let base: String
+    let blocks: [Block]
+
+    init(markup: String) {
+        self.base = markup
+        self.blocks = markup.split(
+            omittingEmptySubsequences: false,
+            whereSeparator: \.isNewline
+        ).map(Self.parseLine)
+    }
+}
+
+extension Subtext {
+    /// Render markup verbatim with syntax highlighting and links
+    func renderMarkup(url: (String) -> String?) -> NSAttributedString {
+        let attributedString = NSMutableAttributedString(string: base)
+        // Set default styles for entire string
+        attributedString.addAttribute(
+            .font,
+            value: UIFont.appText,
+            range: NSRange(base.startIndex..<base.endIndex, in: base)
+        )
+
+        for block in blocks {
+            switch block {
+            case let .heading(line):
+                let nsRange = NSRange(line.range, in: attributedString.string)
+                attributedString.addAttribute(
+                    .font,
+                    value: UIFont.appTextBold,
+                    range: nsRange
+                )
+            case
+                .list(_, let inline),
+                .quote(_, let inline),
+                .text(_, let inline):
+                for inline in inline {
+                    switch inline {
+                    case let .link(link):
+                        attributedString.addAttribute(
+                            .link,
+                            value: link.span,
+                            range: NSRange(
+                                link.span.range,
+                                in: attributedString.string
+                            )
+                        )
+                    case let .bracketlink(bracketlink):
+                        attributedString.addAttribute(
+                            .link,
+                            value: bracketlink.body(),
+                            range: NSRange(
+                                bracketlink.body().range,
+                                in: attributedString.string
+                            )
+                        )
+                    case let .slashlink(slashlink):
+                        if let url = url(String(slashlink.span)) {
+                            attributedString.addAttribute(
+                                .link,
+                                value: url,
+                                range: NSRange(
+                                    slashlink.span.range,
+                                    in: attributedString.string
+                                )
+                            )
+                        }
+                    }
+                }
+            }
+        }
+
+        return attributedString
+    }
+}
diff --git a/xcode/Subconscious/Shared/Library/Subtext4.swift b/xcode/Subconscious/Shared/Library/Subtext4.swift
deleted file mode 100644
index 3543d404..00000000
--- a/xcode/Subconscious/Shared/Library/Subtext4.swift
+++ /dev/null
@@ -1,130 +0,0 @@
-//
-//  Subtext4.swift
-//  Subconscious
-//
-//  Created by Gordon Brander on 9/29/21.
-//
-
-import Foundation
-import SwiftUI
-
-struct Subtext4: Equatable {
-    static let heading = try! NSRegularExpression(
-        pattern: #"^#.*$"#,
-        options: .anchorsMatchLines
-    )
-
-    /// Slashlink pattern
-    static let slashlink = try! NSRegularExpression(
-        pattern: #"(^|\s)(/[a-zA-Z0-9/\-\_]+)"#,
-        options: .anchorsMatchLines
-    )
-
-    static let barelink = try! NSRegularExpression(
-        pattern: #"(^|\s)(https?://[^\s>]+)[\.,;]?"#
-    )
-
-    static let bracketlink = try! NSRegularExpression(
-        pattern: #"<([^>\s]+)>"#
-    )
-
-    /// Static property for empty document
-    static let empty = Self(markup: "")
-
-    let base: String
-    let headings: Set<NSRange>
-    let slashlinks: Set<NSRange>
-    let links: Set<NSRange>
-
-    init(
-        markup: String,
-        cursor: String.Index? = nil
-    ) {
-        let nsRange = NSRange(markup.startIndex..<markup.endIndex, in: markup)
-        self.base = markup
-        let headings = Self.heading.matches(
-            in: markup,
-            range: nsRange
-        ).map({ result in
-            result.range
-        })
-        self.headings = Set(headings)
-        let slashlinks = Self.slashlink.matches(
-            in: markup,
-            range: nsRange
-        ).map({ result in
-            result.range(at: 2)
-        })
-        self.slashlinks = Set(slashlinks)
-
-        var links = Self.barelink.matches(
-            in: markup,
-            range: nsRange
-        ).map({ result in
-            result.range(at: 2)
-        })
-        let bracketlinks = Self.bracketlink.matches(
-            in: markup,
-            range: nsRange
-        ).map({ result in
-            result.range(at: 1)
-        })
-        links.append(contentsOf: bracketlinks)
-        self.links = Set(links)
-    }
-
-    init(
-        markup: String,
-        range: NSRange
-    ) {
-        let cursor = Range(range, in: markup)
-        self.init(
-            markup: markup,
-            cursor: cursor?.lowerBound
-        )
-    }
-
-    /// Render markup verbatim with syntax highlighting and links
-    func renderMarkup(url: (String) -> String?) -> NSAttributedString {
-        let attributedString = NSMutableAttributedString(string: base)
-        // Set default styles for entire string
-        attributedString.addAttribute(
-            .font,
-            value: UIFont.appText,
-            range: NSRange(base.startIndex..<base.endIndex, in: base)
-        )
-        for nsRange in headings {
-            attributedString.addAttribute(
-                .font,
-                value: UIFont.appTextBold,
-                range: nsRange
-            )
-        }
-        for nsRange in slashlinks {
-            if
-                let text = Range(nsRange, in: base).map({ range in
-                    base[range]
-                }),
-                let url = url(String(text))
-            {
-                attributedString.addAttribute(
-                    .link,
-                    value: url,
-                    range: nsRange
-                )
-            }
-        }
-        for nsRange in links {
-            if let url = Range(nsRange, in: base).map({ range in
-                base[range]
-            }) {
-                attributedString.addAttribute(
-                    .link,
-                    value: url,
-                    range: nsRange
-                )
-            }
-        }
-        return attributedString
-    }
-}
diff --git a/xcode/Subconscious/Shared/Library/Tape.swift b/xcode/Subconscious/Shared/Library/Tape.swift
new file mode 100644
index 00000000..a986bf02
--- /dev/null
+++ b/xcode/Subconscious/Shared/Library/Tape.swift
@@ -0,0 +1,134 @@
+//
+//  Tape.swift
+//  Subconscious
+//
+//  Created by Gordon Brander on 10/25/21.
+//
+
+import Foundation
+
+struct Tape<T>
+where T: Collection,
+      T.SubSequence: Equatable
+{
+    private(set) var savedIndex: T.Index
+    private(set) var startIndex: T.Index
+    private(set) var currentIndex: T.Index
+    let collection: T
+
+    init(_ collection: T) {
+        self.collection = collection
+        self.startIndex = collection.startIndex
+        self.currentIndex = collection.startIndex
+        self.savedIndex = collection.startIndex
+    }
+
+    /// Get current subsequence
+    var subsequence: T.SubSequence {
+        collection[startIndex..<currentIndex]
+    }
+
+    func isExhausted() -> Bool {
+        return self.currentIndex >= self.collection.endIndex
+    }
+
+    /// Sets the start of the current range to the current index
+    /// Generally called at the beginning of each loop.
+    mutating func start() {
+        startIndex = currentIndex
+    }
+
+    /// Get current subsequence, and advance start index to current index.
+    /// Conceptually like snipping off a piece of tape so that you have the piece up until the cut,
+    /// and the cut becomes the new start of the tape.
+    mutating func cut() -> T.SubSequence {
+        let subsequence = collection[startIndex..<currentIndex]
+        startIndex = currentIndex
+        return subsequence
+    }
+    
+    mutating func save() {
+        savedIndex = currentIndex
+    }
+
+    mutating func backtrack() {
+        startIndex = savedIndex
+        currentIndex = savedIndex
+    }
+
+    /// Move forward one element
+    @discardableResult mutating func consume() -> T.SubSequence {
+        let subsequence = collection[currentIndex...currentIndex]
+        self.collection.formIndex(
+            after: &self.currentIndex
+        )
+        return subsequence
+    }
+
+    /// Peek forward, and consume if match
+    mutating func consumeMatch(_ subsequence: T.SubSequence) -> Bool {
+        if let endIndex = collection.index(
+            currentIndex,
+            offsetBy: subsequence.count,
+            limitedBy: collection.endIndex
+        ) {
+            if collection[currentIndex..<endIndex] == subsequence {
+                self.currentIndex = endIndex
+                return true
+            }
+        }
+        return false
+    }
+
+    /// Consume up to, but not including some delimiter.
+    /// Returns subsequence.
+    @discardableResult mutating func consumeUntil(
+        _ delimiter: T.SubSequence,
+        includeDelimiter: Bool = false
+    ) -> T.SubSequence {
+        while !self.isExhausted() {
+            if self.peek(next: delimiter.count) == delimiter {
+                if includeDelimiter {
+                    self.consume()
+                }
+                return self.subsequence
+            } else {
+                self.consume()
+            }
+        }
+        return self.subsequence
+    }
+
+    /// Get a single-item SubSequence offset by `offset` of the `currentStartIndex`.
+    /// Returns a single-item SubSequence, or nil if `offset` is invalid.
+    func peek(_ offset: Int = 0) -> T.SubSequence? {
+        if
+            let startIndex = collection.index(
+                currentIndex,
+                offsetBy: offset,
+                limitedBy: collection.endIndex
+            ),
+            let endIndex = collection.index(
+                currentIndex,
+                offsetBy: offset + 1,
+                limitedBy: collection.endIndex
+            )
+        {
+            return collection[startIndex..<endIndex]
+        }
+        return nil
+    }
+
+    /// Peek forward by `offset`, returning a subsequence from `position` through `offset`,
+    /// or from `position` through `endIndex`, whichever is smaller..
+    func peek(next offset: Int) -> T.SubSequence? {
+        if let endIndex = collection.index(
+            currentIndex,
+            offsetBy: offset,
+            limitedBy: collection.endIndex
+        ) {
+            return collection[currentIndex..<endIndex]
+        }
+        return nil
+    }
+}
diff --git a/xcode/Subconscious/Subconscious.xcodeproj/project.pbxproj b/xcode/Subconscious/Subconscious.xcodeproj/project.pbxproj
index 0d10561f..956249c8 100644
--- a/xcode/Subconscious/Subconscious.xcodeproj/project.pbxproj
+++ b/xcode/Subconscious/Subconscious.xcodeproj/project.pbxproj
@@ -9,6 +9,10 @@
 /* Begin PBXBuildFile section */
 		B8082AAA26F3B43A004B10BB /* Store.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8082AA926F3B43A004B10BB /* Store.swift */; };
 		B8082AAB26F3B43A004B10BB /* Store.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8082AA926F3B43A004B10BB /* Store.swift */; };
+		B81A535C27275138001A6268 /* Tape.swift in Sources */ = {isa = PBXBuildFile; fileRef = B81A535B27275138001A6268 /* Tape.swift */; };
+		B81A535D27275138001A6268 /* Tape.swift in Sources */ = {isa = PBXBuildFile; fileRef = B81A535B27275138001A6268 /* Tape.swift */; };
+		B81A535F272751EE001A6268 /* Subtext.swift in Sources */ = {isa = PBXBuildFile; fileRef = B81A535E272751EE001A6268 /* Subtext.swift */; };
+		B81A5360272751EE001A6268 /* Subtext.swift in Sources */ = {isa = PBXBuildFile; fileRef = B81A535E272751EE001A6268 /* Subtext.swift */; };
 		B81EBB062702533100B87594 /* RowButtonStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = B81EBB052702533100B87594 /* RowButtonStyle.swift */; };
 		B81EBB072702533100B87594 /* RowButtonStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = B81EBB052702533100B87594 /* RowButtonStyle.swift */; };
 		B81EBB0927025C1500B87594 /* TranscludeButtonStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = B81EBB0827025C1500B87594 /* TranscludeButtonStyle.swift */; };
@@ -37,8 +41,6 @@
 		B82C3A7426F6B5B200833CC8 /* OrdereredDictionaryUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = B82C3A7226F6B5B200833CC8 /* OrdereredDictionaryUtilities.swift */; };
 		B82C3A7626F6B5BF00833CC8 /* StringUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = B82C3A7526F6B5BF00833CC8 /* StringUtilities.swift */; };
 		B82C3A7726F6B5BF00833CC8 /* StringUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = B82C3A7526F6B5BF00833CC8 /* StringUtilities.swift */; };
-		B845FCC527051BF7001ECE4F /* Subtext4.swift in Sources */ = {isa = PBXBuildFile; fileRef = B845FCC427051BF7001ECE4F /* Subtext4.swift */; };
-		B845FCC627051BF7001ECE4F /* Subtext4.swift in Sources */ = {isa = PBXBuildFile; fileRef = B845FCC427051BF7001ECE4F /* Subtext4.swift */; };
 		B864598726F97B81007969E3 /* KeyboardToolbarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B864598626F97B81007969E3 /* KeyboardToolbarView.swift */; };
 		B864598826F97B81007969E3 /* KeyboardToolbarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B864598626F97B81007969E3 /* KeyboardToolbarView.swift */; };
 		B878C9822703F47A0042DF72 /* SuggestionLabelView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B878C9812703F47A0042DF72 /* SuggestionLabelView.swift */; };
@@ -100,6 +102,8 @@
 
 /* Begin PBXFileReference section */
 		B8082AA926F3B43A004B10BB /* Store.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Store.swift; sourceTree = "<group>"; };
+		B81A535B27275138001A6268 /* Tape.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tape.swift; sourceTree = "<group>"; };
+		B81A535E272751EE001A6268 /* Subtext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Subtext.swift; sourceTree = "<group>"; };
 		B81EBB052702533100B87594 /* RowButtonStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RowButtonStyle.swift; sourceTree = "<group>"; };
 		B81EBB0827025C1500B87594 /* TranscludeButtonStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TranscludeButtonStyle.swift; sourceTree = "<group>"; };
 		B824FDCD26FA662200B81BBD /* TextFile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextFile.swift; sourceTree = "<group>"; };
@@ -113,7 +117,6 @@
 		B82C3A6426F5796300833CC8 /* OptionalUtilities.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OptionalUtilities.swift; sourceTree = "<group>"; };
 		B82C3A7226F6B5B200833CC8 /* OrdereredDictionaryUtilities.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrdereredDictionaryUtilities.swift; sourceTree = "<group>"; };
 		B82C3A7526F6B5BF00833CC8 /* StringUtilities.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StringUtilities.swift; sourceTree = "<group>"; };
-		B845FCC427051BF7001ECE4F /* Subtext4.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Subtext4.swift; sourceTree = "<group>"; };
 		B864598626F97B81007969E3 /* KeyboardToolbarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardToolbarView.swift; sourceTree = "<group>"; };
 		B878C9812703F47A0042DF72 /* SuggestionLabelView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SuggestionLabelView.swift; sourceTree = "<group>"; };
 		B8879E9F26F90C5100A0B4FF /* AppNavigationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppNavigationView.swift; sourceTree = "<group>"; };
@@ -292,16 +295,17 @@
 				B82C3A7226F6B5B200833CC8 /* OrdereredDictionaryUtilities.swift */,
 				B8EC568126F415C800AC64E5 /* PublisherBag.swift */,
 				B824FDD026FA98F300B81BBD /* ResultSet.swift */,
+				B8879EA526F9348600A0B4FF /* Slashlink.swift */,
 				B8EC568826F4204F00AC64E5 /* SQLite3Database.swift */,
 				B8EC568B26F4206400AC64E5 /* SQLite3Migrations.swift */,
 				B8082AA926F3B43A004B10BB /* Store.swift */,
+				B8E63EA5270F9DD000545719 /* StringRandomAlphanumeric.swift */,
 				B82C3A7526F6B5BF00833CC8 /* StringUtilities.swift */,
-				B845FCC427051BF7001ECE4F /* Subtext4.swift */,
-				B8879EA526F9348600A0B4FF /* Slashlink.swift */,
+				B81A535E272751EE001A6268 /* Subtext.swift */,
+				B81A535B27275138001A6268 /* Tape.swift */,
 				B824FDCD26FA662200B81BBD /* TextFile.swift */,
 				B824FDD326FAB1BC00B81BBD /* Truncate.swift */,
 				B82C3A6126F576FB00833CC8 /* URLUtilities.swift */,
-				B8E63EA5270F9DD000545719 /* StringRandomAlphanumeric.swift */,
 			);
 			path = Library;
 			sourceTree = "<group>";
@@ -489,6 +493,7 @@
 				B8EDB806270365BA00C63CA8 /* PseudoKeyboardToolbarView.swift in Sources */,
 				B81EBB0927025C1500B87594 /* TranscludeButtonStyle.swift in Sources */,
 				B82C3A6226F576FC00833CC8 /* URLUtilities.swift in Sources */,
+				B81A535F272751EE001A6268 /* Subtext.swift in Sources */,
 				B81EBB062702533100B87594 /* RowButtonStyle.swift in Sources */,
 				B8E63EA6270F9DD000545719 /* StringRandomAlphanumeric.swift in Sources */,
 				B8879EA926F93EBF00A0B4FF /* BacklinksView.swift in Sources */,
@@ -498,11 +503,11 @@
 				B8879EA626F9348600A0B4FF /* Slashlink.swift in Sources */,
 				B8879EAC26F944DA00A0B4FF /* DetailView.swift in Sources */,
 				B82C3A7626F6B5BF00833CC8 /* StringUtilities.swift in Sources */,
-				B845FCC527051BF7001ECE4F /* Subtext4.swift in Sources */,
 				B8EB2A1F26F27797006E97C3 /* SubconsciousApp.swift in Sources */,
 				B864598726F97B81007969E3 /* KeyboardToolbarView.swift in Sources */,
 				B824FDD126FA98F300B81BBD /* ResultSet.swift in Sources */,
 				B82C3A5626F529EF00833CC8 /* CombineUtilities.swift in Sources */,
+				B81A535C27275138001A6268 /* Tape.swift in Sources */,
 				B824FDCE26FA662200B81BBD /* TextFile.swift in Sources */,
 				B8EC568626F41A3C00AC64E5 /* SearchbarRepresentable.swift in Sources */,
 				B8EC568226F415C800AC64E5 /* PublisherBag.swift in Sources */,
@@ -537,8 +542,8 @@
 				B8879EA726F9348600A0B4FF /* Slashlink.swift in Sources */,
 				B8879EAD26F944DA00A0B4FF /* DetailView.swift in Sources */,
 				B82C3A7726F6B5BF00833CC8 /* StringUtilities.swift in Sources */,
-				B845FCC627051BF7001ECE4F /* Subtext4.swift in Sources */,
 				B8EB2A2026F27797006E97C3 /* SubconsciousApp.swift in Sources */,
+				B81A535D27275138001A6268 /* Tape.swift in Sources */,
 				B864598826F97B81007969E3 /* KeyboardToolbarView.swift in Sources */,
 				B824FDD226FA98F300B81BBD /* ResultSet.swift in Sources */,
 				B82C3A5726F529EF00833CC8 /* CombineUtilities.swift in Sources */,
@@ -546,6 +551,7 @@
 				B8EC568726F41A3C00AC64E5 /* SearchbarRepresentable.swift in Sources */,
 				B8EC568326F415C800AC64E5 /* PublisherBag.swift in Sources */,
 				B8EC569026F4233B00AC64E5 /* AppEnvironment.swift in Sources */,
+				B81A5360272751EE001A6268 /* Subtext.swift in Sources */,
 				B82C3A7426F6B5B200833CC8 /* OrdereredDictionaryUtilities.swift in Sources */,
 				B82C3A5426F528B000833CC8 /* DatabaseService.swift in Sources */,
 				B878C9832703F47A0042DF72 /* SuggestionLabelView.swift in Sources */,
@@ -776,6 +782,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = macOS/macOS.entitlements;
+				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1;
@@ -805,6 +812,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = macOS/macOS.entitlements;
+				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1;