diff options
| author | Richard Henderson <rth@redhat.com> | 2005-11-26 14:31:12 -0800 |
|---|---|---|
| committer | Richard Henderson <rth@gcc.gnu.org> | 2005-11-26 14:31:12 -0800 |
| commit | 75ce3d489ce44d6eeb8e59d88d76eb6d4682bbd1 (patch) | |
| tree | 5703faf1ece630500fe3307d28bde4060c47e721 /gcc/cp | |
| parent | 37d3243dadc9c18a234d04716873b717efa93ae8 (diff) | |
| download | gcc-75ce3d489ce44d6eeb8e59d88d76eb6d4682bbd1.zip gcc-75ce3d489ce44d6eeb8e59d88d76eb6d4682bbd1.tar.gz gcc-75ce3d489ce44d6eeb8e59d88d76eb6d4682bbd1.tar.bz2 | |
c-lex.c (pragma_lex): Rename from c_lex.
* c-lex.c (pragma_lex): Rename from c_lex.
* c-pch.c: Update for pragma_lex rename.
* c-pragma.c, c-pragma.h, config/ia64/ia64-c.c: Likewise.
* config/m32c/m32c-pragma.c, config/darwin-c.c: Likewise.
* config/rs6000/rs6000-c.c, config/c4x/c4x-c.c: Likewise.
* config/sol2-c.c, config/v850/v850-c.c: Likewise.
* doc/tm.texi: Likewise.
cp/
* lex.c: Update for pragma_lex rename.
* parser.c: Likewise.
From-SVN: r107544
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/lex.c | 6 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 6 |
3 files changed, 11 insertions, 6 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5e5df9b..b6936aa 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2005-11-26 Richard Henderson <rth@redhat.com> + + * lex.c: Update for pragma_lex rename. + * parser.c: Likewise. + 2005-11-25 Volker Reichelt <reichelt@igpm.rwth-aachen.de> PR c++/9278 diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c index ce56265..4ed1077 100644 --- a/gcc/cp/lex.c +++ b/gcc/cp/lex.c @@ -460,11 +460,11 @@ parse_strconst_pragma (const char* name, int opt) tree result, x; enum cpp_ttype t; - t = c_lex (&x); + t = pragma_lex (&x); if (t == CPP_STRING) { result = x; - if (c_lex (&x) != CPP_EOF) + if (pragma_lex (&x) != CPP_EOF) warning (0, "junk at end of #pragma %s", name); return result; } @@ -583,7 +583,7 @@ static void handle_pragma_java_exceptions (cpp_reader* dfile ATTRIBUTE_UNUSED ) { tree x; - if (c_lex (&x) != CPP_EOF) + if (pragma_lex (&x) != CPP_EOF) warning (0, "junk at end of #pragma GCC java_exceptions"); choose_personality_routine (lang_java); diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 5827e5e..0ea0f93 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -254,7 +254,7 @@ cp_lexer_new_main (void) /* Tell cpplib we want CPP_PRAGMA tokens. */ cpp_get_options (parse_in)->defer_pragmas = true; - /* Tell c_lex not to merge string constants. */ + /* Tell pragma_lex not to merge string constants. */ c_lex_return_raw_strings = true; c_common_no_more_pch (); @@ -297,8 +297,8 @@ cp_lexer_new_main (void) lexer->next_token = lexer->buffer_length ? buffer : (cp_token *)&eof_token; /* Pragma processing (via cpp_handle_deferred_pragma) may result in - direct calls to c_lex. Those callers all expect c_lex to do - string constant concatenation. */ + direct calls to pragma_lex. Those callers all expect pragma_lex + to do string constant concatenation. */ c_lex_return_raw_strings = false; /* Subsequent preprocessor diagnostics should use compiler |