Changeset 7023ce in git for Singular/extra.cc

Timestamp:

Feb 4, 2015, 10:08:19 AM (9 years ago)

Author:

Stephan Oberfranz <oberfran@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

dbf60932968d7dd0d5f400c4209b39e40b442f58

Parents:

ca38640ca6928ad815ae7b2bd1f3516f383315af48d66afcfd578627347de972483894aa987b9f60

Message:

---

Merge branch 'spielwiese' of github.com:Singular/Sources into spielwiese

File:

• Singular/extra.cc (modified) (4 diffs)

Singular/extra.cc

@@ -613 +613 @@
     }
     else
-  /*==================== complexNearZero ======================*/
+    /*======================= demon_list =====================*/
+    if (strcmp(sys_cmd,"denom_list")==0)
+    {
+      res->rtyp=LIST_CMD;
+      extern lists get_denom_list();
+      res->data=(lists)get_denom_list();
+      return FALSE;
+    }
+    else
+    /*==================== complexNearZero ======================*/
     if(strcmp(sys_cmd,"complexNearZero")==0)
     {
@@ -863 +872 @@
       {
         int id=0;
-        blackboxIsCmd((char*)h->Data(),id);
+        char *n=(char*)h->Data();
+        blackboxIsCmd(n,id);
         if (id>0)
         {
@@ -873 +883 @@
             return FALSE;
           }
-        }
+          else Werror("'%s' is not a newstruct",n);
+        }
+        else Werror("'%s' is not a blackbox object",n);
       }
       return TRUE;
@@ -3444 +3456 @@
 
   #endif
-/*======================= demon_list =====================*/
-  if (strcmp(sys_cmd,"denom_list")==0)
-  {
-    res->rtyp=LIST_CMD;
-    extern lists get_denom_list();
-    res->data=(lists)get_denom_list();
-    return FALSE;
-  }
-  else
   /*==================== mpz_t loader ======================*/
     if(strcmp(sys_cmd, "GNUmpLoad")==0)