OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lex.h: Plugify.

Browse Source 
objcp:
	* plugin/lex.h: Plugify.
cp:
	* lex.c: Plugify.
	* Make-lang.in (objcp/plugin/lex.h): Likewise.

From-SVN: r170104
This commit is contained in:
Mike Stump 2011-02-13 10:02:30 +00:00 committed by Mike Stump
parent eb369a703f
commit 88a3b64909
8 changed files with 51 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/cp/ChangeLog
View File

@ -1,9 +1,7 @@
2011-02-13 Tobias Burnus <burnus@net-b.de>
* parser.c (cp_parser_declaration): Remove unused variable.
2011-02-13 Mike Stump <mikestump@comcast.net>
* lex.c: Plugify.
* Make-lang.in (objcp/plugin/lex.h): Likewise.
* Make-lang.in (cp/parser.o): Move c-family/c-objc.h dependancy
down.

10
gcc/cp/Make-lang.in
View File

@ -247,8 +247,7 @@ CXX_TREE_H = $(TREE_H) cp/name-lookup.h cp/cp-tree.h $(C_COMMON_H) \
CXX_PRETTY_PRINT_H = cp/cxx-pretty-print.h $(C_PRETTY_PRINT_H)
cp/lex.o: cp/lex.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) \
$(C_PRAGMA_H) output.h input.h cp/operators.def $(TM_P_H) \
c-family/c-objc.h
$(C_PRAGMA_H) output.h input.h cp/operators.def $(TM_P_H)
cp/cp-lang.o: cp/cp-lang.c $(CXX_TREE_H) $(TM_H) debug.h langhooks.h \
$(LANGHOOKS_DEF_H) $(C_COMMON_H) gtype-cp.h gt-cp-cp-lang.h \
cp/cp-objcp-common.h $(EXPR_H) $(TARGET_H)
@ -332,6 +331,8 @@ cp/cxx-pretty-print.o: cp/cxx-pretty-print.c $(CXX_PRETTY_PRINT_H) \
cp/parser.o: $(objdir)/objcp/plugin/parser.h $(srcdir)/objcp/plugin/parser.c \
c-family/c-objc.h
cp/lex.o: $(objdir)/objcp/plugin/lex.h c-family/c-objc.h
build/slashify:: $(srcdir)/config/slashify.c
$(COMPILER_FOR_BUILD) $(srcdir)/config/slashify.c -o $@
@ -339,3 +340,8 @@ $(objdir)/objcp/plugin/parser.h: $(srcdir)/objcp/plugin/parser.h | build/slashif
test -d objcp || mkdir objcp
test -d objcp/plugin || mkdir objcp/plugin
build/slashify < $< > $@
$(objdir)/objcp/plugin/lex.h: $(srcdir)/objcp/plugin/lex.h | build/slashify
test -d objcp || mkdir objcp
test -d objcp/plugin || mkdir objcp/plugin
build/slashify < $< > $@

4
gcc/cp/lex.c
View File

@ -33,7 +33,7 @@ along with GCC; see the file COPYING3. If not see
#include "cpplib.h"
#include "flags.h"
#include "c-family/c-pragma.h"
#include "c-family/c-objc.h"
#include "objcp/plugin/lex.h"
#include "output.h"
#include "tm_p.h"
#include "timevar.h"
@ -449,7 +449,7 @@ unqualified_name_lookup_error (tree name)
}
else
{
if (!objc_diagnose_private_ivar (name))
if (!PLUGIN_UNQUALIFIED_NAME_LOOKUP_ERROR (name))
{
error ("%qD was not declared in this scope", name);
suggest_alternatives_for (location_of (name), name);

1
gcc/cp/parser.c
View File

@ -9325,6 +9325,7 @@ cp_parser_declaration (cp_parser* parser)
cp_token token2;
int saved_pedantic;
void *p;
tree attributes = NULL_TREE;
/* Check for the `__extension__' keyword. */
if (cp_parser_extension_opt (parser, &saved_pedantic))

4
gcc/objcp/ChangeLog
View File

@ -1,3 +1,7 @@
2011-02-13 Mike Stump <mikestump@comcast.net>
* plugin/lex.h: Plugify.
2011-02-12 Mike Stump <mikestump@comcast.net>
* Make-lang.in (obj-c++.tags): Plugify Objective-C++.

32
gcc/objcp/plugin/lex.h Normal file
View File

@ -0,0 +1,32 @@
/* Objective-C++ Parser plugin
Copyright (C) 2011 Free Software Foundation, Inc.
This file is part of GCC.
GCC is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
any later version.
GCC is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#ifndef HIDE_OBJC
#include "c-family/c-objc.h"
#define PLUGIN_UNQUALIFIED_NAME_LOOKUP_ERROR(name) @(
objc_diagnose_private_ivar (name)@)
#else
#define PLUGIN_UNQUALIFIED_NAME_LOOKUP_ERROR(name) 0
#endif

2
gcc/objcp/plugin/parser.c
View File

@ -19,7 +19,7 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#ifdef HIDE_OBJC
#ifndef HIDE_OBJC
/* Objective-C++ Productions */

2
gcc/objcp/plugin/parser.h
View File

@ -21,7 +21,7 @@ along with GCC; see the file COPYING3. If not see
/* This isn't defined anywhere, yet, but it could be. This will turn off
the entire C++ Objective-C++ plugin. */
#ifdef HIDE_OBJC
#ifndef HIDE_OBJC
#include "c-family/c-objc.h"