Changeset 392682 in git for Singular/ipshell.cc

Timestamp:

Jan 15, 2007, 6:45:33 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

0d0763b5f948b33d8a6ba2d7e1d6d32a36742eb9

Parents:

5aec73093e57f2bc8df5d7134d52ceaabbf29312

Message:

*hannes: better test in rCompose


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

File:

• Singular/ipshell.cc (modified) (6 diffs)

Singular/ipshell.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.cc,v 1.145 2006-10-16 15:47:30 Singular Exp $ */
+/* $Id: ipshell.cc,v 1.146 2007-01-15 17:45:33 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -708 +708 @@
       memset(&tmpW,0,sizeof(sleftv));
       tmpW.rtyp=IDTYP(w);
-      if (tmpW.rtyp==MAP_CMD) 
-      { 
+      if (tmpW.rtyp==MAP_CMD)
+      {
         tmpW.rtyp=IDEAL_CMD;
         save_r=IDMAP(w)->preimage;
@@ -735 +735 @@
       }
       if (save_r!=NULL)
-      { 
+      {
         IDMAP(w)->preimage=save_r;
         IDMAP((idhdl)v)->preimage=omStrDup(save_r);
@@ -1932 +1932 @@
       R->order[j]=rOrderName(omStrDup((char*)vv->m[0].Data())); // assume STRING
       if (j==0) R->block0[0]=1;
-      else 
+      else
       {
          int jj=j-1;
          while((jj>=0)
-         && ((R->order[jj]== ringorder_a) 
+         && ((R->order[jj]== ringorder_a)
             || (R->order[jj]== ringorder_aa)
             || (R->order[jj]== ringorder_c)
@@ -2029 +2029 @@
     ideal q=(ideal)L->m[3].Data();
     if (q->m[0]!=NULL)
+    {
+      if ((R->ch!=currRing->ch)
+      || (R->P!=currRing->P))
+      {
+        WerrorS("coefficient fields must be equal if q-ideal !=0");
+        goto rCompose_err;
+      }
       R->qideal=idrCopyR(q,currRing,R);
+    }
   }
   else
@@ -4368 +4376 @@
 #ifdef HAVE_RING2TOM
   int cring = 0;
-#endif  
+#endif
   int float_len=0;
   int float_len2=0;