rev 379 - in trunk: include/prothon modules/dbm src

Author: mark
Date: 2004-04-17 21:03:46 -0400 (Sat, 17 Apr 2004)
New Revision: 379

Modified:
   trunk/include/prothon/prothon_dll.h
   trunk/modules/dbm/DBM.c
   trunk/src/object.c
Log:
dbm now imports ok, doesn't work otherwise

Modified: trunk/include/prothon/prothon_dll.h
===================================================================
--- trunk/include/prothon/prothon_dll.h	2004-04-18 00:25:31 UTC (rev 378)
+++ trunk/include/prothon/prothon_dll.h	2004-04-18 01:03:46 UTC (rev 379)
@@ -188,8 +188,10 @@
 #define MODULE_CONSTANT_DECLARE(module, name)  obj_p module##_##name
 
 #define MODULE_CONSTANT_INT(module, name, val)						\
-	module##_##name = NEW_INT(val);							    \
+	module##_##name = NEW_INT(val);									\
+	clr_immutable(module##_##name);									\
 	set_obj_id(module##_##name, module, name);						\
+	set_immutable(module##_##name);									\
 	set_attr(ist, module##_OBJ, sym(ist, #name), module##_##name)
 
 #define MODULE_SUB_INIT(name)	\

Modified: trunk/modules/dbm/DBM.c
===================================================================
--- trunk/modules/dbm/DBM.c	2004-04-18 00:25:31 UTC (rev 378)
+++ trunk/modules/dbm/DBM.c	2004-04-18 01:03:46 UTC (rev 379)
@@ -245,8 +245,8 @@
 	apr_dbm_freedatum(db, data);
 	return parms[1];
 }
-DEF( DB, getUsedNames, FPARM2( name,  NULL, 
-	                           type,  NEW_STRING("SDBM") ) ) {
+DEF( DB, getNames, FPARM2( name,  NULL, 
+	                       type,  NEW_STRING("SDBM") ) ) {
 	apr_status_t aprerr;
 	apr_pool_t* pool;
 	obj_p res;
@@ -256,10 +256,10 @@
 	STRING_PARAM(2, type);
 
 	aprerr = apr_pool_create(&pool, get_pr_head_pool());
-	IF_APR_ERR("out of memory in getUsedNames()") return NULL;
+	IF_APR_ERR("out of memory in getNames()") return NULL;
 
 	aprerr = apr_dbm_get_usednames_ex(pool, type, name, &used1, &used2);
-	IF_APR_ERR("get_usednames() in dbm") return NULL;
+	IF_APR_ERR("getNames() in dbm") return NULL;
 
 	res = NEW_LIST(2);
 	list_append(ist, res, NEW_STRING(used1));
@@ -276,9 +276,9 @@
 
 MAIN_MODULE_INIT(DBM) {
 	MODULE_SUB_INIT(DBM);
-	MODULE_ADD_SYM(DB, getUsedNames);
+	MODULE_ADD_SYM(DB, getNames);
+	MODULE_ADD_SYM(DB, fetch);
 	MODULE_ADD_SYM(DB, __init__);
-	MODULE_ADD_SYM(DB, fetch);
 	MODULE_ADD_SYM(DB, store);
 	MODULE_ADD_SYM(DB, delete);
 	MODULE_ADD_SYM(DB, exists_QUES);
Modified: trunk/src/object.c
===================================================================
--- trunk/src/object.c	2004-04-18 00:25:31 UTC (rev 378)
+++ trunk/src/object.c	2004-04-18 01:03:46 UTC (rev 379)
@@ -152,6 +152,7 @@
 	dll_services.list3			  = list3;		
 	dll_services.list4			  = list4;		
 	dll_services.list6			  = list6;		
+	dll_services.list8			  = list8;		
 	dll_services.raise_exception  = raise_exception;
 	dll_services.new_object       = new_object;
 	dll_services.set_obj_doc_f    = set_obj_doc_f;