projects
/
umlisp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r4876: *** empty log message ***
[umlisp.git]
/
parse-common.lisp
diff --git
a/parse-common.lisp
b/parse-common.lisp
index 38abc8740dabaa85e960cf35fbb7f3cd7e264f97..bca8940c9232bed5688c014aa1945af96c4cf9c1 100644
(file)
--- a/
parse-common.lisp
+++ b/
parse-common.lisp
@@
-7,7
+7,7
@@
;;;; Author: Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
;;;; Author: Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
-;;;; $Id: parse-common.lisp,v 1.1
1 2003/05/07 22:54:16
kevin Exp $
+;;;; $Id: parse-common.lisp,v 1.1
3 2003/05/08 04:36:12
kevin Exp $
;;;;
;;;; This file, part of UMLisp, is
;;;; Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
;;;;
;;;; This file, part of UMLisp, is
;;;; Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@
-21,7
+21,7
@@
(eval-when (:compile-toplevel)
(declaim (optimize (speed 3) (safety 1) (compilation-speed 0) (debug 3))))
(eval-when (:compile-toplevel)
(declaim (optimize (speed 3) (safety 1) (compilation-speed 0) (debug 3))))
-(defun ensure-
init-uml
s (&optional (alwaysclear nil))
+(defun ensure-
ucols+ufile
s (&optional (alwaysclear nil))
"Initialize all UMLS file and column structures if not already initialized"
(when (or alwaysclear (null *umls-files*))
(gen-ucols)
"Initialize all UMLS file and column structures if not already initialized"
(when (or alwaysclear (null *umls-files*))
(gen-ucols)
@@
-162,6
+162,8
@@
Currently, these are the LEX and NET files."
(defun ensure-compiled-fun (fun)
"Ensure that a function is compiled"
(etypecase fun
(defun ensure-compiled-fun (fun)
"Ensure that a function is compiled"
(etypecase fun
+ (null
+ nil)
(function
(if (compiled-function-p fun)
fun
(function
(if (compiled-function-p fun)
fun
@@
-182,7
+184,7
@@
Currently, these are the LEX and NET files."
ucol))
(defun make-empty-ucol (colname filename)
ucol))
(defun make-empty-ucol (colname filename)
- (warn "call in make-empty-ucol
"
)
+ (warn "call in make-empty-ucol
: ~A/~A" colname filename
)
(make-ucol (copy-seq colname) "Unknown" "" nil nil nil filename nil))
(defun find-ucol (colname filename)
(make-ucol (copy-seq colname) "Unknown" "" nil nil nil filename nil))
(defun find-ucol (colname filename)
@@
-193,10
+195,10
@@
Currently, these are the LEX and NET files."
"Returns umls-file structure for a filename"
(find-if #'(lambda (f) (string-equal filename (fil f))) *umls-files*))
"Returns umls-file structure for a filename"
(find-if #'(lambda (f) (string-equal filename (fil f))) *umls-files*))
-(defun find-ucols-for-
filename (filenam
e)
+(defun find-ucols-for-
ufile (ufil
e)
"Returns list of umls-cols for a file structure"
"Returns list of umls-cols for a file structure"
- (loop for colname in (fields
(find-ufile filename)
)
- collect (find-ucol colname
filename
)))
+ (loop for colname in (fields
ufile
)
+ collect (find-ucol colname
(fil ufile)
)))
(defun umls-field-string-to-list (fmt)
"Converts a comma delimited list of fields into a list of field names. Will
(defun umls-field-string-to-list (fmt)
"Converts a comma delimited list of fields into a list of field names. Will
@@
-216,7
+218,7
@@
append a unique number (starting at 2) onto a column name that is repeated in th
(defun make-ufile (fil des table cls rws bts fields)
(let ((ufile (make-instance 'ufile :fil fil :des des :table table :cls cls
:rws rws :bts bts :fields fields)))
(defun make-ufile (fil des table cls rws bts fields)
(let ((ufile (make-instance 'ufile :fil fil :des des :table table :cls cls
:rws rws :bts bts :fields fields)))
- (setf (ucols ufile) (find-ucols-for-
filename fil
))
+ (setf (ucols ufile) (find-ucols-for-
ufile ufile
))
ufile))
(defun datatype-for-colname (colname)
ufile))
(defun datatype-for-colname (colname)