X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=blobdiff_plain;f=src%2Fscheme-primitives.4th;h=f38fd93a94c060e625983093307f780dda94e110;hb=ed191ba289bdcd6c0aa2e1079e63e8069ca6965c;hp=1ed995b2439a3a5169105dd535f97fe3bd4d9e70;hpb=bc2450b4b29d6bb8ba5422fb9eb7a75d1b6b5a57;p=scheme.forth.jl.git diff --git a/src/scheme-primitives.4th b/src/scheme-primitives.4th index 1ed995b..f38fd93 100644 --- a/src/scheme-primitives.4th +++ b/src/scheme-primitives.4th @@ -46,6 +46,10 @@ -rot 2drop boolean-type ; 1 make-fa-primitive procedure? +:noname ( args -- boolobj ) + port-type istype? -rot 2drop boolean-type +; 1 make-fa-primitive port? + \ }}} \ ==== Type conversions ==== {{{ @@ -471,6 +475,36 @@ current-input-port obj@ ; 0 make-fa-primitive current-input-port +:noname ( args -- charobj ) + nil? if + 2drop current-input-port obj@ + else + car port-type ensure-arg-type + then + + read-char +; make-primitive read-char + +:noname ( args -- charobj ) + nil? if + 2drop current-input-port obj@ + else + car port-type ensure-arg-type + then + + peek-char +; make-primitive peek-char + +:noname ( args -- stringobj ) + nil? if + 2drop current-input-port obj@ + else + car port-type ensure-arg-type + then + + read-line +; make-primitive read-line + : charlist>cstr ( charlist addr -- n ) dup 2swap ( origaddr addr charlist ) @@ -577,7 +611,17 @@ defer display nil? if ." Error." else - ." Error: " car display + ." Error:" + + 2dup car space display + cdr nil? invert if + begin + 2dup car space print + cdr nil? + until + then + + 2drop then reset-term