aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/interp/as.boot4
-rw-r--r--src/interp/br-op1.boot2
-rw-r--r--src/interp/pspad1.boot4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/interp/as.boot b/src/interp/as.boot
index e1b35e2f..c6ea5bde 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 = "%" => "$"
- niladicConstructorFromDB form => [form]
+ GETL(form,"NILADIC") => [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]
- niladicConstructorFromDB x => [x]
+ GETL(x,"NILADIC") => [x]
--x = 'Type => '(Type)
x = '_% => '_$
x
diff --git a/src/interp/br-op1.boot b/src/interp/br-op1.boot
index 8f7fe8c8..1f9825bb 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 niladicConstructorFromDB x => x
+ form is [x] and GETL(x,"NILADIC") => x
[niladicHack x for x in form]
--============================================================================
diff --git a/src/interp/pspad1.boot b/src/interp/pspad1.boot
index 39f86ec2..775236e0 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 niladicConstructorFromDB p => p
+ name is [p] and GETL(p,"NILADIC") => 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 =>
- niladicConstructorFromDB op => formatOp op
+ GETL(op,"NILADIC") => formatOp op
formatOp op and format "()"
formatOp op and formatFunctionCallTail argl