Changeset 2ef280 in git

Timestamp:

May 6, 2005, 7:31:05 PM (18 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '91fdef05f09f54b8d58d92a472e9c4a43aa4656f')

Children:

034fb497cb219b3b2cbdac20ddd2e9c933b8c75f

Parents:

b33f45b18119ac74e85de184817f94280e653df2

Message:

*hannes: exportto


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

Location:

Singular

Files:

• distrib.h (modified) (1 diff)
• grammar.y (modified) (2 diffs)
• iparith.cc (modified) (2 diffs)
• ipshell.cc (modified) (2 diffs)

Singular/distrib.h

@@ -1 @@
-#undef MAKE_DISTRIBUTION
+#undef MAKE_DISTRIBUTION 

Singular/grammar.y

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: grammar.y,v 1.108 2005-05-06 12:16:47 Singular Exp $ */
+/* $Id: grammar.y,v 1.109 2005-05-06 17:31:03 Singular Exp $ */
 /*
 * ABSTRACT: SINGULAR shell grammatik
@@ -1155 +1155 @@
             if (iiExport(&$2,0)) YYERROR;
         }
-        | EXPORT_CMD exprlist extendedid expr
-        {
-          if ((strcmp($3,"to")!=0) ||
-          (($4.Typ()!=PACKAGE_CMD) && ($4.Typ()!=INT_CMD) &&
-           ($4.Typ()!=STRING_CMD)))
-            MYYERROR("export <id> to <package|int>");
-          omFree((ADDRESS)$3);
-          if ($4.Typ()==INT_CMD)
-          {
-            if (iiExport(&$2,((int)$4.Data())-1)) YYERROR;
-          }
-          else
-          {
-#ifdef HAVE_NS
-            package p=(package)$4.Data();
-            if (p!=$2.req_packhdl)
-            {
-              if(iiExport(&$2,0,(idhdl)$4.data)) YYERROR;
-            }
-#else
-            Print("%s::%s;\n", (char *)$4.Name(),$2.Name());
-#endif /* HAVE_NS */
-          }
-        }
         ;
 

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.354 2005-05-06 11:55:38 bricken Exp $ */
+/* $Id: iparith.cc,v 1.355 2005-05-06 17:31:04 Singular Exp $ */
 
 /*
@@ -1662 +1662 @@
 static BOOLEAN jjEXPORTTO(leftv res, leftv u, leftv v)
 {
-  Print("exportto %s -> %s\n",v->Name(),u->Name() );
-  return FALSE;
+  //Print("exportto %s -> %s\n",v->Name(),u->Name() );
+  return iiExport(v,0,(idhdl)u->data);
 }
 static BOOLEAN jjERROR(leftv res, leftv u)

Singular/ipshell.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.cc,v 1.109 2005-05-06 12:39:47 Singular Exp $ */
+/* $Id: ipshell.cc,v 1.110 2005-05-06 17:31:05 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -459 +459 @@
         else if((IDTYP(h)==PACKAGE_CMD) || (IDTYP(h)==POINTER_CMD))
         {
-          Print("list_cmd:package or pointer\n");
+          //Print("list_cmd:package or pointer\n");
           all=TRUE;typ=PROC_CMD;fullname=TRUE;really_all=TRUE;
           h=IDPACKAGE(h)->idroot;