aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog1
-rw-r--r--src/interp/daase.lisp10
-rw-r--r--src/interp/database.boot5
3 files changed, 5 insertions, 11 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index bb77e5b3..6325a19b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,7 @@
* interp/database.boot (getConstructorAbbreviationFromDB): Use DB
data structure directtly.
+ (getConstructorKindFromDB): Likewise.
2013-05-20 Gabriel Dos Reis <gdr@integrable-solutions.net>
diff --git a/src/interp/daase.lisp b/src/interp/daase.lisp
index e2b10eec..36aa0c27 100644
--- a/src/interp/daase.lisp
+++ b/src/interp/daase.lisp
@@ -667,14 +667,6 @@
(case key
; note that abbreviation, constructorkind and cosig are heavy hitters
; thus they occur first in the list of things to check
- (abbreviation
- (setq stream *interp-stream*)
- (when struct
- (setq data (|dbAbbreviation| struct))))
- (constructorkind
- (setq stream *interp-stream*)
- (when struct
- (setq data (|dbConstructorKind| struct))))
(cosig
(setq stream *interp-stream*)
(when struct
@@ -747,7 +739,7 @@
(when struct
(setq data (database-dependents struct))))
(otherwise
- (warn "~%(GETDATABASE ~a ~a) failed~%" constructor key)))
+ (error "~%(GETDATABASE ~a ~a) failed~%" constructor key)))
(when (numberp data) ;fetch the real data
(when *miss*
(format t "getdatabase miss: ~20a ~a~%" key constructor))
diff --git a/src/interp/database.boot b/src/interp/database.boot
index 7517e834..fc13f773 100644
--- a/src/interp/database.boot
+++ b/src/interp/database.boot
@@ -72,7 +72,7 @@ makeConstructor(s,k == nil,a == nil) ==
--%
-getConstructorAbbreviationFromDB: %Symbol -> %Symbol
+getConstructorAbbreviationFromDB: %Symbol -> %Maybe %Symbol
getConstructorAbbreviationFromDB ctor ==
db := constructorDB ctor => dbAbbreviation db
nil
@@ -85,7 +85,8 @@ getConstructorCategory ctor ==
getConstructorKindFromDB: %Symbol -> %Maybe %ConstructorKind
getConstructorKindFromDB ctor ==
- GETDATABASE(ctor,"CONSTRUCTORKIND")
+ db := constructorDB ctor => dbConstructorKind db
+ nil
getConstructorAncestorsFromDB: %Symbol -> %List %Constructor
getConstructorAncestorsFromDB ctor ==