Changeset 7604db in git for Singular/lists.cc

Timestamp:

Apr 19, 1999, 1:03:57 PM (24 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

228c7e51151a4fc3bdf6908acbb09367f243d275

Parents:

a30caa3e79912e5d42b9d62c6d2e1aa1239e5486

Message:

* print command


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

File:

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

Singular/lists.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: lists.cc,v 1.14 1999-04-17 14:58:51 obachman Exp $ */
+/* $Id: lists.cc,v 1.15 1999-04-19 11:02:40 obachman Exp $ */
 /*
 * ABSTRACT: handling of the list type
@@ -356 +356 @@
 char* lString(lists l, BOOLEAN typed, int dim)
 {
-  if (l->nr == -1) return mstrdup("");
+  if (l->nr == -1) 
+  {
+    if (typed) return mstrdup("list()");
+    return mstrdup("");
+  }
+  
   char** slist = (char**) Alloc((l->nr+1) * sizeof(char*));
   int i, j, k;
@@ -362 +367 @@
   for (i=0, j = 0, k = 0; i<=l->nr; i++)
   {
-    slist[i] = l->m[i].String();
+    slist[i] = l->m[i].String(NULL, typed, dim);
     assume(slist[i] != NULL);
+    mmTestL(slist[i]);
     if (*(slist[i]) != '\0')
     {
@@ -370 +376 @@
     }
   }
-  s = (char*) AllocL(j+k+1);
-  *s = '\0';
+  s = (char*) AllocL(j+k+2+(typed ? 10 : 0) + (dim == 2 ? k : 0));
+
+  if (typed)
+    sprintf(s, "list(");
+  else
+    *s = '\0';
+
   for (i=0; i<=l->nr; i++)
   {
@@ -378 +389 @@
       strcat(s, slist[i]);
       strcat(s, ",");
-    }
+      if (dim == 2) strcat(s, "\n");
+    }
+    mmTestL(s);
     FreeL(slist[i]);
   }
-  if (k > 0) s[strlen(s) - 1] = '\0';
+  if (k > 0) s[strlen(s) - (dim == 2 ? 2 : 1)] = '\0';
+  if (typed) strcat(s, ")");
+  mmTestL(s);
   Free(slist, (l->nr+1) * sizeof(char*));
   return s;