aboutsummaryrefslogtreecommitdiff
path: root/gcc/cpphash.c
diff options
context:
space:
mode:
authorNeil Booth <neilb@earthling.net>2000-04-25 11:57:57 +0000
committerNeil Booth <neil@gcc.gnu.org>2000-04-25 11:57:57 +0000
commit05183359dab76cc72b7c149b44b79012e8234b88 (patch)
treef6054d71feac30674ea9d0da03b21c1292f844cb /gcc/cpphash.c
parentac79db28f447f57b159b40fd7e05de089d204a55 (diff)
downloadgcc-05183359dab76cc72b7c149b44b79012e8234b88.zip
gcc-05183359dab76cc72b7c149b44b79012e8234b88.tar.gz
gcc-05183359dab76cc72b7c149b44b79012e8234b88.tar.bz2
* Revert previous patch until build failure cause determined.
From-SVN: r33411
Diffstat (limited to 'gcc/cpphash.c')
-rw-r--r--gcc/cpphash.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/gcc/cpphash.c b/gcc/cpphash.c
index ac8294d..5817e964 100644
--- a/gcc/cpphash.c
+++ b/gcc/cpphash.c
@@ -459,8 +459,7 @@ collect_objlike_expansion (pfile, list)
default:;
}
- if (i > 1 && !last_was_paste
- && (list->tokens[i].flags & PREV_WHITESPACE))
+ if (i > 1 && !last_was_paste && (list->tokens[i].flags & HSPACE_BEFORE))
CPP_PUTC (pfile, ' ');
CPP_PUTS (pfile,
@@ -572,10 +571,10 @@ collect_funlike_expansion (pfile, list, arglist, replacement)
}
if (last_token != PASTE && last_token != START
- && (list->tokens[i].flags & PREV_WHITESPACE))
+ && (list->tokens[i].flags & HSPACE_BEFORE))
CPP_PUTC (pfile, ' ');
if (last_token == ARG && CPP_TRADITIONAL (pfile)
- && !(list->tokens[i].flags & PREV_WHITESPACE))
+ && !(list->tokens[i].flags & HSPACE_BEFORE))
endpat->raw_after = 1;
switch (token)
@@ -617,7 +616,7 @@ collect_funlike_expansion (pfile, list, arglist, replacement)
{
int raw_before = (last_token == PASTE
|| (CPP_TRADITIONAL (pfile)
- && !(list->tokens[i].flags & PREV_WHITESPACE)));
+ && !(list->tokens[i].flags & HSPACE_BEFORE)));
add_pat (&pat, &endpat,
CPP_WRITTEN (pfile) - last /* nchars */, j /* argno */,
@@ -866,7 +865,7 @@ _cpp_create_definition (pfile, list, hp)
/* The macro is function-like only if the next character,
with no intervening whitespace, is '('. */
else if (list->tokens[1].type == CPP_OPEN_PAREN
- && ! (list->tokens[1].flags & PREV_WHITESPACE))
+ && ! (list->tokens[1].flags & HSPACE_BEFORE))
{
struct arglist args;
int replacement;