Changeset daeb6d in git for Singular/subexpr.cc

Timestamp:

Oct 22, 1998, 2:26:17 PM (26 years ago)

Author:

Kai Krüger <krueger@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

c6217051c24f5239a0f05fbcbf54346d4765c2e5

Parents:

f78e2660572d74fc77f51e15288a9f225a21bd10

Message:

 	tesths.cc subexpr.h subexpr.cc ipshell.h ipshell.cc iplib.cc
 	ipid.h ipid.cc ipassign.cc iparith.cc ChangeLog
	  - Added assignment <package>=<package> via ref-counter
	    rewriten killhdl for packages
	  - Added libname,language to packages
	  - exportto(Up,...) 'Up' defined in syMake
	  - listvar() shows toplevel-packages too.


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

File:

• Singular/subexpr.cc (modified) (4 diffs)

Singular/subexpr.cc

@@ -104 +104 @@
             char *typ;
             language_defs lang = ((package)d)->language;
-            ::Print("// Package : %-*.*s`%s`\n",spaces,spaces," ",n);
+            ::Print("// Package : %-*.*s`%s`, ref=%d\n",spaces,spaces," ",n,
+                    ((package)d)->ref);
             switch (lang) {
+                case LANG_TOP:      typ="Toplevel"; break;
                 case LANG_SINGULAR: typ="singular"; break;
                 case LANG_C:        typ="object";   break;
@@ -111 +113 @@
                 default:            typ="unknow language";
             }
+            if(((package)d)->libname!=NULL)
+              ::Print("// libname : %s\n", ((package)d)->libname);
+            
             ::Print("// language: %-*.*s%s",spaces,spaces," ",typ);
           }
@@ -442 +447 @@
     case POINTER_CMD:
       return d;
+    case PACKAGE_CMD:
+      return  (void *)paCopy((package) d);
     case PROC_CMD:
       return  (void *)piCopy((procinfov) d);
@@ -1114 +1121 @@
         v->name = IDID(h);
         v->attribute=IDATTR(h);
+        return;
+      }
+      if (strcmp(id,"Up")==0)
+      { namehdl ns=namespaceroot;
+        if (!ns->isroot) ns=ns->next;
+        if (id!=ns->name) FreeL((ADDRESS)id);
+        v->rtyp = NSHDL;
+        v->data = (char *)ns;
+        v->name = mstrdup(ns->name);
         return;
       }