ruby_rnv 0.2.4 → 0.4.2

data/ext/rnv/src/rn.h

@@ -142,7 +142,7 @@ extern void rn_add_psval(rnv_t *rnv, rn_st_t *rn_st, char *s);
 extern void rn_end_ps(rnv_t *rnv, rn_st_t *rn_st);
 
 extern void rn_init(rnv_t *rnv, rn_st_t *rn_st);
-extern void rn_clear(rnv_t *rnv, rn_st_t *rn_st);
+extern void rn_dispose(rn_st_t *rn_st);
 
 extern void rn_compress(rnv_t *rnv, rn_st_t *rn_st, int *starts,int n);
 extern int rn_compress_last(rnv_t *rnv, rn_st_t *rn_st, int start);

data/ext/rnv/src/rnc.c

@@ -1,7 +1,4 @@
-#include "type.h"
-
 /* $Id: rnc.c,v 1.74 2004/08/18 19:10:51 dvd Exp $ */
-
 #include <fcntl.h> /* open, close */
 #include <sys/types.h>
 #include <unistd.h> /* open,read,close */
@@ -9,6 +6,8 @@
 #include <errno.h> /*errno*/
 #include <assert.h> /*assert*/
 
+#include "type.h"
+
 #include "u.h"
 #include "xmlc.h"
 #include "m.h"
@@ -75,9 +74,9 @@ static char *kwdtab[NKWD]={
 #define SYM_DOCUMENTATION 41 /* ## */
 #define SYM_LITERAL 42
 
-#define err(msg) (*rnv->verror_handler)(rnv,erno|ERBIT_RNC,"%s:%i:%i: error: "msg"\n",ap)
-#define warn(msg) (*rnv->verror_handler)(rnv,erno|ERBIT_RNC,"%s:%i:%i: warning: "msg"\n",ap)
-void rnc_default_verror_handler(rnv_t *rnv, int erno,va_list ap) {
+#define err(msg) (*handler)(data,erno|ERBIT_RNC,"%s:%i:%i: error: "msg"\n",ap)
+#define warn(msg) (*handler)(data,erno|ERBIT_RNC,"%s:%i:%i: warning: "msg"\n",ap)
+void rnc_default_verror_handler(void *data, int erno, int (*handler)(void *data, int erno,char *format, va_list ap), va_list ap) {
   switch(erno) {
   case RNC_ER_IO: err("I/O error: %s\n"); break;
   case RNC_ER_UTF: err("invalid UTF-8 sequence"); break;
@@ -171,6 +170,9 @@ static void rnc_source_init(struct rnc_source *sp,char *fn) {
   sp->cur=0;
   for(i=0;i!=2;++i)  sp->sym[i].s=(char*)m_alloc(
     sp->sym[i].slen=BUFSIZE,sizeof(char));
+
+  if(!sp->verror_handler)
+    sp->verror_handler= &verror_default_handler;
 }
 
 static int rnc_read(struct rnc_source *sp) {
@@ -201,20 +203,29 @@ int rnc_errors(struct rnc_source *sp) {
 #define DE_CHOICE 8
 #define DE_ILEAVE 16
 
-void rnc_init(rnv_t *rnv, rnc_st_t *rnc_st, rn_st_t *rn_st) {
-    memset(rnc_st, 0, sizeof(rnc_st_t));
-    rnv->rnc_verror_handler=&rnc_default_verror_handler;
-    rn_init(rnv, rn_st);
+void rnc_init(rnc_st_t *rnc_st) {
+    rnc_st->verror_handler = &verror_default_handler;
     rnc_st->len_p=LEN_P; rnc_st->path=(char*)m_alloc(rnc_st->len_p,sizeof(char));
     /* initialize scopes */
     sc_init(&rnc_st->nss); sc_init(&rnc_st->dts); sc_init(&rnc_st->defs); sc_init(&rnc_st->refs); sc_init(&rnc_st->prefs);
 }
 
-void rnc_clear(void) {}
+void rnc_dispose(rnc_st_t *rnc_st) {
+  if (rnc_st->path)
+    m_free(rnc_st->path);
+
+  sc_dispose(&rnc_st->nss);
+  sc_dispose(&rnc_st->dts);
+  sc_dispose(&rnc_st->defs);
+  sc_dispose(&rnc_st->refs);
+  sc_dispose(&rnc_st->prefs);
+
+  m_free(rnc_st);
+}
 
 static void error(int force,struct rnc_source *sp,int erno,...) {
   if(force || sp->line != sp->prevline) {
-    va_list ap; va_start(ap,erno); sp->rnv->rnc_verror_handler(sp->rnv, erno,ap); va_end(ap);
+    va_list ap; va_start(ap,erno); rnc_default_verror_handler(sp->user_data, erno, sp->verror_handler, ap); va_end(ap);
     sp->prevline=sp->line;
   }
   sp->flags|=SRC_ERRORS;
@@ -222,7 +233,7 @@ static void error(int force,struct rnc_source *sp,int erno,...) {
 
 static void warning(int force,struct rnc_source *sp,int erno,...) {
   if(force || sp->line != sp->prevline) {
-    va_list ap; va_start(ap,erno); sp->rnv->rnc_verror_handler(sp->rnv, erno,ap); va_end(ap);
+    va_list ap; va_start(ap,erno); rnc_default_verror_handler(sp->user_data, erno,sp->verror_handler, ap); va_end(ap);
   }
 }
 
@@ -902,7 +913,8 @@ static void add_well_known_nss(rnv_t *rnv, rnc_st_t *rnc_st, rn_st_t *rn_st, int
 static int file(rnv_t *rnv, rnc_st_t *rnc_st, rn_st_t *rn_st, struct rnc_source *sp,int nsuri) {
   int ret=0;
   struct rnc_source src;
-  src.rnv = rnv;
+  src.verror_handler = rnv->verror_handler;
+  src.user_data = rnv->user_data;
   add_well_known_nss(rnv, rnc_st, rn_st, nsuri);
   if(rnc_open(&src,rnc_st->path)!=-1) {
     ret=topLevel(rnv, rnc_st, rn_st, &src);
@@ -1107,6 +1119,7 @@ static void include(rnv_t *rnv, rnc_st_t *rnc_st, rn_st_t *rn_st, struct rnc_sou
     nsuri=inherit(rnv, rnc_st, rn_st, sp);
     sc_open(&rnc_st->nss); open_scope(rnc_st, sp);
     if(file(rnv, rnc_st, rn_st, sp,nsuri)!=-1) error(1,sp,RNC_ER_NOTGR,sp->fn,CUR(sp).line,CUR(sp).col);
+    sc_close(&rnc_st->nss);
     sc_lock(&rnc_st->defs);
     if(CUR(sp).sym==SYM_LCUR) {
       getsym(sp);
@@ -1114,7 +1127,6 @@ static void include(rnv_t *rnv, rnc_st_t *rnc_st, rn_st_t *rn_st, struct rnc_sou
       chk_skip_get(sp,SYM_RCUR);
     }
     fold_scope(rnv, rnc_st, rn_st, sp);
-    sc_close(&rnc_st->nss);
   }
 }
 
@@ -1154,7 +1166,7 @@ static int topLevel(rnv_t *rnv, rnc_st_t *rnc_st, rn_st_t *rn_st, struct rnc_sou
   getsym(sp); getsym(sp);
   while(decl(rnv, rn_st, rnc_st, sp));
   if((is_grammar=(CUR(sp).sym==SYM_GRAMMAR))) {
-    chk_get(sp,SYM_LCUR);
+    getsym(sp);chk_get(sp,SYM_LCUR);
   }
   if(grammarContent(rnv, rn_st, rnc_st, sp)) {
     while(grammarContent(rnv, rn_st, rnc_st, sp));

data/ext/rnv/src/rnc.h

@@ -31,30 +31,10 @@
 #define RNC_ER_NOSTART 70
 #define RNC_ER_UNDEF 71
 
-struct rnc_cym {
-  char *s; int slen;
-  int line,col;
-  int sym;
-};
+extern void rnc_default_verror_handler(void *data, int erno, int (*handler)(void *data, int erno,char *format, va_list ap), va_list ap);
 
-struct rnc_source {
-  int flags;
-  char *fn; int fd;
-  char *buf; int i,n;
-  int complete;
-  int line,col,prevline/*when error reported*/;
-  int u,v,w; int nx;
-  int cur;
-  struct rnc_cym sym[2];
-
-  // FIXME: for error handlers
-  rnv_t *rnv;
-};
-
-extern void rnc_default_verror_handler(rnv_t *rnv, int erno,va_list ap);
-
-extern void rnc_init(rnv_t *rnv, rnc_st_t *rnc_st, rn_st_t *rn_st);
-extern void rnc_clear(void);
+extern void rnc_init(rnc_st_t *rnc_st);
+extern void rnc_dispose(rnc_st_t *rnc_st);
 
 extern int rnc_open(struct rnc_source *sp,char *fn);
 extern int rnc_stropen(struct rnc_source *sp,char *fn,char *s,int len);

data/ext/rnv/src/rnd.c

@@ -1,10 +1,10 @@
-#include "type.h"
-
 /* $Id: rnd.c,v 1.33 2004/02/25 00:00:32 dvd Exp $ */
-
 #include <stdlib.h>
 #include <assert.h>
 #include <string.h>
+
+#include "type.h"
+
 #include "m.h"
 #include "rn.h"
 #include "rnx.h"
@@ -15,8 +15,8 @@
 
 #define LEN_F RND_LEN_F
 
-#define err(msg) (*rnv->verror_handler)(rnv,erno|ERBIT_RND,"error: "msg"\n",ap)
-void rnd_default_verror_handler(rnv_t *rnv, int erno,va_list ap) {
+#define err(msg) (*handler)(data,erno|ERBIT_RND,"error: "msg"\n",ap)
+void rnd_default_verror_handler(void *data, int erno, int (*handler)(void *data, int erno,char *format, va_list ap), va_list ap) {
   switch(erno) {
   case RND_ER_LOOPST: err("loop in start pattern"); break;
   case RND_ER_LOOPEL: err("loop in pattern for element '%s'"); break;
@@ -30,17 +30,21 @@ void rnd_default_verror_handler(rnv_t *rnv, int erno,va_list ap) {
   }
 }
 
-void rnd_init(rnv_t *rnv, rnd_st_t *rnd_st, rn_st_t *rn_st) {
-    memset(rnd_st, 0, sizeof(rnd_st_t));
-    rnv->rnd_verror_handler=&rnd_default_verror_handler;
-    rn_init(rnv, rn_st);
+void rnd_init(rnd_st_t *rnd_st) {
+    rnd_st->verror_handler = &verror_default_handler;
+}
+
+void rnd_dispose(rnd_st_t *rnd_st) {
+  if (rnd_st->flat)
+    m_free(rnd_st->flat);
+  m_free(rnd_st);
 }
 
 void rnd_clear(void) {}
 
-static void error_handler(rnv_t *rnv, rnd_st_t *rnd_st, int er_no,...) {
-  va_list ap; va_start(ap,er_no); 
-  rnv->rnd_verror_handler(rnv, er_no,ap); 
+static void error_handler(rnd_st_t *rnd_st, int erno,...) {
+  va_list ap; va_start(ap,erno); 
+  rnd_default_verror_handler(rnd_st->user_data, erno, rnd_st->verror_handler, ap); 
   va_end(ap);
   ++rnd_st->errors;
 }
@@ -141,9 +145,9 @@ static void loops(rnv_t *rnv, rnd_st_t *rnd_st) {
   int i=0,p=rnd_st->flat[i],nc=-1,p1;
   for(;;) {
     if(loop(rnv, p)) {
-      if(i==0) error_handler(rnv, rnd_st, RND_ER_LOOPST); else {
+      if(i==0) error_handler(rnd_st, RND_ER_LOOPST); else {
 	char *s=rnx_nc2str(rnv, nc);
-	error_handler(rnv, rnd_st,RND_ER_LOOPEL, s);
+	error_handler(rnd_st,RND_ER_LOOPEL, s);
 	m_free(s);
       }
     }
@@ -195,7 +199,7 @@ static void ctypes(rnv_t *rnv, rnd_st_t *rnd_st) {
       ctype(rnv, p1);
       if(!rn_contentType(rnv, p1)) {
 	char *s=rnx_nc2str(rnv, nc);
-	error_handler(rnv,rnd_st,RND_ER_CTYPE, s);
+	error_handler(rnd_st,RND_ER_CTYPE, s);
 	m_free(s);
       }
     }
@@ -328,18 +332,18 @@ static void path(rnv_t *rnv, rnd_st_t *rnd_st, int p,int nc) {
   case RN_P_INTERLEAVE: rn_Interleave(p,p1,p2); goto BINARY;
   case RN_P_GROUP: rn_Group(p,p1,p2); goto BINARY;
   case RN_P_DATA_EXCEPT: rn_DataExcept(p,p1,p2);
-    if(bad_data_except(rnv, p2)) {char *s=rnx_nc2str(rnv, nc); error_handler(rnv,rnd_st,RND_ER_BADEXPT, s); m_free(s);}
+    if(bad_data_except(rnv, p2)) {char *s=rnx_nc2str(rnv, nc); error_handler(rnd_st,RND_ER_BADEXPT, s); m_free(s);}
     goto BINARY;
   BINARY: path(rnv, rnd_st, p1,nc); path(rnv, rnd_st, p2,nc); break;
 
   case RN_P_ONE_OR_MORE: rn_OneOrMore(p,p1);
-    if(bad_one_or_more(rnv, p1,0)) {char *s=rnx_nc2str(rnv, nc); error_handler(rnv,rnd_st,RND_ER_BADMORE, s); m_free(s);}
+    if(bad_one_or_more(rnv, p1,0)) {char *s=rnx_nc2str(rnv, nc); error_handler(rnd_st,RND_ER_BADMORE, s); m_free(s);}
     goto UNARY;
   case RN_P_LIST: rn_List(p,p1);
-    if(bad_list(rnv, p1)) {char *s=rnx_nc2str(rnv, nc); error_handler(rnv,rnd_st,RND_ER_BADLIST, s); m_free(s);}
+    if(bad_list(rnv, p1)) {char *s=rnx_nc2str(rnv, nc); error_handler(rnd_st,RND_ER_BADLIST, s); m_free(s);}
     goto UNARY;
   case RN_P_ATTRIBUTE: rn_Attribute(p,nc1,p1);
-    if(bad_attribute(rnv, p1)) {char *s=rnx_nc2str(rnv, nc),*s1=rnx_nc2str(rnv, nc1); error_handler(rnv,rnd_st,RND_ER_BADATTR, s1,s); m_free(s1); m_free(s);}
+    if(bad_attribute(rnv, p1)) {char *s=rnx_nc2str(rnv, nc),*s1=rnx_nc2str(rnv, nc1); error_handler(rnd_st,RND_ER_BADATTR, s1,s); m_free(s1); m_free(s);}
     goto UNARY;
   UNARY: path(rnv, rnd_st, p1,nc); break;
 
@@ -349,7 +353,7 @@ static void path(rnv_t *rnv, rnd_st_t *rnd_st, int p,int nc) {
 
 static void paths(rnv_t *rnv, rnd_st_t *rnd_st) {
   int i,p,p1,nc;
-  if(bad_start(rnv, rnd_st->flat[0])) error_handler(rnv,rnd_st, RND_ER_BADSTART);
+  if(bad_start(rnv, rnd_st->flat[0])) error_handler(rnd_st, RND_ER_BADSTART);
   for(i=0;i!=rnd_st->n_f;++i) {
     p=rnd_st->flat[i];
     if(RN_P_IS(p,RN_P_ELEMENT)) {

data/ext/rnv/src/rnd.h

@@ -15,10 +15,11 @@
 #define RND_ER_BADLIST 6
 #define RND_ER_BADATTR 7
 
-extern void rnd_default_verror_handler(rnv_t *rnv, int erno,va_list ap);
+extern void rnd_default_verror_handler(void *data, int erno, int (*handler)(void *data, int erno,char *format, va_list ap), va_list ap);
 
-extern void rnd_init(rnv_t *rnv, rnd_st_t *rnd_st, rn_st_t *rn_st);
+extern void rnd_init(rnd_st_t *rnd_st);
 extern void rnd_clear(void);
+extern void rnd_dispose(rnd_st_t *rnd_st);
 
 extern int rnd_fixup(rnv_t *rnv, rnd_st_t *rnd_st, rn_st_t *rn_st, int start);
 

data/ext/rnv/src/rnl.c

@@ -1,35 +1,36 @@
-#include "type.h"
-
 /* $Id: rnl.c,v 1.2 2004/01/15 23:47:45 dvd Exp $ */
-
 #include <stdarg.h>
+
+#include "type.h"
+
 #include "erbit.h"
 #include "rn.h"
 #include "rnc.h"
 #include "rnd.h"
 #include "rnl.h"
 
-void rnl_default_verror_handler(rnv_t *rnv, int erno,va_list ap) {
+void rnl_default_verror_handler(void *data, int erno, int (*handler)(void *data, int erno,char *format, va_list ap), va_list ap) {
   if(erno&ERBIT_RNC) {
-    rnc_default_verror_handler(rnv, erno&~ERBIT_RNC,ap);
+    rnc_default_verror_handler(data, erno&~ERBIT_RNC,handler, ap);
   } else if(erno&ERBIT_RND) {
-    rnd_default_verror_handler(rnv, erno&~ERBIT_RND,ap);
+    rnd_default_verror_handler(data, erno&~ERBIT_RND,handler, ap);
   }
 }
 
-static void verror_handler_rnc(rnv_t *rnv, int erno,va_list ap) {rnl_default_verror_handler(rnv, erno|ERBIT_RNC,ap);}
-static void verror_handler_rnd(rnv_t *rnv, int erno,va_list ap) {rnl_default_verror_handler(rnv, erno|ERBIT_RND,ap);}
-
-void rnl_init(rnv_t *rnv, rn_st_t *rn_st, rnc_st_t *rnc_st, rnd_st_t *rnd_st) {
-    rnv->rnl_verror_handler=&rnl_default_verror_handler;
+void rnl_init(rnv_t *rnv, rnc_st_t *rnc_st, rn_st_t *rn_st, rnd_st_t *rnd_st) {
     rn_init(rnv, rn_st);
-    rnc_init(rnv, rnc_st, rn_st);
-    rnv->rnc_verror_handler=&verror_handler_rnc;
-    rnd_init(rnv, rnd_st, rn_st); 
-    rnv->rnd_verror_handler=&verror_handler_rnd;
-}
+    rnc_init(rnc_st);
+
+    if(rnv->verror_handler)
+      rnc_st->verror_handler = rnv->verror_handler;
+    rnc_st->user_data = rnv->user_data;
 
-void rnl_clear(void) {}
+    rnd_init(rnd_st); 
+
+    if(rnv->verror_handler)
+      rnd_st->verror_handler = rnv->verror_handler;
+    rnd_st->user_data = rnv->user_data;
+}
 
 static int load(rnv_t *rnv, rnc_st_t *rnc_st, rn_st_t *rn_st, rnd_st_t *rnd_st, struct rnc_source *sp) {
   int start=-1;
@@ -42,21 +43,24 @@ static int load(rnv_t *rnv, rnc_st_t *rnc_st, rn_st_t *rn_st, rnd_st_t *rnd_st,
 
 int rnl_fn(rnv_t *rnv, rnc_st_t *rnc_st, rn_st_t *rn_st, rnd_st_t *rnd_st, char *fn) {
   struct rnc_source src;
-  src.rnv = rnv;
+  src.verror_handler = rnv->verror_handler;
+  src.user_data = rnv->user_data;
   rnc_open(&src,fn); 
   return load(rnv, rnc_st, rn_st, rnd_st, &src);
 }
 
 int rnl_fd(rnv_t *rnv, rnc_st_t *rnc_st, rn_st_t *rn_st, rnd_st_t *rnd_st, char *fn,int fd) {
   struct rnc_source src;
-  src.rnv = rnv;
+  src.verror_handler = rnv->verror_handler;
+  src.user_data = rnv->user_data;
   rnc_bind(&src,fn,fd); 
   return load(rnv, rnc_st, rn_st, rnd_st, &src);
 }
 
 int rnl_s(rnv_t *rnv, rnc_st_t *rnc_st, rn_st_t *rn_st, rnd_st_t *rnd_st, char *fn,char *s,int len) {
   struct rnc_source src;
-  src.rnv = rnv;
+  src.verror_handler = rnv->verror_handler;
+  src.user_data = rnv->user_data;
   rnc_stropen(&src,fn,s,len); 
   return load(rnv, rnc_st, rn_st, rnd_st, &src);
 }

data/ext/rnv/src/rnl.h

@@ -6,10 +6,9 @@
 #include <stdarg.h>
 #include "type.h"
 
-extern void rnl_default_verror_handler(rnv_t *rnv, int erno,va_list ap);
+extern void rnl_default_verror_handler(void *data, int erno, int (*handler)(void *data, int erno,char *format, va_list ap), va_list ap);
 
-extern void rnl_init(rnv_t *rnv, rn_st_t *rn_st, rnc_st_t *rnc_st, rnd_st_t *rnd_st);
-extern void rnl_clear(void);
+extern void rnl_init(rnv_t *rnv, rnc_st_t *rnc_st, rn_st_t *rn_st, rnd_st_t *rnd_st);
 
 extern int rnl_fn(rnv_t *rnv, rnc_st_t *rnc_st, rn_st_t *rn_st, rnd_st_t *rnd_st, char *fn);
 extern int rnl_fd(rnv_t *rnv, rnc_st_t *rnc_st, rn_st_t *rn_st, rnd_st_t *rnd_st, char *fn,int fd);

data/ext/rnv/src/rnv.c

@@ -1,9 +1,9 @@
-#include "type.h"
-
 /* $Id: rnv.c,v 1.69 2004/01/28 23:21:24 dvd Exp $ */
-
 #include <string.h> /*strncpy,strrchr*/
 #include <assert.h>
+
+#include "type.h"
+
 #include "m.h"
 #include "xmlc.h" /*xmlc_white_space*/
 #include "erbit.h"
@@ -11,10 +11,10 @@
 #include "er.h"
 #include "rnv.h"
 
-#define err(msg) (*rnv->verror_handler)(rnv,erno|ERBIT_RNV,msg"\n",ap);
-void rnv_default_verror_handler(rnv_t *rnv, int erno,va_list ap) {
+#define err(msg) (*handler)(data,erno|ERBIT_RNV,msg"\n",ap);
+void rnv_default_verror_handler(void *data, int erno, int (*handler)(void *data, int erno,char *format, va_list ap), va_list ap) {
   if(erno&ERBIT_DRV) {
-    drv_default_verror_handler(rnv, erno&~ERBIT_DRV,ap);
+    drv_default_verror_handler(data, erno&~ERBIT_DRV, handler, ap);
   } else {
     switch(erno) {
     case RNV_ER_ELEM: err("element %s^%s not allowed"); break;
@@ -31,24 +31,26 @@ void rnv_default_verror_handler(rnv_t *rnv, int erno,va_list ap) {
 }
 
 static void error_handler(rnv_t *rnv, int erno,...) {
-  va_list ap; va_start(ap,erno); (*rnv->rnv_verror_handler)(rnv,erno,ap); va_end(ap);
+  va_list ap; va_start(ap,erno); rnv_default_verror_handler(rnv->user_data,erno,rnv->verror_handler,ap); va_end(ap);
 }
 
-static void verror_handler_drv(rnv_t *rnv, int erno,va_list ap) {rnv_default_verror_handler(rnv,erno|ERBIT_DRV,ap);}
-
-static void windup(void);
 void rnv_init(rnv_t *rnv, drv_st_t *drv_st, rn_st_t *rn_st, rx_st_t *rx_st) {
-    rnv->rnv_verror_handler=&rnv_default_verror_handler;
+    if(!rnv->verror_handler)
+      rnv->verror_handler = &verror_default_handler;
     drv_init(rnv, drv_st, rn_st, rx_st);
-    rnv->drv_verror_handler=&verror_handler_drv;
-    windup();
-}
-
-void rnv_clear(void) {
-  windup();
 }
 
-static void windup(void) {
+void rnv_dispose(rnv_t *rnv) {
+  if (rnv->rn_pattern)
+    m_free(rnv->rn_pattern);
+  if (rnv->rn_nameclass)
+    m_free(rnv->rn_nameclass);
+  if (rnv->rn_string)
+    m_free(rnv->rn_string);
+  if (rnv->rnx_exp)
+    m_free(rnv->rnx_exp);
+
+  m_free(rnv);
 }
 
 static char *qname_open(char **surip,char **snamep,char *name) {

data/ext/rnv/src/rnv.h

@@ -15,10 +15,10 @@
 #define RNV_ER_TEXT 6
 #define RNV_ER_NOTX 7
 
-extern void rnv_default_verror_handler(rnv_t *rnv, int erno,va_list ap);
+extern void rnv_default_verror_handler(void *data, int erno, int (*handler)(void *data, int erno,char *format, va_list ap), va_list ap);
 
 extern void rnv_init(rnv_t *rnv, drv_st_t *drv_st, rn_st_t *rn_st, rx_st_t *rx_st);
-extern void rnv_clear(void);
+extern void rnv_dispose(rnv_t *rnv);
 
 extern int rnv_text(rnv_t *rnv, drv_st_t *drv_st, rn_st_t *rn_st, rx_st_t *rx_st, int *curp,int *prevp,char *text,int n_t,int mixed);
 extern int rnv_start_tag(rnv_t *rnv, drv_st_t *drv_st, rn_st_t *rn_st, rx_st_t *rx_st, int *curp,int *prevp,char *name,char **attrs);