Changeset 2082b6 in git

Timestamp:

Jul 8, 1999, 6:44:03 PM (25 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

58ce10a42ffe9e3efdfe86dbd440815c71d053d9

Parents:

b719a30005f8bcbcca9d638b7908dda038ffee56

Message:

*hannes: handling of a/b


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

File:

• Singular/gnumpfl.cc (modified) (5 diffs)

Singular/gnumpfl.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gnumpfl.cc,v 1.7 1999-07-02 16:14:39 wenk Exp $ */
+/* $Id: gnumpfl.cc,v 1.8 1999-07-08 16:44:03 Singular Exp $ */
 /*
 * ABSTRACT: computations with GMP floating-point numbers
@@ -241 +241 @@
 {
   if ( exp == 0 )
-  { 
+  {
     gmp_float* n = new gmp_float(1);
-    *u=(number)n; 
+    *u=(number)n;
     return;
   }
@@ -258 +258 @@
       gmp_float* n = new gmp_float();
       *n= *(gmp_float*)x;
-      *u=(number)n; 
+      *u=(number)n;
     }
     return;
@@ -389 +389 @@
   else
   {
-    if ( *s == '/' ) {
+    gmp_float divisor(1.0);
+    char *start2=s;
+    if ( *s == '/' )
+    {
+      s++;
+      s= ngfEatFloatNExp( s );
+      if (s!= start2+1)
+      {
+        char tmp_c=*s;
+        *s='\0';
+        divisor.setFromStr(start2+1);
+        *s=tmp_c;
+      }
+      else
+      {
+        Werror("wrong long real format: %s",start2);
+      }
     }
-    char c=*s;
-    *s='\0';
+    char c=*start2;
+    *start2='\0';
     if ( *(gmp_float**)a == NULL ) (*(gmp_float**)a)= new gmp_float();
     (*(gmp_float**)a)->setFromStr(start);
-    *s=c;
-  }
-
- 
+    *start2=c;
+    (**(gmp_float**)a) /= divisor;
+  }
 
   return s;
@@ -409 +424 @@
 {
   char *out;
-  if ( a ) {
+  if ( a != NULL )
+  {
     out= floatToStr(*(gmp_float*)a,gmp_output_digits);
     StringAppend(out);
     //Free((ADDRESS)out, (strlen(out)+1)* sizeof(char) );
     FreeL( (ADDRESS)out );
-  } else {
+  }
+  else
+  {
     StringAppend("0");
   }