OSDN Git Service

2009-06-29 Andrew Haley <aph@redhat.com>
authoraph <aph@138bc75d-0d04-0410-961f-82ee72b054a4>
Mon, 29 Jun 2009 17:50:59 +0000 (17:50 +0000)
committeraph <aph@138bc75d-0d04-0410-961f-82ee72b054a4>
Mon, 29 Jun 2009 17:50:59 +0000 (17:50 +0000)
commitfce8df1021b8e76afd5e8f909557826fcbf3ff19
tree3cfe7282cd5664c854b8f591c178d778224cc35e
parentd6d765b4a20ee056454dc87d9e002cd2f5ebb42d
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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@149059 138bc75d-0d04-0410-961f-82ee72b054a4
150 files changed:
gcc/java/ChangeLog
gcc/java/java-tree.h
gcc/java/mangle.c
gcc/java/mangle_name.c
libjava/classpath/ChangeLog
libjava/classpath/tools/classes/gnu/classpath/tools/javah/ClassWrapper.class
libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniPrintStream.class
libjava/classpath/tools/classes/gnu/classpath/tools/javah/CniStubPrinter.class
libjava/classpath/tools/classes/gnu/classpath/tools/javah/FieldHelper.class
libjava/classpath/tools/classes/gnu/classpath/tools/javah/Keywords.class
libjava/classpath/tools/classes/gnu/classpath/tools/javah/MethodHelper.class
libjava/classpath/tools/gnu/classpath/tools/javah/ClassWrapper.java
libjava/classpath/tools/gnu/classpath/tools/javah/CniPrintStream.java
libjava/classpath/tools/gnu/classpath/tools/javah/CniStubPrinter.java
libjava/classpath/tools/gnu/classpath/tools/javah/FieldHelper.java
libjava/classpath/tools/gnu/classpath/tools/javah/Keywords.java
libjava/classpath/tools/gnu/classpath/tools/javah/MethodHelper.java
libjava/gnu/xml/stream/AttributeImpl.h
libjava/gnu/xml/stream/EndElementImpl.h
libjava/gnu/xml/stream/StartElementImpl.h
libjava/gnu/xml/stream/XIncludeFilter.h
libjava/gnu/xml/stream/XMLEventFactoryImpl.h
libjava/gnu/xml/stream/XMLEventImpl.h
libjava/gnu/xml/stream/XMLEventWriterImpl.h
libjava/gnu/xml/stream/XMLParser.h
libjava/gnu/xml/stream/XMLStreamWriterImpl.h
libjava/gnu/xml/transform/AbstractNumberNode.h
libjava/gnu/xml/transform/ApplyImportsNode.h
libjava/gnu/xml/transform/ApplyTemplatesNode.h
libjava/gnu/xml/transform/AttributeNode.h
libjava/gnu/xml/transform/Bindings.h
libjava/gnu/xml/transform/CallTemplateNode.h
libjava/gnu/xml/transform/ChooseNode.h
libjava/gnu/xml/transform/CommentNode.h
libjava/gnu/xml/transform/CopyNode.h
libjava/gnu/xml/transform/CopyOfNode.h
libjava/gnu/xml/transform/CurrentFunction.h
libjava/gnu/xml/transform/DocumentFunction.h
libjava/gnu/xml/transform/ElementAvailableFunction.h
libjava/gnu/xml/transform/ElementNode.h
libjava/gnu/xml/transform/ForEachNode.h
libjava/gnu/xml/transform/FormatNumberFunction.h
libjava/gnu/xml/transform/FunctionAvailableFunction.h
libjava/gnu/xml/transform/GenerateIdFunction.h
libjava/gnu/xml/transform/IfNode.h
libjava/gnu/xml/transform/Key.h
libjava/gnu/xml/transform/KeyFunction.h
libjava/gnu/xml/transform/LiteralNode.h
libjava/gnu/xml/transform/MessageNode.h
libjava/gnu/xml/transform/OtherwiseNode.h
libjava/gnu/xml/transform/ParameterNode.h
libjava/gnu/xml/transform/ProcessingInstructionNode.h
libjava/gnu/xml/transform/SortKey.h
libjava/gnu/xml/transform/Stylesheet.h
libjava/gnu/xml/transform/SystemPropertyFunction.h
libjava/gnu/xml/transform/Template.h
libjava/gnu/xml/transform/TemplateNode.h
libjava/gnu/xml/transform/TextNode.h
libjava/gnu/xml/transform/TransformerImpl.h
libjava/gnu/xml/transform/UnparsedEntityUriFunction.h
libjava/gnu/xml/transform/ValueOfNode.h
libjava/gnu/xml/transform/WhenNode.h
libjava/gnu/xml/transform/WithParam.h
libjava/gnu/xml/validation/datatype/AtomicSimpleType.h
libjava/gnu/xml/validation/datatype/ListSimpleType.h
libjava/gnu/xml/validation/datatype/SimpleType.h
libjava/gnu/xml/validation/datatype/Type.h
libjava/gnu/xml/validation/datatype/UnionSimpleType.h
libjava/gnu/xml/validation/xmlschema/AttributeDeclaration.h
libjava/gnu/xml/validation/xmlschema/ComplexType.h
libjava/gnu/xml/validation/xmlschema/ElementDeclaration.h
libjava/gnu/xml/validation/xmlschema/XMLSchemaBuilder.h
libjava/gnu/xml/xpath/AndExpr.h
libjava/gnu/xml/xpath/ArithmeticExpr.h
libjava/gnu/xml/xpath/BooleanFunction.h
libjava/gnu/xml/xpath/CeilingFunction.h
libjava/gnu/xml/xpath/ConcatFunction.h
libjava/gnu/xml/xpath/Constant.h
libjava/gnu/xml/xpath/ContainsFunction.h
libjava/gnu/xml/xpath/CountFunction.h
libjava/gnu/xml/xpath/EqualityExpr.h
libjava/gnu/xml/xpath/Expr.h
libjava/gnu/xml/xpath/FalseFunction.h
libjava/gnu/xml/xpath/FloorFunction.h
libjava/gnu/xml/xpath/FunctionCall.h
libjava/gnu/xml/xpath/IdFunction.h
libjava/gnu/xml/xpath/LangFunction.h
libjava/gnu/xml/xpath/LastFunction.h
libjava/gnu/xml/xpath/LocalNameFunction.h
libjava/gnu/xml/xpath/NameFunction.h
libjava/gnu/xml/xpath/NameTest.h
libjava/gnu/xml/xpath/NamespaceTest.h
libjava/gnu/xml/xpath/NamespaceUriFunction.h
libjava/gnu/xml/xpath/NegativeExpr.h
libjava/gnu/xml/xpath/NodeTypeTest.h
libjava/gnu/xml/xpath/NormalizeSpaceFunction.h
libjava/gnu/xml/xpath/NotFunction.h
libjava/gnu/xml/xpath/NumberFunction.h
libjava/gnu/xml/xpath/OrExpr.h
libjava/gnu/xml/xpath/ParenthesizedExpr.h
libjava/gnu/xml/xpath/PositionFunction.h
libjava/gnu/xml/xpath/Predicate.h
libjava/gnu/xml/xpath/RelationalExpr.h
libjava/gnu/xml/xpath/Root.h
libjava/gnu/xml/xpath/RoundFunction.h
libjava/gnu/xml/xpath/Selector.h
libjava/gnu/xml/xpath/StartsWithFunction.h
libjava/gnu/xml/xpath/Steps.h
libjava/gnu/xml/xpath/StringFunction.h
libjava/gnu/xml/xpath/StringLengthFunction.h
libjava/gnu/xml/xpath/SubstringAfterFunction.h
libjava/gnu/xml/xpath/SubstringBeforeFunction.h
libjava/gnu/xml/xpath/SubstringFunction.h
libjava/gnu/xml/xpath/SumFunction.h
libjava/gnu/xml/xpath/Test.h
libjava/gnu/xml/xpath/TranslateFunction.h
libjava/gnu/xml/xpath/TrueFunction.h
libjava/gnu/xml/xpath/UnionExpr.h
libjava/gnu/xml/xpath/VariableReference.h
libjava/gnu/xml/xpath/XPathImpl.h
libjava/gnu/xml/xpath/XPathParser.h
libjava/javax/xml/datatype/DatatypeConstants.h
libjava/javax/xml/datatype/Duration.h
libjava/javax/xml/datatype/XMLGregorianCalendar.h
libjava/javax/xml/namespace/NamespaceContext.h
libjava/javax/xml/namespace/QName.h
libjava/javax/xml/stream/XMLEventFactory.h
libjava/javax/xml/stream/XMLEventWriter.h
libjava/javax/xml/stream/XMLStreamReader.h
libjava/javax/xml/stream/XMLStreamWriter.h
libjava/javax/xml/stream/events/Attribute.h
libjava/javax/xml/stream/events/Characters.h
libjava/javax/xml/stream/events/Comment.h
libjava/javax/xml/stream/events/DTD.h
libjava/javax/xml/stream/events/EndDocument.h
libjava/javax/xml/stream/events/EndElement.h
libjava/javax/xml/stream/events/EntityDeclaration.h
libjava/javax/xml/stream/events/EntityReference.h
libjava/javax/xml/stream/events/Namespace.h
libjava/javax/xml/stream/events/NotationDeclaration.h
libjava/javax/xml/stream/events/ProcessingInstruction.h
libjava/javax/xml/stream/events/StartDocument.h
libjava/javax/xml/stream/events/StartElement.h
libjava/javax/xml/stream/events/XMLEvent.h
libjava/javax/xml/stream/util/ReaderDelegate.h
libjava/javax/xml/xpath/XPath.h
libjava/javax/xml/xpath/XPathConstants.h
libjava/javax/xml/xpath/XPathExpression.h
libjava/javax/xml/xpath/XPathFunctionResolver.h
libjava/javax/xml/xpath/XPathVariableResolver.h