Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for Gray stream implementation of interactive-stream-p #640

Closed
wants to merge 7 commits into from
Closed

Add support for Gray stream implementation of interactive-stream-p #640

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b9a12d7
Add support for Gray stream implementation of interactive-stream-p
yitzchak Nov 21, 2023
7b83a3e
Update CHANGES for recent Gray stream additions
yitzchak Nov 27, 2023
154b6c9
Lisp.checkStream() coercion works for GRAY-STREAM subclasses
easye Nov 30, 2023
6ec431b
Add autoloads for missing GrayStream functions
easye Nov 30, 2023
f4e4cf8
Find most specialized method, defaulting GRAY-STREAM if none
easye Nov 30, 2023
a5c9095
Stream.is{Input,Output}Stream works for all cases
easye Nov 30, 2023
2f3cd57
Fix call to find-method
yitzchak Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 27 additions & 47 deletions src/org/armedbear/lisp/GrayStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,59 +35,49 @@ public GrayStream findOrCreate(LispObject o) {
return wrappedStream;
}

//
//
// do what we can for Java code that wants to determine our valence(s)
//
public static final Symbol INPUT_STREAM_P
= PACKAGE_GRAY_STREAMS_JAVA.addExternalSymbol("JAVA/INPUT-STREAM-P");
public boolean isInputStream() {
Function SUBTYPEP
= (Function)Symbol.SUBTYPEP.getSymbolFunction();
Package pkg
= getCurrentPackage().findPackage("GRAY-STREAMS");
Symbol fundamentalInputStream
= (Symbol) pkg.findSymbol("FUNDAMENTAL-INPUT-STREAM");
if (SUBTYPEP.execute(clos.typeOf(), fundamentalInputStream).equals(T)) {
Copy link
Collaborator

@easye easye Nov 22, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@yitzchak From what I remember, I think I had to add the SUBTYPEP to actually get this to work with uses of GRAY-STREAMS in some Quicklisp systems. I will try to go through my notes to figure out which systems I had problems with to see if your "terse" way works. In any event the use of getBooleanValue() is definitely an improvement.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good. I'll see if I can add some tests to my suite looking for such things.

Also, do you want me to update the change log as I make PRs?

return true;
}
return false;
Function f = checkFunction(INPUT_STREAM_P.getSymbolFunction());
return f.execute(clos).getBooleanValue();
}

public static final Symbol OUTPUT_STREAM_P
= PACKAGE_GRAY_STREAMS_JAVA.addExternalSymbol("JAVA/OUTPUT-STREAM-P");
public boolean isOutputStream() {
Function SUBTYPEP
= (Function)Symbol.SUBTYPEP.getSymbolFunction();
Package pkg
= getCurrentPackage().findPackage("GRAY-STREAMS");
Symbol s
= (Symbol) pkg.findSymbol("FUNDAMENTAL-OUTPUT-STREAM");
if (SUBTYPEP.execute(clos.typeOf(), s).equals(T)) {
return true;
}
return false;
Function f = checkFunction(OUTPUT_STREAM_P.getSymbolFunction());
return f.execute(clos).getBooleanValue();
}

public static final Symbol INTERACTIVE_STREAM_P
= PACKAGE_GRAY_STREAMS_JAVA.addExternalSymbol("JAVA/INTERACTIVE-STREAM-P");
public boolean isInteractive() {
Function f = checkFunction(INTERACTIVE_STREAM_P.getSymbolFunction());
return f.execute(clos).getBooleanValue();
}

public static final Symbol OPEN_STREAM_P
= PACKAGE_GRAY_STREAMS_JAVA.addExternalSymbol("JAVA/OPEN-STREAM-P");
public boolean isOpen() {
Function f = checkFunction(OPEN_STREAM_P.getSymbolFunction());
return f.execute(clos).getBooleanValue();
}

public boolean isCharacterStream() {
Function SUBTYPEP
= (Function)Symbol.SUBTYPEP.getSymbolFunction();
Package pkg
= getCurrentPackage().findPackage("GRAY-STREAMS");
= getCurrentPackage().findPackage("COMMON-LISP");
Symbol s
= (Symbol) pkg.findSymbol("FUNDAMENTAL-CHARACTER-STREAM");
if (SUBTYPEP.execute(clos.typeOf(), s).equals(T)) {
return true;
}
return false;
= (Symbol) pkg.findSymbol("CHARACTER");
return SUBTYPEP.execute(getElementType(), s).getBooleanValue();
}

public boolean isBinaryStream() {
Function SUBTYPEP
= (Function)Symbol.SUBTYPEP.getSymbolFunction();
Package pkg
= getCurrentPackage().findPackage("GRAY-STREAMS");
Symbol s
= (Symbol) pkg.findSymbol("FUNDAMENTAL-BINARY-STREAM");
if (SUBTYPEP.execute(clos.typeOf(), s).equals(T)) {
return true;
}
return false;
return !isCharacterStream();
}

public boolean isCharacterInputStream() {
Expand Down Expand Up @@ -251,11 +241,6 @@ public int getCharPos() {
// unimplemented interfaces of parent class
//
// we stub these to return Lisp-side errors
public boolean isInteractive() {
simple_error("unimplemented isInteractive()");
return false; // unreached
}

public void setInteractive(boolean b) {
simple_error("unimplemented setInteractive(boolean)");
}
Expand All @@ -274,11 +259,6 @@ public void setExternalFormat(LispObject format) {
simple_error("unimplemented setExternalFormat()");
}

public boolean isOpen() {
simple_error("unimplemented isOpen()");
return false; // unreached
}

public void setOpen(boolean b) {
simple_error("unimplemented setOpen()");;
}
Expand Down
44 changes: 44 additions & 0 deletions src/org/armedbear/lisp/gray-streams-java.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,50 @@

;;;; N.b. The function symbols seemingly have to be unique across all
;;;; packages for this to work, hence the "java/…" prefixes.
(defun java/input-stream-p (object)
(let* ((method
(find-method #'gray-streams::gray-input-stream-p
'()
(list
(class-of object))
nil))
(method-function
(mop:method-function method)))
(funcall method-function `(,object) nil)))

(defun java/output-stream-p (object)
(let* ((method
(find-method #'gray-streams::gray-output-stream-p
'()
(list
(class-of object))
nil))
(method-function
(mop:method-function method)))
(funcall method-function `(,object) nil)))

(defun java/interactive-stream-p (object)
(let* ((method
(find-method #'gray-streams::gray-interactive-stream-p
'()
(list
(class-of object))
nil))
(method-function
(mop:method-function method)))
(funcall method-function `(,object) nil)))

(defun java/open-stream-p (object)
(let* ((method
(find-method #'gray-streams::gray-open-stream-p
'()
(list
(class-of object))
nil))
(method-function
(mop:method-function method)))
(funcall method-function `(,object) nil)))

(defun java/element-type (object)
(let* ((method
(or
Expand Down
10 changes: 10 additions & 0 deletions src/org/armedbear/lisp/gray-streams.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@
#'(lambda (s) (and (input-stream-p s) (eql (stream-element-type s) 'character))))
(defvar *ansi-input-stream-p* #'cl::input-stream-p)
(defvar *ansi-output-stream-p* #'cl::output-stream-p)
(defvar *ansi-interactive-stream-p* #'cl::interactive-stream-p)
(defvar *ansi-open-stream-p* #'cl::open-stream-p)
(defvar *ansi-streamp* #'cl::streamp)
(defvar *ansi-read-sequence* #'cl::read-sequence)
Expand All @@ -208,6 +209,7 @@
(defgeneric gray-input-stream-p (stream))
(defgeneric gray-input-character-stream-p (stream)) ;; # fb 1.01
(defgeneric gray-output-stream-p (stream))
(defgeneric gray-interactive-stream-p (stream))
(defgeneric gray-stream-element-type (stream))

(defmethod gray-close ((stream fundamental-stream) &key abort)
Expand All @@ -221,6 +223,10 @@
(defmethod gray-streamp ((s fundamental-stream))
s)

(defmethod gray-interactive-stream-p (stream)
(declare (ignore stream))
nil)

(defclass fundamental-input-stream (fundamental-stream) ())

(defmethod gray-input-character-stream-p (s) ;; # fb 1.01
Expand Down Expand Up @@ -605,6 +611,9 @@
(defmethod gray-output-stream-p (stream)
(funcall *ansi-output-stream-p* stream))

(defmethod gray-interactive-stream-p (stream)
(funcall *ansi-interactive-stream-p* stream))

(defmethod gray-open-stream-p (stream)
(funcall *ansi-open-stream-p* stream))

Expand Down Expand Up @@ -687,6 +696,7 @@
(setf (symbol-function 'common-lisp::input-stream-p) #'gray-input-stream-p)
(setf (symbol-function 'common-lisp::input-character-stream-p) #'gray-input-character-stream-p) ;; # fb 1.01
(setf (symbol-function 'common-lisp::output-stream-p) #'gray-output-stream-p)
(setf (symbol-function 'common-lisp::interactive-stream-p) #'gray-interactive-stream-p)
(setf (symbol-function 'common-lisp::open-stream-p) #'gray-open-stream-p)
(setf (symbol-function 'common-lisp::streamp) #'gray-streamp)
(setf (symbol-function 'common-lisp::read-sequence) #'gray-read-sequence)
Expand Down
Loading