X-Git-Url: https://gcc.gnu.org/git/?a=blobdiff_plain;f=gcc%2Fc-lex.c;h=1c832c50d15a648979fbedb5864d82eb4a73f1e4;hb=b0ae01d7f9e4c7e93097856926facb7ce9505f1d;hp=5a2d947be05f820f5648f405ecf22d69f90750b2;hpb=5d709b0013a3d180de93f3349233637c281215b2;p=gcc.git diff --git a/gcc/c-lex.c b/gcc/c-lex.c index 5a2d947be05f..1c832c50d15a 100644 --- a/gcc/c-lex.c +++ b/gcc/c-lex.c @@ -1,6 +1,7 @@ /* 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. @@ -16,8 +17,8 @@ for more details. 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" @@ -45,12 +46,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA 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 */ @@ -60,6 +55,10 @@ int c_header_level; /* depth in C headers - C++ only */ to the untranslated one. */ int c_lex_string_translate = 1; +/* True if strings should be passed to the caller of c_lex completely + unmolested (no concatenation, no translation). */ +bool c_lex_return_raw_strings = false; + static tree interpret_integer (const cpp_token *, unsigned int); static tree interpret_float (const cpp_token *, unsigned int); static enum integer_type_kind narrowest_unsigned_type @@ -117,9 +116,9 @@ get_fileinfo (const char *name) struct c_fileinfo *fi; if (!file_info_tree) - file_info_tree = splay_tree_new ((splay_tree_compare_fn)strcmp, + file_info_tree = splay_tree_new ((splay_tree_compare_fn) strcmp, 0, - (splay_tree_delete_value_fn)free); + (splay_tree_delete_value_fn) free); n = splay_tree_lookup (file_info_tree, (splay_tree_key) name); if (n) @@ -168,7 +167,7 @@ dump_time_statistics (void) print_time ("header files (total)", header_time); print_time ("main file (total)", this_time - body_time); fprintf (stderr, "ratio = %g : 1\n", - (double)header_time / (double)(this_time - body_time)); + (double) header_time / (double) (this_time - body_time)); fprintf (stderr, "\n******\n"); splay_tree_foreach (file_info_tree, dump_one_header, 0); @@ -180,14 +179,14 @@ cb_ident (cpp_reader * ARG_UNUSED (pfile), const cpp_string * ARG_UNUSED (str)) { #ifdef ASM_OUTPUT_IDENT - if (! flag_no_ident) + if (!flag_no_ident) { /* Convert escapes in the string. */ cpp_string cstr = { 0, 0 }; if (cpp_interpret_string (pfile, str, 1, &cstr, false)) { ASM_OUTPUT_IDENT (asm_out_file, (const char *) cstr.text); - free ((void *)cstr.text); + free ((void *) cstr.text); } } #endif @@ -221,7 +220,7 @@ fe_file_change (const struct line_map *new_map) { /* Don't stack the main buffer on the input stack; we already did in compile_file. */ - if (! MAIN_FILE_P (new_map)) + if (!MAIN_FILE_P (new_map)) { #ifdef USE_MAPPED_LOCATION int included_at = LAST_SOURCE_LINE_LOCATION (new_map - 1); @@ -252,7 +251,7 @@ fe_file_change (const struct line_map *new_map) 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 @@ -279,11 +278,16 @@ cb_def_pragma (cpp_reader *pfile, source_location loc) -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); @@ -295,12 +299,8 @@ cb_def_pragma (cpp_reader *pfile, source_location loc) 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); } } @@ -323,32 +323,33 @@ cb_undef (cpp_reader * ARG_UNUSED (pfile), source_location loc, (const char *) NODE_NAME (node)); } -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; @@ -380,33 +381,52 @@ c_lex_with_flags (tree *value, unsigned char *cpp_flags) 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: { @@ -415,9 +435,9 @@ c_lex_with_flags (tree *value, unsigned char *cpp_flags) 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; @@ -428,7 +448,16 @@ c_lex_with_flags (tree *value, unsigned char *cpp_flags) case CPP_STRING: case CPP_WSTRING: - return lex_string (tok, value, false); + if (!c_lex_return_raw_strings) + { + type = lex_string (tok, value, false); + break; + } + + /* FALLTHROUGH */ + + case CPP_PRAGMA: + *value = build_string (tok->val.str.len, (char *) tok->val.str.text); break; /* These tokens should not be visible outside cpplib. */ @@ -442,21 +471,25 @@ c_lex_with_flags (tree *value, unsigned char *cpp_flags) break; } - if (! no_more_pch) + 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 @@ -481,8 +514,8 @@ narrowest_unsigned_type (unsigned HOST_WIDE_INT low, { tree upper = TYPE_MAX_VALUE (integer_types[itk]); - if ((unsigned HOST_WIDE_INT)TREE_INT_CST_HIGH (upper) > high - || ((unsigned HOST_WIDE_INT)TREE_INT_CST_HIGH (upper) == high + if ((unsigned HOST_WIDE_INT) TREE_INT_CST_HIGH (upper) > high + || ((unsigned HOST_WIDE_INT) TREE_INT_CST_HIGH (upper) == high && TREE_INT_CST_LOW (upper) >= low)) return itk; } @@ -509,8 +542,8 @@ narrowest_signed_type (unsigned HOST_WIDE_INT low, { tree upper = TYPE_MAX_VALUE (integer_types[itk]); - if ((unsigned HOST_WIDE_INT)TREE_INT_CST_HIGH (upper) > high - || ((unsigned HOST_WIDE_INT)TREE_INT_CST_HIGH (upper) == high + if ((unsigned HOST_WIDE_INT) TREE_INT_CST_HIGH (upper) > high + || ((unsigned HOST_WIDE_INT) TREE_INT_CST_HIGH (upper) == high && TREE_INT_CST_LOW (upper) >= low)) return itk; } @@ -565,10 +598,11 @@ interpret_integer (const cpp_token *token, unsigned int flags) 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"); } } } @@ -583,8 +617,8 @@ interpret_integer (const cpp_token *token, unsigned int flags) if (itk > itk_unsigned_long && (flags & CPP_N_WIDTH) != CPP_N_LARGE - && ! in_system_header && ! flag_isoc99) - pedwarn ("integer constant is too large for \"%s\" type", + && !in_system_header && !flag_isoc99) + pedwarn ("integer constant is too large for %qs type", (flags & CPP_N_UNSIGNED) ? "unsigned long" : "long"); value = build_int_cst_wide (type, integer.low, integer.high); @@ -644,13 +678,13 @@ interpret_float (const cpp_token *token, unsigned int flags) real_from_string (&real, copy); real_convert (&real, TYPE_MODE (type), &real); - /* A diagnostic is required for "soft" overflow by some ISO C - testsuites. This is not pedwarn, because some people don't want - an error for this. - ??? That's a dubious reason... is this a mandatory diagnostic or - isn't it? -- zw, 2001-08-21. */ + /* Both C and C++ require a diagnostic for a floating constant + outside the range of representable values of its type. Since we + have __builtin_inf* to produce an infinity, it might now be + appropriate for this to be a mandatory pedwarn rather than + conditioned on -pedantic. */ if (REAL_VALUE_ISINF (real) && pedantic) - warning ("floating constant exceeds range of \"%s\"", type_name); + pedwarn ("floating constant exceeds range of %<%s%>", type_name); /* Create a node with determined type and value. */ value = build_real (type, real); @@ -681,7 +715,7 @@ lex_string (const cpp_token *tok, tree *valp, bool objc_string) { tree value; bool wide = false; - size_t count = 1; + size_t concats = 0; struct obstack str_ob; cpp_string istr; @@ -693,67 +727,75 @@ lex_string (const cpp_token *tok, tree *valp, bool objc_string) 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; + } + /* 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)); } - while (tok->type == CPP_STRING || tok->type == CPP_WSTRING); - strs = (cpp_string *) obstack_finish (&str_ob); + + 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); + 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. */ gcc_assert (xlated); - if (TREE_STRING_LENGTH (value) != (int)istr.len - || 0 != strncmp (TREE_STRING_POINTER (value), (char *)istr.text, + if (TREE_STRING_LENGTH (value) != (int) istr.len + || 0 != strncmp (TREE_STRING_POINTER (value), (char *) istr.text, istr.len)) { /* Arrange for us to return the untranslated string in *valp, but to set up the C type of the translated one. */ - *valp = build_string (istr.len, (char *)istr.text); + *valp = build_string (istr.len, (char *) istr.text); valp = &TREE_CHAIN (*valp); } - free ((void *)istr.text); + free ((void *) istr.text); } } else @@ -773,7 +815,7 @@ lex_string (const cpp_token *tok, tree *valp, bool objc_string) 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;