adjust

Author: rintaro

utils/swift-xcodegen/Sources/SwiftXcodeGen/BuildArgs/SwiftDriverUtils.swift

@@ -111,8 +111,6 @@ struct SwiftTargets {
   func getSources(
     from edge: NinjaBuildFile.BuildEdge, buildDir: RepoBuildDir
   ) throws -> SwiftTarget.Sources {
-    // If we have SWIFT_SOURCES defined, use it, otherwise check the rule
-    // inputs.
     let files: [AnyPath] = edge.inputs.map(AnyPath.init)
 
     // Split the files into repo sources and external sources. Repo sources

utils/swift-xcodegen/Sources/SwiftXcodeGen/BuildArgs/SwiftTargets.swift

@@ -97,12 +97,12 @@ fileprivate enum NinjaCommandLineError: Error {
 extension NinjaBuildFile {
 
   func commandLine(for edge: BuildEdge) throws -> String {
-    guard  let rule = self.rules[edge.ruleName] else {
+    guard let rule = self.rules[edge.ruleName] else {
       throw NinjaCommandLineError.unknownRule(edge.ruleName)
     }
 
     // Helper to get a substitution value for ${key}.
-    // Note that we don't declare built-in substitions (e.g. $in, $out) for now.
+    // Note that we don't do built-in substitutions (e.g. $in, $out) for now.
     func value(for key: String) -> String? {
       edge.bindings[key] ?? rule.bindings[key] ?? self.bindings[key]
     }
@@ -125,17 +125,20 @@ extension NinjaBuildFile {
           key = String(rest[rest.index(after: rest.startIndex)..<rightBraceIdx])
           rest = rest[rest.index(after: rightBraceIdx)...]
         } else {
-          let keyEnd = rest.firstIndex(where: { !$0.isLetter && $0 != "_" }) ?? rest.endIndex
+          func isBindingChar(_ c: Character) -> Bool {
+            c.isASCII && (c.isLetter || c.isNumber || c == "_" || c == "-")
+          }
+          let keyEnd = rest.firstIndex(where: { !isBindingChar($0) }) ?? rest.endIndex
           key = String(rest[rest.startIndex..<keyEnd])
           rest = rest[keyEnd...]
         }
 
-        // Peform substition.
+        // Perform substitution.
         if let substituted = value(for: key) {
           // Recursive substitutions.
           result += eval(string: substituted)
         } else {
-          // If the value is not found, keep the variable interporation.
+          // If the value is not found, keep the interpolation.
           result += string[dollarIdx..<rest.startIndex]
         }
       }

utils/swift-xcodegen/Sources/SwiftXcodeGen/Ninja/NinjaBuildFile.swift

@@ -71,13 +71,13 @@ fileprivate extension NinjaParser {
   typealias Rule = NinjaBuildFile.Rule
   typealias BuildEdge = NinjaBuildFile.BuildEdge
 
-  struct ParsedAttribute: Hashable {
+  struct ParsedBinding: Hashable {
     var key: String
     var value: String
   }
 
   enum Lexeme: Hashable {
-    case attribute(ParsedAttribute)
+    case binding(ParsedBinding)
     case element(String)
     case rule
     case build
@@ -166,15 +166,15 @@ extension NinjaParser.Lexer {
     })
   }
 
-  private mutating func tryConsumeAttribute(key: String) -> Lexeme? {
+  private mutating func tryConsumeBinding(key: String) -> Lexeme? {
     input.tryEating { input in
       input.skip(while: \.isSpaceOrTab)
       guard input.tryEat("=") else { return nil }
       input.skip(while: \.isSpaceOrTab)
       guard let value = input.consumeUnescaped(while: { !$0.isNewline }) else {
         return nil
       }
-      return .attribute(.init(key: key, value: value))
+      return .binding(.init(key: key, value: value))
     }
   }
 
@@ -216,7 +216,7 @@ extension NinjaParser.Lexer {
 
       // If we're on a newline, check to see if we can lex an attribute.
       if isAtStartOfLine {
-        if let attr = tryConsumeAttribute(key: element) {
+        if let attr = tryConsumeBinding(key: element) {
           return attr
         }
       }
@@ -238,8 +238,8 @@ fileprivate extension NinjaParser {
     while let lexeme = eat(), lexeme != .newline {}
   }
 
-  mutating func parseAttribute() throws -> ParsedAttribute? {
-    guard case let .attribute(attr) = peek else { return nil }
+  mutating func parseBinding() throws -> ParsedBinding? {
+    guard case let .binding(attr) = peek else { return nil }
     eat()
     tryEat(.newline)
     return attr
@@ -262,7 +262,7 @@ fileprivate extension NinjaParser {
     }
 
     var bindings: [String: String] = [:]
-    while indent < lexer.leadingTriviaCount, let binding = try parseAttribute() {
+    while indent < lexer.leadingTriviaCount, let binding = try parseBinding() {
       bindings[binding.key] = binding.value
     }
 
@@ -322,7 +322,7 @@ fileprivate extension NinjaParser {
     skipLine()
 
     var bindings: [String: String] = [:]
-    while indent < lexer.leadingTriviaCount, let binding = try parseAttribute() {
+    while indent < lexer.leadingTriviaCount, let binding = try parseBinding() {
       bindings[binding.key] = binding.value
     }
 
@@ -345,7 +345,7 @@ fileprivate extension NinjaParser {
       throw NinjaParseError.expected(.element("<path>"))
     }
 
-    let baseDirectory = self.filePath.removingLastComponent()
+    let baseDirectory = self.filePath.parentDir!
     let path = AnyPath(fileName).absolute(in: baseDirectory)
     return try NinjaParser.parse(filePath: path, input: path.read())
   }
@@ -363,14 +363,15 @@ fileprivate extension NinjaParser {
         buildEdges.append(edge)
         continue
       }
-      if let binding = try parseAttribute() {
+      if let binding = try parseBinding() {
         bindings[binding.key] = binding.value
         continue
       }
       if let included = try parseInclude() {
         bindings.merge(included.bindings.values, uniquingKeysWith: { _, other in other })
         rules.merge(included.rules, uniquingKeysWith: { _, other in other })
         buildEdges.append(contentsOf: included.buildEdges)
+        continue
       }
       // Ignore unknown bits of syntax like 'subninja' for now.
       eat()

utils/swift-xcodegen/Sources/SwiftXcodeGen/Ninja/NinjaParser.swift

@@ -38,7 +38,8 @@ public extension RelativePath {
   }
 
   func absolute(in base: AbsolutePath) -> AbsolutePath {
-    base.appending(self)
+    precondition(base.isDirectory, "Expected '\(base)' to be a directory")
+    return base.appending(self)
   }
 
   init(_ component: Component) {