summaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorzack <zack@138bc75d-0d04-0410-961f-82ee72b054a4>2001-03-07 01:32:01 +0000
committerzack <zack@138bc75d-0d04-0410-961f-82ee72b054a4>2001-03-07 01:32:01 +0000
commit9ee99ac68bb9672aca4c02e5800d6e34f34b63b4 (patch)
tree6fd6ae80f761d7e077d853c2bbffc740946a5e0d /gcc/cp
parent9d630a4a6d77daebd4a61fbccc74a7e17f506ecc (diff)
downloadgcc-9ee99ac68bb9672aca4c02e5800d6e34f34b63b4.tar.gz
* c-parse.in (yylexname): New function, split out of _yylex.
(objc_rid_sans_at): New table. (init_reswords): Initialize it. (_yylex): Give labels clearer names. Handle CPP_ATSIGN by retrieving the next token and checking it for significance as an ObjC keyword or string constant. * cpplex.c (_cpp_lex_token): Just return CPP_ATSIGN for '@'. * cpplib.h (TTYPE_TABLE): Add CPP_ATSIGN, drop CPP_OSTRING. * c-lex.c, c-parse.in, cppmacro.c, cpplex.c, cp/spew.c: Remove references to CPP_OSTRING. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@40279 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog4
-rw-r--r--gcc/cp/spew.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 07ac4c5d9fc..92d117b175c 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2001-03-06 Zack Weinberg <zackw@stanford.edu>
+
+ * spew.c: Remove references to CPP_OSTRING.
+
2001-03-06 Andrew Haley <aph@redhat.com>
* typeck.c (convert_arguments): Check that we have an fndecl.
diff --git a/gcc/cp/spew.c b/gcc/cp/spew.c
index 02157f00b45..a02db1b97bc 100644
--- a/gcc/cp/spew.c
+++ b/gcc/cp/spew.c
@@ -351,9 +351,6 @@ read_token (t)
t->yychar = STRING;
break;
- /* This token should not be generated in C++ mode. */
- case CPP_OSTRING:
-
/* These tokens should not survive translation phase 4. */
case CPP_HASH:
case CPP_PASTE:
@@ -1499,8 +1496,7 @@ yyerror (msgid)
error ("%s before %s'\\x%x'", string, ell, val);
}
else if (last_token == CPP_STRING
- || last_token == CPP_WSTRING
- || last_token == CPP_OSTRING)
+ || last_token == CPP_WSTRING)
error ("%s before string constant", string);
else if (last_token == CPP_NUMBER
|| last_token == CPP_INT