From b973e4a094e56e7acd86dde1bdfd88c37d4b9075 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Sat, 26 Apr 2003 12:06:36 +0000 Subject: [PATCH] fixed a problem in the generator where the way functions are remapped as MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * python/generator.py: fixed a problem in the generator where the way functions are remapped as methods on classes was not symetric and dependant on python internal hash order, as reported by Stéphane Bidoul * libexslt/strings.c: attempt at fixing an object type pbm * libxslt/triodef.h: update for OpenVMS from libxml2 Daniel --- ChangeLog | 9 +++++++++ libexslt/strings.c | 2 +- libxslt/triodef.h | 2 +- python/generator.py | 2 -- python/libxsltclass.txt | 1 + 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1e3be416..33c0a3cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Sat Apr 26 14:00:58 CEST 2003 Daniel Veillard + + * python/generator.py: fixed a problem in the generator where + the way functions are remapped as methods on classes was + not symetric and dependant on python internal hash order, + as reported by Stéphane Bidoul + * libexslt/strings.c: attempt at fixing an object type pbm + * libxslt/triodef.h: update for OpenVMS from libxml2 + Fri Apr 25 15:26:26 CEST 2003 Daniel Veillard * doc/Makefile.am doc/xsltproc.1 doc/xsltproc.xml: automated the diff --git a/libexslt/strings.c b/libexslt/strings.c index 6d7d02b0..e013eebe 100644 --- a/libexslt/strings.c +++ b/libexslt/strings.c @@ -71,7 +71,7 @@ exsltStrTokenizeFunction(xmlXPathParserContextPtr ctxt, int nargs) if (ret != NULL) { /* Tag the subtree for removal once consumed */ ret->boolval = 1; - ret->type = XPATH_NODESET; + ret->type = XPATH_XSLT_TREE; for (cur = str, token = str; *cur != 0; cur++) { for (delimiter = delimiters; *delimiter != 0; delimiter++) { if (*cur == *delimiter) { diff --git a/libxslt/triodef.h b/libxslt/triodef.h index f4a7a02b..0fd32fb7 100644 --- a/libxslt/triodef.h +++ b/libxslt/triodef.h @@ -194,7 +194,7 @@ typedef void * trio_pointer_t; */ # pragma message disable (UNDERFLOW, FLOATOVERFL) -# if (__CRTL_VER > 80000000) +# if (__CRTL_VER < 80000000) /* * Although the compiler supports C99 language constructs, the C * run-time library does not contain all C99 functions. diff --git a/python/generator.py b/python/generator.py index 7f342cdf..ac587a34 100755 --- a/python/generator.py +++ b/python/generator.py @@ -741,8 +741,6 @@ def buildWrappers(): func = nameFixup(name, classe, type, file) info = (2, func, name, ret, args, file) function_classes[classe].append(info) - if found == 1: - break if found == 1: continue if name[0:8] == "xmlXPath": diff --git a/python/libxsltclass.txt b/python/libxsltclass.txt index afb55895..95d9d736 100644 --- a/python/libxsltclass.txt +++ b/python/libxsltclass.txt @@ -207,6 +207,7 @@ Class stylesheet() parseTemplateContent() # functions from module xsltutils + printErrorContext() saveResultToFd() saveResultToFile() saveResultToFilename()