Changeset 9a1960 in git

Timestamp:

Aug 31, 2016, 3:05:27 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

83408ff8113e53cb015596658bf580157b85e9da

Parents:

23ca1f7da923b9cd2662a14a6ae562c743794970

Message:

Singular_4_1: CoeffName

Location:

libpolys/coeffs

Files:

• modulop.cc (modified) (3 diffs)
• rintegers.cc (modified) (4 diffs)

libpolys/coeffs/modulop.cc

@@ -468 +468 @@
 }
 
-static char* npCoeffString(const coeffs r)
-{
+static char* npCoeffName(const coeffs cf)
+{
+  static char npCoeffName_buf[15];
 #ifdef SINGULAR_4_1
-  char *s=(char*)omAlloc(14);
-  snprintf(s,14,"ZZ/%d",r->ch);
+  snprintf(npCoeffName_buf,14,"ZZ/%d",cf->ch);
 #else
-  char *s=(char*)omAlloc(11);
-  snprintf(s,11,"%d",r->ch);
-#endif
-  return s;
+  snprintf(npCoeffName_buf,11,"%d",cf->ch);
+#endif
+  return npCoeffName_buf;
+}
+
+static char* npCoeffString(const coeffs cf)
+{
+  return omStrDup(npCoeffName(cf));
 }
 
@@ -518 +522 @@
   r->nCoeffIsEqual=npCoeffsEqual;
   r->cfCoeffString=npCoeffString;
+  r->cfCoeffName=npCoeffName;
+  r->cfCoeffWrite=npCoeffWrite;
 
   r->cfMult  = npMult;
@@ -566 +572 @@
   }
 #endif
-  r->cfCoeffWrite=npCoeffWrite;
 #ifdef LDEBUG
   // debug stuff

libpolys/coeffs/rintegers.cc

@@ -256 +256 @@
 }
 
-number nrzDiv (number a,number b, const coeffs R)
+number nrzDiv (number a,number b, const coeffs)
 {
   mpz_ptr erg = (mpz_ptr) omAllocBin(gmp_nrz_bin);
@@ -468 +468 @@
 }
 
-static char* nrzCoeffString(const coeffs)
+static char* nrzCoeffName(const coeffs)
 {
 #ifdef SINGULAR_4_1
-  return omStrDup("ZZ");
+  return (char*)"ZZ";
 #else
-  return omStrDup("integer");
-#endif
+  return (char*)"integer";
+#endif
+}
+
+static char* nrzCoeffString(const coeffs cf)
+{
+  return omStrDup(nrzCoeffName(cf));
 }
 
@@ -500 +505 @@
   //r->nCoeffIsEqual = ndCoeffIsEqual;
   r->cfCoeffString = nrzCoeffString;
+  r->cfCoeffName = nrzCoeffName;
+  r->cfCoeffWrite = nrzCoeffWrite;
   //r->cfKillChar = ndKillChar;
   r->cfMult  = nrzMult;
@@ -533 +540 @@
   r->cfDelete= nrzDelete;
   r->cfSetMap = nrzSetMap;
-  r->cfCoeffWrite = nrzCoeffWrite;
   r->cfQuot1 = nrzQuot1;
   r->convSingNFactoryN=nrzConvSingNFactoryN;