Changeset c12cf96 in git

Timestamp:

Sep 29, 1998, 12:39:12 PM (25 years ago)

Author:

Kai Krüger <krueger@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

c898336d2b07c6834ddddbc81515f8b883795ba3

Parents:

9ccebb1f2afc97ac52cb586d379fed91a6b84060

Message:

Modified Files:
 	* subexpr.h subexpr.cc
	Added packhdl and req_packhdl to sleftv (needed by namespaces)
	Added char * Fullname() to sleftv
        Changed syMake() for it.
        Added char *iiSleftv2name(leftv v)


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

Location:

Singular

Files:

• subexpr.cc (modified) (4 diffs)
• subexpr.h (modified) (4 diffs)

Singular/subexpr.cc

@@ -243 +243 @@
   }
   name=NULL;
+#ifdef HAVE_NAMESPACES
+  packhdl = NULL;
+  req_packhdl = NULL;
+#endif /* HAVE_NAMESPACES */
   if (data!=NULL)
   {
@@ -1049 +1053 @@
 #endif
   memset(v,0,sizeof(sleftv));
+#ifdef HAVE_NAMESPACES
+  v->packhdl = NULL;
+  if(packhdl != NULL)
+    v->req_packhdl = packhdl;
+  else v->req_packhdl = namespaceroot->get(namespaceroot->name, 0, TRUE);
+#endif /* HAVE_NAMESPACES */
 #ifdef SIQ
   if (siq<=0)
@@ -1073 +1083 @@
         }
       }
+#ifdef HAVE_NAMESPACES
+      if (strcmp(id,"Current")==0)
+      {
+        h = namespaceroot->get(namespaceroot->name,0, TRUE);
+        if (id!=IDID(h)) FreeL((ADDRESS)id);
+        v->rtyp = IDHDL;
+        v->data = (char *)h;
+        v->flag = IDFLAG(h);
+        v->name = IDID(h);
+        v->attribute=IDATTR(h);
+        return;
+      }
+      h=ggetid(id, packhdl==NULL ? FALSE : TRUE, &(v->packhdl));
+      //if(h==NULL) Print("syMake: h is null\n");
+#else /* HAVE_NAMESPACES */
       h=ggetid(id);
+#endif /* HAVE_NAMESPACES */
       /* 3) existing identifier, local */
       if ((h!=NULL) && (IDLEV(h)==myynest))
@@ -1348 +1374 @@
 }
 
+
+char *iiSleftv2name(leftv v)
+{
+#ifdef HAVE_NAMESPACES
+  char *name;
+  if(v->packhdl != NULL) {
+    name = (char *)AllocL(strlen(v->name) + strlen(IDID(v->packhdl)) + 3);
+    sprintf(name, "%s::%s", IDID(v->packhdl), v->name);
+    return(name);
+  }
+  else
+  {
+    return(v->name);
+  }
+#else /* HAVE_NAMESPACES */
+  return(v->name);
+#endif /* HAVE_NAMESPACES */
+}

Singular/subexpr.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: subexpr.h,v 1.8 1998-08-27 12:03:49 obachman Exp $ */
+/* $Id: subexpr.h,v 1.9 1998-09-29 10:39:11 krueger Exp $ */
 /*
 * ABSTRACT: handling of leftv
@@ -23 +23 @@
 extern const char sNoName[];
 extern BOOLEAN siq;
+extern char *iiSleftv2name(leftv v);
 
 class sleftv;
@@ -50 +51 @@
                   */
     Subexpr e;    /* holds the indices for indexed values */
+#ifdef HAVE_NAMESPACES
+    idhdl       packhdl;
+    idhdl       req_packhdl;
+#define IDSROOT(a) (IDPACKAGE(((sleftv)a).packhdl)->idroot)
+#endif /* HAVE_NAMESPACES */
     inline void Init() { memset(this,0,sizeof(*this)); }
     void Set(int val);
@@ -62 +68 @@
     {
       if ((name!=NULL) && (e==NULL)) return name;
+      else return sNoName;
+    }
+    inline const char * Fullname()
+    {
+      if ((name!=NULL) && (e==NULL)) return(iiSleftv2name(this));
       else return sNoName;
     }