top level:

2000-07-03  Zack Weinberg  <zack@wolery.cumb.org>

	* fix-header.c (struct partial_proto): Remove unnecessary fields.
	(recognized_extern, recognized_function, read_scan_file):
	Update for new scheme.
	(check_protection): It's still a multiple include guard even
	if it doesn't always trigger.
	* scan-decls.c (skip_to_closing_brace, scan_decls): Update for
	new scheme.
	* scan.h: Declare struct cpp_token.  Update prototypes.

2000-07-03  Neil Booth  <neilb@earthling.net>
	    Zack Weinberg  <zack@wolery.cumb.org>

	Complete overhaul of the lexer and macro expander.

	* cpphash.c (object_defn, funct_defn, push_macro_expansion,
	arg, arglist, argdata, reflist, collect_objlike_expansion,
	collect_funlike_expansion, collect_params,
	warn_trad_stringify, trad_stringify, duplicate_arg_p, add_pat,
	unsafe_chars, macarg, compare_defs, special_symbol,
	scan_arguments, stringify, funlike_macroexpand,
	_cpp_quote_string, monthnames): Delete.
	(cpp_lookup, _cpp_free_definition, dump_funlike_macro,
	_cpp_create_definition, _cpp_dump_definition,
	dump_hash_helper): Adjust.
	(find_param, count_params, parse_define, var_args_str,
	check_macro_redefinition, save_expansion): New.

	* cpplex.c (skip_block_comment, skip_line_comment, parse_name,
        parse_string, output_line_command, trigraph_replace,
        lex_line, cpp_push_buffer, cpp_pop_buffer, cpp_output_tokens,
        cpp_scan_buffer_nooutput, cpp_scan_buffer, cpp_free_toklist,
        cpp_idcmp, _cpp_get_directive_token, _cpp_init_input_buffer,
	_cpp_skip_rest_of_line): Modify.

        (maybe_macroexpand, skip_comment, copy_comment, skip_string,
	find_position, null_warning, bump_column, expand_name_space,
	pedantic_whitespace, _cpp_output_list, _cpp_slice_toklist,
	_cpp_squeeze_toklist, _cpp_scan_until, _cpp_skip_hspace,
	_cpp_parse_name, _cpp_lex_token, cpp_get_non_space_token,
	_cpp_prescan): Delete.

	(dump_param_spelling, process_directive, lex_next,
        is_macro_disabled, stringify_arg, expand_context_stack,
        output_token, make_string_token, alloc_number_token,
        special_symbol, duplicate_token, maybe_paste_with_next,
        can_paste, prevent_macro_expansion, restore_macro_expansion,
        get_temp_token, release_temp_tokens, quote_string,
        token_names, token_spellings, _cpp_expand_name_space,
        _cpp_glue_header_name, _cpp_reserve_name_space,
        digraph_spellings, trigraph_ok, skip_whitespace, save_comment,
        placemarker_token, eof_token, cpp_context, macro_args,
        get_raw_token, parse_arg, parse_args, save_token,
        push_arg_context, push_macro_context, pop_context,
        do_pop_context, free_macro_args, _cpp_get_line,
        _cpp_run_directive): New.

	* cpplib.c (validate_else, parse_include, push_conditional,
	pass_thru_directive, read_line_number, parse_ifdef,
	detect_if_not_defined, _cpp_check_directive, do_define,
	do_undef, do_include, do_import, do_include_next, do_error,
	do_warning, do_ident, do_pragma, pragma_dispatch, gcc_pragmas,
	top_pragmas, do_pragma_gcc, do_pragma_implementation,
	do_pragma_poison, do_pragma_system_header,
	do_pragma_dependency, do_sccs, do_ifdef, do_ifndef, do_else,
	dl_elif, do_endif, _cpp_unwind_if_stack, do_assert,
	do_unassert, cpp_define, cpp_undef, cpp_assert, cpp_unassert,
	cpp_defined): Update for new scheme.
	(strtoul_for_line, get_define_node, dump_macro_name,
	_cpp_check_linemarker, _cpp_parse_assertion): New.
	(_cpp_handle_directive, do_pragma_default): Delete.

	* cpphash.h (struct predicate): Now struct answer.
	(enum spell_type, struct token_spelling, struct directive,
	directive_handler): New.
	Update prototypes.  Remove unused macros.
	* cpplib.h: Update prototypes.  Remove unused macros,
	structure definitions, and fields.

	* cpperror.c (print_containing_files, v_message): Adjust.
	* cppexp.c (parse_assertion, lex, parse_escape,
	_cpp_parse_expr): Adjust.
	* cppfiles.c (open_include_file, _cpp_execute_include,
	_cpp_compare_file_date, cpp_read_file, read_include_file):
	Adjust.
	* cppinit.c (dump_special_to_buffer): Delete.
	(append_include_chain, merge_include_chains, cpp_reader_init,
	cpp_cleanup, initialize_builtins, builtin_array, cpp_start_read,
	cpp_finish, handle_option, print_help): Adjust.
	* cppmain.c (main): Adjust.

testsuite:
2000-07-03  Zack Weinberg  <zack@wolery.cumb.org>

	* testsuite/gcc.dg/cpp/19951025-1.c: Adjust regexps.
	* testsuite/gcc.dg/cpp/19990703-1.c: Likewise.
	* testsuite/gcc.dg/cpp/20000625-1.c: Likewise.
	* testsuite/gcc.dg/cpp/20000625-2.c: Likewise.

	* testsuite/gcc.dg/cpp/macro1.c,
	testsuite/gcc.dg/cpp/paste1.c, testsuite/gcc.dg/cpp/paste2.c,
	testsuite/gcc.dg/cpp/paste3.c, testsuite/gcc.dg/cpp/paste4.c,
	testsuite/gcc.dg/cpp/strify1.c,
	testsuite/gcc.dg/cpp/strify2.c: New tests.

From-SVN: r34859

1 files changed, 31 insertions, 75 deletions

diff --git a/gcc/cppexp.c b/gcc/cppexp.c
index 58430c3..392132b 100644
--- a/gcc/cppexp.c
+++ b/gcc/cppexp.c
@@ -394,74 +394,22 @@ parse_assertion (pfile)
      cpp_reader *pfile;
 {
   struct operation op;
+  struct answer *answer;
   cpp_hashnode *hp;
-  struct predicate *pred;
-  cpp_toklist query;
-  enum cpp_ttype type;
-  U_CHAR *tok;
-  size_t len;
-  unsigned int old_written;
-  int specific = 0;
-
-  old_written = CPP_WRITTEN (pfile);
-  CPP_PUTC (pfile, '#');
-  pfile->no_macro_expand++;
-  type = _cpp_get_directive_token (pfile);
-  if (type == CPP_VSPACE)
-    SYNTAX_ERROR ("assertion without predicate");
-  else if (type != CPP_NAME)
-    SYNTAX_ERROR ("assertion predicate is not an identifier");
-
-  tok = pfile->token_buffer + old_written;
-  len = CPP_WRITTEN (pfile) - old_written;
-  hp = cpp_lookup (pfile, tok, len);
 
-  /* Look ahead for an open paren.  */
-  _cpp_skip_hspace (pfile);
-  if (CPP_BUF_PEEK (CPP_BUFFER (pfile)) == '(')
+  op.op = ERROR;
+  hp = _cpp_parse_assertion (pfile, &answer);
+  if (hp)
     {
-      if (_cpp_get_directive_token (pfile) != CPP_OPEN_PAREN)
-	CPP_ICE ("impossible token, expecting ( in parse_assertion");
-
-      _cpp_init_toklist (&query, NO_DUMMY_TOKEN);
-      specific = 1;
-      if (_cpp_scan_until (pfile, &query, CPP_CLOSE_PAREN) != CPP_CLOSE_PAREN)
-	SYNTAX_ERROR ("missing close paren on assertion answer");
-
-      if (_cpp_get_directive_token (pfile) != CPP_CLOSE_PAREN)
-	CPP_ICE ("impossible token, expecting ) in parse_assertion");
-    }
+      /* If we get here, the syntax is valid.  */
+      op.op = INT;
+      op.value = (hp->type == T_ASSERTION &&
+		  (answer == 0 || *find_answer (hp, &answer->list) != 0));
 
-  /* If we get here, the syntax is valid.  */
-  op.op = INT;
-  op.value = 0;
-  /* Has this predicate been asserted at all?  */
-  if (hp->type == T_ASSERTION)
-    {
-      if (specific)
-	{
-	  for (pred = hp->value.pred; pred; pred = pred->next)
-	    if (_cpp_equiv_toklists (&query, &pred->answer))
-	      {
-		op.value = 1;
-		break;
-	      }
-	  _cpp_free_toklist (&query);
-	}
-      else
-	op.value = 1;
+      if (answer)
+	FREE_ANSWER (answer);
     }
-
- out:
-  pfile->no_macro_expand--;
-  CPP_SET_WRITTEN (pfile, old_written);
   return op;
-
- syntax_error:
-  if (specific)
-    _cpp_free_toklist (&query);
-  op.op = ERROR;
-  goto out;
 }
 
 struct token
@@ -480,8 +428,6 @@ static const struct token tokentab2[] =
   {"!=", NOTEQUAL},
   {"<=", LEQ},
   {">=", GEQ},
-  {"++", ERROR},
-  {"--", ERROR},
   {NULL, ERROR}
 };
 
@@ -496,16 +442,20 @@ lex (pfile, skip_evaluation)
   enum cpp_ttype token;
   struct operation op;
   U_CHAR *tok_start, *tok_end;
-  long old_written;
+  long old_written = CPP_WRITTEN (pfile);
 
-  old_written = CPP_WRITTEN (pfile);
+ retry:
   token = _cpp_get_directive_token (pfile);
-
   tok_start = pfile->token_buffer + old_written;
   tok_end = CPP_PWRITTEN (pfile);
   CPP_SET_WRITTEN (pfile, old_written);
+
   switch (token)
     {
+    case CPP_PLACEMARKER:
+      CPP_SET_WRITTEN (pfile, old_written);
+      goto retry;
+
     case CPP_EOF: /* Should not happen ...  */
     case CPP_VSPACE:
       op.op = 0;
@@ -524,6 +474,7 @@ lex (pfile, skip_evaluation)
       return parse_charconst (pfile, tok_start, tok_end);
 
     case CPP_NAME:
+      /* FIXME:  could this not overflow the tok_start buffer? */
       if (!ustrncmp (tok_start, U"defined", 7))
 	return parse_defined (pfile);
 
@@ -539,7 +490,16 @@ lex (pfile, skip_evaluation)
     case CPP_HASH:
       return parse_assertion (pfile);
 
-    case CPP_OTHER:
+    case CPP_AND_AND:	op.op = ANDAND; return op;
+    case CPP_OR_OR:	op.op = OROR;	return op;
+    case CPP_LSHIFT:	op.op = LSH;	return op;
+    case CPP_RSHIFT:	op.op = RSH;	return op;
+    case CPP_EQ_EQ:	op.op = EQUAL;	return op;
+    case CPP_NOT_EQ:	op.op = NOTEQUAL; return op;
+    case CPP_LESS_EQ:	op.op = LEQ;	return op;
+    case CPP_GREATER_EQ:op.op = GEQ;	return op;
+
+    default:
       /* See if it is a special token of length 2.  */
       if (tok_start + 2 == tok_end)
         {
@@ -553,8 +513,6 @@ lex (pfile, skip_evaluation)
 	  op.op = toktab->token; 
 	  return op;
 	}
-      /* fall through */
-    default:
       op.op = *tok_start;
       return op;
   }
@@ -612,7 +570,7 @@ parse_escape (pfile, string_ptr, result_mask)
     case 'e':
     case 'E':
       if (CPP_PEDANTIC (pfile))
-	cpp_pedwarn (pfile, "non-ANSI-standard escape sequence, '\\%c'", c);
+	cpp_pedwarn (pfile, "non-ISO-standard escape sequence, '\\%c'", c);
       return TARGET_ESC;
     case 'f':
       return TARGET_FF;
@@ -844,9 +802,7 @@ _cpp_parse_expr (pfile)
   char buff[5];
 
   /* Save parser state and set it to something sane.  */
-  int save_only_seen_white = pfile->only_seen_white;
   int save_skipping = pfile->skipping;
-  pfile->only_seen_white = 0;
   pfile->skipping = 0;
 
   /* We've finished when we try to reduce this.  */
@@ -875,7 +831,8 @@ _cpp_parse_expr (pfile)
 	case ERROR:
 	  goto syntax_error;
 	default:
-	  SYNTAX_ERROR ("invalid character in #if");
+	  SYNTAX_ERROR2 ("invalid character '%s' in #if",
+			 op_to_str (op.op, buff));
 
 	push_immediate:
 	case INT:
@@ -1168,7 +1125,6 @@ _cpp_parse_expr (pfile)
   if (stack != init_stack)
     free (stack);
   CPP_SET_WRITTEN (pfile, old_written);
-  pfile->only_seen_white = save_only_seen_white;
   pfile->skipping = save_skipping;
   return result;
 }