Added use of scl_memmgr to express library.

davyw · davyw · commit 4d6d249dadd8 · 2012-02-27T21:21:08.000+01:00
* Replaced malloc, calloc, realloc and free with scl_memmgr versions.
* Added scl_memmgr.h includes.
diff --git a/src/express/CMakeLists.txt b/src/express/CMakeLists.txt
@@ -70,6 +70,7 @@ SET(EXPRESS_PRIVATE_HDRS
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
+	${SCL_SOURCE_DIR}/src/base
 )
 
 add_definitions( -DFLEX )
@@ -80,9 +81,10 @@ endif()
 
 if(BORLAND)
 add_definitions( -D__STDC__ )
+add_definitions( -DSCL_BASE_DLL_IMPORTS )
 endif()
 
-SCL_ADDLIB(express "${EXPRESS_SOURCES}" "")
+SCL_ADDLIB(express "${EXPRESS_SOURCES}" "base")
 
 if(APPLE)
     set_target_properties(express PROPERTIES LINK_FLAGS "-flat_namespace -undefined suppress")
diff --git a/src/express/alg.c b/src/express/alg.c
@@ -38,6 +38,7 @@
  * prettied up interface to print_objects_when_running
  */
 
+#include <scl_memmgr.h>
 #define ALGORITHM_C
 #include "express/alg.h"
 #include "express/object.h"
diff --git a/src/express/caseitem.c b/src/express/caseitem.c
@@ -29,6 +29,7 @@
  * prettied up interface to print_objects_when_running
  */
 
+#include <scl_memmgr.h>
 #define CASE_ITEM_C
 #include "express/caseitem.h"
 
diff --git a/src/express/dict.c b/src/express/dict.c
@@ -33,6 +33,7 @@
  * Initial revision
  */
 
+#include <scl_memmgr.h>
 #define DICTIONARY_C
 #include "express/dict.h"
 #include "express/object.h"
diff --git a/src/express/entity.c b/src/express/entity.c
@@ -111,6 +111,7 @@
  *
  */
 
+#include <scl_memmgr.h>
 #define ENTITY_C
 #include "express/entity.h"
 #include "express/express.h"
diff --git a/src/express/error.c b/src/express/error.c
@@ -52,6 +52,7 @@
  */
 
 #include <scl_cf.h>
+#include <scl_memmgr.h>
 #include <stdlib.h>
 #include <setjmp.h>
 #ifdef HAVE_UNISTD_H
@@ -105,7 +106,7 @@ void ERRORinitialize( void ) {
     ERROR_syntax_expecting =
         ERRORcreate( "%s, expecting %s in %s %s", SEVERITY_EXIT );
 
-    ERROR_string_base = ( char * )malloc( ERROR_MAX_SPACE );
+    ERROR_string_base = ( char * )scl_malloc( ERROR_MAX_SPACE );
     ERROR_start_message_buffer();
 
 
@@ -410,7 +411,7 @@ void ERRORnospace() {
 Error ERRORcreate( char * message, Severity severity ) {
     Error n;
 
-    n = ( struct Error_ * )malloc( sizeof( struct Error_ ) );
+    n = ( struct Error_ * )scl_malloc( sizeof( struct Error_ ) );
     n->message = message;
     n->severity = severity;
     n->enabled = true;
diff --git a/src/express/expr.c b/src/express/expr.c
@@ -71,6 +71,7 @@
  */
 
 #include <scl_cf.h>
+#include <scl_memmgr.h>
 #define EXPRESSION_C
 
 #ifdef HAVE_UNISTD_H
diff --git a/src/express/express.c b/src/express/express.c
@@ -69,6 +69,7 @@
  */
 
 #include <scl_cf.h>
+#include <scl_memmgr.h>
 #define EXPRESS_C
 #include "express/basic.h"
 #include <ctype.h>
@@ -138,7 +139,7 @@ Symbol * EXPRESS_get_symbol( Generic e ) {
 
 Express EXPRESScreate() {
     Express model = SCOPEcreate( OBJ_EXPRESS );
-    model->u.express = ( struct Express_ * )calloc( 1, sizeof( struct Express_ ) );
+    model->u.express = ( struct Express_ * )scl_calloc( 1, sizeof( struct Express_ ) );
     return model;
 }
 
@@ -157,7 +158,7 @@ static void EXPRESS_PATHinit() {
     p = getenv( "EXPRESS_PATH" );
     if( !p ) {
         /* if no EXPRESS_PATH, search current directory anyway */
-        dir = ( Dir * )malloc( sizeof( Dir ) );
+        dir = ( Dir * )scl_malloc( sizeof( Dir ) );
         dir->leaf = dir->full;
         LISTadd( EXPRESS_path, ( Generic )dir );
     } else {
@@ -189,7 +190,7 @@ static void EXPRESS_PATHinit() {
             }
             p++;    /* leave p after terminating null */
 
-            dir = ( Dir * )malloc( sizeof( Dir ) );
+            dir = ( Dir * )scl_malloc( sizeof( Dir ) );
 
             /* if it's just ".", make it as if it was */
             /* just "" to make error messages cleaner */
@@ -388,7 +389,7 @@ void EXPRESSparse( Express model, FILE * fp, char * filename ) {
             length -= 4;
         }
 
-        model->u.express->basename = ( char * )malloc( length + 1 );
+        model->u.express->basename = ( char * )scl_malloc( length + 1 );
         memcpy( model->u.express->basename, filename, length );
         model->u.express->basename[length] = '\0';
 
diff --git a/src/express/fedex.c b/src/express/fedex.c
@@ -72,6 +72,7 @@
  */
 
 #include <scl_cf.h>
+#include <scl_memmgr.h>
 #include <scl_export.h>
 #include "scl_version_string.h"
 #include <stdlib.h>
diff --git a/src/express/hash.c b/src/express/hash.c
@@ -105,6 +105,7 @@
  *
  */
 
+#include <scl_memmgr.h>
 #define HASH_C
 #include <string.h>
 #include <stdlib.h>
@@ -297,7 +298,7 @@ HASHdestroy( Hash_Table table ) {
                         p = q;
                     }
                 }
-                free( table->Directory[i] );
+                scl_free( table->Directory[i] );
             }
         }
         HASH_Table_destroy( table );
@@ -315,11 +316,11 @@ void *
 HASHfind( Hash_Table t, char * s ) {
 //    Element * ep;
     struct Element_ *ep = NULL;
-    struct Element_ *e = malloc( sizeof * e );
+    struct Element_ *e = scl_malloc( sizeof * e );
     e -> key = s;
     e -> symbol = 0; /*  initialize to 0 - 25-Apr-1994 - kcm */
     ep = HASHsearch( t, e, HASH_FIND );
-    free(e);
+    scl_free(e);
     return( ep ? ep->data : 0 );
 }
 
@@ -329,7 +330,7 @@ void
 HASHinsert( Hash_Table t, char * s, void * data ) {
     Element e2;
 //    memset(e, 0, sizeof(s) + sizeof(data));
-    struct Element_ *e = malloc( sizeof * e );
+    struct Element_ *e = scl_malloc( sizeof * e );
     e -> key = s;
     e -> data = data;
     e -> symbol = 0; /*  initialize to 0 - 25-Apr-1994 - kcm */
diff --git a/src/express/lexact.c b/src/express/lexact.c
@@ -51,6 +51,7 @@
  * prettied up interface to print_objects_when_running
  */
 
+#include <scl_memmgr.h>
 #define LEX_ACTIONS_C
 #include <stdlib.h>
 #include <ctype.h>
@@ -308,7 +309,7 @@ SCANprocess_logical_literal( char * string ) {
             break;
             /* default will actually be triggered by 'UNKNOWN' keyword */
     }
-    free( string );
+    scl_free( string );
     return TOK_LOGICAL_LITERAL;
 }
 
@@ -322,7 +323,7 @@ SCANprocess_identifier_or_keyword( void ) {
 
     /* make uppercase copy */
     len = strlen( yytext );
-    dest = test_string = ( char * )malloc( len + 1 );
+    dest = test_string = ( char * )scl_malloc( len + 1 );
     for( src = yytext; *src; src++, dest++ ) {
         *dest = ( islower( *src ) ? toupper( *src ) : *src );
     }
@@ -338,7 +339,7 @@ SCANprocess_identifier_or_keyword( void ) {
             case TOK_LOGICAL_LITERAL:
                 return SCANprocess_logical_literal( test_string );
             default:
-                free( test_string );
+                scl_free( test_string );
                 return k->token;
         }
     }
@@ -534,7 +535,7 @@ SCANupperize( char * s ) {
 
 char *
 SCANstrdup( char * s ) {
-    char * s2 = ( char * )malloc( strlen( s ) + 1 );
+    char * s2 = ( char * )scl_malloc( strlen( s ) + 1 );
     if( !s2 ) {
         return 0;
     }
diff --git a/src/express/linklist.c b/src/express/linklist.c
@@ -21,6 +21,7 @@
  * prettied up interface to print_objects_when_running
  */
 
+#include <scl_memmgr.h>
 #define LINKED_LIST_C
 #include "express/linklist.h"
 
diff --git a/src/express/memory.c b/src/express/memory.c
@@ -34,6 +34,7 @@ Now you can say things like:
     foo_destroy(foo1);
 
 */
+#include <scl_memmgr.h>
 #include <stdlib.h>
 #include <string.h>
 #include "express/memory.h"
diff --git a/src/express/object.c b/src/express/object.c
@@ -21,6 +21,7 @@
  * prettied up interface to print_objects_when_running
  */
 
+#include <scl_memmgr.h>
 #define OBJECT_C
 #include <stdlib.h>
 #include "express/object.h"
@@ -35,7 +36,7 @@ Symbol * UNK_get_symbol( Generic x ) {
 void OBJinitialize() {
     int i;
 
-    OBJ = ( struct Object * )malloc( MAX_OBJECT_TYPES * sizeof( struct Object ) );
+    OBJ = ( struct Object * )scl_malloc( MAX_OBJECT_TYPES * sizeof( struct Object ) );
     for( i = 0; i < MAX_OBJECT_TYPES; i++ ) {
         OBJ[i].get_symbol = UNK_get_symbol;
         OBJ[i].type = "of unknown_type";
diff --git a/src/express/resolve.c b/src/express/resolve.c
@@ -56,6 +56,7 @@
  */
 
 #include <scl_cf.h>
+#include <scl_memmgr.h>
 #define RESOLVE_C
 #include <stdlib.h>
 #ifdef HAVE_UNISTD_H
diff --git a/src/express/schema.c b/src/express/schema.c
@@ -46,6 +46,7 @@
  */
 
 #include <scl_cf.h>
+#include <scl_memmgr.h>
 #define SCHEMA_C
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
diff --git a/src/express/scope.c b/src/express/scope.c
@@ -38,6 +38,7 @@
  * prettied up interface to print_objects_when_running
  */
 
+#include <scl_memmgr.h>
 #define SCOPE_C
 #include "express/scope.h"
 #include "express/resolve.h"
diff --git a/src/express/stmt.c b/src/express/stmt.c
@@ -40,6 +40,7 @@
  *
  */
 
+#include <scl_memmgr.h>
 #define STATEMENT_C
 #include "express/stmt.h"
 
diff --git a/src/express/symbol.c b/src/express/symbol.c
@@ -32,6 +32,7 @@
  * Initial revision
  */
 
+#include <scl_memmgr.h>
 #define SYMBOL_C
 #include "express/symbol.h"
 
diff --git a/src/express/type.c b/src/express/type.c
@@ -122,6 +122,7 @@ This module implements the type abstraction.  It is
  *
  */
 
+#include <scl_memmgr.h>
 #define TYPE_C
 #include "express/type.h"
 
diff --git a/src/express/variable.c b/src/express/variable.c
@@ -83,6 +83,7 @@
  *
  */
 
+#include <scl_memmgr.h>
 #define VARIABLE_C
 #include <stdlib.h>
 #include "express/variable.h"

Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,7 @@`
`111`	`111`	`*`
`112`	`112`	`*/`
`113`	`113`
	`114`	`+#include <scl_memmgr.h>`
`114`	`115`	`#define ENTITY_C`
`115`	`116`	`#include "express/entity.h"`
`116`	`117`	`#include "express/express.h"`