* interp/as.boot: Use getConstructorAbbreviationFromDB.

	* interp/br-con.boot: Likewise.
	* interp/br-data.boot: Likewise.
	* interp/br-prof.boot: Likewise.
	* interp/br-util.boot: Likewise.
	* interp/c-doc.boot: Likewise.
	* interp/clammed.boot: Likewise.
	* interp/database.boot: Likewise.
	* interp/define.boot: Likewise.
	* interp/format.boot: Likewise.
	* interp/functor.boot: Likewise.
	* interp/g-cndata.boot: Likewise.
	* interp/i-funsel.boot: Likewise.
	* interp/i-output.boot: Likewise.
	* interp/lisplib.boot: Likewise.
	* interp/pspad1.boot: Likewise.

18 files changed, 51 insertions, 28 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c7e8d399..82cf2210 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,22 @@
+2011-03-05  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	* interp/as.boot: Use getConstructorAbbreviationFromDB.
+	* interp/br-con.boot: Likewise.
+	* interp/br-data.boot: Likewise.
+	* interp/br-prof.boot: Likewise.
+	* interp/br-util.boot: Likewise.
+	* interp/c-doc.boot: Likewise.
+	* interp/clammed.boot: Likewise.
+	* interp/database.boot: Likewise.
+	* interp/define.boot: Likewise.
+	* interp/format.boot: Likewise.
+	* interp/functor.boot: Likewise.
+	* interp/g-cndata.boot: Likewise.
+	* interp/i-funsel.boot: Likewise.
+	* interp/i-output.boot: Likewise.
+	* interp/lisplib.boot: Likewise.
+	* interp/pspad1.boot: Likewise.
+
 2011-03-04  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	* interp/nrunopt.boot: Move content to define.boot, interop.boot,
diff --git a/src/interp/as.boot b/src/interp/as.boot
index d7e1aac1..d2f3eb55 100644
--- a/src/interp/as.boot
+++ b/src/interp/as.boot
@@ -754,7 +754,7 @@ asySplit(name,end) ==
 
 createAbbreviation s ==
   if string? s then s := makeSymbol s
-  a := constructor? s
+  a := getConstructorAbbreviationFromDB s
   a ~= s => a
   nil
 
diff --git a/src/interp/br-con.boot b/src/interp/br-con.boot
index d12e0d23..3ad5882b 100644
--- a/src/interp/br-con.boot
+++ b/src/interp/br-con.boot
@@ -941,7 +941,7 @@ dbShowCons(htPage,key,:options) ==
     abbrev? := htpProperty(htPage,'exclusion) = 'abbrs
     u := [x for x in cAlist | test] where test() ==
       conname := CAAR x
-      subject := (abbrev? => constructor? conname; conname)
+      subject := (abbrev? => getConstructorAbbreviationFromDB conname; conname)
       superMatch?(filter,DOWNCASE STRINGIMAGE subject)
     null u => emptySearchPage('"constructor",filter)
     htPage := htInitPageNoScroll(htCopyProplist htPage)
diff --git a/src/interp/br-data.boot b/src/interp/br-data.boot
index 822efdc3..b8fa1f2e 100644
--- a/src/interp/br-data.boot
+++ b/src/interp/br-data.boot
@@ -244,7 +244,7 @@ dbAugmentConstructorDataTable() ==
 
 dbHasExamplePage conname ==
   sname    := STRINGIMAGE conname
-  abb      := constructor? conname
+  abb      := getConstructorAbbreviationFromDB conname
   ucname   := UPCASE STRINGIMAGE abb
   pathname :=strconc(systemRootDirectory(),'"/share/hypertex/pages/",ucname,'".ht")
   isExistingFile pathname => makeSymbol strconc(sname,'"XmpPage")
diff --git a/src/interp/br-prof.boot b/src/interp/br-prof.boot
index 64274acf..bb5d4e32 100644
--- a/src/interp/br-prof.boot
+++ b/src/interp/br-prof.boot
@@ -253,7 +253,7 @@ hasNewInfoText u ==
 getInfoAlist conname ==
   cat? := getConstructorKindFromDB conname = "category"
   if cat? then conname := makeSymbol strconc(STRINGIMAGE conname,'"&")
-  abb := constructor? conname or return '"not a constructor"
+  abb := getConstructorAbbreviationFromDB conname or return '"not a constructor"
   fs  := strconc(PNAME abb,'".NRLIB/info")
   inStream :=
     PROBE_-FILE fs => OPEN fs
diff --git a/src/interp/br-util.boot b/src/interp/br-util.boot
index 8ee40a5d..5ad260ae 100644
--- a/src/interp/br-util.boot
+++ b/src/interp/br-util.boot
@@ -1,6 +1,6 @@
 -- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007-2010, Gabriel Dos Reis.
+-- Copyright (C) 2007-2011, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -532,7 +532,8 @@ emptySearchPage(kind,filter,:options) ==
   htSay '"}}"
   htShowPage()
 
-isLoaded? conform == GETL(constructor? opOf conform,'LOADED)
+isLoaded? conform ==
+  property(getConstructorAbbreviationFromDB opOf conform,'LOADED)
 
 string2Integer s ==
   and/[digit? (s.i) for i in 0..MAXINDEX s] => readInteger s
diff --git a/src/interp/c-doc.boot b/src/interp/c-doc.boot
index c738b784..206995d9 100644
--- a/src/interp/c-doc.boot
+++ b/src/interp/c-doc.boot
@@ -63,12 +63,14 @@ getOfCategoryArgument pred ==
   nil
 
 getDocForCategory(name,op,sig) ==
-  getOpDoc(constructor? name,op,sig) or
-    or/[getOpDoc(constructor? x,op,sig) for x in whatCatCategories name]
+  getOpDoc(getConstructorAbbreviationFromDB name,op,sig) or
+    or/[getOpDoc(getConstructorAbbreviationFromDB x,op,sig)
+         for x in whatCatCategories name]
 
 getDocForDomain(name,op,sig) ==
-  getOpDoc(constructor? name,op,sig) or
-    or/[getOpDoc(constructor? x,op,sig) for x in whatCatExtDom name]
+  getOpDoc(getConstructorAbbreviationFromDB name,op,sig) or
+    or/[getOpDoc(getConstructorAbbreviationFromDB x,op,sig)
+          for x in whatCatExtDom name]
 
 ++ returns the documentation, known to the global DB, for a operator
 ++ `op' and given signature `sigPart'.  The operator `op' is assumed
diff --git a/src/interp/clammed.boot b/src/interp/clammed.boot
index 9894f53b..eb3eda6d 100644
--- a/src/interp/clammed.boot
+++ b/src/interp/clammed.boot
@@ -1,6 +1,6 @@
 -- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007-2010, Gabriel Dos Reis.
+-- Copyright (C) 2007-2011, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -106,7 +106,7 @@ isValidType form ==
   form = '(Complex (AlgebraicNumber)) => NIL
   form is ['Expression, ['Kernel, . ]] => NIL
   form is [op,:argl] =>
-    null constructor? op => nil
+    not constructor? op => nil
     cosig := getDualSignatureFromDB op
     cosig and null rest cosig => -- niladic constructor
         null argl => true
diff --git a/src/interp/database.boot b/src/interp/database.boot
index d7e98938..cf823270 100644
--- a/src/interp/database.boot
+++ b/src/interp/database.boot
@@ -1,6 +1,6 @@
 -- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007-2010, Gabriel Dos Reis.
+-- Copyright (C) 2007-2011, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -639,7 +639,7 @@ updateDatabase(fname,cname,systemdir?) ==
  -- for now in NRUNTIME do database update only if forced
   not $forceDatabaseUpdate => nil
   -- these modemaps are never needed in the old scheme
-  if oldFname := constructor? cname then
+  if oldFname := getConstructorAbbreviationFromDB cname then
     clearClams()
     clearAllSlams []
     if GETL(cname, 'LOADED) then
diff --git a/src/interp/define.boot b/src/interp/define.boot
index 66608c6b..65f6fd3c 100644
--- a/src/interp/define.boot
+++ b/src/interp/define.boot
@@ -819,7 +819,7 @@ compDefineCategory2(form,signature,specialCases,body,m,e,
       $lisplibParents  :=         
         getParentsFor($op,$FormalMapVariableList,$lisplibCategory)
       $lisplibAncestors := computeAncestorsOf($form,nil)
-      $lisplibAbbreviation := constructor? $op
+      $lisplibAbbreviation := getConstructorAbbreviationFromDB $op
       form':=[op',:sargl]
       augLisplibModemapsFromCategory(form',formalBody,signature')
     [fun,$Category,e]
@@ -991,7 +991,7 @@ compDefineFunctor1(df is ['DEF,form,signature,nils,body],
       $lisplibParents  :=         
         getParentsFor($op,$FormalMapVariableList,$lisplibCategory)
       $lisplibAncestors := computeAncestorsOf($form,nil)
-      $lisplibAbbreviation := constructor? $op
+      $lisplibAbbreviation := getConstructorAbbreviationFromDB $op
     $insideFunctorIfTrue:= false
     if $LISPLIB then
       $lisplibKind:=
diff --git a/src/interp/format.boot b/src/interp/format.boot
index 519d0169..9f225f0c 100644
--- a/src/interp/format.boot
+++ b/src/interp/format.boot
@@ -398,7 +398,7 @@ form2String1 u ==
     -- string literals (e.g. "failed") masquerading as constructors
     stringImage op
   op='Join or op= 'mkCategory => formJoin1(op,argl)
-  $InteractiveMode and IDENTP op and (u:= constructor? op) =>
+  $InteractiveMode and IDENTP op and (u:= getConstructorAbbreviationFromDB op) =>
     null argl => app2StringWrap(formWrapId constructorName op, u1)
     op = "NTuple"  => [ form2String1 first argl, '"*"]
     op = "Map"     => ['"(",:formatSignature0 [argl.1,argl.0],'")"]
diff --git a/src/interp/functor.boot b/src/interp/functor.boot
index cc6e9611..9f78f0c9 100644
--- a/src/interp/functor.boot
+++ b/src/interp/functor.boot
@@ -906,7 +906,7 @@ getCaps x ==
  
 getAbbreviation(name,c) ==
   --returns abbreviation of name with c arguments
-  x := constructor? name
+  x := getConstructorAbbreviationFromDB name
   X := ASSQ(x,$abbreviationTable) =>
     N:= ASSQ(name,rest X) =>
       C:= ASSQ(c,rest N) => rest C --already there
diff --git a/src/interp/g-cndata.boot b/src/interp/g-cndata.boot
index 5f90bc61..8e922224 100644
--- a/src/interp/g-cndata.boot
+++ b/src/interp/g-cndata.boot
@@ -156,10 +156,10 @@ abbreviate u ==
   u is ['Union,:arglist] =>
     ['Union,:[abbreviate a for a in arglist]]
   u is [op,:arglist] =>
-    abb := constructor?(op) =>
+    abb := getConstructorAbbreviationFromDB(op) =>
       [abb,:condAbbrev(arglist,getPartialConstructorModemapSig(op))]
     u
-  constructor?(u) or u
+  getConstructorAbbreviationFromDB(u) or u
  
 unabbrev u == unabbrev1(u,nil)
  
diff --git a/src/interp/i-funsel.boot b/src/interp/i-funsel.boot
index 4774af7e..b52f11b9 100644
--- a/src/interp/i-funsel.boot
+++ b/src/interp/i-funsel.boot
@@ -1,6 +1,6 @@
 -- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007-2010, Gabriel Dos Reis.
+-- Copyright (C) 2007-2011, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -1584,7 +1584,7 @@ hasSig(dom,foo,sig,SL) ==
   -- tests whether domain dom has function foo with signature sig
   -- under substitution SL
   $domPvar: local := nil
-  fun:= constructor? first dom =>
+  fun:= getConstructorAbbreviationFromDB first dom =>
     S0:= constructSubst dom
     p := ASSQ(foo,getConstructorOperationsFromDB dom.op) =>
       for [x,.,cond,.] in rest p until not (S='failed) repeat
diff --git a/src/interp/i-output.boot b/src/interp/i-output.boot
index 901dbed4..e36eb56b 100644
--- a/src/interp/i-output.boot
+++ b/src/interp/i-output.boot
@@ -1641,7 +1641,7 @@ getOutputAbbreviatedForm form ==
   form is [op,:argl] =>
     op in '(Union Record) => outputDomainConstructor form
     op is "Mapping" => formatMapping argl
-    u:= constructor? op or op
+    u:= getConstructorAbbreviationFromDB op or op
     null argl => u
     ml:= getPartialConstructorModemapSig(op)
     argl:= [fn for x in argl for m in ml] where fn() ==
diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot
index 86f213bc..b3afc62a 100644
--- a/src/interp/i-syscmd.boot
+++ b/src/interp/i-syscmd.boot
@@ -2511,7 +2511,8 @@ reportOpsFromUnitDirectly unitForm ==
   NIL
 
 reportOpsFromLisplib(op,u) ==
-  null(fn:= constructor? op) => sayKeyedMsg("S2IZ0054",[u])
+  null(fn:= getConstructorAbbreviationFromDB op) =>
+    sayKeyedMsg("S2IZ0054",[u])
   argml :=
     (s := getConstructorSignature op) => KDR s
     NIL
diff --git a/src/interp/lisplib.boot b/src/interp/lisplib.boot
index 4d754bbe..2bd63c11 100644
--- a/src/interp/lisplib.boot
+++ b/src/interp/lisplib.boot
@@ -410,7 +410,7 @@ makeConstructorsAutoLoad() ==
     if niladicConstructorFromDB cnam
      then PUT(cnam,'NILADIC,'T)
      else REMPROP(cnam,'NILADIC)
-    systemDependentMkAutoload(constructor? cnam,cnam)
+    systemDependentMkAutoload(getConstructorAbbreviationFromDB cnam,cnam)
  
 systemDependentMkAutoload(fn,cnam) ==
     FBOUNDP(cnam) => "next"
@@ -432,9 +432,9 @@ autoLoad(abb,cname) ==
   symbolFunction cname
 
 setAutoLoadProperty(name) ==
---  abb := constructor? name
+--  abb := getConstructorAbbreviationFromDB name
   REMPROP(name,'LOADED)
-  symbolFunction(name) := mkAutoLoad(constructor? name, name)
+  symbolFunction(name) := mkAutoLoad(getConstructorAbbreviationFromDB name, name)
 
 unloadOneConstructor(cnam,fn) ==
     REMPROP(cnam,'LOADED)
diff --git a/src/interp/pspad1.boot b/src/interp/pspad1.boot
index 2adbd906..cd3a08dd 100644
--- a/src/interp/pspad1.boot
+++ b/src/interp/pspad1.boot
@@ -589,7 +589,7 @@ formatDEF0(["DEF",form,tlist,sclist,body],$DEFdepth) ==
       form
   con := opOf $form
   $comments: local := SUBST('_$,'_%,getConstructorDocumentationFromDB con)
-  $abb :local := constructor? opOf $form
+  $abb :local := getConstructorAbbreviationFromDB opOf $form
   if $DEFdepth < 2 then
     condoc := (u := LASSOC('constructor,$comments)) and KDR KAR u or ['""]
     $numberOfSpills := -1