Changeset 5d466e in git

Timestamp:

Jun 6, 2006, 7:17:06 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

54e84caff739c3553691638a0b6127d496e50d1f

Parents:

aaa39a5f3bfb59db4dc34d109d40f75d267a1ff9

Message:

*hannes: fastmap(map)


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

File:

• Singular/ipshell.cc (modified) (3 diffs)

Singular/ipshell.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.cc,v 1.136 2006-02-02 10:11:18 Singular Exp $ */
+/* $Id: ipshell.cc,v 1.137 2006-06-06 17:17:06 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -726 +726 @@
     else if ((w=IDRING(r)->idroot->get(what,myynest))!=NULL)
     {
+      char *save_r=NULL;
       v=(leftv)omAlloc0Bin(sleftv_bin);
       sleftv tmpW;
       memset(&tmpW,0,sizeof(sleftv));
       tmpW.rtyp=IDTYP(w);
+      if (tmpW.rtyp==MAP_CMD) 
+      { 
+        tmpW.rtyp=IDEAL_CMD;
+        save_r=IDMAP(w)->preimage;
+        IDMAP(w)->preimage=0;
+      }
       tmpW.data=IDDATA(w);
       #ifdef FAST_MAP
@@ -747 +754 @@
         Werror("cannot map %s(%d)",Tok2Cmdname(w->typ),w->typ);
         omFreeBin((ADDRESS)v, sleftv_bin);
+        if (save_r!=NULL) IDMAP(w)->preimage=save_r;
         return NULL;
+      }
+      if (save_r!=NULL)
+      { 
+        IDMAP(w)->preimage=save_r;
+        IDMAP((idhdl)v)->preimage=omStrDup(save_r);
+        v->rtyp=MAP_CMD;
       }
       return v;