Changeset 8520b7 in git

Timestamp:

Mar 2, 1998, 4:22:48 PM (26 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

268d7b4f3a721679865848670aa0a64930584db9

Parents:

a18fae54e4f760ce0cd7832679f5171a88c3fde7

Message:

* hannes: changed handling of "echo" in examples: do not report file + lineno
   (febase.inc,lib0lib.res, inoutlib.res, mem.res, homlib.res)


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

Location:

Singular

Files:

• ChangeLog (modified) (1 diff)
• febase.inc (modified) (6 diffs)

Singular/ChangeLog

@@ +1 @@
+Mon Mar  2 16:18:25 MET 1998 hannes
+   * changed handling of "echo" in examples: do not report file + lineno
+     (febase.inc,lib0lib.res, inoutlib.res, mem.res, homlib.res)
+
 Fri Feb 27 15:02:10 MET 1998 hannes
    * new input scheme: many modifications to febase.h, febase.inc,

Singular/febase.inc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: febase.inc,v 1.3 1998-02-27 16:27:57 Singular Exp $ */
+/* $Id: febase.inc,v 1.4 1998-03-02 15:22:48 Singular Exp $ */
 /*
 * ABSTRACT: handling of 'voices'
@@ -151 +151 @@
                      yylineno = lineno+1;
                      break;
-    case BT_file:
-                     yylineno = 1;
-                     break;
     case BT_if:
     case BT_else:
@@ -160 +157 @@
     case BT_break:
                      yylineno = blocklineno-1;
+                     break;
+    //case BT_file:
+    default:
+                     yylineno = 1;
                      break;
   }
@@ -378 +379 @@
 static int fePrintEcho(char *anf)
 {
-  prompt_char = '.';
   char *ss=strchr(anf,'\n');
   int len_s;
@@ -396 +396 @@
   // handle echo:
   if (((si_echo>myynest)
-    && (((currentVoice->typ==BT_proc)
-         && (strncmp(anf,";return();",10)!=0))
+    && ((currentVoice->typ==BT_proc)
       || (currentVoice->typ==BT_example)
       || (currentVoice->typ==BT_file)
       || (currentVoice->typ==BT_none)
-      )
-  )
+    )
+    && (strncmp(anf,";return();",10)!=0)
+   )
   || (traceit&TRACE_SHOW_LINE)
   || (traceit&TRACE_SHOW_LINE1))
   {
-    if (currentVoice->filename==NULL)
-      Print("(none) %3d%c ",yylineno,prompt_char);
-    else
-      Print("%s %3d%c ",currentVoice->filename,yylineno,prompt_char);
+    if (currentVoice->typ!=BT_example)
+    {
+      if (currentVoice->filename==NULL)
+        Print("(none) %3d%c ",yylineno,prompt_char);
+      else
+        Print("%s %3d%c ",currentVoice->filename,yylineno,prompt_char);
+    }
     fwrite(anf,1,len_s,stdout);
     mflush();
@@ -422 +425 @@
     mflush();
   }
+  prompt_char = '.';
   return len_s;
 }