Changeset e10683 in git for Singular/polys.cc

Timestamp:

Nov 30, 2000, 5:46:09 PM (23 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

379305282702a4d34d62437d3dfe5bf09925c710

Parents:

50268a871f223956bed4c2b84352e38f543a574b

Message:

*hannes: pmInit stuff


git-svn-id: file:///usr/local/Singular/svn/trunk@4782 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• Singular/polys.cc (modified) (6 diffs)

Singular/polys.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys.cc,v 1.68 2000-11-09 16:32:53 obachman Exp $ */
+/* $Id: polys.cc,v 1.69 2000-11-30 16:46:09 Singular Exp $ */
 
 /*
@@ -55 +55 @@
   pLDeg=r->pLDeg;
   pLexOrder=r->LexOrder;
-  
+
   if (complete)
   {
@@ -140 +140 @@
 * convert monomial given as string to poly, e.g. 1x3y5z
 */
-poly pmInit(char *st, BOOLEAN &ok)
+char * p_Read(char *st, poly &rc, ring r)
 {
   int i,j;
-  ok=FALSE;
-  BOOLEAN b=FALSE;
-  poly rc = pInit();
-  char *s = nRead(st,&(rc->coef));
+  rc = p_Init(r);
+  char *s = r->cf->nRead(st,&(rc->coef));
   if (s==st)
   /* i.e. it does not start with a coeff: test if it is a ringvar*/
@@ -154 +152 @@
     {
       pIncrExp(rc,1+j);
+      while (*s!='\0') s++;
       goto done;
     }
   }
-  else
-    b=TRUE;
   while (*s!='\0')
   {
@@ -164 +161 @@
     ss[0] = *s++;
     ss[1] = '\0';
-    j = rIsRingVar(ss);
+    j = r_IsRingVar(ss,r);
     if (j >= 0)
     {
       s = eati(s,&i);
-      pAddExp(rc,1+j, (Exponent_t)i);
+      p_AddExp(rc,1+j, (Exponent_t)i, r);
     }
     else
     {
-      if ((s!=st)&&isdigit(st[0]))
-      {
-        errorreported=TRUE;
-      }
-      pDelete(&rc);
-      return NULL;
+      s--;
+      return s;
     }
   }
 done:
+  if (r->cf->nIsZero(pGetCoeff(rc))) p_DeleteLm(&rc,r);
+  else
+  {
+    p_Setm(rc,r);
+  }
+  return s;
+}
+
+poly pmInit(char *st, BOOLEAN &ok)
+{
+  poly p;
+  char *s=p_Read(st,p,currRing);
+  if (*s!='\0')
+  {
+    if ((s!=st)&&isdigit(st[0]))
+    {
+      errorreported=TRUE;
+    }
+    ok=FALSE;
+    pDelete(&p);
+    return NULL;
+  }
   ok=!errorreported;
-  if (nIsZero(pGetCoeff(rc))) pDeleteLm(&rc);
-  else
-  {
-    pSetm(rc);
-  }
-  return rc;
+  return p;
 }
 
@@ -229 +239 @@
   return q;
 }
-
 
 /*2