Changeset ed3c47 in git

Timestamp:

May 13, 1998, 4:53:46 PM (26 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

c6964d3e1ef307882e6dfb190e037a208fdd3a80

Parents:

7dc38717a028ca1c92f3fac68c5c7fd4c3267996

Message:

* hannes: changed syntax of NOT (does not require () any more)
          changes to make -Wall happy


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

Location:

Singular

Files:

• ChangeLog (modified) (1 diff)
• grammar.y (modified) (3 diffs)
• iplib.cc (modified) (6 diffs)
• mminit.cc (modified) (3 diffs)

Singular/ChangeLog

@@ +1 @@
+Wed May 13 16:52:09 MET DST 1998 hannes
+        * changed syntax of NOT (does not require () any more)
 Tue May 12 16:58:13 MET DST 1998 hannes
         * changed return type of option(): none -> string

Singular/grammar.y

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: grammar.y,v 1.32 1998-05-11 16:55:29 Singular Exp $ */
+/* $Id: grammar.y,v 1.33 1998-05-13 14:53:44 Singular Exp $ */
 /*
 * ABSTRACT: SINGULAR shell grammatik
@@ -283 +283 @@
 %left '+' '-'
 %left '*' '/' '%' INTDIV
-%left UMINUS
+%left UMINUS NOT
 %left  '^'
 %left '[' ']'
@@ -781 +781 @@
             if(iiExprArith2(&$$,&$1,DOTDOT,&$3)) YYERROR;
           }
-        | NOT '(' expr ')'
+        | NOT expr 
           {
             memset(&$$,0,sizeof($$));
-            int i; TESTSETINT($3,i);
+            int i; TESTSETINT($2,i);
             $$.rtyp  = INT_CMD;
             $$.data = (void *)(i == 0 ? 1 : 0);

Singular/iplib.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iplib.cc,v 1.24 1998-05-09 14:34:29 krueger Exp $ */
+/* $Id: iplib.cc,v 1.25 1998-05-13 14:53:45 Singular Exp $ */
 /*
 * ABSTRACT: interpreter: LIB and help
@@ -25 +25 @@
 #else /* HAVE_LIBPARSER */
    procinfo *iiInitSingularProcinfo(procinfov pi, char *libname,
-                                    char *procname, int line, long pos,
-                                    BOOLEAN pstatic = FALSE);
+                                    char *procname, int line, long pos,
+                                    BOOLEAN pstatic = FALSE);
 #endif /* HAVE_LIBPARSER */
 
@@ -308 +308 @@
   if(pi->is_static && myynest==0) {
     Werror("'%s::%s()' is a local procedure and cannot be accessed by an user.",
-           pi->libname, pi->procname);
+           pi->libname, pi->procname);
     return NULL;
   }
@@ -526 +526 @@
   }
   if (BVERBOSE(V_LOAD_LIB)) Print( "// ** loaded %s %s", libnamebuf,
-                                   text_buffer);
+                                   text_buffer);
   if( (lib_style == OLD_LIBSTYLE) && (BVERBOSE(V_LOAD_LIB)))
     Warn( "library %s has an old format. Please fix it for the next time",
-          newlib);
+          newlib);
   else {
     if (BVERBOSE(V_LOAD_LIB)) Print("\n");
@@ -737 +737 @@
 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
 int iiAddCproc(char *libname, char *procname, BOOLEAN pstatic,
-               BOOLEAN(*func)(leftv res, leftv v))
+               BOOLEAN(*func)(leftv res, leftv v))
 {
   procinfov pi;
@@ -763 +763 @@
 char *iiConvName(char *libname)
 {
-  char *p = (char *)AllocL(strlen(libname)+7);
-  char *q = mstrdup(libname);
-  char *r = q;
-  for(; *r!='\0'; r++)
+  int l=strlen(libname)+7;
+  char *p = (char *)AllocL(l);
+  char *r;
+
+  memset(p,0,l);
+  sprintf(p, "%s_init", libname);
+  for(r=p; *r!='\0'; r++)
   {
     if(*r=='.') *r='_';
     if(*r==':') *r='_';
   }
-  sprintf(p, "%s_init\0", q);
-  FreeL((ADDRESS)q);
   return(p);
 }

Singular/mminit.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mminit.cc,v 1.10 1998-04-28 08:46:22 obachman Exp $ */
+/* $Id: mminit.cc,v 1.11 1998-05-13 14:53:46 Singular Exp $ */
 /*
 * ABSTRACT: init of memory management
@@ -11 +11 @@
 #include <stdlib.h>
 #include <string.h>
+#define __USE_MISC
+#include <unistd.h>
+#include <sys/types.h>
 #include "mod2.h"
 #include "mmemory.h"
@@ -153 +156 @@
 #ifdef HAVE_SBRK
 #include <unistd.h>
-unsigned long mm_SbrkInit = sbrk(0);
+unsigned long mm_SbrkInit = (unsigned long)sbrk(0);
 #endif