Changeset 762bfd in git

Timestamp:

May 3, 2005, 5:41:50 PM (18 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '23b0a9c07070b684aa12355009488dc00d9501e3')

Children:

00845bd62a3eda4672469a384d3406598ba33ef2

Parents:

35664ecae6d51cbd60177ada1c2dcb7e7362361a

Message:

*hannes: importfrom


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

Location:

Singular

Files:

• iparith.cc (modified) (2 diffs)
• ipassign.cc (modified) (2 diffs)
• ipshell.h (modified) (2 diffs)

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.351 2005-05-02 15:58:45 Singular Exp $ */
+/* $Id: iparith.cc,v 1.352 2005-05-03 15:41:48 Singular Exp $ */
 
 /*
@@ -1930 +1930 @@
   }
   res->data = (char *)idHomogen((ideal)u->Data(),i);
-  return FALSE;
-}
-static BOOLEAN jjIMPORTFROM(leftv res, leftv u, leftv v)
-{
-  Print("importfrom %s::%s ->.\n",v->Name(),u->Name() );
   return FALSE;
 }

Singular/ipassign.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipassign.cc,v 1.72 2005-03-24 10:54:19 Singular Exp $ */
+/* $Id: ipassign.cc,v 1.73 2005-05-03 15:41:50 Singular Exp $ */
 
 /*
@@ -1533 +1533 @@
   return nok;
 }
+BOOLEAN jjIMPORTFROM(leftv res, leftv u, leftv v)
+{
+  //Print("importfrom %s::%s ->.\n",v->Name(),u->Name() );
+  assume(u->Typ()==PACKAGE_CMD);
+  char *vn=(char *)v->Name();
+  idhdl h=((package)(u->Data()))->idroot->get(vn /*v->Name()*/, myynest);
+  if (h!=NULL)
+  {
+    //check for existence
+    if (IDPACKAGE(h)==basePack)
+    {
+      PrintS("source and destination packages are identical");
+      return FALSE;
+    }
+    idhdl t=basePack->idroot->get(vn /*v->Name()*/, myynest);
+    if (t!=NULL)
+    {
+      Warn("redefining `%s`",vn);
+      killhdl(t);
+    }
+    sleftv tmp_expr;
+    if (iiDeclCommand(&tmp_expr,v,myynest,DEF_CMD,&IDROOT)) return TRUE;
+    sleftv h_expr;
+    memset(&h_expr,0,sizeof(h_expr));
+    h_expr.rtyp=IDHDL;
+    h_expr.data=h;
+    h_expr.name=vn;
+    return iiAssign(&tmp_expr,&h_expr);
+  }
+  else
+  {
+    Werror("`%s` not found in `%s`",v->Name(), u->Name());
+    return TRUE;
+  }
+  return FALSE;
+}

Singular/ipshell.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.h,v 1.37 2005-05-02 16:31:56 Singular Exp $ */
+/* $Id: ipshell.h,v 1.38 2005-05-03 15:41:50 Singular Exp $ */
 /*
 * ABSTRACT
@@ -71 +71 @@
 BOOLEAN jjBETTI2(leftv res, leftv u, leftv v);
 BOOLEAN jjBETTI2_ID(leftv res, leftv u, leftv v);
+BOOLEAN jjIMPORTFROM(leftv res, leftv u, leftv v);
 
 int     iiRegularity(lists L);