Changeset 000098 in git for Singular/ipprint.cc

Timestamp:

Jun 29, 2011, 12:40:24 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

3a8c5fe234a64598138a3f2f2cd5c5c2636d4442

Parents:

7959ec93769d80d56f9893f174493c33cfc6a5b1

Message:

print returns a string

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

File:

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

Singular/ipprint.cc

@@ -217 +217 @@
 BOOLEAN jjPRINT(leftv res, leftv u)
 {
+  SPrintStart();
+  BOOLEAN bo=FALSE;
   switch(u->Typ())
   {
       case INTVEC_CMD:
-        return ipPrint_INTVEC(u);
+        bo=ipPrint_INTVEC(u);
+        break;
 
       case INTMAT_CMD:
-        return ipPrint_INTMAT(u);
+        bo=ipPrint_INTMAT(u);
+        break;
 
       case MATRIX_CMD:
-        return ipPrint_MA(u);
+        bo=ipPrint_MA(u);
+        break;
 
       case IDEAL_CMD:
@@ -234 +239 @@
         PrintLn();
         omFree(s);
-        return FALSE;
+        break;
       }
 
@@ -242 +247 @@
         ipPrint_MA0(m, u->Name());
         idDelete((ideal *) &m);
-        return FALSE;
+        break;
       }
 
       case VECTOR_CMD:
-        return ipPrint_V(u);
+        bo=ipPrint_V(u);
+        break;
 
       default:
         u->Print();
-        return FALSE;
-  }
+        break;
+  }
+  char *s=SPrintEnd();
+  if (u->next==NULL)
+  {
+    int l=strlen(s);
+    if (s[l-1]=='\n') s[l-1]='\0';
+  }
+  res->data=(void*)s;
+  return bo;
 }
 
@@ -276 +290 @@
       h->next=NULL;
       if (jjPRINT(res, h)) return TRUE;
+      PrintS((char*)res->data);
+      omFree(res->data);
+      PrintLn();
       h->next=hh;
       h=hh;
@@ -333 +350 @@
   if ((u->Typ()==INTMAT_CMD)&&(strcmp((char *)v->Data(),"betti")==0))
   {
-    ipPrintBetti(u);
-    res->data = NULL;
-    res->rtyp = NONE;
-    return FALSE;
-  }
-/* ======================== end betti ================================= */
-
-  char* ns = omStrDup((char*) v->Data());
-  int dim = 1;
-  if (strlen(ns) == 3 && ns[1] == '2')
-  {
-    dim = 2;
-    ns[1] = ns[2];
-    ns[2] = '\0';
-  }
-  if (strcmp(ns,"%l") == 0)
-  {
-    res->data = (char*) u->String(NULL, TRUE, dim);
-    if (dim == 2)
-    {
-      char* ns = (char*) omAlloc(strlen((char*) res->data) + 2);
-      strcpy(ns, (char*) res->data);
-      omFree(res->data);
-      strcat(ns, "\n");
-      res->data = ns;
-    }
-  }
-  else if (strcmp(ns,"%t") == 0)
-  {
-    SPrintStart();
-    type_cmd(u);
-    res->data = SPrintEnd();
-    if (dim != 2)
-      ((char*)res->data)[strlen((char*)res->data) -1] = '\0';
-  }
-  else if (strcmp(ns,"%;") == 0)
-  {
-    SPrintStart();
-    u->Print();
-    if (dim == 2) PrintLn();
-    res->data = SPrintEnd();
-  }
-  else if  (strcmp(ns,"%p") == 0)
-  {
-    SPrintStart();
-    iiExprArith1(res, u, PRINT_CMD);
-    if (dim == 2) PrintLn();
-    res->data = SPrintEnd();
-  }
-  else if (strcmp(ns,"%b") == 0 && (u->Typ()==INTMAT_CMD))
-  {
     SPrintStart();
     ipPrintBetti(u);
-    if (dim == 2) PrintLn();
-    res->data = SPrintEnd();
+    char *s = SPrintEnd();
+    s[strlen(s)]='\0';
+    res->data=s;
   }
   else
-  {
-    res->data = u->String(NULL, FALSE, dim);
-    if (dim == 2)
-    {
-      char* ns = (char*) omAlloc(strlen((char*) res->data) + 2);
-      strcpy(ns, (char*) res->data);
-      omFree(res->data);
-      strcat(ns, "\n");
-      res->data = ns;
-    }
-  }
-
-  omFree(ns);
-  res->rtyp = STRING_CMD;
-  return FALSE;
-}
+/* ======================== end betti ================================= */
+  {
+    char* ns = omStrDup((char*) v->Data());
+    int dim = 1;
+    if (strlen(ns) == 3 && ns[1] == '2')
+    {
+      dim = 2;
+      ns[1] = ns[2];
+      ns[2] = '\0';
+    }
+    if (strcmp(ns,"%l") == 0)
+    {
+      res->data = (char*) u->String(NULL, TRUE, dim);
+      if (dim == 2)
+      {
+        char* ns = (char*) omAlloc(strlen((char*) res->data) + 2);
+        strcpy(ns, (char*) res->data);
+        omFree(res->data);
+        strcat(ns, "\n");
+        res->data = ns;
+      }
+    }
+    else if (strcmp(ns,"%t") == 0)
+    {
+      SPrintStart();
+      type_cmd(u);
+      res->data = SPrintEnd();
+      if (dim != 2)
+        ((char*)res->data)[strlen((char*)res->data) -1] = '\0';
+    }
+    else if (strcmp(ns,"%;") == 0)
+    {
+      SPrintStart();
+      u->Print();
+      if (dim == 2) PrintLn();
+      res->data = SPrintEnd();
+    }
+    else if  (strcmp(ns,"%p") == 0)
+    {
+      iiExprArith1(res, u, PRINT_CMD);
+    }
+    else if (strcmp(ns,"%b") == 0 && (u->Typ()==INTMAT_CMD))
+    {
+      SPrintStart();
+      ipPrintBetti(u);
+      if (dim == 2) PrintLn();
+      res->data = SPrintEnd();
+    }
+    else
+    {
+      res->data = u->String(NULL, FALSE, dim);
+      if (dim == 2)
+      {
+        char* ns = (char*) omAlloc(strlen((char*) res->data) + 2);
+        strcpy(ns, (char*) res->data);
+        omFree(res->data);
+        strcat(ns, "\n");
+        res->data = ns;
+      }
+    }
+    omFree(ns);
+  }
+  return FALSE;
+}