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

6
libjava/javax/xml/namespace/QName.h
View file

@ -13,7 +13,7 @@ extern "Java"
{
namespace xml
{
namespace namespace
namespace namespace$
{
class QName;
}
@ -21,7 +21,7 @@ extern "Java"
}
}
class javax::xml::namespace::QName : public ::java::lang::Object
class javax::xml::namespace$::QName : public ::java::lang::Object
{
public:
@ -34,7 +34,7 @@ public:
virtual jboolean equals(::java::lang::Object *);
virtual jint hashCode();
virtual ::java::lang::String * toString();
static ::javax::xml::namespace::QName * valueOf(::java::lang::String *);
static ::javax::xml::namespace$::QName * valueOf(::java::lang::String *);
private:
static const jlong serialVersionUID = 4418622981026545151LL;
::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) namespaceURI;