Changes needed for 2009AB version of UMLS

[umlisp.git] / parse-macros.lisp

diff --git a/parse-macros.lisp b/parse-macros.lisp
index 67af3c6ddd2f51806a86f035898fba5b144a6ce7..490934fd79fa3836794cceac703a6ef665390849 100644 (file)
--- a/parse-macros.lisp
+++ b/parse-macros.lisp
@@ -7,10 +7,8 @@
 ;;;; Author:   Kevin M. Rosenberg
 ;;;; Created:  Apr 2000
 ;;;;
-;;;; $Id$
-;;;;
 ;;;; This file, part of UMLisp, is
-;;;;    Copyright (c) 2000-2006 by Kevin M. Rosenberg, M.D.
+;;;;    Copyright (c) 2000-2010 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.
@@ -48,6 +46,12 @@
            (,buffer (make-fields-buffer))
            (,files (source-files ,path)))
        (with-open-file (,ustream (first ,files) :direction :input
+                        #+(and sbcl sb-unicode) :external-format
+                        #+(and sbcl sb-unicode) :UTF-8
+                        #+(and allegro ics) :external-format
+                        #+(and allegro ics) :UTF-8
+                        #+lispworks :external-format
+                        #+lispworks :UTF-8
                         #+(and clisp unicode) :external-format
                         #+(and clisp unicode) charset:utf-8)
          (do ((,line (read-buffered-fields ,buffer ,ustream #\| ,eof)
@@ -67,8 +71,14 @@
       (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)
+                                #+(and sbcl sb-unicode) :external-format
+                                #+(and sbcl sb-unicode) :UTF-8
+                                #+(and allegro ics) :external-format
+                                #+(and allegro ics) :UTF-8
+                                #+lispworks :external-format
+                                #+lispworks :UTF-8
+                                #+(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)
@@ -93,7 +103,15 @@
     `(let ((,buffer (make-fields-buffer))
            (,eof (gensym "EOFSYM-")))
       (with-open-file
-          (,ustream (umls-pathname ,filename) :direction :input)
+          (,ustream (umls-pathname ,filename) :direction :input
+                    #+(and sbcl sb-unicode) :external-format
+                    #+(and sbcl sb-unicode) :UTF-8
+                    #+(and allegro ics) :external-format
+                    #+(and allegro ics) :UTF-8
+                    #+lispworks :external-format
+                    #+lispworks :UTF-8
+                    #+(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)