(cpp_options_init): Ignore DOLLARS_IN_IDENTIFIERS.
(parse_name): Diagnose $ in identifier if pedantic. (cpp_handle_options): -traditional no longer messes with dollars_in_ident. From-SVN: r12935
This commit is contained in:
parent
45870676ab
commit
9e979f8fd8
|
@ -785,7 +785,6 @@ cpp_options_init (opts)
|
||||||
/* Initialize is_idchar to allow $. */
|
/* Initialize is_idchar to allow $. */
|
||||||
opts->dollars_in_ident = 1;
|
opts->dollars_in_ident = 1;
|
||||||
initialize_char_syntax (opts);
|
initialize_char_syntax (opts);
|
||||||
opts->dollars_in_ident = DOLLARS_IN_IDENTIFIERS > 0;
|
|
||||||
|
|
||||||
opts->no_line_commands = 0;
|
opts->no_line_commands = 0;
|
||||||
opts->no_trigraphs = 1;
|
opts->no_trigraphs = 1;
|
||||||
|
@ -5228,6 +5227,9 @@ parse_name (pfile, c)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (c == '$' && CPP_PEDANTIC (pfile))
|
||||||
|
cpp_pedwarn ("`$' in identifier");
|
||||||
|
|
||||||
CPP_RESERVE(pfile, 2); /* One more for final NUL. */
|
CPP_RESERVE(pfile, 2); /* One more for final NUL. */
|
||||||
CPP_PUTC_Q (pfile, c);
|
CPP_PUTC_Q (pfile, c);
|
||||||
c = GETC();
|
c = GETC();
|
||||||
|
@ -6418,8 +6420,6 @@ cpp_handle_options (pfile, argc, argv)
|
||||||
case 't':
|
case 't':
|
||||||
if (!strcmp (argv[i], "-traditional")) {
|
if (!strcmp (argv[i], "-traditional")) {
|
||||||
opts->traditional = 1;
|
opts->traditional = 1;
|
||||||
if (opts->dollars_in_ident > 0)
|
|
||||||
opts->dollars_in_ident = 1;
|
|
||||||
} else if (!strcmp (argv[i], "-trigraphs")) {
|
} else if (!strcmp (argv[i], "-trigraphs")) {
|
||||||
if (!opts->chill)
|
if (!opts->chill)
|
||||||
opts->no_trigraphs = 0;
|
opts->no_trigraphs = 0;
|
||||||
|
|
Loading…
Reference in New Issue