From 946ce1b70473e06c40af6817c28521213af2fb8d Mon Sep 17 00:00:00 2001 From: zack Date: Thu, 10 May 2001 00:07:23 +0000 Subject: * cppinit.c (cpp_post_options): Shut off macro expansion if -fpreprocessed. * cpplib.c (_cpp_handle_directive): If -fpreprocessed, accept IN_I directives only if the # is in column 1 and the directive name begins in column 2. * cppmain.c (scan_buffer): Insert a space between # and an identifier, when that identifier is a directive name. * tradcpp.c (struct file_buf): Add a pointer to the next entry in the header search path. (enum node_type): Add T_INCLUDE_NEXT. (directive_table): Add entry for include_next. (do_include_next): New function. (process_include): New routine, broken out of do_include. (finclude): Insert 'nhd' argument, to be copied into next_header_dir of the new buffer. (main): Adjust to match. * gsyslimits.h, limity.h: Un-indent #include_next. testsuite: * gcc.dg/cpp/direct2.c: New test. * gcc.dg/cpp/direct2s.c: New test. * gcc.c-torture/execute/920730-1t.c: #undef __GNUC__ at head. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@41932 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cppmain.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gcc/cppmain.c') diff --git a/gcc/cppmain.c b/gcc/cppmain.c index ceab9c992e7..db7f0736fea 100644 --- a/gcc/cppmain.c +++ b/gcc/cppmain.c @@ -238,6 +238,13 @@ scan_buffer (pfile) == AVOID_LPASTE && cpp_avoid_paste (pfile, &tokens[1 - index], token)) token->flags |= PREV_WHITE; + /* Special case '# ': insert a space between + the # and the token. This will prevent it from being + treated as a directive when this code is re-preprocessed. + XXX Should do this only at the beginning of a line, but how? */ + else if (token->type == CPP_NAME && token->val.node->directive_index + && tokens[1 - index].type == CPP_HASH) + token->flags |= PREV_WHITE; cpp_output_token (token, print.outf); print.printed = 1; -- cgit v1.2.1