Update main.swift for reading source files

- Update swift to latest dev version
- Remove PathKit from dependencies
- Custom methods for computing the absolute path and reading file contents

.swift-version

@@ -1 +1 @@
-swift-DEVELOPMENT-SNAPSHOT-2016-02-08-a
+swift-DEVELOPMENT-SNAPSHOT-2016-02-25-a

Package.swift

@@ -42,15 +42,13 @@ let package = Package(
             dependencies: [
                 "source",
                 "parser",
+                "util",
             ]
         ),
     ],
     exclude: [
         "Integrations"
     ],
-    dependencies: [
-        .Package(url: "https://github.com/kylef/PathKit.git", majorVersion: 0),
-    ],
     testDependencies: [
         .Package(url: "https://github.com/kylef/Spectre.git", majorVersion: 0),
     ]

Sources/swift-ast/main.swift

@@ -17,18 +17,16 @@
 import CoreFoundation
 import Foundation
 
-import PathKit
-
 import source
 import parser
+import util
 
 var filePaths = Process.arguments
 filePaths.removeAtIndex(0)
 
 for filePath in filePaths {
-  let absolutePath = Path(filePath).absolute()
-
-  guard let fileContent = try? absolutePath.read(NSUTF8StringEncoding) else {
+  let absolutePath = filePath.absolutePath()
+  guard let fileContent = try? absolutePath.readFile() else {
     print("Error in reading file \(absolutePath)")
     continue
   }
@@ -50,3 +48,4 @@ for filePath in filePaths {
   print("File contains \(fileContent.characters.count) chars, and it takes \(parserTimeElapsed) seconds to parse.")
   print("----------")
 }
+

Sources/util/String+AbsolutePath.swift

@@ -0,0 +1,49 @@
+/*
+   Copyright 2016 Ryuichi Saito, LLC
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+import Foundation
+
+public extension String {
+  func absolutePath() -> String {
+    if self.hasPrefix("/") {
+      return self
+    }
+
+    let currentDirectory = NSFileManager.defaultManager().currentDirectoryPath
+    var pathHead = NSString(string: currentDirectory).pathComponents.filter { $0 != "." }
+    if pathHead.count > 1 && pathHead.last == "/" {
+      pathHead.removeLast()
+    }
+    var pathTail = NSString(string: self).pathComponents.filter { $0 != "." }
+    if pathTail.count > 1 && pathTail.last == "/" {
+      pathTail.removeLast()
+    }
+
+    while pathTail.first == ".." {
+      pathTail.removeFirst()
+      if !pathHead.isEmpty {
+        pathHead.removeLast()
+      }
+
+      if pathHead.isEmpty || pathTail.isEmpty {
+        break
+      }
+    }
+
+    let absolutePath = pathHead.joinWithSeparator("/") + "/" + pathTail.joinWithSeparator("/")
+    return absolutePath.substringFromIndex(absolutePath.startIndex.successor())
+  }
+}

Sources/util/String+ReadFile.swift

@@ -0,0 +1,23 @@
+/*
+   Copyright 2016 Ryuichi Saito, LLC
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+import Foundation
+
+public extension String {
+  func readFile() throws -> String {
+    return try NSString(contentsOfFile: self, encoding: NSUTF8StringEncoding) as String
+  }
+}