Changeset d67f97a in git for Singular/links

Timestamp:

Jun 2, 2016, 5:21:19 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

c7afbd34f1aae46fbf47925ff2246e5f42f4ca08

Parents:

0151564fccc0217ec60e98c6a2303897a948c1b4

Message:

ascii dump revisited (fix tr. #647)

File:

• Singular/links/asciiLink.cc (modified) (11 diffs)

Singular/links/asciiLink.cc

@@ -27 +27 @@
 
 /* declarations */
-static BOOLEAN DumpAscii(FILE *fd, idhdl h);
-static BOOLEAN DumpAsciiIdhdl(FILE *fd, idhdl h);
+static BOOLEAN DumpAscii(FILE *fd, idhdl h,char ***list_of_libs);
+static BOOLEAN DumpAsciiIdhdl(FILE *fd, idhdl h,char ***list_of_libs);
 static const char* GetIdString(idhdl h);
 static int DumpRhs(FILE *fd, idhdl h);
 static BOOLEAN DumpQring(FILE *fd, idhdl h, const char *type_str);
 static BOOLEAN DumpAsciiMaps(FILE *fd, idhdl h, idhdl rhdl);
+static BOOLEAN CollectLibs(FILE *fd, char *name, char ***list_of_libs);
+static BOOLEAN DumpLibs(FILE *fd, char ***list_of_libs);
 
 extern si_link_extension si_link_root;
@@ -213 +215 @@
   FILE *fd = (FILE *) l->data;
   idhdl h = IDROOT, rh = currRingHdl;
-  BOOLEAN status = DumpAscii(fd, h);
+  char **list_of_libs=NULL;
+  BOOLEAN status = DumpAscii(fd, h, &list_of_libs);
 
   if (! status ) status = DumpAsciiMaps(fd, h, NULL);
@@ -219 +222 @@
   if (currRingHdl != rh) rSetHdl(rh);
   fprintf(fd, "option(set, intvec(%d, %d));\n", si_opt_1, si_opt_2);
+  char **p=list_of_libs;
+  if (p!=NULL)
+  {
+    while((*p!=NULL) && (*p!=(char*)1))
+    {
+      fprintf(fd,"load(\"%s\",\"try\");\n",*p);
+      p++;
+    }
+    omFree(list_of_libs);
+  }
   fprintf(fd, "RETURN();\n");
   fflush(fd);
@@ -227 +240 @@
 // we do that recursively, to dump ids in the the order in which they
 // were actually defined
-static BOOLEAN DumpAscii(FILE *fd, idhdl h)
+static BOOLEAN DumpAscii(FILE *fd, idhdl h, char ***list_of_libs)
 {
   if (h == NULL) return FALSE;
 
-  if (DumpAscii(fd, IDNEXT(h))) return TRUE;
+  if (DumpAscii(fd, IDNEXT(h),list_of_libs)) return TRUE;
 
   // need to set the ring before writing it, otherwise we get in
@@ -238 +251 @@
     rSetHdl(h);
 
-  if (DumpAsciiIdhdl(fd, h)) return TRUE;
+  if (DumpAsciiIdhdl(fd, h,list_of_libs)) return TRUE;
 
   if (IDTYP(h) == RING_CMD || IDTYP(h) == QRING_CMD)
-    return DumpAscii(fd, IDRING(h)->idroot);
+    return DumpAscii(fd, IDRING(h)->idroot,list_of_libs);
   else
     return FALSE;
@@ -275 +288 @@
 }
 
-static BOOLEAN DumpAsciiIdhdl(FILE *fd, idhdl h)
+static BOOLEAN DumpAsciiIdhdl(FILE *fd, idhdl h, char ***list_of_libs)
 {
   const char *type_str = GetIdString(h);
   int type_id = IDTYP(h);
 
-  if ((type_id == PACKAGE_CMD) &&(strcmp(IDID(h), "Top") == 0))
-    return FALSE;
+  if (type_id == PACKAGE_CMD)
+  {
+    if (strcmp(IDID(h),"Top")==0) return FALSE;
+    if (IDPACKAGE(h)->language==LANG_SINGULAR) return FALSE;
+  }
 
   // we do not throw an error if a wrong type was attempted to be dumped
@@ -294 +310 @@
   if ((type_id == PROC_CMD) && (IDPROC(h)->language == LANG_C))
     return FALSE;
+
+  // handle libraries
+  if ((type_id == PROC_CMD)
+  && (IDPROC(h)->language == LANG_SINGULAR)
+  && (IDPROC(h)->libname!=NULL))
+    return CollectLibs(fd,IDPROC(h)->libname,list_of_libs);
 
   // put type and name
@@ -333 +355 @@
   switch(type)
   {
-      case LIST_CMD:
-      {
-        lists l = IDLIST(h);
-        int i, nl = l->nr + 1;
-
-        for (i=0; i<nl; i++)
-          if (GetIdString((idhdl) &(l->m[i])) == NULL) return NULL;
-      }
-      #ifdef SINGULAR_4_1
-      case CRING_CMD:
-      case CNUMBER_CMD:
-      case CMATRIX_CMD:
-      #endif
-      case PACKAGE_CMD:
-      case INT_CMD:
-      case INTVEC_CMD:
-      case INTMAT_CMD:
-      case STRING_CMD:
-      case RING_CMD:
-      case QRING_CMD:
-      case PROC_CMD:
-      case NUMBER_CMD:
-      case POLY_CMD:
-      case IDEAL_CMD:
-      case VECTOR_CMD:
-      case MODUL_CMD:
-      case MATRIX_CMD:
-        return Tok2Cmdname(type);
-
-      case MAP_CMD:
-      case LINK_CMD:
-        return NULL;
-
-      default:
-       Warn("Error dump data of type %s", Tok2Cmdname(IDTYP(h)));
+    case LIST_CMD:
+    {
+      lists l = IDLIST(h);
+      int i, nl = l->nr + 1;
+
+      for (i=0; i<nl; i++)
+        if (GetIdString((idhdl) &(l->m[i])) == NULL) return NULL;
+    }
+    #ifdef SINGULAR_4_1
+    case CRING_CMD:
+    case CNUMBER_CMD:
+    case CMATRIX_CMD:
+    #endif
+    case BIGINT_CMD:
+    case PACKAGE_CMD:
+    case INT_CMD:
+    case INTVEC_CMD:
+    case INTMAT_CMD:
+    case STRING_CMD:
+    case RING_CMD:
+    case QRING_CMD:
+    case PROC_CMD:
+    case NUMBER_CMD:
+    case POLY_CMD:
+    case IDEAL_CMD:
+    case VECTOR_CMD:
+    case MODUL_CMD:
+    case MATRIX_CMD:
+      return Tok2Cmdname(type);
+
+    case MAP_CMD:
+    case LINK_CMD:
+      return NULL;
+
+    default:
+      Warn("Error dump data of type %s", Tok2Cmdname(IDTYP(h)));
        return NULL;
   }
@@ -391 +414 @@
 }
 
+static BOOLEAN CollectLibs(FILE *fd, char *name, char *** list_of_libs)
+{
+  if (*list_of_libs==NULL)
+  {
+    #define MAX_LIBS 256
+    (*list_of_libs)=(char**)omalloc0(MAX_LIBS*sizeof(char**));
+    (*list_of_libs)[0]=name;
+    (*list_of_libs)[MAX_LIBS-1]=(char*)1;
+    return FALSE;
+  }
+  else
+  {
+    char **p=*list_of_libs;
+    while (((*p)!=NULL)&&((*p!=(char*)1)))
+    {
+      if (strcmp((*p),name)==0) return FALSE;
+      p++;
+    }
+    if (*p==(char*)1)
+    {
+      WerrorS("too many libs");
+      return TRUE;
+    }
+    else
+    {
+      *p=name;
+    }
+  }
+  return FALSE;
+}
+
 
 static int DumpRhs(FILE *fd, idhdl h)
@@ -431 +485 @@
     if (pi->language == LANG_SINGULAR)
     {
-      if( pi->data.s.body==NULL) iiGetLibProcBuffer(pi);
+      /* pi-Libname==NULL */
       char *pstr = pi->data.s.body;
       fputc('"', fd);
@@ -454 +508 @@
     else if (type_id == IDEAL_CMD) { fprintf(fd, "ideal(");need_klammer=TRUE; }
     else if (type_id == MODUL_CMD) { fprintf(fd, "module(");need_klammer=TRUE; }
+    else if (type_id == BIGINT_CMD) { fprintf(fd, "bigint(");need_klammer=TRUE; }
 
     if (fprintf(fd, "%s", rhs) == EOF) return EOF;