Changeset a14390 in git

Timestamp:

Jan 8, 2007, 5:53:51 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

e5984bc502fb2ffa2caf4243edc1faed6ba6141b

Parents:

2e4b40824453f115e0e5d369daa8dcdf4d89fcd8

Message:

*hannes: error message


git-svn-id: file:///usr/local/Singular/svn/trunk@9645 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

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

Singular/extra.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: extra.cc,v 1.245 2007-01-04 14:08:00 motsak Exp $ */
+/* $Id: extra.cc,v 1.246 2007-01-08 16:53:51 Singular Exp $ */
 /*
 * ABSTRACT: general interface to internals of Singular ("system" command)
@@ -836 +836 @@
         currRing->nc->IsSkewConstant=1;
         /* create matrix C */
-        C=mpNew(currRing->N,currRing->N);  "Alternating variables: [", AltVarStart(ER), ", ", AltVarEnd(ER), "].";
-
+        C=mpNew(currRing->N,currRing->N);  
         for(i=1;i<currRing->N;i++)
         {
@@ -980 +979 @@
     else
 #endif
-/*==================== sca?AltVar ==================================*/
-    if ( (strcmp(sys_cmd, "AltVarStart") == 0) || (strcmp(sys_cmd, "AltVarEnd") == 0) )
-    {
-      ring r = currRing;
-
-      if((h!=NULL) && (h->Typ()==RING_CMD)) r = (ring)h->Data(); else
-      {
-        WerrorS("`system(\"AltVarStart\"[,<ring>])` expected");
-        return TRUE;
-      }
-
-      res->rtyp=INT_CMD;
-
-      if (rIsSCA(r))
-      {
-        if(strcmp(sys_cmd, "AltVarStart") == 0)
-          res->data = (void*)scaFirstAltVar(r);
-        else
-          res->data = (void*)scaLastAltVar(r);
-        return FALSE;
-      }
-
-      res->data=NULL;
-      return TRUE;
-    }
 /*==================== opp ==================================*/
     if (strcmp(sys_cmd, "opp")==0)
@@ -2611 +2585 @@
     else
 #endif
+/*==================== sca?AltVar ==================================*/
+    if ( (strcmp(sys_cmd, "AltVarStart") == 0) || (strcmp(sys_cmd, "AltVarEnd") == 0) )
+    {
+      ring r = currRing;
+
+      if((h!=NULL) && (h->Typ()==RING_CMD)) r = (ring)h->Data(); else
+      {
+        WerrorS("`system(\"AltVarStart\"[,<ring>])` expected");
+        return TRUE;
+      }
+
+      res->rtyp=INT_CMD;
+
+      if (rIsSCA(r))
+      {
+        if(strcmp(sys_cmd, "AltVarStart") == 0)
+          res->data = (void*)scaFirstAltVar(r);
+        else
+          res->data = (void*)scaLastAltVar(r);
+        return FALSE;
+      }
+
+      WerrorS("`system(\"AltVarStart\",<ring>" requires sca");
+      return TRUE;
+    }
 /*==================== t-rep-GB ==================================*/
     if (strcmp(sys_cmd, "unifastmult")==0)