Changeset 7c53a72 in git for Singular/ring.cc

Timestamp:

Jan 30, 2001, 2:37:04 PM (23 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

150dc889f015f345eeda915fcc0b97aa94ab2116

Parents:

ac3da3f3a9cb4825dbea5479b2db55fb3d7c09a2

Message:

* hannes: second par for real-field


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

File:

• Singular/ring.cc (modified) (9 diffs)

Singular/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.154 2001-01-20 11:40:14 Singular Exp $ */
+/* $Id: ring.cc,v 1.155 2001-01-30 13:37:02 Singular Exp $ */
 
 /*
@@ -77 +77 @@
 //  if (r->ch== -1)
 //  {
-//    if (r->ch_flags==(short)0) return TRUE;
+//    if (r->float_len==(short)0) return TRUE;
 //  }
 //  return FALSE;
@@ -473 +473 @@
   int ch;
   int float_len=0;
+  int float_len2=0;
   ring R = NULL;
   idhdl tmp = NULL;
@@ -495 +496 @@
       float_len=(int)pn->next->Data();
       pn=pn->next;
+      if ((pn->next!=NULL) && (pn->next->Typ()==INT_CMD))
+      {
+        float_len2=(int)pn->next->Data();
+        pn=pn->next;
+      }
     }
     if ((pn->next==NULL) && complex_flag)
@@ -514 +520 @@
 
   /* characteristic -----------------------------------------------*/
-  /* input: 0 ch=0 : Q     parameter=NULL    ffChar=FALSE   ch_flags
+  /* input: 0 ch=0 : Q     parameter=NULL    ffChar=FALSE   float_len
    *         0    1 : Q(a,...)        *names         FALSE
    *         0   -1 : R               NULL           FALSE  0
@@ -553 +559 @@
   if (ch == -1)
   {
-    R->ch_flags= min(float_len,32767);
+    if (float_len2==0) float_len2=float_len;
+    R->float_len= min(float_len,32767);
+    R->float_len2= min(float_len2,32767);
   }
 
@@ -584 +592 @@
   if ((R->ch == - 1)
   && (R->parameter !=NULL)
-  && (R->ch_flags < SHORT_REAL_LENGTH))
-    R->ch_flags = SHORT_REAL_LENGTH;
+  && (R->float_len < SHORT_REAL_LENGTH))
+    R->float_len = SHORT_REAL_LENGTH;
 
   /* names and number of variables-------------------------------------*/
@@ -698 +706 @@
     if ( rField_is_R(r) )             PrintS("0 (real)\n");  /* R */
     else if ( rField_is_long_R(r) )
-      Print("0 (real:%d digits)\n",r->ch_flags);  /* long R */
+      Print("0 (real:%d digits, additional %d digits)\n",
+             r->float_len,r->float_len2);  /* long R */
     else if ( rField_is_long_C(r) )
-      Print("0 (complex:%d digits)\n",r->ch_flags);  /* long C */
+      Print("0 (complex:%d digits, , additional %d digits)\n",
+             r->float_len, r->float_len2);  /* long C */
     else
       Print ("%d\n",rChar(r)); /* Fp(a) */
@@ -1807 +1817 @@
 
   if ((rInternalChar(r1) != rInternalChar(r2))
-  || (r1->ch_flags != r2->ch_flags)
+  || (r1->float_len != r2->float_len)
+  || (r1->float_len2 != r2->float_len2)
   || (r1->N != r2->N)
   || (r1->OrdSgn != r2->OrdSgn)