11 files changed, 23 insertions, 17 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index f342d215..ea06021f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2011-08-21  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
+	* interp/database.boot (niladicConstructor?): Rename from
+	niladicConstructorFromDB.  Use getConstructorFormFromDB.
+	Adjust callers.
+
+2011-08-21  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
 	* interp/define.boot ($lisplibAbbreviation): Remove.  Adjust users.
 	($lisplibForm): Likewise.
 	* interp/c-doc.boot (finalizeDocumentation): Take constructor's
diff --git a/src/interp/br-op1.boot b/src/interp/br-op1.boot
index ce3b40a0..5fbe9418 100644
--- a/src/interp/br-op1.boot
+++ b/src/interp/br-op1.boot
@@ -920,7 +920,7 @@ mathform2HtString form == escapeString
 
 niladicHack form ==
   form isnt [.,:.] => form
-  form is [x] and niladicConstructorFromDB x => x
+  form is [x] and niladicConstructor? x => x
   [niladicHack x for x in form]
 
 --============================================================================
diff --git a/src/interp/br-saturn.boot b/src/interp/br-saturn.boot
index 2501b596..49b5d54c 100644
--- a/src/interp/br-saturn.boot
+++ b/src/interp/br-saturn.boot
@@ -1164,7 +1164,7 @@ htShowPageStarSaturn() ==
 ++ returns true if op designate a niladic constructor.  Note that
 ++ constructors are symbols whereas ordinary operations are strings.
 operationIsNiladicConstructor op ==
-  ident? op => niladicConstructorFromDB op
+  ident? op => niladicConstructor? op
   false
 
 ++ Like operationIsNiladicConstructor() except that we just want
diff --git a/src/interp/daase.lisp b/src/interp/daase.lisp
index df102e1a..4ec36c16 100644
--- a/src/interp/daase.lisp
+++ b/src/interp/daase.lisp
@@ -737,7 +737,7 @@
   (format t "~a: ~a~%" 'object
 	  (|getConstructorModuleFromDB| constructor))
   (format t "~a: ~a~%" 'niladic
-	  (|niladicConstructorFromDB| constructor))
+	  (|niladicConstructor?| constructor))
   (format t "~a: ~a~%" 'abbreviation
 	  (|getConstructorAbbreviationFromDB| constructor))
   (format t "~a: ~a~%" 'constructor?
diff --git a/src/interp/database.boot b/src/interp/database.boot
index 0bd98389..e4245440 100644
--- a/src/interp/database.boot
+++ b/src/interp/database.boot
@@ -131,10 +131,10 @@ getConstructorAttributesFromDB: %Constructor -> %Form
 getConstructorAttributesFromDB ctor ==
   GETDATABASE(ctor,"ATTRIBUTES")
 
-niladicConstructorFromDB: %Constructor -> %Boolean
-niladicConstructorFromDB ctor ==
-  property(ctor,'LOADED) => dbNiladic? constructorDB ctor
-  GETDATABASE(ctor,"NILADIC")
+niladicConstructor?: %Constructor -> %Boolean
+niladicConstructor? ctor ==
+  form := getConstructorFormFromDB ctor => form.args = nil
+  false
 
 constructorHasCategoryFromDB: %Pair(%Thing,%Thing) -> %List %Code
 constructorHasCategoryFromDB p ==
diff --git a/src/interp/define.boot b/src/interp/define.boot
index b7b1941a..f833e7cb 100644
--- a/src/interp/define.boot
+++ b/src/interp/define.boot
@@ -874,7 +874,7 @@ macroExpand(x,e) ==   --not worked out yet
       macroExpand(rhs,e)]
   -- macros should override niladic props
   [op,:args] := x
-  ident? op and args = nil and niladicConstructorFromDB op and
+  ident? op and args = nil and niladicConstructor? op and
     (u := get(op,"macro", e)) => macroExpand(u,e)
   ident? op and (get(op,"macro",e) is ['%mlambda,parms,body]) =>
     nargs := #args
@@ -1209,7 +1209,7 @@ putDomainsInScope(x,e) ==
   put("$DomainsInScope","special",newValue,e)
 
 getOperationAlist(name,functorForm,form) ==
-  if name isnt [.,:.] and niladicConstructorFromDB name then 
+  if name isnt [.,:.] and niladicConstructor? name then 
     functorForm:= [functorForm]
   (u:= isFunctor functorForm) and not
     ($insideFunctorIfTrue and first functorForm=first $functorForm) => u
diff --git a/src/interp/g-cndata.boot b/src/interp/g-cndata.boot
index 5e0053d9..70f40c52 100644
--- a/src/interp/g-cndata.boot
+++ b/src/interp/g-cndata.boot
@@ -179,13 +179,13 @@ unabbrev1(u,modeIfTrue) ==
     modeIfTrue =>
       d:= isDomainValuedVariable u => u
       a := abbreviation? u =>
-        niladicConstructorFromDB a => [a]
+        niladicConstructor? a => [a]
         largs := ['_$EmptyMode for arg in
           getPartialConstructorModemapSig(a)]
         unabbrev1([u,:largs],modeIfTrue)
       u
     a:= abbreviation?(u) or u
-    niladicConstructorFromDB a => [a]
+    niladicConstructor? a => [a]
     a
   [op,:arglist] := u
   op = 'Join => ['Join, :[unabbrev1(x, modeIfTrue) for x in arglist]]
diff --git a/src/interp/i-analy.boot b/src/interp/i-analy.boot
index 28c5ea5a..4a66b64b 100644
--- a/src/interp/i-analy.boot
+++ b/src/interp/i-analy.boot
@@ -334,7 +334,7 @@ bottomUpCompilePredicate(pred, name) ==
 ++ By default, the ambiguity is resolved to types. 
 ++ See bottomUpIdentifier and isType.
 isUnambiguouslyConstructor(id,t) ==
-  niladicConstructorFromDB id => nil
+  niladicConstructor? id => nil
   k := getConstructorKindFromDB id or
         builtinFunctorName? id => "domain"
         builtinCategoryName? id => "category"
@@ -395,7 +395,7 @@ namedConstant(id,t) ==
   -- ignore polymorphic constants are not supported yet.
   doms := [getDCFromSystemModemap sysmm for sysmm in sysmms]
   candidates := nil
-  for dc in doms | niladicConstructorFromDB first dc repeat
+  for dc in doms | niladicConstructor? first dc repeat
     LASSOC(id,getConstructorOperationsFromDB dc.op) is [[sig,.,.,"CONST"]] =>
       candidates := [[dc,sig],:candidates]
   null candidates => nil
diff --git a/src/interp/i-eval.boot b/src/interp/i-eval.boot
index 5626f35c..8b10a9ac 100644
--- a/src/interp/i-eval.boot
+++ b/src/interp/i-eval.boot
@@ -102,7 +102,7 @@ evaluateType0 form ==
     builtinConstructor? op => [op,:[evaluateType arg for arg in argl]]
     constructor? op => evaluateType1 form
     nil
-  ident? form and niladicConstructorFromDB form => evaluateType [form]
+  ident? form and niladicConstructor? form => evaluateType [form]
   ident? form and (constructor? form or builtinConstructor? form) =>
     throwEvalTypeMsg("S2IE0003",[form,form])
 
@@ -150,7 +150,7 @@ evaluateType form ==
         symbolMember?(arg,args) => throwKeyedMsg("S2IL0032",[arg])
       form
     evaluateFormAsType form
-  ident? form and niladicConstructorFromDB form => evaluateType [form]
+  ident? form and niladicConstructor? form => evaluateType [form]
   ident? form and (constructor? form or builtinConstructor? form) =>
     throwEvalTypeMsg("S2IE0003",[form,form])
   evaluateFormAsType form
diff --git a/src/interp/nrunfast.boot b/src/interp/nrunfast.boot
index b679ec8b..1a881336 100644
--- a/src/interp/nrunfast.boot
+++ b/src/interp/nrunfast.boot
@@ -592,7 +592,7 @@ lazyDomainSet(lazyForm,thisDomain,slot) ==
 ++ resolved to constructor calls.  Note: it is assumed that no
 ++ such resolution has already occured.
 resolveNiladicConstructors form ==
-  ident? form and niladicConstructorFromDB form => [form]
+  ident? form and niladicConstructor? form => [form]
   form isnt [.,:.] => form
   form is ["QUOTE",:.] => form
   for args in tails rest form repeat
diff --git a/src/interp/postpar.boot b/src/interp/postpar.boot
index eaaa254d..264bcdc8 100644
--- a/src/interp/postpar.boot
+++ b/src/interp/postpar.boot
@@ -177,7 +177,7 @@ postAtom x ==
   x=0 => $Zero
   x=1 => $One
   x='T => "T$" -- rename T in spad code to T$
-  ident? x and niladicConstructorFromDB x => [x]
+  ident? x and niladicConstructor? x => [x]
   x="," => "%Comma"
   x = "^" => "**"  -- always use `**' internally for exponentiation
   x