diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/algebra/boolean.spad.pamphlet | 14 | ||||
| -rw-r--r-- | src/interp/modemap.boot | 5 |
3 files changed, 14 insertions, 10 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 1e98fe3b..087e5c42 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-04-08 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * algebra/boolean.spad.pamphlet (atoms$PropositionalFormula): + Rename from terms. + 2010-04-07 Gabriel Dos Reis <gdr@cs.tamu.edu> * algebra/boolean.spad.pamphlet (isAtom$PropositionalFormula): diff --git a/src/algebra/boolean.spad.pamphlet b/src/algebra/boolean.spad.pamphlet index b556b37b..a87b4c9b 100644 --- a/src/algebra/boolean.spad.pamphlet +++ b/src/algebra/boolean.spad.pamphlet @@ -270,8 +270,8 @@ PropositionalFormulaFunctions1(T): Public == Private where Public == Type with dual: PropositionalFormula T -> PropositionalFormula T ++ \spad{dual f} returns the dual of the proposition \spad{f}. - terms: PropositionalFormula T -> Set T - ++ \spad{terms f} ++ returns the set of terms appearing in + atoms: PropositionalFormula T -> Set T + ++ \spad{atoms f} ++ returns the set of atoms appearing in ++ the formula \spad{f}. simplify: PropositionalFormula T -> PropositionalFormula T ++ \spad{simplify f} returns a formula logically equivalent @@ -291,13 +291,13 @@ PropositionalFormulaFunctions1(T): Public == Private where conjunction(dual first f2, dual second f2) error "formula contains `equiv' or `implies'" - terms f == + atoms f == (t := isAtom f) case T => { t } - (f1 := isNot f) case F => terms f1 + (f1 := isNot f) case F => atoms f1 (f2 := isAnd f) case Pair(F,F) => - union(terms first f2, terms second f2) + union(atoms first f2, atoms second f2) (f2 := isOr f) case Pair(F,F) => - union(terms first f2, terms second f2) + union(atoms first f2, atoms second f2) empty()$Set(T) -- one-step simplification helper function @@ -357,7 +357,7 @@ PropositionalFormulaFunctions2(S,T): Public == Private where Public == Type with map: (S -> T, PropositionalFormula S) -> PropositionalFormula T ++ \spad{map(f,x)} returns a propositional formula where - ++ all terms in \spad{x} have been replaced by the result + ++ all atoms in \spad{x} have been replaced by the result ++ of applying the function \spad{f} to them. Private == add macro FS == PropositionalFormula S diff --git a/src/interp/modemap.boot b/src/interp/modemap.boot index 25172e4f..041289bf 100644 --- a/src/interp/modemap.boot +++ b/src/interp/modemap.boot @@ -63,9 +63,8 @@ addDomain(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 - if not isCategoryForm(domain,e) and - not member(name,'(Mapping CATEGORY)) then - unknownTypeError name + if not isCategoryForm(domain,e) and name ~= "Mapping" then + unknownTypeError name e --is not a functor domainMember(dom,domList) == or/[modeEqual(dom,d) for d in domList] |