fix(compiler): locals are also case-insensitive

unnamed · Dec 29, 2023 · 81f29db · 81f29db
1 parent eeacf28
commit 81f29db
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/src/main/java/team/unnamed/mocha/runtime/FunctionCompileState.java b/src/main/java/team/unnamed/mocha/runtime/FunctionCompileState.java
@@ -27,9 +27,9 @@
 import javassist.CtClass;
 import javassist.bytecode.Bytecode;
 import org.jetbrains.annotations.NotNull;
+import team.unnamed.mocha.util.CaseInsensitiveStringHashMap;
 
 import java.lang.reflect.Method;
-import java.util.HashMap;
 import java.util.Map;
 
 import static java.util.Objects.requireNonNull;
@@ -42,10 +42,9 @@ final class FunctionCompileState {
     private final Bytecode bytecode;
     private final Method method;
 
-    private final Map<String, Object> requirements = new HashMap<>();
+    private final Map<String, Object> requirements = new CaseInsensitiveStringHashMap<>();
     private final GlobalScope scope;
     private final Map<String, Integer> argumentParameterIndexes;
-    private final Map<String, Integer> localsByName = new HashMap<>();
     private int maxLocals = 0;
 
     FunctionCompileState(
@@ -100,8 +99,4 @@ public int maxLocals() {
     public void maxLocals(int maxLocals) {
         this.maxLocals = maxLocals;
     }
-
-    public Map<String, Integer> getLocalsByName() {
-        return localsByName;
-    }
 }
diff --git a/src/main/java/team/unnamed/mocha/runtime/MolangCompiler.java b/src/main/java/team/unnamed/mocha/runtime/MolangCompiler.java
@@ -41,14 +41,14 @@
 import team.unnamed.mocha.parser.ast.Expression;
 import team.unnamed.mocha.runtime.compiled.MochaCompiledFunction;
 import team.unnamed.mocha.runtime.compiled.Named;
+import team.unnamed.mocha.util.CaseInsensitiveStringHashMap;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Parameter;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
@@ -99,7 +99,7 @@ public MolangCompiler(final @NotNull ClassLoader classLoader, final @NotNull Glo
             throw new IllegalArgumentException("Target type must have a method to implement: " + clazz.getName());
         }
 
-        final Map<String, Integer> argumentParameterIndexes = new HashMap<>();
+        final Map<String, Integer> argumentParameterIndexes = new CaseInsensitiveStringHashMap<>();
         final CtClass[] ctParameters;
 
         // check method parameter types

diff --git a/src/main/java/team/unnamed/mocha/runtime/MolangCompilingVisitor.java b/src/main/java/team/unnamed/mocha/runtime/MolangCompilingVisitor.java
@@ -37,12 +37,12 @@
 import team.unnamed.mocha.runtime.value.NumberValue;
 import team.unnamed.mocha.runtime.value.ObjectValue;
 import team.unnamed.mocha.runtime.value.Value;
+import team.unnamed.mocha.util.CaseInsensitiveStringHashMap;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Parameter;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -75,7 +75,7 @@ final class MolangCompilingVisitor implements ExpressionVisitor<CompileVisitResu
     private final Map<String, Object> requirements;
     private final Map<String, Integer> argumentParameterIndexes;
 
-    private final Map<String, Integer> localsByName = new HashMap<>();
+    private final Map<String, Integer> localsByName = new CaseInsensitiveStringHashMap<>();
 
     private final CtClass stringCtType;
     /**