Fixed crash when execution gets aborted while loading and executing a file. Included changelog for release 1.9.2.

Author: objecthub

CHANGELOG.md

@@ -1,7 +1,14 @@
 # Changelog
 
-## 1.9.2 (2020-10-24)
-- TODO
+## 1.9.2 (2020-12-23)
+- Included new libraries: `(srfi 9)`, `(srfi 180)`, `(srfi 209)`, `(srfi 210)`
+- Extended library `(lispkit log)` with syntax `log-time`
+- Extended library `(lispkit debug)` with syntax `time-values`
+- Extended library `(lispkit math)` with procedures `fxodd?`, `fxeven?`, `fx-width`, `fx-greatest`, and `fx-least` in library `(lispkit math)`.; generalized procedure `number->string`
+- Fixed procedure `environment-bindings`, renamed `date-time-has-dst`
+- Fixed crash when execution gets aborted while loading and executing a file
+- Included new sample code: `DrawTrees.scm`, `EditDistance.scm`
+- Minor tweaks to the REPL
 
 ## 1.9.1 (2020-10-04)
 - Revision of library `(lispkit test)` involving procedures `test-group-failed-tests`, `test-group-passed-tests`, `failed-tests`, `passed-tests`, `current-test-epsilon`

README.md

@@ -95,7 +95,7 @@ _LispKit_ provides support for the following core features, many of which are ba
     [`(lispkit match)`](https://github.com/objecthub/swift-lispkit/wiki/LispKit-Match),
     [`(lispkit iterate)`](https://github.com/objecthub/swift-lispkit/wiki/LispKit-Iterate),
     [`(lispkit log)`](https://github.com/objecthub/swift-lispkit/wiki/LispKit-Log),
-    `(lispkit debug)`,
+    [`(lispkit debug)`](https://github.com/objecthub/swift-lispkit/wiki/LispKit-Debug),
     [`(lispkit set)`](https://github.com/objecthub/swift-lispkit/wiki/LispKit-Set),
     [`(lispkit stack)`](https://github.com/objecthub/swift-lispkit/wiki/LispKit-Stack), 
     [`(lispkit queue)`](https://github.com/objecthub/swift-lispkit/wiki/LispKit-Queue), 

Sources/LispKit/Primitives/DynamicControlLibrary.swift

@@ -175,6 +175,7 @@ public final class DynamicControlLibrary: NativeLibrary {
     self.execute("(call-with-current-continuation " +
       "  (lambda (cont) (set! exit (lambda args (_trigger-exit cont args)))))")
     self.define(Procedure("emergency-exit", emergencyExit))
+    self.define(Procedure("abort-eventually", abortEventually))
 
     // Parameters
     self.define(Procedure("dynamic-environment", dynamicEnvironment))
@@ -455,6 +456,11 @@ public final class DynamicControlLibrary: NativeLibrary {
     return .undef
   }
 
+  private func abortEventually(expr: Expr?) -> Expr {
+    self.context.machine.abort()
+    return .void
+  }
+  
   private func makeParameter(_ value: Expr, setter: Expr?) -> Expr {
     return .procedure(Procedure(setter ?? .null, value))
   }

Sources/LispKit/Runtime/VirtualMachine.swift

@@ -288,6 +288,9 @@ public final class VirtualMachine: TrackedObject {
       do {
         return try self.apply(.procedure(raiseProc), to: .pair(.error(obj), .null))
       } catch let error as RuntimeError { // handle Lisp-related issues
+        guard !self.abortionRequested else { // abortions bypass the raise mechanism
+          return .error(error)
+        }
         exception = error
       } catch let error { // handle OS-related issues
         exception = RuntimeError.os(error)
@@ -1032,7 +1035,7 @@ public final class VirtualMachine: TrackedObject {
       }
       return res
     } catch let error as RuntimeError {
-      if error.stackTrace == nil {
+      if !self.abortionRequested && error.stackTrace == nil {
         error.attach(stackTrace: self.getStackTrace())
       }
       throw error