diff options
| author | Zack Weinberg <zack@gcc.gnu.org> | 2005-05-12 18:31:38 +0000 |
|---|---|---|
| committer | Zack Weinberg <zack@gcc.gnu.org> | 2005-05-12 18:31:38 +0000 |
| commit | 1ed17cd539718575f2587c75bd69fa3259b25910 (patch) | |
| tree | 9ebe805cfe29bfc038fef679e1dd507371ffc36c /libcpp | |
| parent | 4588b60480b8f66f78a56cb43d6813af76f9a29f (diff) | |
| download | gcc-1ed17cd539718575f2587c75bd69fa3259b25910.zip gcc-1ed17cd539718575f2587c75bd69fa3259b25910.tar.gz gcc-1ed17cd539718575f2587c75bd69fa3259b25910.tar.bz2 | |
directives.c (#sccs table entry): Mark IN_I, consistent with #ident.
libcpp:
* directives.c (#sccs table entry): Mark IN_I, consistent with #ident.
(do_sccs): Delete function definition, #define to do_ident.
(do_ident): Don't hardwire directive name.
gcc:
* doc/cpp.texi: Document that #sccs is a synonym for #ident.
From-SVN: r99623
Diffstat (limited to 'libcpp')
| -rw-r--r-- | libcpp/ChangeLog | 12 | ||||
| -rw-r--r-- | libcpp/directives.c | 14 |
2 files changed, 15 insertions, 11 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 6397e2a..c13a067 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,9 @@ +2005-05-12 Zack Weinberg <zack@codesourcery.com> + + * directives.c (#sccs table entry): Mark IN_I, consistent with #ident. + (do_sccs): Delete function definition, #define to do_ident. + (do_ident): Don't hardwire directive name. + 2005-05-12 Ryota Kunisawa <kunisawa@access.co.jp> PR bootstrap/21230 @@ -26,7 +32,7 @@ fflush, fgetc, fgets, ferror, fread): Redefine to the associated _unlocked function. (fwrite_unlocked): Fix prototype. - + * configure, config.in: Regenerate. 2005-04-05 Jakub Jelinek <jakub@redhat.com> @@ -58,7 +64,7 @@ * lex.c (forms_identifier_p): Disable UCNs in C89 mode. 2005-03-14 Geoffrey Keating <geoffk@apple.com> - + * init.c (cpp_create_reader): Default warn_normalize to normalized_C. * charset.c: Update for new format of ucnid.h. (ucn_valid_in_identifier): Update for new format of ucnid.h. @@ -119,7 +125,7 @@ * directives.c (do_line): Save sysp early before line table is realloc'ed. - + 2005-02-20 Zack Weinberg <zack@codesourcery.com> PR 18785 diff --git a/libcpp/directives.c b/libcpp/directives.c index 957e879..672415b 100644 --- a/libcpp/directives.c +++ b/libcpp/directives.c @@ -157,7 +157,10 @@ D(ident, T_IDENT, EXTENSION, IN_I) /* 11 */ \ D(import, T_IMPORT, EXTENSION, INCL | EXPAND) /* 0 ObjC */ \ D(assert, T_ASSERT, EXTENSION, 0) /* 0 SVR4 */ \ D(unassert, T_UNASSERT, EXTENSION, 0) /* 0 SVR4 */ \ -D(sccs, T_SCCS, EXTENSION, 0) /* 0 SVR4? */ +D(sccs, T_SCCS, EXTENSION, IN_I) /* 0 SVR4? */ + +/* #sccs is synonymous with #ident. */ +#define do_sccs do_ident /* Use the table to generate a series of prototypes, an enum for the directive names, and an array of directive handlers. */ @@ -953,7 +956,8 @@ do_ident (cpp_reader *pfile) const cpp_token *str = cpp_get_token (pfile); if (str->type != CPP_STRING) - cpp_error (pfile, CPP_DL_ERROR, "invalid #ident directive"); + cpp_error (pfile, CPP_DL_ERROR, "invalid #%s directive", + pfile->directive->name); else if (pfile->cb.ident) pfile->cb.ident (pfile, pfile->directive_line, &str->val.str); @@ -1474,12 +1478,6 @@ cpp_handle_deferred_pragma (cpp_reader *pfile, const cpp_string *s) CPP_OPTION (pfile, defer_pragmas) = saved_defer_pragmas; } -/* Ignore #sccs on all systems. */ -static void -do_sccs (cpp_reader *pfile ATTRIBUTE_UNUSED) -{ -} - /* Handle #ifdef. */ static void do_ifdef (cpp_reader *pfile) |