Skip to content

Commit

Permalink
Some fixes for extrinsic
Browse files Browse the repository at this point in the history
  • Loading branch information
yitzchak committed Jan 8, 2024
1 parent 3a20bdd commit 9ef800d
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 9 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ jobs:
fail-fast: false
matrix:
lisp:
- abcl
- clasp
- ecl
- sbcl
runs-on: ubuntu-latest
container:
Expand Down
7 changes: 5 additions & 2 deletions code/extrinsic/interface.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,8 @@
(defmethod cyclosis:make-file-stream
((client extrinsic-client) path direction
if-exists if-does-not-exist element-type external-format)
(when (eq if-does-not-exist :create)
(ensure-directories-exist path))
(let ((target (cl:open path :direction direction
:if-exists if-exists
:if-does-not-exist if-does-not-exist
Expand Down Expand Up @@ -228,6 +230,7 @@
#'extrinsic-format)

(defmethod cyclosis:whitespace-char-p ((client extrinsic-client) ch)
#+abcl (java:jcall "isWhitespace" *readtable* ch)
#+ccl (ccl::whitespacep ch)
#+clasp
(eq (core:syntax-type *readtable* ch) :whitespace)
Expand All @@ -237,8 +240,8 @@
"ecl_readtable_get(ecl_current_readtable(), ECL_CHAR_CODE(#0), NULL) == cat_whitespace"
:one-liner t)
#+sbcl (sb-impl::whitespace[2]p ch *readtable*)
#-(or ccl clasp cmucl (and ecl (not bytecode)) sbcl)
(and (member char '(#\tab #\newline #\linefeed #\page #\return #\space))
#-(or abcl ccl clasp cmucl (and ecl (not bytecode)) sbcl)
(and (member ch '(#\tab #\newline #\linefeed #\page #\return #\space))
t))

(cyclosis:define-interface *client*)
2 changes: 1 addition & 1 deletion code/extrinsic/test/expected-failures.sexp
Original file line number Diff line number Diff line change
@@ -1 +1 @@
#+(or clasp cmucl ecl sbcl) :NIL-VECTORS-ARE-STRINGS
#+(or abcl clasp cmucl ecl sbcl) :NIL-VECTORS-ARE-STRINGS
8 changes: 2 additions & 6 deletions code/extrinsic/test/test.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,8 @@
(defun test (&rest rest)
(let ((system (asdf:find-system :cyclosis-extrinsic/test)))
(apply #'ansi-test-harness:ansi-test
:directory (merge-pathnames
(make-pathname
:directory '(:relative
"dependencies"
"ansi-test"))
(asdf:component-pathname system))
:directory (merge-pathnames #P"dependencies/ansi-test/"
(asdf:component-pathname system))
:tests *tests*
:expected-failures (asdf:component-pathname
(asdf:find-component
Expand Down

0 comments on commit 9ef800d

Please sign in to comment.