simon/beowulf
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

READ now copes correctly with nil input!

Browse source
This commit is contained in:
Simon Brooke 2023-03-24 22:39:23 +00:00
parent a87dbfb8fd
commit 434276ecea
No known key found for this signature in database
GPG key ID: A7A4F18D1D4DF987
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/beowulf/read.clj
View file

@ -14,14 +14,12 @@
Both these extensions can be disabled by using the `--strict` command line Both these extensions can be disabled by using the `--strict` command line
switch." switch."
(:require [beowulf.bootstrap :refer [*options*]] (:require [beowulf.bootstrap :refer [*options*]]
[clojure.java.io :refer [file reader]]
[clojure.math.numeric-tower :refer [expt]] [clojure.math.numeric-tower :refer [expt]]
[clojure.pprint :refer [pprint]]
[clojure.string :refer [join split starts-with? upper-case]] [clojure.string :refer [join split starts-with? upper-case]]
[instaparse.core :as i] [instaparse.core :as i]
[instaparse.failure :as f] [instaparse.failure :as f]
[beowulf.cons-cell :refer [make-beowulf-list make-cons-cell NIL]]) [beowulf.cons-cell :refer [make-beowulf-list make-cons-cell NIL]])
(:import [java.io InputStream PushbackReader] (:import [java.io InputStream]
[instaparse.gll Failure])) [instaparse.gll Failure]))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -347,6 +345,7 @@
expression, or else an input stream. A single form will be read." expression, or else an input stream. A single form will be read."
[input] [input]
(cond (cond
(string? input) (gsp (or input (read-line))) (empty? input) (gsp (read-line))
(instance? InputStream input) (READ (slurp input)) (string? input) (gsp input)
(instance? InputStream input) (READ (slurp input))
:else (throw (ex-info "READ: `input` should be a string or an input stream" {})))) :else (throw (ex-info "READ: `input` should be a string or an input stream" {}))))