rev 677 - in trunk: include/prothon modules/Re src

Author: mark
Date: 2004-06-29 17:08:56 -0400 (Tue, 29 Jun 2004)
New Revision: 677

Modified:
   trunk/include/prothon/prothon.h
   trunk/modules/Re/Re.c
   trunk/src/builtins-core.c
   trunk/src/builtins-file.c
   trunk/src/builtins-thread.c
   trunk/src/memory_mgr.c
   trunk/src/symbol.c
Log:
changed del_ to final_, added get_, set_, and del_

Modified: trunk/include/prothon/prothon.h
===================================================================
--- trunk/include/prothon/prothon.h	2004-06-29 20:57:53 UTC (rev 676)
+++ trunk/include/prothon/prothon.h	2004-06-29 21:08:56 UTC (rev 677)
@@ -462,7 +462,7 @@
 	SETITEM_,
 	DELITEM_,
 	OBJLIST_,
-	DEL_,
+	FINAL_,
 	LEN_,
 	MAX,
 	MIN,
@@ -481,6 +481,7 @@
 	NOTIFYCALLBACK_,
 	GET_,
 	SET_,
+	DEL_, 
 
 	SYM_ENUM_COUNT
 } sym_enum_t;

Modified: trunk/modules/Re/Re.c
===================================================================
--- trunk/modules/Re/Re.c	2004-06-29 20:57:53 UTC (rev 676)
+++ trunk/modules/Re/Re.c	2004-06-29 21:08:56 UTC (rev 677)
@@ -489,7 +489,7 @@
 	return parms[1];
 }
 
-DEF(reCompiled, del_, NULL) {
+DEF(reCompiled, final_, NULL) {
 	if (self->data.ptr)
 		regfree((regex_t*)(self->data.ptr));
 	return OBJ(NONE);
@@ -655,7 +655,7 @@
 	MODULE_ADD_SYM(reCompiled, search);
 	MODULE_ADD_SYM(reCompiled, split);
 	MODULE_ADD_SYM(reCompiled, sub);
-	MODULE_ADD_SYM(reCompiled, del_);
+	MODULE_ADD_SYM(reCompiled, final_);
 	MODULE_ADD_SYM(reCompiled, objList_);
 
 	MODULE_SUB_INIT(reMatch);

Modified: trunk/src/builtins-core.c
===================================================================
--- trunk/src/builtins-core.c	2004-06-29 20:57:53 UTC (rev 676)
+++ trunk/src/builtins-core.c	2004-06-29 21:08:56 UTC (rev 677)
@@ -120,7 +120,7 @@
 	return OBJ(NONE);
 }
 
-DEF(Object, del_, NULL) {
+DEF(Object, final_, NULL) {
 	return OBJ(NONE);
 }
 
@@ -1238,7 +1238,7 @@
 	MODULE_SUB_INIT(Object);
 	MODULE_ADD_SYM(Object, call_);
 	MODULE_ADD_SYM(Object, init_);
-	MODULE_ADD_SYM(Object, del_);
+	MODULE_ADD_SYM(Object, final_);
 	MODULE_ADD_SYM(Object, objId_);
 	MODULE_ADD_SYM(Object, isMain_QUES);
 	MODULE_ADD_SYM(Object, debug_);

Modified: trunk/src/builtins-file.c
===================================================================
--- trunk/src/builtins-file.c	2004-06-29 20:57:53 UTC (rev 676)
+++ trunk/src/builtins-file.c	2004-06-29 21:08:56 UTC (rev 677)
@@ -589,7 +589,7 @@
 	return OBJ(NONE);
 }
 
-DEF(TempDir, del_, NULL) {
+DEF(TempDir, final_, NULL) {
 	if (self->data.ptr)
 		call_func0(ist, self, sym(ist, "delete"));
 	return OBJ(NONE);
@@ -1868,7 +1868,7 @@
 	MODULE_SUB_INIT(TempDir);
 	MODULE_ADD_SYM(TempDir, init_);
 	MODULE_ADD_SYM(TempDir, str_);
-	MODULE_ADD_SYM(TempDir, del_);
+	MODULE_ADD_SYM(TempDir, final_);
 
 	MODULE_SUB_INIT(File);
 	MODULE_ADD_SYM(File, init_);
Modified: trunk/src/builtins-thread.c
===================================================================
--- trunk/src/builtins-thread.c	2004-06-29 20:57:53 UTC (rev 676)
+++ trunk/src/builtins-thread.c	2004-06-29 21:08:56 UTC (rev 677)
@@ -383,7 +383,7 @@
 	return self;
 }
 
-DEF(Mutex, del_, NULL) {
+DEF(Mutex, final_, NULL) {
 	if (self->data.ptr)
 		apr_thread_mutex_destroy((apr_thread_mutex_t*)(self->data.ptr));
 	return OBJ(NONE);
@@ -412,7 +412,7 @@
 	MODULE_ADD_SYM(Mutex, lock);
 	MODULE_ADD_SYM(Mutex, tryLock);
 	MODULE_ADD_SYM(Mutex, unlock);
-	MODULE_ADD_SYM(Mutex, del_);
+	MODULE_ADD_SYM(Mutex, final_);
 	MODULE_ADD_SYM(Mutex, objList_);
 
 	check_exceptions(ist);

Modified: trunk/src/memory_mgr.c
===================================================================
--- trunk/src/memory_mgr.c	2004-06-29 20:57:53 UTC (rev 676)
+++ trunk/src/memory_mgr.c	2004-06-29 21:08:56 UTC (rev 677)
@@ -312,7 +312,7 @@
 			obj_count++;
 			if (obj->state != OBJ_STATE_NEW_OR_MARKED && !obj->del_locked) {
 				delete_notify(ist, obj);
-				call_func(ist, obj, SYM(DEL_), 0, NULL, NULL);
+				call_func(ist, obj, SYM(FINAL_), 0, NULL, NULL);
 				check_exceptions(ist);
 				mm_write_lock(ist, obj);
 				ist->exception_obj = 0;
@@ -344,7 +344,7 @@
 		int obj_count = 0, obj_del_count = 0;
 #ifdef DEBUG_MEM_MGR
 		time = clock();
-		printf("Memory manager phase: Calling del_ on all remaining objects\n");
+		printf("Memory manager phase: Calling final_ on all remaining objects\n");
 #endif
 		mem_mgr_phase = MM_PHASE_DELETING;
 		pr_lock(&object_list_lock); 
@@ -352,14 +352,14 @@
 		pr_unlock(&object_list_lock); 
 		while(obj) {
 			obj_count++;
-			call_func(ist, obj, SYM(DEL_), 0, NULL, NULL);
+			call_func(ist, obj, SYM(FINAL_), 0, NULL, NULL);
 			check_exceptions(ist);
 			pr_lock(&object_list_lock); 
 			obj = obj->next_obj;
 			pr_unlock(&object_list_lock); 
 		}
 #ifdef DEBUG_MEM_MGR
-		printf("Memory manager: Called del_ on %d objects, elapsed time(secs): %g\n", 
+		printf("Memory manager: Called final_ on %d objects, elapsed time(secs): %g\n", 
 			    obj_count, ((clock()-time)*1.0)/CLOCKS_PER_SEC );
 #endif
 #ifdef DEBUG_THREADS

Modified: trunk/src/symbol.c
===================================================================
--- trunk/src/symbol.c	2004-06-29 20:57:53 UTC (rev 676)
+++ trunk/src/symbol.c	2004-06-29 21:08:56 UTC (rev 677)
@@ -141,7 +141,7 @@
 	{ "setItem_",		0 },
 	{ "delItem_",		0 },
 	{ "objList_",		0 }, // f3
-	{ "del_",			0 },
+	{ "final_",			0 },
 	{ "len_",			0 },
 	{ "max",			0 },
 	{ "min",			0 },
@@ -157,7 +157,10 @@
 	{ "attrs_",         0},
 	{ "protos_",        0},
 	{ "command_",       0},
-	{ "notifyCallback_",0}
+	{ "notifyCallback_",0},
+	{ "get_",           0},
+	{ "set_",           0},
+	{ "del_",           0}
 };
 
 typedef struct trie_node_s* trie_p;