From 3ad1aba1f8d179027d2b5532d43024edfa7e903e Mon Sep 17 00:00:00 2001 From: Andrew Haley Date: Mon, 29 Jun 2009 17:50:59 +0000 Subject: re PR java/40590 (namespace namespace broken in CNI) 2009-06-29 Andrew Haley 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 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 --- .../gnu/classpath/tools/javah/ClassWrapper.class | Bin 8529 -> 8421 bytes .../gnu/classpath/tools/javah/CniPrintStream.class | Bin 5058 -> 5349 bytes .../gnu/classpath/tools/javah/CniStubPrinter.class | Bin 3996 -> 4018 bytes .../gnu/classpath/tools/javah/FieldHelper.class | Bin 2203 -> 2118 bytes .../classes/gnu/classpath/tools/javah/Keywords.class | Bin 2625 -> 3576 bytes .../gnu/classpath/tools/javah/MethodHelper.class | Bin 2902 -> 2924 bytes 6 files changed, 0 insertions(+), 0 deletions(-) (limited to 'libjava/classpath/tools/classes') diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/ClassWrapper.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/ClassWrapper.class index 5c20124a..e853782 100644 Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/ClassWrapper.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/ClassWrapper.class differ diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniPrintStream.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniPrintStream.class index 1f0d890..0c7915c 100644 Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniPrintStream.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniPrintStream.class differ diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniStubPrinter.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniStubPrinter.class index 8726cdd..e226ffb 100644 Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniStubPrinter.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniStubPrinter.class differ diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/FieldHelper.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/FieldHelper.class index 9b7169f..3d6f235 100644 Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/FieldHelper.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/FieldHelper.class differ diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Keywords.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Keywords.class index 7b6b063..592ff47 100644 Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Keywords.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Keywords.class differ diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/MethodHelper.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/MethodHelper.class index 2bd3202..71974cc 100644 Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/MethodHelper.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/MethodHelper.class differ -- cgit v1.1