Changeset 6d3ffec in git for Singular/febase.cc

Timestamp:

Apr 30, 1997, 5:25:34 PM (27 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

30637f47193073ce6445ef3c06828b2ec3d7d019

Parents:

01a20e5ae23d2ee1d178accd9cc46711ec2e30d1

Message:

* hannes: added Makefile to "touch -r mod2.h ...."


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

File:

• Singular/febase.cc (modified) (9 diffs)

Singular/febase.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: febase.cc,v 1.11 1997-04-29 19:54:48 obachman Exp $ */
+/* $Id: febase.cc,v 1.12 1997-04-30 15:25:27 Singular Exp $ */
 /*
 * ABSTRACT: i/o system, handling of 'voices'
@@ -37 +37 @@
 class Voices
 {
-  private:
-    void Init()
-    {
-      memset(this,0,sizeof(*this));
-      v_lineno = 1;
-    }
   public:
     int    v_lineno;        // lineno, to restore in recursion
@@ -56 +50 @@
 
   void Next();
-  Voices() { Init(); }
+  Voices() { v_lineno = 1; }
   Voices * VFile(char* fname);
   Voices * Buffer(char* buf, int t);
@@ -72 +66 @@
 int     levmax       = START_LEVMAX;
 Voices *currentVoice = NULL;
-Voices *FileAttribs  =(Voices *)Alloc(START_LEVMAX*sizeof(Voices));
+Voices *FileAttribs  =(Voices *)Alloc0(START_LEVMAX*sizeof(Voices));
 short  *ifswitch     =(short *)Alloc0(START_LEVMAX*sizeof(short));
         /*1 ifswitch==0: no if statement, else is invalid
@@ -277 +271 @@
   v_echo     = si_echo;
   fileVoice  = voice;
-  yylineno   = 1;
+  yylineno   = v_lineno   = 1;
   if (files==NULL)
   {
@@ -299 +293 @@
                           levmax*sizeof(Voices),
                           (levmax+16)*sizeof(Voices));
+    memset(&FileAttribs[levmax],0,16*sizeof(Voices));
     ifswitch=(short *)ReAlloc(ifswitch,
                           levmax*sizeof(short),
@@ -318 +313 @@
 
   currentVoice = &FileAttribs[voice];
-  currentVoice->Init();
 }
 
@@ -461 +455 @@
 int exitFile()
 {
-  int oldswitch;
-
-  while ((voice > 0) && (inputswitch > 0))
-  {
-    exitVoice();
-  }
-  // now we have left all if-, else-, while-, for-, proc-levels
-  // inside this file;
-  // if the file is the terminal (inputswitch == 0) and
-  // voice >0, so return 1 else return 0
-  // (used for EXIT_CMD in CNTRLC-C-handling)
-  oldswitch = inputswitch;
-  exitVoice();
-  #ifdef SIC
-  return 1;
-  #else
-  if ((oldswitch)||(myynest<0)) return 0;
-  else return 1;
-  #endif
+  /*4 first check for valid buffer type*/
+  for (int i=voice; i>0; i--)
+  {
+    if (FileAttribs[i].typ == 0) break;
+    if (FileAttribs[i].typ == BT_file)
+    {
+      while ((BT_file != currentVoice->typ)
+      && (voice > 0))
+      {
+        exitVoice();
+      }
+      exitVoice();
+    }
+  }
 }
 
@@ -598 +587 @@
 void I_FEbase(void)
 {
-  FileAttribs[0].files       = yyin = stdin;
-  FileAttribs[0].filename    = mstrdup("STDIN");
-  yylineno = 1;
-  currentVoice = &FileAttribs[0];
+  currentVoice=FileAttribs[0].VFile("STDIN");
+  //FileAttribs[0].files       = yyin = stdin;
+  //FileAttribs[0].filename    = mstrdup("STDIN");
+  //yylineno = 1;
+  //currentVoice = &FileAttribs[0];
 }