Changeset 4c9cf1 in git for Singular/subexpr.cc

Timestamp:

Apr 16, 2013, 4:32:09 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

4740e8c847a5edf6f11b097ddc27bdabb94d3929

Parents:

cb157aa890f385c73cfbcce78a68fecb61a51f84

Message:

fix: tr. #486 (test for par. name)

from master

File:

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

Singular/subexpr.cc

@@ -118 +118 @@
           break;
         case PACKAGE_CMD:
-          PrintNSpaces(spaces);
-          paPrint(n,(package)d);
-          break;
+          PrintNSpaces(spaces);
+          paPrint(n,(package)d);
+          break;
         case NONE:
           return;
@@ -740 +740 @@
             s = (char*) omAlloc(strlen(ps) + 10);
             sprintf(s,"%s(%s)", (t /*Typ()*/ == POLY_CMD ? "poly" : "vector"), ps);
-            omFree(ps);
+            omFree(ps);
             return s;
           }
@@ -846 +846 @@
           else
             return omStrDup(s);
-        } 
+        }
 
         case RING_CMD:
@@ -1388 +1388 @@
   * 2) `basering` / 'Current`
   * 3) existing identifier, local
-  * 4) ringvar, local ring
+  * 4) ringvar, ringpar, local ring
   * 5) existing identifier, global
   * 6) monom (resp. number), local ring: consisting of:
-  * 6') ringvar, global ring
+  * 6') ringvar,  ringpar,global ring
   * 6'') monom (resp. number), local ring
   * 7) monom (resp. number), non-local ring
@@ -1480 +1480 @@
         v->rtyp = POLY_CMD;
         return;
+      }
+      if(rField_is_Extension(currRing)&&((vnr=r_IsRingVar(id, currRing->cf->extRing))>=0))
+      {
+        BOOLEAN ok=FALSE;
+        poly p = pmInit(id,ok);
+        if (ok)
+        {
+          v->data = pGetCoeff(p);
+          pGetCoeff(p)=NULL;
+          pLmFree(p);
+          v->rtyp = NUMBER_CMD;
+          v->name = id;
+          return;
+        }
       }
     }