Fridrich Strba 2023-09-26 18:21:29 +00:00 committed by Git OBS Bridge
parent 07bb95be41
commit 26bbbafc0a

View File

@ -10,7 +10,7 @@
return res;
}
--- groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/ast/VariableScope.java 2023-09-26 13:31:23.339542759 +0200
+++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/ast/VariableScope.java 2023-09-26 20:06:22.392879780 +0200
+++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/ast/VariableScope.java 2023-09-26 19:45:48.534571007 +0200
@@ -16,8 +16,8 @@
package org.codehaus.groovy.ast;
@ -21,29 +21,28 @@
import java.util.Map;
/**
@@ -107,18 +107,15 @@
@@ -107,17 +107,17 @@
VariableScope copy = new VariableScope();
copy.clazzScope = clazzScope;
if (declaredVariables.size() > 0) {
- copy.declaredVariables = new HashMap<String, Variable>();
- copy.declaredVariables.putAll(declaredVariables);
+ copy.declaredVariables = new LinkedHashMap<String, Variable>(declaredVariables);
+ copy.declaredVariables = new LinkedHashMap<String, Variable>();
copy.declaredVariables.putAll(declaredVariables);
}
copy.inStaticContext = inStaticContext;
copy.parent = parent;
if (referencedClassVariables.size() > 0) {
- copy.referencedClassVariables = new HashMap<String, Variable>();
- copy.referencedClassVariables.putAll(referencedClassVariables);
+ copy.referencedClassVariables = new LinkedHashMap<String, Variable>(referencedClassVariables);
+ copy.referencedClassVariables = new LinkedHashMap<String, Variable>();
copy.referencedClassVariables.putAll(referencedClassVariables);
}
if (referencedLocalVariables.size() > 0) {
- copy.referencedLocalVariables = new HashMap<String, Variable>();
- copy.referencedLocalVariables.putAll(referencedLocalVariables);
+ copy.referencedLocalVariables = new LinkedHashMap<String, Variable>(referencedLocalVariables);
+ copy.referencedLocalVariables = new LinkedHashMap<String, Variable>();
copy.referencedLocalVariables.putAll(referencedLocalVariables);
}
copy.resolvesDynamic = resolvesDynamic;
return copy;
@@ -126,7 +123,7 @@
@@ -126,7 +126,7 @@
public void putDeclaredVariable(Variable var) {
if (declaredVariables == Collections.EMPTY_MAP)
@ -52,7 +51,7 @@
declaredVariables.put(var.getName(), var);
}
@@ -144,13 +141,13 @@
@@ -144,13 +144,13 @@
public void putReferencedLocalVariable(Variable var) {
if (referencedLocalVariables == Collections.EMPTY_MAP)