Changeset 4b2155 in git for Singular/subexpr.cc

Timestamp:

Apr 16, 1999, 9:53:44 AM (25 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', 'e7cc1ebecb61be8b9ca6c18016352af89940b21a')

Children:

0df02761ea5104747ff923eee578ddb4d27f4a45

Parents:

04d56fffcf5bd9bd7b214fdec1609e8a293fd986

Message:

*string() implemented for all types -- no line breaks
*inmtat(intvec, n, m) implemented


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

File:

• Singular/subexpr.cc (modified) (3 diffs)

Singular/subexpr.cc

@@ -638 +638 @@
 }
 
-char *  sleftv::String(void *d)
+char *  sleftv::String(void *d, BOOLEAN func)
 {
 #ifdef SIQ
@@ -658 +658 @@
   {
     /* create a string, which may be freed by FreeL
-    * leave the switch with return
-    * or with break, which copies the string s*/
+     * leave the switch with return
+     * or with break, which copies the string s*/
     char *s;
     const char *n;
@@ -666 +666 @@
     switch (Typ())
     {
-      case INT_CMD:
-        s=(char *)AllocL(MAX_INT_LEN+2);
-        sprintf(s,"%d",(int)d);
-        return s;
-      case STRING_CMD:
-        return (char *)CopyD(STRING_CMD);
-      case POLY_CMD:
-      case VECTOR_CMD:
-        s = pString((poly)d);
-        break;
-      case NUMBER_CMD:
-        StringSetS("");
-        if ((rtyp==IDHDL)&&(IDTYP((idhdl)data)==NUMBER_CMD))
-        {
-          nWrite(IDNUMBER((idhdl)data));
-        }
-        else if (rtyp==NUMBER_CMD)
-        {
-          number n=(number)data;
-          nWrite(n);
-          data=(char *)n;
-        }
-        else if((rtyp==VMINPOLY)&&(rField_is_GF()))
-        {
-          nfShowMipo();
-        }
-        else
-        {
-          number n=nCopy((number)d);
-          nWrite(n);
-          nDelete(&n);
-        }
-        s = StringAppend("");
-        break;
-      case MATRIX_CMD:
-        s= iiStringMatrix((matrix)d,2);
-        break;
-      case MODUL_CMD:
-      case IDEAL_CMD:
-      case MAP_CMD:
-        s= iiStringMatrix((matrix)d,1);
-        break;
-      case INTVEC_CMD:
-      case INTMAT_CMD:
-      {
-        intvec *v=(intvec *)d;
-        return v->String();
-      }
-      case RING_CMD:
-      case QRING_CMD:
-      {
-        return rString((ring)d);
-      }
+        case INT_CMD:
+          s=(char *)AllocL(MAX_INT_LEN+2);
+          sprintf(s,"%d",(int)d);
+          return s;
+        case STRING_CMD:
+          if (d != NULL) return mstrdup((char*)d);
+          return mstrdup("");
+        case POLY_CMD:
+        case VECTOR_CMD:
+          s = pString((poly)d);
+          break;
+        case NUMBER_CMD:
+          StringSetS("");
+          if ((rtyp==IDHDL)&&(IDTYP((idhdl)data)==NUMBER_CMD))
+          {
+            nWrite(IDNUMBER((idhdl)data));
+          }
+          else if (rtyp==NUMBER_CMD)
+          {
+            number n=(number)data;
+            nWrite(n);
+            data=(char *)n;
+          }
+          else if((rtyp==VMINPOLY)&&(rField_is_GF()))
+          {
+            nfShowMipo();
+          }
+          else
+          {
+            number n=nCopy((number)d);
+            nWrite(n);
+            nDelete(&n);
+          }
+          s = StringAppend("");
+          break;
+        case MATRIX_CMD:
+          s= iiStringMatrix((matrix)d,1);
+          break;
+        case MODUL_CMD:
+        case IDEAL_CMD:
+        case MAP_CMD:
+          s= iiStringMatrix((matrix)d,1);
+          break;
+        case INTVEC_CMD:
+        case INTMAT_CMD:
+        {
+          intvec *v=(intvec *)d;
+          return v->String(1);
+        }
+        case RING_CMD:
+        {
+          return rString((ring)d);
+        }
+        case QRING_CMD:
+        {
+          char* r = rString((ring)d);
+          char* i = iiStringMatrix((matrix) ((ring) d)->qideal, 1);
+          s = (char*) AllocL(strlen(r) + strlen(i) + 4);
+          sprintf(s, "%s,(%s)", r, i);
+          FreeL(r);
+          return s;
+        }
+        
+        case RESOLUTION_CMD:
+        {
+          lists l = syConvRes((syStrategy)d);
+          s = lString(l);
+          l->Clean();
+          return (s);
+        }
+        case PROC_CMD:
+        {
+          procinfo* pi = (procinfo*) d;
+          if((pi->language == LANG_SINGULAR) && (pi->data.s.body!=NULL))
+            return mstrdup(pi->data.s.body);
+          else
+            return mstrdup("");
+        }
+          
         case LINK_CMD:
         {
           return slString((si_link) d);
         }
+        case DEF_CMD:
+        {
+          return mstrdup("");
+        }
         
-      default:
-        #ifdef TEST
-        ::Print("String:unknown type %s(%d)", Tok2Cmdname(Typ()),Typ());
-        #endif
-        return NULL;
+        case LIST_CMD:
+        {
+          return lString((lists) d);
+        }
+        default:
+#ifdef TEST
+          ::Print("String:unknown type %s(%d)", Tok2Cmdname(Typ()),Typ());
+#endif
+          return mstrdup("");
     } /* end switch: (Typ()) */
     return mstrdup(s);
   }
-  return NULL;
+  return mstrdup("");
 }