From 01d00dd8cc892cd2666297557dd3dc68c0f273c8 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Mon, 22 Aug 2011 00:05:40 +0000 Subject: * interp/database.boot (niladicConstructor?): Rename from niladicConstructorFromDB. Use getConstructorFormFromDB. Adjust callers. --- src/interp/define.boot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/interp/define.boot') 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 -- cgit v1.2.3