Changeset 30637f in git for Singular/febase.cc

Timestamp:

Apr 30, 1997, 7:08:40 PM (27 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

22d79069af63dd10b93e136d82bb339faa6c28d9

Parents:

6d3ffecde9449bcf2b3a7cceb254992ea1ef9e43

Message:

* hannes: feFopen search list: ., SINGULARPATH, SINGULARDATADIR


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

File:

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

Singular/febase.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: febase.cc,v 1.12 1997-04-30 15:25:27 Singular Exp $ */
+/* $Id: febase.cc,v 1.13 1997-04-30 17:08:40 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
@@ -50 +56 @@
 
   void Next();
-  Voices() { v_lineno = 1; }
+  Voices() { Init(); }
   Voices * VFile(char* fname);
   Voices * Buffer(char* buf, int t);
@@ -113 +119 @@
 */
 
-/*2 fopen, but use 'SINGULARPATH' from environment and SINGULARDATADIR
+/*2
+* fopen, but use 'SINGULARPATH' from environment and SINGULARDATADIR
 * as set by configure
-*  */
+*/
 #ifdef macintosh
 #  define  FS_SEP ','
@@ -141 +148 @@
 {
   if (where!=NULL) strcpy(where,path);
-  if ((*mode=='a') ||(*mode=='w') || (path[0]==DIR_SEP)||(path[0]=='.'))
-    return fopen(path,mode);
+  FILE * f=fopen(path,mode);
+  if ((*mode=='a') ||(*mode=='w') || (path[0]==DIR_SEP)||(path[0]=='.')
+  ||(f!=NULL))
+    return f;
   char found = 0;
-  FILE * f=NULL;
 #ifdef MSDOS
   char *env=getenv("SPATH");
@@ -189 +197 @@
     if (where!=NULL) strcpy(s/*where*/,path);
     f=fopen(path,mode);
-  }
+  }  
 #ifndef macintosh
   if (f==NULL)
@@ -207 +215 @@
     }
     strcpy(ss,SINGULAR_DATADIR);
-    strcat(ss, DIR_SEPP);
+    strcat(s, DIR_SEPP);
     strcat(ss,path);
     f=fopen(ss,mode);
@@ -271 +279 @@
   v_echo     = si_echo;
   fileVoice  = voice;
-  yylineno   = v_lineno   = 1;
+  yylineno   = 1;
   if (files==NULL)
   {
@@ -313 +321 @@
 
   currentVoice = &FileAttribs[voice];
+  currentVoice->Init();
 }
 
@@ -455 +464 @@
 int exitFile()
 {
-  /*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();
-    }
-  }
+  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
 }
 
@@ -587 +601 @@
 void I_FEbase(void)
 {
-  currentVoice=FileAttribs[0].VFile("STDIN");
-  //FileAttribs[0].files       = yyin = stdin;
-  //FileAttribs[0].filename    = mstrdup("STDIN");
-  //yylineno = 1;
-  //currentVoice = &FileAttribs[0];
+  currentVoice = FileAttribs[0].VFile("STDIN");
 }