aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gcc/c/ChangeLog5
-rw-r--r--gcc/c/c-parser.c25
-rw-r--r--gcc/testsuite/ChangeLog9
-rw-r--r--gcc/testsuite/gcc.dg/asm-scope-1.c27
-rw-r--r--gcc/testsuite/gcc.dg/cpp/c11-scope-1.c8
-rw-r--r--gcc/testsuite/gcc.dg/cpp/c17-scope-1.c8
-rw-r--r--gcc/testsuite/gcc.dg/cpp/c2x-scope-1.c8
-rw-r--r--gcc/testsuite/gcc.dg/cpp/c2x-scope-2.c11
-rw-r--r--gcc/testsuite/gcc.dg/cpp/c90-scope-1.c7
-rw-r--r--gcc/testsuite/gcc.dg/cpp/c94-scope-1.c8
-rw-r--r--gcc/testsuite/gcc.dg/cpp/c99-scope-1.c8
-rw-r--r--gcc/testsuite/gcc.dg/cpp/gnu11-scope-1.c8
-rw-r--r--gcc/testsuite/gcc.dg/cpp/gnu17-scope-1.c8
-rw-r--r--gcc/testsuite/gcc.dg/cpp/gnu89-scope-1.c8
-rw-r--r--gcc/testsuite/gcc.dg/cpp/gnu99-scope-1.c8
-rw-r--r--libcpp/ChangeLog8
-rw-r--r--libcpp/include/cpplib.h3
-rw-r--r--libcpp/init.c48
-rw-r--r--libcpp/lex.c2
19 files changed, 187 insertions, 30 deletions
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index 3156e35..0f263f7 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,8 @@
+2019-10-02 Joseph Myers <joseph@codesourcery.com>
+
+ * c-parser.c (c_parser_asm_statement): Handle CPP_SCOPE like two
+ CPP_COLON tokens.
+
2019-10-01 Richard Sandiford <richard.sandiford@arm.com>
* c-objc-common.c (useful_aka_type_p): New function.
diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c
index c8afab2..6957297 100644
--- a/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@@ -6411,7 +6411,9 @@ c_parser_for_statement (c_parser *parser, bool ivdep, unsigned short unroll,
The form with asm-goto-operands is valid if and only if the
asm-qualifier-list contains goto, and is the only allowed form in that case.
- Duplicate asm-qualifiers are not allowed. */
+ Duplicate asm-qualifiers are not allowed.
+
+ The :: token is considered equivalent to two consecutive : tokens. */
static tree
c_parser_asm_statement (c_parser *parser)
@@ -6509,17 +6511,28 @@ c_parser_asm_statement (c_parser *parser)
nsections = 3 + is_goto;
for (section = 0; section < nsections; ++section)
{
- if (!c_parser_require (parser, CPP_COLON,
- is_goto
- ? G_("expected %<:%>")
- : G_("expected %<:%> or %<)%>"),
- UNKNOWN_LOCATION, is_goto))
+ if (c_parser_next_token_is (parser, CPP_SCOPE))
+ {
+ ++section;
+ if (section == nsections)
+ {
+ c_parser_error (parser, "expected %<)%>");
+ goto error_close_paren;
+ }
+ c_parser_consume_token (parser);
+ }
+ else if (!c_parser_require (parser, CPP_COLON,
+ is_goto
+ ? G_("expected %<:%>")
+ : G_("expected %<:%> or %<)%>"),
+ UNKNOWN_LOCATION, is_goto))
goto error_close_paren;
/* Once past any colon, we're no longer a simple asm. */
simple = false;
if ((!c_parser_next_token_is (parser, CPP_COLON)
+ && !c_parser_next_token_is (parser, CPP_SCOPE)
&& !c_parser_next_token_is (parser, CPP_CLOSE_PAREN))
|| section == 3)
switch (section)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5949f0a..834ee45 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2019-10-02 Joseph Myers <joseph@codesourcery.com>
+
+ * gcc.dg/asm-scope-1.c, gcc.dg/cpp/c11-scope-1.c,
+ gcc.dg/cpp/c17-scope-1.c, gcc.dg/cpp/c2x-scope-1.c,
+ gcc.dg/cpp/c2x-scope-2.c, gcc.dg/cpp/c90-scope-1.c,
+ gcc.dg/cpp/c94-scope-1.c, gcc.dg/cpp/c99-scope-1.c,
+ gcc.dg/cpp/gnu11-scope-1.c, gcc.dg/cpp/gnu17-scope-1.c,
+ gcc.dg/cpp/gnu89-scope-1.c, gcc.dg/cpp/gnu99-scope-1.c: New tests.
+
2019-10-01 David Malcolm <dmalcolm@redhat.com>
* gcc.dg/plugin/diagnostic_group_plugin.c (test_begin_group_cb):
diff --git a/gcc/testsuite/gcc.dg/asm-scope-1.c b/gcc/testsuite/gcc.dg/asm-scope-1.c
new file mode 100644
index 0000000..6439104
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/asm-scope-1.c
@@ -0,0 +1,27 @@
+/* Test :: token handling in asm. */
+/* { dg-do compile } */
+/* { dg-options "-std=gnu2x" } */
+
+void
+f (void)
+{
+ asm ("");
+ asm ("" : );
+ asm ("" : :);
+ asm ("" ::);
+ asm ("" : : :);
+ asm ("" :: :);
+ asm ("" : ::);
+ asm goto ("" : : : : lab);
+ asm goto ("" :: : : lab);
+ asm goto ("" : :: : lab);
+ asm goto ("" : : :: lab);
+ asm goto ("" :: :: lab);
+ lab: ;
+ /* Test errors when :: is at the end of asm and only one : allowed. */
+ asm ("" : : ::); /* { dg-error "expected" } */
+ asm ("" :: ::); /* { dg-error "expected" } */
+ asm goto ("" : : : :: lab); /* { dg-error "expected" } */
+ asm goto ("" :: : :: lab); /* { dg-error "expected" } */
+ asm goto ("" : :: :: lab); /* { dg-error "expected" } */
+}
diff --git a/gcc/testsuite/gcc.dg/cpp/c11-scope-1.c b/gcc/testsuite/gcc.dg/cpp/c11-scope-1.c
new file mode 100644
index 0000000..2db0516
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/cpp/c11-scope-1.c
@@ -0,0 +1,8 @@
+/* Test :: token not in C11. */
+/* { dg-do preprocess } */
+/* { dg-options "-std=c11 -pedantic-errors" } */
+
+#define CONCAT(x, y) x ## y
+
+CONCAT (:, :) /* { dg-error "does not give a valid preprocessing token" } */
+CONCAT (::, >)
diff --git a/gcc/testsuite/gcc.dg/cpp/c17-scope-1.c b/gcc/testsuite/gcc.dg/cpp/c17-scope-1.c
new file mode 100644
index 0000000..b5b366b
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/cpp/c17-scope-1.c
@@ -0,0 +1,8 @@
+/* Test :: token not in C17. */
+/* { dg-do preprocess } */
+/* { dg-options "-std=c17 -pedantic-errors" } */
+
+#define CONCAT(x, y) x ## y
+
+CONCAT (:, :) /* { dg-error "does not give a valid preprocessing token" } */
+CONCAT (::, >)
diff --git a/gcc/testsuite/gcc.dg/cpp/c2x-scope-1.c b/gcc/testsuite/gcc.dg/cpp/c2x-scope-1.c
new file mode 100644
index 0000000..8337ba7
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/cpp/c2x-scope-1.c
@@ -0,0 +1,8 @@
+/* Test :: token in C2x. */
+/* { dg-do preprocess } */
+/* { dg-options "-std=c2x -pedantic-errors" } */
+
+#define CONCAT(x, y) x ## y
+
+CONCAT (:, :)
+CONCAT (::, >) /* { dg-error "does not give a valid preprocessing token" } */
diff --git a/gcc/testsuite/gcc.dg/cpp/c2x-scope-2.c b/gcc/testsuite/gcc.dg/cpp/c2x-scope-2.c
new file mode 100644
index 0000000..73b36e7
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/cpp/c2x-scope-2.c
@@ -0,0 +1,11 @@
+/* Test :: token in C2x: preprocessed output. */
+/* { dg-do preprocess } */
+/* { dg-options "-std=c2x -pedantic-errors -P" } */
+
+#define COLON() :
+#define TEST() ABC
+
+/* This must have a space inserted between the two ':' tokens in
+ preprocessed output. */
+TEST()COLON()COLON()TEST()
+/* { dg-final { scan-file c2x-scope-2.i "ABC: :ABC" } } */
diff --git a/gcc/testsuite/gcc.dg/cpp/c90-scope-1.c b/gcc/testsuite/gcc.dg/cpp/c90-scope-1.c
new file mode 100644
index 0000000..4c23e21
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/cpp/c90-scope-1.c
@@ -0,0 +1,7 @@
+/* Test :: token not in C90. */
+/* { dg-do preprocess } */
+/* { dg-options "-std=c90 -pedantic-errors" } */
+
+#define CONCAT(x, y) x ## y
+
+CONCAT (:, :) /* { dg-error "does not give a valid preprocessing token" } */
diff --git a/gcc/testsuite/gcc.dg/cpp/c94-scope-1.c b/gcc/testsuite/gcc.dg/cpp/c94-scope-1.c
new file mode 100644
index 0000000..0e6da01
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/cpp/c94-scope-1.c
@@ -0,0 +1,8 @@
+/* Test :: token not in C94. */
+/* { dg-do preprocess } */
+/* { dg-options "-std=iso9899:199409 -pedantic-errors" } */
+
+#define CONCAT(x, y) x ## y
+
+CONCAT (:, :) /* { dg-error "does not give a valid preprocessing token" } */
+CONCAT (::, >)
diff --git a/gcc/testsuite/gcc.dg/cpp/c99-scope-1.c b/gcc/testsuite/gcc.dg/cpp/c99-scope-1.c
new file mode 100644
index 0000000..e878286
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/cpp/c99-scope-1.c
@@ -0,0 +1,8 @@
+/* Test :: token not in C99. */
+/* { dg-do preprocess } */
+/* { dg-options "-std=c99 -pedantic-errors" } */
+
+#define CONCAT(x, y) x ## y
+
+CONCAT (:, :) /* { dg-error "does not give a valid preprocessing token" } */
+CONCAT (::, >)
diff --git a/gcc/testsuite/gcc.dg/cpp/gnu11-scope-1.c b/gcc/testsuite/gcc.dg/cpp/gnu11-scope-1.c
new file mode 100644
index 0000000..2dea391
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/cpp/gnu11-scope-1.c
@@ -0,0 +1,8 @@
+/* Test :: token in gnu11. */
+/* { dg-do preprocess } */
+/* { dg-options "-std=gnu11 -pedantic-errors" } */
+
+#define CONCAT(x, y) x ## y
+
+CONCAT (:, :)
+CONCAT (::, >) /* { dg-error "does not give a valid preprocessing token" } */
diff --git a/gcc/testsuite/gcc.dg/cpp/gnu17-scope-1.c b/gcc/testsuite/gcc.dg/cpp/gnu17-scope-1.c
new file mode 100644
index 0000000..0c5f20d
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/cpp/gnu17-scope-1.c
@@ -0,0 +1,8 @@
+/* Test :: token in gnu17. */
+/* { dg-do preprocess } */
+/* { dg-options "-std=gnu17 -pedantic-errors" } */
+
+#define CONCAT(x, y) x ## y
+
+CONCAT (:, :)
+CONCAT (::, >) /* { dg-error "does not give a valid preprocessing token" } */
diff --git a/gcc/testsuite/gcc.dg/cpp/gnu89-scope-1.c b/gcc/testsuite/gcc.dg/cpp/gnu89-scope-1.c
new file mode 100644
index 0000000..812e62f
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/cpp/gnu89-scope-1.c
@@ -0,0 +1,8 @@
+/* Test :: token in gnu89. */
+/* { dg-do preprocess } */
+/* { dg-options "-std=gnu89 -pedantic-errors" } */
+
+#define CONCAT(x, y) x ## y
+
+CONCAT (:, :)
+CONCAT (::, >) /* { dg-error "does not give a valid preprocessing token" } */
diff --git a/gcc/testsuite/gcc.dg/cpp/gnu99-scope-1.c b/gcc/testsuite/gcc.dg/cpp/gnu99-scope-1.c
new file mode 100644
index 0000000..5ba871d
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/cpp/gnu99-scope-1.c
@@ -0,0 +1,8 @@
+/* Test :: token in gnu99. */
+/* { dg-do preprocess } */
+/* { dg-options "-std=gnu99 -pedantic-errors" } */
+
+#define CONCAT(x, y) x ## y
+
+CONCAT (:, :)
+CONCAT (::, >) /* { dg-error "does not give a valid preprocessing token" } */
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 1ca622d..682caac 100644
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,11 @@
+2019-10-02 Joseph Myers <joseph@codesourcery.com>
+
+ * include/cpplib.h (struct cpp_options): Add member scope.
+ * init.c (struct lang_flags, lang_defaults): Likewise.
+ (cpp_set_lang): Set scope member of pfile.
+ * lex.c (_cpp_lex_direct): Test CPP_OPTION (pfile, scope) not
+ CPP_OPTION (pfile, cplusplus) for creating CPP_SCOPE tokens.
+
2019-09-26 Eric Botcazou <ebotcazou@adacore.com>
* charset.c (UCS_LIMIT): New macro.
diff --git a/libcpp/include/cpplib.h b/libcpp/include/cpplib.h
index a645f81..ccbcfde 100644
--- a/libcpp/include/cpplib.h
+++ b/libcpp/include/cpplib.h
@@ -483,6 +483,9 @@ struct cpp_options
/* Nonzero for C++2a __VA_OPT__ feature. */
unsigned char va_opt;
+ /* Nonzero for the '::' token. */
+ unsigned char scope;
+
/* Holds the name of the target (execution) character set. */
const char *narrow_charset;
diff --git a/libcpp/init.c b/libcpp/init.c
index ccbfc96..c932598 100644
--- a/libcpp/init.c
+++ b/libcpp/init.c
@@ -92,32 +92,33 @@ struct lang_flags
char trigraphs;
char utf8_char_literals;
char va_opt;
+ char scope;
};
static const struct lang_flags lang_defaults[] =
-{ /* c99 c++ xnum xid c11 std digr ulit rlit udlit bincst digsep trig u8chlit vaopt */
- /* GNUC89 */ { 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1 },
- /* GNUC99 */ { 1, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1 },
- /* GNUC11 */ { 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1 },
- /* GNUC17 */ { 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1 },
- /* GNUC2X */ { 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1 },
- /* STDC89 */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0 },
- /* STDC94 */ { 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0 },
- /* STDC99 */ { 1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0 },
- /* STDC11 */ { 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0 },
- /* STDC17 */ { 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0 },
- /* STDC2X */ { 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0 },
- /* GNUCXX */ { 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1 },
- /* CXX98 */ { 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0 },
- /* GNUCXX11 */ { 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1 },
- /* CXX11 */ { 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0 },
- /* GNUCXX14 */ { 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1 },
- /* CXX14 */ { 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0 },
- /* GNUCXX17 */ { 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1 },
- /* CXX17 */ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0 },
- /* GNUCXX2A */ { 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1 },
- /* CXX2A */ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1 },
- /* ASM */ { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
+{ /* c99 c++ xnum xid c11 std digr ulit rlit udlit bincst digsep trig u8chlit vaopt scope*/
+ /* GNUC89 */ { 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1 },
+ /* GNUC99 */ { 1, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1 },
+ /* GNUC11 */ { 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1 },
+ /* GNUC17 */ { 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1 },
+ /* GNUC2X */ { 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1 },
+ /* STDC89 */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 },
+ /* STDC94 */ { 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0 },
+ /* STDC99 */ { 1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0 },
+ /* STDC11 */ { 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
+ /* STDC17 */ { 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0 },
+ /* STDC2X */ { 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 1 },
+ /* GNUCXX */ { 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1 },
+ /* CXX98 */ { 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1 },
+ /* GNUCXX11 */ { 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1 },
+ /* CXX11 */ { 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1 },
+ /* GNUCXX14 */ { 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1 },
+ /* CXX14 */ { 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1 },
+ /* GNUCXX17 */ { 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1 },
+ /* CXX17 */ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1 },
+ /* GNUCXX2A */ { 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1 },
+ /* CXX2A */ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1 },
+ /* ASM */ { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
};
/* Sets internal flags correctly for a given language. */
@@ -143,6 +144,7 @@ cpp_set_lang (cpp_reader *pfile, enum c_lang lang)
CPP_OPTION (pfile, trigraphs) = l->trigraphs;
CPP_OPTION (pfile, utf8_char_literals) = l->utf8_char_literals;
CPP_OPTION (pfile, va_opt) = l->va_opt;
+ CPP_OPTION (pfile, scope) = l->scope;
}
/* Initialize library global state. */
diff --git a/libcpp/lex.c b/libcpp/lex.c
index 0e8de38..3e7d1c3 100644
--- a/libcpp/lex.c
+++ b/libcpp/lex.c
@@ -3104,7 +3104,7 @@ _cpp_lex_direct (cpp_reader *pfile)
case ':':
result->type = CPP_COLON;
- if (*buffer->cur == ':' && CPP_OPTION (pfile, cplusplus))
+ if (*buffer->cur == ':' && CPP_OPTION (pfile, scope))
buffer->cur++, result->type = CPP_SCOPE;
else if (*buffer->cur == '>' && CPP_OPTION (pfile, digraphs))
{
generated by cgit v1.1 at 2024-11-01 02:47:55 +0000