diff options
| author | Andrew Haley <aph@redhat.com> | 2009-06-29 17:50:59 +0000 |
|---|---|---|
| committer | Andrew Haley <aph@gcc.gnu.org> | 2009-06-29 17:50:59 +0000 |
| commit | 3ad1aba1f8d179027d2b5532d43024edfa7e903e (patch) | |
| tree | 3cfe7282cd5664c854b8f591c178d778224cc35e /libjava/javax/xml/xpath | |
| parent | 356ecb153076b45d402faf66da6812e01e276906 (diff) | |
| download | gcc-3ad1aba1f8d179027d2b5532d43024edfa7e903e.zip gcc-3ad1aba1f8d179027d2b5532d43024edfa7e903e.tar.gz gcc-3ad1aba1f8d179027d2b5532d43024edfa7e903e.tar.bz2 | |
re PR java/40590 (namespace namespace broken in CNI)
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
Diffstat (limited to 'libjava/javax/xml/xpath')
| -rw-r--r-- | libjava/javax/xml/xpath/XPath.h | 10 | ||||
| -rw-r--r-- | libjava/javax/xml/xpath/XPathConstants.h | 12 | ||||
| -rw-r--r-- | libjava/javax/xml/xpath/XPathExpression.h | 6 | ||||
| -rw-r--r-- | libjava/javax/xml/xpath/XPathFunctionResolver.h | 4 | ||||
| -rw-r--r-- | libjava/javax/xml/xpath/XPathVariableResolver.h | 4 |
5 files changed, 18 insertions, 18 deletions
diff --git a/libjava/javax/xml/xpath/XPath.h b/libjava/javax/xml/xpath/XPath.h index 0a67abb..a19cd75 100644 --- a/libjava/javax/xml/xpath/XPath.h +++ b/libjava/javax/xml/xpath/XPath.h @@ -13,7 +13,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class NamespaceContext; class QName; @@ -48,12 +48,12 @@ public: virtual ::javax::xml::xpath::XPathVariableResolver * getXPathVariableResolver() = 0; virtual void setXPathFunctionResolver(::javax::xml::xpath::XPathFunctionResolver *) = 0; virtual ::javax::xml::xpath::XPathFunctionResolver * getXPathFunctionResolver() = 0; - virtual void setNamespaceContext(::javax::xml::namespace::NamespaceContext *) = 0; - virtual ::javax::xml::namespace::NamespaceContext * getNamespaceContext() = 0; + virtual void setNamespaceContext(::javax::xml::namespace$::NamespaceContext *) = 0; + virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext() = 0; virtual ::javax::xml::xpath::XPathExpression * compile(::java::lang::String *) = 0; - virtual ::java::lang::Object * evaluate(::java::lang::String *, ::java::lang::Object *, ::javax::xml::namespace::QName *) = 0; + virtual ::java::lang::Object * evaluate(::java::lang::String *, ::java::lang::Object *, ::javax::xml::namespace$::QName *) = 0; virtual ::java::lang::String * evaluate(::java::lang::String *, ::java::lang::Object *) = 0; - virtual ::java::lang::Object * evaluate(::java::lang::String *, ::org::xml::sax::InputSource *, ::javax::xml::namespace::QName *) = 0; + virtual ::java::lang::Object * evaluate(::java::lang::String *, ::org::xml::sax::InputSource *, ::javax::xml::namespace$::QName *) = 0; virtual ::java::lang::String * evaluate(::java::lang::String *, ::org::xml::sax::InputSource *) = 0; static ::java::lang::Class class$; } __attribute__ ((java_interface)); diff --git a/libjava/javax/xml/xpath/XPathConstants.h b/libjava/javax/xml/xpath/XPathConstants.h index 0b15648..5cb800c 100644 --- a/libjava/javax/xml/xpath/XPathConstants.h +++ b/libjava/javax/xml/xpath/XPathConstants.h @@ -13,7 +13,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -30,11 +30,11 @@ class javax::xml::xpath::XPathConstants : public ::java::lang::Object XPathConstants(); public: - static ::javax::xml::namespace::QName * NUMBER; - static ::javax::xml::namespace::QName * STRING; - static ::javax::xml::namespace::QName * BOOLEAN; - static ::javax::xml::namespace::QName * NODESET; - static ::javax::xml::namespace::QName * NODE; + static ::javax::xml::namespace$::QName * NUMBER; + static ::javax::xml::namespace$::QName * STRING; + static ::javax::xml::namespace$::QName * BOOLEAN; + static ::javax::xml::namespace$::QName * NODESET; + static ::javax::xml::namespace$::QName * NODE; static ::java::lang::String * DOM_OBJECT_MODEL; static ::java::lang::Class class$; }; diff --git a/libjava/javax/xml/xpath/XPathExpression.h b/libjava/javax/xml/xpath/XPathExpression.h index 6a9a0e3..389e5f6 100644 --- a/libjava/javax/xml/xpath/XPathExpression.h +++ b/libjava/javax/xml/xpath/XPathExpression.h @@ -13,7 +13,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -39,9 +39,9 @@ class javax::xml::xpath::XPathExpression : public ::java::lang::Object { public: - virtual ::java::lang::Object * evaluate(::java::lang::Object *, ::javax::xml::namespace::QName *) = 0; + virtual ::java::lang::Object * evaluate(::java::lang::Object *, ::javax::xml::namespace$::QName *) = 0; virtual ::java::lang::String * evaluate(::java::lang::Object *) = 0; - virtual ::java::lang::Object * evaluate(::org::xml::sax::InputSource *, ::javax::xml::namespace::QName *) = 0; + virtual ::java::lang::Object * evaluate(::org::xml::sax::InputSource *, ::javax::xml::namespace$::QName *) = 0; virtual ::java::lang::String * evaluate(::org::xml::sax::InputSource *) = 0; static ::java::lang::Class class$; } __attribute__ ((java_interface)); diff --git a/libjava/javax/xml/xpath/XPathFunctionResolver.h b/libjava/javax/xml/xpath/XPathFunctionResolver.h index b526d01..1061227 100644 --- a/libjava/javax/xml/xpath/XPathFunctionResolver.h +++ b/libjava/javax/xml/xpath/XPathFunctionResolver.h @@ -13,7 +13,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -30,7 +30,7 @@ class javax::xml::xpath::XPathFunctionResolver : public ::java::lang::Object { public: - virtual ::javax::xml::xpath::XPathFunction * resolveFunction(::javax::xml::namespace::QName *, jint) = 0; + virtual ::javax::xml::xpath::XPathFunction * resolveFunction(::javax::xml::namespace$::QName *, jint) = 0; static ::java::lang::Class class$; } __attribute__ ((java_interface)); diff --git a/libjava/javax/xml/xpath/XPathVariableResolver.h b/libjava/javax/xml/xpath/XPathVariableResolver.h index d308cac..dfbd635 100644 --- a/libjava/javax/xml/xpath/XPathVariableResolver.h +++ b/libjava/javax/xml/xpath/XPathVariableResolver.h @@ -13,7 +13,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -29,7 +29,7 @@ class javax::xml::xpath::XPathVariableResolver : public ::java::lang::Object { public: - virtual ::java::lang::Object * resolveVariable(::javax::xml::namespace::QName *) = 0; + virtual ::java::lang::Object * resolveVariable(::javax::xml::namespace$::QName *) = 0; static ::java::lang::Class class$; } __attribute__ ((java_interface)); |