Commit 32ef70d4 authored by Havoc Pennington's avatar Havoc Pennington Committed by Havoc Pennington

New module to parse a simple markup language

2000-10-24  Havoc Pennington  <hp@pobox.com>

        * gmarkup.h, gmarkup.c: New module to parse a simple
	markup language

	* Makefile.am: add gmarkup.h, gmarkup.c

	* tests/Makefile.am: add markup-test

	* gstring.h (g_string_new_len): new function to create a string
	with a length
	(g_string_new): avoid a gratuitous realloc
parent 7ea09e45
2000-10-24 Havoc Pennington <hp@pobox.com>
* gmarkup.h, gmarkup.c: New module to parse a simple
markup language
* Makefile.am: add gmarkup.h, gmarkup.c
* tests/Makefile.am: add markup-test
* gstring.h (g_string_new_len): new function to create a string
with a length
(g_string_new): avoid a gratuitous realloc
2000-10-26 Tor Lillqvist <tml@iki.fi>
* makefile.{mingw,msc}.in: Cosmetics.
......
2000-10-24 Havoc Pennington <hp@pobox.com>
* gmarkup.h, gmarkup.c: New module to parse a simple
markup language
* Makefile.am: add gmarkup.h, gmarkup.c
* tests/Makefile.am: add markup-test
* gstring.h (g_string_new_len): new function to create a string
with a length
(g_string_new): avoid a gratuitous realloc
2000-10-26 Tor Lillqvist <tml@iki.fi>
* makefile.{mingw,msc}.in: Cosmetics.
......
2000-10-24 Havoc Pennington <hp@pobox.com>
* gmarkup.h, gmarkup.c: New module to parse a simple
markup language
* Makefile.am: add gmarkup.h, gmarkup.c
* tests/Makefile.am: add markup-test
* gstring.h (g_string_new_len): new function to create a string
with a length
(g_string_new): avoid a gratuitous realloc
2000-10-26 Tor Lillqvist <tml@iki.fi>
* makefile.{mingw,msc}.in: Cosmetics.
......
2000-10-24 Havoc Pennington <hp@pobox.com>
* gmarkup.h, gmarkup.c: New module to parse a simple
markup language
* Makefile.am: add gmarkup.h, gmarkup.c
* tests/Makefile.am: add markup-test
* gstring.h (g_string_new_len): new function to create a string
with a length
(g_string_new): avoid a gratuitous realloc
2000-10-26 Tor Lillqvist <tml@iki.fi>
* makefile.{mingw,msc}.in: Cosmetics.
......
2000-10-24 Havoc Pennington <hp@pobox.com>
* gmarkup.h, gmarkup.c: New module to parse a simple
markup language
* Makefile.am: add gmarkup.h, gmarkup.c
* tests/Makefile.am: add markup-test
* gstring.h (g_string_new_len): new function to create a string
with a length
(g_string_new): avoid a gratuitous realloc
2000-10-26 Tor Lillqvist <tml@iki.fi>
* makefile.{mingw,msc}.in: Cosmetics.
......
2000-10-24 Havoc Pennington <hp@pobox.com>
* gmarkup.h, gmarkup.c: New module to parse a simple
markup language
* Makefile.am: add gmarkup.h, gmarkup.c
* tests/Makefile.am: add markup-test
* gstring.h (g_string_new_len): new function to create a string
with a length
(g_string_new): avoid a gratuitous realloc
2000-10-26 Tor Lillqvist <tml@iki.fi>
* makefile.{mingw,msc}.in: Cosmetics.
......
2000-10-24 Havoc Pennington <hp@pobox.com>
* gmarkup.h, gmarkup.c: New module to parse a simple
markup language
* Makefile.am: add gmarkup.h, gmarkup.c
* tests/Makefile.am: add markup-test
* gstring.h (g_string_new_len): new function to create a string
with a length
(g_string_new): avoid a gratuitous realloc
2000-10-26 Tor Lillqvist <tml@iki.fi>
* makefile.{mingw,msc}.in: Cosmetics.
......
2000-10-24 Havoc Pennington <hp@pobox.com>
* gmarkup.h, gmarkup.c: New module to parse a simple
markup language
* Makefile.am: add gmarkup.h, gmarkup.c
* tests/Makefile.am: add markup-test
* gstring.h (g_string_new_len): new function to create a string
with a length
(g_string_new): avoid a gratuitous realloc
2000-10-26 Tor Lillqvist <tml@iki.fi>
* makefile.{mingw,msc}.in: Cosmetics.
......
......@@ -61,6 +61,7 @@ libglib_1_3_la_SOURCES = \
giounix.c \
glist.c \
gmain.c \
gmarkup.c \
gmem.c \
gmessages.c \
gnode.c \
......@@ -109,6 +110,7 @@ glibinclude_HEADERS = \
glist.h \
gmacros.h \
gmain.h \
gmarkup.h \
gmem.h \
gmessages.h \
gnode.h \
......
......@@ -44,6 +44,7 @@
#include <glist.h>
#include <gmacros.h>
#include <gmain.h>
#include <gmarkup.h>
#include <gmem.h>
#include <gmessages.h>
#include <gnode.h>
......
......@@ -61,6 +61,7 @@ libglib_1_3_la_SOURCES = \
giounix.c \
glist.c \
gmain.c \
gmarkup.c \
gmem.c \
gmessages.c \
gnode.c \
......@@ -109,6 +110,7 @@ glibinclude_HEADERS = \
glist.h \
gmacros.h \
gmain.h \
gmarkup.h \
gmem.h \
gmessages.h \
gnode.h \
......
......@@ -44,6 +44,7 @@
#include <glist.h>
#include <gmacros.h>
#include <gmain.h>
#include <gmarkup.h>
#include <gmem.h>
#include <gmessages.h>
#include <gnode.h>
......
This diff is collapsed.
/* gmarkup.h - Simple XML-like string parser/writer
*
* Copyright 2000 Red Hat, Inc.
*
* GLib is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* GLib is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with GLib; see the file COPYING.LIB. If not,
* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#ifndef __G_MARKUP_H__
#define __G_MARKUP_H__
#include <gerror.h>
#ifdef __cplusplus
extern "C"
{
#endif
typedef enum
{
G_MARKUP_ERROR_BAD_UTF8,
G_MARKUP_ERROR_EMPTY,
G_MARKUP_ERROR_PARSE,
/* These three are primarily intended for specific GMarkupParser
* implementations to set.
*/
G_MARKUP_ERROR_UNKNOWN_ELEMENT,
G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE,
G_MARKUP_ERROR_INVALID_CONTENT
} GMarkupErrorType;
#define G_MARKUP_ERROR g_markup_error_quark ()
GQuark g_markup_error_quark ();
typedef enum
{
/* Hmm, can't think of any at the moment */
G_MARKUP_FOO = 1 << 0
} GMarkupParseFlags;
typedef struct _GMarkupParseContext GMarkupParseContext;
typedef struct _GMarkupParser GMarkupParser;
struct _GMarkupParser
{
/* Called for open tags <foo bar="baz"> */
void (*start_element) (GMarkupParseContext *context,
const gchar *element_name,
const gchar **attribute_names,
const gchar **attribute_values,
gpointer user_data,
GError **error);
/* Called for close tags </foo> */
void (*end_element) (GMarkupParseContext *context,
const gchar *element_name,
gpointer user_data,
GError **error);
/* Called for character data */
/* text is not nul-terminated */
void (*text) (GMarkupParseContext *context,
const gchar *text,
gint text_len,
gpointer user_data,
GError **error);
/* Called for strings that should be re-saved verbatim in this same
* position, but are not otherwise interpretable. At the moment
* this includes comments and processing instructions.
*/
/* text is not nul-terminated. */
void (*passthrough) (GMarkupParseContext *context,
const gchar *passthrough_text,
gint text_len,
gpointer user_data,
GError **error);
/* Called on error, including one set by other
* methods in the vtable. The GError should not be freed.
*/
void (*error) (GMarkupParseContext *context,
GError *error,
gpointer user_data);
};
GMarkupParseContext *g_markup_parse_context_new (const GMarkupParser *parser,
GMarkupParseFlags flags,
gpointer user_data,
GDestroyNotify user_data_dnotify);
void g_markup_parse_context_free (GMarkupParseContext *context);
gboolean g_markup_parse_context_parse (GMarkupParseContext *context,
const gchar *text,
gint text_len,
GError **error);
gboolean g_markup_parse_context_end_parse (GMarkupParseContext *context,
GError **error);
/* For user-constructed error messages, has no precise semantics */
void g_markup_parse_context_get_position (GMarkupParseContext *context,
gint *line_number,
gint *char_number);
/* useful when saving */
gchar* g_markup_escape_text (const gchar *text,
gint length);
#ifdef __cplusplus
}
#endif
#endif /* __G_MARKUP_H__ */
......@@ -243,7 +243,7 @@ g_string_new (const gchar *init)
{
GString *string;
string = g_string_sized_new (2);
string = g_string_sized_new (init ? strlen (init) + 2 : 2);
if (init)
g_string_append (string, init);
......@@ -251,6 +251,25 @@ g_string_new (const gchar *init)
return string;
}
GString*
g_string_new_len (const gchar *init,
gint len)
{
GString *string;
if (len < 0)
return g_string_new (init);
else
{
string = g_string_sized_new (len);
if (init)
g_string_append_len (string, init, len);
return string;
}
}
gchar*
g_string_free (GString *string,
gboolean free_segment)
......
......@@ -53,6 +53,8 @@ gchar* g_string_chunk_insert_const (GStringChunk *chunk,
/* Strings
*/
GString* g_string_new (const gchar *init);
GString* g_string_new_len (const gchar *init,
gint len);
GString* g_string_sized_new (guint dfl_size);
gchar* g_string_free (GString *string,
gboolean free_segment);
......
This diff is collapsed.
/* gmarkup.h - Simple XML-like string parser/writer
*
* Copyright 2000 Red Hat, Inc.
*
* GLib is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* GLib is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with GLib; see the file COPYING.LIB. If not,
* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#ifndef __G_MARKUP_H__
#define __G_MARKUP_H__
#include <gerror.h>
#ifdef __cplusplus
extern "C"
{
#endif
typedef enum
{
G_MARKUP_ERROR_BAD_UTF8,
G_MARKUP_ERROR_EMPTY,
G_MARKUP_ERROR_PARSE,
/* These three are primarily intended for specific GMarkupParser
* implementations to set.
*/
G_MARKUP_ERROR_UNKNOWN_ELEMENT,
G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE,
G_MARKUP_ERROR_INVALID_CONTENT
} GMarkupErrorType;
#define G_MARKUP_ERROR g_markup_error_quark ()
GQuark g_markup_error_quark ();
typedef enum
{
/* Hmm, can't think of any at the moment */
G_MARKUP_FOO = 1 << 0
} GMarkupParseFlags;
typedef struct _GMarkupParseContext GMarkupParseContext;
typedef struct _GMarkupParser GMarkupParser;
struct _GMarkupParser
{
/* Called for open tags <foo bar="baz"> */
void (*start_element) (GMarkupParseContext *context,
const gchar *element_name,
const gchar **attribute_names,
const gchar **attribute_values,
gpointer user_data,
GError **error);
/* Called for close tags </foo> */
void (*end_element) (GMarkupParseContext *context,
const gchar *element_name,
gpointer user_data,
GError **error);
/* Called for character data */
/* text is not nul-terminated */
void (*text) (GMarkupParseContext *context,
const gchar *text,
gint text_len,
gpointer user_data,
GError **error);
/* Called for strings that should be re-saved verbatim in this same
* position, but are not otherwise interpretable. At the moment
* this includes comments and processing instructions.
*/
/* text is not nul-terminated. */
void (*passthrough) (GMarkupParseContext *context,
const gchar *passthrough_text,
gint text_len,
gpointer user_data,
GError **error);
/* Called on error, including one set by other
* methods in the vtable. The GError should not be freed.
*/
void (*error) (GMarkupParseContext *context,
GError *error,
gpointer user_data);
};
GMarkupParseContext *g_markup_parse_context_new (const GMarkupParser *parser,
GMarkupParseFlags flags,
gpointer user_data,
GDestroyNotify user_data_dnotify);
void g_markup_parse_context_free (GMarkupParseContext *context);
gboolean g_markup_parse_context_parse (GMarkupParseContext *context,
const gchar *text,
gint text_len,
GError **error);
gboolean g_markup_parse_context_end_parse (GMarkupParseContext *context,
GError **error);
/* For user-constructed error messages, has no precise semantics */
void g_markup_parse_context_get_position (GMarkupParseContext *context,
gint *line_number,
gint *char_number);
/* useful when saving */
gchar* g_markup_escape_text (const gchar *text,
gint length);
#ifdef __cplusplus
}
#endif
#endif /* __G_MARKUP_H__ */
......@@ -243,7 +243,7 @@ g_string_new (const gchar *init)
{
GString *string;
string = g_string_sized_new (2);
string = g_string_sized_new (init ? strlen (init) + 2 : 2);
if (init)
g_string_append (string, init);
......@@ -251,6 +251,25 @@ g_string_new (const gchar *init)
return string;
}
GString*
g_string_new_len (const gchar *init,
gint len)
{
GString *string;
if (len < 0)
return g_string_new (init);
else
{
string = g_string_sized_new (len);
if (init)
g_string_append_len (string, init, len);
return string;
}
}
gchar*
g_string_free (GString *string,
gboolean free_segment)
......
......@@ -53,6 +53,8 @@ gchar* g_string_chunk_insert_const (GStringChunk *chunk,
/* Strings
*/
GString* g_string_new (const gchar *init);
GString* g_string_new_len (const gchar *init,
gint len);
GString* g_string_sized_new (guint dfl_size);
gchar* g_string_free (GString *string,
gboolean free_segment);
......
......@@ -18,6 +18,7 @@ TESTS = \
gio-test \
hash-test \
list-test \
markup-test \
node-test \
queue-test \
rand-test \
......@@ -43,6 +44,7 @@ dirname_test_LDADD = $(progs_LDADD)
gio_test_LDADD = $(progs_LDADD)
hash_test_LDADD = $(progs_LDADD)
list_test_LDADD = $(progs_LDADD)
markup_test_LDADD = $(progs_LDADD)
node_test_LDADD = $(progs_LDADD)
queue_test_LDADD = $(progs_LDADD)
rand_test_LDADD = $(progs_LDADD)
......
#include <stdio.h>
#include <glib.h>
static int depth = 0;
static void
indent (int extra)
{
int i = 0;
while (i < depth)
{
fputs (" ", stdout);
++i;
}
}
static void
start_element_handler (GMarkupParseContext *context,
const gchar *element_name,
const gchar **attribute_names,
const gchar **attribute_values,
gpointer user_data,
GError **error)
{
int i;
indent (0);
printf ("ELEMENT '%s'\n", element_name);
i = 0;
while (attribute_names[i] != NULL)
{
indent (1);
printf ("%s=\"%s\"\n",
attribute_names[i],
attribute_values[i]);
++i;
}
++depth;
}
static void
end_element_handler (GMarkupParseContext *context,
const gchar *element_name,
gpointer user_data,
GError **error)
{
--depth;
indent (0);
printf ("END '%s'\n", element_name);
}
static void
text_handler (GMarkupParseContext *context,
const gchar *text,
gint text_len,
gpointer user_data,
GError **error)
{
indent (0);
printf ("TEXT '%s'\n", text);
}
static void
passthrough_handler (GMarkupParseContext *context,
const gchar *passthrough_text,
gint text_len,
gpointer user_data,
GError **error)
{
indent (0);
printf ("PASS '%s'\n", passthrough_text);
}
static void
error_handler (GMarkupParseContext *context,
GError *error,
gpointer user_data)
{
fprintf (stderr, " %s\n", error->message);
}
static GMarkupParser parser = {
start_element_handler,
end_element_handler,
text_handler,
passthrough_handler,
error_handler
};
static int
test_in_chunks (const gchar *contents,
gint length,
gint chunk_size)
{
GMarkupParseContext *context;
int i = 0;
context = g_markup_parse_context_new (&parser, 0, NULL, NULL);
while (i < length)
{
int this_chunk = MIN (length - i, chunk_size);
if (!g_markup_parse_context_parse (context,
contents + i,
this_chunk,
NULL))
{
g_markup_parse_context_free (context);
return 1;
}
i += this_chunk;
}
if (!g_markup_parse_context_end_parse (context, NULL))
{
g_markup_parse_context_free (context);
return 1;
}
g_markup_parse_context_free (context);
return 0;
}
static int
test_file (const gchar *filename)
{
gchar *contents;
gint length;
GError *error;
GMarkupParseContext *context;
error = NULL;