diff options
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/interp/c-util.boot | 2 | ||||
| -rw-r--r-- | src/interp/category.boot | 6 | ||||
| -rw-r--r-- | src/interp/functor.boot | 2 | ||||
| -rw-r--r-- | src/interp/modemap.boot | 6 |
5 files changed, 15 insertions, 8 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 28d206b6..1ab79262 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,12 @@ 2011-02-08 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/category.boot(categoryObject?): Rename from isCategory. + * interp/c-util.boot: Adjust use. + * interp/functor.boot: Likewise. + * interp/modemap.boot: Likewise. + +2011-02-08 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/buildom.boot: Don't cache instantiation of builtin domains, as the comment at the top of the file says. diff --git a/src/interp/c-util.boot b/src/interp/c-util.boot index 6c8cbbc8..6d770390 100644 --- a/src/interp/c-util.boot +++ b/src/interp/c-util.boot @@ -920,7 +920,7 @@ sublisV(p,e) == suba(p,e) == string? e => e -- no need to descend vectors unless they are categories - isCategory e => LIST2VEC [suba(p,e.i) for i in 0..MAXINDEX e] + categoryObject? e => LIST2VEC [suba(p,e.i) for i in 0..MAXINDEX e] atom e => (y:= ASSQ(e,p) => rest y; e) u:= suba(p,first e) v:= suba(p,rest e) diff --git a/src/interp/category.boot b/src/interp/category.boot index e788700f..cd4a070c 100644 --- a/src/interp/category.boot +++ b/src/interp/category.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 @@ -46,8 +46,8 @@ $NewCatVec := nil --% ++ Returns true if `a' is a category (runtime) object. -isCategory: %Thing -> %Boolean -isCategory a == +categoryObject?: %Thing -> %Boolean +categoryObject? a == vector? a and #a > 5 and vectorRef(a,3) = $Category ++ Return true if the form `x' designates an instantiaion of a diff --git a/src/interp/functor.boot b/src/interp/functor.boot index fff6c141..4e066e9a 100644 --- a/src/interp/functor.boot +++ b/src/interp/functor.boot @@ -57,7 +57,7 @@ DomainPrint(D,brief) == env:= null $e => $EmptyEnvironment $e --in case we are called from top level - isCategory D => CategoryPrint(D,env) + categoryObject? D => CategoryPrint(D,env) $Sublis:= [[keyItem D,:'original]] SAY '"-----------------------------------------------------------------------" DomainPrint1(D,NIL,env) diff --git a/src/interp/modemap.boot b/src/interp/modemap.boot index 545d56e3..375ea972 100644 --- a/src/interp/modemap.boot +++ b/src/interp/modemap.boot @@ -260,7 +260,7 @@ substituteCategoryArguments(argl,catform) == augModemapsFromCategoryRep(domainName,repDefn,functorBody,categoryForm,e) == [fnAlist,e]:= evalAndSub(domainName,domainName,domainName,categoryForm,e) [repFnAlist,e]:= evalAndSub("Rep","Rep",repDefn,getmode(repDefn,e),e) - catform:= (isCategory categoryForm => categoryForm.0; categoryForm) + catform:= (categoryObject? categoryForm => categoryForm.0; categoryForm) compilerMessage('"Adding %1p modemaps",[domainName]) e:= putDomainsInScope(domainName,e) for [lhs:=[op,sig,:.],cond,fnsel] in fnAlist repeat @@ -281,7 +281,7 @@ AMFCR_,redefined(opname,u) == augModemapsFromCategory(domainName,domainView,functorForm,categoryForm,e) == [fnAlist,e]:= evalAndSub(domainName,domainView,functorForm,categoryForm,e) - -- catform:= (isCategory categoryForm => categoryForm.0; categoryForm) + -- catform:= (categoryObject? categoryForm => categoryForm.0; categoryForm) -- catform appears not to be used, so why set it? --if not $InteractiveMode then compilerMessage('"Adding %1p modemaps",[domainName]) @@ -314,7 +314,7 @@ augModemapsFromCategory(domainName,domainView,functorForm,categoryForm,e) == evalAndSub(domainName,viewName,functorForm,form,$e) == $lhsOfColon: local:= domainName - isCategory form => [substNames(domainName,viewName,functorForm,form.1),$e] + categoryObject? form => [substNames(domainName,viewName,functorForm,form.1),$e] --next lines necessary-- see MPOLY for which $ is actual arg. --- RDJ 3/83 if CONTAINED("$$",form) then $e:= put("$$","mode",get("$","mode",$e),$e) opAlist:= getOperationAlist(domainName,functorForm,form) |