Changeset c5bae4 in git

Timestamp:

Mar 9, 2020, 4:42:03 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b9f50b373314e74e83c7c060a651dd2913e1f033')

Children:

e7e39839d32320823bf9689c97c5071650497b8e

Parents:

685700007296bcb12ecd15cd6f76760dc598af41

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2020-03-09 16:42:03+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2020-03-09 16:46:18+01:00

Message:

chg: TRACE, traceit: add traceit_stop ('n')

Files:

• Singular/febase.cc (modified) (1 diff)
• Singular/fevoices.cc (modified) (1 diff)
• Singular/iplib.cc (modified) (2 diffs)
• libpolys/reporter/reporter.h (modified) (1 diff)

Singular/febase.cc

@@ -41 +41 @@
 VAR int  myynest = -1;
 VAR int  traceit = 0;
+VAR int  traceit_stop = 0;
 VAR char       my_yylinebuf[80];
 

Singular/fevoices.cc

@@ -456 +456 @@
     if (traceit&TRACE_SHOW_LINE)
     {
-      while(fgetc(stdin)!='\n');
+      char c;
+      do
+      {
+        c=fgetc(stdin);
+        if (c=='n') traceit_stop=1;
+      }
+      while(c!='\n');
     }
   }

Singular/iplib.cc

@@ -294 +294 @@
 BOOLEAN iiAllStart(procinfov pi, const char *p, feBufferTypes t, int l)
 {
+  int save_trace=traceit;
+  int restore_traceit=0;
+  if (traceit_stop
+  && (traceit & TRACE_SHOW_LINE))
+  {
+    traceit &=(~TRACE_SHOW_LINE);
+    traceit_stop=0;
+    restore_traceit=1;
+  }
   // see below:
   BITSET save1=si_opt_1;
@@ -300 +309 @@
                pi, l );
   BOOLEAN err=yyparse();
+
   if (sLastPrinted.rtyp!=0)
   {
     sLastPrinted.CleanUp();
   }
+
+  if (restore_traceit) traceit=save_trace;
+
   // the access to optionStruct and verboseStruct do not work
   // on x86_64-Linux for pic-code

libpolys/reporter/reporter.h

@@ -23 +23 @@
 EXTERN_VAR BOOLEAN feOut;
 EXTERN_VAR int  traceit ;
+EXTERN_VAR int  traceit_stop ;
 EXTERN_VAR void (*WarnS_callback)(const char *s);