From 26c1f12d4d829f293ee9265690ddfb451119df1e Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Thu, 14 Aug 2008 00:48:08 +0000
Subject: Cleanup GETL(x,'NILADIC)

---
 src/interp/as.boot     | 4 ++--
 src/interp/br-op1.boot | 2 +-
 src/interp/pspad1.boot | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/interp/as.boot b/src/interp/as.boot
index dcb5bf80..e1b35e2f 100644
--- a/src/interp/as.boot
+++ b/src/interp/as.boot
@@ -547,7 +547,7 @@ asytranForm1(form,levels,local?) ==
   if form = '_% then $hasPerCent := true
   IDENTP form =>
     form = "%" => "$"
-    GETL(form,'NILADIC) => [form]
+    niladicConstructorFromDB form => [form]
     form
   [asytranForm(x,levels,local?) for x in form]
 
@@ -925,7 +925,7 @@ asyTypeUnit x ==
     fn = 'Declare and r is [name,typ,:.] => asyTypeUnitDeclare(name,typ)
     x is '(_%) => '(_$)
     [fn,:asyTypeUnitList r]
-  GETL(x,'NILADIC) => [x]
+  niladicConstructorFromDB x => [x]
 --x = 'Type => '(Type)
   x = '_% => '_$
   x
diff --git a/src/interp/br-op1.boot b/src/interp/br-op1.boot
index 76aa6e69..8f7fe8c8 100644
--- a/src/interp/br-op1.boot
+++ b/src/interp/br-op1.boot
@@ -922,7 +922,7 @@ mathform2HtString form == escapeString
 
 niladicHack form ==
   atom form => form
-  form is [x] and GETL(x,'NILADIC) => x
+  form is [x] and niladicConstructorFromDB x => x
   [niladicHack x for x in form]
 
 --============================================================================
diff --git a/src/interp/pspad1.boot b/src/interp/pspad1.boot
index 2ad7b5d2..39f86ec2 100644
--- a/src/interp/pspad1.boot
+++ b/src/interp/pspad1.boot
@@ -311,7 +311,7 @@ formatDOLLAR ['DOLLAR,x,y] == formatDollar1(y, x)
 formatDollar1(name,arg) ==
   id :=
     IDENTP name => name
-    name is [p] and GETL(p,'NILADIC) => p
+    name is [p] and niladicConstructorFromDB p => p
     name
   format arg and format "$$" and formatForcePren id
  
@@ -379,7 +379,7 @@ formatFunctionCall u ==
 formatFunctionCall1 [op,:argl] ==
 --null argl and getConstructorProperty(op,'niladic) => formatOp op
   null argl => 
-    GETL(op,'NILADIC) => formatOp op
+    niladicConstructorFromDB op => formatOp op
     formatOp op and format "()"
   formatOp op and formatFunctionCallTail argl 
  
-- 
cgit v1.2.3