/* C preprocessor macro expansion for GDB.
- Copyright 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2007, 2008 Free Software Foundation, Inc.
Contributed by Red Hat, Inc.
This file is part of GDB.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
-#include "obstack.h"
+#include "gdb_obstack.h"
#include "bcache.h"
#include "macrotab.h"
#include "macroexp.h"
static void
init_buffer (struct macro_buffer *b, int n)
{
- /* Small value for initial testing. */
- n = 1;
-
b->size = n;
if (n > 0)
b->text = (char *) xmalloc (n);
/* Append the character C to the buffer B. */
-static inline void
+static void
appendc (struct macro_buffer *b, int c)
{
int new_len = b->len + 1;
/* Append the LEN bytes at ADDR to the buffer B. */
-static inline void
+static void
appendmem (struct macro_buffer *b, char *addr, int len)
{
int new_len = b->len + len;
/* Recognizing preprocessor tokens. */
-static int
-is_whitespace (int c)
+int
+macro_is_whitespace (int c)
{
return (c == ' '
|| c == '\t'
}
-static int
-is_digit (int c)
+int
+macro_is_digit (int c)
{
return ('0' <= c && c <= '9');
}
-static int
-is_identifier_nondigit (int c)
+int
+macro_is_identifier_nondigit (int c)
{
return (c == '_'
|| ('a' <= c && c <= 'z')
return 1;
}
- error ("Unterminated comment in macro expansion.");
+ error (_("Unterminated comment in macro expansion."));
}
else if (p[0] == '/'
&& p[1] == '/')
get_identifier (struct macro_buffer *tok, char *p, char *end)
{
if (p < end
- && is_identifier_nondigit (*p))
+ && macro_is_identifier_nondigit (*p))
{
char *tok_start = p;
while (p < end
- && (is_identifier_nondigit (*p)
- || is_digit (*p)))
+ && (macro_is_identifier_nondigit (*p)
+ || macro_is_digit (*p)))
p++;
set_token (tok, tok_start, p);
get_pp_number (struct macro_buffer *tok, char *p, char *end)
{
if (p < end
- && (is_digit (*p)
+ && (macro_is_digit (*p)
|| *p == '.'))
{
char *tok_start = p;
while (p < end)
{
- if (is_digit (*p)
- || is_identifier_nondigit (*p)
+ if (macro_is_digit (*p)
+ || macro_is_identifier_nondigit (*p)
|| *p == '.')
p++;
else if (p + 2 <= end
for (;;)
{
if (p >= end)
- error ("Unmatched single quote.");
+ error (_("Unmatched single quote."));
else if (*p == '\'')
{
if (p == body_start)
- error ("A character constant must contain at least one "
- "character.");
+ error (_("A character constant must contain at least one "
+ "character."));
p++;
break;
}
for (;;)
{
if (p >= end)
- error ("Unterminated string in expression.");
+ error (_("Unterminated string in expression."));
else if (*p == '\"')
{
p++;
break;
}
else if (*p == '\n')
- error ("Newline characters may not appear in string "
- "constants.");
+ error (_("Newline characters may not appear in string "
+ "constants."));
else if (*p == '\\')
{
p++;
{
/* Here, speed is much less important than correctness and clarity. */
- /* ISO/IEC 9899:1999 (E) Section 6.4.6 Paragraph 1 */
+ /* ISO/IEC 9899:1999 (E) Section 6.4.6 Paragraph 1.
+ Note that this table is ordered in a special way. A punctuator
+ which is a prefix of another punctuator must appear after its
+ "extension". Otherwise, the wrong token will be returned. */
static const char * const punctuators[] = {
- "[", "]", "(", ")", "{", "}", ".", "->",
- "++", "--", "&", "*", "+", "-", "~", "!",
- "/", "%", "<<", ">>", "<", ">", "<=", ">=", "==", "!=",
- "^", "|", "&&", "||",
- "?", ":", ";", "...",
- "=", "*=", "/=", "%=", "+=", "-=", "<<=", ">>=", "&=", "^=", "|=",
- ",", "#", "##",
- "<:", ":>", "<%", "%>", "%:", "%:%:",
+ "[", "]", "(", ")", "{", "}", "?", ";", ",", "~",
+ "...", ".",
+ "->", "--", "-=", "-",
+ "++", "+=", "+",
+ "*=", "*",
+ "!=", "!",
+ "&&", "&=", "&",
+ "/=", "/",
+ "%>", "%:%:", "%:", "%=", "%",
+ "^=", "^",
+ "##", "#",
+ ":>", ":",
+ "||", "|=", "|",
+ "<<=", "<<", "<=", "<:", "<%", "<",
+ ">>=", ">>", ">=", ">",
+ "==", "=",
0
};
only occur after a #include, which we will never see. */
while (p < end)
- if (is_whitespace (*p))
+ if (macro_is_whitespace (*p))
p++;
else if (get_comment (tok, p, end))
p += tok->len;
/* As far as I know, there's no case where inserting a space isn't
enough to prevent a splice. */
internal_error (__FILE__, __LINE__,
- "unable to avoid splicing tokens during macro expansion");
+ _("unable to avoid splicing tokens during macro expansion"));
}
get_token (&tok, src);
args_len = 0;
- args_size = 1; /* small for initial testing */
+ args_size = 6;
args = (struct macro_buffer *) xmalloc (sizeof (*args) * args_size);
for (;;)
char *start = src->text;
if (! get_token (&tok, src))
- error ("Malformed argument list for macro `%s'.", name);
+ error (_("Malformed argument list for macro `%s'."), name);
/* Is tok an opening paren? */
if (tok.len == 1 && tok.text[0] == '(')
/* Is this token the stringification operator? */
if (tok.len == 1
&& tok.text[0] == '#')
- error ("Stringification is not implemented yet.");
+ error (_("Stringification is not implemented yet."));
/* Is this token the splicing operator? */
if (tok.len == 2
&& tok.text[0] == '#'
&& tok.text[1] == '#')
- error ("Token splicing is not implemented yet.");
+ error (_("Token splicing is not implemented yet."));
/* Is this token an identifier? */
if (tok.is_identifier)
/* Is it the magic varargs parameter? */
if (tok.len == 11
&& ! memcmp (tok.text, "__VA_ARGS__", 11))
- error ("Variable-arity macros not implemented yet.");
+ error (_("Variable-arity macros not implemented yet."));
/* Is it one of the parameters? */
for (i = 0; i < def->argc; i++)
else if (def->kind == macro_function_like)
{
struct cleanup *back_to = make_cleanup (null_cleanup, 0);
- int argc;
+ int argc = 0;
struct macro_buffer *argv = NULL;
struct macro_buffer substituted;
struct macro_buffer substituted_src;
if (def->argc >= 1
&& strcmp (def->argv[def->argc - 1], "...") == 0)
- error ("Varargs macros not implemented yet.");
+ error (_("Varargs macros not implemented yet."));
make_cleanup (free_current_contents, &argv);
argv = gather_arguments (id, src, &argc);
if (! (argc == 1
&& argv[0].len == 0
&& def->argc == 0))
- error ("Wrong number of arguments to macro `%s' "
- "(expected %d, got %d).",
+ error (_("Wrong number of arguments to macro `%s' "
+ "(expected %d, got %d)."),
id, def->argc, argc);
}
return 1;
}
else
- internal_error (__FILE__, __LINE__, "bad macro definition kind");
+ internal_error (__FILE__, __LINE__, _("bad macro definition kind"));
}
macro_lookup_ftype *lookup_func,
void *lookup_func_baton)
{
- error ("Expand-once not implemented yet.");
+ error (_("Expand-once not implemented yet."));
}