Changeset b1888cd in git

Timestamp:

Jan 18, 2016, 6:41:35 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

5a47b7bc8ce6105fef00dfd41ddf87f6da2a4812

Parents:

d357119ab5bfd0a31f26d884e6630f4c0cb9ec5f

Message:

fix: rInit simplifications

File:

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

Singular/ipshell.cc

@@ -5591 +5591 @@
   && ((strcmp(pn->name,"real")==0) || (strcmp(pn->name,"complex")==0)))
   {
+    leftv pnn=pn->next;
     BOOLEAN complex_flag=(strcmp(pn->name,"complex")==0);
-    if ((pn->next!=NULL) && (pn->next->Typ()==INT_CMD))
-    {
-      leftv pnn=pn->next;
+    if ((pnn!=NULL) && (pnn->Typ()==INT_CMD))
+    {
       float_len=(int)(long)pnn->Data();
       float_len2=float_len;
-      if ((pnn->next!=NULL) && (pnn->next->Typ()==INT_CMD))
-      {
-        float_len2=(int)(long)pnn->next->Data();
+      pnn=pnn->next;
+      if ((pnn!=NULL) && (pnn->Typ()==INT_CMD))
+      {
+        float_len2=(int)(long)pnn->Data();
+        pnn=pnn->next;
       }
     }
 
     if (!complex_flag)
-      complex_flag= pn->next != NULL;
+      complex_flag= (pnn!=NULL) && (pnn->name!=NULL);
     if( !complex_flag && (float_len2 <= (short)SHORT_REAL_LENGTH))
        cf=nInitChar(n_R, NULL);
@@ -5622 +5624 @@
            param.float_len2= SHORT_REAL_LENGTH;
          }
-         if (pn->next == NULL)
+         if ((pnn == NULL) || (pnn->name == NULL))
            param.par_name=(const char*)"i"; //default to i
          else
-           param.par_name = (const char*)pn->next->name;
+           param.par_name = (const char*)pnn->name;
        }