X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=recctrl%2Fregxread.c;h=d24be824a12b2424d7792f3d7589c374086032af;hb=01ddc55fd5a59535e229c09440cfdadccadf3555;hp=fc5f56460d9830e06fc18d22e73eba98469da981;hpb=4c32050b877fd85e68771370d63f9a96dd7aa5a3;p=idzebra-moved-to-github.git

diff --git a/recctrl/regxread.c b/recctrl/regxread.c
index fc5f564..d24be82 100644
--- a/recctrl/regxread.c
+++ b/recctrl/regxread.c
@@ -4,7 +4,17 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: regxread.c,v $
- * Revision 1.29  1999-07-12 07:27:54  adam
+ * Revision 1.32  1999-09-07 07:19:21  adam
+ * Work on character mapping. Implemented replace rules.
+ *
+ * Revision 1.31  1999/07/14 13:05:29  adam
+ * Tcl filter works with objects when TCL is version 8 or later; filter
+ * works with strings otherwise (slow).
+ *
+ * Revision 1.30  1999/07/14 10:55:28  adam
+ * Fixed memory leak.
+ *
+ * Revision 1.29  1999/07/12 07:27:54  adam
  * Improved speed of Tcl processing. Fixed one memory leak.
  *
  * Revision 1.28  1999/07/06 12:26:04  adam
@@ -189,6 +199,10 @@
 
 #if HAVE_TCL_H
 #include <tcl.h>
+
+#if MAJOR_VERSION >= 8
+#define HAVE_TCL_OBJECTS
+#endif
 #endif
 
 #define REGX_DEBUG 0
@@ -207,7 +221,7 @@
 
 struct regxCode {
     char *str;
-#if HAVE_TCL_H
+#if HAVE_TCL_OBJECTS
     Tcl_Obj *tcl_obj;
 #endif
 };
@@ -249,7 +263,6 @@ struct lexContext {
 };
 
 struct lexConcatBuf {
-    int len;
     int max;
     char *buf;
 };
@@ -278,7 +291,7 @@ struct lexSpec {
     int (*f_win_rf)(void *, char *, size_t);
     off_t (*f_win_sf)(void *, off_t);
 
-    struct lexConcatBuf **concatBuf;
+    struct lexConcatBuf *concatBuf;
     int maxLevel;
     data1_node **d1_stack;
     int d1_level;
@@ -356,7 +369,7 @@ static void regxCodeDel (struct regxCode **pp)
     struct regxCode *p = *pp;
     if (p)
     {
-#if HAVE_TCL_H
+#if HAVE_TCL_OBJECTS
 	if (p->tcl_obj)
 	    Tcl_DecrRefCount (p->tcl_obj);
 #endif
@@ -374,7 +387,7 @@ static void regxCodeMk (struct regxCode **pp, const char *buf, int len)
     p->str = (char *) xmalloc (len+1);
     memcpy (p->str, buf, len);
     p->str[len] = '\0';
-#if HAVE_TCL_H
+#if HAVE_TCL_OBJECTS
     p->tcl_obj = Tcl_NewStringObj ((char *) buf, len);
     if (p->tcl_obj)
 	Tcl_IncrRefCount (p->tcl_obj);
@@ -470,14 +483,12 @@ static struct lexSpec *lexSpecCreate (const char *name, data1_handle dh)
     p->f_win_buf = NULL;
 
     p->maxLevel = 128;
-    p->concatBuf = (struct lexConcatBuf **)
+    p->concatBuf = (struct lexConcatBuf *)
 	xmalloc (sizeof(*p->concatBuf) * p->maxLevel);
     for (i = 0; i < p->maxLevel; i++)
     {
-	p->concatBuf[i] = (struct lexConcatBuf *)
-	    xmalloc (sizeof(**p->concatBuf));
-	p->concatBuf[i]->len = p->concatBuf[i]->max = 0;
-	p->concatBuf[i]->buf = 0;
+	p->concatBuf[i].max = 0;
+	p->concatBuf[i].buf = 0;
     }
     p->d1_stack = (data1_node **) xmalloc (sizeof(*p->d1_stack) * p->maxLevel);
     p->d1_level = 0;
@@ -496,7 +507,7 @@ static void lexSpecDestroy (struct lexSpec **pp)
         return ;
 
     for (i = 0; i < p->maxLevel; i++)
-	xfree (p->concatBuf[i]);
+	xfree (p->concatBuf[i].buf);
     xfree (p->concatBuf);
 
     lt = p->context;
@@ -506,7 +517,7 @@ static void lexSpecDestroy (struct lexSpec **pp)
 	lexContextDestroy (lt);
 	lt = lt_next;
     }
-#if HAVE_TCL_H
+#if HAVE_TCL_OBJECTS
     if (p->tcl_interp)
 	Tcl_DeleteInterp (p->tcl_interp);
 #endif
@@ -868,21 +879,20 @@ static void execData (struct lexSpec *spec,
 	    parent->child = res;
 	spec->d1_stack[spec->d1_level] = res;
     }
-    if (org_len + elen >= spec->concatBuf[spec->d1_level]->max)
+    if (org_len + elen >= spec->concatBuf[spec->d1_level].max)
     {
 	char *old_buf, *new_buf;
 
-	spec->concatBuf[spec->d1_level]->max = org_len + elen + 256;
-	new_buf = (char *) xmalloc (spec->concatBuf[spec->d1_level]->max);
-	if ((old_buf = spec->concatBuf[spec->d1_level]->buf))
+	spec->concatBuf[spec->d1_level].max = org_len + elen + 256;
+	new_buf = (char *) xmalloc (spec->concatBuf[spec->d1_level].max);
+	if ((old_buf = spec->concatBuf[spec->d1_level].buf))
 	{
 	    memcpy (new_buf, old_buf, org_len);
 	    xfree (old_buf);
 	}
-	spec->concatBuf[spec->d1_level]->buf = new_buf;
+	spec->concatBuf[spec->d1_level].buf = new_buf;
     }
-    assert (spec->concatBuf[spec->d1_level]);
-    memcpy (spec->concatBuf[spec->d1_level]->buf + org_len, ebuf, elen);
+    memcpy (spec->concatBuf[spec->d1_level].buf + org_len, ebuf, elen);
     res->u.data.len += elen;
 }
 
@@ -906,7 +916,7 @@ static void tagDataRelease (struct lexSpec *spec)
 	    res->u.data.data = (char *) nmem_malloc (spec->m, res->u.data.len);
 	else
 	    res->u.data.data = res->lbuf;
-	memcpy (res->u.data.data, spec->concatBuf[spec->d1_level]->buf,
+	memcpy (res->u.data.data, spec->concatBuf[spec->d1_level].buf,
 		res->u.data.len);
     }
 }
@@ -1019,9 +1029,9 @@ static void tagStrip (const char **tag, int *len)
 static void tagBegin (struct lexSpec *spec, 
                       const char *tag, int len)
 {
-    struct data1_node *parent = spec->d1_stack[spec->d1_level -1];
+    struct data1_node *parent;
     data1_element *elem = NULL;
-    data1_node *partag = get_parent_tag(spec->dh, parent);
+    data1_node *partag;
     data1_node *res;
     data1_element *e = NULL;
     int localtag = 0;
@@ -1032,6 +1042,9 @@ static void tagBegin (struct lexSpec *spec,
         return ;
     }
     tagStrip (&tag, &len);
+
+    parent = spec->d1_stack[spec->d1_level -1];
+    partag = get_parent_tag(spec->dh, parent);
    
     res = data1_mk_node (spec->dh, spec->m);
     res->parent = parent;
@@ -1442,10 +1455,11 @@ static void execTcl (struct lexSpec *spec, struct regxCode *code)
 	    var_buf[var_len] = ch;
 	}
     }
-    if (code->tcl_obj)
-	ret = Tcl_GlobalEvalObj(spec->tcl_interp, code->tcl_obj);
-    else
-	ret = Tcl_GlobalEval (spec->tcl_interp, code->str);
+#if HAVE_TCL_OBJECTS
+    ret = Tcl_GlobalEvalObj(spec->tcl_interp, code->tcl_obj);
+#else
+    ret = Tcl_GlobalEval (spec->tcl_interp, code->str);
+#endif
     if (ret != TCL_OK)
     {
     	const char *err = Tcl_GetVar(spec->tcl_interp, "errorInfo", 0);