projects
/
umlisp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r4842: Auto commit for Debian build
[umlisp.git]
/
parse-common.lisp
diff --git
a/parse-common.lisp
b/parse-common.lisp
index 1e397bf62a047f75f501a8b17435744969ed7d30..07e5cc9a3138ee8f0a021af7b125efb63c988ef5 100644
(file)
--- a/
parse-common.lisp
+++ b/
parse-common.lisp
@@
-4,10
+4,10
@@
;;;;
;;;; Name: parse-common.lisp
;;;; Purpose: Common, stable parsing routines for UMLisp
;;;;
;;;; Name: parse-common.lisp
;;;; Purpose: Common, stable parsing routines for UMLisp
-;;;;
Programmer:
Kevin M. Rosenberg
+;;;;
Author:
Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
;;;; Date Started: Apr 2000
;;;;
-;;;; $Id: parse-common.lisp,v 1.
7 2003/05/06 07:17:35
kevin Exp $
+;;;; $Id: parse-common.lisp,v 1.
8 2003/05/06 07:44:07
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.
@@
-86,7
+86,7
@@
Currently, these are the LEX and NET files."
(let* ((filename (car length-list))
(max-field (cadr length-list))
(av-field (caddr length-list))
(let* ((filename (car length-list))
(max-field (cadr length-list))
(av-field (caddr length-list))
- (file (find-u
mls-
file filename)))
+ (file (find-ufile filename)))
(when file
(if (/= (length max-field) (length (fields file)))
(format t "Warning: Number of file fields ~A doesn't match length of fields in file structure ~S"
(when file
(if (/= (length max-field) (length (fields file)))
(format t "Warning: Number of file fields ~A doesn't match length of fields in file structure ~S"
@@
-94,7
+94,7
@@
Currently, these are the LEX and NET files."
(dotimes (i (max (length max-field) (length (fields file))))
(declare (fixnum i))
(let* ((field (nth i (fields file)))
(dotimes (i (max (length max-field) (length (fields file))))
(declare (fixnum i))
(let* ((field (nth i (fields file)))
- (col (find-u
mls-
col field filename)))
+ (col (find-ucol field filename)))
(if col
(progn
(setf (cmax col) (aref max-field i))
(if col
(progn
(setf (cmax col) (aref max-field i))
@@
-158,18
+158,18
@@
Currently, these are the LEX and NET files."
(push new-col *umls-cols*)
new-col))))))
(push new-col *umls-cols*)
new-col))))))
-(defun find-u
mls-
col (colname filename)
+(defun find-ucol (colname filename)
"Returns list of umls-col structure for a column name and a filename"
(find-or-make-col-in-columns colname filename *umls-cols*))
"Returns list of umls-col structure for a column name and a filename"
(find-or-make-col-in-columns colname filename *umls-cols*))
-(defun find-u
mls-
file (filename)
+(defun find-ufile (filename)
"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 ucols-for-u
mls-
file (file)
+(defun ucols-for-ufile (file)
"Returns list of umls-cols for a file structure"
(let ((filename (fil file)))
"Returns list of umls-cols for a file structure"
(let ((filename (fil file)))
- (mapcar (lambda (col) (find-u
mls-
col col filename))
+ (mapcar (lambda (col) (find-ucol col filename))
(fields file))))
(fields file))))