diff options
| author | dos-reis <gdr@axiomatics.org> | 2013-06-18 06:31:41 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2013-06-18 06:31:41 +0000 |
| commit | 01ee31f560d8ae13ea2518329a7a3ba55aad8150 (patch) | |
| tree | 77198b2d2e8ea8eaa05ca1dc5c941f57b2fc6655 /src/interp/compiler.boot | |
| parent | 5d68f2651a08223febcc172a6cb49a6e92899034 (diff) | |
| download | open-axiom-01ee31f560d8ae13ea2518329a7a3ba55aad8150.tar.gz | |
* interp/compiler.boot (compHasFormat): Take a DB parameter.
Adjust callers.
* interp/define.boot (ICformat): Likewise.
* interp/lisplib.boot (predicateBitIndex): Likewise.
(predicateBitRef): Likewise.
(transHasCode): Likewise.
Diffstat (limited to 'src/interp/compiler.boot')
| -rw-r--r-- | src/interp/compiler.boot | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot index 1d2921eb..e070e214 100644 --- a/src/interp/compiler.boot +++ b/src/interp/compiler.boot @@ -1349,12 +1349,12 @@ compElt(form,m,E) == compHas: (%Form,%Mode,%Env) -> %Maybe %Triple compHas(pred is ["has",a,b],m,e) == e := chaseInferences(pred,e) - predCode := compHasFormat(pred,e) + predCode := compHasFormat(currentDB e,pred,e) coerce([predCode,$Boolean,e],m) --used in various other places to make the discrimination -compHasFormat(pred is ["has",olda,b],e) == +compHasFormat(db,pred is ["has",olda,b],e) == argl := $form.args formals := take(#argl,$FormalMapVariableList) a := applySubst(pairList(formals,argl),olda) @@ -1365,7 +1365,7 @@ compHasFormat(pred is ["has",olda,b],e) == ["HasSignature",a, mkList [MKQ op,mkList [mkTypeForm type for type in sig]]] b is ["Join",:l] or b is ["CATEGORY",.,:l] => - ["AND",:[compHasFormat(["has",olda,c],e) for c in l]] + ["AND",:[compHasFormat(db,["has",olda,c],e) for c in l]] isCategoryForm(b,e) => ["HasCategory",a,optimize! mkTypeForm b] stackAndThrow('"Second argument to %1b must be a category, or a signature or an attribute",["has"]) |