Changeset 6d3ffec in git

Timestamp:

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

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

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

Location:

Singular

Files:

• Makefile.in (modified) (1 diff)
• febase.cc (modified) (9 diffs)
• grammar.y (modified) (2 diffs)
• intvec.cc (modified) (4 diffs)
• intvec.h (modified) (2 diffs)
• iparith.cc (modified) (3 diffs)
• ipshell.cc (modified) (2 diffs)
• ring.cc (modified) (3 diffs)
• subexpr.cc (modified) (3 diffs)

Singular/Makefile.in

@@ -165 +165 @@
 mod2.h: config.status config.cache mod2.h.in Makefile.in
         ./config.status
-        touch -r mod2.h configure configure.in Makefile.in
+        touch -r mod2.h configure configure.in Makefile Makefile.in
 
 config.status config.cache : configure

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];
 }
 

Singular/grammar.y

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: grammar.y,v 1.7 1997-04-10 16:34:42 Singular Exp $ */
+/* $Id: grammar.y,v 1.8 1997-04-30 15:25:27 Singular Exp $ */
 /*
 * ABSTRACT: SINGULAR shell grammatik
@@ -343 +343 @@
           {
             ifswitch[voice]=0;
+            exitFile();
             /* Print("exit found\n"); */
-            YYACCEPT;
           }
         | SYS_BREAK

Singular/intvec.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: intvec.cc,v 1.5 1997-04-12 16:04:37 Singular Exp $ */
+/* $Id: intvec.cc,v 1.6 1997-04-30 15:25:28 Singular Exp $ */
 /*
 * ABSTRACT: class intvec: lists/vectors of integers
@@ -77 +77 @@
 }
 
-char * intvec::ivString()
+char * intvec::ivString(int mat,int spaces)
 {
   StringSetS("");
-  if (col == 1)
+  if ((col == 1)&&(mat!=INTMAT_CMD))
   {
     for (int i=0; i<row; i++)
@@ -105 +105 @@
         }
       }
-      if (j+1<row) StringAppend("\n");
+      if (j+1<row) 
+      {
+        StringAppend("\n");
+        if (spaces>0) StringAppend("%-*.*s",spaces,spaces," ");
+      }  
     }
   }
@@ -116 +120 @@
 }
 
-void intvec::show(int spaces)
+void intvec::show(int mat,int spaces)
 {
   if (spaces>0)
-    Print("%-*.*s%s",spaces,spaces," ",ivString());
+    Print("%-*.*s%s",spaces,spaces," ",ivString(mat,spaces));
   else
-    PrintS(ivString());
+    PrintS(ivString(mat,0));
 }
 

Singular/intvec.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: intvec.h,v 1.3 1997-04-09 12:19:45 Singular Exp $ */
+/* $Id: intvec.h,v 1.4 1997-04-30 15:25:29 Singular Exp $ */
 /*
 * ABSTRACT: class intvec: lists/vectors of integers
@@ -51 +51 @@
     int  rows() const { return row; }
     void length(int l) { row = l; col = 1; }
-    void show(int spaces=0);
+    void show(int mat=0,int spaces=0);
     void makeVector() { row*=col;col=1; }
     // keiner (ausser obachman) darf das folgenden benutzen !!!
     int * ivGetVec() { return v; }
     char * String();
-    char * ivString();
+    char * ivString(int mat=0,int spaces=0);
     ~intvec()
        {

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.24 1997-04-28 09:57:54 Singular Exp $ */
+/* $Id: iparith.cc,v 1.25 1997-04-30 15:25:30 Singular Exp $ */
 /*
 * ABSTRACT: table driven kernel interface, used by interpreter
@@ -1176 +1176 @@
 static BOOLEAN jjKLAMMER(leftv res, leftv u, leftv v)
 {
+  if(u->name==NULL) return TRUE;
   char * n = (char *)AllocL(strlen(u->name) + 6);
   sprintf(n,"%s(%d)",u->name,(int)v->Data());
@@ -4222 +4223 @@
   }
   fprintf(outfile,"/*---------------------------------------------*/\n");
-  char ops[]="=><+*/[.^,%(";
+  char ops[]="=><+*/[.^,%(;";
   for(i=0;ops[i]!='\0';i++)
     fprintf(outfile,"// token %d : %c\n", (int)ops[i], ops[i]);

Singular/ipshell.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipshell.cc,v 1.7 1997-04-28 17:47:15 Singular Exp $ */
+/* $Id: ipshell.cc,v 1.8 1997-04-30 15:25:32 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -640 +640 @@
   if (r==NULL) return TRUE;
   res->data=(char *)syBetti(r,len,&reg);
-// int i,j;
-//  for(i=0;i<betti->rows();i++)
-//  {
-//    Print("%2d:",i);
-//    for(j=1;j<=betti->cols();j++)
-//    {
-//      Print(" %5d",IMATELEM(*betti,i+1,j));
-//    }
-//    PrintLn();
-//  }
   Free((ADDRESS)r,(len)*sizeof(ideal));
   return FALSE;

Singular/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.8 1997-04-18 15:49:40 Singular Exp $ */
+/* $Id: ring.cc,v 1.9 1997-04-30 15:25:33 Singular Exp $ */
 
 /*
@@ -288 +288 @@
     {
       while ((ch!=fftable[l]) && (fftable[l])) l++;
-      if (fftable[l]==0) ch = IsPrime(ch);
+      if (fftable[l]==0)
+      {
+        ch = IsPrime(ch);
+      }  
       else
       {
         char *m[1]={(char *)sNoName};
         nfSetChar(ch,m);
-        if(errorreported) ch=IsPrime(ch);
-        else ffChar=TRUE;
+        if(errorreported)
+        {
+           errorreported=0;
+           ch=IsPrime(ch);
+        }
+        else
+        {
+          ffChar=TRUE;
+        }  
       }
     }
@@ -319 +329 @@
       else hs=pn;
       hs->CleanUp();
-      Free((ADDRESS)hs,sizeof(sleftv));
-      if (ffChar) pn->next=NULL;
+      if (ffChar) 
+      {
+        pn->next=NULL;
+        Free((ADDRESS)hs,sizeof(sleftv));
+      }  
       else pn=NULL;
     }

Singular/subexpr.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: subexpr.cc,v 1.15 1997-04-22 14:50:28 Singular Exp $ */
+/* $Id: subexpr.cc,v 1.16 1997-04-30 15:25:34 Singular Exp $ */
 
 /*
@@ -116 +116 @@
         case INTVEC_CMD:
         case INTMAT_CMD:
-          ((intvec *)d)->show(spaces);
+          ((intvec *)d)->show(t,spaces);
           break;
         case RING_CMD:
@@ -664 +664 @@
         return rString((ring)d);
       }  
-  #ifdef TEST
       default:
+        #ifdef TEST
         ::Print("String:unknown type %s(%d)", Tok2Cmdname(Typ()),Typ());
+        #endif
         return NULL;
-  #endif
     } /* end switch: (Typ()) */
     return mstrdup(s);