Commit e1ef1ed9 authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

1.0.0.4: Fix, test and export n-stream-has-char-p & n-stream-eol-p

parent c6d0484d

base/macros.lisp

+1 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ outputs a tag plus a list of variable and their values, returns the last value" 
;;; Streams



(defun n-stream-has-char-p (c s)

  (and (eql (peek-char nil s) c) (read-char s)))

  (and (eql (peek-char nil s nil) c) (read-char s)))



(defun n-stream-eol-p (s)

  (let* ((cr (n-stream-has-char-p #\return s))

fare-utils.asd

+1 −1
Original line number Diff line number Diff line 
;;; -*- Mode: Lisp ; Base: 10 ; Syntax: ANSI-Common-Lisp -*-

(defsystem "fare-utils"

  :version "1.0.0.3"

  :version "1.0.0.4"

  :description "Basic functions and macros, interfaces, pure and stateful datastructures"

  :long-description "fare-utils is a small collection of utilities.

It contains a lot of basic everyday functions and macros"

package.lisp

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ 
   #:maybe-adjust-size-down #:maybe-adjust-size-up

   #:msg #:multiple-value-quote #:mvbind

   #:mvcall #:mvlist #:mvprog1 #:mvquote #:mvsetq

   #:n-stream-has-char-p #:n-stream-eol-p

   #:ndolist-with-rest #:ndolist-with-rest-fun #:nilf #:niy

   #:node-item #:node-mixin #:nop

   #:null-string-p #:plist->alist #:pop-last-item

test/strings.lisp

+8 −1
Original line number Diff line number Diff line
@@ -16,9 +16,16 @@ 
(deftest test-eol-p ()

  (with-input-from-string (s (format nil "x~cy~cz~at" #\return #\newline +crlf+))

    (is (equal (n-stream-eol-p s) nil))

    (is (equal (n-stream-has-char-p #\a s) nil))

    (is (equal (n-stream-has-char-p #\x s) #\x))

    (is (equal (n-stream-eol-p s) #\return))

    (is (equal (n-stream-eol-p s) nil))

    (is (equal (n-stream-has-char-p #\y s) #\y))

    (is (equal (n-stream-eol-p s) #\newline))

    (is (equal (n-stream-eol-p s) nil))

    (is (equal (n-stream-has-char-p #\z s) #\z))

    (is (equal (n-stream-eol-p s) +crlf+))

    (is (equal (n-stream-eol-p s) nil))))
 
    (is (equal (n-stream-eol-p s) nil))

    (is (equal (n-stream-has-char-p #\t s) #\t))

    (is (equal (n-stream-eol-p s) nil))

    (is (equal (n-stream-has-char-p #\a s) nil))))