Fix bug in read. Support executing all regression tests. Update LispKit version to 1.6.

Author: objecthub

CHANGELOG.md

@@ -1,7 +1,17 @@
 # Changelog
 
-## 1.5.5 (2018-11-18)
-TODO
+## 1.6 (2019-01-04)
+- New libraries: `(lispkit log)`, `(lispkit char-set)`, `(scheme char)`, `(srfi 14 ascii)`, `(srfi 101)`, `(srfi 125)`
+- Support Scheme libraries from R7RS large/Red edition:  `(scheme box)`,  `(scheme charset)`,
+  `(scheme comparator)`, `(scheme generator)`,
+  `(scheme hash-table)`, `(scheme ideque)`, `(scheme list)`, `(scheme rlist)`, `(scheme set)`,
+  `(scheme sort)`, `(scheme stream)`, `(scheme text)`, `(scheme vector)`
+- Extended library `(lispkit test)`: support nested test groups, approximate tests, and handle exceptions correctly
+- Handle closing of ports correctly in library `(lispkit port)`
+- Fix major bug in library `(lispkit system)` affecting the composition of file paths
+- Bug fixes affecting `fold-left`, `max`, `min`, `numerator`, `denominator`, `log`, `magnitude`, `gcd` and `lcm`, as well as the escaping of symbols
+- Move from `#\dx????` syntax to `#\x????` to represent character literals
+- Return more user-friendly error messages for operating system errors
 
 ## 1.5.4 (2018-11-03)
 - Migrated project to Xcode 10.1 and ported code to Swift 4.2.1

LispKit.xcodeproj/project.pbxproj

@@ -68,6 +68,7 @@
 		CC436C421FFD96800095559E /* Logic.scm in Resources */ = {isa = PBXBuildFile; fileRef = CC436C411FFD94870095559E /* Logic.scm */; };
 		CC4385BC20BABAA600055289 /* HTTP.scm in Copy examples */ = {isa = PBXBuildFile; fileRef = CC4385BB20BAB79500055289 /* HTTP.scm */; };
 		CC4385BE20BB5F3400055289 /* Compiler.scm in Copy examples */ = {isa = PBXBuildFile; fileRef = CC4385BD20BB5EE200055289 /* Compiler.scm */; };
+		CC44E5B221DECD7B0009969C /* All.scm in Copy tests */ = {isa = PBXBuildFile; fileRef = CC44E5B121DECB850009969C /* All.scm */; };
 		CC4575C620F00C4400116F0F /* DrawingLibrary.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC4575C520F00C4400116F0F /* DrawingLibrary.swift */; };
 		CC4575C820F00EE000116F0F /* Color.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC4575C720F00EE000116F0F /* Color.swift */; };
 		CC474EAF1ECFAC3F00B535E3 /* Pi.scm in Copy examples */ = {isa = PBXBuildFile; fileRef = CCFBE5C31ECBA8DA0032254B /* Pi.scm */; };
@@ -283,6 +284,7 @@
 			dstPath = LispKit/Resources/Tests;
 			dstSubfolderSpec = 7;
 			files = (
+				CC44E5B221DECD7B0009969C /* All.scm in Copy tests */,
 				CC54924721DCDFE2004A0652 /* SRFI-14-Tests.scm in Copy tests */,
 				CC54923B21D9828B004A0652 /* SRFI-101-Tests.scm in Copy tests */,
 				CC2C73DF21A22D2B00B18661 /* SRFI-125-Tests.scm in Copy tests */,
@@ -620,6 +622,7 @@
 		CC436C411FFD94870095559E /* Logic.scm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Logic.scm; sourceTree = "<group>"; };
 		CC4385BB20BAB79500055289 /* HTTP.scm */ = {isa = PBXFileReference; lastKnownFileType = text; path = HTTP.scm; sourceTree = "<group>"; };
 		CC4385BD20BB5EE200055289 /* Compiler.scm */ = {isa = PBXFileReference; lastKnownFileType = text; path = Compiler.scm; sourceTree = "<group>"; };
+		CC44E5B121DECB850009969C /* All.scm */ = {isa = PBXFileReference; lastKnownFileType = text; path = All.scm; sourceTree = "<group>"; };
 		CC4575C520F00C4400116F0F /* DrawingLibrary.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DrawingLibrary.swift; sourceTree = "<group>"; };
 		CC4575C720F00EE000116F0F /* Color.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Color.swift; sourceTree = "<group>"; };
 		CC474EB01ED0390200B535E3 /* Queens.scm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Queens.scm; sourceTree = "<group>"; };
@@ -859,6 +862,7 @@
 		CC09ECF12198B7D300F84713 /* Tests */ = {
 			isa = PBXGroup;
 			children = (
+				CC44E5B121DECB850009969C /* All.scm */,
 				CC09ECF22198B87200F84713 /* R7RS-Tests.scm */,
 				CC54924421DCDEA1004A0652 /* SRFI-14-Tests.scm */,
 				CC54923A21D9823B004A0652 /* SRFI-101-Tests.scm */,

Sources/LispKit/Data/Equality.swift

@@ -34,7 +34,8 @@ struct Equality: Hashable {
   }
 
   func hash(into hasher: inout Hasher) {
-    hasher.combine(ref1.hashValue &+ ref2.hashValue)
+    let value: Int = ObjectIdentifier(ref1).hashValue ^ ObjectIdentifier(ref2).hashValue
+    hasher.combine(value)
   }
 
   static func ==(lhs: Equality, rhs: Equality) -> Bool {

Sources/LispKit/IO/TextInput.swift

@@ -99,6 +99,13 @@ open class TextInput {
     return self.buffer[self.next]
   }
 
+  open func unread() {
+    guard self.next > self.buffer.startIndex else {
+      return
+    }
+    self.next = self.buffer.index(before: self.next)
+  }
+  
   open func readString(_ n: Int) -> String? {
     assert(n >= 0, "TextInput.readString called with negative count")
     guard n > 0 else {

Sources/LispKit/Info.plist

@@ -20,13 +20,13 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.5</string>
+	<string>1.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2016–2018 Matthias Zenger. All rights reserved.</string>
+	<string>Copyright © 2016–2019 Matthias Zenger. All rights reserved.</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

Sources/LispKit/Primitives/BytevectorLibrary.swift

@@ -169,8 +169,14 @@ public final class BytevectorLibrary: NativeLibrary {
     guard toStart + end - start - 1 < toVec.value.count else {
       throw RuntimeError.eval(.targetBytevectorTooSmall, to)
     }
-    for i in start..<end {
-      toVec.value[toStart + i - start] = fromVec.value[i]
+    if toStart <= start {
+      for i in start..<end {
+        toVec.value[toStart + i - start] = fromVec.value[i]
+      }
+    } else if toStart > start {
+      for i in (start..<end).reversed() {
+        toVec.value[toStart + i - start] = fromVec.value[i]
+      }
     }
     return .void
   }

Sources/LispKit/Primitives/PortLibrary.swift

@@ -408,7 +408,12 @@ public final class PortLibrary: NativeLibrary {
     let input = try self.textInputFrom(expr, open: true)
     let parser = Parser(symbols: self.context.symbols, input: input)
     do {
-      return try parser.parse(false).datum
+      let res = try parser.parse(false).datum
+      if case .eof = res {
+        return res
+      }
+      input.unread() // put the look-ahead character back into the input stream
+      return res
     } catch let error as RuntimeError {
       guard case .syntax(.empty) = error.descriptor else {
         throw error

Sources/LispKit/Resources/Tests/All.scm

@@ -0,0 +1,28 @@
+;;; LISPKIT REGRESSION TEST SUITE
+;;;
+;;; Author: Matthias Zenger
+;;; Copyright © 2019 Matthias Zenger. 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. 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 (lispkit base)
+        (lispkit test))
+
+(test-begin "LispKit regression tests")
+
+(load "Tests/R7RS-Tests")
+(load "Tests/SRFI-14-Tests")
+(load "Tests/SRFI-101-Tests")
+(load "Tests/SRFI-125-Tests")
+
+(test-end)
+
+;; Current number of failures: 26 (all from R7RS-Tests)

Sources/LispKit/Resources/Tests/SRFI-14-Tests.scm

@@ -36,7 +36,7 @@
 
 (define (vowel? c) (member c '(#\a #\e #\i #\o #\u)))
 
-(test-begin "srfi-14: char-sets")
+(test-begin "SRFI 14: Character sets")
 
 (test-not (char-set? 5))
 

Sources/LispKitRepl/AppInfo.swift

@@ -3,7 +3,7 @@
 //  LispKit
 //
 //  Created by Matthias Zenger on 05/05/2016.
-//  Copyright © 2016-2018 ObjectHub. All rights reserved.
+//  Copyright © 2016-2019 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.3"
+    "2.0.4"
 
   // Copyright message
   public static let copyright =

Sources/LispKitRepl/Info.plist

@@ -20,14 +20,14 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.3</string>
+	<string>2.0.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.0.3</string>
+	<string>2.0.4</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2016–2018 Matthias Zenger. All rights reserved.</string>
+	<string>Copyright © 2016–2019 Matthias Zenger. All rights reserved.</string>
 </dict>
 </plist>

Sources/LispKitRepl/main.swift

@@ -3,7 +3,7 @@
 //  LispKitRepl
 //
 //  Created by Matthias Zenger on 14/04/2016.
-//  Copyright © 2016-2018 ObjectHub. All rights reserved.
+//  Copyright © 2016-2019 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.
@@ -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.5",
+                        implementationVersion: "1.6",
                         commandLineArguments: cmdLineArgs,
                         includeInternalResources: false,
                         includeDocumentPath: searchDocs.wasSet ? "LispKit" : nil)
@@ -142,7 +142,7 @@ if !searchDocs.wasSet {
                   .appendingPathComponent("lib", isDirectory: true)
   _ = context.fileHandler.addSearchPath(rootUrl.path)
   _ = context.fileHandler.addLibrarySearchPath(rootUrl
-        .appendingPathComponent("Libraries", isDirectory: true).path)
+                           .appendingPathComponent("Libraries", isDirectory: true).path)
   if !prelude.wasSet {
     prelude.value = rootUrl.appendingPathComponent("Libraries", isDirectory: true)
                            .appendingPathComponent("Prelude.scm", isDirectory: false).path