Drop int/real arrays.

This commit is contained in:
Michael R Sweet 2003-06-19 03:39:23 +00:00
parent dd903644a5
commit 596ca0f10d
3 changed files with 3 additions and 95 deletions

View File

@ -30,10 +30,8 @@
<tbody>
<tr><td><tt>MXML_ELEMENT</tt></td><td>XML element with attributes</td></tr>
<tr><td><tt>MXML_INTEGER</tt></td><td>Integer value</td></tr>
<tr><td><tt>MXML_INTEGER_ARRAY</tt></td><td>Integer array value</td></tr>
<tr><td><tt>MXML_OPAQUE</tt></td><td>Opaque string</td></tr>
<tr><td><tt>MXML_REAL</tt></td><td>Real value</td></tr>
<tr><td><tt>MXML_REAL_ARRAY</tt></td><td>Real array value</td></tr>
<tr><td><tt>MXML_TEXT</tt></td><td>Text fragment</td></tr>
</tbody></table></p>
<h1><a name="_functions">Functions</a></h1>
@ -493,9 +491,7 @@ mxmlWalkPrev(
<h1><a name="_structures">Structures</a></h1>
<ul>
<li><a href="#mxml_attr_s"><tt>mxml_attr_s</tt></a></li>
<li><a href="#mxml_intarray_s"><tt>mxml_intarray_s</tt></a></li>
<li><a href="#mxml_node_s"><tt>mxml_node_s</tt></a></li>
<li><a href="#mxml_realarray_s"><tt>mxml_realarray_s</tt></a></li>
<li><a href="#mxml_text_s"><tt>mxml_text_s</tt></a></li>
<li><a href="#mxml_value_s"><tt>mxml_value_s</tt></a></li>
</ul>
@ -518,24 +514,6 @@ struct mxml_attr_s
<tr><td><tt>value</tt></td><td>Attribute value</td></tr>
</tbody></table></p>
<hr noshade/>
<h2><a name="mxml_intarray_s">mxml_intarray_s</a></h2>
<p>An XML integer array value.</p>
<h3>Definition</h3>
<pre>
struct mxml_intarray_s
{
int num_values;
int * values;
};
</pre>
<h3>Members</h3>
<p class="table"><table align="center" border="1" width="80%">
<thead><tr><th>Name</th><th>Description</th></tr></thead>
<tbody>
<tr><td><tt>num_values</tt></td><td>Number of values</td></tr>
<tr><td><tt>values</tt></td><td>The array of values</td></tr>
</tbody></table></p>
<hr noshade/>
<h2><a name="mxml_node_s">mxml_node_s</a></h2>
<p>Data types...</p>
<h3>Definition</h3>
@ -564,24 +542,6 @@ struct mxml_node_s
<tr><td><tt>value</tt></td><td>Node value</td></tr>
</tbody></table></p>
<hr noshade/>
<h2><a name="mxml_realarray_s">mxml_realarray_s</a></h2>
<p>An XML real array value.</p>
<h3>Definition</h3>
<pre>
struct mxml_realarray_s
{
int num_values;
double * values;
};
</pre>
<h3>Members</h3>
<p class="table"><table align="center" border="1" width="80%">
<thead><tr><th>Name</th><th>Description</th></tr></thead>
<tbody>
<tr><td><tt>num_values</tt></td><td>Number of values</td></tr>
<tr><td><tt>values</tt></td><td>The array of values</td></tr>
</tbody></table></p>
<hr noshade/>
<h2><a name="mxml_text_s">mxml_text_s</a></h2>
<p>An XML text value.</p>
<h3>Definition</h3>
@ -623,9 +583,7 @@ struct mxml_value_s
<ul>
<li><a href="#mxml_attr_t"><tt>mxml_attr_t</tt></a></li>
<li><a href="#mxml_element_t"><tt>mxml_element_t</tt></a></li>
<li><a href="#mxml_intarray_t"><tt>mxml_intarray_t</tt></a></li>
<li><a href="#mxml_node_t"><tt>mxml_node_t</tt></a></li>
<li><a href="#mxml_realarray_t"><tt>mxml_realarray_t</tt></a></li>
<li><a href="#mxml_text_t"><tt>mxml_text_t</tt></a></li>
<li><a href="#mxml_type_t"><tt>mxml_type_t</tt></a></li>
<li><a href="#mxml_value_t"><tt>mxml_value_t</tt></a></li>
@ -645,13 +603,6 @@ typedef struct <a href="#mxml_attr_s">mxml_attr_s</a> mxml_attr_t;
typedef struct <a href="#mxml_value_s">mxml_value_s</a> mxml_element_t;
</pre>
<hr noshade/>
<h2><a name="mxml_intarray_t">mxml_intarray_t</a></h2>
<p>An XML integer array value.</p>
<h3>Definition</h3>
<pre>
typedef struct <a href="#mxml_intarray_s">mxml_intarray_s</a> mxml_intarray_t;
</pre>
<hr noshade/>
<h2><a name="mxml_node_t">mxml_node_t</a></h2>
<p>An XML node.</p>
<h3>Definition</h3>
@ -659,13 +610,6 @@ typedef struct <a href="#mxml_intarray_s">mxml_intarray_s</a> mxml_intarray_t;
typedef struct <a href="#mxml_node_s">mxml_node_s</a> mxml_node_t;
</pre>
<hr noshade/>
<h2><a name="mxml_realarray_t">mxml_realarray_t</a></h2>
<p>An XML real array value.</p>
<h3>Definition</h3>
<pre>
typedef struct <a href="#mxml_realarray_s">mxml_realarray_s</a> mxml_realarray_t;
</pre>
<hr noshade/>
<h2><a name="mxml_text_t">mxml_text_t</a></h2>
<p>An XML text value.</p>
<h3>Definition</h3>
@ -698,11 +642,9 @@ typedef union <a href="#mxml_value_u">mxml_value_u</a> mxml_value_t;
struct mxml_value_u
{
<a href="#mxml_element_t">mxml_element_t</a> element;
<a href="#mxml_intarray_t">mxml_intarray_t</a> intarray;
int integer;
char * opaque;
double real;
<a href="#mxml_realarray_t">mxml_realarray_t</a> realarray;
<a href="#mxml_text_t">mxml_text_t</a> text;
};
</pre>
@ -711,11 +653,9 @@ struct mxml_value_u
<thead><tr><th>Name</th><th>Description</th></tr></thead>
<tbody>
<tr><td><tt>element</tt></td><td>Element</td></tr>
<tr><td><tt>intarray</tt></td><td>Integer array</td></tr>
<tr><td><tt>integer</tt></td><td>Integer number</td></tr>
<tr><td><tt>opaque</tt></td><td>Opaque string</td></tr>
<tr><td><tt>real</tt></td><td>Real number</td></tr>
<tr><td><tt>realarray</tt></td><td>Real array</td></tr>
<tr><td><tt>text</tt></td><td>Text fragment</td></tr>
</tbody></table></p>
</body>

22
mxml.h
View File

@ -1,5 +1,5 @@
/*
* "$Id: mxml.h,v 1.10 2003/06/19 03:20:41 mike Exp $"
* "$Id: mxml.h,v 1.11 2003/06/19 03:39:23 mike Exp $"
*
* Header file for mini-XML, a small XML-like file parsing library.
*
@ -68,9 +68,7 @@ typedef enum mxml_type_e /**** The XML node type. ****/
MXML_INTEGER, /* Integer value */
MXML_OPAQUE, /* Opaque string */
MXML_REAL, /* Real value */
MXML_TEXT, /* Text fragment */
MXML_INTEGER_ARRAY, /* Integer array value */
MXML_REAL_ARRAY /* Real array value */
MXML_TEXT /* Text fragment */
} mxml_type_t;
typedef struct mxml_attr_s /**** An XML element attribute value. ****/
@ -92,18 +90,6 @@ typedef struct mxml_text_s /**** An XML text value. ****/
char *string; /* Fragment string */
} mxml_text_t;
typedef struct mxml_intarray_s /**** An XML integer array value. ****/
{
int num_values; /* Number of values */
int *values; /* The array of values */
} mxml_intarray_t;
typedef struct mxml_realarray_s /**** An XML real array value. ****/
{
int num_values; /* Number of values */
double *values; /* The array of values */
} mxml_realarray_t;
typedef union mxml_value_u /**** An XML node value. ****/
{
mxml_element_t element; /* Element */
@ -111,8 +97,6 @@ typedef union mxml_value_u /**** An XML node value. ****/
char *opaque; /* Opaque string */
double real; /* Real number */
mxml_text_t text; /* Text fragment */
mxml_intarray_t intarray; /* Integer array */
mxml_realarray_t realarray; /* Real array */
} mxml_value_t;
typedef struct mxml_node_s mxml_node_t; /**** An XML node. ****/
@ -183,5 +167,5 @@ extern mxml_node_t *mxmlWalkPrev(mxml_node_t *node, mxml_node_t *top,
/*
* End of "$Id: mxml.h,v 1.10 2003/06/19 03:20:41 mike Exp $".
* End of "$Id: mxml.h,v 1.11 2003/06/19 03:39:23 mike Exp $".
*/

View File

@ -197,12 +197,6 @@ name="name"><type>char *</type><description>Attribute name</description></variab
mxml_attr_s</type></typedef>
<typedef name="mxml_element_t"><description>An XML element value.</description><type>struct
mxml_value_s</type></typedef>
<struct name="mxml_intarray_s"><description>An XML integer array value.</description><variable
name="num_values"><type>int</type><description>Number of values</description></variable>
<variable name="values"><type>int *</type><description>The array of values</description></variable>
</struct>
<typedef name="mxml_intarray_t"><description>An XML integer array value.</description><type>struct
mxml_intarray_s</type></typedef>
<struct name="mxml_node_s"><description>Data types...</description><variable
name="child"><type>mxml_node_t *</type><description>First child node</description></variable>
<variable name="last_child"><type>mxml_node_t *</type><description>Last child node</description></variable>
@ -213,12 +207,6 @@ name="child"><type>mxml_node_t *</type><description>First child node</descriptio
<variable name="value"><type>mxml_value_t</type><description>Node value</description></variable>
</struct>
<typedef name="mxml_node_t"><type>struct mxml_node_s</type><description>An XML node.</description><description>An XML node.</description></typedef>
<struct name="mxml_realarray_s"><description>An XML real array value.</description><variable
name="num_values"><type>int</type><description>Number of values</description></variable>
<variable name="values"><type>double *</type><description>The array of values</description></variable>
</struct>
<typedef name="mxml_realarray_t"><description>An XML real array value.</description><type>struct
mxml_realarray_s</type></typedef>
<struct name="mxml_text_s"><description>An XML text value.</description><variable
name="string"><type>char *</type><description>Fragment string</description></variable>
<variable name="whitespace"><type>int</type><description>Leading whitespace?</description></variable>
@ -228,10 +216,8 @@ mxml_text_s</type></typedef>
<enumeration name="mxml_type_e"><description>The XML node type.</description><constant
name="MXML_ELEMENT"><description>XML element with attributes</description></constant>
<constant name="MXML_INTEGER"><description>Integer value</description></constant>
<constant name="MXML_INTEGER_ARRAY"><description>Integer array value</description></constant>
<constant name="MXML_OPAQUE"><description>Opaque string</description></constant>
<constant name="MXML_REAL"><description>Real value</description></constant>
<constant name="MXML_REAL_ARRAY"><description>Real array value</description></constant>
<constant name="MXML_TEXT"><description>Text fragment</description></constant>
</enumeration>
<typedef name="mxml_type_t"><description>The XML node type.</description><type>enum
@ -245,10 +231,8 @@ name="attrs"><type>mxml_attr_t *</type><description>Attributes</description></va
mxml_value_u</type></typedef>
<union name="mxml_value_u"><description>An XML node value.</description><variable
name="element"><type>mxml_element_t</type><description>Element</description></variable>
<variable name="intarray"><type>mxml_intarray_t</type><description>Integer array</description></variable>
<variable name="integer"><type>int</type><description>Integer number</description></variable>
<variable name="opaque"><type>char *</type><description>Opaque string</description></variable>
<variable name="real"><type>double</type><description>Real number</description></variable>
<variable name="realarray"><type>mxml_realarray_t</type><description>Real array</description></variable>
<variable name="text"><type>mxml_text_t</type><description>Text fragment</description></variable>
</union>