diff options
| -rw-r--r-- | gcc/doc/cpp.texi | 7 | ||||
| -rw-r--r-- | gcc/testsuite/c-c++-common/cpp/file-name-1.c | 22 | ||||
| -rw-r--r-- | gcc/testsuite/c-c++-common/spellcheck-reserved.c | 18 | ||||
| -rw-r--r-- | libcpp/include/cpplib.h | 1 | ||||
| -rw-r--r-- | libcpp/init.c | 1 | ||||
| -rw-r--r-- | libcpp/macro.c | 14 |
6 files changed, 59 insertions, 4 deletions
diff --git a/gcc/doc/cpp.texi b/gcc/doc/cpp.texi index 4b065b6..d4b3ff0 100644 --- a/gcc/doc/cpp.texi +++ b/gcc/doc/cpp.texi @@ -2005,6 +2005,13 @@ This macro expands to the name of the main input file, in the form of a C string constant. This is the source file that was specified on the command line of the preprocessor or C compiler. +@item __FILE_NAME__ +This macro expands to the basename of the current input file, in the +form of a C string constant. This is the last path component by which +the preprocessor opened the file. For example, processing +@code{"/usr/local/include/myheader.h"} would set this +macro to @code{"myheader.h"}. + @item __INCLUDE_LEVEL__ This macro expands to a decimal integer constant that represents the depth of nesting in include files. The value of this macro is diff --git a/gcc/testsuite/c-c++-common/cpp/file-name-1.c b/gcc/testsuite/c-c++-common/cpp/file-name-1.c new file mode 100644 index 0000000..2b476e3 --- /dev/null +++ b/gcc/testsuite/c-c++-common/cpp/file-name-1.c @@ -0,0 +1,22 @@ +/* { dg-do preprocess } */ +/* { dg-additional-options -Wno-pedantic } */ + +main-1 __FILE_NAME__ + +# 7 "inner.h" 1 +inner-1 __FILE_NAME__ +# 9 "subdir/inside.h" 1 +inside-1 __FILE_NAME__ +inside-2 __FILE__ +# 11 "" 2 +inner-2 __FILE_NAME__ +#13 "" 2 +main-2 __FILE_NAME__ + + +/* { dg-final { scan-file file-name-1.i "main-1 \"\[^\n]*file-name-1.c\"\n" } } */ +/* { dg-final { scan-file file-name-1.i "main-2 \"\[^\n]*file-name-1.c\"\n" } } */ +/* { dg-final { scan-file file-name-1.i "inner-1 \"inner.h\"\n" } } */ +/* { dg-final { scan-file file-name-1.i "inner-2 \"inner.h\"\n" } } */ +/* { dg-final { scan-file file-name-1.i "inside-1 \"inside.h\"\n" } } */ +/* { dg-final { scan-file file-name-1.i "inside-2 \"subdir/inside.h\"\n" } } */ diff --git a/gcc/testsuite/c-c++-common/spellcheck-reserved.c b/gcc/testsuite/c-c++-common/spellcheck-reserved.c index ed292f2..56e59dc 100644 --- a/gcc/testsuite/c-c++-common/spellcheck-reserved.c +++ b/gcc/testsuite/c-c++-common/spellcheck-reserved.c @@ -50,3 +50,21 @@ const char * test_3 (void) /* { dg-error "did you mean '__FILE__'" "" { target c } misspelled__FILE_ } */ /* { dg-error "'__FILE_' was not declared in this scope; did you mean '__FILE__'\\?" "" { target c++ } misspelled__FILE_ } */ } + +/* Verify that we can correct "__FILE_NAME_" to "__FILE_NAME__". */ + +const char * test_4 (void) +{ + return __FILE_NAME_; /* { dg-line misspelled__FILE_NAME_ } */ + /* { dg-error "did you mean '__FILE_NAME__'" "" { target c } misspelled__FILE_NAME_ } */ + /* { dg-error "'__FILE_NAME_' was not declared in this scope; did you mean '__FILE_NAME__'\\?" "" { target c++ } misspelled__FILE_NAME_ } */ +} + +/* Verify that we can correct "__FILENAME__" to "__FILE_NAME__". */ + +const char * test_5 (void) +{ + return __FILENAME__; /* { dg-line misspelled__FILENAME__ } */ + /* { dg-error "did you mean '__FILE_NAME__'" "" { target c } misspelled__FILENAME__ } */ + /* { dg-error "'__FILENAME__' was not declared in this scope; did you mean '__FILE_NAME__'\\?" "" { target c++ } misspelled__FILENAME__ } */ +} diff --git a/libcpp/include/cpplib.h b/libcpp/include/cpplib.h index 2cdaf19..7e84063 100644 --- a/libcpp/include/cpplib.h +++ b/libcpp/include/cpplib.h @@ -886,6 +886,7 @@ enum cpp_builtin_type BT_SPECLINE = 0, /* `__LINE__' */ BT_DATE, /* `__DATE__' */ BT_FILE, /* `__FILE__' */ + BT_FILE_NAME, /* `__FILE_NAME__' */ BT_BASE_FILE, /* `__BASE_FILE__' */ BT_INCLUDE_LEVEL, /* `__INCLUDE_LEVEL__' */ BT_TIME, /* `__TIME__' */ diff --git a/libcpp/init.c b/libcpp/init.c index d5d4e99..a450470 100644 --- a/libcpp/init.c +++ b/libcpp/init.c @@ -405,6 +405,7 @@ static const struct builtin_macro builtin_array[] = B("__TIME__", BT_TIME, false), B("__DATE__", BT_DATE, false), B("__FILE__", BT_FILE, false), + B("__FILE_NAME__", BT_FILE_NAME, false), B("__BASE_FILE__", BT_BASE_FILE, false), B("__LINE__", BT_SPECLINE, true), B("__INCLUDE_LEVEL__", BT_INCLUDE_LEVEL, true), diff --git a/libcpp/macro.c b/libcpp/macro.c index dff7c98..4fc5f83 100644 --- a/libcpp/macro.c +++ b/libcpp/macro.c @@ -531,15 +531,21 @@ _cpp_builtin_macro_text (cpp_reader *pfile, cpp_hashnode *node, } break; case BT_FILE: + case BT_FILE_NAME: case BT_BASE_FILE: { unsigned int len; const char *name; uchar *buf; - - if (node->value.builtin == BT_FILE) - name = linemap_get_expansion_filename (pfile->line_table, - pfile->line_table->highest_line); + + if (node->value.builtin == BT_FILE + || node->value.builtin == BT_FILE_NAME) + { + name = linemap_get_expansion_filename (pfile->line_table, + pfile->line_table->highest_line); + if ((node->value.builtin == BT_FILE_NAME) && name) + name = lbasename (name); + } else { name = _cpp_get_file_name (pfile->main_file); |