yggdrasil/gcc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
libjava/gnu/xml/validation/datatype/AtomicSimpleType.h
+3 -3
View File
@@ -28,7 +28,7 @@ extern "Java"
{
namespace xml
{
namespace namespace
namespace namespace$
{
class QName;
}
@@ -50,9 +50,9 @@ class gnu::xml::validation::datatype::AtomicSimpleType : public ::gnu::xml::vali
{
public:
AtomicSimpleType(::javax::xml::namespace::QName *, ::java::util::Set *, jint, ::gnu::xml::validation::datatype::SimpleType *, ::gnu::xml::validation::datatype::Annotation *);
AtomicSimpleType(::javax::xml::namespace$::QName *, ::java::util::Set *, jint, ::gnu::xml::validation::datatype::SimpleType *, ::gnu::xml::validation::datatype::Annotation *);
public: // actually package-private
AtomicSimpleType(::javax::xml::namespace::QName *, ::gnu::xml::validation::datatype::SimpleType *);
AtomicSimpleType(::javax::xml::namespace$::QName *, ::gnu::xml::validation::datatype::SimpleType *);
public:
virtual void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
static ::java::lang::Class class$;
libjava/gnu/xml/validation/datatype/ListSimpleType.h
+2 -2
View File
@@ -28,7 +28,7 @@ extern "Java"
{
namespace xml
{
namespace namespace
namespace namespace$
{
class QName;
}
@@ -50,7 +50,7 @@ class gnu::xml::validation::datatype::ListSimpleType : public ::gnu::xml::valida
{
public:
ListSimpleType(::javax::xml::namespace::QName *, ::java::util::Set *, jint, ::gnu::xml::validation::datatype::SimpleType *, ::gnu::xml::validation::datatype::Annotation *, ::gnu::xml::validation::datatype::SimpleType *);
ListSimpleType(::javax::xml::namespace$::QName *, ::java::util::Set *, jint, ::gnu::xml::validation::datatype::SimpleType *, ::gnu::xml::validation::datatype::Annotation *, ::gnu::xml::validation::datatype::SimpleType *);
virtual void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
::gnu::xml::validation::datatype::SimpleType * __attribute__((aligned(__alignof__( ::gnu::xml::validation::datatype::SimpleType)))) itemType;
static ::java::lang::Class class$;
libjava/gnu/xml/validation/datatype/SimpleType.h
+2 -2
View File
@@ -27,7 +27,7 @@ extern "Java"
{
namespace xml
{
namespace namespace
namespace namespace$
{
class QName;
}
@@ -50,7 +50,7 @@ class gnu::xml::validation::datatype::SimpleType : public ::gnu::xml::validation
{
public:
SimpleType(::javax::xml::namespace::QName *, jint, ::java::util::Set *, jint, ::gnu::xml::validation::datatype::SimpleType *, ::gnu::xml::validation::datatype::Annotation *);
SimpleType(::javax::xml::namespace$::QName *, jint, ::java::util::Set *, jint, ::gnu::xml::validation::datatype::SimpleType *, ::gnu::xml::validation::datatype::Annotation *);
virtual jboolean isValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
virtual void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
private:
libjava/gnu/xml/validation/datatype/Type.h
+3 -3
View File
@@ -26,7 +26,7 @@ extern "Java"
{
namespace xml
{
namespace namespace
namespace namespace$
{
class QName;
}
@@ -38,9 +38,9 @@ class gnu::xml::validation::datatype::Type : public ::java::lang::Object
{
public:
Type(::javax::xml::namespace::QName *);
Type(::javax::xml::namespace$::QName *);
static ::gnu::xml::validation::datatype::Type * ANY_TYPE;
::javax::xml::namespace::QName * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
static ::java::lang::Class class$;
};
libjava/gnu/xml/validation/datatype/UnionSimpleType.h
+2 -2
View File
@@ -28,7 +28,7 @@ extern "Java"
{
namespace xml
{
namespace namespace
namespace namespace$
{
class QName;
}
@@ -50,7 +50,7 @@ class gnu::xml::validation::datatype::UnionSimpleType : public ::gnu::xml::valid
{
public:
UnionSimpleType(::javax::xml::namespace::QName *, ::java::util::Set *, jint, ::gnu::xml::validation::datatype::SimpleType *, ::gnu::xml::validation::datatype::Annotation *, ::java::util::List *);
UnionSimpleType(::javax::xml::namespace$::QName *, ::java::util::Set *, jint, ::gnu::xml::validation::datatype::SimpleType *, ::gnu::xml::validation::datatype::Annotation *, ::java::util::List *);
virtual void checkValid(::java::lang::String *, ::org::relaxng::datatype::ValidationContext *);
::java::util::List * __attribute__((aligned(__alignof__( ::gnu::xml::validation::datatype::SimpleType)))) memberTypes;
static ::java::lang::Class class$;
libjava/gnu/xml/validation/xmlschema/AttributeDeclaration.h
+3 -3
View File
@@ -31,7 +31,7 @@ extern "Java"
{
namespace xml
{
namespace namespace
namespace namespace$
{
class QName;
}
@@ -43,14 +43,14 @@ class gnu::xml::validation::xmlschema::AttributeDeclaration : public ::java::lan
{
public: // actually package-private
AttributeDeclaration(jboolean, jint, ::java::lang::String *, ::javax::xml::namespace::QName *, ::gnu::xml::validation::datatype::SimpleType *, ::gnu::xml::validation::datatype::Annotation *);
AttributeDeclaration(jboolean, jint, ::java::lang::String *, ::javax::xml::namespace$::QName *, ::gnu::xml::validation::datatype::SimpleType *, ::gnu::xml::validation::datatype::Annotation *);
static const jint NONE = 0;
static const jint DEFAULT = 1;
static const jint FIXED = 2;
jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) scope;
jint type;
::java::lang::String * value;
::javax::xml::namespace::QName * name;
::javax::xml::namespace$::QName * name;
::gnu::xml::validation::datatype::SimpleType * datatype;
::gnu::xml::validation::datatype::Annotation * annotation;
public:
libjava/gnu/xml/validation/xmlschema/ComplexType.h
+3 -3
View File
@@ -27,7 +27,7 @@ extern "Java"
{
namespace xml
{
namespace namespace
namespace namespace$
{
class QName;
}
@@ -39,8 +39,8 @@ class gnu::xml::validation::xmlschema::ComplexType : public ::gnu::xml::validati
{
public: // actually package-private
ComplexType(::javax::xml::namespace::QName *, jboolean, jint, jint);
::javax::xml::namespace::QName * __attribute__((aligned(__alignof__( ::gnu::xml::validation::datatype::Type)))) baseType;
ComplexType(::javax::xml::namespace$::QName *, jboolean, jint, jint);
::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::gnu::xml::validation::datatype::Type)))) baseType;
jint derivationMethod;
jint finality;
jboolean isAbstract;
libjava/gnu/xml/validation/xmlschema/ElementDeclaration.h
+4 -4
View File
@@ -31,7 +31,7 @@ extern "Java"
{
namespace xml
{
namespace namespace
namespace namespace$
{
class QName;
}
@@ -43,15 +43,15 @@ class gnu::xml::validation::xmlschema::ElementDeclaration : public ::java::lang:
{
public: // actually package-private
ElementDeclaration(::javax::xml::namespace::QName *, ::gnu::xml::validation::datatype::Type *, jint, ::gnu::xml::validation::xmlschema::ElementDeclaration *, jint, ::java::lang::String *, jboolean, ::javax::xml::namespace::QName *, jint, jint, jboolean);
::javax::xml::namespace::QName * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
ElementDeclaration(::javax::xml::namespace$::QName *, ::gnu::xml::validation::datatype::Type *, jint, ::gnu::xml::validation::xmlschema::ElementDeclaration *, jint, ::java::lang::String *, jboolean, ::javax::xml::namespace$::QName *, jint, jint, jboolean);
::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
::gnu::xml::validation::datatype::Type * datatype;
jint scope;
::gnu::xml::validation::xmlschema::ElementDeclaration * parent;
jint type;
::java::lang::String * value;
jboolean nillable;
::javax::xml::namespace::QName * substitutionGroup;
::javax::xml::namespace$::QName * substitutionGroup;
jint substitutionGroupExclusions;
jint disallowedSubstitutions;
jboolean isAbstract;
libjava/gnu/xml/validation/xmlschema/XMLSchemaBuilder.h
+3 -3
View File
@@ -36,7 +36,7 @@ extern "Java"
{
namespace xml
{
namespace namespace
namespace namespace$
{
class QName;
}
@@ -77,7 +77,7 @@ public: // actually package-private
virtual jint parseComplexTypeBlockSet(::java::lang::String *);
virtual ::java::lang::Object * parseElement(::org::w3c::dom::Node *, ::gnu::xml::validation::xmlschema::ElementDeclaration *);
virtual ::java::lang::Integer * getOccurrence(::java::lang::String *);
virtual ::gnu::xml::validation::datatype::SimpleType * parseSimpleType(::javax::xml::namespace::QName *);
virtual ::gnu::xml::validation::datatype::SimpleType * parseSimpleType(::javax::xml::namespace$::QName *);
virtual ::gnu::xml::validation::datatype::SimpleType * parseSimpleType(::org::w3c::dom::Node *);
virtual ::gnu::xml::validation::datatype::Type * parseComplexType(::org::w3c::dom::Node *, ::gnu::xml::validation::xmlschema::ElementDeclaration *);
virtual void parseSimpleContent(::org::w3c::dom::Node *, ::gnu::xml::validation::xmlschema::ComplexType *);
@@ -87,7 +87,7 @@ public: // actually package-private
virtual ::gnu::xml::validation::datatype::Annotation * parseAnnotation(::org::w3c::dom::Node *);
private:
static ::java::lang::String * getAttribute(::org::w3c::dom::NamedNodeMap *, ::java::lang::String *);
static ::javax::xml::namespace::QName * asQName(::java::lang::String *, ::org::w3c::dom::Node *);
static ::javax::xml::namespace$::QName * asQName(::java::lang::String *, ::org::w3c::dom::Node *);
public: // actually package-private
::gnu::xml::validation::xmlschema::XMLSchema * __attribute__((aligned(__alignof__( ::java::lang::Object)))) schema;
::org::relaxng::datatype::DatatypeLibrary * typeLibrary;