Changeset 046a94 in git

Timestamp:

Sep 28, 2011, 7:08:54 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

733d247ce0bb53a600a9565cc20a019df1de9856

Parents:

d0340f40c4bd9c7fbfd9dc6788a900be9d21a13b

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-09-28 19:08:54+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:13:42+01:00

Message:

FIX: correct small real fields

File:

• Singular/ipshell.cc (modified) (2 diffs)

Singular/ipshell.cc

@@ -5025 +5025 @@
   && ((strcmp(pn->name,"real")==0) || (strcmp(pn->name,"complex")==0)))
   {
-    LongComplexInfo param;
     BOOLEAN complex_flag=(strcmp(pn->name,"complex")==0);
     const int ch=0;
@@ -5039 +5038 @@
       }
     }
-    // set the parameter name
-    if (complex_flag) {
-      if (pn->next == NULL)
-        param.par_name=(const char*)"i"; //default to i
-      else
-        param.par_name = (const char*)pn->next->name;
-    }
-
-    param.float_len = float_len;
-    param.float_len2 = float_len2;
-    cf=nInitChar(complex_flag ? n_long_C: n_long_R, (void*)&param);
-
+    assume( float_len <= float_len2 );
+     
+    if( !complex_flag && (float_len2 <= (short)SHORT_REAL_LENGTH) )
+       cf=nInitChar(n_R, NULL);
+    else // longR or longC?
+    { 
+       LongComplexInfo param;
+       
+       param.float_len = float_len;
+       param.float_len2 = float_len2;
+       
+       // set the parameter name
+       if (complex_flag) {
+          if (pn->next == NULL)
+            param.par_name=(const char*)"i"; //default to i
+          else
+            param.par_name = (const char*)pn->next->name;
+       }
+
+       cf = nInitChar(complex_flag ? n_long_C: n_long_R, (void*)&param);
+    }   
     assume( cf != NULL );
   }