Changeset 1ba856 in git

Timestamp:

Aug 5, 2019, 1:54:09 PM (4 years ago)

Author:

Andreas Steenpass <steenpass@…>

Branches:

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

Children:

621203ad7373159254c97525b77e9edda2f36c37

Parents:

31212ff491b316ea34617fe1509cfbc676781d4b

git-author:

Andreas Steenpass <steenpass@mathematik.uni-kl.de>2019-08-05 13:54:09+02:00

git-committer:

Andreas Steenpass <steenpass@mathematik.uni-kl.de>2019-08-06 17:17:17+02:00

Message:

allow "real" and "complex" in create_ring()

File:

• Singular/LIB/standard.lib (modified) (3 diffs)

Singular/LIB/standard.lib

@@ -2517 +2517 @@
 static proc parse_L1(string l1)
 {
+  list tokens;
   if (find(l1, "(", 1) == 0)   // no parentheses
   {
-      return(int(l1));
-  }
-  list tokens = tuple_to_tokens(l1);
+    tokens[1] = l1;
+  }
+  else
+  {
+    tokens = tuple_to_tokens(l1);
+  }
+  if (tokens[1] == "real")
+  {
+    int p1 = 6;
+    int p2 = 6;
+    if (size(tokens) > 1)
+    {
+      p1 = int(tokens[2]);
+      p2 = p1;
+    }
+    if (size(tokens) > 2)
+    {
+      p2 = int(tokens[3]);
+    }
+    return(list(0, list(p1, p2)));
+  }
+  if (tokens[1] == "complex")
+  {
+    int p1 = 6;
+    int p2 = 6;
+    string imag_unit = "i";
+    if (int(tokens[size(tokens)]) == 0)   // not an integer
+    {
+      imag_unit = tokens[size(tokens)];
+      tokens = delete(tokens, size(tokens));
+    }
+    if (size(tokens) > 1)
+    {
+      p1 = int(tokens[2]);
+      p2 = p1;
+    }
+    if (size(tokens) > 2)
+    {
+      p2 = int(tokens[3]);
+    }
+    return(list(0, list(p1, p2), imag_unit));
+  }
   if (size(tokens) == 1)
   {
-      return(int(tokens[1]));
+    return(int(tokens[1]));
   }
   list L = int(tokens[1]);
@@ -2537 +2577 @@
   if (v[1, 4] == "var(" && defined(basering))
   {
-      int i = int(v[5,size(v)-5]);
-      v = ringlist(basering)[2][i];
+    int i = int(v[5,size(v)-5]);
+    v = ringlist(basering)[2][i];
   }
   return(v);
@@ -2552 +2592 @@
   if (find(l2, "(", 1) == 0)   // no parentheses
   {
-      return(list(parse_var(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]);
+    V[i] = parse_var(V[i]);
   }
   return(V);