r11209: fix test

[umlisp.git] / parse-macros.lisp

diff --git a/parse-macros.lisp b/parse-macros.lisp
index e71ba1dc59e29184c2502f967839a9191a655670..a2af75ef7a7bf38a66c015c315825d86b2cc3974 100644 (file)
--- a/parse-macros.lisp
+++ b/parse-macros.lisp
@@ -10,7 +10,7 @@
 ;;;; $Id$
 ;;;;
 ;;;; This file, part of UMLisp, is
-;;;;    Copyright (c) 2000-2004 by Kevin M. Rosenberg, M.D.
+;;;;    Copyright (c) 2000-2006 by Kevin M. Rosenberg, M.D.
 ;;;;
 ;;;; UMLisp users are granted the rights to distribute and use this software
 ;;;; as governed by the terms of the GNU General Public License.
@@ -18,17 +18,71 @@
 
 (in-package #:umlisp)
 
-(defmacro with-umls-file ((line filename) &body body)
-"Opens a UMLS and processes each parsed line with (body) argument"
+(defun read-umls-line (strm &optional (eof 'eof))
+  "Read a line from a UMLS stream, split into fields"
+  (let ((line (read-line strm nil eof)))
+    (if (eq line eof)
+       eof
+       (delimited-string-to-list line #\| t))))
+
+(defun source-files (path)
+  (if (probe-file path)
+      (list path)
+    (sort
+     (directory (make-pathname :defaults path
+                              :type :wild
+                              :name (concatenate 'string (pathname-name path)
+                                                 (aif (pathname-type path)
+                                                      (concatenate 'string "." it)
+                                                      ""))))
+     #'(lambda (a b)
+        (string-lessp (pathname-type a) (pathname-type b))))))
+
+(defmacro with-buffered-reading-umls-file ((line path) &body body)
+  "Opens a UMLS and processes each parsed line with (body) argument"
   (let ((ustream (gensym "STRM-"))
-       (eof (gensym "EOF-")))
-    `(let ((,eof (gensym "EOFSYM-")))
-      (with-open-file
-         (,ustream (umls-pathname ,filename) :direction :input)
-       (do ((,line (read-umls-line ,ustream ,eof)
-                   (read-umls-line ,ustream ,eof)))
-           ((eq ,line ,eof) t)
-         ,@body)))))
+       (buffer (gensym "BUF-"))
+       (eof (gensym "EOF-"))
+       (files (gensym "FILES-")))
+    `(let ((,eof (gensym "EOFSYM-"))
+          (,buffer (make-fields-buffer))
+          (,files (source-files ,path)))
+       (with-open-file (,ustream (first ,files) :direction :input
+                        #+(and clisp unicode) :external-format
+                        #+(and clisp unicode) charset:utf-8)
+        (do ((,line (read-buffered-fields ,buffer ,ustream #\| ,eof)
+                    (read-buffered-fields ,buffer ,ustream #\| ,eof)))
+            ((eq ,line ,eof) t)
+          (setq ,line (coerce ,line 'list))
+          (print ,line)
+          ,@body)))))
+
+(defmacro with-reading-umls-file ((line path) &body body)
+  "Opens a UMLS and processes each parsed line with (body) argument"
+  (let ((ustream (gensym "STRM-"))
+       (eof (gensym "EOF-"))
+       (files (gensym "FILES-")))
+    `(let ((,eof (gensym "EOFSYM-"))
+          (,files (source-files ,path)))
+      (unless ,files
+        (error "Can't find file files for ~A~%" ,path))
+      (with-open-file (,ustream (first ,files) :direction :input
+                       #+(and clisp unicode) :external-format
+                       #+(and clisp unicode) charset:utf-8)
+        (do ((,line (read-umls-line ,ustream ,eof)
+                    (read-umls-line ,ustream ,eof)))
+            ((eq ,line ,eof) t)
+          ,@body)))))
+
+(defmacro with-umls-ufile ((line ufile) &body body)
+  "Opens a UMLS and processes each parsed line with (body) argument"
+  `(with-reading-umls-file (,line (ufile-pathname ,ufile))
+     ,@body))
+
+(defmacro with-umls-file ((line ufile) &body body)
+  "Opens a UMLS and processes each parsed line with (body) argument"
+  `(with-reading-umls-file (,line (umls-pathname ,ufile))
+     ,@body))
 
 (defmacro with-buffered-umls-file ((line filename) &body body)
   "Opens a UMLS and processes each parsed line with (body) argument"
@@ -44,17 +98,4 @@
            ((eq ,line ,eof) t)
          ,@body)))))
 
-(defmacro with-buffered2-umls-file ((line filename) &body body)
-  "Opens a UMLS and processes each parsed line with (body) argument"
-  (let ((ustream (gensym "STRM-"))
-       (buffer (gensym "BUF-"))
-       (eof (gensym "EOF-")))
-    `(let ((,buffer (make-fields-buffer2))
-          (,eof (gensym "EOFSYM-")))
-      (with-open-file
-         (,ustream (umls-pathname ,filename)
-          :direction :input :if-exists :overwrite)
-       (do ((,line (read-buffered-fields ,buffer ,ustream #\| ,eof)
-                   (read-buffered-fields ,buffer ,ustream #\| ,eof)))
-           ((eq ,line ,eof) t)
-         ,@body)))))
+