forked from pool/groovy18
This commit is contained in:
parent
804a5e61b1
commit
6fb4401416
@ -23,7 +23,7 @@
|
|||||||
public void visit(ASTNode[] astNodes, SourceUnit sourceUnit) {
|
public void visit(ASTNode[] astNodes, SourceUnit sourceUnit) {
|
||||||
|
|
||||||
--- groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/classgen/Verifier.java 2023-09-15 00:14:26.176051747 +0200
|
--- groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/classgen/Verifier.java 2023-09-15 00:14:26.176051747 +0200
|
||||||
+++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/classgen/Verifier.java 2023-09-15 01:04:37.502489263 +0200
|
+++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/classgen/Verifier.java 2023-09-15 01:19:28.711554694 +0200
|
||||||
@@ -432,13 +432,13 @@
|
@@ -432,13 +432,13 @@
|
||||||
ClassHelper.long_TYPE,
|
ClassHelper.long_TYPE,
|
||||||
//"",
|
//"",
|
||||||
@ -40,15 +40,41 @@
|
|||||||
ACC_PUBLIC | ACC_STATIC | ACC_SYNTHETIC,
|
ACC_PUBLIC | ACC_STATIC | ACC_SYNTHETIC,
|
||||||
ClassHelper.long_TYPE,
|
ClassHelper.long_TYPE,
|
||||||
//"",
|
//"",
|
||||||
@@ -1051,7 +1051,7 @@
|
@@ -1051,12 +1051,12 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void addCovariantMethods(ClassNode classNode) {
|
protected void addCovariantMethods(ClassNode classNode) {
|
||||||
- Map methodsToAdd = new HashMap();
|
- Map methodsToAdd = new HashMap();
|
||||||
|
- Map genericsSpec = new HashMap();
|
||||||
+ Map methodsToAdd = new LinkedHashMap();
|
+ Map methodsToAdd = new LinkedHashMap();
|
||||||
Map genericsSpec = new HashMap();
|
+ Map genericsSpec = new LinkedHashMap();
|
||||||
|
|
||||||
// unimplemented abstract methods from interfaces
|
// unimplemented abstract methods from interfaces
|
||||||
|
- Map abstractMethods = new HashMap();
|
||||||
|
- Map<String, MethodNode> allInterfaceMethods = new HashMap<String, MethodNode>();
|
||||||
|
+ Map abstractMethods = new LinkedHashMap();
|
||||||
|
+ Map<String, MethodNode> allInterfaceMethods = new LinkedHashMap<String, MethodNode>();
|
||||||
|
ClassNode[] interfaces = classNode.getInterfaces();
|
||||||
|
for (ClassNode iface : interfaces) {
|
||||||
|
Map ifaceMethodsMap = iface.getDeclaredMethodsMap();
|
||||||
|
@@ -1086,7 +1086,7 @@
|
||||||
|
|
||||||
|
addCovariantMethods(classNode, declaredMethods, abstractMethods, methodsToAdd, genericsSpec);
|
||||||
|
|
||||||
|
- Map<String, MethodNode> declaredMethodsMap = new HashMap<String, MethodNode>();
|
||||||
|
+ Map<String, MethodNode> declaredMethodsMap = new LinkedHashMap<String, MethodNode>();
|
||||||
|
if (methodsToAdd.size() > 0) {
|
||||||
|
for (MethodNode mn : declaredMethods) {
|
||||||
|
declaredMethodsMap.put(mn.getTypeDescriptor(), mn);
|
||||||
|
@@ -1336,7 +1336,7 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
private Map createGenericsSpec(ClassNode current, Map oldSpec) {
|
||||||
|
- Map ret = new HashMap(oldSpec);
|
||||||
|
+ Map ret = new LinkedHashMap(oldSpec);
|
||||||
|
// ret contains the type specs, what we now need is the type spec for the
|
||||||
|
// current class. To get that we first apply the type parameters to the
|
||||||
|
// current class and then use the type names of the current class to reset
|
||||||
--- groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/tools/groovydoc/gstringTemplates/classLevel/classDocName.html 2023-09-14 17:55:59.569563087 +0200
|
--- groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/tools/groovydoc/gstringTemplates/classLevel/classDocName.html 2023-09-14 17:55:59.569563087 +0200
|
||||||
+++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/tools/groovydoc/gstringTemplates/classLevel/classDocName.html 2023-09-14 21:15:34.220475678 +0200
|
+++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/tools/groovydoc/gstringTemplates/classLevel/classDocName.html 2023-09-14 21:15:34.220475678 +0200
|
||||||
@@ -62,9 +62,8 @@
|
@@ -62,9 +62,8 @@
|
||||||
|
Loading…
x
Reference in New Issue
Block a user