[SCM] an open source computer algebra system branch, cleanedupstream, updated. 6125e540ca6d66c307958938a9d53b245507c323

[Bernhard R. Link]

The following commit has been merged in the cleanedupstream branch:
commit efcdd88e5670b01d977f1707f92b73635ae45843
Author: Hans Schoenemann <hannes at mathematik.uni-kl.de>
Date:   Tue Feb 7 15:15:19 2012 +0100

    fix: better error message while creating matrices

diff --git a/Singular/bbcone.cc b/Singular/bbcone.cc
index 4fa0517..138b752 100644
--- a/Singular/bbcone.cc
+++ b/Singular/bbcone.cc
@@ -1218,7 +1218,7 @@ void bbcone_setup()
 {
   blackbox *b=(blackbox*)omAlloc0(sizeof(blackbox));
   // all undefined entries will be set to default in setBlackboxStuff
-  // the default Print is quite usefule,
+  // the default Print is quite usefull,
   // all other are simply error messages
   b->blackbox_destroy=bbcone_destroy;
   b->blackbox_String=bbcone_String;
diff --git a/Singular/iparith.cc b/Singular/iparith.cc
index 884d724..1b05c6d 100644
--- a/Singular/iparith.cc
+++ b/Singular/iparith.cc
@@ -6106,7 +6106,7 @@ static BOOLEAN jjMATRIX_Id(leftv res, leftv u, leftv v,leftv w)
   int ni=(int)(long)w->Data();
   if ((mi<1)||(ni<1))
   {
-    WerrorS("matrix dimensions must be positive");
+    Werror("converting ideal to matrix: dimensions must be positive(%dx%d)",mi,ni);
     return TRUE;
   }
   matrix m=mpNew(mi,ni);
@@ -6129,7 +6129,7 @@ static BOOLEAN jjMATRIX_Mo(leftv res, leftv u, leftv v,leftv w)
   int ni=(int)(long)w->Data();
   if ((mi<1)||(ni<1))
   {
-    WerrorS("matrix dimensions must be positive");
+    Werror("converting module to matrix: dimensions must be positive(%dx%d)",mi,ni);
     return TRUE;
   }
   res->data = (char *)idModule2formatedMatrix((ideal)u->CopyD(MODUL_CMD),
@@ -6142,7 +6142,7 @@ static BOOLEAN jjMATRIX_Ma(leftv res, leftv u, leftv v,leftv w)
   int ni=(int)(long)w->Data();
   if ((mi<1)||(ni<1))
   {
-    WerrorS("matrix dimensions must be positive");
+    Werror("converting matrix to matrix: dimensions must be positive(%dx%d)",mi,ni);
     return TRUE;
   }
   matrix m=mpNew(mi,ni);

-- 
an open source computer algebra system