Handle input of a single file from stdin

Note that multiple files, like coming from 'cat f1 f2 | json2ecl' will not work because there will not be a valid JSON separator between the two files' contents.

Signed-off-by: Dan S. Camper <[email protected]>

Author: dancamper

json2ecl.asd

@@ -10,7 +10,7 @@
   :description "Examines JSON data and deduces the ECL RECORD definitions necessary to parse it."
   :author "Dan S. Camper"
   :license  "MIT"
-  :version "0.0.2"
+  :version "0.0.3"
   :serial t
   :depends-on (#:adopt #:com.inuoe.jzon #:with-user-abort)
   :components ((:file "package")

json2ecl.lisp

@@ -239,7 +239,7 @@
 
 ;;;
 
-(defun process-file (input &optional (parsed-obj nil))
+(defun process-file-or-stream (input &optional (parsed-obj nil))
   (jzon:with-parser (parser input)
     (setf parsed-obj (parse-obj parsed-obj parser t)))
   parsed-obj)

userio.lisp

@@ -42,16 +42,17 @@
      (with-user-abort:user-abort () (adopt:exit 130))))
 
 (defun run (args)
-  (let ((argc (length args)))
-    (when (plusp argc)
-      (let ((toplevel-name (if (= argc 1)
-                               (pathname-name (uiop:probe-file* (car args)))
-                               (format nil "~A" (gensym "toplevel_"))))
-            (result-obj nil))
-        (loop for input in args
-              do (setf result-obj (process-file (uiop:probe-file* input) result-obj)))
-        (setf *layout-names* nil)
-        (format t "~A" (as-ecl-recdef result-obj toplevel-name))))))
+  (let* ((argc (length args))
+         (args (if (plusp argc) args (list *standard-input*))))
+    (let ((toplevel-name (if (= argc 1)
+                             (pathname-name (uiop:probe-file* (car args)))
+                             (format nil "~A" (gensym "toplevel_"))))
+          (result-obj nil))
+      (loop for input in args
+            do (let ((one-item (or (uiop:probe-file* input) input)))
+                 (setf result-obj (process-file-or-stream one-item result-obj))))
+      (setf *layout-names* nil)
+      (format t "~A" (as-ecl-recdef result-obj toplevel-name)))))
 
 (defun toplevel (argv)
   (sb-ext:disable-debugger)