Changeset 98adcd in git

Timestamp:

Apr 11, 2012, 3:04:38 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

ea4f38900333c304ce2655ba13b1ab15003f27bdfcbfae5d69b3277a93d042a85b03a5ec3b8cf79c

Parents:

4ec288be9af6f58af102d533957618aaf274e928

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2012-04-11 15:04:38+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2012-04-11 15:32:52+02:00

Message:

chg: handling of alias (from master)

Location:

Singular

Files:

• iparith.cc (modified) (1 diff)
• ipconv.cc (modified) (3 diffs)
• subexpr.cc (modified) (1 diff)

Singular/iparith.cc

@@ -683 +683 @@
   }
   return jjPLUSMINUS_Gen(res,u,v);
-  return FALSE;
 }
 static BOOLEAN jjPLUS_MA(leftv res, leftv u, leftv v)

Singular/ipconv.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id$ */
 /*
 * ABSTRACT: automatic type conversions
@@ -167 +166 @@
   // operations...
   number n = n_Init_bigint((number)data, coeffs_BIGINT, currRing->cf);
-  n_Delete((number *)&data, coeffs_BIGINT);  
+  n_Delete((number *)&data, coeffs_BIGINT);
   return (void*)n;
 }
@@ -281 +280 @@
       else if (input->name!=NULL)
       {
-        output->name=input->name;
-        input->name=NULL;
+        if (input->rtyp==ALIAS_CMD)
+        output->name=omStrDup(input->name);
+        else
+        {
+          output->name=input->name;
+          input->name=NULL;
+        }
       }
       else if ((input->rtyp==POLY_CMD) && (input->name==NULL))

Singular/subexpr.cc

@@ -624 +624 @@
 void * sleftv::CopyD(int t)
 {
-  if ((rtyp!=IDHDL)&&(e==NULL))
+  if ((rtyp!=IDHDL)&&(rtyp!=ALIAS_CMD)&&(e==NULL))
   {
     if (iiCheckRing(t)) return NULL;