Changeset 7161aca in git for Singular/LIB/standard.lib

Timestamp:

Aug 12, 2019, 11:10:44 AM (5 years ago)

Author:

Karim Abou Zeid <karim23697@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

8307d2d92aa305b1a9b4e0c9353dfc467f913461

Parents:

d4cec6ab781a81162945ff680935242fcccc952ab258e2adb78434353acc85388a6c40c626c4b5ee

Message:

Merge branch 'spielwiese' into stable

File:

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

Singular/LIB/standard.lib

@@ -2517 +2517 @@
 static proc parse_L1(string l1)
 {
-  if (find(l1, "(", 1) == 0)   // no parentheses
-  {
-      return(int(l1));
-  }
-  list tokens = tuple_to_tokens(l1);
+  list tokens;
+  if (l1[1] != "(")
+  {
+    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);
@@ -2550 +2590 @@
 static proc parse_L2(string l2)
 {
-  if (find(l2, "(", 1) == 0)   // no parentheses
-  {
-      return(list(parse_var(l2)));
+  if (l2[1] != "(")
+  {
+    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);
@@ -2572 +2612 @@
 {
   string name;
-  intvec w;
   int b1 = find(ordering, "(", 1);
   if (b1 == 0)   // no parentheses
@@ -2579 +2618 @@
     if (name == "C" || name == "c")
     {
-      w = intvec(0);
+      intvec w = intvec(0);
     }
     else
     {
-      w = 1:n_vars;
+      intvec w = 1:n_vars;
     }
   }
@@ -2593 +2632 @@
     if (c == 0)
     {
-      w = 1:int(ordering[b1+1, b2-b1-1]);
+      if (name == "L")
+      {
+        int w = int(ordering[b1+1, b2-b1-1]);
+      }
+      if (name == "wp" || name == "Wp" || name == "ws" || name == "Ws"
+          || name == "a")
+      {
+        intvec w = int(ordering[b1+1, b2-b1-1]);
+      }
+      if (!defined(w))   // else
+      {
+        intvec w = 1:int(ordering[b1+1, b2-b1-1]);
+      }
     }
     else
     {
       list W = tuple_to_tokens(ordering[b1, b2-b1+1]);
-      w = intvec(int(W[1..size(W)]));
+      intvec w = intvec(int(W[1..size(W)]));
     }
   }