Commit a83fb695 authored by Drew's avatar Drew

Merge remote-tracking branch 'origin/master' into overlays

parents 0c43ea3d 7bbfbcff
......@@ -23,7 +23,7 @@ public func collectSources(sourceDescriptions: [String], task: Task) -> [String]
let description = task.importedPath + unPrefixedDescription
if description.hasSuffix("**.swift") {
let basepath = String(Array(description.characters)[0..<description.characters.count - 9])
let manager = NSFileManager.defaultManager()
guard let enumerator = ICantBelieveItsNotFoundation_enumeratorAtPath(basepath) else {
fatalError("Invalid path \(basepath)")
}
......
......@@ -21,6 +21,8 @@ final public class Task {
var mixins: [String] = [] ///The mixins we should apply to this task
public var allKeys: [String]
private var kvp: [String:ParseValue]
init?(value: ParseValue, name: String, importedPath: String) {
......@@ -28,6 +30,7 @@ final public class Task {
self.importedPath = importedPath.pathWithTrailingSlash
self.kvp = kvp
self.key = name
self.allKeys = [String](kvp.keys)
self.tool = kvp["tool"]?.string ?? self.tool
if let mixins = kvp["mixins"]?.vector {
for mixin in mixins {
......
......@@ -26,8 +26,8 @@ final public class Scanner {
private var shouldStall = false
var line: Int = 0
var column: Int = 0
var line: Int = 1
var column: Int = 1
public init(content: String) {
self.content = content
......@@ -37,8 +37,8 @@ final public class Scanner {
func _defaults() {
self.index = content.startIndex
self.line = 0
self.column = 0
self.line = 1
self.column = 1
self.shouldStall = false
self.current = nil
}
......@@ -62,7 +62,7 @@ final public class Scanner {
if current?.character == "\n" {
line += 1
column = 0
column = 1
}
else {
column += 1
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment