use scl_memmgr in express; SCL git 82c84e7 and 4d6d249

Nicholas Reed · Nicholas Reed · commit 885828c192ce · 2012-06-13T21:13:59.000Z
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -288,7 +288,7 @@ include_directories(
   ${SCL_BINARY_DIR}/include
   )
 
-#ADD_SUBDIRECTORY(src/base)
+ADD_SUBDIRECTORY(src/base)
 ADD_SUBDIRECTORY(src/express)
 ADD_SUBDIRECTORY(src/exppp)
 ADD_SUBDIRECTORY(src/fedex_plus)
diff --git a/src/base/CMakeLists.txt b/src/base/CMakeLists.txt
@@ -4,7 +4,9 @@ set(SCL_BASE_SOURCES
 )
 
 include_directories(
-	${SCL_SOURCE_DIR}/include
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${SCL_SOURCE_DIR}/include
 )
 
 option(SCL_MEMMGR_ENABLE_CHECKS "Enable scl_memmgr's memory leak detection" OFF)
diff --git a/src/express/CMakeLists.txt b/src/express/CMakeLists.txt
@@ -1,6 +1,7 @@
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
+    ${SCL_SOURCE_DIR}/src/base
 )
 
 find_package(LEMON)
@@ -42,5 +43,5 @@ SET(EXPRESS_PRIVATE_HDRS
     stack.h
 )
 
-SCL_ADDLIB(express "${EXPRESS_SOURCES}" "")
+SCL_ADDLIB(express "${EXPRESS_SOURCES}" "base")
 SCL_ADDEXEC(fedex "${FEDEX_SOURCES}" express)
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>
 #include "express/alg.h"
 #include "express/object.h"
 #include "express/schema.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>
 #include "express/caseitem.h"
 
 struct freelist_head CASE_IT_fl;
diff --git a/src/express/dict.c b/src/express/dict.c
@@ -33,6 +33,7 @@
  * Initial revision
  */
 
+#include <scl_memmgr.h>
 #include "express/dict.h"
 #include "express/object.h"
 #include "express/expbasic.h"
diff --git a/src/express/entity.c b/src/express/entity.c
@@ -111,6 +111,7 @@
  *
  */
 
+#include <scl_memmgr.h>
 #include "express/entity.h"
 #include "express/express.h"
 #include "express/object.h"
diff --git a/src/express/error.c b/src/express/error.c
@@ -51,6 +51,7 @@
  * prettied up interface to print_objects_when_running
  */
 
+#include <scl_memmgr.h>
 #include <stdlib.h>
 #include <setjmp.h>
 
@@ -123,7 +124,7 @@ void ERRORinitialize( void ) {
     ERROR_syntax_expecting =
         ERRORcreate( "%s, expecting %s in %s %s", SEVERITY_EXIT );
 
-    ERROR_string_base = ( char * )calloc( 1, ERROR_MAX_SPACE );
+    ERROR_string_base = ( char * )scl_malloc( ERROR_MAX_SPACE );
     ERROR_start_message_buffer();
 
 
@@ -428,7 +429,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
@@ -70,6 +70,7 @@
  *
  */
 
+#include <scl_memmgr.h>
 #include "express/expr.h"
 #include "express/resolve.h"
 
diff --git a/src/express/express.c b/src/express/express.c
@@ -68,6 +68,7 @@
  *
  */
 
+#include "scl_memmgr.h"
 #include "express/basic.h"
 #include <ctype.h>
 #include <stdlib.h>
@@ -274,7 +275,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;
 }
 
@@ -293,7 +294,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 {
@@ -325,7 +326,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 */
@@ -523,7 +524,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
@@ -76,6 +76,7 @@ char * FEDEXversion( void ) {
 }
 
 #include <scl_cf.h>
+#include <scl_memmgr.h>
 #include <scl_export.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/src/express/hash.c b/src/express/hash.c
@@ -105,6 +105,7 @@
  *
  */
 
+#include <scl_memmgr.h>
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
@@ -300,7 +301,7 @@ HASHdestroy( Hash_Table table ) {
                         p = q;
                     }
                 }
-                free( table->Directory[i] );
+                scl_free( table->Directory[i] );
             }
         }
         HASH_Table_destroy( table );
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>
 #include <stdlib.h>
 #include <ctype.h>
 #include "express/lexact.h"
@@ -314,7 +315,7 @@ SCANprocess_logical_literal( char * string ) {
             break;
             /* default will actually be triggered by 'UNKNOWN' keyword */
     }
-    free( string );
+    scl_free( string );
     return TOK_LOGICAL_LITERAL;
 }
 
@@ -328,7 +329,7 @@ SCANprocess_identifier_or_keyword( const char * yytext ) {
 
     /* 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 );
     }
@@ -344,7 +345,7 @@ SCANprocess_identifier_or_keyword( const char * yytext ) {
             case TOK_LOGICAL_LITERAL:
                 return SCANprocess_logical_literal( test_string );
             default:
-                free( test_string );
+                scl_free( test_string );
                 return k->token;
         }
     }
@@ -542,7 +543,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>
 #include "express/linklist.h"
 
 Error ERROR_empty_list = ERROR_none;
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>
 #include <stdlib.h>
 #include "express/object.h"
 
@@ -36,7 +37,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
@@ -55,6 +55,7 @@
  *
  */
 
+#include <scl_memmgr.h>
 #include <stdlib.h>
 #include "express/resolve.h"
 #include "stack.h"
diff --git a/src/express/schema.c b/src/express/schema.c
@@ -45,6 +45,7 @@
  * prettied up interface to print_objects_when_running
  */
 
+#include <scl_memmgr.h>
 #include "express/expbasic.h"
 #include "express/schema.h"
 #include "express/object.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>
 #include "express/stmt.h"
 
 struct freelist_head STMT_fl;
diff --git a/src/express/symbol.c b/src/express/symbol.c
@@ -32,6 +32,7 @@
  * Initial revision
  */
 
+#include <scl_memmgr.h>
 #include "express/symbol.h"
 
 struct freelist_head SYMBOL_fl;
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>
 #include "express/type.h"
 
 /* Very commonly-used read-only types */
diff --git a/src/express/variable.c b/src/express/variable.c
@@ -83,6 +83,7 @@
  *
  */
 
+#include <scl_memmgr.h>
 #include <stdlib.h>
 #include "express/variable.h"
 #include "express/object.h"

Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,7 @@ include_directories(`
`288`	`288`	`${SCL_BINARY_DIR}/include`
`289`	`289`	`)`
`290`	`290`
`291`		`-#ADD_SUBDIRECTORY(src/base)`
	`291`	`+ADD_SUBDIRECTORY(src/base)`
`292`	`292`	`ADD_SUBDIRECTORY(src/express)`
`293`	`293`	`ADD_SUBDIRECTORY(src/exppp)`
`294`	`294`	`ADD_SUBDIRECTORY(src/fedex_plus)`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,9 @@ set(SCL_BASE_SOURCES`
`4`	`4`	`)`
`5`	`5`
`6`	`6`	`include_directories(`
`7`		`- ${SCL_SOURCE_DIR}/include`
	`7`	`+ ${CMAKE_CURRENT_BINARY_DIR}`
	`8`	`+ ${CMAKE_CURRENT_SOURCE_DIR}`
	`9`	`+ ${SCL_SOURCE_DIR}/include`
`8`	`10`	`)`
`9`	`11`
`10`	`12`	`option(SCL_MEMMGR_ENABLE_CHECKS "Enable scl_memmgr's memory leak detection" OFF)`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`include_directories(`
`2`	`2`	`${CMAKE_CURRENT_BINARY_DIR}`
`3`	`3`	`${CMAKE_CURRENT_SOURCE_DIR}`
	`4`	`+ ${SCL_SOURCE_DIR}/src/base`
`4`	`5`	`)`
`5`	`6`
`6`	`7`	`find_package(LEMON)`
`@@ -42,5 +43,5 @@ SET(EXPRESS_PRIVATE_HDRS`
`42`	`43`	`stack.h`
`43`	`44`	`)`
`44`	`45`
`45`		`-SCL_ADDLIB(express "${EXPRESS_SOURCES}" "")`
	`46`	`+SCL_ADDLIB(express "${EXPRESS_SOURCES}" "base")`
`46`	`47`	`SCL_ADDEXEC(fedex "${FEDEX_SOURCES}" express)`
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`	`#include "express/entity.h"`
`115`	`116`	`#include "express/express.h"`
`116`	`117`	`#include "express/object.h"`
Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,7 @@`
`70`	`70`	`*`
`71`	`71`	`*/`
`72`	`72`
	`73`	`+#include <scl_memmgr.h>`
`73`	`74`	`#include "express/expr.h"`
`74`	`75`	`#include "express/resolve.h"`
`75`	`76`