Merge branch 'kanaka:master' into merge-eval

IMPLS.yml

@@ -115,7 +115,6 @@ IMPL:
   - {IMPL: zig}
 
   # See .travis.yml (for older osx / xcode tests)
-# - {IMPL: swift,  NO_DOCKER: 1, OS: xcode7.3}
   - {IMPL: swift3}
 # - {IMPL: swift3, NO_DOCKER: 1, OS: xcode8}
   - {IMPL: swift4}

README.md

@@ -42,7 +42,7 @@ process guide](process/guide.md) there is also a [mal/make-a-lisp
 FAQ](docs/FAQ.md) where I attempt to answer some common questions.
 
 
-**3. Mal is implemented in 89 languages (95 different implementations and 118 runtime modes)**
+**3. Mal is implemented in 88 languages (94 different implementations and 117 runtime modes)**
 
 | Language | Creator |
 | -------- | ------- |
@@ -125,7 +125,6 @@ FAQ](docs/FAQ.md) where I attempt to answer some common questions.
 | [Scheme (R7RS)](#scheme-r7rs) | [Vasilij Schneidermann](https://github.com/wasamasa) |
 | [Skew](#skew) | [Dov Murik](https://github.com/dubek) |
 | [Standard ML](#sml) | [Fabian Bergström](https://github.com/fabjan) |
-| [Swift 2](#swift) | [Keith Rollin](https://github.com/keith-rollin) |
 | [Swift 3](#swift-3) | [Joel Martin](https://github.com/kanaka)  |
 | [Swift 4](#swift-4) | [陆遥](https://github.com/LispLY)  |
 | [Swift 5](#swift-5) | [Oleg Montak](https://github.com/MontakOleg)  |
@@ -177,7 +176,7 @@ make DOCKERIZE=1 "repl^IMPL^stepX"
 make DOCKERIZE=1 "repl^IMPL"
 ```
 
-## External Implementations
+## External / Alternate Implementations
 
 The following implementations are maintained as separate projects:
 
@@ -190,6 +189,10 @@ The following implementations are maintained as separate projects:
 * [by Tim Morgan](https://github.com/seven1m/mal-rust)
 * [by vi](https://github.com/vi/mal-rust-vi) - using [Pest](https://pest.rs/) grammar, not using typical Mal infrastructure (cargo-ized steps and built-in converted tests).
 
+### Swift 2
+
+* [by Keith Rollin](https://github.com/kanaka/mal/tree/fbfe678/impls/swift) - This implementation used to be in the repo. However, Swift 2 is no longer easily buildable/testable.
+
 ### Q
 
 * [by Ali Mohammad Pur](https://github.com/alimpfard/mal/tree/q/impls/q) - The Q implementation works fine but it requires a proprietary manual download that can't be Dockerized (or integrated into the mal CI pipeline) so for now it remains a separate project.
@@ -1119,18 +1122,6 @@ make sml_MODE=mosml
 ```
 
 
-### Swift
-
-The Swift implementation of mal requires the Swift 2.0 compiler (Xcode
-7.0) to build. Older versions will not work due to changes in the
-language and standard library.
-
-```
-cd impls/swift
-make
-./stepX_YYY
-```
-
 ### Swift 3
 
 The Swift 3 implementation of mal requires the Swift 3.0 compiler. It