procyberian/gcc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR java/40590 (namespace namespace broken in CNI)

Browse source 
2009-06-29  Andrew Haley  <aph@redhat.com>

	PR java/40590	
	* tools/gnu/classpath/tools/javah/FieldHelper.java (print):
	Use printName().
	* tools/gnu/classpath/tools/javah/MethodHelper.java (print):
	Use printName().
	* tools/gnu/classpath/tools/javah/CniStubPrinter.java (printDecl):
	Use printName().
	* tools/gnu/classpath/tools/javah/Keywords.java (words): Replace
	with keywords list from  gcc/java/mangle.c.
	* tools/gnu/classpath/tools/javah/ClassWrapper.java (printMethods):
	Don't pre-convert a C++ keyword.
	(print(CniPrintStream)): Call CniPrintStream.printName().
	(printContents): Likewise.
	* tools/gnu/classpath/tools/javah/CniPrintStream.java
	(getClassName): Don't call replaceAll("/", "::").
	(print(Type)): Add ""::" befor name, " *" after.  Use printName(), not
	print.
	(printName(PrintStream, String), printName(String), printlnName):
	New methods.
	(moveToPackage): Use printName().

2009-06-29  Andrew Haley  <aph@redhat.com>

	PR java/40590
	* java-tree.h (cxx_keyword_p): New declaration.
	* mangle_name.c (utf8_cmp): Move here from mangle.c.
	(cxx_keywords): Likewise.
	(cxx_keyword_p): Likewise.
	(MANGLE_CXX_KEYWORDS): New macro.
	(append_gpp_mangled_name): Use MANGLE_CXX_KEYWORDS.
	(append_gpp_mangled_name): Likewise.
	* mangle.c: Move code to mangle_name.c.
	(mangle_member_name): Don't call cxx_keyword_p.

From-SVN: r149059
This commit is contained in:
Andrew Haley 2009-06-29 17:50:59 +00:00 • committed by Andrew Haley
parent 356ecb1530
commit 3ad1aba1f8
150 changed files with 765 additions and 586 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libjava/javax/xml/stream/XMLStreamReader.h
View file

@ -15,7 +15,7 @@ extern "Java"
{
namespace xml
{
namespace namespace
namespace namespace$
{
class NamespaceContext;
class QName;
@ -47,7 +47,7 @@ public:
virtual jboolean isWhiteSpace() = 0;
virtual ::java::lang::String * getAttributeValue(::java::lang::String *, ::java::lang::String *) = 0;
virtual jint getAttributeCount() = 0;
virtual ::javax::xml::namespace::QName * getAttributeName(jint) = 0;
virtual ::javax::xml::namespace$::QName * getAttributeName(jint) = 0;
virtual ::java::lang::String * getAttributeNamespace(jint) = 0;
virtual ::java::lang::String * getAttributeLocalName(jint) = 0;
virtual ::java::lang::String * getAttributePrefix(jint) = 0;
@ -57,7 +57,7 @@ public:
virtual jint getNamespaceCount() = 0;
virtual ::java::lang::String * getNamespacePrefix(jint) = 0;
virtual ::java::lang::String * getNamespaceURI(jint) = 0;
virtual ::javax::xml::namespace::NamespaceContext * getNamespaceContext() = 0;
virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext() = 0;
virtual jint getEventType() = 0;
virtual ::java::lang::String * getText() = 0;
virtual JArray< jchar > * getTextCharacters() = 0;
@ -67,7 +67,7 @@ public:
virtual ::java::lang::String * getEncoding() = 0;
virtual jboolean hasText() = 0;
virtual ::javax::xml::stream::Location * getLocation() = 0;
virtual ::javax::xml::namespace::QName * getName() = 0;
virtual ::javax::xml::namespace$::QName * getName() = 0;
virtual ::java::lang::String * getLocalName() = 0;
virtual jboolean hasName() = 0;
virtual ::java::lang::String * getNamespaceURI() = 0;