X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=glib%2Fgscanner.c;h=52b770a61fdf89f1a949bb38ea0c9f5c949ef71a;hb=9f5afe3966d31ef6f1e880d950206a0325e6c777;hp=2bb0f471a319451ba3a84335d98d43777d121bc8;hpb=7428120d37820cfc6a16c324e1d23366039a21d3;p=platform%2Fupstream%2Fglib.git diff --git a/glib/gscanner.c b/glib/gscanner.c index 2bb0f47..52b770a 100644 --- a/glib/gscanner.c +++ b/glib/gscanner.c @@ -5,37 +5,275 @@ * Copyright (C) 1997, 1998 Tim Janik * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * 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. * * This library 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 - * Library General Public License for more details. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see . */ -#define __gscanner_c__ - -#include -#include -#include -#include -#include "glib.h" -#ifdef HAVE_UNISTD_H -#include + +/* + * Modified by the GLib Team and others 1997-2000. See the AUTHORS + * file for a list of people on the GLib Team. See the ChangeLog + * files for a list of changes. These files are distributed with + * GLib at ftp://ftp.gtk.org/pub/gtk/. + */ + +/* + * MT safe + */ + +#include "config.h" + +#include +#include +#include +#include +#include + +#include "gscanner.h" + +#include "gprintfint.h" +#include "gstrfuncs.h" +#include "gstring.h" +#include "gtestutils.h" + +#ifdef G_OS_UNIX +#include #endif -#include -#include /* needed for sys/stat.h */ -#include -#ifdef _MSC_VER -#include /* For _read() */ +#ifdef G_OS_WIN32 +#include #endif + +/** + * SECTION:scanner + * @title: Lexical Scanner + * @short_description: a general purpose lexical scanner + * + * The #GScanner and its associated functions provide a + * general purpose lexical scanner. + */ + +/** + * GScannerMsgFunc: + * @scanner: a #GScanner + * @message: the message + * @error: %TRUE if the message signals an error, + * %FALSE if it signals a warning. + * + * Specifies the type of the message handler function. + */ + +/** + * G_CSET_a_2_z: + * + * The set of lowercase ASCII alphabet characters. + * Used for specifying valid identifier characters + * in #GScannerConfig. + */ + +/** + * G_CSET_A_2_Z: + * + * The set of uppercase ASCII alphabet characters. + * Used for specifying valid identifier characters + * in #GScannerConfig. + */ + +/** + * G_CSET_DIGITS: + * + * The set of ASCII digits. + * Used for specifying valid identifier characters + * in #GScannerConfig. + */ + +/** + * G_CSET_LATINC: + * + * The set of uppercase ISO 8859-1 alphabet characters + * which are not ASCII characters. + * Used for specifying valid identifier characters + * in #GScannerConfig. + */ + +/** + * G_CSET_LATINS: + * + * The set of lowercase ISO 8859-1 alphabet characters + * which are not ASCII characters. + * Used for specifying valid identifier characters + * in #GScannerConfig. + */ + +/** + * GTokenType: + * @G_TOKEN_EOF: the end of the file + * @G_TOKEN_LEFT_PAREN: a '(' character + * @G_TOKEN_LEFT_CURLY: a '{' character + * @G_TOKEN_LEFT_BRACE: a '[' character + * @G_TOKEN_RIGHT_CURLY: a '}' character + * @G_TOKEN_RIGHT_PAREN: a ')' character + * @G_TOKEN_RIGHT_BRACE: a ']' character + * @G_TOKEN_EQUAL_SIGN: a '=' character + * @G_TOKEN_COMMA: a ',' character + * @G_TOKEN_NONE: not a token + * @G_TOKEN_ERROR: an error occurred + * @G_TOKEN_CHAR: a character + * @G_TOKEN_BINARY: a binary integer + * @G_TOKEN_OCTAL: an octal integer + * @G_TOKEN_INT: an integer + * @G_TOKEN_HEX: a hex integer + * @G_TOKEN_FLOAT: a floating point number + * @G_TOKEN_STRING: a string + * @G_TOKEN_SYMBOL: a symbol + * @G_TOKEN_IDENTIFIER: an identifier + * @G_TOKEN_IDENTIFIER_NULL: a null identifier + * @G_TOKEN_COMMENT_SINGLE: one line comment + * @G_TOKEN_COMMENT_MULTI: multi line comment + * + * The possible types of token returned from each + * g_scanner_get_next_token() call. + */ + +/** + * GTokenValue: + * @v_symbol: token symbol value + * @v_identifier: token identifier value + * @v_binary: token binary integer value + * @v_octal: octal integer value + * @v_int: integer value + * @v_int64: 64-bit integer value + * @v_float: floating point value + * @v_hex: hex integer value + * @v_string: string value + * @v_comment: comment value + * @v_char: character value + * @v_error: error value + * + * A union holding the value of the token. + */ + +/** + * GErrorType: + * @G_ERR_UNKNOWN: unknown error + * @G_ERR_UNEXP_EOF: unexpected end of file + * @G_ERR_UNEXP_EOF_IN_STRING: unterminated string constant + * @G_ERR_UNEXP_EOF_IN_COMMENT: unterminated comment + * @G_ERR_NON_DIGIT_IN_CONST: non-digit character in a number + * @G_ERR_DIGIT_RADIX: digit beyond radix in a number + * @G_ERR_FLOAT_RADIX: non-decimal floating point number + * @G_ERR_FLOAT_MALFORMED: malformed floating point number + * + * The possible errors, used in the @v_error field + * of #GTokenValue, when the token is a %G_TOKEN_ERROR. + */ + +/** + * GScanner: + * @user_data: unused + * @max_parse_errors: unused + * @parse_errors: g_scanner_error() increments this field + * @input_name: name of input stream, featured by the default message handler + * @qdata: quarked data + * @config: link into the scanner configuration + * @token: token parsed by the last g_scanner_get_next_token() + * @value: value of the last token from g_scanner_get_next_token() + * @line: line number of the last token from g_scanner_get_next_token() + * @position: char number of the last token from g_scanner_get_next_token() + * @next_token: token parsed by the last g_scanner_peek_next_token() + * @next_value: value of the last token from g_scanner_peek_next_token() + * @next_line: line number of the last token from g_scanner_peek_next_token() + * @next_position: char number of the last token from g_scanner_peek_next_token() + * @msg_handler: handler function for _warn and _error + * + * The data structure representing a lexical scanner. + * + * You should set @input_name after creating the scanner, since + * it is used by the default message handler when displaying + * warnings and errors. If you are scanning a file, the filename + * would be a good choice. + * + * The @user_data and @max_parse_errors fields are not used. + * If you need to associate extra data with the scanner you + * can place them here. + * + * If you want to use your own message handler you can set the + * @msg_handler field. The type of the message handler function + * is declared by #GScannerMsgFunc. + */ + +/** + * GScannerConfig: + * @cset_skip_characters: specifies which characters should be skipped + * by the scanner (the default is the whitespace characters: space, + * tab, carriage-return and line-feed). + * @cset_identifier_first: specifies the characters which can start + * identifiers (the default is #G_CSET_a_2_z, "_", and #G_CSET_A_2_Z). + * @cset_identifier_nth: specifies the characters which can be used + * in identifiers, after the first character (the default is + * #G_CSET_a_2_z, "_0123456789", #G_CSET_A_2_Z, #G_CSET_LATINS, + * #G_CSET_LATINC). + * @cpair_comment_single: specifies the characters at the start and + * end of single-line comments. The default is "#\n" which means + * that single-line comments start with a '#' and continue until + * a '\n' (end of line). + * @case_sensitive: specifies if symbols are case sensitive (the + * default is %FALSE). + * @skip_comment_multi: specifies if multi-line comments are skipped + * and not returned as tokens (the default is %TRUE). + * @skip_comment_single: specifies if single-line comments are skipped + * and not returned as tokens (the default is %TRUE). + * @scan_comment_multi: specifies if multi-line comments are recognized + * (the default is %TRUE). + * @scan_identifier: specifies if identifiers are recognized (the + * default is %TRUE). + * @scan_identifier_1char: specifies if single-character + * identifiers are recognized (the default is %FALSE). + * @scan_identifier_NULL: specifies if %NULL is reported as + * %G_TOKEN_IDENTIFIER_NULL (the default is %FALSE). + * @scan_symbols: specifies if symbols are recognized (the default + * is %TRUE). + * @scan_binary: specifies if binary numbers are recognized (the + * default is %FALSE). + * @scan_octal: specifies if octal numbers are recognized (the + * default is %TRUE). + * @scan_float: specifies if floating point numbers are recognized + * (the default is %TRUE). + * @scan_hex: specifies if hexadecimal numbers are recognized (the + * default is %TRUE). + * @scan_hex_dollar: specifies if '$' is recognized as a prefix for + * hexadecimal numbers (the default is %FALSE). + * @scan_string_sq: specifies if strings can be enclosed in single + * quotes (the default is %TRUE). + * @scan_string_dq: specifies if strings can be enclosed in double + * quotes (the default is %TRUE). + * @numbers_2_int: specifies if binary, octal and hexadecimal numbers + * are reported as #G_TOKEN_INT (the default is %TRUE). + * @int_2_float: specifies if all numbers are reported as %G_TOKEN_FLOAT + * (the default is %FALSE). + * @identifier_2_string: specifies if identifiers are reported as strings + * (the default is %FALSE). + * @char_2_token: specifies if characters are reported by setting + * `token = ch` or as %G_TOKEN_CHAR (the default is %TRUE). + * @symbol_2_token: specifies if symbols are reported by setting + * `token = v_symbol` or as %G_TOKEN_SYMBOL (the default is %FALSE). + * @scope_0_fallback: specifies if a symbol is searched for in the + * default scope in addition to the current scope (the default is %FALSE). + * @store_int64: use value.v_int64 rather than v_int + * + * Specifies the #GScanner parser configuration. Most settings can + * be changed during the parsing phase and will affect the lexical + * parsing of the next unpeeked token. + */ + /* --- defines --- */ #define to_lower(c) ( \ (guchar) ( \ @@ -59,9 +297,8 @@ struct _GScannerKey }; - /* --- variables --- */ -static GScannerConfig g_scanner_config_template = +static const GScannerConfig g_scanner_config_template = { ( " \t\r\n" @@ -73,8 +310,9 @@ static GScannerConfig g_scanner_config_template = ) /* cset_identifier_first */, ( G_CSET_a_2_z - "_0123456789" + "_" G_CSET_A_2_Z + G_CSET_DIGITS G_CSET_LATINS G_CSET_LATINC ) /* cset_identifier_nth */, @@ -102,6 +340,7 @@ static GScannerConfig g_scanner_config_template = TRUE /* char_2_token */, FALSE /* symbol_2_token */, FALSE /* scope_0_fallback */, + FALSE /* store_int64 */, }; @@ -110,7 +349,7 @@ static inline GScannerKey* g_scanner_lookup_internal (GScanner *scanner, guint scope_id, const gchar *symbol); -static gint g_scanner_key_equal (gconstpointer v1, +static gboolean g_scanner_key_equal (gconstpointer v1, gconstpointer v2); static guint g_scanner_key_hash (gconstpointer v); static void g_scanner_get_token_ll (GScanner *scanner, @@ -130,7 +369,7 @@ static guchar g_scanner_get_char (GScanner *scanner, guint *position_p); static void g_scanner_msg_handler (GScanner *scanner, gchar *message, - gint is_error); + gboolean is_error); /* --- functions --- */ @@ -153,10 +392,23 @@ g_scanner_char_2_num (guchar c, return -1; } -GScanner* -g_scanner_new (GScannerConfig *config_templ) +/** + * g_scanner_new: + * @config_templ: the initial scanner settings + * + * Creates a new #GScanner. + * + * The @config_templ structure specifies the initial settings + * of the scanner, which are copied into the #GScanner + * @config field. If you pass %NULL then the default settings + * are used. + * + * Returns: the new #GScanner + */ +GScanner * +g_scanner_new (const GScannerConfig *config_templ) { - register GScanner *scanner; + GScanner *scanner; if (!config_templ) config_templ = &g_scanner_config_template; @@ -164,46 +416,49 @@ g_scanner_new (GScannerConfig *config_templ) scanner = g_new0 (GScanner, 1); scanner->user_data = NULL; - scanner->max_parse_errors = 0; + scanner->max_parse_errors = 1; scanner->parse_errors = 0; scanner->input_name = NULL; - scanner->derived_data = NULL; + g_datalist_init (&scanner->qdata); scanner->config = g_new0 (GScannerConfig, 1); - scanner->config->case_sensitive = config_templ->case_sensitive; - scanner->config->cset_skip_characters = config_templ->cset_skip_characters; - scanner->config->cset_identifier_first= config_templ->cset_identifier_first; - scanner->config->cset_identifier_nth = config_templ->cset_identifier_nth; - scanner->config->cpair_comment_single = config_templ->cpair_comment_single; - scanner->config->skip_comment_multi = config_templ->skip_comment_multi; - scanner->config->skip_comment_single = config_templ->skip_comment_single; - scanner->config->scan_comment_multi = config_templ->scan_comment_multi; - scanner->config->scan_identifier = config_templ->scan_identifier; - scanner->config->scan_identifier_1char= config_templ->scan_identifier_1char; - scanner->config->scan_identifier_NULL = config_templ->scan_identifier_NULL; - scanner->config->scan_symbols = config_templ->scan_symbols; - scanner->config->scan_binary = config_templ->scan_binary; - scanner->config->scan_octal = config_templ->scan_octal; - scanner->config->scan_float = config_templ->scan_float; - scanner->config->scan_hex = config_templ->scan_hex; - scanner->config->scan_hex_dollar = config_templ->scan_hex_dollar; - scanner->config->scan_string_sq = config_templ->scan_string_sq; - scanner->config->scan_string_dq = config_templ->scan_string_dq; - scanner->config->numbers_2_int = config_templ->numbers_2_int; - scanner->config->int_2_float = config_templ->int_2_float; - scanner->config->identifier_2_string = config_templ->identifier_2_string; - scanner->config->char_2_token = config_templ->char_2_token; - scanner->config->symbol_2_token = config_templ->symbol_2_token; - scanner->config->scope_0_fallback = config_templ->scope_0_fallback; + scanner->config->case_sensitive = config_templ->case_sensitive; + scanner->config->cset_skip_characters = config_templ->cset_skip_characters; + if (!scanner->config->cset_skip_characters) + scanner->config->cset_skip_characters = ""; + scanner->config->cset_identifier_first = config_templ->cset_identifier_first; + scanner->config->cset_identifier_nth = config_templ->cset_identifier_nth; + scanner->config->cpair_comment_single = config_templ->cpair_comment_single; + scanner->config->skip_comment_multi = config_templ->skip_comment_multi; + scanner->config->skip_comment_single = config_templ->skip_comment_single; + scanner->config->scan_comment_multi = config_templ->scan_comment_multi; + scanner->config->scan_identifier = config_templ->scan_identifier; + scanner->config->scan_identifier_1char = config_templ->scan_identifier_1char; + scanner->config->scan_identifier_NULL = config_templ->scan_identifier_NULL; + scanner->config->scan_symbols = config_templ->scan_symbols; + scanner->config->scan_binary = config_templ->scan_binary; + scanner->config->scan_octal = config_templ->scan_octal; + scanner->config->scan_float = config_templ->scan_float; + scanner->config->scan_hex = config_templ->scan_hex; + scanner->config->scan_hex_dollar = config_templ->scan_hex_dollar; + scanner->config->scan_string_sq = config_templ->scan_string_sq; + scanner->config->scan_string_dq = config_templ->scan_string_dq; + scanner->config->numbers_2_int = config_templ->numbers_2_int; + scanner->config->int_2_float = config_templ->int_2_float; + scanner->config->identifier_2_string = config_templ->identifier_2_string; + scanner->config->char_2_token = config_templ->char_2_token; + scanner->config->symbol_2_token = config_templ->symbol_2_token; + scanner->config->scope_0_fallback = config_templ->scope_0_fallback; + scanner->config->store_int64 = config_templ->store_int64; scanner->token = G_TOKEN_NONE; - scanner->value.v_int = 0; + scanner->value.v_int64 = 0; scanner->line = 1; scanner->position = 0; scanner->next_token = G_TOKEN_NONE; - scanner->next_value.v_int = 0; + scanner->next_value.v_int64 = 0; scanner->next_line = 1; scanner->next_position = 0; @@ -225,11 +480,11 @@ g_scanner_free_value (GTokenType *token_p, { switch (*token_p) { - case G_TOKEN_STRING: - case G_TOKEN_IDENTIFIER: - case G_TOKEN_IDENTIFIER_NULL: - case G_TOKEN_COMMENT_SINGLE: - case G_TOKEN_COMMENT_MULTI: + case G_TOKEN_STRING: + case G_TOKEN_IDENTIFIER: + case G_TOKEN_IDENTIFIER_NULL: + case G_TOKEN_COMMENT_SINGLE: + case G_TOKEN_COMMENT_MULTI: g_free (value_p->v_string); break; @@ -251,11 +506,18 @@ g_scanner_destroy_symbol_table_entry (gpointer _key, g_free (key); } +/** + * g_scanner_destroy: + * @scanner: a #GScanner + * + * Frees all memory used by the #GScanner. + */ void -g_scanner_destroy (GScanner *scanner) +g_scanner_destroy (GScanner *scanner) { g_return_if_fail (scanner != NULL); + g_datalist_clear (&scanner->qdata); g_hash_table_foreach (scanner->symbol_table, g_scanner_destroy_symbol_table_entry, NULL); g_hash_table_destroy (scanner->symbol_table); @@ -269,16 +531,26 @@ g_scanner_destroy (GScanner *scanner) static void g_scanner_msg_handler (GScanner *scanner, gchar *message, - gint is_error) + gboolean is_error) { g_return_if_fail (scanner != NULL); - fprintf (stdout, "%s:%d: ", scanner->input_name, scanner->line); + _g_fprintf (stderr, "%s:%d: ", + scanner->input_name ? scanner->input_name : "", + scanner->line); if (is_error) - fprintf (stdout, "error: "); - fprintf (stdout, "%s\n", message); + _g_fprintf (stderr, "error: "); + _g_fprintf (stderr, "%s\n", message); } +/** + * g_scanner_error: + * @scanner: a #GScanner + * @format: the message format. See the printf() documentation + * @...: the parameters to insert into the format string + * + * Outputs an error message, via the #GScanner message handler. + */ void g_scanner_error (GScanner *scanner, const gchar *format, @@ -304,6 +576,14 @@ g_scanner_error (GScanner *scanner, } } +/** + * g_scanner_warn: + * @scanner: a #GScanner + * @format: the message format. See the printf() documentation + * @...: the parameters to insert into the format string + * + * Outputs a warning message, via the #GScanner message handler. + */ void g_scanner_warn (GScanner *scanner, const gchar *format, @@ -327,12 +607,12 @@ g_scanner_warn (GScanner *scanner, } } -static gint +static gboolean g_scanner_key_equal (gconstpointer v1, gconstpointer v2) { - register const GScannerKey *key1 = v1; - register const GScannerKey *key2 = v2; + const GScannerKey *key1 = v1; + const GScannerKey *key2 = v2; return (key1->scope_id == key2->scope_id) && (strcmp (key1->symbol, key2->symbol) == 0); } @@ -340,23 +620,13 @@ g_scanner_key_equal (gconstpointer v1, static guint g_scanner_key_hash (gconstpointer v) { - register const GScannerKey *key = v; - register gchar *c; - register guint h; + const GScannerKey *key = v; + gchar *c; + 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; - } - } + h = (h << 5) - h + *c; return h; } @@ -366,15 +636,15 @@ g_scanner_lookup_internal (GScanner *scanner, guint scope_id, const gchar *symbol) { - register GScannerKey *key_p; + GScannerKey *key_p; GScannerKey key; key.scope_id = scope_id; if (!scanner->config->case_sensitive) { - register gchar *d; - register const gchar *c; + gchar *d; + const gchar *c; key.symbol = g_new (gchar, strlen (symbol) + 1); for (d = key.symbol, c = symbol; *c; c++, d++) @@ -392,13 +662,33 @@ g_scanner_lookup_internal (GScanner *scanner, return key_p; } +/** + * g_scanner_add_symbol: + * @scanner: a #GScanner + * @symbol: the symbol to add + * @value: the value of the symbol + * + * Adds a symbol to the default scope. + * + * Deprecated: 2.2: Use g_scanner_scope_add_symbol() instead. + */ + +/** + * g_scanner_scope_add_symbol: + * @scanner: a #GScanner + * @scope_id: the scope id + * @symbol: the symbol to add + * @value: the value of the symbol + * + * Adds a symbol to the given scope. + */ void g_scanner_scope_add_symbol (GScanner *scanner, guint scope_id, const gchar *symbol, gpointer value) { - register GScannerKey *key; + GScannerKey *key; g_return_if_fail (scanner != NULL); g_return_if_fail (symbol != NULL); @@ -413,7 +703,7 @@ g_scanner_scope_add_symbol (GScanner *scanner, key->value = value; if (!scanner->config->case_sensitive) { - register gchar *c; + gchar *c; c = key->symbol; while (*c != 0) @@ -428,12 +718,30 @@ g_scanner_scope_add_symbol (GScanner *scanner, key->value = value; } +/** + * g_scanner_remove_symbol: + * @scanner: a #GScanner + * @symbol: the symbol to remove + * + * Removes a symbol from the default scope. + * + * Deprecated: 2.2: Use g_scanner_scope_remove_symbol() instead. + */ + +/** + * g_scanner_scope_remove_symbol: + * @scanner: a #GScanner + * @scope_id: the scope id + * @symbol: the symbol to remove + * + * Removes a symbol from a scope. + */ void g_scanner_scope_remove_symbol (GScanner *scanner, guint scope_id, const gchar *symbol) { - register GScannerKey *key; + GScannerKey *key; g_return_if_fail (scanner != NULL); g_return_if_fail (symbol != NULL); @@ -448,12 +756,42 @@ g_scanner_scope_remove_symbol (GScanner *scanner, } } +/** + * g_scanner_freeze_symbol_table: + * @scanner: a #GScanner + * + * There is no reason to use this macro, since it does nothing. + * + * Deprecated: 2.2: This macro does nothing. + */ + +/** + * g_scanner_thaw_symbol_table: + * @scanner: a #GScanner + * + * There is no reason to use this macro, since it does nothing. + * + * Deprecated: 2.2: This macro does nothing. + */ + +/** + * g_scanner_lookup_symbol: + * @scanner: a #GScanner + * @symbol: the symbol to look up + * + * Looks up a symbol in the current scope and return its value. + * If the symbol is not bound in the current scope, %NULL is + * returned. + * + * Returns: the value of @symbol in the current scope, or %NULL + * if @symbol is not bound in the current scope + */ gpointer g_scanner_lookup_symbol (GScanner *scanner, const gchar *symbol) { - register GScannerKey *key; - register guint scope_id; + GScannerKey *key; + guint scope_id; g_return_val_if_fail (scanner != NULL, NULL); @@ -471,12 +809,25 @@ g_scanner_lookup_symbol (GScanner *scanner, return NULL; } +/** + * g_scanner_scope_lookup_symbol: + * @scanner: a #GScanner + * @scope_id: the scope id + * @symbol: the symbol to look up + * + * Looks up a symbol in a scope and return its value. If the + * symbol is not bound in the scope, %NULL is returned. + * + * Returns: the value of @symbol in the given scope, or %NULL + * if @symbol is not bound in the given scope. + * + */ gpointer g_scanner_scope_lookup_symbol (GScanner *scanner, guint scope_id, const gchar *symbol) { - register GScannerKey *key; + GScannerKey *key; g_return_val_if_fail (scanner != NULL, NULL); @@ -491,11 +842,20 @@ g_scanner_scope_lookup_symbol (GScanner *scanner, return NULL; } +/** + * g_scanner_set_scope: + * @scanner: a #GScanner + * @scope_id: the new scope id + * + * Sets the current scope. + * + * Returns: the old scope id + */ guint g_scanner_set_scope (GScanner *scanner, guint scope_id) { - register guint old_scope_id; + guint old_scope_id; g_return_val_if_fail (scanner != NULL, 0); @@ -510,55 +870,80 @@ g_scanner_foreach_internal (gpointer _key, gpointer _value, gpointer _user_data) { - register GScannerKey *key; - register gpointer *d; - register GHFunc func; - register gpointer func_data; - register guint *scope_id; + GScannerKey *key; + gpointer *d; + GHFunc func; + gpointer user_data; + guint *scope_id; d = _user_data; func = (GHFunc) d[0]; - func_data = d[1]; + user_data = d[1]; scope_id = d[2]; key = _value; if (key->scope_id == *scope_id) - func (key->symbol, key->value, func_data); + func (key->symbol, key->value, user_data); } +/** + * g_scanner_foreach_symbol: + * @scanner: a #GScanner + * @func: the function to call with each symbol + * @data: data to pass to the function + * + * Calls a function for each symbol in the default scope. + * + * Deprecated: 2.2: Use g_scanner_scope_foreach_symbol() instead. + */ + +/** + * g_scanner_scope_foreach_symbol: + * @scanner: a #GScanner + * @scope_id: the scope id + * @func: the function to call for each symbol/value pair + * @user_data: user data to pass to the function + * + * Calls the given function for each of the symbol/value pairs + * in the given scope of the #GScanner. The function is passed + * the symbol and value of each pair, and the given @user_data + * parameter. + */ void g_scanner_scope_foreach_symbol (GScanner *scanner, guint scope_id, GHFunc func, - gpointer func_data) + gpointer user_data) { gpointer d[3]; g_return_if_fail (scanner != NULL); d[0] = (gpointer) func; - d[1] = func_data; + d[1] = user_data; d[2] = &scope_id; g_hash_table_foreach (scanner->symbol_table, g_scanner_foreach_internal, d); } -void -g_scanner_freeze_symbol_table (GScanner *scanner) -{ - g_return_if_fail (scanner != NULL); - - g_hash_table_freeze (scanner->symbol_table); -} - -void -g_scanner_thaw_symbol_table (GScanner *scanner) -{ - g_return_if_fail (scanner != NULL); - - g_hash_table_thaw (scanner->symbol_table); -} - +/** + * g_scanner_peek_next_token: + * @scanner: a #GScanner + * + * Parses the next token, without removing it from the input stream. + * The token data is placed in the @next_token, @next_value, @next_line, + * and @next_position fields of the #GScanner structure. + * + * Note that, while the token is not removed from the input stream + * (i.e. the next call to g_scanner_get_next_token() will return the + * same token), it will not be reevaluated. This can lead to surprising + * results when changing scope or the scanner configuration after peeking + * the next token. Getting the next token after switching the scope or + * configuration will return whatever was peeked before, regardless of + * any symbols that may have been added or removed in the new scope. + * + * Returns: the type of the token + */ GTokenType g_scanner_peek_next_token (GScanner *scanner) { @@ -578,6 +963,17 @@ g_scanner_peek_next_token (GScanner *scanner) return scanner->next_token; } +/** + * g_scanner_get_next_token: + * @scanner: a #GScanner + * + * Parses the next token just like g_scanner_peek_next_token() + * and also removes it from the input stream. The token data is + * placed in the @token, @value, @line, and @position fields of + * the #GScanner structure. + * + * Returns: the type of the token + */ GTokenType g_scanner_get_next_token (GScanner *scanner) { @@ -603,6 +999,15 @@ g_scanner_get_next_token (GScanner *scanner) return scanner->token; } +/** + * g_scanner_cur_token: + * @scanner: a #GScanner + * + * Gets the current token type. This is simply the @token + * field in the #GScanner structure. + * + * Returns: the current token type + */ GTokenType g_scanner_cur_token (GScanner *scanner) { @@ -611,22 +1016,41 @@ g_scanner_cur_token (GScanner *scanner) return scanner->token; } +/** + * g_scanner_cur_value: + * @scanner: a #GScanner + * + * Gets the current token value. This is simply the @value + * field in the #GScanner structure. + * + * Returns: the current token value + */ GTokenValue g_scanner_cur_value (GScanner *scanner) { GTokenValue v; + v.v_int64 = 0; + g_return_val_if_fail (scanner != NULL, v); /* MSC isn't capable of handling return scanner->value; ? */ - v.v_int = 0; - v = scanner->value; return v; } +/** + * g_scanner_cur_line: + * @scanner: a #GScanner + * + * Returns the current line in the input stream (counting + * from 1). This is the line of the last token parsed via + * g_scanner_get_next_token(). + * + * Returns: the current line + */ guint g_scanner_cur_line (GScanner *scanner) { @@ -635,6 +1059,16 @@ g_scanner_cur_line (GScanner *scanner) return scanner->line; } +/** + * g_scanner_cur_position: + * @scanner: a #GScanner + * + * Returns the current position in the current line (counting + * from 0). This is the position of the last token parsed via + * g_scanner_get_next_token(). + * + * Returns: the current position on the line + */ guint g_scanner_cur_position (GScanner *scanner) { @@ -643,14 +1077,31 @@ g_scanner_cur_position (GScanner *scanner) return scanner->position; } +/** + * g_scanner_eof: + * @scanner: a #GScanner + * + * Returns %TRUE if the scanner has reached the end of + * the file or text buffer. + * + * Returns: %TRUE if the scanner has reached the end of + * the file or text buffer + */ gboolean g_scanner_eof (GScanner *scanner) { g_return_val_if_fail (scanner != NULL, TRUE); - return scanner->token == G_TOKEN_EOF; + return scanner->token == G_TOKEN_EOF || scanner->token == G_TOKEN_ERROR; } +/** + * g_scanner_input_file: + * @scanner: a #GScanner + * @input_fd: a file descriptor + * + * Prepares to scan a file. + */ void g_scanner_input_file (GScanner *scanner, gint input_fd) @@ -662,7 +1113,7 @@ g_scanner_input_file (GScanner *scanner, g_scanner_sync_file_offset (scanner); scanner->token = G_TOKEN_NONE; - scanner->value.v_int = 0; + scanner->value.v_int64 = 0; scanner->line = 1; scanner->position = 0; scanner->next_token = G_TOKEN_NONE; @@ -675,6 +1126,14 @@ g_scanner_input_file (GScanner *scanner, scanner->buffer = g_new (gchar, READ_BUFFER_SIZE + 1); } +/** + * g_scanner_input_text: + * @scanner: a #GScanner + * @text: the text buffer to scan + * @text_len: the length of the text buffer + * + * Prepares to scan a text buffer. + */ void g_scanner_input_text (GScanner *scanner, const gchar *text, @@ -690,7 +1149,7 @@ g_scanner_input_text (GScanner *scanner, g_scanner_sync_file_offset (scanner); scanner->token = G_TOKEN_NONE; - scanner->value.v_int = 0; + scanner->value.v_int64 = 0; scanner->line = 1; scanner->position = 0; scanner->next_token = G_TOKEN_NONE; @@ -715,8 +1174,8 @@ g_scanner_peek_next_char (GScanner *scanner) } else if (scanner->input_fd >= 0) { - register gint count; - register gchar *buffer; + gint count; + gchar *buffer; buffer = scanner->buffer; do @@ -743,15 +1202,24 @@ g_scanner_peek_next_char (GScanner *scanner) return 0; } +/** + * g_scanner_sync_file_offset: + * @scanner: a #GScanner + * + * Rewinds the filedescriptor to the current buffer position + * and blows the file read ahead buffer. This is useful for + * third party uses of the scanners filedescriptor, which hooks + * onto the current scanning position. + */ void g_scanner_sync_file_offset (GScanner *scanner) { g_return_if_fail (scanner != NULL); /* for file input, rewind the filedescriptor to the current - * buffer position and blow the file read ahead buffer. usefull for - * third party uses of our filedescriptor, which hooks onto the current - * scanning position. + * buffer position and blow the file read ahead buffer. useful + * for third party uses of our file descriptor, which hooks + * onto the current scanning position. */ if (scanner->input_fd >= 0 && scanner->text_end > scanner->text) @@ -775,14 +1243,14 @@ g_scanner_get_char (GScanner *scanner, guint *line_p, guint *position_p) { - register guchar fchar; + guchar fchar; if (scanner->text < scanner->text_end) fchar = *(scanner->text++); else if (scanner->input_fd >= 0) { - register gint count; - register gchar *buffer; + gint count; + gchar *buffer; buffer = scanner->buffer; do @@ -825,6 +1293,33 @@ g_scanner_get_char (GScanner *scanner, return fchar; } +/** + * g_scanner_unexp_token: + * @scanner: a #GScanner + * @expected_token: the expected token + * @identifier_spec: a string describing how the scanner's user + * refers to identifiers (%NULL defaults to "identifier"). + * This is used if @expected_token is %G_TOKEN_IDENTIFIER or + * %G_TOKEN_IDENTIFIER_NULL. + * @symbol_spec: a string describing how the scanner's user refers + * to symbols (%NULL defaults to "symbol"). This is used if + * @expected_token is %G_TOKEN_SYMBOL or any token value greater + * than %G_TOKEN_LAST. + * @symbol_name: the name of the symbol, if the scanner's current + * token is a symbol. + * @message: a message string to output at the end of the + * warning/error, or %NULL. + * @is_error: if %TRUE it is output as an error. If %FALSE it is + * output as a warning. + * + * Outputs a message through the scanner's msg_handler, + * resulting from an unexpected token in the input stream. + * Note that you should not call g_scanner_peek_next_token() + * followed by g_scanner_unexp_token() without an intermediate + * call to g_scanner_get_next_token(), as g_scanner_unexp_token() + * evaluates the scanner's current token (not the peeked token) + * to construct part of the message. + */ void g_scanner_unexp_token (GScanner *scanner, GTokenType expected_token, @@ -834,12 +1329,12 @@ g_scanner_unexp_token (GScanner *scanner, const gchar *message, gint is_error) { - register gchar *token_string; - register guint token_string_len; - register gchar *expected_string; - register guint expected_string_len; - register gchar *message_prefix; - register gboolean print_unexp; + gchar *token_string; + guint token_string_len; + gchar *expected_string; + guint expected_string_len; + gchar *message_prefix; + gboolean print_unexp; void (*msg_handler) (GScanner*, const gchar*, ...); g_return_if_fail (scanner != NULL); @@ -862,8 +1357,8 @@ g_scanner_unexp_token (GScanner *scanner, switch (scanner->token) { - case G_TOKEN_EOF: - g_snprintf (token_string, token_string_len, "end of file"); + case G_TOKEN_EOF: + _g_snprintf (token_string, token_string_len, "end of file"); break; default: @@ -872,122 +1367,127 @@ g_scanner_unexp_token (GScanner *scanner, if ((scanner->token >= ' ' && scanner->token <= '~') || strchr (scanner->config->cset_identifier_first, scanner->token) || strchr (scanner->config->cset_identifier_nth, scanner->token)) - g_snprintf (token_string, expected_string_len, "character `%c'", scanner->token); + _g_snprintf (token_string, token_string_len, "character '%c'", scanner->token); else - g_snprintf (token_string, expected_string_len, "character `\\%o'", scanner->token); + _g_snprintf (token_string, token_string_len, "character '\\%o'", scanner->token); break; } else if (!scanner->config->symbol_2_token) { - g_snprintf (token_string, token_string_len, "(unknown) token <%d>", scanner->token); + _g_snprintf (token_string, token_string_len, "(unknown) token <%d>", scanner->token); break; } /* fall through */ - case G_TOKEN_SYMBOL: + case G_TOKEN_SYMBOL: if (expected_token == G_TOKEN_SYMBOL || (scanner->config->symbol_2_token && expected_token > G_TOKEN_LAST)) print_unexp = FALSE; if (symbol_name) - g_snprintf (token_string, - token_string_len, - "%s%s `%s'", - print_unexp ? "" : "invalid ", - symbol_spec, - symbol_name); + _g_snprintf (token_string, + token_string_len, + "%s%s '%s'", + print_unexp ? "" : "invalid ", + symbol_spec, + symbol_name); else - g_snprintf (token_string, - token_string_len, - "%s%s", - print_unexp ? "" : "invalid ", - symbol_spec); + _g_snprintf (token_string, + token_string_len, + "%s%s", + print_unexp ? "" : "invalid ", + symbol_spec); break; - case G_TOKEN_ERROR: + case G_TOKEN_ERROR: print_unexp = FALSE; expected_token = G_TOKEN_NONE; switch (scanner->value.v_error) { - case G_ERR_UNEXP_EOF: - g_snprintf (token_string, token_string_len, "scanner: unexpected end of file"); + case G_ERR_UNEXP_EOF: + _g_snprintf (token_string, token_string_len, "scanner: unexpected end of file"); break; - case G_ERR_UNEXP_EOF_IN_STRING: - g_snprintf (token_string, token_string_len, "scanner: unterminated string constant"); + case G_ERR_UNEXP_EOF_IN_STRING: + _g_snprintf (token_string, token_string_len, "scanner: unterminated string constant"); break; - case G_ERR_UNEXP_EOF_IN_COMMENT: - g_snprintf (token_string, token_string_len, "scanner: unterminated comment"); + case G_ERR_UNEXP_EOF_IN_COMMENT: + _g_snprintf (token_string, token_string_len, "scanner: unterminated comment"); break; - case G_ERR_NON_DIGIT_IN_CONST: - g_snprintf (token_string, token_string_len, "scanner: non digit in constant"); + case G_ERR_NON_DIGIT_IN_CONST: + _g_snprintf (token_string, token_string_len, "scanner: non digit in constant"); break; - case G_ERR_FLOAT_RADIX: - g_snprintf (token_string, token_string_len, "scanner: invalid radix for floating constant"); + case G_ERR_FLOAT_RADIX: + _g_snprintf (token_string, token_string_len, "scanner: invalid radix for floating constant"); break; - case G_ERR_FLOAT_MALFORMED: - g_snprintf (token_string, token_string_len, "scanner: malformed floating constant"); + case G_ERR_FLOAT_MALFORMED: + _g_snprintf (token_string, token_string_len, "scanner: malformed floating constant"); break; - case G_ERR_DIGIT_RADIX: - g_snprintf (token_string, token_string_len, "scanner: digit is beyond radix"); + case G_ERR_DIGIT_RADIX: + _g_snprintf (token_string, token_string_len, "scanner: digit is beyond radix"); break; - case G_ERR_UNKNOWN: + case G_ERR_UNKNOWN: default: - g_snprintf (token_string, token_string_len, "scanner: unknown error"); + _g_snprintf (token_string, token_string_len, "scanner: unknown error"); break; } break; - case G_TOKEN_CHAR: - g_snprintf (token_string, token_string_len, "character `%c'", scanner->value.v_char); + case G_TOKEN_CHAR: + _g_snprintf (token_string, token_string_len, "character '%c'", scanner->value.v_char); break; - case G_TOKEN_IDENTIFIER: - if (expected_token == G_TOKEN_IDENTIFIER) + case G_TOKEN_IDENTIFIER: + case G_TOKEN_IDENTIFIER_NULL: + if (expected_token == G_TOKEN_IDENTIFIER || + expected_token == G_TOKEN_IDENTIFIER_NULL) print_unexp = FALSE; - g_snprintf (token_string, + _g_snprintf (token_string, token_string_len, - "%s%s `%s'", + "%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: - case G_TOKEN_OCTAL: - case G_TOKEN_INT: - case G_TOKEN_HEX: - g_snprintf (token_string, token_string_len, "number `%ld'", scanner->value.v_int); + case G_TOKEN_BINARY: + case G_TOKEN_OCTAL: + case G_TOKEN_INT: + case G_TOKEN_HEX: + if (scanner->config->store_int64) + _g_snprintf (token_string, token_string_len, "number '%" G_GUINT64_FORMAT "'", scanner->value.v_int64); + else + _g_snprintf (token_string, token_string_len, "number '%lu'", scanner->value.v_int); break; - case G_TOKEN_FLOAT: - g_snprintf (token_string, token_string_len, "number `%.3f'", scanner->value.v_float); + case G_TOKEN_FLOAT: + _g_snprintf (token_string, token_string_len, "number '%.3f'", scanner->value.v_float); break; - case G_TOKEN_STRING: + case G_TOKEN_STRING: if (expected_token == G_TOKEN_STRING) print_unexp = FALSE; - g_snprintf (token_string, - token_string_len, - "%s%sstring constant \"%s\"", - print_unexp ? "" : "invalid ", - scanner->value.v_string[0] == 0 ? "empty " : "", - scanner->value.v_string); + _g_snprintf (token_string, + token_string_len, + "%s%sstring constant \"%s\"", + print_unexp ? "" : "invalid ", + scanner->value.v_string[0] == 0 ? "empty " : "", + scanner->value.v_string); token_string[token_string_len - 2] = '"'; token_string[token_string_len - 1] = 0; break; - case G_TOKEN_COMMENT_SINGLE: - case G_TOKEN_COMMENT_MULTI: - g_snprintf (token_string, token_string_len, "comment"); + case G_TOKEN_COMMENT_SINGLE: + case G_TOKEN_COMMENT_MULTI: + _g_snprintf (token_string, token_string_len, "comment"); break; - case G_TOKEN_NONE: + case G_TOKEN_NONE: /* somehow the user's parsing code is screwed, there isn't much * we can do about it. * Note, a common case to trigger this is @@ -1002,60 +1502,96 @@ g_scanner_unexp_token (GScanner *scanner, switch (expected_token) { gboolean need_valid; - + gchar *tstring; + case G_TOKEN_EOF: + _g_snprintf (expected_string, expected_string_len, "end of file"); + break; default: if (expected_token >= 1 && expected_token <= 255) { if ((expected_token >= ' ' && expected_token <= '~') || strchr (scanner->config->cset_identifier_first, expected_token) || strchr (scanner->config->cset_identifier_nth, expected_token)) - g_snprintf (expected_string, expected_string_len, "character `%c'", expected_token); + _g_snprintf (expected_string, expected_string_len, "character '%c'", expected_token); else - g_snprintf (expected_string, expected_string_len, "character `\\%o'", expected_token); + _g_snprintf (expected_string, expected_string_len, "character '\\%o'", expected_token); break; } else if (!scanner->config->symbol_2_token) { - g_snprintf (expected_string, expected_string_len, "(unknown) token <%d>", expected_token); + _g_snprintf (expected_string, expected_string_len, "(unknown) token <%d>", expected_token); break; } /* fall through */ - case G_TOKEN_SYMBOL: + case G_TOKEN_SYMBOL: need_valid = (scanner->token == G_TOKEN_SYMBOL || (scanner->config->symbol_2_token && scanner->token > G_TOKEN_LAST)); - g_snprintf (expected_string, - expected_string_len, - "%s%s", - need_valid ? "valid " : "", - symbol_spec); + _g_snprintf (expected_string, + expected_string_len, + "%s%s", + need_valid ? "valid " : "", + symbol_spec); /* FIXME: should we attempt to lookup the symbol_name for symbol_2_token? */ break; - - case G_TOKEN_INT: - g_snprintf (expected_string, expected_string_len, "number (integer)"); + case G_TOKEN_CHAR: + _g_snprintf (expected_string, expected_string_len, "%scharacter", + scanner->token == G_TOKEN_CHAR ? "valid " : ""); break; - - case G_TOKEN_FLOAT: - g_snprintf (expected_string, expected_string_len, "number (float)"); + case G_TOKEN_BINARY: + tstring = "binary"; + _g_snprintf (expected_string, expected_string_len, "%snumber (%s)", + scanner->token == expected_token ? "valid " : "", tstring); break; - - case G_TOKEN_STRING: - g_snprintf (expected_string, - expected_string_len, - "%sstring constant", - scanner->token == G_TOKEN_STRING ? "valid " : ""); + case G_TOKEN_OCTAL: + tstring = "octal"; + _g_snprintf (expected_string, expected_string_len, "%snumber (%s)", + scanner->token == expected_token ? "valid " : "", tstring); break; - - case G_TOKEN_IDENTIFIER: - g_snprintf (expected_string, - expected_string_len, - "%s%s", - scanner->token == G_TOKEN_IDENTIFIER ? "valid " : "", - identifier_spec); + case G_TOKEN_INT: + tstring = "integer"; + _g_snprintf (expected_string, expected_string_len, "%snumber (%s)", + scanner->token == expected_token ? "valid " : "", tstring); break; - - case G_TOKEN_NONE: + case G_TOKEN_HEX: + tstring = "hexadecimal"; + _g_snprintf (expected_string, expected_string_len, "%snumber (%s)", + scanner->token == expected_token ? "valid " : "", tstring); + break; + case G_TOKEN_FLOAT: + tstring = "float"; + _g_snprintf (expected_string, expected_string_len, "%snumber (%s)", + scanner->token == expected_token ? "valid " : "", tstring); + break; + case G_TOKEN_STRING: + _g_snprintf (expected_string, + expected_string_len, + "%sstring constant", + scanner->token == G_TOKEN_STRING ? "valid " : ""); + break; + case G_TOKEN_IDENTIFIER: + case G_TOKEN_IDENTIFIER_NULL: + need_valid = (scanner->token == G_TOKEN_IDENTIFIER_NULL || + scanner->token == G_TOKEN_IDENTIFIER); + _g_snprintf (expected_string, + expected_string_len, + "%s%s", + need_valid ? "valid " : "", + identifier_spec); + break; + case G_TOKEN_COMMENT_SINGLE: + tstring = "single-line"; + _g_snprintf (expected_string, expected_string_len, "%scomment (%s)", + scanner->token == expected_token ? "valid " : "", tstring); + break; + case G_TOKEN_COMMENT_MULTI: + tstring = "multi-line"; + _g_snprintf (expected_string, expected_string_len, "%scomment (%s)", + scanner->token == expected_token ? "valid " : "", tstring); + break; + case G_TOKEN_NONE: + case G_TOKEN_ERROR: + /* this is handled upon printout */ break; } @@ -1066,21 +1602,26 @@ g_scanner_unexp_token (GScanner *scanner, message_prefix = ""; message = ""; } - - if (expected_token != G_TOKEN_NONE) + if (expected_token == G_TOKEN_ERROR) + { + msg_handler (scanner, + "failure around %s%s%s", + token_string, + message_prefix, + message); + } + else if (expected_token == G_TOKEN_NONE) { if (print_unexp) msg_handler (scanner, - "unexpected %s, expected %s%s%s", + "unexpected %s%s%s", token_string, - expected_string, message_prefix, message); else msg_handler (scanner, - "%s, expected %s%s%s", + "%s%s%s", token_string, - expected_string, message_prefix, message); } @@ -1088,14 +1629,16 @@ g_scanner_unexp_token (GScanner *scanner, { if (print_unexp) msg_handler (scanner, - "unexpected %s%s%s", + "unexpected %s, expected %s%s%s", token_string, + expected_string, message_prefix, message); else msg_handler (scanner, - "%s%s%s", + "%s, expected %s%s%s", token_string, + expected_string, message_prefix, message); } @@ -1104,25 +1647,6 @@ g_scanner_unexp_token (GScanner *scanner, g_free (expected_string); } -gint -g_scanner_stat_mode (const gchar *filename) -{ - struct stat *stat_buf; - gint st_mode; - - stat_buf = g_new0 (struct stat, 1); -#ifdef HAVE_LSTAT - lstat (filename, stat_buf); -#else - stat (filename, stat_buf); -#endif - st_mode = stat_buf->st_mode; - - g_free (stat_buf); - - return st_mode; -} - static void g_scanner_get_token_i (GScanner *scanner, GTokenType *token_p, @@ -1171,7 +1695,17 @@ g_scanner_get_token_i (GScanner *scanner, scanner->config->int_2_float) { *token_p = G_TOKEN_FLOAT; - value_p->v_float = value_p->v_int; + if (scanner->config->store_int64) + { +#ifdef _MSC_VER + /* work around error C2520, see gvaluetransform.c */ + value_p->v_float = (__int64)value_p->v_int64; +#else + value_p->v_float = value_p->v_int64; +#endif + } + else + value_p->v_float = value_p->v_int; } errno = 0; @@ -1184,18 +1718,18 @@ g_scanner_get_token_ll (GScanner *scanner, guint *line_p, guint *position_p) { - register GScannerConfig *config; - register GTokenType token; - register gboolean in_comment_multi; - register gboolean in_comment_single; - register gboolean in_string_sq; - register gboolean in_string_dq; - register GString *gstring; - GTokenValue value; - guchar ch; + GScannerConfig *config; + GTokenType token; + gboolean in_comment_multi; + gboolean in_comment_single; + gboolean in_string_sq; + gboolean in_string_dq; + GString *gstring; + GTokenValue value; + guchar ch; config = scanner->config; - (*value_p).v_int = 0; + (*value_p).v_int64 = 0; if ((scanner->text >= scanner->text_end && scanner->input_fd < 0) || scanner->token == G_TOKEN_EOF) @@ -1212,11 +1746,11 @@ g_scanner_get_token_ll (GScanner *scanner, do /* while (ch != 0) */ { - register gboolean dotted_float = FALSE; + gboolean dotted_float = FALSE; ch = g_scanner_get_char (scanner, line_p, position_p); - value.v_int = 0; + value.v_int64 = 0; token = G_TOKEN_NONE; /* this is *evil*, but needed ;( @@ -1229,20 +1763,20 @@ g_scanner_get_token_ll (GScanner *scanner, switch (ch) { - case 0: + case 0: token = G_TOKEN_EOF; (*position_p)++; /* ch = 0; */ break; - case '/': + case '/': if (!config->scan_comment_multi || g_scanner_peek_next_char (scanner) != '*') goto default_case; g_scanner_get_char (scanner, line_p, position_p); token = G_TOKEN_COMMENT_MULTI; in_comment_multi = TRUE; - gstring = g_string_new (""); + gstring = g_string_new (NULL); while ((ch = g_scanner_get_char (scanner, line_p, position_p)) != 0) { if (ch == '*' && g_scanner_peek_next_char (scanner) == '/') @@ -1257,12 +1791,12 @@ g_scanner_get_token_ll (GScanner *scanner, ch = 0; break; - case '\'': + case '\'': if (!config->scan_string_sq) goto default_case; token = G_TOKEN_STRING; in_string_sq = TRUE; - gstring = g_string_new (""); + gstring = g_string_new (NULL); while ((ch = g_scanner_get_char (scanner, line_p, position_p)) != 0) { if (ch == '\'') @@ -1276,12 +1810,12 @@ g_scanner_get_token_ll (GScanner *scanner, ch = 0; break; - case '"': + case '"': if (!config->scan_string_dq) goto default_case; token = G_TOKEN_STRING; in_string_dq = TRUE; - gstring = g_string_new (""); + gstring = g_string_new (NULL); while ((ch = g_scanner_get_char (scanner, line_p, position_p)) != 0) { if (ch == '"') @@ -1296,44 +1830,44 @@ g_scanner_get_token_ll (GScanner *scanner, ch = g_scanner_get_char (scanner, line_p, position_p); switch (ch) { - register guint i; - register guint fchar; + guint i; + guint fchar; - case 0: + case 0: break; - case '\\': + case '\\': gstring = g_string_append_c (gstring, '\\'); break; - case 'n': + case 'n': gstring = g_string_append_c (gstring, '\n'); break; - case 't': + case 't': gstring = g_string_append_c (gstring, '\t'); break; - case 'r': + case 'r': gstring = g_string_append_c (gstring, '\r'); break; - case 'b': + case 'b': gstring = g_string_append_c (gstring, '\b'); break; - case 'f': + case 'f': gstring = g_string_append_c (gstring, '\f'); break; - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': i = ch - '0'; fchar = g_scanner_peek_next_char (scanner); if (fchar >= '0' && fchar <= '7') @@ -1362,7 +1896,7 @@ g_scanner_get_token_ll (GScanner *scanner, ch = 0; break; - case '.': + case '.': if (!config->scan_float) goto default_case; token = G_TOKEN_FLOAT; @@ -1370,14 +1904,14 @@ g_scanner_get_token_ll (GScanner *scanner, ch = g_scanner_get_char (scanner, line_p, position_p); goto number_parsing; - case '$': + case '$': if (!config->scan_hex_dollar) goto default_case; token = G_TOKEN_HEX; ch = g_scanner_get_char (scanner, line_p, position_p); goto number_parsing; - case '0': + case '0': if (config->scan_octal) token = G_TOKEN_OCTAL; else @@ -1426,18 +1960,18 @@ g_scanner_get_token_ll (GScanner *scanner, else ch = '0'; /* fall through */ - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': number_parsing: { - register gboolean in_number = TRUE; + gboolean in_number = TRUE; gchar *endptr; if (token == G_TOKEN_NONE) @@ -1448,7 +1982,7 @@ g_scanner_get_token_ll (GScanner *scanner, do /* while (in_number) */ { - register gboolean is_E; + gboolean is_E; is_E = token == G_TOKEN_FLOAT && (ch == 'e' || ch == 'E'); @@ -1539,30 +2073,31 @@ g_scanner_get_token_ll (GScanner *scanner, while (in_number); endptr = NULL; - switch (token) + if (token == G_TOKEN_FLOAT) + value.v_float = g_strtod (gstring->str, &endptr); + else { - case G_TOKEN_BINARY: - value.v_binary = strtol (gstring->str, &endptr, 2); - break; - - case G_TOKEN_OCTAL: - value.v_octal = strtol (gstring->str, &endptr, 8); - break; - - case G_TOKEN_INT: - value.v_int = strtol (gstring->str, &endptr, 10); - break; - - case G_TOKEN_FLOAT: - value.v_float = g_strtod (gstring->str, &endptr); - break; - - case G_TOKEN_HEX: - value.v_hex = strtol (gstring->str, &endptr, 16); - break; - - default: - break; + guint64 ui64 = 0; + switch (token) + { + case G_TOKEN_BINARY: + ui64 = g_ascii_strtoull (gstring->str, &endptr, 2); + break; + case G_TOKEN_OCTAL: + ui64 = g_ascii_strtoull (gstring->str, &endptr, 8); + break; + case G_TOKEN_INT: + ui64 = g_ascii_strtoull (gstring->str, &endptr, 10); + break; + case G_TOKEN_HEX: + ui64 = g_ascii_strtoull (gstring->str, &endptr, 16); + break; + default: ; + } + if (scanner->config->store_int64) + value.v_int64 = ui64; + else + value.v_int = ui64; } if (endptr && *endptr) { @@ -1586,10 +2121,9 @@ g_scanner_get_token_ll (GScanner *scanner, { token = G_TOKEN_COMMENT_SINGLE; in_comment_single = TRUE; - gstring = g_string_new (""); - while ((ch = g_scanner_get_char (scanner, - line_p, - position_p)) != 0) + gstring = g_string_new (NULL); + ch = g_scanner_get_char (scanner, line_p, position_p); + while (ch != 0) { if (ch == config->cpair_comment_single[1]) { @@ -1599,8 +2133,12 @@ g_scanner_get_token_ll (GScanner *scanner, } gstring = g_string_append_c (gstring, ch); - ch = 0; + ch = g_scanner_get_char (scanner, line_p, position_p); } + /* ignore a missing newline at EOF for single line comments */ + if (in_comment_single && + config->cpair_comment_single[1] == '\n') + in_comment_single = FALSE; } else if (config->scan_identifier && ch && strchr (config->cset_identifier_first, ch)) @@ -1612,7 +2150,7 @@ g_scanner_get_token_ll (GScanner *scanner, g_scanner_peek_next_char (scanner))) { token = G_TOKEN_IDENTIFIER; - gstring = g_string_new (""); + gstring = g_string_new (NULL); gstring = g_string_append_c (gstring, ch); do { @@ -1667,8 +2205,7 @@ g_scanner_get_token_ll (GScanner *scanner, if (gstring) { - value.v_string = gstring->str; - g_string_free (gstring, FALSE); + value.v_string = g_string_free (gstring, FALSE); gstring = NULL; } @@ -1676,8 +2213,8 @@ g_scanner_get_token_ll (GScanner *scanner, { if (config->scan_symbols) { - register GScannerKey *key; - register guint scope_id; + GScannerKey *key; + guint scope_id; scope_id = scanner->scope_id; key = g_scanner_lookup_internal (scanner, scope_id, value.v_identifier);