+Fri Jun 12 15:39:06 1998 Tim Janik <timj@gtk.org>
+
+ * glib.h (GScanner): cleanups of the structure fields (binary
+ incompatible).
+
Fri Jun 12 00:39:28 1998 Josh MacDonald <jmacd@icw.EECS.Berkeley.EDU>
* glib.h: add new hash and equal functions g_int_*. complement
+Fri Jun 12 15:39:06 1998 Tim Janik <timj@gtk.org>
+
+ * glib.h (GScanner): cleanups of the structure fields (binary
+ incompatible).
+
Fri Jun 12 00:39:28 1998 Josh MacDonald <jmacd@icw.EECS.Berkeley.EDU>
* glib.h: add new hash and equal functions g_int_*. complement
+Fri Jun 12 15:39:06 1998 Tim Janik <timj@gtk.org>
+
+ * glib.h (GScanner): cleanups of the structure fields (binary
+ incompatible).
+
Fri Jun 12 00:39:28 1998 Josh MacDonald <jmacd@icw.EECS.Berkeley.EDU>
* glib.h: add new hash and equal functions g_int_*. complement
+Fri Jun 12 15:39:06 1998 Tim Janik <timj@gtk.org>
+
+ * glib.h (GScanner): cleanups of the structure fields (binary
+ incompatible).
+
Fri Jun 12 00:39:28 1998 Josh MacDonald <jmacd@icw.EECS.Berkeley.EDU>
* glib.h: add new hash and equal functions g_int_*. complement
+Fri Jun 12 15:39:06 1998 Tim Janik <timj@gtk.org>
+
+ * glib.h (GScanner): cleanups of the structure fields (binary
+ incompatible).
+
Fri Jun 12 00:39:28 1998 Josh MacDonald <jmacd@icw.EECS.Berkeley.EDU>
* glib.h: add new hash and equal functions g_int_*. complement
+Fri Jun 12 15:39:06 1998 Tim Janik <timj@gtk.org>
+
+ * glib.h (GScanner): cleanups of the structure fields (binary
+ incompatible).
+
Fri Jun 12 00:39:28 1998 Josh MacDonald <jmacd@icw.EECS.Berkeley.EDU>
* glib.h: add new hash and equal functions g_int_*. complement
+Fri Jun 12 15:39:06 1998 Tim Janik <timj@gtk.org>
+
+ * glib.h (GScanner): cleanups of the structure fields (binary
+ incompatible).
+
Fri Jun 12 00:39:28 1998 Josh MacDonald <jmacd@icw.EECS.Berkeley.EDU>
* glib.h: add new hash and equal functions g_int_*. complement
+Fri Jun 12 15:39:06 1998 Tim Janik <timj@gtk.org>
+
+ * glib.h (GScanner): cleanups of the structure fields (binary
+ incompatible).
+
Fri Jun 12 00:39:28 1998 Josh MacDonald <jmacd@icw.EECS.Berkeley.EDU>
* glib.h: add new hash and equal functions g_int_*. complement
struct _GScanner
{
- /* unused portions */
+ /* unused fields */
gpointer user_data;
- const gchar *input_name;
- guint parse_errors;
guint max_parse_errors;
-
- /* maintained/used by the g_scanner_*() functions */
+
+ /* g_scanner_error() increments this field */
+ guint parse_errors;
+
+ /* name of input stream, featured by the default message handler */
+ const gchar *input_name;
+
+ /* data pointer for derived structures */
+ gpointer derived_data;
+
+ /* link into the scanner configuration */
GScannerConfig *config;
+
+ /* fields filled in after g_scanner_get_next_token() */
GTokenType token;
GValue value;
guint line;
guint position;
-
- /* to be considered private */
+
+ /* fields filled in after g_scanner_peek_next_token() */
GTokenType next_token;
GValue next_value;
guint next_line;
guint next_position;
+
+ /* to be considered private */
GHashTable *symbol_table;
const gchar *text;
guint text_len;
gint input_fd;
gint peeked_char;
+ /* handler function for _warn and _error */
GScannerMsgFunc msg_handler;
};
struct _GScanner
{
- /* unused portions */
+ /* unused fields */
gpointer user_data;
- const gchar *input_name;
- guint parse_errors;
guint max_parse_errors;
-
- /* maintained/used by the g_scanner_*() functions */
+
+ /* g_scanner_error() increments this field */
+ guint parse_errors;
+
+ /* name of input stream, featured by the default message handler */
+ const gchar *input_name;
+
+ /* data pointer for derived structures */
+ gpointer derived_data;
+
+ /* link into the scanner configuration */
GScannerConfig *config;
+
+ /* fields filled in after g_scanner_get_next_token() */
GTokenType token;
GValue value;
guint line;
guint position;
-
- /* to be considered private */
+
+ /* fields filled in after g_scanner_peek_next_token() */
GTokenType next_token;
GValue next_value;
guint next_line;
guint next_position;
+
+ /* to be considered private */
GHashTable *symbol_table;
const gchar *text;
guint text_len;
gint input_fd;
gint peeked_char;
+ /* handler function for _warn and _error */
GScannerMsgFunc msg_handler;
};
scanner = g_new0 (GScanner, 1);
scanner->user_data = NULL;
- scanner->input_name = NULL;
- scanner->parse_errors = 0;
scanner->max_parse_errors = 0;
+ scanner->parse_errors = 0;
+ scanner->input_name = NULL;
+ scanner->derived_data = NULL;
scanner->config = g_new0 (GScannerConfig, 1);
scanner->next_value.v_int = 0;
scanner->next_line = 1;
scanner->next_position = 0;
-
+
scanner->symbol_table = g_hash_table_new (g_str_hash, g_str_equal);
scanner->text = NULL;
scanner->text_len = 0;
scanner = g_new0 (GScanner, 1);
scanner->user_data = NULL;
- scanner->input_name = NULL;
- scanner->parse_errors = 0;
scanner->max_parse_errors = 0;
+ scanner->parse_errors = 0;
+ scanner->input_name = NULL;
+ scanner->derived_data = NULL;
scanner->config = g_new0 (GScannerConfig, 1);
scanner->next_value.v_int = 0;
scanner->next_line = 1;
scanner->next_position = 0;
-
+
scanner->symbol_table = g_hash_table_new (g_str_hash, g_str_equal);
scanner->text = NULL;
scanner->text_len = 0;