yacc: correct a few mistakes

Author: jmalak

bld/yacc/c/alloc.c

@@ -75,7 +75,7 @@ void MemFini( void )
 {
 #ifdef TRMEM
     if( memHandle != NULL ) {
-        _trmem_prt_list( memHandle );
+        _trmem_prt_list_ex( memHandle, 100 );
         _trmem_close( memHandle );
         if( memFile != NULL ) {
             fclose( memFile );
@@ -107,11 +107,16 @@ void *YaccCalloc( size_t n, size_t size )
 {
     void        *ptr;
 
-    ptr = YaccAlloc( n * size );
+    size *= n;
+#ifdef TRMEM
+    ptr = _trmem_alloc( size, _trmem_guess_who(), memHandle );
+#else
+    ptr = malloc( size );
+#endif
     if( ptr == NULL ) {
         msg( "Out of memory\n" );
     }
-    memset( ptr, 0, n * size );
+    memset( ptr, 0, size );
     return( ptr );
 }
 
@@ -144,6 +149,7 @@ void YaccFree( void *ptr )
 }
 
 char *YaccStrDup( const char *str )
+/*********************************/
 {
     size_t      size;
     char        *ptr;

bld/yacc/c/lalr1.c

@@ -523,11 +523,11 @@ void lalr1( void )
         puts( "internal error" );
     }
     FREE( stk );
+    FREE( look );
     Conflict();
     nbstate = nstate;
-    FreeSet( rset );
-    FreeSet( lset );
-    FREE( look );
+//    FreeSet( rset );
+//    FreeSet( lset );
 }
 
 void showstates( void )

bld/yacc/c/sentence.c

@@ -38,12 +38,12 @@
 #include "yaccins.h"
 #include "alloc.h"
 
-typedef struct traceback traceback;
-struct traceback {
-    traceback   *next;
-    a_state     *state;
-    a_sym       *sym;
-};
+
+typedef struct traceback {
+    struct traceback    *next;
+    a_state             *state;
+    a_sym               *sym;
+} traceback;
 
 static void pushTrace( traceback **h, a_state *state, a_sym *sym )
 {
@@ -60,8 +60,7 @@ static void popTrace( traceback **h )
 {
     traceback   *token;
 
-    token = *h;
-    if( token != NULL ) {
+    if( (token = *h) != NULL ) {
         *h = token->next;
         FREE( token );
     }

bld/yacc/c/yacc.c

@@ -38,6 +38,7 @@
 #include "alloc.h"
 #include "walloca.h"
 
+
 FILE *yaccin;
 char *loadpath;
 char *srcname_norm = NULL;
@@ -236,7 +237,7 @@ static char *fname_normalize( char *name )
     char    *p;
     char    *dst;
 
-    p = dst = malloc( strlen( name ) + 1 );
+    p = dst = MALLOC( strlen( name ) + 1, char );
     while( (c = *name++) != '\0' ) {
         if( c == '\\' )
             c = '/';
@@ -318,7 +319,7 @@ int main( int argc, char **argv )
     loadpath = argv[0];
     *getname( loadpath ) = '\0';
     srcname = argv[i];
-    if( !strrchr( srcname, '.' ) ) {
+    if( strrchr( srcname, '.' ) == NULL ) {
         srcname = alloca( strlen( argv[i] )+3 );
         srcname = strcat( strcpy( srcname, argv[i] ), ".y" );
     }

bld/yacc/h/alloc.h

@@ -37,7 +37,7 @@
 #include <stdlib.h>
 
 #define MALLOC(n,t)     ((t *)YaccAlloc((n) * sizeof(t)))
-#define REALLOC(p,n,t)  ((t *)YaccRealloc((char *)p,(n) * sizeof(t)))
+#define REALLOC(p,n,t)  ((t *)YaccRealloc((p),(n) * sizeof(t)))
 #define CALLOC(n,t)     ((t *)YaccCalloc((n),sizeof(t)))
 #define FREE(n)         YaccFree((n))
 #define STRDUP(p)       YaccStrDup((p))