luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-12 05:39:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

new functions to make a scanner scope sensitive wrt symbol lookups.

Browse Source 
Thu Jul 23 00:29:14 1998  Tim Janik  <timj@gtk.org>

        * glib.h:
        * gscanner.c: new functions to make a scanner scope sensitive wrt
        symbol lookups.
        g_scanner_scope_foreach_symbol, g_scanner_scope_lookup_symbol,
        g_scanner_scope_remove_symbol, g_scanner_scope_add_symbol and
        g_scanner_set_scope.
        g_scanner_add_symbol, g_scanner_remove_symbol and
        g_scanner_foreach_symbol are now aliases for scope 0.
This commit is contained in:
Tim Janik 1998-07-22 22:32:22 +00:00 committed by Tim Janik
parent d2063fdc73
commit b813e192c6
13 changed files with 619 additions and 279 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
Thu Jul 23 00:29:14 1998 Tim Janik <timj@gtk.org>
* glib.h:
* gscanner.c: new functions to make a scanner scope sensitive wrt
symbol lookups.
g_scanner_scope_foreach_symbol, g_scanner_scope_lookup_symbol,
g_scanner_scope_remove_symbol, g_scanner_scope_add_symbol and
g_scanner_set_scope.
g_scanner_add_symbol, g_scanner_remove_symbol and
g_scanner_foreach_symbol are now aliases for scope 0.
Mon Jul 20 23:05:34 1998 George Lebl <jirka@5z.com> Mon Jul 20 23:05:34 1998 George Lebl <jirka@5z.com>
* glib.h: typo fixed for alphas for gint64 * glib.h: typo fixed for alphas for gint64

11
ChangeLog.pre-2-0
View File

@ -1,3 +1,14 @@
Thu Jul 23 00:29:14 1998 Tim Janik <timj@gtk.org>
* glib.h:
* gscanner.c: new functions to make a scanner scope sensitive wrt
symbol lookups.
g_scanner_scope_foreach_symbol, g_scanner_scope_lookup_symbol,
g_scanner_scope_remove_symbol, g_scanner_scope_add_symbol and
g_scanner_set_scope.
g_scanner_add_symbol, g_scanner_remove_symbol and
g_scanner_foreach_symbol are now aliases for scope 0.
Mon Jul 20 23:05:34 1998 George Lebl <jirka@5z.com> Mon Jul 20 23:05:34 1998 George Lebl <jirka@5z.com>
* glib.h: typo fixed for alphas for gint64 * glib.h: typo fixed for alphas for gint64

11
ChangeLog.pre-2-10
View File

@ -1,3 +1,14 @@
Thu Jul 23 00:29:14 1998 Tim Janik <timj@gtk.org>
* glib.h:
* gscanner.c: new functions to make a scanner scope sensitive wrt
symbol lookups.
g_scanner_scope_foreach_symbol, g_scanner_scope_lookup_symbol,
g_scanner_scope_remove_symbol, g_scanner_scope_add_symbol and
g_scanner_set_scope.
g_scanner_add_symbol, g_scanner_remove_symbol and
g_scanner_foreach_symbol are now aliases for scope 0.
Mon Jul 20 23:05:34 1998 George Lebl <jirka@5z.com> Mon Jul 20 23:05:34 1998 George Lebl <jirka@5z.com>
* glib.h: typo fixed for alphas for gint64 * glib.h: typo fixed for alphas for gint64

11
ChangeLog.pre-2-12
View File

@ -1,3 +1,14 @@
Thu Jul 23 00:29:14 1998 Tim Janik <timj@gtk.org>
* glib.h:
* gscanner.c: new functions to make a scanner scope sensitive wrt
symbol lookups.
g_scanner_scope_foreach_symbol, g_scanner_scope_lookup_symbol,
g_scanner_scope_remove_symbol, g_scanner_scope_add_symbol and
g_scanner_set_scope.
g_scanner_add_symbol, g_scanner_remove_symbol and
g_scanner_foreach_symbol are now aliases for scope 0.
Mon Jul 20 23:05:34 1998 George Lebl <jirka@5z.com> Mon Jul 20 23:05:34 1998 George Lebl <jirka@5z.com>
* glib.h: typo fixed for alphas for gint64 * glib.h: typo fixed for alphas for gint64

11
ChangeLog.pre-2-2
View File

@ -1,3 +1,14 @@
Thu Jul 23 00:29:14 1998 Tim Janik <timj@gtk.org>
* glib.h:
* gscanner.c: new functions to make a scanner scope sensitive wrt
symbol lookups.
g_scanner_scope_foreach_symbol, g_scanner_scope_lookup_symbol,
g_scanner_scope_remove_symbol, g_scanner_scope_add_symbol and
g_scanner_set_scope.
g_scanner_add_symbol, g_scanner_remove_symbol and
g_scanner_foreach_symbol are now aliases for scope 0.
Mon Jul 20 23:05:34 1998 George Lebl <jirka@5z.com> Mon Jul 20 23:05:34 1998 George Lebl <jirka@5z.com>
* glib.h: typo fixed for alphas for gint64 * glib.h: typo fixed for alphas for gint64

11
ChangeLog.pre-2-4
View File

@ -1,3 +1,14 @@
Thu Jul 23 00:29:14 1998 Tim Janik <timj@gtk.org>
* glib.h:
* gscanner.c: new functions to make a scanner scope sensitive wrt
symbol lookups.
g_scanner_scope_foreach_symbol, g_scanner_scope_lookup_symbol,
g_scanner_scope_remove_symbol, g_scanner_scope_add_symbol and
g_scanner_set_scope.
g_scanner_add_symbol, g_scanner_remove_symbol and
g_scanner_foreach_symbol are now aliases for scope 0.
Mon Jul 20 23:05:34 1998 George Lebl <jirka@5z.com> Mon Jul 20 23:05:34 1998 George Lebl <jirka@5z.com>
* glib.h: typo fixed for alphas for gint64 * glib.h: typo fixed for alphas for gint64

11
ChangeLog.pre-2-6
View File

@ -1,3 +1,14 @@
Thu Jul 23 00:29:14 1998 Tim Janik <timj@gtk.org>
* glib.h:
* gscanner.c: new functions to make a scanner scope sensitive wrt
symbol lookups.
g_scanner_scope_foreach_symbol, g_scanner_scope_lookup_symbol,
g_scanner_scope_remove_symbol, g_scanner_scope_add_symbol and
g_scanner_set_scope.
g_scanner_add_symbol, g_scanner_remove_symbol and
g_scanner_foreach_symbol are now aliases for scope 0.
Mon Jul 20 23:05:34 1998 George Lebl <jirka@5z.com> Mon Jul 20 23:05:34 1998 George Lebl <jirka@5z.com>
* glib.h: typo fixed for alphas for gint64 * glib.h: typo fixed for alphas for gint64

11
ChangeLog.pre-2-8
View File

@ -1,3 +1,14 @@
Thu Jul 23 00:29:14 1998 Tim Janik <timj@gtk.org>
* glib.h:
* gscanner.c: new functions to make a scanner scope sensitive wrt
symbol lookups.
g_scanner_scope_foreach_symbol, g_scanner_scope_lookup_symbol,
g_scanner_scope_remove_symbol, g_scanner_scope_add_symbol and
g_scanner_set_scope.
g_scanner_add_symbol, g_scanner_remove_symbol and
g_scanner_foreach_symbol are now aliases for scope 0.
Mon Jul 20 23:05:34 1998 George Lebl <jirka@5z.com> Mon Jul 20 23:05:34 1998 George Lebl <jirka@5z.com>
* glib.h: typo fixed for alphas for gint64 * glib.h: typo fixed for alphas for gint64

41
glib.h
View File

@ -8,7 +8,7 @@
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details. * Library General Public License for more details.
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
@ -447,9 +447,9 @@ typedef unsigned long long guint64;
/* This should never happen */ /* This should never happen */
#endif #endif
typedef gint32 gssize; typedef gint32 gssize;
typedef guint32 gsize; typedef guint32 gsize;
typedef gint32 gtime; typedef gint32 gtime;
typedef guint32 GQuark; typedef guint32 GQuark;
typedef struct _GList GList; typedef struct _GList GList;
@ -526,13 +526,13 @@ struct _GArray
struct _GByteArray struct _GByteArray
{ {
guint8 *data; guint8 *data;
guint len; guint len;
}; };
struct _GPtrArray struct _GPtrArray
{ {
gpointer *pdata; gpointer *pdata;
guint len; guint len;
}; };
struct _GTuples struct _GTuples
@ -543,7 +543,7 @@ struct _GTuples
struct _GDebugKey struct _GDebugKey
{ {
gchar *key; gchar *key;
guint value; guint value;
}; };
struct _GCache { gint dummy; }; struct _GCache { gint dummy; };
@ -1155,6 +1155,7 @@ struct _GScannerConfig
guint identifier_2_string : 1; guint identifier_2_string : 1;
guint char_2_token : 1; /* return G_TOKEN_CHAR? */ guint char_2_token : 1; /* return G_TOKEN_CHAR? */
guint symbol_2_token : 1; guint symbol_2_token : 1;
guint scope_0_fallback : 1; /* try scope 0 on lookups? */
}; };
struct _GScanner struct _GScanner
@ -1193,6 +1194,7 @@ struct _GScanner
guint text_len; guint text_len;
gint input_fd; gint input_fd;
gint peeked_char; gint peeked_char;
guint scope_id;
/* handler function for _warn and _error */ /* handler function for _warn and _error */
GScannerMsgFunc msg_handler; GScannerMsgFunc msg_handler;
@ -1212,15 +1214,23 @@ GValue g_scanner_cur_value (GScanner *scanner);
guint g_scanner_cur_line (GScanner *scanner); guint g_scanner_cur_line (GScanner *scanner);
guint g_scanner_cur_position (GScanner *scanner); guint g_scanner_cur_position (GScanner *scanner);
gboolean g_scanner_eof (GScanner *scanner); gboolean g_scanner_eof (GScanner *scanner);
void g_scanner_add_symbol (GScanner *scanner, guint g_scanner_set_scope (GScanner *scanner,
guint scope_id);
void g_scanner_scope_add_symbol (GScanner *scanner,
guint scope_id,
const gchar *symbol, const gchar *symbol,
gpointer value); gpointer value);
gpointer g_scanner_lookup_symbol (GScanner *scanner, void g_scanner_scope_remove_symbol (GScanner *scanner,
guint scope_id,
const gchar *symbol); const gchar *symbol);
void g_scanner_foreach_symbol (GScanner *scanner, gpointer g_scanner_scope_lookup_symbol (GScanner *scanner,
guint scope_id,
const gchar *symbol);
void g_scanner_scope_foreach_symbol (GScanner *scanner,
guint scope_id,
GHFunc func, GHFunc func,
gpointer func_data); gpointer func_data);
void g_scanner_remove_symbol (GScanner *scanner, gpointer g_scanner_lookup_symbol (GScanner *scanner,
const gchar *symbol); const gchar *symbol);
void g_scanner_freeze_symbol_table (GScanner *scanner); void g_scanner_freeze_symbol_table (GScanner *scanner);
void g_scanner_thaw_symbol_table (GScanner *scanner); void g_scanner_thaw_symbol_table (GScanner *scanner);
@ -1238,6 +1248,17 @@ void g_scanner_warn (GScanner *scanner,
const gchar *format, const gchar *format,
...) G_GNUC_PRINTF (2,3); ...) G_GNUC_PRINTF (2,3);
gint g_scanner_stat_mode (const gchar *filename); gint g_scanner_stat_mode (const gchar *filename);
/* keep downward source compatibility */
#define g_scanner_add_symbol( scanner, symbol, value ) G_STMT_START { \
g_scanner_scope_add_symbol ((scanner), 0, (symbol), (value)); \
} G_STMT_END
#define g_scanner_remove_symbol( scanner, symbol ) G_STMT_START { \
g_scanner_scope_remove_symbol ((scanner), 0, (symbol)); \
} G_STMT_END
#define g_scanner_foreach_symbol( scanner, func, data ) G_STMT_START { \
g_scanner_scope_foreach_symbol ((scanner), 0, (func), (data)); \
} G_STMT_END
/* Completion */ /* Completion */

41
glib/glib.h
View File

@ -8,7 +8,7 @@
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details. * Library General Public License for more details.
* *
* You should have received a copy of the GNU Library General Public * You should have received a copy of the GNU Library General Public
@ -447,9 +447,9 @@ typedef unsigned long long guint64;
/* This should never happen */ /* This should never happen */
#endif #endif
typedef gint32 gssize; typedef gint32 gssize;
typedef guint32 gsize; typedef guint32 gsize;
typedef gint32 gtime; typedef gint32 gtime;
typedef guint32 GQuark; typedef guint32 GQuark;
typedef struct _GList GList; typedef struct _GList GList;
@ -526,13 +526,13 @@ struct _GArray
struct _GByteArray struct _GByteArray
{ {
guint8 *data; guint8 *data;
guint len; guint len;
}; };
struct _GPtrArray struct _GPtrArray
{ {
gpointer *pdata; gpointer *pdata;
guint len; guint len;
}; };
struct _GTuples struct _GTuples
@ -543,7 +543,7 @@ struct _GTuples
struct _GDebugKey struct _GDebugKey
{ {
gchar *key; gchar *key;
guint value; guint value;
}; };
struct _GCache { gint dummy; }; struct _GCache { gint dummy; };
@ -1155,6 +1155,7 @@ struct _GScannerConfig
guint identifier_2_string : 1; guint identifier_2_string : 1;
guint char_2_token : 1; /* return G_TOKEN_CHAR? */ guint char_2_token : 1; /* return G_TOKEN_CHAR? */
guint symbol_2_token : 1; guint symbol_2_token : 1;
guint scope_0_fallback : 1; /* try scope 0 on lookups? */
}; };
struct _GScanner struct _GScanner
@ -1193,6 +1194,7 @@ struct _GScanner
guint text_len; guint text_len;
gint input_fd; gint input_fd;
gint peeked_char; gint peeked_char;
guint scope_id;
/* handler function for _warn and _error */ /* handler function for _warn and _error */
GScannerMsgFunc msg_handler; GScannerMsgFunc msg_handler;
@ -1212,15 +1214,23 @@ GValue g_scanner_cur_value (GScanner *scanner);
guint g_scanner_cur_line (GScanner *scanner); guint g_scanner_cur_line (GScanner *scanner);
guint g_scanner_cur_position (GScanner *scanner); guint g_scanner_cur_position (GScanner *scanner);
gboolean g_scanner_eof (GScanner *scanner); gboolean g_scanner_eof (GScanner *scanner);
void g_scanner_add_symbol (GScanner *scanner, guint g_scanner_set_scope (GScanner *scanner,
guint scope_id);
void g_scanner_scope_add_symbol (GScanner *scanner,
guint scope_id,
const gchar *symbol, const gchar *symbol,
gpointer value); gpointer value);
gpointer g_scanner_lookup_symbol (GScanner *scanner, void g_scanner_scope_remove_symbol (GScanner *scanner,
guint scope_id,
const gchar *symbol); const gchar *symbol);
void g_scanner_foreach_symbol (GScanner *scanner, gpointer g_scanner_scope_lookup_symbol (GScanner *scanner,
guint scope_id,
const gchar *symbol);
void g_scanner_scope_foreach_symbol (GScanner *scanner,
guint scope_id,
GHFunc func, GHFunc func,
gpointer func_data); gpointer func_data);
void g_scanner_remove_symbol (GScanner *scanner, gpointer g_scanner_lookup_symbol (GScanner *scanner,
const gchar *symbol); const gchar *symbol);
void g_scanner_freeze_symbol_table (GScanner *scanner); void g_scanner_freeze_symbol_table (GScanner *scanner);
void g_scanner_thaw_symbol_table (GScanner *scanner); void g_scanner_thaw_symbol_table (GScanner *scanner);
@ -1238,6 +1248,17 @@ void g_scanner_warn (GScanner *scanner,
const gchar *format, const gchar *format,
...) G_GNUC_PRINTF (2,3); ...) G_GNUC_PRINTF (2,3);
gint g_scanner_stat_mode (const gchar *filename); gint g_scanner_stat_mode (const gchar *filename);
/* keep downward source compatibility */
#define g_scanner_add_symbol( scanner, symbol, value ) G_STMT_START { \
g_scanner_scope_add_symbol ((scanner), 0, (symbol), (value)); \
} G_STMT_END
#define g_scanner_remove_symbol( scanner, symbol ) G_STMT_START { \
g_scanner_scope_remove_symbol ((scanner), 0, (symbol)); \
} G_STMT_END
#define g_scanner_foreach_symbol( scanner, func, data ) G_STMT_START { \
g_scanner_scope_foreach_symbol ((scanner), 0, (func), (data)); \
} G_STMT_END
/* Completion */ /* Completion */

361
glib/gscanner.c
View File

@ -45,12 +45,13 @@
/* --- typedefs --- */ /* --- typedefs --- */
typedef struct _GScannerHashVal GScannerHashVal; typedef struct _GScannerKey GScannerKey;
struct _GScannerHashVal struct _GScannerKey
{ {
gchar *key; guint scope_id;
gpointer value; gchar *symbol;
gpointer value;
}; };
@ -96,36 +97,42 @@ static GScannerConfig g_scanner_config_template =
FALSE /* identifier_2_string */, FALSE /* identifier_2_string */,
TRUE /* char_2_token */, TRUE /* char_2_token */,
FALSE /* symbol_2_token */, FALSE /* symbol_2_token */,
FALSE /* scope_0_fallback */,
}; };
/* --- prototypes --- */ /* --- prototypes --- */
extern char* g_vsprintf (gchar *fmt, va_list *args, va_list *args2); extern char* g_vsprintf (gchar *fmt, va_list *args, va_list *args2);
static GScannerHashVal* g_scanner_lookup_internal (GScanner *scanner, static inline
const gchar *symbol); gint g_scanner_char_2_num (guchar c,
static void g_scanner_get_token_ll (GScanner *scanner, guchar base);
GTokenType *token_p, static inline
GValue *value_p, GScannerKey* g_scanner_lookup_internal (GScanner *scanner,
guint *line_p, guint scope_id,
guint *position_p); const gchar *symbol);
static void g_scanner_get_token_i (GScanner *scanner, static gint g_scanner_key_equal (gconstpointer v1,
GTokenType *token_p, gconstpointer v2);
GValue *value_p, static guint g_scanner_key_hash (gconstpointer v);
guint *line_p, static void g_scanner_get_token_ll (GScanner *scanner,
guint *position_p); GTokenType *token_p,
static void g_scanner_free_value (GTokenType *token_p, GValue *value_p,
GValue *value_p); guint *line_p,
guint *position_p);
static void g_scanner_get_token_i (GScanner *scanner,
GTokenType *token_p,
GValue *value_p,
guint *line_p,
guint *position_p);
static void g_scanner_free_value (GTokenType *token_p,
GValue *value_p);
static inline static guchar g_scanner_peek_next_char (GScanner *scanner);
gint g_scanner_char_2_num (guchar c, static guchar g_scanner_get_char (GScanner *scanner,
guchar base); guint *line_p,
static guchar g_scanner_peek_next_char(GScanner *scanner); guint *position_p);
static guchar g_scanner_get_char (GScanner *scanner, static void g_scanner_msg_handler (GScanner *scanner,
guint *line_p, gchar *message,
guint *position_p); gint is_error);
static void g_scanner_msg_handler (GScanner *scanner,
gchar *message,
gint is_error);
/* --- functions --- */ /* --- functions --- */
@ -190,6 +197,7 @@ g_scanner_new (GScannerConfig *config_templ)
scanner->config->identifier_2_string = config_templ->identifier_2_string; scanner->config->identifier_2_string = config_templ->identifier_2_string;
scanner->config->char_2_token = config_templ->char_2_token; scanner->config->char_2_token = config_templ->char_2_token;
scanner->config->symbol_2_token = config_templ->symbol_2_token; scanner->config->symbol_2_token = config_templ->symbol_2_token;
scanner->config->scope_0_fallback = config_templ->scope_0_fallback;
scanner->token = G_TOKEN_NONE; scanner->token = G_TOKEN_NONE;
scanner->value.v_int = 0; scanner->value.v_int = 0;
@ -201,11 +209,12 @@ g_scanner_new (GScannerConfig *config_templ)
scanner->next_line = 1; scanner->next_line = 1;
scanner->next_position = 0; scanner->next_position = 0;
scanner->symbol_table = g_hash_table_new (g_str_hash, g_str_equal); scanner->symbol_table = g_hash_table_new (g_scanner_key_hash, g_scanner_key_equal);
scanner->text = NULL; scanner->text = NULL;
scanner->text_len = 0; scanner->text_len = 0;
scanner->input_fd = -1; scanner->input_fd = -1;
scanner->peeked_char = -1; scanner->peeked_char = -1;
scanner->scope_id = 0;
scanner->msg_handler = g_scanner_msg_handler; scanner->msg_handler = g_scanner_msg_handler;
@ -213,12 +222,14 @@ g_scanner_new (GScannerConfig *config_templ)
} }
static void static void
g_scanner_destroy_symbol_table_entry (gpointer key, g_scanner_destroy_symbol_table_entry (gpointer _key,
gpointer value, gpointer _value,
gpointer user_data) gpointer _data)
{ {
GScannerKey *key = _key;
g_free (key->symbol);
g_free (key); g_free (key);
g_free (value);
} }
void void
@ -227,7 +238,7 @@ g_scanner_destroy (GScanner *scanner)
g_return_if_fail (scanner != NULL); g_return_if_fail (scanner != NULL);
g_hash_table_foreach (scanner->symbol_table, g_hash_table_foreach (scanner->symbol_table,
g_scanner_destroy_symbol_table_entry, NULL); g_scanner_destroy_symbol_table_entry, NULL);
g_hash_table_destroy (scanner->symbol_table); g_hash_table_destroy (scanner->symbol_table);
g_scanner_free_value (&scanner->token, &scanner->value); g_scanner_free_value (&scanner->token, &scanner->value);
g_scanner_free_value (&scanner->next_token, &scanner->next_value); g_scanner_free_value (&scanner->next_token, &scanner->next_value);
@ -236,7 +247,7 @@ g_scanner_destroy (GScanner *scanner)
} }
static void static void
g_scanner_msg_handler (GScanner *scanner, g_scanner_msg_handler (GScanner *scanner,
gchar *message, gchar *message,
gint is_error) gint is_error)
{ {
@ -249,8 +260,8 @@ g_scanner_msg_handler (GScanner *scanner,
} }
void void
g_scanner_error (GScanner *scanner, g_scanner_error (GScanner *scanner,
const gchar *format, const gchar *format,
...) ...)
{ {
g_return_if_fail (scanner != NULL); g_return_if_fail (scanner != NULL);
@ -341,107 +352,222 @@ g_scanner_input_text (GScanner *scanner,
scanner->peeked_char = -1; scanner->peeked_char = -1;
} }
void static gint
g_scanner_add_symbol (GScanner *scanner, g_scanner_key_equal (gconstpointer v1,
const gchar *symbol, gconstpointer v2)
gpointer value)
{ {
register GScannerHashVal *hash_val; register const GScannerKey *key1 = v1;
register const GScannerKey *key2 = v2;
return (key1->scope_id == key2->scope_id) && (strcmp (key1->symbol, key2->symbol) == 0);
}
static guint
g_scanner_key_hash (gconstpointer v)
{
register const GScannerKey *key = v;
register gchar *c;
register guint h;
h = key->scope_id;
for (c = key->symbol; *c; c++)
{
register guint g;
h = (h << 4) + *c;
g = h & 0xf0000000;
if (g)
{
h = h ^ (g >> 24);
h = h ^ g;
}
}
return h;
}
static inline GScannerKey*
g_scanner_lookup_internal (GScanner *scanner,
guint scope_id,
const gchar *symbol)
{
register GScannerKey *key_p;
GScannerKey key;
key.scope_id = scope_id;
if (!scanner->config->case_sensitive)
{
register gchar *d;
register const gchar *c;
key.symbol = g_new (gchar, strlen (symbol) + 1);
for (d = key.symbol, c = symbol; *c; c++, d++)
*d = to_lower (*c);
*d = 0;
key_p = g_hash_table_lookup (scanner->symbol_table, &key);
g_free (key.symbol);
}
else
{
key.symbol = (gchar*) symbol;
key_p = g_hash_table_lookup (scanner->symbol_table, &key);
}
return key_p;
}
void
g_scanner_scope_add_symbol (GScanner *scanner,
guint scope_id,
const gchar *symbol,
gpointer value)
{
register GScannerKey *key;
g_return_if_fail (scanner != NULL); g_return_if_fail (scanner != NULL);
g_return_if_fail (symbol != NULL); g_return_if_fail (symbol != NULL);
hash_val = g_scanner_lookup_internal (scanner, symbol); key = g_scanner_lookup_internal (scanner, scope_id, symbol);
if (!hash_val) if (!key)
{ {
hash_val = g_new (GScannerHashVal, 1); key = g_new (GScannerKey, 1);
hash_val->key = g_strdup (symbol); key->scope_id = scope_id;
hash_val->value = value; key->symbol = g_strdup (symbol);
key->value = value;
if (!scanner->config->case_sensitive) if (!scanner->config->case_sensitive)
{ {
register guint i, l; register gchar *c;
l = strlen (hash_val->key); c = key->symbol;
for (i = 0; i < l; i++) while (*c != 0)
hash_val->key[i] = to_lower (hash_val->key[i]); {
*c = to_lower (*c);
c++;
}
} }
g_hash_table_insert (scanner->symbol_table, hash_val->key, hash_val); g_hash_table_insert (scanner->symbol_table, key, key);
} }
else else
hash_val->value = value; key->value = value;
}
void
g_scanner_scope_remove_symbol (GScanner *scanner,
guint scope_id,
const gchar *symbol)
{
register GScannerKey *key;
g_return_if_fail (scanner != NULL);
g_return_if_fail (symbol != NULL);
key = g_scanner_lookup_internal (scanner, scope_id, symbol);
if (key)
{
g_hash_table_remove (scanner->symbol_table, key);
g_free (key->symbol);
g_free (key);
}
} }
gpointer gpointer
g_scanner_lookup_symbol (GScanner *scanner, g_scanner_lookup_symbol (GScanner *scanner,
const gchar *symbol) const gchar *symbol)
{ {
register GScannerHashVal *hash_val; register GScannerKey *key;
register guint scope_id;
g_return_val_if_fail (scanner != NULL, NULL);
if (!symbol)
return NULL;
scope_id = scanner->scope_id;
key = g_scanner_lookup_internal (scanner, scope_id, symbol);
if (!key && scope_id && scanner->config->scope_0_fallback)
key = g_scanner_lookup_internal (scanner, 0, symbol);
if (key)
return key->value;
else
return NULL;
}
gpointer
g_scanner_scope_lookup_symbol (GScanner *scanner,
guint scope_id,
const gchar *symbol)
{
register GScannerKey *key;
g_return_val_if_fail (scanner != NULL, NULL); g_return_val_if_fail (scanner != NULL, NULL);
if (!symbol) if (!symbol)
return NULL; return NULL;
hash_val = g_scanner_lookup_internal (scanner, symbol); key = g_scanner_lookup_internal (scanner, scope_id, symbol);
if (hash_val) if (key)
return hash_val->value; return key->value;
else else
return NULL; return NULL;
} }
static void guint
g_scanner_foreach_internal (gpointer key, g_scanner_set_scope (GScanner *scanner,
gpointer value, guint scope_id)
gpointer user_data)
{ {
register GScannerHashVal *hash_val; register guint old_scope_id;
g_return_val_if_fail (scanner != NULL, 0);
old_scope_id = scanner->scope_id;
scanner->scope_id = scope_id;
return old_scope_id;
}
static void
g_scanner_foreach_internal (gpointer _key,
gpointer _value,
gpointer _user_data)
{
register GScannerKey *key;
register gpointer *d;
register GHFunc func; register GHFunc func;
register gpointer func_data; register gpointer func_data;
register gpointer *d; register guint *scope_id;
d = user_data; d = _user_data;
func = (GHFunc)d[0]; func = (GHFunc) d[0];
func_data = d[1]; func_data = d[1];
hash_val = value; scope_id = d[2];
key = _value;
func (key, hash_val->value, func_data); if (key->scope_id == *scope_id)
func (key->symbol, key->value, func_data);
} }
void void
g_scanner_foreach_symbol (GScanner *scanner, g_scanner_scope_foreach_symbol (GScanner *scanner,
GHFunc func, guint scope_id,
gpointer func_data) GHFunc func,
gpointer func_data)
{ {
gpointer d[2]; gpointer d[3];
g_return_if_fail (scanner != NULL); g_return_if_fail (scanner != NULL);
d[0] = (gpointer)func; d[0] = (gpointer) func;
d[1] = func_data; d[1] = func_data;
d[2] = &scope_id;
g_hash_table_foreach (scanner->symbol_table, g_scanner_foreach_internal, d); g_hash_table_foreach (scanner->symbol_table, g_scanner_foreach_internal, d);
} }
void
g_scanner_remove_symbol (GScanner *scanner,
const gchar *symbol)
{
register GScannerHashVal *hash_val;
g_return_if_fail (scanner != NULL);
hash_val = g_scanner_lookup_internal (scanner, symbol);
if (hash_val)
{
g_hash_table_remove (scanner->symbol_table, hash_val->key);
g_free (hash_val->key);
g_free (hash_val);
}
}
void void
g_scanner_freeze_symbol_table (GScanner *scanner) g_scanner_freeze_symbol_table (GScanner *scanner)
{ {
@ -545,31 +671,6 @@ g_scanner_eof (GScanner *scanner)
return scanner->token == G_TOKEN_EOF; return scanner->token == G_TOKEN_EOF;
} }
static GScannerHashVal*
g_scanner_lookup_internal (GScanner *scanner,
const gchar *symbol)
{
register GScannerHashVal *hash_val;
if (!scanner->config->case_sensitive)
{
register gchar *buffer;
register guint i, l;
l = strlen (symbol);
buffer = g_new (gchar, l + 1);
for (i = 0; i < l; i++)
buffer[i] = to_lower (symbol[i]);
buffer[i] = 0;
hash_val = g_hash_table_lookup (scanner->symbol_table, buffer);
g_free (buffer);
}
else
hash_val = g_hash_table_lookup (scanner->symbol_table, (gchar*) symbol);
return hash_val;
}
static guchar static guchar
g_scanner_peek_next_char (GScanner *scanner) g_scanner_peek_next_char (GScanner *scanner)
{ {
@ -676,7 +777,7 @@ g_scanner_unexp_token (GScanner *scanner,
register guint expected_string_len; register guint expected_string_len;
register gchar *message_prefix; register gchar *message_prefix;
register gboolean print_unexp; register gboolean print_unexp;
void (*msg_handler) (GScanner*, const gchar*, ...); void (*msg_handler) (GScanner*, const gchar*, ...);
g_return_if_fail (scanner != NULL); g_return_if_fail (scanner != NULL);
@ -944,7 +1045,7 @@ gint
g_scanner_stat_mode (const gchar *filename) g_scanner_stat_mode (const gchar *filename)
{ {
struct stat *stat_buf; struct stat *stat_buf;
gint st_mode; gint st_mode;
stat_buf = g_new0 (struct stat, 1); stat_buf = g_new0 (struct stat, 1);
@ -1001,19 +1102,19 @@ g_scanner_get_token_i (GScanner *scanner,
switch (*token_p) switch (*token_p)
{ {
case G_TOKEN_IDENTIFIER: case G_TOKEN_IDENTIFIER:
if (scanner->config->identifier_2_string) if (scanner->config->identifier_2_string)
*token_p = G_TOKEN_STRING; *token_p = G_TOKEN_STRING;
break; break;
case G_TOKEN_SYMBOL: case G_TOKEN_SYMBOL:
if (scanner->config->symbol_2_token) if (scanner->config->symbol_2_token)
*token_p = (GTokenType) value_p->v_symbol; *token_p = (GTokenType) value_p->v_symbol;
break; break;
case G_TOKEN_BINARY: case G_TOKEN_BINARY:
case G_TOKEN_OCTAL: case G_TOKEN_OCTAL:
case G_TOKEN_HEX: case G_TOKEN_HEX:
if (scanner->config->numbers_2_int) if (scanner->config->numbers_2_int)
*token_p = G_TOKEN_INT; *token_p = G_TOKEN_INT;
break; break;
@ -1531,15 +1632,19 @@ g_scanner_get_token_ll (GScanner *scanner,
if (token == G_TOKEN_IDENTIFIER && if (token == G_TOKEN_IDENTIFIER &&
config->scan_symbols) config->scan_symbols)
{ {
register GScannerHashVal *hash_val; register GScannerKey *key;
register guint scope_id;
scope_id = scanner->scope_id;
key = g_scanner_lookup_internal (scanner, scope_id, value.v_identifier);
if (!key && scope_id && scanner->config->scope_0_fallback)
key = g_scanner_lookup_internal (scanner, 0, value.v_identifier);
hash_val = g_scanner_lookup_internal (scanner, value.v_identifier); if (key)
if (hash_val)
{ {
g_free (value.v_identifier); g_free (value.v_identifier);
token = G_TOKEN_SYMBOL; token = G_TOKEN_SYMBOL;
value.v_symbol = hash_val->value; value.v_symbol = key->value;
} }
} }

6
glibconfig.h.in
View File

@ -50,15 +50,15 @@
/* The number of bytes in a long. */ /* The number of bytes in a long. */
#undef SIZEOF_LONG #undef SIZEOF_LONG
/* The number of bytes in a long long. */
#undef SIZEOF_LONG_LONG
/* The number of bytes in a short. */ /* The number of bytes in a short. */
#undef SIZEOF_SHORT #undef SIZEOF_SHORT
/* The number of bytes in a void *. */ /* The number of bytes in a void *. */
#undef SIZEOF_VOID_P #undef SIZEOF_VOID_P
/* The number of bytes in a long long. */
#undef SIZEOF_LONG_LONG
/* Define if you have the atexit function. */ /* Define if you have the atexit function. */
#undef HAVE_ATEXIT #undef HAVE_ATEXIT

361
gscanner.c
View File

@ -45,12 +45,13 @@
/* --- typedefs --- */ /* --- typedefs --- */
typedef struct _GScannerHashVal GScannerHashVal; typedef struct _GScannerKey GScannerKey;
struct _GScannerHashVal struct _GScannerKey
{ {
gchar *key; guint scope_id;
gpointer value; gchar *symbol;
gpointer value;
}; };
@ -96,36 +97,42 @@ static GScannerConfig g_scanner_config_template =
FALSE /* identifier_2_string */, FALSE /* identifier_2_string */,
TRUE /* char_2_token */, TRUE /* char_2_token */,
FALSE /* symbol_2_token */, FALSE /* symbol_2_token */,
FALSE /* scope_0_fallback */,
}; };
/* --- prototypes --- */ /* --- prototypes --- */
extern char* g_vsprintf (gchar *fmt, va_list *args, va_list *args2); extern char* g_vsprintf (gchar *fmt, va_list *args, va_list *args2);
static GScannerHashVal* g_scanner_lookup_internal (GScanner *scanner, static inline
const gchar *symbol); gint g_scanner_char_2_num (guchar c,
static void g_scanner_get_token_ll (GScanner *scanner, guchar base);
GTokenType *token_p, static inline
GValue *value_p, GScannerKey* g_scanner_lookup_internal (GScanner *scanner,
guint *line_p, guint scope_id,
guint *position_p); const gchar *symbol);
static void g_scanner_get_token_i (GScanner *scanner, static gint g_scanner_key_equal (gconstpointer v1,
GTokenType *token_p, gconstpointer v2);
GValue *value_p, static guint g_scanner_key_hash (gconstpointer v);
guint *line_p, static void g_scanner_get_token_ll (GScanner *scanner,
guint *position_p); GTokenType *token_p,
static void g_scanner_free_value (GTokenType *token_p, GValue *value_p,
GValue *value_p); guint *line_p,
guint *position_p);
static void g_scanner_get_token_i (GScanner *scanner,
GTokenType *token_p,
GValue *value_p,
guint *line_p,
guint *position_p);
static void g_scanner_free_value (GTokenType *token_p,
GValue *value_p);
static inline static guchar g_scanner_peek_next_char (GScanner *scanner);
gint g_scanner_char_2_num (guchar c, static guchar g_scanner_get_char (GScanner *scanner,
guchar base); guint *line_p,
static guchar g_scanner_peek_next_char(GScanner *scanner); guint *position_p);
static guchar g_scanner_get_char (GScanner *scanner, static void g_scanner_msg_handler (GScanner *scanner,
guint *line_p, gchar *message,
guint *position_p); gint is_error);
static void g_scanner_msg_handler (GScanner *scanner,
gchar *message,
gint is_error);
/* --- functions --- */ /* --- functions --- */
@ -190,6 +197,7 @@ g_scanner_new (GScannerConfig *config_templ)
scanner->config->identifier_2_string = config_templ->identifier_2_string; scanner->config->identifier_2_string = config_templ->identifier_2_string;
scanner->config->char_2_token = config_templ->char_2_token; scanner->config->char_2_token = config_templ->char_2_token;
scanner->config->symbol_2_token = config_templ->symbol_2_token; scanner->config->symbol_2_token = config_templ->symbol_2_token;
scanner->config->scope_0_fallback = config_templ->scope_0_fallback;
scanner->token = G_TOKEN_NONE; scanner->token = G_TOKEN_NONE;
scanner->value.v_int = 0; scanner->value.v_int = 0;
@ -201,11 +209,12 @@ g_scanner_new (GScannerConfig *config_templ)
scanner->next_line = 1; scanner->next_line = 1;
scanner->next_position = 0; scanner->next_position = 0;
scanner->symbol_table = g_hash_table_new (g_str_hash, g_str_equal); scanner->symbol_table = g_hash_table_new (g_scanner_key_hash, g_scanner_key_equal);
scanner->text = NULL; scanner->text = NULL;
scanner->text_len = 0; scanner->text_len = 0;
scanner->input_fd = -1; scanner->input_fd = -1;
scanner->peeked_char = -1; scanner->peeked_char = -1;
scanner->scope_id = 0;
scanner->msg_handler = g_scanner_msg_handler; scanner->msg_handler = g_scanner_msg_handler;
@ -213,12 +222,14 @@ g_scanner_new (GScannerConfig *config_templ)
} }
static void static void
g_scanner_destroy_symbol_table_entry (gpointer key, g_scanner_destroy_symbol_table_entry (gpointer _key,
gpointer value, gpointer _value,
gpointer user_data) gpointer _data)
{ {
GScannerKey *key = _key;
g_free (key->symbol);
g_free (key); g_free (key);
g_free (value);
} }
void void
@ -227,7 +238,7 @@ g_scanner_destroy (GScanner *scanner)
g_return_if_fail (scanner != NULL); g_return_if_fail (scanner != NULL);
g_hash_table_foreach (scanner->symbol_table, g_hash_table_foreach (scanner->symbol_table,
g_scanner_destroy_symbol_table_entry, NULL); g_scanner_destroy_symbol_table_entry, NULL);
g_hash_table_destroy (scanner->symbol_table); g_hash_table_destroy (scanner->symbol_table);
g_scanner_free_value (&scanner->token, &scanner->value); g_scanner_free_value (&scanner->token, &scanner->value);
g_scanner_free_value (&scanner->next_token, &scanner->next_value); g_scanner_free_value (&scanner->next_token, &scanner->next_value);
@ -236,7 +247,7 @@ g_scanner_destroy (GScanner *scanner)
} }
static void static void
g_scanner_msg_handler (GScanner *scanner, g_scanner_msg_handler (GScanner *scanner,
gchar *message, gchar *message,
gint is_error) gint is_error)
{ {
@ -249,8 +260,8 @@ g_scanner_msg_handler (GScanner *scanner,
} }
void void
g_scanner_error (GScanner *scanner, g_scanner_error (GScanner *scanner,
const gchar *format, const gchar *format,
...) ...)
{ {
g_return_if_fail (scanner != NULL); g_return_if_fail (scanner != NULL);
@ -341,107 +352,222 @@ g_scanner_input_text (GScanner *scanner,
scanner->peeked_char = -1; scanner->peeked_char = -1;
} }
void static gint
g_scanner_add_symbol (GScanner *scanner, g_scanner_key_equal (gconstpointer v1,
const gchar *symbol, gconstpointer v2)
gpointer value)
{ {
register GScannerHashVal *hash_val; register const GScannerKey *key1 = v1;
register const GScannerKey *key2 = v2;
return (key1->scope_id == key2->scope_id) && (strcmp (key1->symbol, key2->symbol) == 0);
}
static guint
g_scanner_key_hash (gconstpointer v)
{
register const GScannerKey *key = v;
register gchar *c;
register guint h;
h = key->scope_id;
for (c = key->symbol; *c; c++)
{
register guint g;
h = (h << 4) + *c;
g = h & 0xf0000000;
if (g)
{
h = h ^ (g >> 24);
h = h ^ g;
}
}
return h;
}
static inline GScannerKey*
g_scanner_lookup_internal (GScanner *scanner,
guint scope_id,
const gchar *symbol)
{
register GScannerKey *key_p;
GScannerKey key;
key.scope_id = scope_id;
if (!scanner->config->case_sensitive)
{
register gchar *d;
register const gchar *c;
key.symbol = g_new (gchar, strlen (symbol) + 1);
for (d = key.symbol, c = symbol; *c; c++, d++)
*d = to_lower (*c);
*d = 0;
key_p = g_hash_table_lookup (scanner->symbol_table, &key);
g_free (key.symbol);
}
else
{
key.symbol = (gchar*) symbol;
key_p = g_hash_table_lookup (scanner->symbol_table, &key);
}
return key_p;
}
void
g_scanner_scope_add_symbol (GScanner *scanner,
guint scope_id,
const gchar *symbol,
gpointer value)
{
register GScannerKey *key;
g_return_if_fail (scanner != NULL); g_return_if_fail (scanner != NULL);
g_return_if_fail (symbol != NULL); g_return_if_fail (symbol != NULL);
hash_val = g_scanner_lookup_internal (scanner, symbol); key = g_scanner_lookup_internal (scanner, scope_id, symbol);
if (!hash_val) if (!key)
{ {
hash_val = g_new (GScannerHashVal, 1); key = g_new (GScannerKey, 1);
hash_val->key = g_strdup (symbol); key->scope_id = scope_id;
hash_val->value = value; key->symbol = g_strdup (symbol);
key->value = value;
if (!scanner->config->case_sensitive) if (!scanner->config->case_sensitive)
{ {
register guint i, l; register gchar *c;
l = strlen (hash_val->key); c = key->symbol;
for (i = 0; i < l; i++) while (*c != 0)
hash_val->key[i] = to_lower (hash_val->key[i]); {
*c = to_lower (*c);
c++;
}
} }
g_hash_table_insert (scanner->symbol_table, hash_val->key, hash_val); g_hash_table_insert (scanner->symbol_table, key, key);
} }
else else
hash_val->value = value; key->value = value;
}
void
g_scanner_scope_remove_symbol (GScanner *scanner,
guint scope_id,
const gchar *symbol)
{
register GScannerKey *key;
g_return_if_fail (scanner != NULL);
g_return_if_fail (symbol != NULL);
key = g_scanner_lookup_internal (scanner, scope_id, symbol);
if (key)
{
g_hash_table_remove (scanner->symbol_table, key);
g_free (key->symbol);
g_free (key);
}
} }
gpointer gpointer
g_scanner_lookup_symbol (GScanner *scanner, g_scanner_lookup_symbol (GScanner *scanner,
const gchar *symbol) const gchar *symbol)
{ {
register GScannerHashVal *hash_val; register GScannerKey *key;
register guint scope_id;
g_return_val_if_fail (scanner != NULL, NULL);
if (!symbol)
return NULL;
scope_id = scanner->scope_id;
key = g_scanner_lookup_internal (scanner, scope_id, symbol);
if (!key && scope_id && scanner->config->scope_0_fallback)
key = g_scanner_lookup_internal (scanner, 0, symbol);
if (key)
return key->value;
else
return NULL;
}
gpointer
g_scanner_scope_lookup_symbol (GScanner *scanner,
guint scope_id,
const gchar *symbol)
{
register GScannerKey *key;
g_return_val_if_fail (scanner != NULL, NULL); g_return_val_if_fail (scanner != NULL, NULL);
if (!symbol) if (!symbol)
return NULL; return NULL;
hash_val = g_scanner_lookup_internal (scanner, symbol); key = g_scanner_lookup_internal (scanner, scope_id, symbol);
if (hash_val) if (key)
return hash_val->value; return key->value;
else else
return NULL; return NULL;
} }
static void guint
g_scanner_foreach_internal (gpointer key, g_scanner_set_scope (GScanner *scanner,
gpointer value, guint scope_id)
gpointer user_data)
{ {
register GScannerHashVal *hash_val; register guint old_scope_id;
g_return_val_if_fail (scanner != NULL, 0);
old_scope_id = scanner->scope_id;
scanner->scope_id = scope_id;
return old_scope_id;
}
static void
g_scanner_foreach_internal (gpointer _key,
gpointer _value,
gpointer _user_data)
{
register GScannerKey *key;
register gpointer *d;
register GHFunc func; register GHFunc func;
register gpointer func_data; register gpointer func_data;
register gpointer *d; register guint *scope_id;
d = user_data; d = _user_data;
func = (GHFunc)d[0]; func = (GHFunc) d[0];
func_data = d[1]; func_data = d[1];
hash_val = value; scope_id = d[2];
key = _value;
func (key, hash_val->value, func_data); if (key->scope_id == *scope_id)
func (key->symbol, key->value, func_data);
} }
void void
g_scanner_foreach_symbol (GScanner *scanner, g_scanner_scope_foreach_symbol (GScanner *scanner,
GHFunc func, guint scope_id,
gpointer func_data) GHFunc func,
gpointer func_data)
{ {
gpointer d[2]; gpointer d[3];
g_return_if_fail (scanner != NULL); g_return_if_fail (scanner != NULL);
d[0] = (gpointer)func; d[0] = (gpointer) func;
d[1] = func_data; d[1] = func_data;
d[2] = &scope_id;
g_hash_table_foreach (scanner->symbol_table, g_scanner_foreach_internal, d); g_hash_table_foreach (scanner->symbol_table, g_scanner_foreach_internal, d);
} }
void
g_scanner_remove_symbol (GScanner *scanner,
const gchar *symbol)
{
register GScannerHashVal *hash_val;
g_return_if_fail (scanner != NULL);
hash_val = g_scanner_lookup_internal (scanner, symbol);
if (hash_val)
{
g_hash_table_remove (scanner->symbol_table, hash_val->key);
g_free (hash_val->key);
g_free (hash_val);
}
}
void void
g_scanner_freeze_symbol_table (GScanner *scanner) g_scanner_freeze_symbol_table (GScanner *scanner)
{ {
@ -545,31 +671,6 @@ g_scanner_eof (GScanner *scanner)
return scanner->token == G_TOKEN_EOF; return scanner->token == G_TOKEN_EOF;
} }
static GScannerHashVal*
g_scanner_lookup_internal (GScanner *scanner,
const gchar *symbol)
{
register GScannerHashVal *hash_val;
if (!scanner->config->case_sensitive)
{
register gchar *buffer;
register guint i, l;
l = strlen (symbol);
buffer = g_new (gchar, l + 1);
for (i = 0; i < l; i++)
buffer[i] = to_lower (symbol[i]);
buffer[i] = 0;
hash_val = g_hash_table_lookup (scanner->symbol_table, buffer);
g_free (buffer);
}
else
hash_val = g_hash_table_lookup (scanner->symbol_table, (gchar*) symbol);
return hash_val;
}
static guchar static guchar
g_scanner_peek_next_char (GScanner *scanner) g_scanner_peek_next_char (GScanner *scanner)
{ {
@ -676,7 +777,7 @@ g_scanner_unexp_token (GScanner *scanner,
register guint expected_string_len; register guint expected_string_len;
register gchar *message_prefix; register gchar *message_prefix;
register gboolean print_unexp; register gboolean print_unexp;
void (*msg_handler) (GScanner*, const gchar*, ...); void (*msg_handler) (GScanner*, const gchar*, ...);
g_return_if_fail (scanner != NULL); g_return_if_fail (scanner != NULL);
@ -944,7 +1045,7 @@ gint
g_scanner_stat_mode (const gchar *filename) g_scanner_stat_mode (const gchar *filename)
{ {
struct stat *stat_buf; struct stat *stat_buf;
gint st_mode; gint st_mode;
stat_buf = g_new0 (struct stat, 1); stat_buf = g_new0 (struct stat, 1);
@ -1001,19 +1102,19 @@ g_scanner_get_token_i (GScanner *scanner,
switch (*token_p) switch (*token_p)
{ {
case G_TOKEN_IDENTIFIER: case G_TOKEN_IDENTIFIER:
if (scanner->config->identifier_2_string) if (scanner->config->identifier_2_string)
*token_p = G_TOKEN_STRING; *token_p = G_TOKEN_STRING;
break; break;
case G_TOKEN_SYMBOL: case G_TOKEN_SYMBOL:
if (scanner->config->symbol_2_token) if (scanner->config->symbol_2_token)
*token_p = (GTokenType) value_p->v_symbol; *token_p = (GTokenType) value_p->v_symbol;
break; break;
case G_TOKEN_BINARY: case G_TOKEN_BINARY:
case G_TOKEN_OCTAL: case G_TOKEN_OCTAL:
case G_TOKEN_HEX: case G_TOKEN_HEX:
if (scanner->config->numbers_2_int) if (scanner->config->numbers_2_int)
*token_p = G_TOKEN_INT; *token_p = G_TOKEN_INT;
break; break;
@ -1531,15 +1632,19 @@ g_scanner_get_token_ll (GScanner *scanner,
if (token == G_TOKEN_IDENTIFIER && if (token == G_TOKEN_IDENTIFIER &&
config->scan_symbols) config->scan_symbols)
{ {
register GScannerHashVal *hash_val; register GScannerKey *key;
register guint scope_id;
scope_id = scanner->scope_id;
key = g_scanner_lookup_internal (scanner, scope_id, value.v_identifier);
if (!key && scope_id && scanner->config->scope_0_fallback)
key = g_scanner_lookup_internal (scanner, 0, value.v_identifier);
hash_val = g_scanner_lookup_internal (scanner, value.v_identifier); if (key)
if (hash_val)
{ {
g_free (value.v_identifier); g_free (value.v_identifier);
token = G_TOKEN_SYMBOL; token = G_TOKEN_SYMBOL;
value.v_symbol = hash_val->value; value.v_symbol = key->value;
} }
} }