diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-10-01 14:02:30 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-10-01 14:02:30 +0000 |
| commit | 73374b314b15f2a313718d0e347a1050d1d1a405 (patch) | |
| tree | e893bb8f428e229c04445ffc11fdc0a2f3f6a1f5 /src/interp/trace.boot | |
| parent | 4cb6f558586ccd4893c2acd088bba66654f6bf19 (diff) | |
| download | open-axiom-73374b314b15f2a313718d0e347a1050d1d1a405.tar.gz | |
* boot/utility.boot: Define BOOTTRAN namespace.
(setUnion): New.
(setDifference): New.
* boot/translator.boot (packageBody): New.
(translateToplevel): Use it. Translate namespace definition.
* boot/tokens.boot: Replace bitmask with bitref.
Do not translate setDifference and setUnion.
* boot/parser.boot (bpDef): Now include namespace definition.
(bpComma): Remove namespace rule as subsumed by Where rule.
* boot/Makefile.in: Remove dependencies on initial-env.lisp.
(AXIOM_LOCAL_LISP_sources): Remove as unused,
(boot_sources): Remove as redundant with boot_SOURCES.
* boot/initial-env.lisp: Remove.
Diffstat (limited to 'src/interp/trace.boot')
| -rw-r--r-- | src/interp/trace.boot | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/interp/trace.boot b/src/interp/trace.boot index 9d079469..5e2e92d4 100644 --- a/src/interp/trace.boot +++ b/src/interp/trace.boot @@ -365,7 +365,7 @@ getMapSubNames(l) == for mapName in l repeat lmm:= get(mapName,'localModemap,$InteractiveFrame) => subs:= append([[mapName,:second mm] for mm in lmm],subs) - union(subs,getPreviousMapSubNames UNIONQ(_/TRACENAMES, + setUnion(subs,getPreviousMapSubNames setUnion(_/TRACENAMES, $lastUntraced)) getPreviousMapSubNames(traceNames) == @@ -411,7 +411,7 @@ untraceMapSubNames traceNames == for name in (subs:= ASSOCRIGHT $mapSubNameAlist) | symbolMember?(name,_/TRACENAMES) repeat _/UNTRACE_,2(name,nil) - $lastUntraced:= SETDIFFERENCE($lastUntraced,subs) + $lastUntraced := setDifference($lastUntraced,subs) funfind("functor","opname") == ops:= isFunctor functor @@ -528,7 +528,7 @@ untraceDomainLocalOps(dom,lops) == untraceAllDomainLocalOps(dom) == nil -- abb := abbreviate dom -- actualLops := getLocalOpsFromLisplib abb --- null (l := intersection(actualLops,_/TRACENAMES)) => nil +-- null (l := setIntersection(actualLops,_/TRACENAMES)) => nil -- _/UNTRACE_,1(l,nil) -- nil @@ -772,7 +772,7 @@ tracelet(fn,vars) == fn = 'Undef => nil vars:= vars="all" => "all" - l:= LASSOC(fn,$letAssoc) => union(vars,l) + l:= LASSOC(fn,$letAssoc) => setUnion(vars,l) vars $letAssoc:= [[fn,:vars],:$letAssoc] if $letAssoc then SETLETPRINTFLAG true @@ -792,7 +792,7 @@ breaklet(fn,vars) == fn = "Undef" => nil fnEntry:= LASSOC(fn,$letAssoc) vars:= - pair := symbolLassoc("BREAK",fnEntry) => union(vars,rest pair) + pair := symbolLassoc("BREAK",fnEntry) => setUnion(vars,rest pair) vars $letAssoc:= null fnEntry => [[fn,:[["BREAK",:vars]]],:$letAssoc] |