From 447306fa90a0acc3c8255daae74427e01374d14f Mon Sep 17 00:00:00 2001
From: Nathan Sidwell <nathan@codesourcery.com>
Date: Mon, 20 Nov 2000 16:13:47 +0000
Subject: [PATCH] lex.c (rid_to_yy, RID_EXPORT): Make unique keyword.
cp:
* lex.c (rid_to_yy, RID_EXPORT): Make unique keyword.
* parse.y (extdef): Add EXPORT reduction.
* spew.c (yylex): Don't skip export here.
testsuite:
* g++.old-deja/g++.pt/export1.C: New test.
From-SVN: r37585
---
gcc/cp/ChangeLog | 6 ++++++
gcc/cp/lex.c | 2 +-
gcc/cp/parse.y | 7 ++++++-
gcc/cp/spew.c | 11 -----------
gcc/testsuite/ChangeLog | 4 ++++
gcc/testsuite/g++.old-deja/g++.pt/export1.C | 18 ++++++++++++++++++
6 files changed, 35 insertions(+), 13 deletions(-)
create mode 100644 gcc/testsuite/g++.old-deja/g++.pt/export1.C
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7886ddca74ae..3e6af41fbc52 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2000-11-20 Nathan Sidwell <nathan@codesourcery.com>
+
+ * lex.c (rid_to_yy, RID_EXPORT): Make unique keyword.
+ * parse.y (extdef): Add EXPORT reduction.
+ * spew.c (yylex): Don't skip export here.
+
2000-11-19 Mark Mitchell <mark@codesourcery.com>
* decl.c (init_decl_processing): Correct name of pure virtual
diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c
index df5dc94f3930..b0553e0434f5 100644
--- a/gcc/cp/lex.c
+++ b/gcc/cp/lex.c
@@ -544,7 +544,7 @@ const short rid_to_yy[RID_MAX] =
/* RID_FRIEND */ SCSPEC,
/* RID_VIRTUAL */ SCSPEC,
/* RID_EXPLICIT */ SCSPEC,
- /* RID_EXPORT */ SCSPEC,
+ /* RID_EXPORT */ EXPORT,
/* RID_MUTABLE */ SCSPEC,
/* ObjC */
diff --git a/gcc/cp/parse.y b/gcc/cp/parse.y
index b8dff069e90c..13c678b7b2a6 100644
--- a/gcc/cp/parse.y
+++ b/gcc/cp/parse.y
@@ -278,7 +278,7 @@ cp_parse_init ()
%token NAMESPACE TYPENAME_KEYWORD USING
%token LEFT_RIGHT TEMPLATE
%token TYPEID DYNAMIC_CAST STATIC_CAST REINTERPRET_CAST CONST_CAST
-%token SCOPE
+%token SCOPE EXPORT
/* Define the operator tokens and their precedences.
The value is an integer because, if used, it is the tree code
@@ -485,6 +485,11 @@ extdef:
{ do_pending_inlines (); }
| datadef
{ do_pending_inlines (); }
+
+ | EXPORT
+ { cp_warning ("keyword `export' not implemented, and will be ignored"); }
+ template_def
+ { do_pending_inlines (); }
| template_def
{ do_pending_inlines (); }
| asm_keyword '(' string ')' ';'
diff --git a/gcc/cp/spew.c b/gcc/cp/spew.c
index 9e6b65ba3b84..0894993a8b6b 100644
--- a/gcc/cp/spew.c
+++ b/gcc/cp/spew.c
@@ -803,17 +803,6 @@ yylex ()
consume_token ();
}
}
- /* If export, warn that it's unimplemented and go on. */
- else if (nth_token (0)->yylval.ttype == ridpointers[RID_EXPORT])
- {
- warning ("keyword 'export' not implemented and will be ignored");
-#ifdef SPEW_DEBUG
- if (spew_debug)
- debug_yychar (yychr);
-#endif
- consume_token ();
- goto retry;
- }
/* do_aggr needs to know if the previous token was `friend'. */
else if (nth_token (0)->yylval.ttype == ridpointers[RID_FRIEND])
after_friend = 1;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2db948fa1e54..efb25913a33c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2000-11-20 Nathan Sidwell <nathan@codesourcery.com>
+
+ * g++.old-deja/g++.pt/export1.C: New test.
+
2000-11-20 Jakub Jelinek <jakub@redhat.com>
* gcc.dg/20001117-1.c: New test.
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/export1.C b/gcc/testsuite/g++.old-deja/g++.pt/export1.C
new file mode 100644
index 000000000000..43f79737c76d
--- /dev/null
+++ b/gcc/testsuite/g++.old-deja/g++.pt/export1.C
@@ -0,0 +1,18 @@
+// Build don't link:
+// Copyright (C) 2000 Free Software Foundation, Inc.
+// Contributed by Nathan Sidwell 17 Nov 2000 <nathan@codesourcery.com>
+
+
+// bug 721, we died horribly when export was used wrongly
+
+struct test {
+int export(void); // ERROR - parse error
+};
+
+int test::export(void) // ERROR - parse error
+{
+return 0;
+}
+
+template <class T> class Y;
+export template <class T> class X; // WARNING - export not implemented
--
GitLab