Changeset bdefc5f in git

Timestamp:

Aug 18, 2008, 12:41:46 PM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

2808c64dad8b9be424474938919df9567f014887

Parents:

c778d068b7087bc2b07871c2ca155d64cb79590b

Message:

*hannes: new syntac for monitor


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

File:

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

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.476 2008-08-07 07:46:58 Singular Exp $ */
+/* $Id: iparith.cc,v 1.477 2008-08-18 10:41:46 Singular Exp $ */
 
 /*
@@ -2441 +2441 @@
   return FALSE;
 }
+static BOOLEAN jjMONITOR2(leftv res, leftv u,leftv v);
+static BOOLEAN jjMONITOR1(leftv res, leftv v)
+{
+  return jjMONITOR2(res,v,NULL);
+}
 static BOOLEAN jjMONITOR2(leftv res, leftv u,leftv v)
 {
+#if 0
   char *opt=(char *)v->Data();
   int mode=0;
@@ -2452 +2458 @@
   }
   monitor((char *)(u->Data()),mode);
-  return FALSE;
+#else
+  si_link l=(si_link)u->Data();
+  if (slOpen(l,SI_LINK_WRITE)) return TRUE;
+  if(strcmp(l->m->type,"ASCII")!=0)
+  {
+    Werror("ASCII link required, not >$s<",l->m->type);
+    slClose(l);
+    return TRUE;
+  }
+  SI_LINK_SET_CLOSE_P(l); // febase handles the FILE*
+  char *opt;
+  if (v==NULL) opt="i";
+  else         opt=(char *)v->Data();
+  int mode=0;
+  while(*opt!='\0')
+  {
+    if (*opt=='i') mode |= PROT_I;
+    else if (*opt=='o') mode |= PROT_O;
+    opt++;
+  }
+  if (((FILE*)l->data) == stdin) monitor(NULL,0);
+  else monitor((FILE *)l->data,mode);
+  return FALSE;
+#endif
 }
 static BOOLEAN jjPARSTR2(leftv res, leftv u, leftv v)
@@ -3335 +3364 @@
 ,{jjMODULO,    MODULO_CMD,     MODUL_CMD,      IDEAL_CMD,  IDEAL_CMD ALLOW_PLURAL}
 ,{jjMODULO,    MODULO_CMD,     MODUL_CMD,      MODUL_CMD,  MODUL_CMD ALLOW_PLURAL}
-,{jjMONITOR2,  MONITOR_CMD,    NONE,           STRING_CMD, STRING_CMD ALLOW_PLURAL}
+,{jjMONITOR2,  MONITOR_CMD,    NONE,           LINK_CMD, STRING_CMD ALLOW_PLURAL}
 //,{jjRES,       MRES_CMD,       LIST_CMD,       IDEAL_CMD,  INT_CMD NO_PLURAL}
 //,{jjRES,       MRES_CMD,       LIST_CMD,       MODUL_CMD,  INT_CMD NO_PLURAL}
@@ -4121 +4150 @@
 }
 #endif
-static BOOLEAN jjMONITOR1(leftv res, leftv v)
-{
-  monitor((char *)(v->Data()),PROT_I);
-  return FALSE;
-}
+//static BOOLEAN jjMONITOR1(leftv res, leftv v)
+//{
+//  return jjMONITOR2(res,v,NULL);
+//}
 static BOOLEAN jjMSTD(leftv res, leftv v)
 {
@@ -5061 +5089 @@
 ,{jjMINRES_R,   MINRES_CMD,      RESOLUTION_CMD, RESOLUTION_CMD ALLOW_PLURAL}
 ,{jjDUMMY,      MODUL_CMD,       MODUL_CMD,      MODUL_CMD      ALLOW_PLURAL}
-,{jjMONITOR1,   MONITOR_CMD,     NONE,           STRING_CMD     ALLOW_PLURAL}
+,{jjMONITOR1,   MONITOR_CMD,     NONE,           LINK_CMD     ALLOW_PLURAL}
 ,{jjMULT,       MULTIPLICITY_CMD,  INT_CMD,      IDEAL_CMD      NO_PLURAL}
 ,{jjMULT,       MULTIPLICITY_CMD,  INT_CMD,      MODUL_CMD      NO_PLURAL}