Changeset 87cf50 in git

Timestamp:

Nov 29, 1999, 3:46:55 PM (24 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

8542c2b8dfa68b83e4a8a7a4be5a4d20e52ff585

Parents:

21959cfde99e2b34993ef4bb1a03e6b58939bf78

Message:

*hannes: spectrum stuff: semic


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

Location:

Singular

Files:

• extra.cc (modified) (11 diffs)
• iparith.cc (modified) (4 diffs)
• tok.h (modified) (2 diffs)

Singular/extra.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: extra.cc,v 1.121 1999-11-24 18:50:36 obachman Exp $ */
+/* $Id: extra.cc,v 1.122 1999-11-29 14:46:53 Singular Exp $ */
 /*
 * ABSTRACT: general interface to internals of Singular ("system" command)
@@ -326 +326 @@
         return FALSE;
       }
-      
+
       feOptIndex opt = feGetOptIndex(&sys_cmd[2]);
       if (opt == FE_OPT_UNDEF)
@@ -334 +334 @@
         return TRUE;
       }
-      
-      // for Untyped Options (help version), 
+
+      // for Untyped Options (help version),
       // setting it just triggers action
       if (feOptSpec[opt].type == feOptUntyped)
@@ -342 +342 @@
         return FALSE;
       }
-      
+
       if (h == NULL)
       {
@@ -360 +360 @@
         return FALSE;
       }
-      
-      if (h->Typ() != STRING_CMD && 
+
+      if (h->Typ() != STRING_CMD &&
           h->Typ() != INT_CMD)
       {
@@ -376 +376 @@
         }
         errormsg = feSetOptValue(opt, (int) h->Data());
-        if (errormsg != NULL) 
+        if (errormsg != NULL)
           Werror("Option '--%s=%d' %s", sys_cmd, (int) h->Data(), errormsg);
       }
@@ -507 +507 @@
    else
    {
+/*==================== semic =============================*/
+   if(strcmp(sys_cmd,"semic") == 0)
+   {
+     if ((h->next!=NULL)
+     && (h->Typ()==LIST_CMD)
+     && (h->next->Typ()==LIST_CMD))
+     {
+       if (h->next->next==NULL)
+         return semicProc(res,h,h->next);
+       else if (h->next->next->Typ()==INT_CMD)
+         return semicProc3(res,h,h->next,h->next->next);
+     }
+     return TRUE;
+   }
+   else
+   {
    #endif
 /*================= Extended system call ========================*/
@@ -543 +559 @@
       if (h->Typ()==NUMBER_CMD )
       {
-        if ( h->next!=NULL && h->next->Typ()==INT_CMD )
-        {
-          if ( !rField_is_long_C() )
-            {
-              Werror( "unsupported ground field!");
-              return TRUE;
-            }
-          else
-            {
-              res->rtyp=INT_CMD;
-              res->data=(void*)complexNearZero((gmp_complex*)h->Data(),(int)h->next->Data());
-              return FALSE;
-            }
-        }      
-        else
-        {
-          Werror( "expected <int> as third parameter!");
-          return TRUE;
-        }
-      }
-      else
-      {
-        Werror( "expected <number> as second parameter!");
-        return TRUE;
+        if ( h->next!=NULL && h->next->Typ()==INT_CMD )
+        {
+          if ( !rField_is_long_C() )
+            {
+              Werror( "unsupported ground field!");
+              return TRUE;
+            }
+          else
+            {
+              res->rtyp=INT_CMD;
+              res->data=(void*)complexNearZero((gmp_complex*)h->Data(),(int)h->next->Data());
+              return FALSE;
+            }
+        }
+        else
+        {
+          Werror( "expected <int> as third parameter!");
+          return TRUE;
+        }
+      }
+      else
+      {
+        Werror( "expected <number> as second parameter!");
+        return TRUE;
       }
     }
@@ -574 +590 @@
       if ( !rField_is_long_C() && !rField_is_long_R() )
       {
-        Werror( "unsupported ground field!");
-        return TRUE;
+        Werror( "unsupported ground field!");
+        return TRUE;
       }
       res->rtyp=INT_CMD;
@@ -599 +615 @@
     {
 #ifdef MLIST
-      FILE *fd = NULL; 
+      FILE *fd = NULL;
       if ((h!=NULL) &&(h->Typ()==STRING_CMD))
       {
@@ -610 +626 @@
       return FALSE;
 #else
-     WerrorS("mtrack not supported without MLIST"); 
+     WerrorS("mtrack not supported without MLIST");
      return TRUE;
-#endif     
+#endif
     }
     else

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.191 1999-11-24 18:13:21 Singular Exp $ */
+/* $Id: iparith.cc,v 1.192 1999-11-29 14:46:54 Singular Exp $ */
 
 /*
@@ -284 +284 @@
   { "size",        0, COUNT_CMD ,         CMD_1},
   { "sortvec",     0, SORTVEC_CMD ,       CMD_1},
-  #ifdef HAVE_SPECTRUM
-  { "semic",       0, SEMIC_CMD ,         CMD_23},
-  #endif
   #ifdef OLD_RES
   { "sres",        0, SRES_CMD ,          CMD_23},
@@ -2295 +2292 @@
 ,{jjSIMPL_ID,  SIMPLIFY_CMD,   IDEAL_CMD,      IDEAL_CMD,  INT_CMD PROFILER}
 ,{jjSIMPL_ID,  SIMPLIFY_CMD,   MODUL_CMD,      MODUL_CMD,  INT_CMD PROFILER}
-#ifdef HAVE_SPECTRUM
-,{semicProc,   SEMIC_CMD,      INT_CMD,        LIST_CMD,   LIST_CMD PROFILER}
-#endif
 //,{jjRES,       SRES_CMD,       LIST_CMD,       IDEAL_CMD,  INT_CMD PROFILER}
 //,{jjRES,       SRES_CMD,       LIST_CMD,       MODUL_CMD,  INT_CMD PROFILER}
@@ -4338 +4332 @@
 ,{jjRING3,          RING_CMD,   RING_CMD,   DEF_CMD,    DEF_CMD,    DEF_CMD }
 #ifdef HAVE_SPECTRUM
-,{semicProc3,       SEMIC_CMD,  INT_CMD,    LIST_CMD,   LIST_CMD,   INT_CMD }
 ,{spectrumOp3,      SPECTRUM_CMD, LIST_CMD, LIST_CMD,   STRING_CMD, INT_CMD }
 ,{spectrumOp3,      SPECTRUM_CMD, LIST_CMD, LIST_CMD,   STRING_CMD, LIST_CMD }

Singular/tok.h

@@ -7 +7 @@
 * ABSTRACT: tokens, types for interpreter; general macros
 */
-/* $Id: tok.h,v 1.32 1999-11-24 18:13:23 Singular Exp $ */
+/* $Id: tok.h,v 1.33 1999-11-29 14:46:55 Singular Exp $ */
 
 #ifndef MYYSTYPE
@@ -106 +106 @@
   RESULTANT_CMD,
   ROWS_CMD,
-#ifdef HAVE_SPECTRUM
-  SEMIC_CMD,
-#endif
   SQR_FREE_DEC_CMD,
   STATUS_CMD,