more range renames

Author: wickwirew

Sources/Compiler/Compiler.swift

@@ -51,7 +51,7 @@ public struct Compiler {
 
         for stmtSyntax in stmtSyntaxes {
             if !stmtSyntax.accept(visitor: &validator) {
-                diagnostics.add(.illegalStatement(in: context, at: stmtSyntax.range))
+                diagnostics.add(.illegalStatement(in: context, at: stmtSyntax.location))
             }
 
             guard let (stmt, diags) = stmtSyntax.accept(visitor: &compiler) else { continue }

Sources/Compiler/Diagnostic.swift

@@ -7,7 +7,7 @@
 
 public struct Diagnostic: Error {
     public let message: String
-    public let range: SourceLocation
+    public let location: SourceLocation
     public let suggestion: Suggestion?
 
     public enum Suggestion: Sendable {
@@ -17,21 +17,21 @@ public struct Diagnostic: Error {
 
     public init(
         _ message: String,
-        at range: SourceLocation,
+        at location: SourceLocation,
         suggestion: Suggestion? = nil
     ) {
         self.message = message
-        self.range = range
+        self.location = location
         self.suggestion = suggestion
     }
 
     init(
         expected: TypeNameSyntax,
         got actual: TypeNameSyntax,
-        at range: SourceLocation
+        at location: SourceLocation
     ) {
         self.message = "Incorrect type, expected '\(expected.name)' got '\(actual.name)'"
-        self.range = range
+        self.location = location
         self.suggestion = .replace(expected.name.description)
     }
 
@@ -45,84 +45,84 @@ extension Diagnostic {
     static func incorrectType(
         _ actual: TypeNameSyntax,
         expected: TypeNameSyntax,
-        at range: SourceLocation
+        at location: SourceLocation
     ) -> Diagnostic {
         Diagnostic(
             "Incorrect type, expected '\(expected.name)' got '\(actual.name)'",
-            at: range,
+            at: location,
             suggestion: .replace(expected.name.description)
         )
     }
 
     static func expectedNumber(
         _ actual: TypeNameSyntax,
-        at range: SourceLocation
+        at location: SourceLocation
     ) -> Diagnostic {
         Diagnostic(
             "Incorrect type, expected number got '\(actual.name)'",
-            at: range
+            at: location
         )
     }
 
     static func ambiguous(
         _ identifier: Substring,
-        at range: SourceLocation
+        at location: SourceLocation
     ) -> Diagnostic {
         Diagnostic(
             "'\(identifier)' is ambigious in the current context",
-            at: range
+            at: location
         )
     }
 
     static func tableDoesNotExist(_ identifier: IdentifierSyntax) -> Diagnostic {
         Diagnostic(
             "Table '\(identifier)' does not exist",
-            at: identifier.range
+            at: identifier.location
         )
     }
 
     static func tableAlreadyExists(_ identifier: IdentifierSyntax) -> Diagnostic {
         Diagnostic(
             "Table '\(identifier)' already exists",
-            at: identifier.range
+            at: identifier.location
         )
     }
 
     static func columnDoesNotExist(_ identifier: IdentifierSyntax) -> Diagnostic {
         Diagnostic(
             "Column '\(identifier)' does not exist",
-            at: identifier.range
+            at: identifier.location
         )
     }
 
-    static func nameRequired(at range: SourceLocation) -> Diagnostic {
+    static func nameRequired(at location: SourceLocation) -> Diagnostic {
         return Diagnostic(
             "Name required, add via 'AS'",
-            at: range,
+            at: location,
             suggestion: .append("AS \(Diagnostic.placeholder(name: "name"))")
         )
     }
 
     static func unexpectedToken(
         of kind: Token.Kind,
         expected: Token.Kind? = nil,
-        at range: SourceLocation
+        at location: SourceLocation
     ) -> Diagnostic {
         if let expected {
-            return Diagnostic("Unexpected token \(kind), expected '\(expected)'", at: range)
+            return Diagnostic("Unexpected token \(kind), expected '\(expected)'", at: location)
         } else {
-            return Diagnostic("Unexpected token \(kind)", at: range)
+            return Diagnostic("Unexpected token \(kind)", at: location)
         }
     }
 
     static func unexpected(token: Token) -> Diagnostic {
-        return unexpectedToken(of: token.kind, at: token.range)
+        return unexpectedToken(of: token.kind, at: token.location)
     }
 
     static func unexpectedToken(
         of kind: Token.Kind,
         expectedAnyOf expected: Token.Kind...,
-        at range: SourceLocation
+        at location: SourceLocation
     ) -> Diagnostic {
         var expectedMessage = ""
         for (index, kind) in expected.enumerated() {
@@ -135,28 +135,28 @@ extension Diagnostic {
             expectedMessage += "'\(kind)'"
         }
 
-        return Diagnostic("Unexpected token \(kind), expected any of \(expected)", at: range)
+        return Diagnostic("Unexpected token \(kind), expected any of \(expected)", at: location)
     }
 
     static func illegalStatement(
         in context: String,
-        at range: SourceLocation
+        at location: SourceLocation
     ) -> Diagnostic {
-        return Diagnostic("Statement is not allowed in \(context)", at: range)
+        return Diagnostic("Statement is not allowed in \(context)", at: location)
     }
 
     static func alreadyHasPrimaryKey(
         _ table: Substring,
-        at range: SourceLocation
+        at location: SourceLocation
     ) -> Diagnostic {
-        return Diagnostic("Table '\(table)' already has a primary key", at: range)
+        return Diagnostic("Table '\(table)' already has a primary key", at: location)
     }
 
     static func unableToUnify(
         _ t1: Type,
         with t2: Type,
-        at range: SourceLocation
+        at location: SourceLocation
     ) -> Diagnostic {
-        return Diagnostic("Unable to unify types '\(t1)' and '\(t2)'", at: range)
+        return Diagnostic("Unable to unify types '\(t1)' and '\(t2)'", at: location)
     }
 }

Sources/Compiler/DiagnosticReporter.swift

@@ -13,7 +13,7 @@ public struct StdoutDiagnosticReporter: DiagnosticReporter {
     public init() {}
 
     public func report(diagnostic: Diagnostic, source: String, fileName: String) {
-        let source = source[diagnostic.range.range]
+        let source = source[diagnostic.location.range]
 
         print("""
         \(source)

Sources/Compiler/Diagnostics.swift

@@ -40,12 +40,12 @@ public struct Diagnostics {
 
     public mutating func trying<Output>(
         _ action: () throws -> Output,
-        at range: SourceLocation
+        at location: SourceLocation
     ) -> Output? {
         do {
             return try action()
         } catch {
-            add(.init("\(error)", at: range))
+            add(.init("\(error)", at: location))
             return nil
         }
     }

Sources/Compiler/Gen/Rewriter.swift

@@ -25,19 +25,19 @@ struct Rewriter {
     mutating func removeNonSql<S: StmtSyntax>(_ stmt: S, in source: String) -> String {
         let rangesToRemove = stmt.accept(visitor: &self)
 
-        guard !rangesToRemove.isEmpty else { return "\(source[stmt.range.range]);" }
+        guard !rangesToRemove.isEmpty else { return "\(source[stmt.location.range]);" }
 
         var final = ""
-        var start = stmt.range.lowerBound
+        var start = stmt.location.lowerBound
 
         // Remove in reverse so the range start does not change.
         for range in rangesToRemove.sorted(by: { $0.lowerBound < $1.lowerBound }) {
             final.append(contentsOf: source[start..<range.lowerBound])
             start = range.upperBound
         }
 
-        if start < stmt.range.upperBound {
-            final.append(contentsOf: source[start..<stmt.range.upperBound])
+        if start < stmt.location.upperBound {
+            final.append(contentsOf: source[start..<stmt.location.upperBound])
         }
 
         return "\(final.trimmingCharacters(in: .whitespaces));"
@@ -61,13 +61,13 @@ struct Rewriter {
         let rowRanges: [(Range<Substring.Index>, Parameter<String>)] = parameters
             .compactMap { param -> [(Range<Substring.Index>, Parameter<String>)]? in
                 guard case .row = param.type else { return nil }
-                return param.ranges.map { ($0.range, param) }
+                return param.locations.map { ($0.range, param) }
             }
             .flatMap(\.self)
             .sorted { $0.0.lowerBound < $1.0.lowerBound }
 
         guard !rowRanges.isEmpty else {
-            return [.text(source[stmt.range.range])]
+            return [.text(source[stmt.location.range])]
         }
 
         guard rangesToRemove.isEmpty else {
@@ -83,7 +83,7 @@ struct Rewriter {
         }
 
         var segments: [SourceSegment] = []
-        var startIndex = stmt.range.lowerBound
+        var startIndex = stmt.location.lowerBound
 
         for (rowRange, param) in rowRanges {
             let textRange = startIndex..<rowRange.lowerBound
@@ -95,8 +95,8 @@ struct Rewriter {
 
         // If the last range wasnt to the end of the string
         // then make sure to append the rest
-        if startIndex < stmt.range.upperBound {
-            let textRange = startIndex..<stmt.range.upperBound
+        if startIndex < stmt.location.upperBound {
+            let textRange = startIndex..<stmt.location.upperBound
             let text = source[textRange]
             segments.append(.text(text))
         }
@@ -109,15 +109,15 @@ extension Rewriter: StmtSyntaxVisitor {
     func visit(_ stmt: borrowing CreateTableStmtSyntax) -> [Range<Substring.Index>] {
         switch stmt.kind {
         case .columns(let columns):
-            return columns.values.compactMap { $0.type.alias?.range.range }
+            return columns.values.compactMap { $0.type.alias?.location.range }
         case .select:
             return []
         }
     }
 
     func visit(_ stmt: borrowing AlterTableStmtSyntax) -> [Range<Substring.Index>] {
         return switch stmt.kind {
-        case .addColumn(let c): c.type.alias.map { [$0.range.range] } ?? []
+        case .addColumn(let c): c.type.alias.map { [$0.location.range] } ?? []
         default: []
         }
     }
@@ -134,7 +134,7 @@ extension Rewriter: StmtSyntaxVisitor {
 
     func visit(_ stmt: borrowing QueryDefinitionStmtSyntax) -> [Range<Substring.Index>] {
         // Remove the `DEFINE QUERY name AS`
-        return [stmt.range.lowerBound..<stmt.statement.range.lowerBound]
+        return [stmt.location.lowerBound..<stmt.statement.location.lowerBound]
     }
 
     func visit(_ stmt: borrowing PragmaStmt) -> [Range<Substring.Index>] { [] }
@@ -152,8 +152,8 @@ extension Rewriter: StmtSyntaxVisitor {
     func visit(_ stmt: borrowing CreateVirtualTableStmtSyntax) -> [Range<Substring.Index>] {
         return stmt.arguments.flatMap { argument -> [Range<Substring.Index>] in
             guard case let .fts5Column(_, typeName, notNull, _) = argument else { return [] }
-            if let typeName, let notNull { return [typeName.range.range, notNull.range] }
-            if let typeName { return [typeName.range.range] }
+            if let typeName, let notNull { return [typeName.location.range, notNull.range] }
+            if let typeName { return [typeName.location.range] }
             if let notNull { return [notNull.range] }
             return []
         }

Sources/Compiler/Parse/Lexer.swift

@@ -41,7 +41,7 @@ struct Lexer {
     private var eof: Token {
         return Token(
             kind: .eof,
-            range: SourceLocation(
+            location: SourceLocation(
                 range: source.endIndex..<source.endIndex
             )
         )
@@ -87,9 +87,9 @@ struct Lexer {
             advance()
             if self.current == ">" {
                 advance()
-                return Token(kind: .doubleArrow, range: location(from: currentIndex, to: peekIndex))
+                return Token(kind: .doubleArrow, location: location(from: currentIndex, to: peekIndex))
             } else {
-                return Token(kind: .arrow, range: location(from: currentIndex, to: peekIndex))
+                return Token(kind: .arrow, location: location(from: currentIndex, to: peekIndex))
             }
         case ("*", _): return consumeSingle(of: .star)
         case ("=", _): return consumeSingle(of: .equal)
@@ -136,7 +136,7 @@ struct Lexer {
         }
 
         let location = location(from: start, to: currentIndex)
-        return Token(kind: Token.Kind(word: source[location.range]), range: location)
+        return Token(kind: Token.Kind(word: source[location.range]), location: location)
     }
 
     private mutating func parseNumber() -> Token {
@@ -166,7 +166,7 @@ struct Lexer {
             .int(integer(from: string, at: location.range))
         }
 
-        return Token(kind: kind, range: location)
+        return Token(kind: kind, location: location)
     }
 
     private mutating func scientificNotation(
@@ -216,7 +216,7 @@ struct Lexer {
         let value = mantissa * pow(10, exponent)
         return Token(
             kind: .double(value),
-            range: location(from: mantissaRange.lowerBound, to: exponentRange.upperBound)
+            location: location(from: mantissaRange.lowerBound, to: exponentRange.upperBound)
         )
     }
 
@@ -243,10 +243,10 @@ struct Lexer {
 
         guard let value = Int(source[numberRange], radix: 16) else {
             diagnostics.add(.init("Invalid hex number", at: location))
-            return Token(kind: .hex(0), range: location)
+            return Token(kind: .hex(0), location: location)
         }
 
-        return Token(kind: .hex(value), range: location)
+        return Token(kind: .hex(value), location: location)
     }
 
     private mutating func parseString() -> Token {
@@ -266,7 +266,7 @@ struct Lexer {
             diagnostics.add(.init("Unterminated string", at: location(from: start, to: currentIndex)))
         }
 
-        return Token(kind: .string(source[stringRange]), range: location(from: tokenStart, to: currentIndex))
+        return Token(kind: .string(source[stringRange]), location: location(from: tokenStart, to: currentIndex))
     }
 
     private mutating func skipWhitespace() {
@@ -278,14 +278,14 @@ struct Lexer {
     private mutating func consumeSingle(of kind: Token.Kind) -> Token {
         let start = currentIndex
         advance()
-        return Token(kind: kind, range: location(from: start, to: currentIndex))
+        return Token(kind: kind, location: location(from: start, to: currentIndex))
     }
 
     private mutating func consumeDouble(of kind: Token.Kind) -> Token {
         let start = currentIndex
         advance()
         advance()
-        return Token(kind: kind, range: location(from: start, to: currentIndex))
+        return Token(kind: kind, location: location(from: start, to: currentIndex))
     }
 
     private mutating func integer<S: StringProtocol>(