diff --git a/ChangeLog b/ChangeLog index cbcd66a4..750b1033 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Dec 12 10:59:11 CET 2002 Daniel Veillard + + * doc/apibuild.py doc/libxml2-api.xml: fixups to the api builder, + gives enum values, fix functype return type + Thu Dec 12 01:09:34 CET 2002 Daniel Veillard * HTMLtree.c include/libxml/HTMLtree.h: patch from Mark Vadok diff --git a/doc/apibuild.py b/doc/apibuild.py index 3c482460..3e94e931 100755 --- a/doc/apibuild.py +++ b/doc/apibuild.py @@ -745,6 +745,7 @@ class CParser: name = token[1] signature = self.signature if signature != None: + type = string.split(type, '(')[0] d = self.mergeFunctionComment(name, ((type, None), signature), 1) self.index.add(name, self.filename, not self.is_header, @@ -853,7 +854,7 @@ class CParser: name = None self.comment = None comment = "" - value = "" + value = "0" while token != None: if token[0] == "sep" and token[1] == "{": token = self.token() @@ -874,9 +875,9 @@ class CParser: self.enums.append((name, value, comment)) name = token[1] comment = "" - value = "" token = self.token() if token[0] == "op" and token[1][0] == "=": + value = "" if len(token[1]) > 1: value = token[1][1:] token = self.token() @@ -884,6 +885,12 @@ class CParser: token[1] != '}'): value = value + token[1] token = self.token() + else: + try: + value = "%d" % (int(value) + 1) + except: + print "Failed to compute value of enum %s" % (name) + value="" if token[0] == "sep" and token[1] == ",": token = self.token() else: diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml index 2e415af8..9cefcb1f 100644 --- a/doc/libxml2-api.xml +++ b/doc/libxml2-api.xml @@ -468,6 +468,7 @@ + @@ -2148,42 +2149,42 @@ Check if the current value on the XPath stack is a node set or an XSLT value tree. Returns true if the current object on the stack is a node-set. - + - - - + + + - - - + + + - + - - - - - - - - - - + + + + + + + + + + - - - - + + + + - + @@ -2215,117 +2216,117 @@ - - + + - - + + - - + + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2335,62 +2336,62 @@ - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - + + - - + + - + - - - - - - - - + + + + + + + + - + - + - + - + - - - - + + + + - + - - - + + + @@ -2584,7 +2585,7 @@ An attribute definition has been parsed. - + @@ -2595,7 +2596,7 @@ Handle an attribute that has been read by the parser. The default handling is to convert the attribute into an DOM subtree and past it in a new xmlAttr element added to the element. - + @@ -2609,7 +2610,7 @@ Called when a pcdata block has been parsed. - + @@ -2623,7 +2624,7 @@ Receiving some chars from the parser. - + @@ -2642,7 +2643,7 @@ A comment has been parsed. - + @@ -2731,7 +2732,7 @@ An element definition has been parsed. - + @@ -2744,7 +2745,7 @@ Called when the document end has been detected. - + @@ -2755,7 +2756,7 @@ Called when the end of an element has been detected. - + @@ -2771,7 +2772,7 @@ An entity definition has been parsed. - + @@ -2781,7 +2782,7 @@ Display and format an error messages, callback. - + @@ -2796,7 +2797,7 @@ Callback on external subset declaration. - + @@ -2804,21 +2805,21 @@ Display and format fatal error messages, callback. Note: so far fatalError() SAX callbacks are not used, error() get all the callbacks for errors. - + A callback for the xmlNanoFTPGet command. - + A callback for the xmlNanoFTPList command. Note that only one of year and day:minute are specified. - + @@ -2845,7 +2846,7 @@ Get an entity by name. - + @@ -2867,7 +2868,7 @@ Get a parameter entity by name. - + @@ -2895,7 +2896,7 @@ Does this document has an external subset? - + @@ -2905,7 +2906,7 @@ Does this document has an internal subset. - + @@ -3061,6 +3062,14 @@ + + Dump an HTML node, recursive behaviour,children are printed too, and formatting returns/spaces are added. + + + + + + parse Reference declarations [66] CharRef ::= '&#' [0-9]+ ';' | '&#x' [0-9a-fA-F]+ ';' @@ -3159,7 +3168,7 @@ Receiving some ignorable whitespaces from the parser. UNUSED: by default the DOM building will use characters. - + @@ -3206,7 +3215,7 @@ Callback on internal subset declaration. - + @@ -3219,7 +3228,7 @@ Is this document tagged standalone? - + @@ -3269,7 +3278,7 @@ What to do when a notation declaration has been parsed. - + @@ -3284,7 +3293,7 @@ A processing instruction has been parsed. - + @@ -3297,7 +3306,7 @@ Called when an entity reference is detected. - + @@ -3310,7 +3319,7 @@ Callback: The entity loader, to control the loading of external entities, the application can either: - override this resolveEntity() callback in the SAX block - or better use the xmlSetExternalEntityLoader() function to set up it's own entity resolution routine - + @@ -3323,7 +3332,7 @@ Receive the document locator at startup, actually xmlDefaultSAXLocator. Everything is available on the context, so this is useless in our case. - + @@ -3340,7 +3349,7 @@ Called when the document start being processed. - + @@ -3352,7 +3361,7 @@ Called when an opening tag has been processed. - + @@ -3368,7 +3377,7 @@ What to do when an unparsed entity declaration is parsed. - + @@ -3388,14 +3397,14 @@ Display and format a warning messages, callback. - + This is the prototype for a extended link detection callback. - + @@ -3412,7 +3421,7 @@ This is the prototype for a extended link set detection callback. - + @@ -3438,7 +3447,7 @@ This is the prototype for the link detection routine. It calls the default link detection callbacks upon link detection. - + @@ -3454,7 +3463,7 @@ This is the prototype for a simple link detection callback. - + @@ -3872,7 +3881,7 @@ - + @@ -4009,7 +4018,7 @@ Take a block of chars in the original encoding and try to convert it to an UTF-8 block of chars out. - + @@ -4017,7 +4026,7 @@ Take a block of UTF-8 chars in and try to convert it to an other encoding. Note: a first call designed to produce heading info is called with in = NULL. If stateful this should also initialize the encoder state. - + @@ -4481,14 +4490,14 @@ Callback function used when one needs to be able to track back the provenance of a chunk of nodes inherited from an entity replacement. - + External entity loaders types. - + @@ -4567,7 +4576,7 @@ Signature for a free() implementation. - + @@ -4652,7 +4661,7 @@ Signature of the function to use when there is an error and no parsing or validity context available . - + @@ -4869,7 +4878,7 @@ Callback to copy data from a hash. - + @@ -4886,7 +4895,7 @@ Callback to free data from a hash. - + @@ -4977,14 +4986,14 @@ Callback when scanning data in a hash with the simple scanner. - + Callback when scanning data in a hash with the full scanner. - + @@ -5121,22 +5130,22 @@ Callback used in the I/O Input API to close the resource - + Callback used in the I/O Input API to detect if the current handler can provide input fonctionnalities for this resource. - + Callback used in the I/O Input API to open the resource - + Callback used in the I/O Input API to read the resource - + @@ -5261,13 +5270,13 @@ Callback function used to compare 2 data. - + Callback function used to free data from a list. - + @@ -5390,7 +5399,7 @@ Callback function used when walking a list with xmlListWalk(). - + @@ -5438,7 +5447,7 @@ Signature for a malloc() implementation. - + @@ -6169,22 +6178,22 @@ Callback used in the I/O Output API to close the resource - + Callback used in the I/O Output API to detect if the current handler can provide output fonctionnalities for this resource. - + Callback used in the I/O Output API to open the resource - + Callback used in the I/O Output API to write to the resource - + @@ -6633,7 +6642,7 @@ Callback for freeing some parser input allocations. - + @@ -6718,7 +6727,7 @@ Signature for a realloc() implementation. - + @@ -6754,7 +6763,7 @@ - + @@ -7101,7 +7110,7 @@ This is a generic signature for the XML shell functions. - + @@ -7165,7 +7174,7 @@ This is a generic signature for the XML shell input function. - + @@ -7273,7 +7282,7 @@ Signature for an strdup() implementation. - + @@ -8368,14 +8377,14 @@ Callback called when a validity error is found. This is a message oriented function similar to an *printf function. - + Callback called when a validity warning is found. This is a message oriented function similar to an *printf function. - + @@ -8392,7 +8401,7 @@ An axis traversal function. To traverse an axis, the engine calls the first time with cur == NULL and repeat until the function returns NULL indicating the end of the axis traversal. - + @@ -8521,7 +8530,7 @@ A conversion function is associated to a type and used to cast the new type to primitive values. - + @@ -8600,7 +8609,7 @@ An XPath evaluation function, the parameters are on the XPath context stack. - + @@ -8660,14 +8669,14 @@ Prototype for callbacks used to plug function lookup in the XPath engine. - + An XPath function. The arguments (if any) are popped out from the context stack and the result is pushed on the stack. - + @@ -9219,7 +9228,7 @@ Prototype for callbacks used to plug variable lookup in the XPath engine. - +