aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Dos Reis <gdr@axiomatics.org>2016-01-20 05:31:00 -0800
committerGabriel Dos Reis <gdr@axiomatics.org>2016-01-20 05:31:00 -0800
commite572854c495b63ee446831a7d61a27e5bc84550f (patch)
tree47a8fb57dc01e56c6b5ac0fabcf901064491a46a
parent7ce0611cdcc235063e66cd291bf20474dc40668c (diff)
downloadopen-axiom-e572854c495b63ee446831a7d61a27e5bc84550f.tar.gz
getConstructorArgsFromDB: remove as redundant.
-rw-r--r--src/interp/br-util.boot2
-rw-r--r--src/interp/c-doc.boot2
-rw-r--r--src/interp/daase.lisp4
-rw-r--r--src/interp/database.boot6
4 files changed, 4 insertions, 10 deletions
diff --git a/src/interp/br-util.boot b/src/interp/br-util.boot
index e8d82f6c..a649ec76 100644
--- a/src/interp/br-util.boot
+++ b/src/interp/br-util.boot
@@ -273,7 +273,7 @@ getConstructorForm name ==
name = 'Enumeration => '(Enumeration a b)
getConstructorFormFromDB name
-getConstructorArgs conname == rest getConstructorForm conname
+getConstructorArgs conname == getConstructorForm(conname).args
bcComments(comments,:options) ==
italics? := not IFCAR options
diff --git a/src/interp/c-doc.boot b/src/interp/c-doc.boot
index 88d9fa1d..e9b1cb93 100644
--- a/src/interp/c-doc.boot
+++ b/src/interp/c-doc.boot
@@ -431,7 +431,7 @@ removeBackslashes s ==
checkNumOfArgs conform ==
conname := opOf conform
constructor? conname or (conname := abbreviation? conname) =>
- #getConstructorArgsFromDB conname
+ getConstructorArity conname
nil --signals error
++ returns ok if correct, form if wrong number of arguments, nil if unknown
diff --git a/src/interp/daase.lisp b/src/interp/daase.lisp
index 97e66462..4bfd30da 100644
--- a/src/interp/daase.lisp
+++ b/src/interp/daase.lisp
@@ -597,7 +597,7 @@
(format t "~a: ~a~%" 'constructorform
(|getConstructorFormFromDB| constructor))
(format t "~a: ~a~%" 'constructorargs
- (|getConstructorArgsFromDB| constructor))
+ (|getConstructorArgs| constructor))
(format t "~a: ~a~%" 'attributes
(|getConstructorAttributes| constructor))
(format t "~a: ~%" 'predicates)
@@ -667,8 +667,6 @@
(setq stream *browse-stream*)
(when struct
(setq data (|dbSourceFile| struct))))
- (constructorargs
- (setq data (cdr (|getConstructorFormFromDB| constructor))))
(documentation
(setq stream *browse-stream*)
(when struct
diff --git a/src/interp/database.boot b/src/interp/database.boot
index 98dbc134..da33e22b 100644
--- a/src/interp/database.boot
+++ b/src/interp/database.boot
@@ -154,10 +154,6 @@ getConstructorFullNameFromDB: %Symbol -> %Symbol
getConstructorFullNameFromDB ctor ==
GETDATABASE(ctor,"CONSTRUCTOR")
-getConstructorArgsFromDB: %Symbol -> %List %Symbol
-getConstructorArgsFromDB ctor ==
- GETDATABASE(ctor,"CONSTRUCTORARGS")
-
++ returns a list of Boolean values indicating whether the
++ parameter type at the corresponding position is a category.
getDualSignature: %Symbol -> %Form
@@ -216,7 +212,7 @@ getOperationModemapsFromDB op ==
getConstructorArity: %Symbol -> %Short
getConstructorArity ctor ==
- sig := getConstructorSignature ctor => #rest sig
+ form := getConstructorFormFromDB ctor => #form.args
-1
getConstructorKind: %Symbol -> %Maybe %ConstructorKind