Changeset 472f39 in git for Singular/silink.cc

Timestamp:

Jul 6, 1999, 3:35:34 PM (25 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

ce7ba606241efb95de4d1ab5581428b7143b3be2

Parents:

acfbb5a85f3eb92ffdb442a04348bd0186e1785b

Message:

* hannes: gmalloc.c: 64-bit cleanups (part 1)
          ipid.h, subexpr.h: aligment changes
	  ipid.cc: new funktion: idrec::String (for idhdl)
	  silink.cc: slReadAscii2 introduced,
	  silink.cc: String-fixes for idhdl


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

File:

• Singular/silink.cc (modified) (11 diffs)

Singular/silink.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: silink.cc,v 1.27 1999-04-17 12:30:24 Singular Exp $ */
+/* $Id: silink.cc,v 1.28 1999-07-06 13:35:33 Singular Exp $ */
 
 /*
@@ -389 +389 @@
 }
 
-leftv slReadAscii(si_link l)
+leftv slReadAscii2(si_link l, leftv pr)
 {
   FILE * fp=(FILE *)l->data;
@@ -415 +415 @@
   #endif
     {
-      //PrintS("? "); mflush();
-      buf=(char *)AllocL(80);
-      fe_fgets_stdin("? ",buf,80);
+      if (pr->Typ()==STRING_CMD)
+      {
+        buf=(char *)AllocL(80);
+        fe_fgets_stdin(pr->Data(),buf,80);
+      }
+      else
+      {
+        WerrorS("read(<link>,<string>) expected");
+        buf=mstrdup("");
+      }
     }
   }
@@ -425 +432 @@
   return v;
 }
+
+leftv slReadAscii(si_link l)
+{
+  sleftv tmp;
+  memset(&tmp,0,sizeof(sleftv));
+  tmp.rtyp=STRING_CMD;
+  tmp.data="? ";
+  return slReadAscii2(l,&tmp);
+}
+
 BOOLEAN slWriteAscii(si_link l, leftv v)
 {
@@ -524 +541 @@
     char *rhs;
     rSetHdl(rhdl, TRUE);
-    rhs = ((leftv) h)->String();
+    rhs = h->String();
 
 #ifdef HAVE_NAMESPACES
-    if (fprintf(fd, "setring %s::%s;\n", 
+    if (fprintf(fd, "setring %s::%s;\n",
                 namespaceroot->name, IDID(rhdl)) == EOF) return TRUE;
-    if (fprintf(fd, "%s %s::%s = %s, %s;\n", Tok2Cmdname(MAP_CMD), 
+    if (fprintf(fd, "%s %s::%s = %s, %s;\n", Tok2Cmdname(MAP_CMD),
                  namespaceroot->name, IDID(h),
                 IDMAP(h)->preimage, rhs) == EOF)
@@ -555 +572 @@
   idtyp type_id = IDTYP(h);
 
-  if (type_id == PACKAGE_CMD && strcmp(IDID(h), "Top") == 0) return FALSE;
-  
+#ifdef HAVE_NAMESPACES
+  if ((type_id == PACKAGE_CMD) &&(strcmp(IDID(h), "Top") == 0))
+    return FALSE;
+#endif
+
   // we do not throw an error if a wrong type was attempted to be dumped
-  if (type_str == NULL) return FALSE;
+  if (type_str == NULL)
+    return FALSE;
 
   // handle qrings separately
-  if (type_id == QRING_CMD) return DumpQring(fd, h, type_str);
+  if (type_id == QRING_CMD)
+    return DumpQring(fd, h, type_str);
 
   // do not dump LIB string
   if (type_id == STRING_CMD && strcmp("LIB", IDID(h)) == 0)
-  {
     return FALSE;
-  }
-
+
+  // put type and name
 #ifdef HAVE_NAMESPACES
-  // put type and name
-  if (fprintf(fd, "%s %s::%s", type_str, namespaceroot->name, IDID(h)) == EOF) return TRUE; 
+  if (fprintf(fd, "%s %s::%s", type_str, namespaceroot->name, IDID(h)) == EOF)
+    return TRUE;
 #else
-  // put type and name
-  if (fprintf(fd, "%s %s", type_str, IDID(h)) == EOF) return TRUE;
+  if (fprintf(fd, "%s %s", type_str, IDID(h)) == EOF)
+    return TRUE;
 #endif
   // for matricies, append the dimension
@@ -588 +609 @@
   }
 
-  if (type_id == PACKAGE_CMD) {
+#ifdef HAVE_NAMESPACES
+  if (type_id == PACKAGE_CMD)
+  {
     if (fprintf(fd, ";\n") == EOF) return TRUE;
     else return FALSE;
   }
-  
+#endif
+
   // write the equal sign
   if (fprintf(fd, " = ") == EOF) return TRUE;
@@ -648 +672 @@
 static BOOLEAN DumpQring(FILE *fd, idhdl h, char *type_str)
 {
-  char *ring_str = ((leftv) h)->String();
+  char *ring_str = h->String();
   if (fprintf(fd, "%s temp_ring = %s;\n", Tok2Cmdname(RING_CMD), ring_str)
               == EOF) return TRUE;
@@ -656 +680 @@
   if (fprintf(fd, "attrib(temp_ideal, \"isSB\", 1);\n") == EOF) return TRUE;
 #ifdef HAVE_NAMESPACES
-  if (fprintf(fd, "%s %s::%s = temp_ideal;\n", 
+  if (fprintf(fd, "%s %s::%s = temp_ideal;\n",
               type_str,  namespaceroot->name, IDID(h)) == EOF)
 #else
@@ -722 +746 @@
   else
   {
-    char *rhs = ((leftv) h)->String();
+    char *rhs = h->String();
 
     if (rhs == NULL) return EOF;
@@ -796 +820 @@
   si_link_root->Kill=slCloseAscii;
   si_link_root->Read=slReadAscii;
+  si_link_root->Read2=slReadAscii2;
   si_link_root->Write=slWriteAscii;
   si_link_root->Dump=slDumpAscii;