SHA256
1
0
forked from pool/groovy18
Fridrich Strba 2023-09-14 23:28:02 +00:00 committed by Git OBS Bridge
parent 6fb4401416
commit 69ff199d58

View File

@ -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:19:28.711554694 +0200 +++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/classgen/Verifier.java 2023-09-15 01:27:52.518115209 +0200
@@ -432,13 +432,13 @@ @@ -432,13 +432,13 @@
ClassHelper.long_TYPE, ClassHelper.long_TYPE,
//"", //"",
@ -46,14 +46,14 @@
protected void addCovariantMethods(ClassNode classNode) { protected void addCovariantMethods(ClassNode classNode) {
- Map methodsToAdd = new HashMap(); - Map methodsToAdd = new HashMap();
- Map genericsSpec = new HashMap(); - Map genericsSpec = new HashMap();
+ Map methodsToAdd = new LinkedHashMap(); + Map methodsToAdd = new TreeMap();
+ Map genericsSpec = new LinkedHashMap(); + Map genericsSpec = new TreeMap();
// unimplemented abstract methods from interfaces // unimplemented abstract methods from interfaces
- Map abstractMethods = new HashMap(); - Map abstractMethods = new HashMap();
- Map<String, MethodNode> allInterfaceMethods = new HashMap<String, MethodNode>(); - Map<String, MethodNode> allInterfaceMethods = new HashMap<String, MethodNode>();
+ Map abstractMethods = new LinkedHashMap(); + Map abstractMethods = new TreeMap();
+ Map<String, MethodNode> allInterfaceMethods = new LinkedHashMap<String, MethodNode>(); + Map<String, MethodNode> allInterfaceMethods = new TreeMap<String, MethodNode>();
ClassNode[] interfaces = classNode.getInterfaces(); ClassNode[] interfaces = classNode.getInterfaces();
for (ClassNode iface : interfaces) { for (ClassNode iface : interfaces) {
Map ifaceMethodsMap = iface.getDeclaredMethodsMap(); Map ifaceMethodsMap = iface.getDeclaredMethodsMap();
@ -62,7 +62,7 @@
addCovariantMethods(classNode, declaredMethods, abstractMethods, methodsToAdd, genericsSpec); addCovariantMethods(classNode, declaredMethods, abstractMethods, methodsToAdd, genericsSpec);
- Map<String, MethodNode> declaredMethodsMap = new HashMap<String, MethodNode>(); - Map<String, MethodNode> declaredMethodsMap = new HashMap<String, MethodNode>();
+ Map<String, MethodNode> declaredMethodsMap = new LinkedHashMap<String, MethodNode>(); + Map<String, MethodNode> declaredMethodsMap = new TreeMap<String, MethodNode>();
if (methodsToAdd.size() > 0) { if (methodsToAdd.size() > 0) {
for (MethodNode mn : declaredMethods) { for (MethodNode mn : declaredMethods) {
declaredMethodsMap.put(mn.getTypeDescriptor(), mn); declaredMethodsMap.put(mn.getTypeDescriptor(), mn);
@ -71,7 +71,7 @@
private Map createGenericsSpec(ClassNode current, Map oldSpec) { private Map createGenericsSpec(ClassNode current, Map oldSpec) {
- Map ret = new HashMap(oldSpec); - Map ret = new HashMap(oldSpec);
+ Map ret = new LinkedHashMap(oldSpec); + Map ret = new TreeMap(oldSpec);
// ret contains the type specs, what we now need is the type spec for the // 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. 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 // current class and then use the type names of the current class to reset