/* Mainly the interface between cpplib and the C front ends.
Copyright (C) 1987, 1988, 1989, 1992, 1994, 1995, 1996, 1997
- 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+ 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+ Free Software Foundation, Inc.
This file is part of GCC.
You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING. If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA. */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA. */
#include "config.h"
#include "system.h"
static int header_time, body_time;
static splay_tree file_info_tree;
-#undef WCHAR_TYPE_SIZE
-#define WCHAR_TYPE_SIZE TYPE_PRECISION (wchar_type_node)
-
-/* Number of bytes in a wide character. */
-#define WCHAR_BYTES (WCHAR_TYPE_SIZE / BITS_PER_UNIT)
-
int pending_lang_change; /* If we need to switch languages - C++ only */
int c_header_level; /* depth in C headers - C++ only */
if (c_header_level && --c_header_level == 0)
{
if (new_map->sysp == 2)
- warning ("badly nested C headers from preprocessor");
+ warning (0, "badly nested C headers from preprocessor");
--pending_lang_change;
}
#endif
-Wunknown-pragmas has been given. */
if (warn_unknown_pragmas > in_system_header)
{
+ const unsigned char *space, *name;
+ const cpp_token *s;
#ifndef USE_MAPPED_LOCATION
+ location_t fe_loc;
const struct line_map *map = linemap_lookup (&line_table, loc);
+ fe_loc.file = map->to_file;
+ fe_loc.line = SOURCE_LINE (map, loc);
+#else
+ location_t fe_loc = loc;
#endif
- const unsigned char *space, *name;
- const cpp_token *s;
space = name = (const unsigned char *) "";
s = cpp_get_token (pfile);
name = cpp_token_as_text (pfile, s);
}
-#ifdef USE_MAPPED_LOCATION
- input_location = loc;
-#else
- input_line = SOURCE_LINE (map, loc);
-#endif
- warning ("ignoring #pragma %s %s", space, name);
+ warning (OPT_Wunknown_pragmas, "%Hignoring #pragma %s %s",
+ &fe_loc, space, name);
}
}
(const char *) NODE_NAME (node));
}
\f
-static inline const cpp_token *
-get_nonpadding_token (void)
-{
- const cpp_token *tok;
- timevar_push (TV_CPP);
- do
- tok = cpp_get_token (parse_in);
- while (tok->type == CPP_PADDING);
- timevar_pop (TV_CPP);
-
- return tok;
-}
+/* Read a token and return its type. Fill *VALUE with its value, if
+ applicable. Fill *CPP_FLAGS with the token's flags, if it is
+ non-NULL. */
enum cpp_ttype
-c_lex_with_flags (tree *value, unsigned char *cpp_flags)
+c_lex_with_flags (tree *value, location_t *loc, unsigned char *cpp_flags)
{
- const cpp_token *tok;
- location_t atloc;
static bool no_more_pch;
+ const cpp_token *tok;
+ enum cpp_ttype type;
+ timevar_push (TV_CPP);
retry:
- tok = get_nonpadding_token ();
-
+ tok = cpp_get_token (parse_in);
+ type = tok->type;
+
retry_after_at:
- switch (tok->type)
+#ifdef USE_MAPPED_LOCATION
+ *loc = tok->src_loc;
+#else
+ *loc = input_location;
+#endif
+ switch (type)
{
+ case CPP_PADDING:
+ goto retry;
+
case CPP_NAME:
*value = HT_IDENT_TO_GCC_IDENT (HT_NODE (tok->val.node));
break;
case CPP_ATSIGN:
/* An @ may give the next token special significance in Objective-C. */
- atloc = input_location;
- tok = get_nonpadding_token ();
if (c_dialect_objc ())
{
- tree val;
- switch (tok->type)
+ location_t atloc = input_location;
+
+ retry_at:
+ tok = cpp_get_token (parse_in);
+ type = tok->type;
+ switch (type)
{
+ case CPP_PADDING:
+ goto retry_at;
+
+ case CPP_STRING:
+ case CPP_WSTRING:
+ type = lex_string (tok, value, true);
+ break;
+
case CPP_NAME:
- val = HT_IDENT_TO_GCC_IDENT (HT_NODE (tok->val.node));
- if (objc_is_reserved_word (val))
+ *value = HT_IDENT_TO_GCC_IDENT (HT_NODE (tok->val.node));
+ if (objc_is_reserved_word (*value))
{
- *value = val;
- return CPP_AT_NAME;
+ type = CPP_AT_NAME;
+ break;
}
- break;
-
- case CPP_STRING:
- case CPP_WSTRING:
- return lex_string (tok, value, true);
+ /* FALLTHROUGH */
- default: break;
+ default:
+ /* ... or not. */
+ error ("%Hstray %<@%> in program", &atloc);
+ goto retry_after_at;
}
+ break;
}
- /* ... or not. */
- error ("%Hstray '@' in program", &atloc);
- goto retry_after_at;
+ /* FALLTHROUGH */
+ case CPP_HASH:
+ case CPP_PASTE:
+ {
+ unsigned char name[4];
+
+ *cpp_spell_token (parse_in, tok, name, true) = 0;
+
+ error ("stray %qs in program", name);
+ }
+
+ goto retry;
case CPP_OTHER:
{
if (c == '"' || c == '\'')
error ("missing terminating %c character", (int) c);
else if (ISGRAPH (c))
- error ("stray '%c' in program", (int) c);
+ error ("stray %qc in program", (int) c);
else
- error ("stray '\\%o' in program", (int) c);
+ error ("stray %<\\%o%> in program", (int) c);
}
goto retry;
case CPP_STRING:
case CPP_WSTRING:
if (!c_lex_return_raw_strings)
- return lex_string (tok, value, false);
- /* else fall through */
+ {
+ type = lex_string (tok, value, false);
+ break;
+ }
+
+ /* FALLTHROUGH */
case CPP_PRAGMA:
*value = build_string (tok->val.str.len, (char *) tok->val.str.text);
break;
}
+ if (cpp_flags)
+ *cpp_flags = tok->flags;
+
if (!no_more_pch)
{
no_more_pch = true;
c_common_no_more_pch ();
}
-
- if (cpp_flags)
- *cpp_flags = tok->flags;
- return tok->type;
+
+ timevar_pop (TV_CPP);
+
+ return type;
}
enum cpp_ttype
c_lex (tree *value)
{
- return c_lex_with_flags (value, NULL);
+ location_t loc;
+ return c_lex_with_flags (value, &loc, NULL);
}
/* Returns the narrowest C-visible unsigned type, starting with the
if (itk_u < itk_unsigned_long)
itk_u = itk_unsigned_long;
itk = itk_u;
- warning ("this decimal constant is unsigned only in ISO C90");
+ warning (0, "this decimal constant is unsigned only in ISO C90");
}
- else if (warn_traditional)
- warning ("this decimal constant would be unsigned in ISO C90");
+ else
+ warning (OPT_Wtraditional,
+ "this decimal constant would be unsigned in ISO C90");
}
}
}
{
tree value;
bool wide = false;
- size_t count = 1;
+ size_t concats = 0;
struct obstack str_ob;
cpp_string istr;
if (tok->type == CPP_WSTRING)
wide = true;
- tok = get_nonpadding_token ();
- if (c_dialect_objc () && tok->type == CPP_ATSIGN)
- {
- objc_string = true;
- tok = get_nonpadding_token ();
- }
- if (tok->type == CPP_STRING || tok->type == CPP_WSTRING)
+ retry:
+ tok = cpp_get_token (parse_in);
+ switch (tok->type)
{
- gcc_obstack_init (&str_ob);
- obstack_grow (&str_ob, &str, sizeof (cpp_string));
-
- do
+ case CPP_PADDING:
+ goto retry;
+ case CPP_ATSIGN:
+ if (c_dialect_objc ())
{
- count++;
- if (tok->type == CPP_WSTRING)
- wide = true;
- obstack_grow (&str_ob, &tok->val.str, sizeof (cpp_string));
-
- tok = get_nonpadding_token ();
- if (c_dialect_objc () && tok->type == CPP_ATSIGN)
- {
- objc_string = true;
- tok = get_nonpadding_token ();
- }
+ objc_string = true;
+ goto retry;
}
- while (tok->type == CPP_STRING || tok->type == CPP_WSTRING);
- strs = (cpp_string *) obstack_finish (&str_ob);
+ /* FALLTHROUGH */
+
+ default:
+ break;
+
+ case CPP_WSTRING:
+ wide = true;
+ /* FALLTHROUGH */
+
+ case CPP_STRING:
+ if (!concats)
+ {
+ gcc_obstack_init (&str_ob);
+ obstack_grow (&str_ob, &str, sizeof (cpp_string));
+ }
+
+ concats++;
+ obstack_grow (&str_ob, &tok->val.str, sizeof (cpp_string));
+ goto retry;
}
/* We have read one more token than we want. */
_cpp_backup_tokens (parse_in, 1);
+ if (concats)
+ strs = XOBFINISH (&str_ob, cpp_string *);
- if (count > 1 && !objc_string && warn_traditional && !in_system_header)
- warning ("traditional C rejects string constant concatenation");
+ if (concats && !objc_string && !in_system_header)
+ warning (OPT_Wtraditional,
+ "traditional C rejects string constant concatenation");
if ((c_lex_string_translate
? cpp_interpret_string : cpp_interpret_string_notranslate)
- (parse_in, strs, count, &istr, wide))
+ (parse_in, strs, concats + 1, &istr, wide))
{
value = build_string (istr.len, (char *) istr.text);
free ((void *) istr.text);
if (c_lex_string_translate == -1)
{
- int xlated = cpp_interpret_string_notranslate (parse_in, strs, count,
+ int xlated = cpp_interpret_string_notranslate (parse_in, strs,
+ concats + 1,
&istr, wide);
/* Assume that, if we managed to translate the string above,
then the untranslated parsing will always succeed. */
TREE_TYPE (value) = wide ? wchar_array_type_node : char_array_type_node;
*valp = fix_string_type (value);
- if (strs != &str)
+ if (concats)
obstack_free (&str_ob, 0);
return objc_string ? CPP_OBJC_STRING : wide ? CPP_WSTRING : CPP_STRING;
OSDN Git Service
