Changeset 38f64f3 in git

Timestamp:

Jul 1, 2019, 2:09:17 PM (5 years ago)

Author:

Andreas Steenpass <steenpass@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

4b7966107c42517ad9414fb42aafae650eb74994

Parents:

4abcd2d774b1f54dbe0a29184ff63af5c678b3fa

Message:

add parse_var() to ring.lib

File:

• Singular/LIB/ring.lib (modified) (4 diffs)

Singular/LIB/ring.lib

@@ -1406 +1406 @@
 }
 
+static proc parse_var(string v)
+{
+  if (v[1, 4] == "var(" && defined(basering))
+  {
+      int i = int(v[5,size(v)-5]);
+      v = ringlist(basering)[2][i];
+  }
+  return(v);
+}
+
 /*
  * parses
@@ -1415 +1425 @@
   if (find(l2, "(", 1) == 0)   // no parentheses
   {
-      return(list(l2));
+      return(list(parse_var(l2)));
   }
   list V = tuple_to_tokens(l2);
+  for (int i = size(V); i > 0; i--)
+  {
+      V[i] = parse_var(V[i]);
+  }
   return(V);
 }
@@ -1527 +1541 @@
 
   /* L[1] */
-  if (typeof(l2) == "list")
+  if (typeof(l1) == "list")
   {
     if (no_minpoly)
@@ -1542 +1556 @@
       }
     }
+  }
+  if (typeof(l1) == "list" || typeof(l1) == "int")
+  {
     L[1] = l1;
   }