From dfc1e83f7ce2fba63aa5d15b3b9c5ac7a8cc8b1e Mon Sep 17 00:00:00 2001
From: hyung-hwan <hyunghwan.chung@gmail.com>
Date: Thu, 25 Sep 2008 02:06:56 +0000
Subject: [PATCH] added missing basic functions to ase_str_t

---
 ase/include/ase/cmn/str.h | 15 ++++++++++++++-
 ase/lib/awk/awk.c         | 14 +++++++-------
 ase/lib/cmn/str_dyn.c     | 17 ++++++++++++++++-
 3 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/ase/include/ase/cmn/str.h b/ase/include/ase/cmn/str.h
index 5d21b95b..49f7c6dd 100644
--- a/ase/include/ase/cmn/str.h
+++ b/ase/include/ase/cmn/str.h
@@ -1,5 +1,5 @@
 /*
- * $Id: str.h 376 2008-09-24 07:18:50Z baconevi $
+ * $Id: str.h 379 2008-09-24 08:06:56Z baconevi $
  *
  * {License}
  */
@@ -219,6 +219,19 @@ int ase_str_yield (
 	int new_capa    /* new capacity in number of characters */
 );
 
+void* ase_str_getextension (
+	ase_str_t* str
+);
+
+ase_mmgr_t* ase_str_getmmgr (
+	ase_str_t* str
+);
+
+void ase_str_setmmgr (
+	ase_str_t* str,
+	ase_mmgr_t* mmgr
+);
+
 /*
  * NAME: get the sizer
  *
diff --git a/ase/lib/awk/awk.c b/ase/lib/awk/awk.c
index 67c93ebc..8459522b 100644
--- a/ase/lib/awk/awk.c
+++ b/ase/lib/awk/awk.c
@@ -1,5 +1,5 @@
 /*
- * $Id: awk.c 363 2008-09-04 10:58:08Z baconevi $ 
+ * $Id: awk.c 379 2008-09-24 08:06:56Z baconevi $ 
  *
  * {License}
  */
@@ -67,7 +67,7 @@ ase_awk_t* ase_awk_open (ase_mmgr_t* mmgr, ase_size_t ext)
 		return ASE_NULL;	
 	}
 
-	awk->wtab = ase_map_open (mmgr, sizeof(awk), 512, 70);
+	awk->wtab = ase_map_open (mmgr, ASE_SIZEOF(awk), 512, 70);
 	if (awk->wtab == ASE_NULL)
 	{
 		ase_str_close (&awk->token.name);
@@ -78,7 +78,7 @@ ase_awk_t* ase_awk_open (ase_mmgr_t* mmgr, ase_size_t ext)
 	ase_map_setcopier (awk->wtab, ASE_MAP_KEY, ASE_MAP_COPIER_INLINE);
 	ase_map_setcopier (awk->wtab, ASE_MAP_VAL, ASE_MAP_COPIER_INLINE);
 
-	awk->rwtab = ase_map_open (mmgr, sizeof(awk), 512, 70);
+	awk->rwtab = ase_map_open (mmgr, ASE_SIZEOF(awk), 512, 70);
 	if (awk->rwtab == ASE_NULL)
 	{
 		ase_map_close (awk->wtab);
@@ -92,7 +92,7 @@ ase_awk_t* ase_awk_open (ase_mmgr_t* mmgr, ase_size_t ext)
 
 	/* TODO: initial map size?? */
 	/*awk->tree.afns = ase_map_open (awk, 512, 70, free_afn, ASE_NULL, mmgr);*/
-	awk->tree.afns = ase_map_open (mmgr, sizeof(awk), 512, 70);
+	awk->tree.afns = ase_map_open (mmgr, ASE_SIZEOF(awk), 512, 70);
 	if (awk->tree.afns == ASE_NULL) 
 	{
 		ase_map_close (awk->rwtab);
@@ -105,7 +105,7 @@ ase_awk_t* ase_awk_open (ase_mmgr_t* mmgr, ase_size_t ext)
 	ase_map_setfreeer (awk->tree.afns, ASE_MAP_VAL, free_afn);
 
 	/*awk->parse.afns = ase_map_open (awk, 256, 70, ASE_NULL, ASE_NULL, mmgr);*/
-	awk->parse.afns = ase_map_open (mmgr, sizeof(awk), 256, 70);
+	awk->parse.afns = ase_map_open (mmgr, ASE_SIZEOF(awk), 256, 70);
 	if (awk->parse.afns == ASE_NULL)
 	{
 		ase_map_close (awk->tree.afns);
@@ -118,7 +118,7 @@ ase_awk_t* ase_awk_open (ase_mmgr_t* mmgr, ase_size_t ext)
 	*(ase_awk_t**)ase_map_getextension(awk->parse.afns) = awk;
 
 	/*awk->parse.named = ase_map_open (awk, 256, 70, ASE_NULL, ASE_NULL, mmgr);*/
-	awk->parse.named = ase_map_open (mmgr, sizeof(awk), 256, 70);
+	awk->parse.named = ase_map_open (mmgr, ASE_SIZEOF(awk), 256, 70);
 	if (awk->parse.named == ASE_NULL)
 	{
 		ase_map_close (awk->parse.afns);
@@ -204,7 +204,7 @@ ase_awk_t* ase_awk_open (ase_mmgr_t* mmgr, ase_size_t ext)
 	awk->bfn.sys = ASE_NULL;
 	/*awk->bfn.user = ASE_NULL;*/
 	/*awk->bfn.user = ase_map_open (awk, 512, 70, free_bfn, ASE_NULL, mmgr);*/
-	awk->bfn.user = ase_map_open (mmgr, sizeof(awk), 512, 70);
+	awk->bfn.user = ase_map_open (mmgr, ASE_SIZEOF(awk), 512, 70);
 	if (awk->bfn.user == ASE_NULL)
 	{
 		ase_awk_tab_close (&awk->parse.params);
diff --git a/ase/lib/cmn/str_dyn.c b/ase/lib/cmn/str_dyn.c
index 3c55664d..81f06439 100644
--- a/ase/lib/cmn/str_dyn.c
+++ b/ase/lib/cmn/str_dyn.c
@@ -1,5 +1,5 @@
 /*
- * $Id: str_dyn.c 376 2008-09-24 07:18:50Z baconevi $
+ * $Id: str_dyn.c 379 2008-09-24 08:06:56Z baconevi $
  *
  * {License}
  */
@@ -92,6 +92,21 @@ int ase_str_yield (ase_str_t* str, ase_xstr_t* buf, int new_capa)
 	return 0;
 }
 
+void* ase_str_getextension (ase_str_t* str)
+{
+	return str + 1;
+}
+
+ase_mmgr_t* ase_str_getmmgr (ase_str_t* str)
+{
+	return str->mmgr;
+}
+
+void ase_str_setmmgr (ase_str_t* str, ase_mmgr_t* mmgr)
+{
+	str->mmgr = mmgr;
+}
+
 ase_str_sizer_t ase_str_getsizer (ase_str_t* str)
 {
 	return str->sizer;