Minor fixes in (lispkit draw). First release for Swift 4.2.

Author: objecthub

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.5.3 (2018-10-21)
+- Migrated project to Xcode 10.0 and ported code to Swift 4.2
+- Small bug fixes in library `(lispkit draw)`
+- Fixed serious hashing bug (crashing LispKit)
+- New SRFI library: SRFI 14, SRFI 16
+
 ## 1.5.2 (2018-09-16)
 - Several substantial extensions of library `(lispkit draw)`
 - Support for turtle graphics via library `(lispkit draw turtle)`

Cartfile

@@ -1,2 +1,2 @@
-github "objecthub/swift-numberkit" ~> 2.2.4
+github "objecthub/swift-numberkit" ~> 2.2.5
 github "objecthub/swift-commandlinekit" ~> 0.2.5

Cartfile.resolved

@@ -1,2 +1,2 @@
 github "objecthub/swift-commandlinekit" "0.2.5"
-github "objecthub/swift-numberkit" "2.2.4"
+github "objecthub/swift-numberkit" "2.2.5"

Package.swift

@@ -37,8 +37,8 @@ let package = Package(
     .executable(name: "LispKitRepl", targets: ["LispKitRepl"])
   ],
   dependencies: [
-    .package(url: "https://github.com/objecthub/swift-numberkit.git", from: "2.2.2"),
-    .package(url: "https://github.com/objecthub/swift-commandlinekit.git", from: "0.2.3")
+    .package(url: "https://github.com/objecthub/swift-numberkit.git", from: "2.2.5"),
+    .package(url: "https://github.com/objecthub/swift-commandlinekit.git", from: "0.2.5")
   ],
   targets: [
     .target(name: "LispKit",

Sources/LispKit/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.2</string>
+	<string>1.5.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Sources/LispKit/Primitives/DrawingLibrary.swift

@@ -768,7 +768,7 @@ public final class DrawingLibrary: NativeLibrary {
     return .object(ImmutableBox(nsimage))
   }
 
-  private func saveBitmap(bitmap: Expr, filename: Expr, format: Expr) throws -> Expr {
+  private func saveBitmap(filename: Expr, bitmap: Expr, format: Expr) throws -> Expr {
     guard case .symbol(let sym) = format else {
       throw RuntimeError.eval(.invalidImageFileType, format)
     }

Sources/LispKit/Resources/Examples/Turtle.scm

@@ -9,7 +9,7 @@
 ;;;
 ;;; Author: Matthias Zenger
 ;;; Copyright © 2018 Matthias Zenger. All rights reserved.
-;;; Original copyright © 1994-03-06 Matthias Zenger
+;;; Original copyright © 1994-03-06, Matthias Zenger.
 ;;;
 ;;; 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
@@ -103,4 +103,3 @@
     (display filename)
     (newline)
     (save-drawings filename pages "Demo of library (lispkit draw turtle)")))
-

Sources/LispKit/Resources/Libraries/lispkit/object.sld

@@ -169,7 +169,6 @@
 ;;; either express or implied. See the License for the specific language governing permissions
 ;;; and limitations under the License.
 
-
 (define-library (lispkit object)
 
   ;; Procedural object interface

Sources/LispKitRepl/AppInfo.swift

@@ -3,7 +3,7 @@
 //  LispKit
 //
 //  Created by Matthias Zenger on 05/05/2016.
-//  Copyright © 2016, 2017 ObjectHub. All rights reserved.
+//  Copyright © 2016-2018 ObjectHub. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ public struct AppInfo {
   // Version of the application
   public static let version =
     (Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String) ??
-    "2.0.1"
+    "2.0.2"
 
   // Copyright message
   public static let copyright =

Sources/LispKitRepl/Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.1</string>
+	<string>2.0.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.0.0</string>
+	<string>2.0.2</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>

Sources/LispKitRepl/main.swift

@@ -123,7 +123,7 @@ var cmdLineArgs = flags.parameters.isEmpty ? [CommandLine.arguments.first!] : fl
 #if SPM
   let context = Context(console: console,
                         implementationName: "LispKit",
-                        implementationVersion: "1.5.2",
+                        implementationVersion: "1.5.3",
                         commandLineArguments: cmdLineArgs,
                         includeInternalResources: false,
                         includeDocumentPath: searchDocs.wasSet ? "LispKit" : nil)