remove try in promote part 2

Author: pzinn

M2/Macaulay2/m2/classes.m2

@@ -9,7 +9,7 @@ ancestors  = T -> unique join({T}, while (T = parent T) =!= Thing list T, {Thing
 ancestors' = T -> unique join({T}, while (T = class  T) =!= Type  list T, {Type})
 
 -- TODO: make this TT toString X later?
-synonym = X -> if X.?synonym then X.synonym else "object of class " | toString X
+synonym = X -> lookup(symbol synonym,X) -- X.synonym ?? "object of class " | toString X
 -- TODO: find a more permanent solution
 plurals = new MutableHashTable from {
     "body"       => "bodies",
@@ -22,7 +22,7 @@ pluralize = s -> demark_" " append(
     drop(ws := separate_" " s, -1),
     if  plurals#?(last ws)
     then plurals#(last ws) else last ws | "s")
-pluralsynonym = T -> if T.?synonym then pluralize T.synonym else "objects of class " | toString T
+pluralsynonym = T -> pluralize lookup(symbol synonym,T) -- pluralize T.synonym ?? "objects of class " | toString T
 
 Time.synonym = "timing result"
 Boolean.synonym = "Boolean value"

M2/Macaulay2/m2/matrix.m2

@@ -3,6 +3,22 @@
 
 needs "modules.m2"
 
+notsamering := (X,Y) -> (
+     if X === Y then error("expected ",pluralsynonym X, " for the same ring")
+     else error("expected ",synonym X," and ",synonym Y," for the same ring"))
+samering = (M,N) -> if ring M === ring N then (M,N) else notsamering(class M,class N)
+nottosamering := (X,Y) -> (
+     if X === Y then error("expected ",pluralsynonym X, " for compatible rings")
+     else error("expected ",synonym X," and ",synonym Y," for compatible rings"))
+tosamering = (M,N) -> (
+     R := ring M; S := ring N;
+     if R =!= S then (
+	 if isPromotable(R,S) then (promote(M,S),N)
+	 else if isPromotable(S,R) then (M,promote(N,R))
+	 else nottosamering(class M,class N)
+	 )
+     else (M,N))
+
 oops := R -> error (
      if degreeLength R === 1
      then "expected degree to be an integer or list of integers of length 1"
@@ -75,24 +91,15 @@ reduce = (tar,rawF) -> (
 
 addHook(ReduceHooks, Strategy => Default, (tar, rawF) -> rawF % raw gb presentation tar)
 
-toSameRing = (m,n) -> (
-     R := ring m; S := ring n;
-     if R =!= S then (
-	 if isPromotable(R,S) then (promote(m,S),n)
-	 else if isPromotable(S,R) then (m,promote(n,R))
-	 else error "expected compatible rings"
-	 )
-     else (m,n))
-
 InfiniteNumber * Matrix := (r,m) -> (map(target m, source m, matrix(r*(entries m))))
 Matrix * InfiniteNumber := (m,r) -> r*m
 Number * Matrix :=
 RingElement * Matrix := (r,m) -> (
-    (r,m) = toSameRing(r,m);
+    (r,m) = tosamering(r,m);
      map(target m, source m, reduce(target m, raw r * raw m)))
 Matrix * Number :=
 Matrix * RingElement := (m,r) -> (
-    (r,m) = toSameRing(r,m);
+    (r,m) = tosamering(r,m);
      map(target m, source m, reduce(target m, raw m * raw r)))
 Matrix / Number      :=
 Matrix / RingElement := (m,r) -> m * (1/r)
@@ -129,7 +136,7 @@ Matrix == ZZ := (m,i) -> if i === 0 then rawIsZero m.RawMatrix else m - i == 0
 
 Matrix + Matrix := Matrix => (
      (f,g) -> map(target f, source f, reduce(target f, raw f + raw g))
-     ) @@ toSameRing
+     ) @@ tosamering
 Matrix + RingElement :=
 Matrix + Number      := (f,r) -> if r == 0 then f else f + r*id_(target f)
 RingElement + Matrix :=
@@ -139,7 +146,7 @@ Number + Vector := RingElement + Vector := (r,v) -> vector(r + matrix v)
 
 Matrix - Matrix := Matrix => (
      (f,g) -> map(target f, source f, reduce(target f, raw f - raw g))
-     ) @@ toSameRing
+     ) @@ tosamering
 Matrix - RingElement :=
 Matrix - Number      := (f,r) -> if r == 0 then f else f - r*id_(target f)
 RingElement - Matrix :=
@@ -177,7 +184,7 @@ Matrix * Matrix := Matrix => (m,n) -> (
 	       q,
 	       Degree => degree m + if m.?RingMap then m.RingMap.cache.DegreeMap degree n else degree n))
      else (
-	  (m,n) = toSameRing(m,n);
+	  (m,n) = tosamering(m,n);
 	  M = target m;
 	  P := source m;
 	  N = source n;
@@ -510,7 +517,7 @@ bothFree := (f,g) -> (
      or not isFreeModule source g or not isFreeModule target g then error "expected a homomorphism between free modules"
      else (f,g))
 
-diff(Matrix, Matrix) := Matrix => ( (f,g) -> map(ring f, rawMatrixDiff(f.RawMatrix, g.RawMatrix)) ) @@ bothFree @@ toSameRing 
+diff(Matrix, Matrix) := Matrix => ( (f,g) -> map(ring f, rawMatrixDiff(f.RawMatrix, g.RawMatrix)) ) @@ bothFree @@ tosamering
 diff(RingElement, RingElement) := RingElement => (f,g) -> (diff(matrix{{f}},matrix{{g}}))_(0,0)
 diff(Matrix, RingElement) := (m,f) -> diff(m,matrix{{f}})
 diff(RingElement, Matrix) := (f,m) -> diff(matrix{{f}},m)
@@ -520,7 +527,7 @@ diff(Vector, Vector) := (v,w) -> diff(matrix{v}, transpose matrix{w})
 diff(Matrix, Vector) := (m,w) -> diff(m,transpose matrix {w})
 diff(Vector, Matrix) := (v,m) -> diff(matrix {v}, m)
 
-contract(Matrix, Matrix) := Matrix => ( (f,g) -> map(ring f, rawMatrixContract(f.RawMatrix, g.RawMatrix)) ) @@ bothFree @@ toSameRing
+contract(Matrix, Matrix) := Matrix => ( (f,g) -> map(ring f, rawMatrixContract(f.RawMatrix, g.RawMatrix)) ) @@ bothFree @@ tosamering
 contract(RingElement, RingElement) := RingElement => (f,g) -> (contract(matrix{{f}},matrix{{g}}))_(0,0)
 contract(Matrix, RingElement) := (m,f) -> contract(m,matrix{{f}})
 contract(RingElement, Matrix) := (f,m) -> contract(matrix{{f}},m)
@@ -538,8 +545,8 @@ contract(Number, Matrix) := (f,m) -> contract(matrix{{f}},m)
 contract(Vector, Number) := (v,f) -> (contract(matrix{v},matrix{{f}}))_0
 contract(Number, Vector) := (f,v) -> contract(matrix{{f}},transpose matrix{v})
 
-diff'(Matrix, Matrix) := Matrix => ((m,n) -> ( flip(dual target n, target m) * diff(n,m) * flip(source m, dual source n) )) @@ bothFree @@ toSameRing
-contract'(Matrix, Matrix) := Matrix => ((m,n) -> ( flip(dual target n, target m) * contract(n,m) * flip(source m, dual source n) )) @@ bothFree @@ toSameRing
+diff'(Matrix, Matrix) := Matrix => ((m,n) -> ( flip(dual target n, target m) * diff(n,m) * flip(source m, dual source n) )) @@ bothFree @@ tosamering
+contract'(Matrix, Matrix) := Matrix => ((m,n) -> ( flip(dual target n, target m) * contract(n,m) * flip(source m, dual source n) )) @@ bothFree @@ tosamering
 
 jacobian = method()
 jacobian Matrix := Matrix => (m) -> diff(transpose vars ring m, m)

M2/Macaulay2/m2/matrix1.m2

@@ -6,17 +6,6 @@ needs "quotient.m2"
 
 -----------------------------------------------------------------------------
 
-notsamering := (X,Y) -> (
-     if X === Y then error("expected ",pluralsynonym X, " for the same ring")
-     else error("expected ",X.synonym," and ",Y.synonym," for the same ring"))
-nottosamering := (X,Y) -> (
-     if X === Y then error("expected ",pluralsynonym X, " for compatible rings")
-     else error("expected ",X.synonym," and ",Y.synonym," for compatible rings"))
-samering = (M,N) -> if ring M === ring N then (M,N) else notsamering(class M,class N)
-tosamering := (M,N) -> if ring M === ring N then (M,N) else ( -- need merging with toSameRing in matrix.m2
-     z := try 0_(ring M) + 0_(ring N) else nottosamering(class M,class N);
-     (promote(M,ring z),promote(N,ring z)))
-
 module Ring := Module => (cacheValue symbol module)(R -> R^1)
 
 matrix(RingFamily,List) := Matrix => opts -> (R,m) -> matrix(default R, m, opts)
@@ -382,7 +371,7 @@ tensor(Matrix, Matrix) := Matrix => {} >> opts -> ((f, g) -> (
      map(target f ** target g, 
 	  source f ** source g, 
 	  map(R, f.RawMatrix ** g.RawMatrix),
-	  Degree => degree f + degree g))) @@ toSameRing
+	  Degree => degree f + degree g))) @@ tosamering
 
 Matrix ** Module := Matrix => (f, M) -> tensor(f, id_M)
 Module ** Matrix := Matrix => (M, f) -> tensor(id_M, f)