Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Undocument a bunch of expression methods, cf #1668 #3379

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions M2/Macaulay2/m2/expressions.m2
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@ lprec = prec = x -> (getParsing x)#0
rprec = strength2 = x -> (getParsing x)#1
uprec = strength1 = x -> (getParsing x)#2

-- local variables
EmptyName := symbol EmptyName
unit := symbol unit
operator := symbol operator
EmptyName = symbol EmptyName
unit = symbol unit
operator = symbol operator
protect unit
protect operator
protect EmptyName
-*
letters := set characters "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'"
digits := set characters "0123456789"
Expand Down Expand Up @@ -433,7 +435,7 @@ expressionValue Adjacent := x -> (expressionValue x#0) (expressionValue x#1)
-----------------------------------------------------------------------------
prepend0 := (e,x) -> prepend(unhold e, x)
append0 := (x,e) -> append(x, unhold e)
assocList := {Sum,Product,DirectSum,TensorProduct,Equation} -- populate automatically?
assocList = {Sum,Product,DirectSum,TensorProduct,Equation} -- populate automatically?
scan(assocList, opClass -> (
installMethod(opClass#operator,opClass,opClass,join);
installMethod(opClass#operator,opClass,Expression,append);
Expand Down
30 changes: 18 additions & 12 deletions M2/Macaulay2/packages/Macaulay2Doc/doc.m2
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ undocumented {
(symbol *, Number, RingElement),
(symbol *, RingElement, Number),
(symbol*, Minus, Expression),
(symbol*, Product, Holder),
(symbol*, Minus, Minus),
(symbol*, Number, InfiniteNumber),
(symbol*, InfiniteNumber, ZZ),
Expand All @@ -35,15 +34,29 @@ undocumented {
(symbol*, ZZ, GradedModuleMap),
(symbol*, InfiniteNumber, InfiniteNumber),
(symbol*, Expression, Minus),
(symbol*, Product, Product),
(symbol*, Holder, Product),
(symbol*, ZZ, Module),
(symbol*, ZZ, MonomialIdeal),
(symbol*, String),
(symbol*, ZZ, ChainComplexMap),
(symbol*, Expression, OneExpression),
(symbol*, OneExpression, Expression),
}
operator:= core "operator"
unit:=core "unit"
undocumented splice apply(core "assocList", opClass -> (
(opClass#operator,opClass,opClass),
(opClass#operator,opClass,Expression),
(opClass#operator,opClass,Holder),
(opClass#operator,Expression,opClass),
(opClass#operator,Holder,opClass),
(opClass#operator,Expression,Expression),
(opClass#operator,Expression,Thing),
(opClass#operator,Thing,Expression))
| if opClass#?unit then (
(opClass#operator,Expression,opClass#unit),
(opClass#operator,opClass#unit,Expression),
(opClass#operator,opClass,opClass#unit),
(opClass#operator,opClass#unit,opClass)
) else ())



document {
Expand Down Expand Up @@ -893,7 +906,6 @@ document {

undocumented {
(symbol**, QuotientRing, PolynomialRing),
-- (symbol**, Expression, NonAssociativeProduct),
(symbol**, QuotientRing, QuotientRing),
(symbol**, Number, Matrix),
(symbol**, Matrix, Number),
Expand All @@ -902,14 +914,8 @@ undocumented {
(symbol **,RingElement,Number),
(symbol **,RingElement,RingElement),
(symbol **,Thing,InexactFieldFamily),
-- (symbol**, NonAssociativeProduct, NonAssociativeProduct),
(symbol**, PolynomialRing, PolynomialRing),
(symbol**, PolynomialRing, QuotientRing),
-- (symbol**, NonAssociativeProduct, Expression),
-- (symbol**, NonAssociativeProduct, Holder),
-- (symbol**, Holder, NonAssociativeProduct),
(symbol**, Expression, OneExpression),
(symbol**, OneExpression, Expression)
}

document {
Expand Down
7 changes: 1 addition & 6 deletions M2/Macaulay2/packages/Macaulay2Doc/doc12.m2
Original file line number Diff line number Diff line change
Expand Up @@ -282,12 +282,7 @@ document {
}

undocumented {
(symbol -, Thing, Minus),
(symbol +, Sum, Sum),
(symbol +, Sum, Holder),
(symbol +, Holder, Sum),
(symbol +, ZeroExpression, Expression),
(symbol +, Expression, ZeroExpression),
(symbol -, Thing, Minus)
}

expressionMethodKeys := flatten apply(toList core "expressionBinaryOperators", op -> {
Expand Down
Loading