diff options
| author | Tim Janik <timj@gtk.org> | 1999-07-24 18:50:58 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 1999-07-24 18:50:58 +0000 |
| commit | 87c7aeb93bd654776f59805a342ad913031034f3 (patch) | |
| tree | 4f43e0cefcbe83a51ffe9aeb24f3386f519a071d /gscanner.c | |
| parent | c8a28b935ca605ece11c65564ad1d3918786dd07 (diff) | |
| download | glib-87c7aeb93bd654776f59805a342ad913031034f3.tar.gz | |
18:36. incorporated proposed cleanups from gtk-devel-list.
Sat Jul 24 20:11:35 1999 Tim Janik <timj@gtk.org>
* merged GLib 1.3.0 with glib-1.2.3 from Fri Jul 16 22:18:36.
* incorporated proposed cleanups from gtk-devel-list.
* bumped version number to GLib-1.3.1
* glib.h:
* gqueue.c:
* gstring.c:
* glist.c:
removed string tokenisation (we got g_strsplit() and g_strjoin()
already) and readline functions.
s/g_list_delete/g_list_delete_link.
implemented g_slist_delete_link.
removed notion of g_ATEXIT() macro in glib.h, this is an *internal*
macro, g_atexit() is provided for public consumption.
added GTrashStack inline utility functions.
reimplement double eneded queues.
removed GStack implementation, people can use a queue or a (singly)
linked list for this task.
deprecated g_strescape(), we need the SunOS variants here.
* gdate.c: added DEBUG_MSG() macro to wrap old messages.
* *.*: CVS merges.
* upgrade to libtool 1.3.3.
Diffstat (limited to 'gscanner.c')
| -rw-r--r-- | gscanner.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gscanner.c b/gscanner.c index 832ca31fb..7d106e4a5 100644 --- a/gscanner.c +++ b/gscanner.c @@ -973,7 +973,7 @@ g_scanner_unexp_token (GScanner *scanner, "%s%s `%s'", print_unexp ? "" : "invalid ", identifier_spec, - scanner->value.v_string); + scanner->token == G_TOKEN_IDENTIFIER ? scanner->value.v_string : "null"); break; case G_TOKEN_BINARY: @@ -1075,6 +1075,10 @@ g_scanner_unexp_token (GScanner *scanner, identifier_spec); break; + case G_TOKEN_EOF: + g_snprintf (expected_string, expected_string_len, "end of file"); + break; + case G_TOKEN_NONE: break; } |