;;;; $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.
(delimited-string-to-list line #\| t))))
(defun source-files (path)
- (if (probe-file path)
+ (if (probe-file path)
(list path)
(sort
(directory (make-pathname :defaults path
`(let ((,eof (gensym "EOFSYM-"))
(,buffer (make-fields-buffer))
(,files (source-files ,path)))
- (with-open-file (,ustream (first ,files) :direction :input)
+ (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)
(files (gensym "FILES-")))
`(let ((,eof (gensym "EOFSYM-"))
(,files (source-files ,path)))
- (with-open-file (,ustream (first ,files) :direction :input)
- (do ((,line (read-umls-line ,ustream ,eof)
- (read-umls-line ,ustream ,eof)))
- ((eq ,line ,eof) t)
- ,@body)))))
+ (unless ,files
+ (error "Can't find files for ~A~%" (namestring ,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)
+ (locally (declare (type list ,line))
+ ,@body))))))
(defmacro with-umls-ufile ((line ufile) &body body)
"Opens a UMLS and processes each parsed line with (body) argument"