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/classpath/tools/classes | |
| 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/classpath/tools/classes')
| -rw-r--r-- | libjava/classpath/tools/classes/gnu/classpath/tools/javah/ClassWrapper.class | bin | 8529 -> 8421 bytes |
| -rw-r--r-- | libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniPrintStream.class | bin | 5058 -> 5349 bytes |
| -rw-r--r-- | libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniStubPrinter.class | bin | 3996 -> 4018 bytes |
| -rw-r--r-- | libjava/classpath/tools/classes/gnu/classpath/tools/javah/FieldHelper.class | bin | 2203 -> 2118 bytes |
| -rw-r--r-- | libjava/classpath/tools/classes/gnu/classpath/tools/javah/Keywords.class | bin | 2625 -> 3576 bytes |
| -rw-r--r-- | libjava/classpath/tools/classes/gnu/classpath/tools/javah/MethodHelper.class | bin | 2902 -> 2924 bytes |
6 files changed, 0 insertions, 0 deletions
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/ClassWrapper.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/ClassWrapper.class Binary files differindex 5c20124a..e853782 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/ClassWrapper.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/ClassWrapper.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniPrintStream.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniPrintStream.class Binary files differindex 1f0d890..0c7915c 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniPrintStream.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniPrintStream.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniStubPrinter.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniStubPrinter.class Binary files differindex 8726cdd..e226ffb 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniStubPrinter.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniStubPrinter.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/FieldHelper.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/FieldHelper.class Binary files differindex 9b7169f..3d6f235 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/FieldHelper.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/FieldHelper.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Keywords.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Keywords.class Binary files differindex 7b6b063..592ff47 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Keywords.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Keywords.class diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/MethodHelper.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/MethodHelper.class Binary files differindex 2bd3202..71974cc 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/MethodHelper.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/MethodHelper.class |