Changeset 50a84c in git

Timestamp:

Mar 16, 1999, 4:33:16 PM (25 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

1799c9fbabec720f27f0705fcdd3b0ce44cbfb14

Parents:

3e23be413b53a8a512a19cc775abe1326f3a1a52

Message:

* hannes: added ERROR, trace flag for proc


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

Location:

Singular

Files:

• ChangeLog (modified) (1 diff)
• attrib.cc (modified) (4 diffs)
• febase.h (modified) (1 diff)
• febase.inc (modified) (3 diffs)
• iparith.cc (modified) (4 diffs)
• ipid.cc (modified) (2 diffs)
• iplib.cc (modified) (3 diffs)
• subexpr.h (modified) (2 diffs)
• tok.h (modified) (2 diffs)

Singular/ChangeLog

@@ +1 @@
+Tue Mar 16 15:54:02 MET 1999 hannes
+  * introduced new routine ERROR(string) (iparith.cc, tok.h)
+  * added trace flag for proc (ipid.cc iplib.cc, febase*)
+
 Mon Mar  8 18:27:26 MET 1999 hannes
   * access to coeff-description via functions (1. approach)

Singular/attrib.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: attrib.cc,v 1.10 1998-05-28 16:50:45 Singular Exp $ */
+/* $Id: attrib.cc,v 1.11 1999-03-16 15:33:04 Singular Exp $ */
 
 /*
@@ -263 +263 @@
   }
   attr at=v->attribute;
+  if (v->Typ()==PROC_CMD)
+  {
+    procinfo *p=(procinfo *)v->Data();
+    if (p->trace_flag!=0)
+      Print("trace:%d\n",p->trace_flag);
+  }    
   if (hasFlag(v,FLAG_STD))
   {
@@ -294 +300 @@
     res->data=(void *)(((ideal)v->Data())->rank);
   }
+  else if ((v->Typ()==PROC_CMD) && (strcmp(name,"trace")==0))
+  {
+    procinfo *p=(procinfo *)v->Data();
+    res->rtyp=INT_CMD;
+    res->data=(void *)p->trace_flag;
+  }    
   else
   {
@@ -350 +362 @@
     I->rank=max(I->rank,(int)c->Data());
   }
+  else if ((strcmp(name,"trace")==0)&&(v->Typ()==PROC_CMD))
+  {
+    if (c->Typ()!=INT_CMD)
+    {
+      WerrorS("attrib `trace` must be int");
+      return TRUE;
+    }
+    procinfo *p=(procinfo *)v->Data();
+    p->trace_flag=(int)c->Data();
+  }    
 #ifdef DRING
   else if (strcmp(name,"D")==0)

Singular/febase.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: febase.h,v 1.26 1999-02-26 15:32:01 Singular Exp $ */
+/* $Id: febase.h,v 1.27 1999-03-16 15:33:05 Singular Exp $ */
 /*
-* ABSTRACT
+* ABSTRACT: basic i/o
 */
 #include <stdio.h>

Singular/febase.inc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: febase.inc,v 1.19 1998-10-29 13:26:52 Singular Exp $ */
+/* $Id: febase.inc,v 1.20 1999-03-16 15:33:06 Singular Exp $ */
 /*
 * ABSTRACT: handling of 'voices'
@@ -392 +392 @@
    )
   || (traceit&TRACE_SHOW_LINE)
-  || (traceit&TRACE_SHOW_LINE1))
+  || (traceit&TRACE_SHOW_LINE1)
+  || ((currentVoice->pi!=NULL)&&(currentVoice->pi->trace_flag&TRACE_SHOW_LINE)))
   {
     if (currentVoice->typ!=BT_example)
@@ -420 +421 @@
     }
   }
-  else if (traceit&TRACE_SHOW_LINENO)
+  else if ((traceit&TRACE_SHOW_LINENO)
+  || ((currentVoice->pi!=NULL)&&(currentVoice->pi->trace_flag&TRACE_SHOW_LINENO)))
   {
     Print("{%d}",yylineno);

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.137 1999-03-16 13:38:08 Singular Exp $ */
+/* $Id: iparith.cc,v 1.138 1999-03-16 15:33:09 Singular Exp $ */
 
 /*
@@ -149 +149 @@
   { "extgcd",      0, EXTGCD_CMD ,        CMD_2},
   { "EXTGCD",      2, EXTGCD_CMD ,        CMD_2},
+  { "ERROR",       0, ERROR_CMD ,         CMD_1},
   { "eliminate",   0, ELIMINATION_CMD,    CMD_23},
   { "else",        0, ELSE_CMD ,          ELSE_CMD},
@@ -1418 +1419 @@
   setFlag(res,FLAG_STD);
   return FALSE;
+}
+static BOOLEAN jjERROR(leftv res, leftv u)
+{
+  WerrorS((char *)u->Data());
+  return TRUE;
 }
 static BOOLEAN jjDIM2(leftv res, leftv v, leftv w)
@@ -3403 +3409 @@
 ,{jjDUMP,       DUMP_CMD,        NONE,           LINK_CMD }
 ,{jjE,          E_CMD,           VECTOR_CMD,     INT_CMD }
+,{jjERROR,      ERROR_CMD,       NONE,           STRING_CMD }
 #ifdef HAVE_FACTORY
 ,{jjFAC_P,      FAC_CMD,         LIST_CMD,       POLY_CMD }

Singular/ipid.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipid.cc,v 1.30 1999-03-15 16:18:52 Singular Exp $ */
+/* $Id: ipid.cc,v 1.31 1999-03-16 15:33:13 Singular Exp $ */
 
 /*
@@ -765 +765 @@
 void iiname2hdl(const char *name, idhdl *pck, idhdl *h)
 {
-  char *q = strchr(name, ':');
+  const char *q = strchr(name, ':');
   char *p, *i;
 

Singular/iplib.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iplib.cc,v 1.51 1999-02-26 09:35:14 krueger Exp $ */
+/* $Id: iplib.cc,v 1.52 1999-03-16 15:33:14 Singular Exp $ */
 /*
 * ABSTRACT: interpreter: LIB and help
@@ -412 +412 @@
 #endif
   iiRETURNEXPR[myynest+1].Init();
-  if (traceit&TRACE_SHOW_PROC)
+  if ((traceit&TRACE_SHOW_PROC)
+  || (pi->trace_flag&TRACE_SHOW_PROC))
   {
     if (traceit&TRACE_SHOW_LINENO) PrintLn();
@@ -437 +438 @@
                  break;
   }
-  if (traceit&TRACE_SHOW_PROC)
+  if ((traceit&TRACE_SHOW_PROC)
+  || (pi->trace_flag&TRACE_SHOW_PROC))
   {
     if (traceit&TRACE_SHOW_LINENO) PrintLn();

Singular/subexpr.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: subexpr.h,v 1.14 1999-02-26 09:36:18 krueger Exp $ */
+/* $Id: subexpr.h,v 1.15 1999-03-16 15:33:15 Singular Exp $ */
 /*
 * ABSTRACT: handling of leftv
@@ -145 +145 @@
   short         ref;
   char          is_static;        // if set, proc not accessible for user
+  char          trace_flag;
   procinfodata  data;
 };

Singular/tok.h

@@ -7 +7 @@
 * ABSTRACT: token for interpreter, as types; general macros
 */
-/* $Id: tok.h,v 1.22 1999-01-22 17:40:52 Singular Exp $ */
+/* $Id: tok.h,v 1.23 1999-03-16 15:33:16 Singular Exp $ */
 
 #ifndef MYYSTYPE
@@ -60 +60 @@
   DUMP_CMD,
   END_GRAMMAR,
+  ERROR_CMD,
   EXTGCD_CMD,
   FAC_CMD,