diff options
| -rw-r--r-- | src/interp/compiler.boot | 93 | ||||
| -rw-r--r-- | src/interp/define.boot | 77 | ||||
| -rw-r--r-- | src/interp/i-special.boot | 2 |
3 files changed, 89 insertions, 83 deletions
diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot index c8b9553c..d3fa6fde 100644 --- a/src/interp/compiler.boot +++ b/src/interp/compiler.boot @@ -56,11 +56,11 @@ comp3: (%Maybe %Database,%Form,%Mode,%Env) -> %Maybe %Triple compExpression: (%Maybe %Database,%Form,%Mode,%Env) -> %Maybe %Triple compAtom: (%Form,%Mode,%Env) -> %Maybe %Triple compSymbol: (%Form,%Mode,%Env) -> %Maybe %Triple -compForm: (%Form,%Mode,%Env) -> %Maybe %Triple -compForm1: (%Form,%Mode,%Env) -> %Maybe %Triple -compForm2: (%Form,%Mode,%Env,%List %Modemap) -> %Maybe %Triple -compForm3: (%Form,%Mode,%Env,%List %Modemap) -> %Maybe %Triple -compArgumentsAndTryAgain: (%Form,%Mode,%Env) -> %Maybe %Triple +compForm: (%Maybe %Database,%Form,%Mode,%Env) -> %Maybe %Triple +compForm1: (%Maybe %Database,%Form,%Mode,%Env) -> %Maybe %Triple +compForm2: (%Maybe %Database,%Form,%Mode,%Env,%List %Modemap) -> %Maybe %Triple +compForm3: (%Maybe %Database,%Form,%Mode,%Env,%List %Modemap) -> %Maybe %Triple +compArgumentsAndTryAgain: (%Maybe %Database,%Form,%Mode,%Env) -> %Maybe %Triple compWithMappingMode: (%Form,%Mode,%Env) -> %Maybe %Triple compFormMatch: (%Modemap,%List %Mode) -> %Boolean compFormWithModemap: (%Form,%Mode,%Env,%Modemap) -> %Maybe %Triple @@ -160,15 +160,15 @@ compNoStacking1(db,x,m,e,$compStack) == comp2(db,x,m,e) == [y,m',e] := T := comp3(db,x,m,e) or return nil T.mode = $Category => T - --if cons? y and isDomainForm(y,e) then e := addDomain(x,e) + --if cons? y and isDomainForm(y,e) then e := addDomain(db,x,e) --line commented out to prevent adding derived domain forms - m~=m' and isDomainForm(m',e) => [y,m',addDomain(m',e)] + m~=m' and isDomainForm(m',e) => [y,m',addDomain(db,m',e)] --isDomainForm test needed to prevent error while compiling Ring T comp3(db,x,m,$e) == --returns a Triple or %else nil to signalcan't do' - $e:= addDomain(m,$e) + $e:= addDomain(db,m,$e) e:= $e --for debugging purposes m is ["Mapping",:.] => compWithMappingMode(x,m,e) m is ['QUOTE,a] => (x=a => [x,m,$e]; nil) @@ -186,7 +186,7 @@ comp3(db,x,m,$e) == op is 'DEF => compDefine(db,x,m,e) t:= compExpression(db,x,m,e) t is [x',m',e'] and not listMember?(m',getDomainsInScope e') => - [x',m',addDomain(m',e')] + [x',m',addDomain(db,m',e')] t ++ We just determined that `op' is called with argument list `args', where @@ -354,7 +354,7 @@ compExpression(db,x,m,e) == -- special forms have dedicated compilers. (op := x.op) and ident? op and (fn := property(op,'SPECIAL)) => FUNCALL(fn,x,m,e) - compForm(x,m,e) + compForm(db,x,m,e) ++ Subroutine of compAtomWithModemap. ++ `Ts' is list of (at least 2) triples. Return the one with most @@ -480,20 +480,20 @@ hasType(x,e) == --% General Forms -compForm(form,m,e) == +compForm(db,form,m,e) == T := - compForm1(form,m,e) or compArgumentsAndTryAgain(form,m,e) or return + compForm1(db,form,m,e) or compArgumentsAndTryAgain(db,form,m,e) or return stackMessageIfNone ["cannot compile","%b",form,"%d"] T -compArgumentsAndTryAgain(form is [.,:argl],m,e) == +compArgumentsAndTryAgain(db,form is [.,:argl],m,e) == -- used in case: f(g(x)) where f is in domain introduced by -- comping g, e.g. for (ELT (ELT x a) b), environment can have no -- modemap with selector b form is ["elt",a,.] => - ([.,.,e]:= comp(a,$EmptyMode,e) or return nil; compForm1(form,m,e)) + ([.,.,e]:= comp(a,$EmptyMode,e) or return nil; compForm1(db,form,m,e)) +/[(e := T.env; 1) for x in argl | T := comp(x,$EmptyMode,e)] = 0 => nil - compForm1(form,m,e) + compForm1(db,form,m,e) outputComp(x,e) == u:=comp(['_:_:,x,$OutputForm],$OutputForm,e) => u @@ -503,7 +503,7 @@ outputComp(x,e) == [['coerceUn2E,x,v.mode],$OutputForm,e] [x,$OutputForm,e] -compForm1(form is [op,:argl],m,e) == +compForm1(db,form is [op,:argl],m,e) == symbolMember?(op,$coreDiagnosticFunctions) => [[op,:[([.,.,e]:=outputComp(x,e)).expr for x in argl]],m,e] op is ["elt",domain,op'] => @@ -515,20 +515,20 @@ compForm1(form is [op,:argl],m,e) == -- Next clause added JHD 8/Feb/94: the clause after doesn't work -- since addDomain refuses to add modemaps from Mapping (domain is ['Mapping,:.]) and - (ans := compForm2([op',:argl],m,e:= augModemapsFromDomain1(domain,domain,e), + (ans := compForm2(db,[op',:argl],m,e:= augModemapsFromDomain1(db,domain,domain,e), [x for x in getFormModemaps([op',:argl],e) | x.mmDC = domain])) => ans - ans := compForm2([op',:argl],m,e:= addDomain(domain,e), + ans := compForm2(db,[op',:argl],m,e:= addDomain(db,domain,e), [x for x in getFormModemaps([op',:argl],e) | x.mmDC = domain]) => ans (op'="construct") and coerceable(domain,m,e) => (T:= comp([op',:argl],domain,e) or return nil; coerce(T,m)) nil - T := compForm2(form,m,e,getFormModemaps(form,e)) => T + T := compForm2(db,form,m,e,getFormModemaps(form,e)) => T --FIXME: remove next line when the parser is fixed. form = $Zero or form = $One => nil compToApply(op,argl,m,e) -compForm2(form is [op,:argl],m,e,modemapList) == +compForm2(db,form is [op,:argl],m,e,modemapList) == modemapList = nil => nil aList := pairList($TriangleVariableList,argl) modemapList := applySubst(aList,modemapList) @@ -546,9 +546,9 @@ compForm2(form is [op,:argl],m,e,modemapList) == or/[x for x in Tl] => partialModeList := [(x => x.mode; nil) for x in Tl] - compFormPartiallyBottomUp(form,m,e,modemapList,partialModeList) or - compForm3(form,m,e,modemapList) - compForm3(form,m,e,modemapList) + compFormPartiallyBottomUp(db,form,m,e,modemapList,partialModeList) or + compForm3(db,form,m,e,modemapList) + compForm3(db,form,m,e,modemapList) ++ We are about to compile a call. Returns true if each argument ++ partially matches (as could be determined by type inference) the @@ -562,12 +562,12 @@ compFormMatch(mm,partialModeList) == main where first b = nil => match(rest a,rest b) first a=first b and match(rest a,rest b) -compFormPartiallyBottomUp(form,m,e,modemapList,partialModeList) == +compFormPartiallyBottomUp(db,form,m,e,modemapList,partialModeList) == mmList := [mm for mm in modemapList | compFormMatch(mm,partialModeList)] => - compForm3(form,m,e,mmList) + compForm3(db,form,m,e,mmList) nil -compForm3(form is [op,:argl],m,e,modemapList) == +compForm3(db,form is [op,:argl],m,e,modemapList) == T := or/ [compFormWithModemap(form,m,e,first (mml:= ml)) @@ -864,7 +864,8 @@ compSubsetCategory(["SubsetCategory",cat,R],m,e) == compCons: (%Form,%Mode,%Env) -> %Maybe %Triple compCons1: (%Form,%Mode,%Env) -> %Maybe %Triple -compCons(form,m,e) == compCons1(form,m,e) or compForm(form,m,e) +compCons(form,m,e) == + compCons1(form,m,e) or compForm(currentDB e,form,m,e) compCons1(["CONS",x,y],m,e) == [x,mx,e]:= comp(x,$EmptyMode,e) or return nil @@ -908,6 +909,7 @@ setqSetelt([v,:s],val,m,E) == setqSingle(id,val,m,E) == checkVariableName id + db := currentDB E $insideSetqSingleIfTrue: local:= true --used for comping domain forms within functions currentProplist:= getProplist(id,E) @@ -940,11 +942,10 @@ setqSingle(id,val,m,E) == -- single domains have constant values in their scopes, we might just -- as well take advantage of that at compile-time where appropriate. e' := put(id,'%macro,val,e') - e':= augModemapsFromDomain1(id,val,e') + e':= augModemapsFromDomain1(db,id,val,e') --all we do now is to allocate a slot number for lhs --e.g. the %LET form below will be changed by putInLocalDomainReferences form := - db := currentDB e' k := assocIndex(db,id) => ['%store,['%tref,'$,k],x] ["%LET",id,x] [form,m',e'] @@ -1068,13 +1069,14 @@ compWhere([.,form,:exprList],m,eInit) == compConstruct: (%Form,%Mode,%Env) -> %Maybe %Triple compConstruct(form is ["construct",:l],m,e) == + db := currentDB e y:= modeIsAggregateOf("List",m,e) => T:= compList(l,["List",second y],e) => coerce(T,m) - compForm(form,m,e) + compForm(db,form,m,e) y:= modeIsAggregateOf("Vector",m,e) => T:= compVector(l,["Vector",second y],e) => coerce(T,m) - compForm(form,m,e) - T:= compForm(form,m,e) => T + compForm(db,form,m,e) + T:= compForm(db,form,m,e) => T for D in getDomainsInScope e repeat (y:=modeIsAggregateOf("List",D,e)) and (T:= compList(l,["List",second y],e)) and (T':= coerce(T,m)) => @@ -1311,7 +1313,8 @@ getExternalSymbolMode(op,lang,e) == compElt: (%Form,%Mode,%Env) -> %Maybe %Triple compElt(form,m,E) == - form isnt ["elt",aDomain,anOp] => compForm(form,m,E) + db := currentDB E + form isnt ["elt",aDomain,anOp] => compForm(db,form,m,E) aDomain is "Lisp" or (aDomain is ["Foreign",lang] and lang="Builtin") => [anOp',m,E] where anOp'() == (anOp = $Zero => 0; anOp = $One => 1; anOp) lang ~= nil => @@ -1319,7 +1322,7 @@ compElt(form,m,E) == op := get(anOp,"%Link",E) or anOp coerce([op,opMode,E],m) isDomainForm(aDomain,E) => - E := addDomain(aDomain,E) + E := addDomain(db,aDomain,E) mmList:= getModemapListFromDomain(internalName anOp,0,aDomain,E) modemap:= -- FIXME: do this only for constants. @@ -1336,7 +1339,7 @@ compElt(form,m,E) == #sig ~= 2 and val isnt ["CONST",:.] => nil val := genDeltaEntry(opOf anOp,modemap,E) coerce([['%call,val],second sig,E], m) - compForm(form,m,E) + compForm(db,form,m,E) --% HAS @@ -1445,7 +1448,7 @@ compImport: (%Form,%Mode,%Env) -> %Triple compImport(["import",:doms],m,e) == if not $bootStrapMode then for dom in doms repeat - e := addDomain(dom,e) + e := addDomain(currentDB e,dom,e) ["/throwAway",$NoValueMode,e] --% Foreign Function Interface @@ -1645,7 +1648,7 @@ getModemapList(op,nargs,e) == -- An angry JHD - August 15th., 1984 compCase(["case",x,m'],m,e) == - e:= addDomain(m',e) + e:= addDomain(currentDB e,m',e) T:= compCase1(x,m',e) => coerce(T,m) nil @@ -1672,13 +1675,15 @@ maybeSpliceMode m == compColon: (%Form,%Mode,%Env) -> %Maybe %Triple compColon([":",f,t],m,e) == - $insideExpressionIfTrue => compColonInside(f,m,e,t) + db := currentDB e + $insideExpressionIfTrue => compColonInside(db,f,m,e,t) --if inside an expression, ":" means to convert to m "on faith" $lhsOfColon: local:= f t:= t isnt [.,:.] and (t':= assoc(t,getDomainsInScope e)) => t' isDomainForm(t,e) and not $insideCategoryIfTrue => - (if not listMember?(t,getDomainsInScope e) then e:= addDomain(t,e); t) + e := addDomain(db,t,e) + t isDomainForm(t,e) or isCategoryForm(t,e) => t t is ["Mapping",m',:r] => t string? t => t -- literal flag types are OK @@ -1713,7 +1718,7 @@ unknownTypeError name == compPretend: (%Form,%Mode,%Env) -> %Maybe %Triple compPretend(["pretend",x,t],m,e) == - e:= addDomain(t,e) + e:= addDomain(currentDB e,t,e) T:= comp(x,t,e) or comp(x,$EmptyMode,e) or return nil t' := T.mode -- save this, in case we need to make suggestions T:= [T.expr,t,T.env] @@ -1725,8 +1730,8 @@ compPretend(["pretend",x,t],m,e) == T' nil -compColonInside(x,m,e,m') == - e:= addDomain(m',e) +compColonInside(db,x,m,e,m') == + e:= addDomain(db,m',e) T:= comp(x,$EmptyMode,e) or return nil if (m'':=T.mode)=m' then warningMessage:= [":",m'," -- should replace by @"] T:= [T.expr,m',T.env] @@ -1876,7 +1881,7 @@ coerceExit([x,m,e],m') == compAtSign: (%Form,%Mode,%Env) -> %Maybe %Triple compAtSign(["@",x,m'],m,e) == - e:= addDomain(m',e) + e:= addDomain(currentDB e,m',e) T:= comp(x,m',e) or return nil coerce(T,m) @@ -1886,7 +1891,7 @@ coerceByModemap: (%Maybe %Triple,%Mode) -> %Maybe %Triple autoCoerceByModemap: (%Maybe %Triple,%Mode) -> %Maybe %Triple compCoerce(["::",x,m'],m,e) == - e:= addDomain(m',e) + e:= addDomain(currentDB e,m',e) T:= compCoerce1(x,m',e) => coerce(T,m) ident? m' and getXmode(m',e) is ["Mapping",["UnionCategory",:l]] => T:= (or/[compCoerce1(x,m1,e) for m1 in l]) or return nil diff --git a/src/interp/define.boot b/src/interp/define.boot index 9f579f44..443f93cb 100644 --- a/src/interp/define.boot +++ b/src/interp/define.boot @@ -258,6 +258,7 @@ GetValue name == actOnInfo(u,$e) == null u => $e u is ["PROGN",:l] => (for v in l repeat $e:= actOnInfo(v,$e); $e) + db := currentDB $e $e:= put("$Information","special",Info:= [u,:get("$Information","special",$e)],$e ) @@ -311,9 +312,9 @@ actOnInfo(u,$e) == assoc(cat,categoryAncestors ocatvec) is [.,"T",.] => $e --what was being asserted is an ancestor of what was known if name="$" - then $e:= augModemapsFromCategory(name,name,cat,$e) + then $e:= augModemapsFromCategory(db,name,name,cat,$e) else - genDomainView(name,cat,"HasCategory") + genDomainView(db,name,cat,"HasCategory") -- a domain upgrade at function level is local to that function. if not $insideCapsuleFunctionIfTrue and not symbolMember?(name,$functorLocalParameters) then @@ -1335,7 +1336,7 @@ putDomainsInScope(x,e) == $insideCapsuleFunctionIfTrue => ($CapsuleDomainsInScope:= newValue; e) put("$DomainsInScope","special",newValue,e) -getOperationAlist(name,functorForm,form) == +getOperationAlist(db,name,functorForm,form) == if ident? name and niladicConstructor? name then functorForm := [functorForm] (u:= get(functorForm,'isFunctor,$CategoryFrame)) and not @@ -1357,18 +1358,18 @@ substNames(domainName,functorForm,opalist) == for [:modemapform,[sel,"$",pos]] in applySubst(pairList($FormalMapVariableList,KDR functorForm),opalist)] -evalAndSub(domainName,functorForm,form,$e) == +evalAndSub(db,domainName,functorForm,form,$e) == $lhsOfColon: local:= domainName categoryObject? form => [substNames(domainName,functorForm,categoryExports form),$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) + opAlist:= getOperationAlist(db,domainName,functorForm,form) substAlist:= substNames(domainName,functorForm,opAlist) [substAlist,$e] -augModemapsFromCategory(domainName,functorForm,categoryForm,e) == - [fnAlist,e]:= evalAndSub(domainName,functorForm,categoryForm,e) +augModemapsFromCategory(db,domainName,functorForm,categoryForm,e) == + [fnAlist,e]:= evalAndSub(db,domainName,functorForm,categoryForm,e) compilerMessage('"Adding %1p modemaps",[domainName]) e:= putDomainsInScope(domainName,e) for [[op,sig,:.],cond,fnsel] in fnAlist repeat @@ -1388,15 +1389,15 @@ addConstructorModemaps(name,form is [functorName,:.],e) == e:= addModemap(op,name,sig,true,opcode,e) e -augModemapsFromDomain1(name,functorForm,e) == +augModemapsFromDomain1(db,name,functorForm,e) == property(KAR functorForm,"makeFunctionList") => addConstructorModemaps(name,functorForm,e) functorForm isnt [.,:.] and (catform := getmode(functorForm,e)) => - augModemapsFromCategory(name,functorForm,catform,e) + augModemapsFromCategory(db,name,functorForm,catform,e) mappingForm := getmodeOrMapping(KAR functorForm,e) => ["Mapping",categoryForm,:functArgTypes] := mappingForm catform := substituteCategoryArguments(rest functorForm,categoryForm) - augModemapsFromCategory(name,functorForm,catform,e) + augModemapsFromCategory(db,name,functorForm,catform,e) stackMessage('"%1pb is an unknown mode",[functorForm]) e @@ -1505,7 +1506,7 @@ compDefineFunctor1(df is ['DEF,form,signature,body],m,$e,$formalArgList) == for x in dbImplicitParameters db repeat getLocalIndex(db,x) [.,.,$e] := compMakeDeclaration("$",target,$e) if not $insideCategoryPackageIfTrue then - $e := augModemapsFromCategory('$,form,target,$e) + $e := augModemapsFromCategory(db,'$,form,target,$e) $e := put('$,'%dc,form,$e) $signature := signature' parSignature := dbSubstituteAllQuantified(db,signature') @@ -1616,7 +1617,7 @@ reportOnFunctorCompilation() == makeFunctorArgumentParameters(db,argl,sigl,target) == $forceAdd: local:= true $ConditionalOperators: local := nil - ("append"/[fn(a,augmentSig(s,findExtras(a,target))) + ("append"/[fn(db,a,augmentSig(s,findExtras(a,target))) for a in argl for s in sigl]) where findExtras(a,target) == -- see if conditional information implies anything else @@ -1645,14 +1646,14 @@ makeFunctorArgumentParameters(db,argl,sigl,target) == MSUBST([:u,:ss],u,s) ['Join,:sl,['CATEGORY,'package,:ss]] ['Join,s,['CATEGORY,'package,:ss]] - fn(a,s) == + fn(db,a,s) == isCategoryForm(s,$CategoryFrame) => - s is ["Join",:catlist] => genDomainViewList(a,s.args) - [genDomainView(a,s,"getDomainView")] + s is ["Join",:catlist] => genDomainViewList(db,a,s.args) + [genDomainView(db,a,s,"getDomainView")] [a] -genDomainOps(dom,cat) == - oplist:= getOperationAlist(dom,dom,cat) +genDomainOps(db,dom,cat) == + oplist:= getOperationAlist(db,dom,dom,cat) siglist:= [sig for [sig,:.] in oplist] oplist:= substNames(dom,dom,oplist) cd:= @@ -1666,20 +1667,19 @@ genDomainOps(dom,cat) == $e := addModemap(op,dom,sig,cond,['ELT,dom,i],$e) dom -genDomainView(viewName,c,viewSelector) == - c is ['CATEGORY,.,:l] => genDomainOps(viewName,c) +genDomainView(db,viewName,c,viewSelector) == + c is ['CATEGORY,.,:l] => genDomainOps(db,viewName,c) code:= c is ['SubsetCategory,c',.] => c' c - $e:= augModemapsFromCategory(viewName,nil,c,$e) + $e:= augModemapsFromCategory(db,viewName,nil,c,$e) cd:= ["%LET",viewName,[viewSelector,viewName,mkTypeForm code]] if not listMember?(cd,$getDomainCode) then $getDomainCode:= [cd,:$getDomainCode] viewName -genDomainViewList: (%Symbol,%List %Form) -> %List %Code -genDomainViewList(id,catlist) == - [genDomainView(id,cat,"getDomainView") +genDomainViewList(db,id,catlist) == + [genDomainView(db,id,cat,"getDomainView") for cat in catlist | isCategoryForm(cat,$EmptyEnvironment)] mkOpVec(dom,siglist) == @@ -1886,13 +1886,13 @@ refineDefinitionSignature(form,signature,e) == processDefinitionParameters(db,form,signature,e) == e := checkAndDeclare(db,form,signature,e) e := giveFormalParametersValues(form.args,e) - e := addDomain(signature.target,e) + e := addDomain(db,signature.target,e) e := compArgumentConditions e if $profileCompiler then for x in form.args for t in signature.source repeat profileRecord('arguments,x,t) for domain in signature repeat - e := addDomain(domain,e) + e := addDomain(db,domain,e) e mkRepititionAssoc l == @@ -2004,20 +2004,20 @@ compDefineCapsuleFunction(db,df is ['DEF,form,signature,body], domainMember(dom,domList) == or/[modeEqual(dom,d) for d in domList] -augModemapsFromDomain(name,functorForm,e) == +augModemapsFromDomain(db,name,functorForm,e) == symbolMember?(KAR name or name,$DummyFunctorNames) => e name = $Category or isCategoryForm(name,e) => e listMember?(name,getDomainsInScope e) => e if super := superType functorForm then - e := addNewDomain(super,e) + e := addNewDomain(db,super,e) if name is ["Union",:dl] then for d in stripTags dl - repeat e:= addDomain(d,e) - augModemapsFromDomain1(name,functorForm,e) + repeat e:= addDomain(db,d,e) + augModemapsFromDomain1(db,name,functorForm,e) -addNewDomain(domain,e) == - augModemapsFromDomain(domain,domain,e) +addNewDomain(db,domain,e) == + augModemapsFromDomain(db,domain,domain,e) -addDomain(domain,e) == +addDomain(db,domain,e) == domain isnt [.,:.] => domain="$EmptyMode" => e domain="$NoValueMode" => e @@ -2025,13 +2025,13 @@ addDomain(domain,e) == char "#" = stringChar(s,0) and char "#" = stringChar(s,1) => e symbolMember?(domain,getDomainsInScope e) => e isLiteral(domain,e) => e - addNewDomain(domain,e) + addNewDomain(db,domain,e) (name:= first domain)='Category => e domainMember(domain,getDomainsInScope e) => e getXmode(name,e) is ["Mapping",target,:.] and isCategoryForm(target,e) => - addNewDomain(domain,e) + addNewDomain(db,domain,e) -- constructor? test needed for domains compiled with $bootStrapMode=true - isDomainForm(domain,e) => addNewDomain(domain,e) + isDomainForm(domain,e) => addNewDomain(db,domain,e) -- ??? we should probably augment $DummyFunctorNames with CATEGORY -- ??? so that we don't have to do this special check here. Investigate. isQuasiquote domain => e @@ -2240,9 +2240,10 @@ compCapsule(['CAPSULE,:itemList],m,e) == [bootStrapError($functorForm, $editFile),m,e] $insideExpressionIfTrue: local:= false $useRepresentationHack := true + db := currentDB e clearCapsuleFunctionTable() - e := checkRepresentation(constructorDB $form.op,$addFormLhs,itemList,e) - compCapsuleInner(constructorDB $form.op,itemList,m,addDomain('_$,e)) + e := checkRepresentation(db,$addFormLhs,itemList,e) + compCapsuleInner(db,itemList,m,addDomain(db,'$,e)) compSubDomain(["SubDomain",domainForm,predicate],m,e) == $addFormLhs: local:= domainForm @@ -2253,7 +2254,7 @@ compSubDomain(["SubDomain",domainForm,predicate],m,e) == compSubDomain1(domainForm,predicate,m,e) == [.,.,e]:= - compMakeDeclaration("#1",domainForm,addDomain(domainForm,e)) + compMakeDeclaration("#1",domainForm,addDomain(currentDB e,domainForm,e)) u:= compCompilerPredicate(predicate,e) or stackSemanticError(["predicate: ",predicate, diff --git a/src/interp/i-special.boot b/src/interp/i-special.boot index 1980d4ad..be7776e2 100644 --- a/src/interp/i-special.boot +++ b/src/interp/i-special.boot @@ -2455,7 +2455,7 @@ up%Import t == t isnt [.,:types] => nil -- ??? shall we error in case types is nil? for x in types repeat - $e := addDomain(devaluate objVal getValue x,$e) + $e := addDomain(nil,devaluate objVal getValue x,$e) setValueToVoid t --% Macro handling |